@@ -475,9 +476,9 @@ function renderAccountCard(profile) {
`;
}
-function renderQuotaCell(bucket, unavailableReason, isLoading) {
+function renderQuotaCell(bucket, unavailableReason) {
const remaining = bucket.remaining_percent;
- let formattedValue = isLoading ? 'Загрузка…' : 'Н/Д';
+ let formattedValue = 'Н/Д';
let barWidth = 0;
let colorClass = 'var(--status-disabled)';
@@ -495,10 +496,6 @@ function renderQuotaCell(bucket, unavailableReason, isLoading) {
? `Сброс: ${formatIsoDate(bucket.reset_at)}`
: (bucket.period ? `Период: ${bucket.period}` : (unavailableReason || 'Период провайдера'));
- if (isLoading && typeof remaining !== 'number') {
- resetText = 'Опрашиваем провайдера…';
- }
-
return `
@@ -652,7 +649,7 @@ function renderProvidersView() {
}
// ═══════════════════════════════════════════════════════════════
-// 5. TEAM VIEW
+// 5. TEAM VIEW (P0-1 / P1-3 Model Choice on Agent Cards)
// ═══════════════════════════════════════════════════════════════
function renderTeamView() {
const container = document.getElementById('team-cards-container');
@@ -669,13 +666,18 @@ function renderTeamView() {
Профиль: ${escapeHtml(agent.assigned_profile_id || 'Не назначен')}
Провайдер: ${escapeHtml(agent.provider_display_name || agent.provider)}
-
Модель: ${escapeHtml(agent.model || '—')}
+
Модель: ${escapeHtml(agent.model || '—')}
-
+
● ${escapeHtml(agent.status_label_ru || 'Работает')}
-
+
+
+
+
`).join('') || '
Команда агентов пуста.
';
@@ -711,6 +713,38 @@ function openAccountDetailsModal(profileId) {
const quotaSnap = profile.quota_snapshot || (currentSnapshot.quotas || {})[profileId];
const buckets = (quotaSnap && quotaSnap.buckets) ? quotaSnap.buckets : [];
+ const provSummary = (currentSnapshot.providers || []).find(p => p.provider_id === profile.provider);
+ const discoveredModels = (provSummary && provSummary.discovered_models) ? provSummary.discovered_models : [];
+ const currentModel = (profile.preferred_models && profile.preferred_models.length) ? profile.preferred_models[0] : '';
+
+ let modelBlockHtml = '';
+ if (discoveredModels.length > 0) {
+ modelBlockHtml = `
+
+ Выбор модели по умолчанию
+
+
+
+
+
+
+ `;
+ } else {
+ modelBlockHtml = `
+
+ Выбор модели по умолчанию
+
+
+
+ ⚠ Список моделей ещё не получен от провайдера ${escapeHtml(profile.provider_display_name || profile.provider)}.
+
+
+
+ `;
+ }
+
elements.modalTitle.textContent = `Учетная запись: ${profile.display_name} (${profileId})`;
elements.modalBody.innerHTML = `
@@ -726,6 +760,8 @@ function openAccountDetailsModal(profileId) {
+ ${modelBlockHtml}
+
Квоты и корзины провайдера
@@ -757,6 +793,113 @@ function openAccountDetailsModal(profileId) {
showModal();
}
+async function handleSaveProfileModel(profileId) {
+ const sel = document.getElementById('modal-model-select');
+ if (!sel) return;
+ const model = sel.value;
+ const feedbackArea = document.getElementById('modal-feedback-area');
+ if (feedbackArea) {
+ feedbackArea.innerHTML = '
⏳ Сохранение модели...
';
+ }
+ const res = await executeAction('set_model', { profile_id: profileId, model: model });
+ if (feedbackArea) {
+ if (res.ok) {
+ feedbackArea.innerHTML = `
✓ ${escapeHtml(res.message || 'Модель сохранена')}
`;
+ if (currentSnapshot && currentSnapshot.all_profiles && currentSnapshot.all_profiles[profileId]) {
+ currentSnapshot.all_profiles[profileId].preferred_models = [model];
+ }
+ } else {
+ feedbackArea.innerHTML = `
❌ ${escapeHtml(res.message || 'Ошибка сохранения модели')}
`;
+ }
+ }
+}
+
+function openAgentModelModal(roleId, profileId) {
+ if (!currentSnapshot) return;
+ const profile = (currentSnapshot.all_profiles || {})[profileId];
+ if (!profile) return;
+
+ const provSummary = (currentSnapshot.providers || []).find(p => p.provider_id === profile.provider);
+ const discoveredModels = (provSummary && provSummary.discovered_models) ? provSummary.discovered_models : [];
+ const currentModel = (profile.preferred_models && profile.preferred_models.length) ? profile.preferred_models[0] : '';
+ const roleName = ((currentSnapshot.routing || {})[roleId]?.role_name_ru) || roleId;
+
+ elements.modalTitle.textContent = `Выбор модели для роли: ${roleName}`;
+ elements.modalBody.innerHTML = `
+
+
+ Профиль агента: ${escapeHtml(profile.display_name)} (${profileId}) • Провайдер: ${escapeHtml(profile.provider_display_name || profile.provider)}
+
+ ${discoveredModels.length > 0 ? `
+
+
+
+
+ ` : `
+
+
+ ⚠ Список моделей ещё не получен от провайдера ${escapeHtml(profile.provider_display_name || profile.provider)}.
+
+
+
+ `}
+ `;
+
+ elements.modalFooter.innerHTML = `
+
+ ${discoveredModels.length > 0 ? `
` : ''}
+ `;
+
+ showModal();
+}
+
+async function handleSaveRoleModel(roleId, profileId) {
+ const sel = document.getElementById('role-model-select');
+ if (!sel) return;
+ const model = sel.value;
+ const feedbackArea = document.getElementById('modal-feedback-area');
+ if (feedbackArea) {
+ feedbackArea.innerHTML = '
⏳ Сохранение модели...
';
+ }
+ const res = await executeAction('set_model', { profile_id: profileId, model: model, role_id: roleId });
+ if (feedbackArea) {
+ if (res.ok) {
+ feedbackArea.innerHTML = `
✓ ${escapeHtml(res.message || 'Модель сохранена')}
`;
+ if (currentSnapshot) {
+ if (currentSnapshot.all_profiles && currentSnapshot.all_profiles[profileId]) {
+ currentSnapshot.all_profiles[profileId].preferred_models = [model];
+ }
+ if (currentSnapshot.routing && currentSnapshot.routing[roleId]) {
+ currentSnapshot.routing[roleId].default_model = model;
+ }
+ if (currentSnapshot.agents) {
+ const ag = currentSnapshot.agents.find(a => a.role_id === roleId);
+ if (ag) ag.model = model;
+ }
+ }
+ setTimeout(() => {
+ closeModal();
+ renderCurrentView();
+ }, 700);
+ } else {
+ feedbackArea.innerHTML = `
❌ ${escapeHtml(res.message || 'Ошибка сохранения модели')}
`;
+ }
+ }
+}
+
+async function handleRefreshProviderModels(providerId, profileId = null) {
+ showToast(`Запрос списка моделей для ${providerId}...`, 'info');
+ const res = await executeAction('refresh_data', { provider: providerId });
+ if (res.ok) {
+ showToast('Запрос обновления моделей отправлен', 'success');
+ if (profileId) {
+ setTimeout(() => openAccountDetailsModal(profileId), 500);
+ }
+ }
+}
+
async function handleTestProfile(profileId) {
const feedbackArea = document.getElementById('modal-feedback-area');
if (feedbackArea) {
diff --git a/tests/test_model_choice_and_discovery.py b/tests/test_model_choice_and_discovery.py
new file mode 100644
index 0000000..60a0aff
--- /dev/null
+++ b/tests/test_model_choice_and_discovery.py
@@ -0,0 +1,138 @@
+"""
+Hermes Hub — Model Choice & Discovery Persistence Tests.
+Verifies P0-1 and P0-2 requirements of Task A18.
+"""
+
+from __future__ import annotations
+
+import json
+import time
+from pathlib import Path
+import pytest
+
+from antigravity_provider.router.action_handler import ActionExecutor, do_set_model
+from antigravity_provider.router.model_discovery_service import ModelDiscoveryService
+from antigravity_provider.router.router_config import load_router_config, save_router_config
+
+
+@pytest.fixture
+def temp_models_cache(tmp_path, monkeypatch):
+ """Provide isolated models_cache.json."""
+ cache_file = tmp_path / "models_cache.json"
+ cache_file.write_text(
+ json.dumps({
+ "antigravity": {
+ "models": [
+ "gemini-3.7-flash-high",
+ "gemini-3.5-flash-high",
+ "gemini-3.1-pro-high",
+ "claude-sonnet-4-6",
+ ],
+ "discovered_at": time.time(),
+ },
+ "opencode-go": {
+ "models": ["deepseek-r1", "deepseek-v4-pro", "qwen3.8-max"],
+ "discovered_at": time.time(),
+ },
+ }, ensure_ascii=False),
+ encoding="utf-8"
+ )
+ svc = ModelDiscoveryService(cache_path=cache_file)
+ monkeypatch.setattr(ModelDiscoveryService, "get", classmethod(lambda cls: svc))
+ return svc, cache_file
+
+
+def test_set_model_success_and_config_persistence(temp_models_cache):
+ """Verify setting valid discovered model succeeds and persists in router_config."""
+ svc, _ = temp_models_cache
+ config = load_router_config()
+ profile_id = "ag-w1"
+ assert profile_id in config.profiles
+
+ # Pick valid discovered model
+ target_model = "gemini-3.1-pro-high"
+ res = ActionExecutor.execute("set_model", {
+ "profile_id": profile_id,
+ "model": target_model,
+ "role_id": "coder-primary",
+ })
+
+ assert res["ok"] is True
+ assert "успешно" in res["message"]
+
+ # Verify persistence on disk
+ reloaded = load_router_config()
+ assert reloaded.profiles[profile_id].preferred_models[0] == target_model
+ assert reloaded.roles["coder-primary"].default_model == target_model
+
+
+def test_set_model_rejects_nonexistent_model(temp_models_cache):
+ """Verify nonexistent model is strictly rejected without modifying configuration."""
+ svc, _ = temp_models_cache
+ config = load_router_config()
+ profile_id = "ag-w1"
+ orig_models = list(config.profiles[profile_id].preferred_models)
+
+ # Attempt to set invalid/hallucinated model
+ res = ActionExecutor.execute("set_model", {
+ "profile_id": profile_id,
+ "model": "gemini-nonexistent-model-99",
+ })
+
+ assert res["ok"] is False
+ assert "отсутствует в списке" in res["message"] or "не поддерживается" in res["message"]
+
+ # Verify config was not corrupted
+ reloaded = load_router_config()
+ assert reloaded.profiles[profile_id].preferred_models == orig_models
+
+
+def test_models_cache_disk_persistence_and_reload(tmp_path):
+ """Verify models cache survives service recreation and disk reload."""
+ cache_file = tmp_path / "models_cache.json"
+ cache_file.write_text(
+ json.dumps({
+ "claude": {
+ "models": ["claude-3-7-sonnet", "claude-sonnet-4-6"],
+ "discovered_at": time.time(),
+ }
+ }, ensure_ascii=False),
+ encoding="utf-8"
+ )
+
+ svc1 = ModelDiscoveryService(cache_path=cache_file)
+ assert svc1.get_models("claude") == ["claude-3-7-sonnet", "claude-sonnet-4-6"]
+
+ # Simulate new process/service instance
+ svc2 = ModelDiscoveryService(cache_path=cache_file)
+ assert svc2.get_models("claude") == ["claude-3-7-sonnet", "claude-sonnet-4-6"]
+
+
+def test_models_discovery_timeout_retains_existing_cache(tmp_path, monkeypatch):
+ """Verify that timeout/probe failure does not erase previously cached models."""
+ cache_file = tmp_path / "models_cache.json"
+ cache_file.write_text(
+ json.dumps({
+ "grok": {
+ "models": ["grok-2-latest", "grok-beta"],
+ "discovered_at": time.time(),
+ }
+ }, ensure_ascii=False),
+ encoding="utf-8"
+ )
+
+ svc = ModelDiscoveryService(cache_path=cache_file)
+
+ # Mock _probe_provider to simulate a hang/timeout
+ def mock_hang_probe(provider):
+ time.sleep(2.0)
+ return ["invented-model"]
+
+ monkeypatch.setattr(svc, "_probe_provider", mock_hang_probe)
+
+ # Synchronous probe with 0.1s timeout
+ result = svc.discover_models_sync("grok", timeout=0.1)
+
+ # Result should retain existing cached models
+ assert result == ["grok-2-latest", "grok-beta"]
+ assert svc.get_models("grok") == ["grok-2-latest", "grok-beta"]