- Поиск серверов выполняется на машине, где запущен Hub (не в браузере).
+ По умолчанию указан адрес на машине с Hub (127.0.0.1:11434). Если Ollama работает на сервере или другом компьютере (например, http://192.168.1.81:11434), укажите его сетевой адрес.
@@ -2948,6 +3054,42 @@ function showWizardStep2(providerId) {
${bodyHtml}
`;
elements.modalFooter.innerHTML = footerHtml;
+ if (providerId === 'antigravity' || providerId === 'claude') {
+ startRedirectAuth(providerId);
+ }
+}
+
+async function testOllamaConnection() {
+ const urlInput = document.getElementById('wiz-base-url-input');
+ const tokenInput = document.getElementById('wiz-token-input');
+ const resultEl = document.getElementById('wiz-ollama-check-result');
+ const btn = document.getElementById('wiz-test-ollama-btn');
+ if (!urlInput || !resultEl) return;
+ const baseUrl = (urlInput.value || '').trim() || 'http://127.0.0.1:11434';
+ const token = tokenInput ? tokenInput.value.trim() : '';
+ if (btn) { btn.disabled = true; btn.textContent = '⏳ Проверка…'; }
+ resultEl.innerHTML = 'Проверяем подключение…';
+ try {
+ const res = await executeAction('validate_connection', {
+ provider: 'ollama',
+ base_url: baseUrl,
+ token: token,
+ });
+ if (res && res.ok) {
+ const models = (res.data && res.data.models) || [];
+ window._wiz_models = models;
+ window._wiz_base_url = baseUrl;
+ resultEl.innerHTML = `✓ Подключение успешно. Моделей: ${models.length}`;
+ showToast('Ollama подключена успешно', 'success');
+ } else {
+ const errMsg = (res && res.message) || 'Не удалось подключиться к Ollama';
+ resultEl.innerHTML = `${escapeHtml(errMsg)}`;
+ }
+ } catch (err) {
+ resultEl.innerHTML = `Ошибка: ${escapeHtml(String(err))}`;
+ } finally {
+ if (btn) { btn.disabled = false; btn.textContent = 'Проверить адрес'; }
+ }
}
async function proceedToWizardStep3(providerId) {
@@ -2968,11 +3110,14 @@ async function proceedToWizardStep3(providerId) {
// Only read slot elements for providers that have them (grok/openai-codex have wiz-device-slot,
// antigravity/claude/openrouter/nvidia have wiz-redirect-slot). Local providers have no slot elements.
const isDeviceAuthFlow = providerId === 'grok' || providerId === 'openai-codex';
- const isRedirectAuthFlow = providerId === 'antigravity' || providerId === 'claude' || providerId === 'openrouter' || providerId === 'nvidia';
+ const isRedirectAuthFlow = providerId === 'antigravity' || providerId === 'claude';
if (isDeviceAuthFlow) {
const deviceSlot = document.getElementById('wiz-device-slot');
- window._wiz_device_profile = deviceSlot?.value || '';
+ window._wiz_device_profile = window._wiz_device_profile || deviceSlot?.value || '';
} else if (isRedirectAuthFlow) {
+ const redirectSlot = document.getElementById('wiz-redirect-slot');
+ window._wiz_device_profile = window._wiz_redirect_slot_id || window._wiz_device_profile || redirectSlot?.value || '';
+ } else if (providerId === 'openrouter' || providerId === 'nvidia') {
const redirectSlot = document.getElementById('wiz-redirect-slot');
window._wiz_device_profile = redirectSlot?.value || '';
}
@@ -3055,6 +3200,8 @@ async function finishAddAccount(providerId) {
let selectedProfileId;
if (isLocalProvider) {
selectedProfileId = '';
+ } else if (providerId === 'antigravity' || providerId === 'claude') {
+ selectedProfileId = window._wiz_redirect_slot_id || window._wiz_device_profile || document.getElementById('wiz-redirect-slot')?.value || '';
} else {
const deviceSlot = document.getElementById('wiz-device-slot');
const redirectSlot = document.getElementById('wiz-redirect-slot');
@@ -3278,6 +3425,7 @@ async function startRedirectAuth(providerId) {
window._wiz_redirect_session = d.session_id;
window._wiz_redirect_provider = providerId;
window._wiz_redirect_slot_id = d.profile_id;
+ window._wiz_device_profile = d.profile_id;
const pastesUrl = d.paste_kind !== 'code';
const label = pastesUrl
@@ -3363,6 +3511,7 @@ async function submitRedirectCallback() {
if (res && res.ok) {
stopRedirectAuthPolling();
+ window._wiz_device_profile = window._wiz_redirect_slot_id;
status.innerHTML = 'Аккаунт подключён' + redirectSlotRoleNote();
showToast('Аккаунт подключён', 'success');
fetchSnapshot();
@@ -3405,6 +3554,7 @@ async function pollRedirectAuth() {
if (res.ok && (res.data || {}).status === 'completed') {
stopRedirectAuthPolling();
+ window._wiz_device_profile = window._wiz_redirect_slot_id;
status.innerHTML = 'Аккаунт подключён';
showToast('Аккаунт подключён', 'success');
fetchSnapshot();
diff --git a/src/antigravity_provider/version.py b/src/antigravity_provider/version.py
index f204dff..bbec965 100644
--- a/src/antigravity_provider/version.py
+++ b/src/antigravity_provider/version.py
@@ -2,7 +2,7 @@
from __future__ import annotations
__version__ = "0.1.2"
-VERSION_INFO = (0, 1, 1)
+VERSION_INFO = (0, 1, 2)
CHANNEL = "stable"
MINIMUM_HERMES_VERSION = "0.20.0"
diff --git a/tests/test_a42_provider_connect.py b/tests/test_a42_provider_connect.py
index 716b9e6..a428a0c 100644
--- a/tests/test_a42_provider_connect.py
+++ b/tests/test_a42_provider_connect.py
@@ -229,7 +229,7 @@ def test_p0_1_add_account_honest_rejections():
# Missing API key for claude
res_cl = ActionExecutor.execute("add_account", {"provider": "claude", "token": ""})
assert res_cl["ok"] is False
- assert "API-ключ" in res_cl["message"]
+ assert "Авторизация через браузер не завершена" in res_cl["message"] or "API-ключ" in res_cl["message"]
# Unsupported provider
res_unsupp = ActionExecutor.execute("add_account", {"provider": "unknown_provider_xyz"})
diff --git a/tests/test_a55_account_connection.py b/tests/test_a55_account_connection.py
new file mode 100644
index 0000000..45dc260
--- /dev/null
+++ b/tests/test_a55_account_connection.py
@@ -0,0 +1,188 @@
+"""Tests for Task A55: Account Connection Defect Fixes (P0-1 through P0-5)."""
+from __future__ import annotations
+
+import json
+from pathlib import Path
+from unittest.mock import MagicMock, patch
+
+import pytest
+from fastapi.testclient import TestClient
+
+from antigravity_provider.version import __version__, VERSION_INFO
+from antigravity_provider.router.action_handler import ActionExecutor
+from antigravity_provider.router.profile_manager import ProfileAuthManager
+from antigravity_provider.router.adapters.ollama_adapter import OllamaAdapter, DEFAULT_OLLAMA_BASE_URL
+from antigravity_provider.router.connection_preflight import validate_connection
+from antigravity_provider.router.model_discovery_service import ModelDiscoveryService
+from antigravity_provider.router.web.server import app
+
+
+# ── P0-1: Antigravity & Browser Auth Tests ──
+
+def test_p0_1_add_account_unauthenticated_browser_auth_error_message():
+ """add_account should return Russian browser auth message for antigravity and claude."""
+ with patch.object(ProfileAuthManager, "get_profile_status", return_value={"authenticated": False}):
+ # Antigravity without token/completed auth
+ res_ag = ActionExecutor.execute("add_account", {
+ "provider": "antigravity",
+ "profile_id": "ag-1",
+ "token": "",
+ })
+ assert not res_ag["ok"]
+ assert "Авторизация через браузер не завершена. Пожалуйста, откройте ссылку входа или вставьте адрес возврата." in res_ag["message"]
+
+ # Claude without token/completed auth
+ res_cl = ActionExecutor.execute("add_account", {
+ "provider": "claude",
+ "profile_id": "claude-1",
+ "token": "",
+ })
+ assert not res_cl["ok"]
+ assert "Авторизация через браузер не завершена. Пожалуйста, откройте ссылку входа или вставьте адрес возврата." in res_cl["message"]
+
+
+def test_p0_1_profile_auth_manager_get_profile_status_antigravity():
+ """get_profile_status should return authenticated: False when auth_data is empty or invalid."""
+ # Unauthenticated/empty auth_data
+ with patch.object(ProfileAuthManager, "load_profile_auth", return_value={}):
+ st = ProfileAuthManager.get_profile_status("antigravity", "ag-1")
+ assert st["authenticated"] is False
+ assert st["status"] == "NOT_CONFIGURED"
+
+ # Authenticated with access_token
+ with patch.object(ProfileAuthManager, "load_profile_auth", return_value={"token": {"access_token": "ya29.valid-token"}}):
+ st = ProfileAuthManager.get_profile_status("antigravity", "ag-1")
+ assert st["authenticated"] is True
+ assert st["status"] == "AUTHENTICATED"
+
+
+def test_p0_1_load_profile_auth_gemini_oauth_creds_fallback(tmp_path: Path, monkeypatch: pytest.MonkeyPatch):
+ """load_profile_auth should check .gemini/oauth_creds.json if auth.json is missing."""
+ monkeypatch.setattr("antigravity_provider.paths.get_hermes_home", lambda: tmp_path)
+ pdir = tmp_path / "agy_profiles" / "ag-5"
+ gemini_dir = pdir / ".gemini"
+ gemini_dir.mkdir(parents=True, exist_ok=True)
+ creds_file = gemini_dir / "oauth_creds.json"
+ creds_file.write_text(json.dumps({"access_token": "token-123", "refresh_token": "refresh-456"}), encoding="utf-8")
+
+ auth = ProfileAuthManager.load_profile_auth("antigravity", "ag-5")
+ assert auth is not None
+ assert auth.get("provider") == "antigravity"
+ assert auth.get("token", {}).get("access_token") == "token-123"
+
+
+# ── P0-2: Ollama Base URL & Connection Error Tests ──
+
+def test_p0_2_ollama_default_base_url():
+ """DEFAULT_OLLAMA_BASE_URL must be http://127.0.0.1:11434 (without trailing /v1)."""
+ assert DEFAULT_OLLAMA_BASE_URL == "http://127.0.0.1:11434"
+
+
+def test_p0_2_ollama_adapter_url_builders():
+ """OllamaAdapter URL methods should handle base_urls with or without /v1 cleanly."""
+ adapter = OllamaAdapter()
+
+ # Standard base url without /v1
+ assert adapter._get_native_host("http://127.0.0.1:11434") == "http://127.0.0.1:11434"
+ assert adapter._get_chat_url("http://127.0.0.1:11434") == "http://127.0.0.1:11434/v1/chat/completions"
+ assert adapter._get_models_url("http://127.0.0.1:11434") == "http://127.0.0.1:11434/v1/models"
+
+ # Base url with /v1
+ assert adapter._get_native_host("http://192.168.1.81:11434/v1") == "http://192.168.1.81:11434"
+ assert adapter._get_chat_url("http://192.168.1.81:11434/v1") == "http://192.168.1.81:11434/v1/chat/completions"
+ assert adapter._get_models_url("http://192.168.1.81:11434/v1") == "http://192.168.1.81:11434/v1/models"
+
+ # Base url with trailing slash
+ assert adapter._get_native_host("http://192.168.1.81:11434/") == "http://192.168.1.81:11434"
+ assert adapter._get_chat_url("http://192.168.1.81:11434/") == "http://192.168.1.81:11434/v1/chat/completions"
+
+
+def test_p0_2_ollama_connection_refused_helpful_message():
+ """Ollama connection refused error should provide network IP guidance."""
+ # Test connection preflight when endpoint is down
+ res = validate_connection("ollama", token="", base_url="http://127.0.0.1:11434")
+ assert not res["ok"]
+ assert "Не удалось подключиться к http://127.0.0.1:11434 (Connection refused)" in res["message"]
+ assert "http://192.168.1.81:11434" in res["message"]
+
+
+# ── P0-3: Antigravity Dynamic Model Discovery Tests ──
+
+def test_p0_3_antigravity_dynamic_model_discovery():
+ """ModelDiscoveryService probe should find and query any authenticated Antigravity profile."""
+ discovery = ModelDiscoveryService.get()
+
+ with patch("antigravity_provider.router.profile_manager.ProfileAuthManager.get_profile_status") as mock_st, \
+ patch("antigravity_provider.agy_subprocess.discover_models", return_value={"gemini-2.5-pro": "gemini-2.5-pro"}) as mock_disc:
+
+ # Simulate ag-3 being authenticated
+ def status_side_effect(prov, pid):
+ if pid == "ag-3":
+ return {"authenticated": True, "provider": prov, "profile_id": pid}
+ return {"authenticated": False, "provider": prov, "profile_id": pid}
+
+ mock_st.side_effect = status_side_effect
+
+ models, err = discovery._probe_provider("antigravity")
+ assert err is None
+ assert models == ["gemini-2.5-pro"]
+ mock_disc.assert_called_with(profile_id="ag-3")
+
+
+# ── P0-4: Version Info & API Propagation Tests ──
+
+def test_p0_4_version_single_source_of_truth():
+ """Version must be 0.1.2 and VERSION_INFO must be (0, 1, 2)."""
+ assert __version__ == "0.1.2"
+ assert VERSION_INFO == (0, 1, 2)
+
+
+def test_p0_4_version_in_api_endpoints():
+ """API endpoints /api/snapshot, /api/health, and /api/settings must return version 0.1.2."""
+ client = TestClient(app)
+
+ # /api/health
+ res_health = client.get("/api/health")
+ assert res_health.status_code == 200
+ assert res_health.json().get("version") == "0.1.2"
+
+ # /api/settings
+ res_settings = client.get("/api/settings")
+ assert res_settings.status_code == 200
+ assert res_settings.json().get("version") == "0.1.2"
+
+ # /api/snapshot
+ res_snap = client.get("/api/snapshot")
+ assert res_snap.status_code == 200
+ snap = res_snap.json()
+ assert snap.get("version") == "0.1.2"
+ assert (snap.get("metrics") or {}).get("version") == "0.1.2"
+
+
+# ── P0-5: Settings View & System Paths Tests ──
+
+def test_p0_5_settings_api_returns_system_paths_and_hub_settings():
+ """GET /api/settings must return system_paths, server host/port, token status, and hub settings."""
+ client = TestClient(app)
+ res = client.get("/api/settings")
+ assert res.status_code == 200
+ data = res.json()
+
+ # System paths dict
+ assert "system_paths" in data
+ sys_paths = data["system_paths"]
+ assert "hermes_home" in sys_paths
+ assert "config_dir" in sys_paths
+ assert "log_file" in sys_paths
+
+ # Server settings & tokens
+ assert "web_api_host" in data
+ assert "web_api_port" in data
+ assert "web_api_token_configured" in data
+
+ # Snapshot includes system_paths
+ res_snap = client.get("/api/snapshot")
+ assert res_snap.status_code == 200
+ snap = res_snap.json()
+ assert "system_paths" in snap
+ assert snap["system_paths"]["hermes_home"] == sys_paths["hermes_home"]
diff --git a/tests/test_api_providers_a32.py b/tests/test_api_providers_a32.py
index 119f56a..8774efb 100644
--- a/tests/test_api_providers_a32.py
+++ b/tests/test_api_providers_a32.py
@@ -86,7 +86,7 @@ def test_ollama_invoke_default_base_url():
assert resp["choices"][0]["message"]["content"] == "pong"
req_arg = mock_urlopen.call_args[0][0]
- assert req_arg.get_full_url() == f"{DEFAULT_OLLAMA_BASE_URL}/chat/completions"
+ assert req_arg.get_full_url() == f"{DEFAULT_OLLAMA_BASE_URL}/v1/chat/completions"
assert req_arg.get_method() == "POST"
assert "Authorization" not in req_arg.headers
diff --git a/uv.lock b/uv.lock
index ed1cae1..c07c7cf 100644
--- a/uv.lock
+++ b/uv.lock
@@ -297,7 +297,7 @@ wheels = [
[[package]]
name = "hermes-hub"
-version = "0.1.1"
+version = "0.1.2"
source = { editable = "." }
dependencies = [
{ name = "fastapi" },