HERMES-GIELIE/api/config.py

2515 lines
111 KiB
Python
Raw Normal View History

"""
2026-03-31 07:02:47 +00:00
Hermes Web UI -- Shared configuration, constants, and global state.
Imported by all other api/* modules and by server.py.
Discovery order for all paths:
1. Explicit environment variable
2. Filesystem heuristics (sibling checkout, parent dir, common install locations)
3. Hardened defaults relative to $HOME
4. Fail loudly with a human-readable fix-it message if required modules are missing
"""
import collections
import copy
import json
security: bandit fixes B310/B324/B110 + QuietHTTPServer (#354) * security: fix bandit security issues (B310, B324) - Add usedforsecurity=False to MD5 hash in gateway_watcher.py - Add URL scheme validation to prevent file:// access in config.py - Add URL validation to bootstrap.py health check - Add nosec comments where runtime validation exists * fix: handle ConnectionResetError gracefully and add debug logging - Add QuietHTTPServer class to suppress noisy connection reset errors caused by clients disconnecting abruptly (fixes log spam from 'ConnectionResetError: [Errno 54] Connection reset by peer') - Replace silent 'pass' statements with logger.debug() calls across api/auth.py, api/config.py, api/gateway_watcher.py, api/models.py, and api/onboarding.py for better observability during troubleshooting - All tests pass (25 passed in test_regressions.py) * chore: add debug logging to profiles and routes modules - Replace silent 'pass' statements with logger.debug() calls in api/profiles.py for better error visibility during profile switching and module patching - Add logger initialization to api/routes.py * security: fix B110 bare except/pass issues (bandit security scan) - Replace bare except/pass patterns with logger.debug() calls - Fixes CWE-703 (improper check/handling of exceptional conditions) - Files affected: routes.py, state_sync.py, streaming.py, workspace.py, server.py - All tests pass successfully * security: bandit fixes B310/B324/B110 + QuietHTTPServer (#354) - api/gateway_watcher.py: MD5 usedforsecurity=False (B324) - api/config.py, bootstrap.py: URL scheme validation before urlopen (B310) - 12 files: replace bare except/pass with logger.debug() (B110) - server.py: QuietHTTPServer suppresses client disconnect log noise - server.py: fix sys.exc_info() (was traceback.sys.exc_info(), impl detail) - tests/test_sprint43.py: 19 new tests covering all security fixes - CHANGELOG.md: v0.50.14 entry; 841 tests total (up from 822) --------- Co-authored-by: lawrencel1ng <lawrence.ling@global.ntt> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com>
2026-04-13 18:11:56 +00:00
import logging
import os
import sys
import threading
import time
import traceback
import uuid
from pathlib import Path
from urllib.parse import parse_qs, urlparse
# ── Basic layout ──────────────────────────────────────────────────────────────
HOME = Path.home()
# REPO_ROOT is the directory that contains this file's parent (api/ -> repo root)
REPO_ROOT = Path(__file__).parent.parent.resolve()
# ── Network config (env-overridable) ─────────────────────────────────────────
HOST = os.getenv("HERMES_WEBUI_HOST", "127.0.0.1")
PORT = int(os.getenv("HERMES_WEBUI_PORT", "8787"))
# ── TLS/HTTPS config (optional, env-overridable) ────────────────────────────
TLS_CERT = os.getenv("HERMES_WEBUI_TLS_CERT", "").strip() or None
TLS_KEY = os.getenv("HERMES_WEBUI_TLS_KEY", "").strip() or None
TLS_ENABLED = TLS_CERT is not None and TLS_KEY is not None
# ── State directory (env-overridable, never inside repo) ──────────────────────
STATE_DIR = (
Path(os.getenv("HERMES_WEBUI_STATE_DIR", str(HOME / ".hermes" / "webui")))
.expanduser()
.resolve()
)
SESSION_DIR = STATE_DIR / "sessions"
WORKSPACES_FILE = STATE_DIR / "workspaces.json"
SESSION_INDEX_FILE = SESSION_DIR / "_index.json"
SETTINGS_FILE = STATE_DIR / "settings.json"
LAST_WORKSPACE_FILE = STATE_DIR / "last_workspace.txt"
PROJECTS_FILE = STATE_DIR / "projects.json"
security: bandit fixes B310/B324/B110 + QuietHTTPServer (#354) * security: fix bandit security issues (B310, B324) - Add usedforsecurity=False to MD5 hash in gateway_watcher.py - Add URL scheme validation to prevent file:// access in config.py - Add URL validation to bootstrap.py health check - Add nosec comments where runtime validation exists * fix: handle ConnectionResetError gracefully and add debug logging - Add QuietHTTPServer class to suppress noisy connection reset errors caused by clients disconnecting abruptly (fixes log spam from 'ConnectionResetError: [Errno 54] Connection reset by peer') - Replace silent 'pass' statements with logger.debug() calls across api/auth.py, api/config.py, api/gateway_watcher.py, api/models.py, and api/onboarding.py for better observability during troubleshooting - All tests pass (25 passed in test_regressions.py) * chore: add debug logging to profiles and routes modules - Replace silent 'pass' statements with logger.debug() calls in api/profiles.py for better error visibility during profile switching and module patching - Add logger initialization to api/routes.py * security: fix B110 bare except/pass issues (bandit security scan) - Replace bare except/pass patterns with logger.debug() calls - Fixes CWE-703 (improper check/handling of exceptional conditions) - Files affected: routes.py, state_sync.py, streaming.py, workspace.py, server.py - All tests pass successfully * security: bandit fixes B310/B324/B110 + QuietHTTPServer (#354) - api/gateway_watcher.py: MD5 usedforsecurity=False (B324) - api/config.py, bootstrap.py: URL scheme validation before urlopen (B310) - 12 files: replace bare except/pass with logger.debug() (B110) - server.py: QuietHTTPServer suppresses client disconnect log noise - server.py: fix sys.exc_info() (was traceback.sys.exc_info(), impl detail) - tests/test_sprint43.py: 19 new tests covering all security fixes - CHANGELOG.md: v0.50.14 entry; 841 tests total (up from 822) --------- Co-authored-by: lawrencel1ng <lawrence.ling@global.ntt> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com>
2026-04-13 18:11:56 +00:00
logger = logging.getLogger(__name__)
# ── Hermes agent directory discovery ─────────────────────────────────────────
def _discover_agent_dir() -> Path:
"""
Locate the hermes-agent checkout using a multi-strategy search.
Priority:
1. HERMES_WEBUI_AGENT_DIR env var -- explicit override always wins
2. HERMES_HOME / hermes-agent -- e.g. ~/.hermes/hermes-agent
3. Sibling of this repo -- ../hermes-agent
4. Parent of this repo -- ../../hermes-agent (nested layout)
5. Common install paths -- ~/.hermes/hermes-agent (again as fallback)
6. HOME / hermes-agent -- ~/hermes-agent (simple flat layout)
"""
candidates = []
# 1. Explicit env var
if os.getenv("HERMES_WEBUI_AGENT_DIR"):
candidates.append(
Path(os.getenv("HERMES_WEBUI_AGENT_DIR")).expanduser().resolve()
)
# 2. HERMES_HOME / hermes-agent
hermes_home = os.getenv("HERMES_HOME", str(HOME / ".hermes"))
candidates.append(Path(hermes_home).expanduser() / "hermes-agent")
# 3. Sibling: <repo-root>/../hermes-agent
candidates.append(REPO_ROOT.parent / "hermes-agent")
# 4. Parent is the agent repo itself (repo cloned inside hermes-agent/)
if (REPO_ROOT.parent / "run_agent.py").exists():
candidates.append(REPO_ROOT.parent)
# 5. ~/.hermes/hermes-agent (explicit common path)
candidates.append(HOME / ".hermes" / "hermes-agent")
# 6. ~/hermes-agent
candidates.append(HOME / "hermes-agent")
v0.50.210: gpt-5.5, cron titles, agent cache, bfcache fix, onboarding fix, mermaid CSP, PWA auth (#1056) * feat(models): add gpt-5.5 to openai, openai-codex, copilot catalogs Adds GPT-5.5 and GPT-5.5 Mini entries to the static _PROVIDER_MODELS catalog so they appear in the model picker for the openai, openai-codex, and copilot providers. Signed-off-by: Pix (PiClaw, claude-opus-4-7) via Hermes Agent * fix(models): add gpt-5.5-mini to copilot provider catalog * fix(renderer): suppress Mermaid Google Fonts CSP violation via fontFamily inherit (#1044) Mermaid's built-in 'dark' and 'default' themes inject an @import for fonts.googleapis.com/Manrope into every generated SVG. The CSP style-src only allows cdn.jsdelivr.net, so this request is blocked on every diagram render, filling the console with CSP errors. Fix: pass fontFamily:'inherit' (and fontSize:'14px') in the themeVariables block of mermaid.initialize() in renderMermaidBlocks(). This suppresses Mermaid's external font import and uses the page's existing font stack. Avoids adding fonts.googleapis.com to the CSP — no new external dependency, no font FOUT, consistent with the rest of the UI typography. 3 regression tests added in tests/test_1044_mermaid_csp_font.py. 2215/2215 tests passing. * fix(onboarding): non-standard provider/path cluster (#1029) * fix(bfcache): restore full layout on tab/session restore — rail, topbar, panels (#1045) The pageshow handler added for #822 only cleared the session search filter and re-rendered the session list. This left the rest of the layout chrome (topbar, rail icons, workspace panel, resize handles, gateway SSE) in the stale bfcache DOM state, causing a broken layout (oversized search icon, uninitialized rail) that required a hard refresh to fix. Fix: extend the pageshow handler to re-run the full set of layout sync calls that the boot IIFE runs on a fresh page load: syncTopbar() — restores model chip, title, topbar state syncWorkspacePanelState() — restores workspace panel open/closed _initResizePanels() — reattaches panel resize drag listeners startGatewaySSE() — reconnects the gateway SSE watcher (bfcache-persisted connections are dead) All four calls are typeof-guarded for safe degradation if a helper is not yet defined. The existing #822 fixes (sessionSearch clear + renderSessionListFromCache) are preserved unchanged. loadSession() is intentionally NOT re-called — it would cause message flicker; the sync calls above are sufficient to restore visual state. 7 regression tests added in tests/test_1045_bfcache_layout_restore.py. 2219/2219 tests passing. * fix(bfcache): also close open dropdowns on bfcache restore (#1045) Additional symptom noted in issue #1045: bfcache freezes the DOM including any open dropdown/popover state. The thinking-level selector (and other composer dropdowns) left open when navigating away would appear open without user interaction on tab restore. Extend the pageshow handler to call all four named close functions before the layout sync: closeModelDropdown() — composer model selector closeReasoningDropdown() — thinking/reasoning effort selector closeWsDropdown() — workspace chip dropdown closeProfileDropdown() — profile switcher dropdown All calls are typeof-guarded, matching the style of the layout sync calls already in the handler. 2 new tests (9 total in test_1045_bfcache_layout_restore.py): - pageshow closes all four named dropdowns - dropdown closes appear before layout sync calls (clean state first) 2221/2221 tests passing. * fix(bfcache): remove _initResizePanels() — bfcache preserves listeners * fix(bfcache): remove _initResizePanels from pageshow — bfcache preserves listeners; update test * fix(sessions): use cron job name as session title when available (#1032) * fix(test): add id column to messages table in cron title test fixture * fix(merge): inject cron title lookup into read_importable loop, remove stale sqlite3 block * fix(pwa): redirect to /login client-side on 401 — fixes iOS PWA auth expiry trap (#1038) When an auth session expires, the server returns a 302→/login for page requests. In a normal browser this works fine, but in an iOS PWA running in standalone mode the redirect navigates out of the PWA shell into Safari, leaving the app permanently stuck on 'Authentication required' with no recovery path. Fix: intercept 401 responses client-side before surfacing any error. - workspace.js api(): check res.status===401 first; call window.location.href='/login' and return immediately (no throw) - ui.js: add _redirectIfUnauth() helper; wire into all direct fetch() calls that bypass api() — api/models, api/models/live, api/upload All fetch paths that could receive a 401 now redirect cleanly within the PWA frame rather than opening Safari. 6 regression tests added in tests/test_1038_pwa_auth_redirect.py. 2175/2175 tests passing. * fix(pwa): preserve current URL in ?next= param on 401 redirect * fix(test): update 401-redirect assertion to accept ?next= URL format * feat(pwa): add _safeNextPath() to login.js so ?next= param is honored after re-login Addresses reviewer suggestion: the ?next= URL set on 401 redirect was ignored by the login success handler (always redirected to ./). _safeNextPath() validates and returns the ?next= param with open-redirect guards: rejects non-path-absolute inputs, // protocol-relative URLs, backslash variants, and control characters. 4 new regression tests added. * Implement session agent cache for AIAgent reuse Added session agent cache to reuse AIAgent across messages. * Implement agent caching for session management * Implement session agent eviction on session deletion Added session agent eviction to prevent turn count leakage in recycled sessions. * docs: v0.50.210 release notes — 7 PRs, 2239 tests (+27) * docs(changelog): drop stale [Unreleased] entries duplicated by v0.50.210 Three entries in the [Unreleased] section are duplicates of items now listed under v0.50.210: - Mermaid CSP font fix (#1044) → v0.50.210 / Mermaid Google Fonts CSP - bfcache layout restore (#1045) → v0.50.210 / bfcache layout and dropdown restore - iOS PWA auth redirect (#1038) → v0.50.210 / Login redirects back to original URL The original drafts landed in [Unreleased] when individual PRs (#1047, #1048, #1043) were approved; the v0.50.210 release-notes commit then added the same items under the version section without removing the [Unreleased] copies. Drop the duplicates so users reading the CHANGELOG don't see the same fix listed twice. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> --------- Signed-off-by: Pix (PiClaw, claude-opus-4-7) via Hermes Agent Co-authored-by: Pix (Hermes) <aliceisjustplaying@users.noreply.github.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: qxxaa <mrhanoi@outlook.com> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-25 22:47:44 +00:00
# 7. XDG_DATA_HOME / hermes-agent (e.g. ~/.local/share/hermes-agent)
xdg_data = Path(os.getenv("XDG_DATA_HOME", str(HOME / ".local" / "share")))
candidates.append(xdg_data.expanduser() / "hermes-agent")
# 8. System-wide install paths (e.g. /opt/hermes-agent, /usr/local/hermes-agent)
for sys_prefix in ("/opt", "/usr/local", "/usr/local/share"):
candidates.append(Path(sys_prefix) / "hermes-agent")
for path in candidates:
if path.exists() and (path / "run_agent.py").exists():
return path.resolve()
return None
def _discover_python(agent_dir: Path) -> str:
"""
Locate a Python executable that has the Hermes agent dependencies installed.
Priority:
1. HERMES_WEBUI_PYTHON env var
2. Agent venv at <agent_dir>/venv/bin/python
3. Local .venv inside this repo
4. System python3
"""
if os.getenv("HERMES_WEBUI_PYTHON"):
return os.getenv("HERMES_WEBUI_PYTHON")
if agent_dir:
venv_py = agent_dir / "venv" / "bin" / "python"
if venv_py.exists():
return str(venv_py)
venv_py = agent_dir / ".venv" / "bin" / "python"
if venv_py.exists():
return str(venv_py)
# Windows layout
venv_py_win = agent_dir / "venv" / "Scripts" / "python.exe"
if venv_py_win.exists():
return str(venv_py_win)
venv_py_win = agent_dir / ".venv" / "Scripts" / "python.exe"
if venv_py_win.exists():
return str(venv_py_win)
# Local .venv inside this repo
local_venv = REPO_ROOT / ".venv" / "bin" / "python"
if local_venv.exists():
return str(local_venv)
# Fall back to system python3
import shutil
for name in ("python3", "python"):
found = shutil.which(name)
if found:
return found
return "python3"
# Run discovery
_AGENT_DIR = _discover_agent_dir()
PYTHON_EXE = _discover_python(_AGENT_DIR)
# ── Inject agent dir into sys.path so Hermes modules are importable ──────────
# When users (or CI builds) run `pip install --target .` or
# `pip install -t .` inside the hermes-agent checkout, third-party
# package directories (openai/, pydantic/, requests/, etc.) end up
# alongside real Hermes source files. Putting _AGENT_DIR at the
# FRONT of sys.path means Python resolves `import pydantic` from that
# local directory — which breaks whenever the host platform differs
# from the container (e.g. macOS .so files inside a Linux image).
#
# Fix: insert _AGENT_DIR at the END of sys.path. Python searches
# entries in order, so site-packages resolves pip packages correctly,
# and Hermes-specific modules (run_agent, hermes/, etc.) still
# resolve because they do not exist in site-packages.
if _AGENT_DIR is not None:
if str(_AGENT_DIR) not in sys.path:
sys.path.append(str(_AGENT_DIR))
_HERMES_FOUND = True
else:
_HERMES_FOUND = False
# ── Config file (reloadable -- supports profile switching) ──────────────────
_cfg_cache = {}
_cfg_lock = threading.Lock()
_cfg_mtime: float = 0.0 # last known mtime of config.yaml; 0 = never loaded
def _get_config_path() -> Path:
"""Return config.yaml path for the active profile."""
env_override = os.getenv("HERMES_CONFIG_PATH")
if env_override:
return Path(env_override).expanduser()
try:
from api.profiles import get_active_hermes_home
return get_active_hermes_home() / "config.yaml"
except ImportError:
return HOME / ".hermes" / "config.yaml"
def get_config() -> dict:
"""Return the cached config dict, loading from disk if needed."""
if not _cfg_cache:
reload_config()
return _cfg_cache
def reload_config() -> None:
"""Reload config.yaml from the active profile's directory."""
global _cfg_mtime
with _cfg_lock:
_cfg_cache.clear()
config_path = _get_config_path()
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
# Remember the old mtime so we can tell whether config actually changed
# vs. first-ever load (mtime == 0.0, e.g. server start or profile switch).
_old_cfg_mtime = _cfg_mtime
try:
import yaml as _yaml
if config_path.exists():
loaded = _yaml.safe_load(config_path.read_text(encoding="utf-8"))
if isinstance(loaded, dict):
_cfg_cache.update(loaded)
try:
_cfg_mtime = Path(config_path).stat().st_mtime
except OSError:
_cfg_mtime = 0.0
except Exception:
security: bandit fixes B310/B324/B110 + QuietHTTPServer (#354) * security: fix bandit security issues (B310, B324) - Add usedforsecurity=False to MD5 hash in gateway_watcher.py - Add URL scheme validation to prevent file:// access in config.py - Add URL validation to bootstrap.py health check - Add nosec comments where runtime validation exists * fix: handle ConnectionResetError gracefully and add debug logging - Add QuietHTTPServer class to suppress noisy connection reset errors caused by clients disconnecting abruptly (fixes log spam from 'ConnectionResetError: [Errno 54] Connection reset by peer') - Replace silent 'pass' statements with logger.debug() calls across api/auth.py, api/config.py, api/gateway_watcher.py, api/models.py, and api/onboarding.py for better observability during troubleshooting - All tests pass (25 passed in test_regressions.py) * chore: add debug logging to profiles and routes modules - Replace silent 'pass' statements with logger.debug() calls in api/profiles.py for better error visibility during profile switching and module patching - Add logger initialization to api/routes.py * security: fix B110 bare except/pass issues (bandit security scan) - Replace bare except/pass patterns with logger.debug() calls - Fixes CWE-703 (improper check/handling of exceptional conditions) - Files affected: routes.py, state_sync.py, streaming.py, workspace.py, server.py - All tests pass successfully * security: bandit fixes B310/B324/B110 + QuietHTTPServer (#354) - api/gateway_watcher.py: MD5 usedforsecurity=False (B324) - api/config.py, bootstrap.py: URL scheme validation before urlopen (B310) - 12 files: replace bare except/pass with logger.debug() (B110) - server.py: QuietHTTPServer suppresses client disconnect log noise - server.py: fix sys.exc_info() (was traceback.sys.exc_info(), impl detail) - tests/test_sprint43.py: 19 new tests covering all security fixes - CHANGELOG.md: v0.50.14 entry; 841 tests total (up from 822) --------- Co-authored-by: lawrencel1ng <lawrence.ling@global.ntt> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com>
2026-04-13 18:11:56 +00:00
logger.debug("Failed to load yaml config from %s", config_path)
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
# Bust the models cache so the next request sees fresh config values.
# Only delete the disk cache when config has actually changed -- not on
# first-ever load (when _old_cfg_mtime == 0.0, i.e. server start or
# profile switch) -- preserving the disk cache so the next restart
# still hits the fast path without a cold run.
if _old_cfg_mtime != 0.0:
_delete_models_cache_on_disk()
def _load_yaml_config_file(config_path: Path) -> dict:
try:
import yaml as _yaml
except ImportError:
return {}
if not config_path.exists():
return {}
try:
loaded = _yaml.safe_load(config_path.read_text(encoding="utf-8"))
return loaded if isinstance(loaded, dict) else {}
except Exception:
logger.debug("Failed to parse yaml config from %s", config_path)
return {}
def _save_yaml_config_file(config_path: Path, config_data: dict) -> None:
try:
import yaml as _yaml
except ImportError as exc:
raise RuntimeError("PyYAML is required to write Hermes config.yaml") from exc
config_path.parent.mkdir(parents=True, exist_ok=True)
config_path.write_text(
_yaml.safe_dump(config_data, sort_keys=False, allow_unicode=True),
encoding="utf-8",
)
# Initial load
reload_config()
cfg = _cfg_cache # alias for backward compat with existing references
# ── Default workspace discovery ───────────────────────────────────────────────
def _workspace_candidates(raw: str | Path | None = None) -> list[Path]:
"""Return ordered candidate workspace paths, de-duplicated."""
candidates: list[Path] = []
def add(candidate: str | Path | None) -> None:
if candidate in (None, ""):
return
try:
path = Path(candidate).expanduser().resolve()
except Exception:
return
if path not in candidates:
candidates.append(path)
add(raw)
if os.getenv("HERMES_WEBUI_DEFAULT_WORKSPACE"):
add(os.getenv("HERMES_WEBUI_DEFAULT_WORKSPACE"))
home_workspace = HOME / "workspace"
home_work = HOME / "work"
if home_workspace.exists():
add(home_workspace)
if home_work.exists():
add(home_work)
add(home_workspace)
add(STATE_DIR / "workspace")
return candidates
def _ensure_workspace_dir(path: Path) -> bool:
"""Best-effort check that a workspace directory exists and is writable."""
try:
path = path.expanduser().resolve()
path.mkdir(parents=True, exist_ok=True)
return path.is_dir() and os.access(path, os.R_OK | os.W_OK | os.X_OK)
except Exception:
return False
def resolve_default_workspace(raw: str | Path | None = None) -> Path:
"""Return the first usable workspace path, creating it when possible."""
for candidate in _workspace_candidates(raw):
if _ensure_workspace_dir(candidate):
return candidate
raise RuntimeError(
"Could not create or access any usable workspace directory. "
"Set HERMES_WEBUI_DEFAULT_WORKSPACE to a writable path."
)
def _discover_default_workspace() -> Path:
"""
Resolve the default workspace in order:
1. HERMES_WEBUI_DEFAULT_WORKSPACE env var
2. ~/workspace if it already exists
3. ~/work if it already exists
4. ~/workspace (create if needed)
5. STATE_DIR / workspace
"""
return resolve_default_workspace()
DEFAULT_WORKSPACE = _discover_default_workspace()
DEFAULT_MODEL = os.getenv("HERMES_WEBUI_DEFAULT_MODEL", "") # Empty = use provider default; avoids showing unavailable OpenAI model to non-OpenAI users (#646)
# ── Startup diagnostics ───────────────────────────────────────────────────────
def print_startup_config() -> None:
"""Print detected configuration at startup so the user can verify what was found."""
ok = "\033[32m[ok]\033[0m"
warn = "\033[33m[!!]\033[0m"
err = "\033[31m[XX]\033[0m"
lines = [
"",
" Hermes Web UI -- startup config",
" --------------------------------",
f" repo root : {REPO_ROOT}",
f" agent dir : {_AGENT_DIR if _AGENT_DIR else 'NOT FOUND'} {ok if _AGENT_DIR else err}",
f" python : {PYTHON_EXE}",
f" state dir : {STATE_DIR}",
f" workspace : {DEFAULT_WORKSPACE}",
f" host:port : {HOST}:{PORT}",
f" config file : {_get_config_path()} {'(found)' if _get_config_path().exists() else '(not found, using defaults)'}",
"",
]
print("\n".join(lines), flush=True)
if not _HERMES_FOUND:
print(
f"{err} Could not find the Hermes agent directory.\n"
" The server will start but agent features will not work.\n"
"\n"
" To fix, set one of:\n"
" export HERMES_WEBUI_AGENT_DIR=/path/to/hermes-agent\n"
" export HERMES_HOME=/path/to/.hermes\n"
"\n"
" Or clone hermes-agent as a sibling of this repo:\n"
" git clone <hermes-agent-repo> ../hermes-agent\n",
flush=True,
)
def verify_hermes_imports() -> tuple:
"""
Attempt to import the key Hermes modules.
Returns (ok: bool, missing: list[str], errors: dict[str, str]).
"""
required = ["run_agent"]
missing = []
errors = {}
for mod in required:
try:
__import__(mod)
except Exception as e:
missing.append(mod)
# Capture the full error message so startup logs show WHY
# (e.g. pydantic_core .so mismatch) instead of just the name.
errors[mod] = f"{type(e).__name__}: {e}"
return (len(missing) == 0), missing, errors
# ── Limits ───────────────────────────────────────────────────────────────────
MAX_FILE_BYTES = 200_000
MAX_UPLOAD_BYTES = 20 * 1024 * 1024
# ── File type maps ───────────────────────────────────────────────────────────
IMAGE_EXTS = {".png", ".jpg", ".jpeg", ".gif", ".svg", ".webp", ".ico", ".bmp"}
MD_EXTS = {".md", ".markdown", ".mdown"}
CODE_EXTS = {
".py",
".js",
".ts",
".jsx",
".tsx",
".css",
".html",
".json",
".yaml",
".yml",
".toml",
".sh",
".bash",
".txt",
".log",
".env",
".csv",
".xml",
".sql",
".rs",
".go",
".java",
".c",
".cpp",
".h",
}
MIME_MAP = {
".png": "image/png",
".jpg": "image/jpeg",
".jpeg": "image/jpeg",
".gif": "image/gif",
".svg": "image/svg+xml",
".webp": "image/webp",
".ico": "image/x-icon",
".bmp": "image/bmp",
".pdf": "application/pdf",
".json": "application/json",
v0.50.216: compression chains, renderer fixes, HTML preview, approval z-index, /steer fix, reasoning chip (#1075) * fix(workspace): add .html/.htm to MIME_MAP so HTML preview renders correctly MIME_MAP was missing entries for .html and .htm. The server fell back to Content-Type: application/octet-stream, which browsers refuse to render as HTML in an iframe — causing a blank white preview. The rest of the pipeline was already correct: the iframe exists in static/index.html, openFile() in static/workspace.js routes .html to showPreview('html'), and _handle_file_raw() in api/routes.py sets the correct CSP sandbox header when ?inline=1 is present. The only missing piece was the MIME type. * test(workspace): lock in MIME_MAP entry for .html/.htm PR #1070 added .html/.htm → text/html to MIME_MAP in api/config.py to fix the blank workspace HTML preview iframe. Without a direct assertion on the MIME_MAP entries, the fix could silently regress (the existing test_779_html_preview.py tests cover the iframe wiring, the inline=1 query handling, and the CSP sandbox header — but none of them touch MIME_MAP itself). Add a single regression test that asserts MIME_MAP['.html'] and MIME_MAP['.htm'] are both 'text/html' so any future removal of those entries fails CI immediately. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(composer): raise .approval-card.visible z-index above .queue-card .queue-card has z-index:2. .approval-card.visible had no z-index, so the queue flyout would render on top of the approval card when both were visible simultaneously — obscuring the Allow/Deny buttons. Fix: add z-index:3 to .approval-card.visible so approvals always render above the queue flyout. Approval is a blocking, security-relevant interaction and must never be obscured by passive UI elements. * test(composer): pin approval-card z-index > queue-card invariant PR #1071 raises .approval-card.visible to z-index:3 so the security- relevant Allow / Deny buttons stay clickable when the queue flyout is also open. Without a regression test, a future CSS edit could silently drop the z-index back below queue-card (z-index:2) and reintroduce the bug — there is no automated UI test covering this stacking interaction. Add a focused regex check that pins the invariant: .approval-card.visible z-index must be strictly greater than .queue-card z-index. Modeled on the existing CSS-regex regression style in tests/test_mobile_layout.py (test_profile_dropdown_not_clipped_by_overflow). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: intercept /steer /interrupt /queue before busy-mode routing in send() Root cause: slash commands entered while the agent is busy never reached the command dispatcher. send() enters the busy block and returns early at line ~50, so the slash-command intercept (~line 56) is never reached. The text was queued as a plain message. When it drained after the turn ended, cmdSteer / cmdInterrupt ran on an idle session, saw no active stream, and showed "No active task to stop." Fix: at the top of the busy block, before checking busyMode, check if the text starts with / and is one of the three control commands. If so, dispatch the handler immediately and return. This lets the user type /steer, /interrupt, or /queue at any time — including while the agent is mid-stream — and have them execute against the live session. Two new regression tests added: - test_slash_commands_intercepted_before_busymode_routing: verifies the intercept appears before the busyMode routing in the busy block - test_steer_intercept_calls_handler_directly: verifies the intercept calls _bc.fn(_pc.args) and returns, not queues * test(busy-intercept): pin sync input-clear before await in slash intercept PR #1072's intercept clears the msg input before awaiting the handler. Order matters: if the await happens first (or if the clear is moved inside the handler), the input still shows '/steer foo' for the duration of the await. A reflexive second Enter press during that window — common while waiting for the toast — re-runs send(): either re-fires the handler (double-steer) or, if the turn just ended, falls through to the non-busy slash dispatcher and drops a confusing "No active task to stop." Add test_steer_intercept_clears_input_before_await pinning the order so this UX invariant cannot silently regress. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: update steer i18n and settings copy — steer no longer interrupts With the real /steer implementation (agent.steer() via /api/chat/steer), steer injects a correction mid-turn WITHOUT interrupting the current stream. The previous copy said "falls back to interrupt", "Steer (interrupt + send)", etc. — accurate only for the old placeholder, not the real implementation. Changes across all 6 locales (en/ru/es/de/zh/zh-Hant): cmd_steer: "falls back to interrupt" removed settings_busy_input_mode_steer: "interrupt + send" → "mid-turn correction" cmd_steer_fallback: "interrupted" → "queued for next turn" busy_steer_fallback: "interrupted instead" → "queued for next turn" settings_desc_busy_input_mode: "currently falls back to interrupt" removed Also: static/index.html: inline fallback text updated to match static/commands.js: internal comment clarified (fallback = queue+cancel, not "interrupt mode" which implies the primary action) * fix(renderer): group consecutive blockquote lines into single element Root cause: the old rule `s.replace(/^> (.+)$/gm, ...)` had three bugs: 1. `.+` required at least one character — bare `>` lines (blank continuation lines) did not match and passed through as literal `>` 2. Each matching line became its own `<blockquote>` element — a 10-line blockquote produced 10 stacked `<blockquote>` tags with no grouping 3. When a fenced code block sat inside a blockquote, the fence-stash pass consumed the code content and left orphaned `>` lines that the old `.+` pattern could not match Fix: replace the single-line regex with a group-based approach that matches one or more consecutive `>` lines as a single block, strips the `>` prefix from each line, passes each non-empty line through inlineMd(), turns blank `>` lines into `<br>`, and wraps the entire group in one `<blockquote>`. 14 regression tests added covering: - Single-line blockquotes (regression) - Multi-line grouping (2 and 10 lines) - Two separate blockquotes staying separate - Bare `>` and `>text` (no space) edge cases - Blank continuation lines → <br> - Bold / italic / inline-code inside blockquotes - Blockquote followed by normal paragraph * fix(renderer): drop empty trailing line from blockquote match The new group-based blockquote rule introduced in this PR captures the trailing newline in its (?:\n|$) clause. After block.split('\n') that trailing newline produces an empty final element. The original filter only dropped lone bare '>' artifacts on the last line, so the empty final element survived, and the .map(blank → '<br>') step turned it into a phantom <br> immediately before </blockquote>. Visible symptom: any blockquote whose source ends with \n (the common case — a quote followed by another paragraph or end-of-message) renders with an extra blank line at the bottom of the quote. Reproducer: '> Hello\n\nThe rest of the message.' → '<blockquote>Hello\n<br></blockquote>\nThe rest of the message.' ^^^ phantom <br> Fix: replace the single-line filter with a while-loop that pops trailing lines while they are either empty OR a bare '>'. This matches the intent the Python test mirror in tests/test_blockquote_rendering.py already had (the mirror was correct; the JS was not — that's why the original tests passed despite the bug). Also add four new regression tests in TestNoPhantomTrailingBr that pin the no-trailing-<br> invariant for the common shapes: - input ending with \n - quote followed by paragraph (the real-world case) - multi-line quote ending with \n - quote with blank continuation + trailing \n (internal <br> stays, trailing <br> does not) Verified end-to-end with node against the actual JS regex. 244 renderer-adjacent tests pass. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(renderer): comprehensive markdown fixes — strikethrough, task lists, CRLF, nested blockquotes Five additional fixes on top of the blockquote grouping from the initial commit: 1. CRLF normalisation: strip \r\n → \n at start of renderMd so Windows line endings do not produce stray \r characters in rendered output 2. Strikethrough: ~~text~~ → <del>text</del> in both inlineMd() (for use inside blockquotes/lists) and the outer pass (for plain paragraphs). Added <del> to SAFE_TAGS and SAFE_INLINE so it is not HTML-escaped. 3. Task lists: - [x] / - [ ] items in unordered lists render as ✅/☐ via task-done/task-todo span wrappers. Checks [X] (uppercase) too. 4. Nested blockquotes: >> / >>> etc. now recurse so each level gets its own <blockquote> element rather than passing through as literal >. Implemented by extracting the blockquote rule into _applyBlockquotes() which calls itself recursively on the stripped inner content. 5. Lists inside blockquotes: > - item now renders <ul><li> inside the blockquote instead of a literal "- item" string. Task list items work inside blockquotes too (> - [x] done → ✅ inside <blockquote><ul>). Also fixed test_issue342.py search window (5000→10000 chars) — the CRLF strip at the top of renderMd pushed the autolink regex past the old limit. 68 new tests in test_renderer_comprehensive.py + test_blockquote_rendering.py covering all constructs, edge cases, and combinations. * fix(renderer): restore space in blockquote prefix-strip regex Commit 04e7b53 changed the blockquote prefix-strip regex from /^>[ \t]?/ (consume "> ", "\t>", or just ">") to /^>[\t]?/ (only consume "\t>" or just ">") The space character was dropped from the character class. Since practically every blockquote an LLM produces is "> " (greater-than followed by a space), this leaves a leading space artifact on every stripped blockquote line. Worse, the leading space breaks the list-detection regex `^(?: )?[-*+] ` inside the new `_applyBlockquotes` helper — that regex requires either zero or two leading spaces, never one — so the new "list inside blockquote" feature never fired for the canonical input shape `> - item`. Reproducer (against the actual ui.js via node, before the fix): > Hello world → <blockquote> Hello world</blockquote> ^ phantom leading space > Steps: → <blockquote>Steps: > - one - one > - two - two</blockquote> ^ literal text, NOT a <ul>; lists-in-quote feature broken > - [x] done → blockquote with literal "[x] done", no checkbox span Tests passed despite the bug because tests/test_blockquote_rendering.py and tests/test_renderer_comprehensive.py validate against a Python mirror (`_apply_blockquotes`) whose strip regex is `^>[ \t]?` — i.e. the mirror is correct, the JS is not, and the static-mirror tests can't catch the divergence. Same shape of bug as commit 94d63d0 (phantom <br> in trailing line) where the mirror was right and the JS was wrong. Fix: restore the space character in the strip regex's character class. Add tests/test_renderer_js_behaviour.py — 11 tests that drive the ACTUAL renderMd via node and assert on rendered output for the most common LLM shapes (single-line quote, multi-line quote, list inside quote, task list inside quote, nested >>>, strikethrough inside and outside quote, top-level task list, quote followed by heading, multi-paragraph quote with list, CRLF normalisation). Verified: the buggy regex makes 6 of those 11 tests fail; the corrected regex makes all 11 pass. Suite: 2354 passed, 0 new failures. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * Collapse agent session compression chains * Restore upstream changelog entries * fix(agent_sessions): bubble active compression chains to top by tip last_activity The original PR merge kept the chain head's id/title/started_at and overrode id/model/message_count/ended_at/end_reason from the tip — but did NOT override last_activity. Since the projected list is sorted by last_activity DESC and the WebUI sidebar surfaces updated_at = last_activity, an actively-used compression chain whose tip is being edited NOW would sort by the ROOT's old last_activity and fall below recently touched standalone sessions. Reproducer (with the harness against actual code, before the fix): - root: started 30 days ago, last msg 30 days ago - tip: started 28 days ago (parent_session_id=root), last msg 5 seconds ago - standalone: last msg 2 days ago Sidebar order with original PR: [0] standalone (48h ago) [1] active_tip (last_activity=root's 720h ago) ← wrong Sidebar order after fix: [0] active_tip (last_activity=tip's 0h ago) ← correct [1] standalone (48h ago) This matches Hermes Agent's own list_sessions_rich projection at hermes_state.py:903-909, which overrides "last_active" from the tip exactly so that the agent CLI's session list orders the same way. Add ``last_activity`` to the merge-from-tip key list, update the existing test_compression_chain_collapses_to_latest_tip_in_sidebar assertion to expect tip-derived updated_at, and add test_compression_chain_bubbles_to_top_by_tip_activity locking in the bubble-to-top invariant — without this regression test the previous behaviour passed CI because no test exercised the sort order against a mixed set of chains and standalone sessions. The chain head's started_at (created_at) and title remain preserved, so users can still find the conversation by its original date and name. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * docs: v0.50.216 release notes and version bump Compression chains, renderer fixes, HTML preview, approval z-index, /steer fix. * chore: gitignore local-only review harness directory Adds .local-review/ to .gitignore so renderer drivers, sample inputs, fixture builders, and other reviewer scratch files do not accidentally get committed. Nothing under that path is ever shared in the repo; keeping the entry tracked makes the boundary explicit for any future contributor who creates the directory locally. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * Keep reasoning chip visible for None effort * test(reasoning): pin chip render output via node, not just source regex The PR's static checks in test_reasoning_chip_btw_fixes.py validate the shape of _applyReasoningChip (no display='none' literal, the right classList.toggle call exists, the right label literals are in the function body) but pass even if the runtime detail is wrong — for example if `inactive` were inverted, _normalizeReasoningEffort mishandled whitespace, or _formatReasoningEffortLabel returned the wrong literal for an unknown input. Add tests/test_reasoning_chip_js_behaviour.py — 11 tests that drive the actual _applyReasoningChip() via node and assert on the rendered DOM state for each effort value: TestChipAlwaysVisible - empty / null -> "Default" label, inactive=true - "none" -> "None" label, inactive=true - "low"/"high" -> verbatim label, inactive=false TestNormalizationEdgeCases - "NONE" -> normalises to "None" - " none " -> trims and normalises - unknown junk -> falls through visible, never hidden TestTitleAttributeAccessibility - title attribute carries the human-readable label for tooltip / screen-reader use Sanity-checked against master's pre-fix ui.js: 11/11 fail (bug caught). Against this PR's ui.js: 11/11 pass. This pattern (drive the actual JS via node) caught two regex-only regressions in PR #1073 where the Python mirror was correct while the JS was broken. Same protection added here so the chip-visibility contract can't silently break in a future refactor. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * docs: add #1074 to v0.50.216 changelog, bump test count to 2428 * fix(i18n): restore broken Unicode in Russian and Spanish steer strings Commit 56c7a14 (fix: update steer i18n and settings copy) accidentally stripped the `\u` prefix from Unicode escape sequences in two locales, producing garbled literal hex strings visible to users: Spanish (es): - cmd_steer: correcci00f3n → corrección - cmd_steer_fallback: 2014 en cola → — en cola - busy_steer_fallback: 2014 en cola → — en cola - settings_desc_busy_input_mode: qu00e9, est00e1, correcci00f3n → qué, está, corrección - settings_busy_input_mode_steer: correcci00f3n → corrección Russian (ru): - settings_desc_busy_input_mode: the entire Cyrillic string was replaced with raw 4-hex-char code-points without the \u prefix (041e043f... instead of actual Cyrillic). Decoded: "Определяет поведение при отправке сообщения во время работы агента. Очередь ждёт; Прерывание отменяет и начинает заново; Steer внедряет коррекцию без прерывания." Fix: write the correct characters directly (UTF-8 is the file encoding so embedding them literally is cleaner than \u escapes for long text). All other locales (en, de, zh, zh-Hant) were not affected — confirmed by grepping for bare hex run-ons in the updated file. Verified: node --check static/i18n.js passes; full pytest suite green (2365 passed, 47 skipped). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * docs: remove duplicate compression chain entry from [Unreleased] --------- Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: Frank Song <franksong2702@gmail.com>
2026-04-26 04:06:31 +00:00
".html": "text/html",
".htm": "text/html",
".xls": "application/vnd.ms-excel",
".xlsx": "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
".doc": "application/msword",
".docx": "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
".mp3": "audio/mpeg",
".wav": "audio/wav",
".m4a": "audio/mp4",
".aac": "audio/aac",
".ogg": "audio/ogg",
".oga": "audio/ogg",
".opus": "audio/opus",
".flac": "audio/flac",
".mp4": "video/mp4",
".mov": "video/quicktime",
".m4v": "video/mp4",
".webm": "video/webm",
".ogv": "video/ogg",
}
# ── Toolsets (from config.yaml or hardcoded default) ─────────────────────────
_DEFAULT_TOOLSETS = [
"browser",
"clarify",
"code_execution",
"cronjob",
"delegation",
"file",
"image_gen",
"memory",
"session_search",
"skills",
"terminal",
"todo",
"web",
"webhook",
]
def _resolve_cli_toolsets(cfg=None):
"""Resolve CLI toolsets using the agent's _get_platform_tools() so that
MCP server toolsets are automatically included, matching CLI behaviour."""
if cfg is None:
cfg = get_config()
try:
from hermes_cli.tools_config import _get_platform_tools
return list(_get_platform_tools(cfg, "cli"))
except Exception:
# Fallback: read raw list from config (MCP toolsets will be missing)
return cfg.get("platform_toolsets", {}).get("cli", _DEFAULT_TOOLSETS)
CLI_TOOLSETS = _resolve_cli_toolsets()
2026-03-31 07:02:47 +00:00
# ── Model / provider discovery ───────────────────────────────────────────────
# Hardcoded fallback models (used when no config.yaml or agent is available)
# Also used as the OpenRouter model list — keep this curated to current, widely-used models.
2026-03-31 07:02:47 +00:00
_FALLBACK_MODELS = [
# OpenAI
{"provider": "OpenAI", "id": "openai/gpt-5.4-mini", "label": "GPT-5.4 Mini"},
{"provider": "OpenAI", "id": "openai/gpt-5.4", "label": "GPT-5.4"},
# Anthropic — 4.6 flagship + 4.5 generation
{"provider": "Anthropic", "id": "anthropic/claude-opus-4.7", "label": "Claude Opus 4.7"},
{"provider": "Anthropic", "id": "anthropic/claude-opus-4.6", "label": "Claude Opus 4.6"},
{"provider": "Anthropic", "id": "anthropic/claude-sonnet-4.6", "label": "Claude Sonnet 4.6"},
{"provider": "Anthropic", "id": "anthropic/claude-sonnet-4-5", "label": "Claude Sonnet 4.5"},
{"provider": "Anthropic", "id": "anthropic/claude-haiku-4-5", "label": "Claude Haiku 4.5"},
# Google — 3.x (latest preview) + 2.5 (stable GA)
{"provider": "Google", "id": "google/gemini-3.1-pro-preview", "label": "Gemini 3.1 Pro Preview"},
{"provider": "Google", "id": "google/gemini-3-flash-preview", "label": "Gemini 3 Flash Preview"},
{"provider": "Google", "id": "google/gemini-3.1-flash-lite-preview", "label": "Gemini 3.1 Flash Lite Preview"},
{"provider": "Google", "id": "google/gemini-2.5-pro", "label": "Gemini 2.5 Pro"},
{"provider": "Google", "id": "google/gemini-2.5-flash", "label": "Gemini 2.5 Flash"},
# DeepSeek
{"provider": "DeepSeek", "id": "deepseek/deepseek-v4-flash", "label": "DeepSeek V4 Flash"},
{"provider": "DeepSeek", "id": "deepseek/deepseek-v4-pro", "label": "DeepSeek V4 Pro"},
{"provider": "DeepSeek", "id": "deepseek/deepseek-chat-v3-0324", "label": "DeepSeek V3 (legacy)"},
{"provider": "DeepSeek", "id": "deepseek/deepseek-r1", "label": "DeepSeek R1 (legacy)"},
# Qwen (Alibaba) — strong coding and general models
{"provider": "Qwen", "id": "qwen/qwen3-coder", "label": "Qwen3 Coder"},
{"provider": "Qwen", "id": "qwen/qwen3.6-plus", "label": "Qwen3.6 Plus"},
# xAI
{"provider": "xAI", "id": "x-ai/grok-4.20", "label": "Grok 4.20"},
# Mistral
{"provider": "Mistral", "id": "mistralai/mistral-large-latest", "label": "Mistral Large"},
# MiniMax
{"provider": "MiniMax", "id": "minimax/MiniMax-M2.7", "label": "MiniMax M2.7"},
{"provider": "MiniMax", "id": "minimax/MiniMax-M2.7-highspeed", "label": "MiniMax M2.7 Highspeed"},
# Z.AI / GLM
{"provider": "Z.AI", "id": "zai/glm-5.1", "label": "GLM-5.1"},
{"provider": "Z.AI", "id": "zai/glm-5", "label": "GLM-5"},
{"provider": "Z.AI", "id": "zai/glm-5-turbo", "label": "GLM-5 Turbo"},
{"provider": "Z.AI", "id": "zai/glm-4.7", "label": "GLM-4.7"},
{"provider": "Z.AI", "id": "zai/glm-4.5", "label": "GLM-4.5"},
{"provider": "Z.AI", "id": "zai/glm-4.5-flash", "label": "GLM-4.5 Flash"},
2026-03-31 07:02:47 +00:00
]
# Provider display names for known Hermes provider IDs
_PROVIDER_DISPLAY = {
"nous": "Nous Portal",
"openrouter": "OpenRouter",
"anthropic": "Anthropic",
"openai": "OpenAI",
"openai-codex": "OpenAI Codex",
"copilot": "GitHub Copilot",
"zai": "Z.AI / GLM",
"kimi-coding": "Kimi / Moonshot",
"deepseek": "DeepSeek",
"minimax": "MiniMax",
2026-04-29 07:50:32 +00:00
"minimax-cn": "MiniMax (China)",
"google": "Google",
"meta-llama": "Meta Llama",
"huggingface": "HuggingFace",
"alibaba": "Alibaba",
"ollama": "Ollama",
"ollama-cloud": "Ollama Cloud",
"opencode-zen": "OpenCode Zen",
"opencode-go": "OpenCode Go",
"lmstudio": "LM Studio",
"mistralai": "Mistral",
"qwen": "Qwen",
"x-ai": "xAI",
"nvidia": "NVIDIA NIM",
2026-03-31 07:02:47 +00:00
}
# Provider alias → canonical slug. Users configure providers using the
# dotted/hyphenated form they see on the provider website (``z.ai``,
# ``x.ai``, ``google``) but the internal catalog (``_PROVIDER_MODELS``)
# uses slugs without punctuation (``zai``, ``xai``, ``gemini``). Without
# normalisation the provider lands in the ``else`` branch of the group
# builder and no models are returned — the bug behind #815.
#
# This table is authoritative for the WebUI. When ``hermes_cli.models``
# is importable we also merge its ``_PROVIDER_ALIASES`` on top so any
# new aliases added to the agent automatically apply. Keeping the local
# copy means the fix works even in environments where the agent tree is
# not on ``sys.path`` (CI, installs without hermes-agent cloned
# alongside the WebUI).
_PROVIDER_ALIASES = {
"glm": "zai",
"z-ai": "zai",
"z.ai": "zai",
"zhipu": "zai",
"github": "copilot",
"github-copilot": "copilot",
"github-models": "copilot",
"github-model": "copilot",
"google": "gemini",
"google-gemini": "gemini",
"google-ai-studio": "gemini",
"kimi": "kimi-coding",
"moonshot": "kimi-coding",
"claude": "anthropic",
"claude-code": "anthropic",
"deep-seek": "deepseek",
2026-04-29 07:50:32 +00:00
"minimax-china": "minimax-cn",
"minimax_cn": "minimax-cn",
"opencode": "opencode-zen",
"grok": "xai",
"x-ai": "xai",
"x.ai": "xai",
"aws": "bedrock",
"aws-bedrock": "bedrock",
"amazon": "bedrock",
"amazon-bedrock": "bedrock",
"qwen": "alibaba",
"aliyun": "alibaba",
"dashscope": "alibaba",
"alibaba-cloud": "alibaba",
"nim": "nvidia",
"nvidia-nim": "nvidia",
"build-nvidia": "nvidia",
"nemotron": "nvidia",
# Legacy alias — earlier WebUI builds wrote ``provider: local`` for unknown
# loopback endpoints, but ``local`` is not registered in
# ``hermes_cli.auth.PROVIDER_REGISTRY``. Routing it through ``custom``
# lets the agent's auxiliary client take the ``no-key-required``
# OpenAI-compat path. See #1384.
"local": "custom",
}
def _resolve_provider_alias(name: str) -> str:
"""Return the canonical provider slug for *name*.
Applies the WebUI's local alias table first, then merges any
additional aliases the agent provides (when hermes_cli is on
sys.path). Lookup is case-insensitive and whitespace-trimmed.
Unknown names pass through unchanged.
"""
if not name:
return name
raw = str(name).strip().lower()
# Prefer the agent's table when available so new aliases added there
# work automatically; otherwise fall through to our local copy.
try:
from hermes_cli.models import _PROVIDER_ALIASES as _agent_aliases
if raw in _agent_aliases:
return _agent_aliases[raw]
except Exception:
pass
return _PROVIDER_ALIASES.get(raw, name)
2026-03-31 07:02:47 +00:00
# Well-known models per provider (used to populate dropdown for direct API providers)
_PROVIDER_MODELS = {
"anthropic": [
{"id": "claude-opus-4.7", "label": "Claude Opus 4.7"},
{"id": "claude-opus-4.6", "label": "Claude Opus 4.6"},
{"id": "claude-sonnet-4.6", "label": "Claude Sonnet 4.6"},
{"id": "claude-sonnet-4-5", "label": "Claude Sonnet 4.5"},
{"id": "claude-haiku-4-5", "label": "Claude Haiku 4.5"},
2026-03-31 07:02:47 +00:00
],
"openai": [
v0.50.210: gpt-5.5, cron titles, agent cache, bfcache fix, onboarding fix, mermaid CSP, PWA auth (#1056) * feat(models): add gpt-5.5 to openai, openai-codex, copilot catalogs Adds GPT-5.5 and GPT-5.5 Mini entries to the static _PROVIDER_MODELS catalog so they appear in the model picker for the openai, openai-codex, and copilot providers. Signed-off-by: Pix (PiClaw, claude-opus-4-7) via Hermes Agent * fix(models): add gpt-5.5-mini to copilot provider catalog * fix(renderer): suppress Mermaid Google Fonts CSP violation via fontFamily inherit (#1044) Mermaid's built-in 'dark' and 'default' themes inject an @import for fonts.googleapis.com/Manrope into every generated SVG. The CSP style-src only allows cdn.jsdelivr.net, so this request is blocked on every diagram render, filling the console with CSP errors. Fix: pass fontFamily:'inherit' (and fontSize:'14px') in the themeVariables block of mermaid.initialize() in renderMermaidBlocks(). This suppresses Mermaid's external font import and uses the page's existing font stack. Avoids adding fonts.googleapis.com to the CSP — no new external dependency, no font FOUT, consistent with the rest of the UI typography. 3 regression tests added in tests/test_1044_mermaid_csp_font.py. 2215/2215 tests passing. * fix(onboarding): non-standard provider/path cluster (#1029) * fix(bfcache): restore full layout on tab/session restore — rail, topbar, panels (#1045) The pageshow handler added for #822 only cleared the session search filter and re-rendered the session list. This left the rest of the layout chrome (topbar, rail icons, workspace panel, resize handles, gateway SSE) in the stale bfcache DOM state, causing a broken layout (oversized search icon, uninitialized rail) that required a hard refresh to fix. Fix: extend the pageshow handler to re-run the full set of layout sync calls that the boot IIFE runs on a fresh page load: syncTopbar() — restores model chip, title, topbar state syncWorkspacePanelState() — restores workspace panel open/closed _initResizePanels() — reattaches panel resize drag listeners startGatewaySSE() — reconnects the gateway SSE watcher (bfcache-persisted connections are dead) All four calls are typeof-guarded for safe degradation if a helper is not yet defined. The existing #822 fixes (sessionSearch clear + renderSessionListFromCache) are preserved unchanged. loadSession() is intentionally NOT re-called — it would cause message flicker; the sync calls above are sufficient to restore visual state. 7 regression tests added in tests/test_1045_bfcache_layout_restore.py. 2219/2219 tests passing. * fix(bfcache): also close open dropdowns on bfcache restore (#1045) Additional symptom noted in issue #1045: bfcache freezes the DOM including any open dropdown/popover state. The thinking-level selector (and other composer dropdowns) left open when navigating away would appear open without user interaction on tab restore. Extend the pageshow handler to call all four named close functions before the layout sync: closeModelDropdown() — composer model selector closeReasoningDropdown() — thinking/reasoning effort selector closeWsDropdown() — workspace chip dropdown closeProfileDropdown() — profile switcher dropdown All calls are typeof-guarded, matching the style of the layout sync calls already in the handler. 2 new tests (9 total in test_1045_bfcache_layout_restore.py): - pageshow closes all four named dropdowns - dropdown closes appear before layout sync calls (clean state first) 2221/2221 tests passing. * fix(bfcache): remove _initResizePanels() — bfcache preserves listeners * fix(bfcache): remove _initResizePanels from pageshow — bfcache preserves listeners; update test * fix(sessions): use cron job name as session title when available (#1032) * fix(test): add id column to messages table in cron title test fixture * fix(merge): inject cron title lookup into read_importable loop, remove stale sqlite3 block * fix(pwa): redirect to /login client-side on 401 — fixes iOS PWA auth expiry trap (#1038) When an auth session expires, the server returns a 302→/login for page requests. In a normal browser this works fine, but in an iOS PWA running in standalone mode the redirect navigates out of the PWA shell into Safari, leaving the app permanently stuck on 'Authentication required' with no recovery path. Fix: intercept 401 responses client-side before surfacing any error. - workspace.js api(): check res.status===401 first; call window.location.href='/login' and return immediately (no throw) - ui.js: add _redirectIfUnauth() helper; wire into all direct fetch() calls that bypass api() — api/models, api/models/live, api/upload All fetch paths that could receive a 401 now redirect cleanly within the PWA frame rather than opening Safari. 6 regression tests added in tests/test_1038_pwa_auth_redirect.py. 2175/2175 tests passing. * fix(pwa): preserve current URL in ?next= param on 401 redirect * fix(test): update 401-redirect assertion to accept ?next= URL format * feat(pwa): add _safeNextPath() to login.js so ?next= param is honored after re-login Addresses reviewer suggestion: the ?next= URL set on 401 redirect was ignored by the login success handler (always redirected to ./). _safeNextPath() validates and returns the ?next= param with open-redirect guards: rejects non-path-absolute inputs, // protocol-relative URLs, backslash variants, and control characters. 4 new regression tests added. * Implement session agent cache for AIAgent reuse Added session agent cache to reuse AIAgent across messages. * Implement agent caching for session management * Implement session agent eviction on session deletion Added session agent eviction to prevent turn count leakage in recycled sessions. * docs: v0.50.210 release notes — 7 PRs, 2239 tests (+27) * docs(changelog): drop stale [Unreleased] entries duplicated by v0.50.210 Three entries in the [Unreleased] section are duplicates of items now listed under v0.50.210: - Mermaid CSP font fix (#1044) → v0.50.210 / Mermaid Google Fonts CSP - bfcache layout restore (#1045) → v0.50.210 / bfcache layout and dropdown restore - iOS PWA auth redirect (#1038) → v0.50.210 / Login redirects back to original URL The original drafts landed in [Unreleased] when individual PRs (#1047, #1048, #1043) were approved; the v0.50.210 release-notes commit then added the same items under the version section without removing the [Unreleased] copies. Drop the duplicates so users reading the CHANGELOG don't see the same fix listed twice. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> --------- Signed-off-by: Pix (PiClaw, claude-opus-4-7) via Hermes Agent Co-authored-by: Pix (Hermes) <aliceisjustplaying@users.noreply.github.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: qxxaa <mrhanoi@outlook.com> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-25 22:47:44 +00:00
{"id": "gpt-5.5", "label": "GPT-5.5"},
{"id": "gpt-5.5-mini", "label": "GPT-5.5 Mini"},
{"id": "gpt-5.4-mini", "label": "GPT-5.4 Mini"},
{"id": "gpt-5.4", "label": "GPT-5.4"},
2026-03-31 07:02:47 +00:00
],
"openai-codex": [
v0.50.210: gpt-5.5, cron titles, agent cache, bfcache fix, onboarding fix, mermaid CSP, PWA auth (#1056) * feat(models): add gpt-5.5 to openai, openai-codex, copilot catalogs Adds GPT-5.5 and GPT-5.5 Mini entries to the static _PROVIDER_MODELS catalog so they appear in the model picker for the openai, openai-codex, and copilot providers. Signed-off-by: Pix (PiClaw, claude-opus-4-7) via Hermes Agent * fix(models): add gpt-5.5-mini to copilot provider catalog * fix(renderer): suppress Mermaid Google Fonts CSP violation via fontFamily inherit (#1044) Mermaid's built-in 'dark' and 'default' themes inject an @import for fonts.googleapis.com/Manrope into every generated SVG. The CSP style-src only allows cdn.jsdelivr.net, so this request is blocked on every diagram render, filling the console with CSP errors. Fix: pass fontFamily:'inherit' (and fontSize:'14px') in the themeVariables block of mermaid.initialize() in renderMermaidBlocks(). This suppresses Mermaid's external font import and uses the page's existing font stack. Avoids adding fonts.googleapis.com to the CSP — no new external dependency, no font FOUT, consistent with the rest of the UI typography. 3 regression tests added in tests/test_1044_mermaid_csp_font.py. 2215/2215 tests passing. * fix(onboarding): non-standard provider/path cluster (#1029) * fix(bfcache): restore full layout on tab/session restore — rail, topbar, panels (#1045) The pageshow handler added for #822 only cleared the session search filter and re-rendered the session list. This left the rest of the layout chrome (topbar, rail icons, workspace panel, resize handles, gateway SSE) in the stale bfcache DOM state, causing a broken layout (oversized search icon, uninitialized rail) that required a hard refresh to fix. Fix: extend the pageshow handler to re-run the full set of layout sync calls that the boot IIFE runs on a fresh page load: syncTopbar() — restores model chip, title, topbar state syncWorkspacePanelState() — restores workspace panel open/closed _initResizePanels() — reattaches panel resize drag listeners startGatewaySSE() — reconnects the gateway SSE watcher (bfcache-persisted connections are dead) All four calls are typeof-guarded for safe degradation if a helper is not yet defined. The existing #822 fixes (sessionSearch clear + renderSessionListFromCache) are preserved unchanged. loadSession() is intentionally NOT re-called — it would cause message flicker; the sync calls above are sufficient to restore visual state. 7 regression tests added in tests/test_1045_bfcache_layout_restore.py. 2219/2219 tests passing. * fix(bfcache): also close open dropdowns on bfcache restore (#1045) Additional symptom noted in issue #1045: bfcache freezes the DOM including any open dropdown/popover state. The thinking-level selector (and other composer dropdowns) left open when navigating away would appear open without user interaction on tab restore. Extend the pageshow handler to call all four named close functions before the layout sync: closeModelDropdown() — composer model selector closeReasoningDropdown() — thinking/reasoning effort selector closeWsDropdown() — workspace chip dropdown closeProfileDropdown() — profile switcher dropdown All calls are typeof-guarded, matching the style of the layout sync calls already in the handler. 2 new tests (9 total in test_1045_bfcache_layout_restore.py): - pageshow closes all four named dropdowns - dropdown closes appear before layout sync calls (clean state first) 2221/2221 tests passing. * fix(bfcache): remove _initResizePanels() — bfcache preserves listeners * fix(bfcache): remove _initResizePanels from pageshow — bfcache preserves listeners; update test * fix(sessions): use cron job name as session title when available (#1032) * fix(test): add id column to messages table in cron title test fixture * fix(merge): inject cron title lookup into read_importable loop, remove stale sqlite3 block * fix(pwa): redirect to /login client-side on 401 — fixes iOS PWA auth expiry trap (#1038) When an auth session expires, the server returns a 302→/login for page requests. In a normal browser this works fine, but in an iOS PWA running in standalone mode the redirect navigates out of the PWA shell into Safari, leaving the app permanently stuck on 'Authentication required' with no recovery path. Fix: intercept 401 responses client-side before surfacing any error. - workspace.js api(): check res.status===401 first; call window.location.href='/login' and return immediately (no throw) - ui.js: add _redirectIfUnauth() helper; wire into all direct fetch() calls that bypass api() — api/models, api/models/live, api/upload All fetch paths that could receive a 401 now redirect cleanly within the PWA frame rather than opening Safari. 6 regression tests added in tests/test_1038_pwa_auth_redirect.py. 2175/2175 tests passing. * fix(pwa): preserve current URL in ?next= param on 401 redirect * fix(test): update 401-redirect assertion to accept ?next= URL format * feat(pwa): add _safeNextPath() to login.js so ?next= param is honored after re-login Addresses reviewer suggestion: the ?next= URL set on 401 redirect was ignored by the login success handler (always redirected to ./). _safeNextPath() validates and returns the ?next= param with open-redirect guards: rejects non-path-absolute inputs, // protocol-relative URLs, backslash variants, and control characters. 4 new regression tests added. * Implement session agent cache for AIAgent reuse Added session agent cache to reuse AIAgent across messages. * Implement agent caching for session management * Implement session agent eviction on session deletion Added session agent eviction to prevent turn count leakage in recycled sessions. * docs: v0.50.210 release notes — 7 PRs, 2239 tests (+27) * docs(changelog): drop stale [Unreleased] entries duplicated by v0.50.210 Three entries in the [Unreleased] section are duplicates of items now listed under v0.50.210: - Mermaid CSP font fix (#1044) → v0.50.210 / Mermaid Google Fonts CSP - bfcache layout restore (#1045) → v0.50.210 / bfcache layout and dropdown restore - iOS PWA auth redirect (#1038) → v0.50.210 / Login redirects back to original URL The original drafts landed in [Unreleased] when individual PRs (#1047, #1048, #1043) were approved; the v0.50.210 release-notes commit then added the same items under the version section without removing the [Unreleased] copies. Drop the duplicates so users reading the CHANGELOG don't see the same fix listed twice. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> --------- Signed-off-by: Pix (PiClaw, claude-opus-4-7) via Hermes Agent Co-authored-by: Pix (Hermes) <aliceisjustplaying@users.noreply.github.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: qxxaa <mrhanoi@outlook.com> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-25 22:47:44 +00:00
{"id": "gpt-5.5", "label": "GPT-5.5"},
{"id": "gpt-5.5-mini", "label": "GPT-5.5 Mini"},
{"id": "gpt-5.4", "label": "GPT-5.4"},
{"id": "gpt-5.4-mini", "label": "GPT-5.4 Mini"},
{"id": "gpt-5.3-codex", "label": "GPT-5.3 Codex"},
{"id": "gpt-5.2-codex", "label": "GPT-5.2 Codex"},
{"id": "gpt-5.1-codex-max", "label": "GPT-5.1 Codex Max"},
{"id": "gpt-5.1-codex-mini", "label": "GPT-5.1 Codex Mini"},
{"id": "codex-mini-latest", "label": "Codex Mini (latest)"},
2026-03-31 07:02:47 +00:00
],
"google": [
{"id": "gemini-3.1-pro-preview", "label": "Gemini 3.1 Pro Preview"},
{"id": "gemini-3-flash-preview", "label": "Gemini 3 Flash Preview"},
{"id": "gemini-3.1-flash-lite-preview", "label": "Gemini 3.1 Flash Lite Preview"},
{"id": "gemini-2.5-pro", "label": "Gemini 2.5 Pro"},
{"id": "gemini-2.5-flash", "label": "Gemini 2.5 Flash"},
2026-03-31 07:02:47 +00:00
],
"deepseek": [
{"id": "deepseek-v4-flash", "label": "DeepSeek V4 Flash"},
{"id": "deepseek-v4-pro", "label": "DeepSeek V4 Pro"},
{"id": "deepseek-chat-v3-0324", "label": "DeepSeek V3 (legacy)"},
{"id": "deepseek-reasoner", "label": "DeepSeek Reasoner (legacy)"},
2026-03-31 07:02:47 +00:00
],
"nous": [
{"id": "@nous:anthropic/claude-opus-4.6", "label": "Claude Opus 4.6 (via Nous)"},
{"id": "@nous:anthropic/claude-sonnet-4.6", "label": "Claude Sonnet 4.6 (via Nous)"},
{"id": "@nous:openai/gpt-5.4-mini", "label": "GPT-5.4 Mini (via Nous)"},
{"id": "@nous:google/gemini-3.1-pro-preview", "label": "Gemini 3.1 Pro Preview (via Nous)"},
2026-03-31 07:02:47 +00:00
],
"zai": [
{"id": "glm-5.1", "label": "GLM-5.1"},
{"id": "glm-5", "label": "GLM-5"},
{"id": "glm-5-turbo", "label": "GLM-5 Turbo"},
{"id": "glm-4.7", "label": "GLM-4.7"},
{"id": "glm-4.5", "label": "GLM-4.5"},
{"id": "glm-4.5-flash", "label": "GLM-4.5 Flash"},
2026-03-31 07:02:47 +00:00
],
"kimi-coding": [
{"id": "moonshot-v1-8k", "label": "Moonshot v1 8k"},
{"id": "moonshot-v1-32k", "label": "Moonshot v1 32k"},
{"id": "moonshot-v1-128k", "label": "Moonshot v1 128k"},
{"id": "kimi-latest", "label": "Kimi Latest"},
release: v0.50.102–v0.50.108 batch (code blocks, utf-8, image URLs, deletion warning, PermissionError, Docker docs, kimi-k2.5) (#755) ## Batch release: v0.50.102 – v0.50.108 Seven self-built PRs reviewed and approved by @nesquena, now consolidated into a single release branch. ### Included fixes | Version | PR | What it fixes | |---|---|---| | v0.50.102 | #746 | Code blocks lose newlines when not preceded by blank line (fixes #745) | | v0.50.103 | #743 | `encoding='utf-8'` on `write_text()` in `api/profiles.py` — Windows `.env` detection (fixes #741) | | v0.50.104 | #735 | Agent `MEDIA:localhost:*` image URLs rewritten to `document.baseURI` — remote users get working images (fixes #642) | | v0.50.105 | #736 | Profile deletion warning strengthened: "permanently deleted, cannot be undone" across all 6 locales (fixes #637) | | v0.50.106 | #738 | Catch `PermissionError` in `_signing_key()` — three-container Docker UID mismatch no longer crashes all HTTP requests | | v0.50.107 | #737 | Docs: three-container UID/GID alignment guide in README + `HERMES_UID`/`HERMES_GID` forwarded in compose (fixes #645) | | v0.50.108 | #742 | Add `kimi-k2.5` to Kimi/Moonshot provider model list (fixes #740) | ### Testing - **pytest**: 1510 passed, 1 warning (1 pre-existing unrelated failure excluded) - **QA harness**: 20/20 passed (`~/WebUI/scripts/run-browser-tests.sh`) - **Browser**: layout, slash autocomplete width, edit button, image URL rewrite, profile deletion dialog all verified All PRs reviewed and approved by @nesquena. Ready to merge and tag **v0.50.108**.
2026-04-20 07:26:55 +00:00
{"id": "kimi-k2.5", "label": "Kimi K2.5"},
2026-03-31 07:02:47 +00:00
],
"minimax": [
{"id": "MiniMax-M2.7", "label": "MiniMax M2.7"},
{"id": "MiniMax-M2.7-highspeed", "label": "MiniMax M2.7 Highspeed"},
{"id": "MiniMax-M2.5", "label": "MiniMax M2.5"},
{"id": "MiniMax-M2.5-highspeed", "label": "MiniMax M2.5 Highspeed"},
{"id": "MiniMax-M2.1", "label": "MiniMax M2.1"},
2026-03-31 07:02:47 +00:00
],
2026-04-29 07:50:32 +00:00
"minimax-cn": [
{"id": "MiniMax-M2.7", "label": "MiniMax M2.7"},
{"id": "MiniMax-M2.5", "label": "MiniMax M2.5"},
{"id": "MiniMax-M2.1", "label": "MiniMax M2.1"},
{"id": "MiniMax-M2", "label": "MiniMax M2"},
],
# GitHub Copilot — model IDs served via the Copilot API
"copilot": [
v0.50.210: gpt-5.5, cron titles, agent cache, bfcache fix, onboarding fix, mermaid CSP, PWA auth (#1056) * feat(models): add gpt-5.5 to openai, openai-codex, copilot catalogs Adds GPT-5.5 and GPT-5.5 Mini entries to the static _PROVIDER_MODELS catalog so they appear in the model picker for the openai, openai-codex, and copilot providers. Signed-off-by: Pix (PiClaw, claude-opus-4-7) via Hermes Agent * fix(models): add gpt-5.5-mini to copilot provider catalog * fix(renderer): suppress Mermaid Google Fonts CSP violation via fontFamily inherit (#1044) Mermaid's built-in 'dark' and 'default' themes inject an @import for fonts.googleapis.com/Manrope into every generated SVG. The CSP style-src only allows cdn.jsdelivr.net, so this request is blocked on every diagram render, filling the console with CSP errors. Fix: pass fontFamily:'inherit' (and fontSize:'14px') in the themeVariables block of mermaid.initialize() in renderMermaidBlocks(). This suppresses Mermaid's external font import and uses the page's existing font stack. Avoids adding fonts.googleapis.com to the CSP — no new external dependency, no font FOUT, consistent with the rest of the UI typography. 3 regression tests added in tests/test_1044_mermaid_csp_font.py. 2215/2215 tests passing. * fix(onboarding): non-standard provider/path cluster (#1029) * fix(bfcache): restore full layout on tab/session restore — rail, topbar, panels (#1045) The pageshow handler added for #822 only cleared the session search filter and re-rendered the session list. This left the rest of the layout chrome (topbar, rail icons, workspace panel, resize handles, gateway SSE) in the stale bfcache DOM state, causing a broken layout (oversized search icon, uninitialized rail) that required a hard refresh to fix. Fix: extend the pageshow handler to re-run the full set of layout sync calls that the boot IIFE runs on a fresh page load: syncTopbar() — restores model chip, title, topbar state syncWorkspacePanelState() — restores workspace panel open/closed _initResizePanels() — reattaches panel resize drag listeners startGatewaySSE() — reconnects the gateway SSE watcher (bfcache-persisted connections are dead) All four calls are typeof-guarded for safe degradation if a helper is not yet defined. The existing #822 fixes (sessionSearch clear + renderSessionListFromCache) are preserved unchanged. loadSession() is intentionally NOT re-called — it would cause message flicker; the sync calls above are sufficient to restore visual state. 7 regression tests added in tests/test_1045_bfcache_layout_restore.py. 2219/2219 tests passing. * fix(bfcache): also close open dropdowns on bfcache restore (#1045) Additional symptom noted in issue #1045: bfcache freezes the DOM including any open dropdown/popover state. The thinking-level selector (and other composer dropdowns) left open when navigating away would appear open without user interaction on tab restore. Extend the pageshow handler to call all four named close functions before the layout sync: closeModelDropdown() — composer model selector closeReasoningDropdown() — thinking/reasoning effort selector closeWsDropdown() — workspace chip dropdown closeProfileDropdown() — profile switcher dropdown All calls are typeof-guarded, matching the style of the layout sync calls already in the handler. 2 new tests (9 total in test_1045_bfcache_layout_restore.py): - pageshow closes all four named dropdowns - dropdown closes appear before layout sync calls (clean state first) 2221/2221 tests passing. * fix(bfcache): remove _initResizePanels() — bfcache preserves listeners * fix(bfcache): remove _initResizePanels from pageshow — bfcache preserves listeners; update test * fix(sessions): use cron job name as session title when available (#1032) * fix(test): add id column to messages table in cron title test fixture * fix(merge): inject cron title lookup into read_importable loop, remove stale sqlite3 block * fix(pwa): redirect to /login client-side on 401 — fixes iOS PWA auth expiry trap (#1038) When an auth session expires, the server returns a 302→/login for page requests. In a normal browser this works fine, but in an iOS PWA running in standalone mode the redirect navigates out of the PWA shell into Safari, leaving the app permanently stuck on 'Authentication required' with no recovery path. Fix: intercept 401 responses client-side before surfacing any error. - workspace.js api(): check res.status===401 first; call window.location.href='/login' and return immediately (no throw) - ui.js: add _redirectIfUnauth() helper; wire into all direct fetch() calls that bypass api() — api/models, api/models/live, api/upload All fetch paths that could receive a 401 now redirect cleanly within the PWA frame rather than opening Safari. 6 regression tests added in tests/test_1038_pwa_auth_redirect.py. 2175/2175 tests passing. * fix(pwa): preserve current URL in ?next= param on 401 redirect * fix(test): update 401-redirect assertion to accept ?next= URL format * feat(pwa): add _safeNextPath() to login.js so ?next= param is honored after re-login Addresses reviewer suggestion: the ?next= URL set on 401 redirect was ignored by the login success handler (always redirected to ./). _safeNextPath() validates and returns the ?next= param with open-redirect guards: rejects non-path-absolute inputs, // protocol-relative URLs, backslash variants, and control characters. 4 new regression tests added. * Implement session agent cache for AIAgent reuse Added session agent cache to reuse AIAgent across messages. * Implement agent caching for session management * Implement session agent eviction on session deletion Added session agent eviction to prevent turn count leakage in recycled sessions. * docs: v0.50.210 release notes — 7 PRs, 2239 tests (+27) * docs(changelog): drop stale [Unreleased] entries duplicated by v0.50.210 Three entries in the [Unreleased] section are duplicates of items now listed under v0.50.210: - Mermaid CSP font fix (#1044) → v0.50.210 / Mermaid Google Fonts CSP - bfcache layout restore (#1045) → v0.50.210 / bfcache layout and dropdown restore - iOS PWA auth redirect (#1038) → v0.50.210 / Login redirects back to original URL The original drafts landed in [Unreleased] when individual PRs (#1047, #1048, #1043) were approved; the v0.50.210 release-notes commit then added the same items under the version section without removing the [Unreleased] copies. Drop the duplicates so users reading the CHANGELOG don't see the same fix listed twice. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> --------- Signed-off-by: Pix (PiClaw, claude-opus-4-7) via Hermes Agent Co-authored-by: Pix (Hermes) <aliceisjustplaying@users.noreply.github.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: qxxaa <mrhanoi@outlook.com> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-25 22:47:44 +00:00
{"id": "gpt-5.5", "label": "GPT-5.5"},
{"id": "gpt-5.5-mini", "label": "GPT-5.5 Mini"},
{"id": "gpt-5.4", "label": "GPT-5.4"},
{"id": "gpt-5.4-mini", "label": "GPT-5.4 Mini"},
{"id": "gpt-4o", "label": "GPT-4o"},
{"id": "claude-opus-4.6", "label": "Claude Opus 4.6"},
{"id": "claude-sonnet-4.6", "label": "Claude Sonnet 4.6"},
{"id": "gemini-3-flash-preview", "label": "Gemini 3 Flash Preview"},
],
# OpenCode Zen — curated models via opencode.ai/zen (pay-as-you-go credits)
"opencode-zen": [
{"id": "gpt-5.4-pro", "label": "GPT-5.4 Pro"},
{"id": "gpt-5.4", "label": "GPT-5.4"},
{"id": "gpt-5.4-mini", "label": "GPT-5.4 Mini"},
{"id": "gpt-5.4-nano", "label": "GPT-5.4 Nano"},
{"id": "gpt-5.3-codex", "label": "GPT-5.3 Codex"},
{"id": "gpt-5.3-codex-spark", "label": "GPT-5.3 Codex Spark"},
{"id": "gpt-5.2", "label": "GPT-5.2"},
{"id": "gpt-5.2-codex", "label": "GPT-5.2 Codex"},
{"id": "gpt-5.1", "label": "GPT-5.1"},
{"id": "gpt-5.1-codex", "label": "GPT-5.1 Codex"},
{"id": "gpt-5.1-codex-max", "label": "GPT-5.1 Codex Max"},
{"id": "gpt-5.1-codex-mini", "label": "GPT-5.1 Codex Mini"},
{"id": "gpt-5", "label": "GPT-5"},
{"id": "gpt-5-codex", "label": "GPT-5 Codex"},
{"id": "gpt-5-nano", "label": "GPT-5 Nano"},
{"id": "claude-opus-4-7", "label": "Claude Opus 4.7"},
{"id": "claude-opus-4-6", "label": "Claude Opus 4.6"},
{"id": "claude-opus-4-5", "label": "Claude Opus 4.5"},
{"id": "claude-opus-4-1", "label": "Claude Opus 4.1"},
{"id": "claude-sonnet-4-6", "label": "Claude Sonnet 4.6"},
{"id": "claude-sonnet-4-5", "label": "Claude Sonnet 4.5"},
{"id": "claude-sonnet-4", "label": "Claude Sonnet 4"},
{"id": "claude-haiku-4-5", "label": "Claude Haiku 4.5"},
{"id": "claude-3-5-haiku", "label": "Claude 3.5 Haiku"},
{"id": "gemini-3.1-pro-preview", "label": "Gemini 3.1 Pro Preview"},
{"id": "gemini-3-flash-preview", "label": "Gemini 3 Flash Preview"},
{"id": "gemini-3.1-flash-lite-preview", "label": "Gemini 3.1 Flash Lite Preview"},
{"id": "gemini-2.5-pro", "label": "Gemini 2.5 Pro"},
{"id": "gemini-2.5-flash", "label": "Gemini 2.5 Flash"},
{"id": "glm-5.1", "label": "GLM-5.1"},
{"id": "glm-5", "label": "GLM-5"},
{"id": "kimi-k2.5", "label": "Kimi K2.5"},
{"id": "minimax-m2.5", "label": "MiniMax M2.5"},
{"id": "minimax-m2.5-free", "label": "MiniMax M2.5 Free"},
{"id": "nemotron-3-super-free", "label": "Nemotron 3 Super Free"},
{"id": "big-pickle", "label": "Big Pickle"},
],
# OpenCode Go — flat-rate models via opencode.ai/go ($10/month)
"opencode-go": [
release: v0.50.240 ## Release v0.50.240 Batch release of 13 PRs that passed full triage + code review + test suite (3199 tests, 0 failures). --- ### Added - **Compact tool activity mode** (`simplified_tool_calling`, default on) — groups tool calls and thinking traces into a single collapsed "Activity" disclosure card per assistant turn. Also adds a new **Calm Console** theme with earth/slate palette and serif prose. @Michaelyklam — #1282 - **PDF first-page preview** — `MEDIA:` `.pdf` files render a canvas thumbnail via PDF.js CDN (4 MB cap). **HTML sandbox iframe** — `.html`/`.htm` files render inline in a sandboxed `<iframe srcdoc>` (256 KB cap). 10 i18n keys × 7 locales. @bergeouss — #1280, closes #480 #482 - **Inline Excalidraw diagram preview** — `.excalidraw` files render as pure SVG (no external deps; rectangles, ellipses, diamonds, text, lines, arrows, freehand; 512 KB cap). @bergeouss — #1279, closes #479 - **Inline CSV table rendering** — fenced `csv` blocks and `MEDIA:` CSV files render as scrollable HTML tables with auto-separator detection. @bergeouss — #1277, closes #485 - **Inline SVG, audio, and video rendering** — SVG as `<img>`, audio as `<audio controls>`, video as `<video controls>`. @bergeouss — #1276, closes #481 - **Batch session select mode** — multi-select sessions for bulk Archive/Delete/Move. 11 i18n keys × 7 locales. @bergeouss — #1275, closes #568 - **Collapsible skill category headers** — click to collapse/expand without re-render; state persists across filter cycles. @bergeouss — #1281 - **`providers.only_configured` setting** — opt-in flag to restrict the model picker to explicitly configured providers. @KingBoyAndGirl — #1268 - **OpenCode Go model catalog** — adds Kimi K2.6, DeepSeek V4 Pro/Flash, MiMo V2.5/Pro, Qwen3.6/3.5 Plus. @nesquena-hermes — #1284, closes #1269 ### Fixed - **Profile `TERMINAL_CWD` TypeError** — `_build_agent_thread_env()` helper merges env before `_set_thread_env()` call. @hi-friday — #1266 - **Service worker subpath cache bypass** — regex now matches `/api/*` under any mount prefix. @Michaelyklam — #1278 - **SSE client disconnect leaks** — `TimeoutError`/`OSError` treated as clean disconnects; server backlog 64, threads daemonized; session list renders before saved-session restore. @KayZz69 — #1267 - **i18n locale corrections** — Korean MCP strings (23), Chinese MCP strings (23), zh-Hant missing keys (41), de missing keys (229). @bergeouss — #1274, closes #1273 --- ### Test results ``` 3199 passed, 2 skipped, 3 xpassed in 72.79s ``` ### PRs on hold (not included) #1265 (draft), #1271 (superseded by #1266), #1272 (skipped XSS tests), #1232 (partial test run), #1222 (review questions open), #1134 (live-server tests), #1132 (superseded by #1134), #1108 (negative UX review), #1084 (empty description)
2026-04-30 00:42:32 +00:00
{"id": "glm-5.1", "label": "GLM-5.1"},
{"id": "glm-5", "label": "GLM-5"},
{"id": "kimi-k2.5", "label": "Kimi K2.5"},
{"id": "kimi-k2.6", "label": "Kimi K2.6"},
{"id": "deepseek-v4-pro", "label": "DeepSeek V4 Pro"},
{"id": "deepseek-v4-flash","label": "DeepSeek V4 Flash"},
{"id": "mimo-v2-pro", "label": "MiMo V2 Pro"},
{"id": "mimo-v2-omni", "label": "MiMo V2 Omni"},
{"id": "mimo-v2.5-pro", "label": "MiMo V2.5 Pro"},
{"id": "mimo-v2.5", "label": "MiMo V2.5"},
{"id": "minimax-m2.7", "label": "MiniMax M2.7"},
{"id": "minimax-m2.5", "label": "MiniMax M2.5"},
{"id": "qwen3.6-plus", "label": "Qwen3.6 Plus"},
{"id": "qwen3.5-plus", "label": "Qwen3.5 Plus"},
],
# 'gemini' is the hermes_cli provider ID for Google AI Studio
# Model IDs are bare — sent directly to:
# https://generativelanguage.googleapis.com/v1beta/openai/chat/completions
"gemini": [
{"id": "gemini-3.1-pro-preview", "label": "Gemini 3.1 Pro Preview"},
{"id": "gemini-3-flash-preview", "label": "Gemini 3 Flash Preview"},
{"id": "gemini-3.1-flash-lite-preview", "label": "Gemini 3.1 Flash Lite Preview"},
{"id": "gemini-2.5-pro", "label": "Gemini 2.5 Pro"},
{"id": "gemini-2.5-flash", "label": "Gemini 2.5 Flash"},
],
# Mistral — prefix used in OpenRouter model IDs (mistralai/mistral-large-latest)
"mistralai": [
{"id": "mistral-large-latest", "label": "Mistral Large"},
{"id": "mistral-small-latest", "label": "Mistral Small"},
],
# Qwen (Alibaba) — prefix used in OpenRouter model IDs (qwen/qwen3-coder)
"qwen": [
{"id": "qwen3-coder", "label": "Qwen3 Coder"},
{"id": "qwen3.6-plus", "label": "Qwen3.6 Plus"},
],
# NVIDIA NIM — NVIDIA's inference platform
"nvidia": [
{"id": "nvidia/nemotron-3-super-120b-a12b", "label": "Nemotron 3 Super 120B"},
{"id": "nvidia/nemotron-3-nano-30b-a3b", "label": "Nemotron 3 Nano 30B"},
{"id": "nvidia/llama-3.3-nemotron-super-49b-v1.5", "label": "Llama 3.3 Nemotron Super 49B"},
{"id": "qwen/qwen3-next-80b-a3b-instruct", "label": "Qwen3 Next 80B"},
],
# xAI — prefix used in OpenRouter model IDs (x-ai/grok-4-20)
"x-ai": [
{"id": "grok-4.20", "label": "Grok 4.20"},
],
2026-03-31 07:02:47 +00:00
}
_AMBIENT_GH_CLI_MARKERS = frozenset({"gh_cli", "gh auth token"})
def _is_ambient_gh_cli_entry(source: str, label: str, key_source: str) -> bool:
"""True when a credential-pool entry is a seeded gh-cli token rather than
one the user added explicitly. Filter these so Copilot doesn't appear in
the dropdown just because `gh` is installed on the system.
"""
return (
source.strip().lower() in _AMBIENT_GH_CLI_MARKERS
or label.strip().lower() == "gh auth token"
or key_source.strip().lower() == "gh auth token"
)
def _format_ollama_label(mid: str) -> str:
"""Turn an Ollama model id (Ollama tag format) into a readable display label.
Examples: 'kimi-k2.5' → 'Kimi K2.5', 'qwen3-vl:235b-instruct' → 'Qwen3 VL (235B Instruct)'
"""
name_part, _, variant = mid.partition(":")
def _fmt(s: str) -> str:
tokens = s.replace("-", " ").replace("_", " ").split()
out = []
for t in tokens:
alpha_only = t.replace(".", "")
if alpha_only.isalpha() and len(t) <= 3:
out.append(t.upper()) # short acronym: glm → GLM, vl → VL, gpt → GPT
elif alpha_only.isalnum() and alpha_only and alpha_only[0].isdigit():
out.append(t.upper()) # size param: 235b → 235B, 1t → 1T
else:
out.append(t[0].upper() + t[1:] if t else t) # capitalize: kimi → Kimi
return " ".join(out)
label = _fmt(name_part)
if variant:
label += f" ({_fmt(variant)})"
return label
def _apply_provider_prefix(
raw_models: list[dict],
provider_id: str,
active_provider: str | None,
) -> list[dict]:
"""Return *raw_models* with @provider: prefixes applied when needed.
Prefixing is skipped when (a) the provider is already the active one, or
(b) a model id already starts with '@' or contains '/' (already routable).
"""
_active = (active_provider or "").lower()
if not _active or provider_id == _active:
return list(raw_models)
result = []
for m in raw_models:
mid = m["id"]
if mid.startswith("@") or "/" in mid:
result.append({"id": mid, "label": m["label"]})
else:
result.append({"id": f"@{provider_id}:{mid}", "label": m["label"]})
return result
def _deduplicate_model_ids(groups: list[dict]) -> None:
"""Ensure every model ID across groups is globally unique.
When multiple providers expose the same model ID (either bare names like
``gpt-5.4`` or slash-qualified IDs like ``google/gemma-4-27b``), the
dropdown cannot distinguish them. This post-process detects such
collisions and prefixes colliding entries with ``@provider_id:`` so the
frontend can treat them as distinct options.
The first occurrence (in provider-id order) is left unchanged for backward
compatibility with sessions that already store the original bare/slash
model name. If that provider is later removed from the config, the next
cache rebuild re-runs dedup — the remaining provider becomes the sole
occurrence and is left unchanged, so the session still matches.
.. note::
The "first occurrence wins" rule means the unchanged ID is not stable
across config changes (adding, removing, or reordering providers).
This is acceptable because the dedup runs on every cache rebuild,
so sessions always resolve to the current canonical unchanged ID.
The ``@provider_id:model`` format is consistent with the existing
``_apply_provider_prefix()`` function and is handled by
``resolve_model_provider()`` (rsplits on the last ``:`` to handle
provider_ids that themselves contain ``:``).
Operates in-place on *groups*.
"""
if not groups:
return
# Collect {model_id: [(group_idx, model_idx), ...]} in alphabetical
# provider_id order so that the "first occurrence stays unchanged" rule is
# deterministic across config edits (adding/removing/reordering providers).
sorted_group_indices = sorted(
range(len(groups)),
key=lambda i: groups[i].get("provider_id", ""),
)
id_map: dict[str, list[tuple[int, int]]] = {}
for gi in sorted_group_indices:
group = groups[gi]
for mi, model in enumerate(group.get("models", [])):
mid = str(model.get("id", "") or "").strip()
# Skip IDs that are already provider-qualified.
if not mid or mid.startswith("@"):
continue
id_map.setdefault(mid, []).append((gi, mi))
# For any ID appearing in 2+ groups, prefix all but the first occurrence.
# This handles N>2 providers correctly: the loop iterates over all
# occurrences after the first, prefixing each with its own provider_id.
for original_id, locations in id_map.items():
if len(locations) < 2:
continue
for gi, mi in locations[1:]:
group = groups[gi]
model = group["models"][mi]
pid = group.get("provider_id", "")
model["id"] = f"@{pid}:{original_id}"
provider_name = group.get("provider", pid)
if model.get("label") != original_id:
model["label"] = f"{model['label']} ({provider_name})"
else:
model["label"] = f"{original_id} ({provider_name})"
def resolve_model_provider(model_id: str) -> tuple:
"""Resolve model name, provider, and base_url for AIAgent.
Model IDs from the dropdown can be in several formats:
- 'claude-sonnet-4.6' (bare name, uses config default provider)
- 'anthropic/claude-sonnet-4.6' (OpenRouter-style provider/model)
- '@minimax:MiniMax-M2.7' (explicit provider hint from dropdown)
The @provider:model format is used for models from non-default provider
groups in the dropdown, so we can route them through the correct provider
via resolve_runtime_provider(requested=provider) instead of the default.
Custom OpenAI-compatible endpoints are special: their model IDs often look
like provider/model (for example ``google/gemma-4-26b-a4b``), which would be
mistaken for an OpenRouter model if we only looked at the slash. To avoid
that, first check whether the selected model matches an entry in
config.yaml -> custom_providers and route it through that named custom
provider.
Returns (model, provider, base_url) where provider and base_url may be None.
"""
config_provider = None
config_base_url = None
model_cfg = cfg.get("model", {})
if isinstance(model_cfg, dict):
config_provider = model_cfg.get("provider")
config_base_url = model_cfg.get("base_url")
# Heal legacy ``provider: local`` entries (written by WebUI < v0.50.252)
# at read time. ``local`` is not a registered provider, so passing it
# downstream raises a ``LOCAL_API_KEY`` error from the auxiliary client
# mid-conversation when compression/vision/web-extract fires. Route
# through ``custom`` instead — it takes the ``no-key-required``
# OpenAI-compat path that local servers (Ollama, LM Studio, llama.cpp,
# vLLM, TabbyAPI) actually use. See #1384.
if isinstance(config_provider, str) and config_provider.strip().lower() == "local":
config_provider = "custom"
model_id = (model_id or "").strip()
if not model_id:
return model_id, config_provider, config_base_url
# Custom providers declared in config.yaml should win over slash-based
# OpenRouter heuristics. Their model IDs commonly contain '/' too.
custom_providers = cfg.get("custom_providers", [])
if isinstance(custom_providers, list):
for entry in custom_providers:
if not isinstance(entry, dict):
continue
entry_model = (entry.get("model") or "").strip()
entry_name = (entry.get("name") or "").strip()
entry_base_url = (entry.get("base_url") or "").strip()
if entry_model and entry_name and model_id == entry_model:
provider_hint = "custom:" + entry_name.lower().replace(" ", "-")
return model_id, provider_hint, entry_base_url or None
# @provider:model format — explicit provider hint from the dropdown.
# Route through that provider directly (resolve_runtime_provider will
# resolve credentials in streaming.py).
# Use rsplit to handle provider_ids that contain ':' (e.g. custom:my-key).
# With rsplit, "@custom:my-key:model" → provider="custom:my-key", model="model".
if model_id.startswith("@") and ":" in model_id:
provider_hint, bare_model = model_id[1:].rsplit(":", 1)
return bare_model, provider_hint, None
if "/" in model_id:
prefix, bare = model_id.split("/", 1)
# OpenRouter always needs the full provider/model path (e.g. openrouter/free,
# anthropic/claude-sonnet-4.6). Never strip the prefix for OpenRouter.
if config_provider == "openrouter":
return model_id, "openrouter", config_base_url
# If prefix matches config provider exactly, strip it and use that provider directly.
# e.g. config=anthropic, model=anthropic/claude-... → bare name to anthropic API
if config_provider and prefix == config_provider:
return bare, config_provider, config_base_url
fix(models): preserve @nous: prefix in settings + fix cross-namespace 404 for Nous (#895 #894) (#901) * fix(models): preserve @nous: prefix in settings + fix cross-namespace 404 for Nous (#895 #894) * fix(review): persist bare form for CLI compatibility + picker smart-match The PR persisted `@nous:anthropic/claude-opus-4.6` verbatim to config.yaml to make the Settings picker match its dropdown options (which carry the `@nous:` prefix after #885). That fixes the WebUI picker but introduces a cross-tool regression: hermes-agent's CLI reads `config.yaml -> model.default` directly and passes it to the provider API verbatim. For aggregator providers (Nous is one — see hermes_cli/model_normalize.py `_AGGREGATOR_PROVIDERS`), `normalize_model_for_provider` is skipped entirely (run_agent.py:887), so the literal `@nous:anthropic/...` string flows to the Nous API, which rejects it — breaking every user who runs `hermes` in the terminal right after saving via WebUI. Fix the tension at the picker rather than the persistence: the existing `_findModelInDropdown()` smart matcher already normalises both sides (lowercase, strip namespace prefix, dashes→dots) so a saved bare `anthropic/claude-opus-4.6` resolves to the `@nous:anthropic/claude-opus-4.6` option automatically. Applied this in panels.js via `_applyModelToDropdown()`. Changes: api/config.py revert the @-prefix preservation; persist the resolved bare/slash form (CLI-compatible) static/panels.js Settings picker uses _applyModelToDropdown() instead of raw `.value =` so saved bare forms still select the matching @nous: option tests test renamed + asserts bare persisted form; new test locks the smart-matcher contract This also improves behaviour for a dormant case not flagged in #895: a user who set their default via `hermes model X` and opens Settings for the first time used to see a blank picker (bare form vs prefixed options). Now the smart matcher finds the right option, so the "open Settings → save → bare form in config.yaml" round-trip is stable for both CLI- and WebUI-origin saves. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * chore: update CHANGELOG v0.50.171 — bare-form persistence + picker smart-match --------- Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-23 17:44:10 +00:00
# Portal providers (Nous, OpenCode) serve models from multiple upstream
# namespaces — check them BEFORE the config_base_url branch so that a
# Nous user whose config.yaml also has a base_url doesn't accidentally
# fall into the prefix-stripping path (#894: minimax/minimax-m2.7 → bare
# name sent to Nous → 404 because Nous requires the full namespace path).
# NVIDIA NIM also serves models from multiple namespaces (qwen, nvidia, etc.)
# and requires the full model path.
_PORTAL_PROVIDERS = {"nous", "opencode-zen", "opencode-go", "nvidia"}
fix(models): preserve @nous: prefix in settings + fix cross-namespace 404 for Nous (#895 #894) (#901) * fix(models): preserve @nous: prefix in settings + fix cross-namespace 404 for Nous (#895 #894) * fix(review): persist bare form for CLI compatibility + picker smart-match The PR persisted `@nous:anthropic/claude-opus-4.6` verbatim to config.yaml to make the Settings picker match its dropdown options (which carry the `@nous:` prefix after #885). That fixes the WebUI picker but introduces a cross-tool regression: hermes-agent's CLI reads `config.yaml -> model.default` directly and passes it to the provider API verbatim. For aggregator providers (Nous is one — see hermes_cli/model_normalize.py `_AGGREGATOR_PROVIDERS`), `normalize_model_for_provider` is skipped entirely (run_agent.py:887), so the literal `@nous:anthropic/...` string flows to the Nous API, which rejects it — breaking every user who runs `hermes` in the terminal right after saving via WebUI. Fix the tension at the picker rather than the persistence: the existing `_findModelInDropdown()` smart matcher already normalises both sides (lowercase, strip namespace prefix, dashes→dots) so a saved bare `anthropic/claude-opus-4.6` resolves to the `@nous:anthropic/claude-opus-4.6` option automatically. Applied this in panels.js via `_applyModelToDropdown()`. Changes: api/config.py revert the @-prefix preservation; persist the resolved bare/slash form (CLI-compatible) static/panels.js Settings picker uses _applyModelToDropdown() instead of raw `.value =` so saved bare forms still select the matching @nous: option tests test renamed + asserts bare persisted form; new test locks the smart-matcher contract This also improves behaviour for a dormant case not flagged in #895: a user who set their default via `hermes model X` and opens Settings for the first time used to see a blank picker (bare form vs prefixed options). Now the smart matcher finds the right option, so the "open Settings → save → bare form in config.yaml" round-trip is stable for both CLI- and WebUI-origin saves. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * chore: update CHANGELOG v0.50.171 — bare-form persistence + picker smart-match --------- Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-23 17:44:10 +00:00
if config_provider in _PORTAL_PROVIDERS:
return model_id, config_provider, config_base_url
# The OpenAI Codex provider uses a real base_url, but its default
# ChatGPT endpoint cannot serve OpenRouter-style provider/model IDs.
# Keep that narrow exception before the custom endpoint protection so
# selecting openai/gpt-5.5 from OpenRouter under active Codex still
# routes through OpenRouter. Other base_url-backed real providers may be
# custom/proxy endpoints, so they must fall through to the branch below.
if (
config_provider == "openai-codex"
and str(config_base_url or "").strip().rstrip("/")
== "https://chatgpt.com/backend-api/codex"
and prefix in _PROVIDER_MODELS
and prefix != config_provider
):
return model_id, "openrouter", None
v0.47.0: dialogs, session menu, /skills, mobile fixes, mobile QA suite * fix: custom provider with slash model name no longer rerouted to OpenRouter (#255) When base_url is configured in config.yaml, resolve_model_provider() now trusts the configured provider/base_url entirely and skips the slash-based OpenRouter heuristic. Fixes google/gemma-4-26b-a4b with provider:custom being silently routed to OpenRouter, resulting in 401 errors. Fixes #230 * test: mobile layout regression suite — 14 tests for every QA run (#254) Adds tests/test_mobile_layout.py with 14 static regression tests that run on every QA pass to catch mobile layout breakage before it reaches prod. Covers: breakpoints at 900px/640px, right panel slide-over CSS, mobile overlay, bottom nav, files button, profile dropdown z-index, chip overflow, workspace close, 100dvh, 44px touch targets, 16px font-size on textarea. * feat: /skills slash command lists and filters available Hermes skills (#257) Adds /skills [query] command to commands.js. Fetches from /api/skills, groups by category (alphabetically sorted), displays as a formatted assistant message. Optional query filters by name, description, or category. i18n keys added for en, de, zh, zh-Hant. 1 regression test added. Fixes #248 * feat: shared app dialogs replace native confirm()/prompt() calls (#251) Adds showConfirmDialog() and showPromptDialog() helpers to ui.js, backed by a themed #appDialogOverlay. Replaces all 11 native browser confirm/prompt call sites across panels.js, sessions.js, ui.js, workspace.js. Supports: danger mode, keyboard focus trap (Tab/Escape/Enter), focus restore, ARIA roles, mobile-responsive stacked buttons at 640px. i18n for en/de/zh/zh-Hant. 5 new tests in test_sprint33.py verify markup, CSS, helpers, and absence of native dialog calls. Extracted from PR #242. * fix: Android Chrome mobile — workspace panel close + profile dropdown (#256) Fix #247: toggleMobileFiles() now shows/hides the mobile overlay when toggling the right workspace panel. New closeMobileFiles() helper closes the panel with correct overlay state tracking. Overlay onclick calls both closeMobileSidebar() and closeMobileFiles(). Mobile-only close button (x) added to workspace panel header. Fix #246: profile dropdown uses position:fixed;top:56px;right:8px at max-width:900px, escaping the overflow-x:auto stacking context that was clipping it on Android Chrome. Fix applied during review: closeMobileSidebar() now checks if the right panel is still open before hiding the overlay, preventing the overlay from disappearing when only the sidebar is closed. Fixes #247 Fixes #246 * feat: session ⋯ action dropdown replaces per-row buttons (#252) Replaces the 5 per-row hover action buttons (pin/move/archive/duplicate/trash) with a single ⋯ trigger that opens a positioned dropdown menu. Menu has full keyboard (Escape), click-outside, scroll, and resize-reposition handling. Position:fixed prevents sidebar clipping. 5 actions: Pin/Unpin, Move to project, Archive/Unarchive, Duplicate, Delete (danger style). Each with icon and descriptive subtitle. Updated test_sprint16.py: test_sessions_js_uses_action_menu_not_per_row_buttons asserts the new trigger and menu functions exist, old per-row classes are gone. Extracted from PR #242. * docs: v0.47.0 release notes, bump version, update test counts (645) --------- Co-authored-by: Nathan Esquenazi <nesquena@gmail.com>
2026-04-11 19:19:12 +00:00
# If a custom endpoint base_url is configured, don't reroute through OpenRouter
# just because the model name contains a slash (e.g. google/gemma-4-26b-a4b).
# The user has explicitly pointed at a base_url, so trust their routing config.
if config_base_url:
# Only strip the provider prefix when it's a known provider namespace
# (e.g. "openai/gpt-5.4" → "gpt-5.4" for a custom OpenAI-compatible proxy).
# Unknown prefixes (e.g. "zai-org/GLM-5.1" on DeepInfra) are intrinsic to
# the model ID and must be preserved — stripping them causes model_not_found.
if prefix in _PROVIDER_MODELS:
return bare, config_provider, config_base_url
# Unknown prefix (not a named provider) — pass full model_id through.
return model_id, config_provider, config_base_url
# If prefix does NOT match config provider, the user picked a cross-provider model
# from the OpenRouter dropdown (e.g. config=anthropic but picked openai/gpt-5.4-mini).
# In this case always route through openrouter with the full provider/model string.
if prefix in _PROVIDER_MODELS and prefix != config_provider:
return model_id, "openrouter", None
return model_id, config_provider, config_base_url
def model_with_provider_context(model_id: str, model_provider: str | None = None) -> str:
"""Return the model string to pass to ``resolve_model_provider()``.
Session persistence keeps the user's selected provider in ``model_provider``
instead of forcing every selected model into ``@provider:model`` form. At
runtime, however, ``resolve_model_provider()`` still understands that
internal disambiguation form, so use it only when the provider context is
needed to route away from the current default provider.
"""
model = str(model_id or "").strip()
provider = str(model_provider or "").strip().lower()
if not model or not provider or provider == "default" or model.startswith("@"):
return model
model_cfg = cfg.get("model", {})
config_provider = None
if isinstance(model_cfg, dict):
config_provider = str(model_cfg.get("provider") or "").strip().lower()
# If the selected provider is already the configured provider, leaving the
# model bare preserves provider-specific base_url/proxy settings.
if provider == config_provider:
return model
# OpenRouter selections with slash IDs are explicit provider/model paths.
if provider == "openrouter":
return f"@{provider}:{model}"
# For non-OpenRouter slash IDs, keep the ID intact so existing custom/proxy
# base_url routing and portal-provider handling remain in charge.
if "/" in model:
return model
return f"@{provider}:{model}"
def get_effective_default_model(config_data: dict | None = None) -> str:
"""Resolve the effective Hermes default model from config, then env overrides."""
active_cfg = config_data if config_data is not None else cfg
default_model = DEFAULT_MODEL
model_cfg = active_cfg.get("model", {})
if isinstance(model_cfg, str):
default_model = model_cfg.strip()
elif isinstance(model_cfg, dict):
cfg_default = str(model_cfg.get("default") or "").strip()
if cfg_default:
default_model = cfg_default
env_model = (
os.getenv("HERMES_MODEL") or os.getenv("OPENAI_MODEL") or os.getenv("LLM_MODEL")
)
if env_model:
default_model = env_model.strip()
return default_model
# ── Reasoning config (CLI parity for /reasoning) ─────────────────────────────
# Mirrors hermes_constants.parse_reasoning_effort so WebUI can validate without
# importing from the agent tree (which may not be installed). Any drift here
# will show up in the shared test suite since both sides accept the same set.
VALID_REASONING_EFFORTS = ("minimal", "low", "medium", "high", "xhigh")
def parse_reasoning_effort(effort):
"""Parse an effort level into the dict the agent expects.
Returns None when *effort* is empty or unrecognised (caller interprets as
"use default"), ``{"enabled": False}`` for ``"none"``, and
``{"enabled": True, "effort": <level>}`` for any of
``VALID_REASONING_EFFORTS``.
"""
if not effort or not str(effort).strip():
return None
eff = str(effort).strip().lower()
if eff == "none":
return {"enabled": False}
if eff in VALID_REASONING_EFFORTS:
return {"enabled": True, "effort": eff}
return None
def get_reasoning_status() -> dict:
"""Return current reasoning configuration from the active profile's
config.yaml — the same source of truth the CLI reads from.
Keys:
- show_reasoning: bool — from ``display.show_reasoning`` (default True)
- reasoning_effort: str — from ``agent.reasoning_effort`` ('' = default)
"""
config_data = _load_yaml_config_file(_get_config_path())
display_cfg = config_data.get("display") or {}
agent_cfg = config_data.get("agent") or {}
show_raw = display_cfg.get("show_reasoning") if isinstance(display_cfg, dict) else None
effort_raw = agent_cfg.get("reasoning_effort") if isinstance(agent_cfg, dict) else None
return {
# Match CLI default (True if unset in config.yaml)
"show_reasoning": bool(show_raw) if isinstance(show_raw, bool) else True,
"reasoning_effort": str(effort_raw or "").strip().lower(),
}
def set_reasoning_display(show: bool) -> dict:
"""Persist ``display.show_reasoning`` to the active profile's config.yaml.
Mirrors CLI ``/reasoning show|hide``: writes the same key that the CLI
writes, so the preference is shared across the WebUI and the terminal
REPL for the same profile.
"""
config_path = _get_config_path()
with _cfg_lock:
config_data = _load_yaml_config_file(config_path)
display_cfg = config_data.get("display")
if not isinstance(display_cfg, dict):
display_cfg = {}
display_cfg["show_reasoning"] = bool(show)
config_data["display"] = display_cfg
_save_yaml_config_file(config_path, config_data)
reload_config()
return get_reasoning_status()
def set_reasoning_effort(effort: str) -> dict:
"""Persist ``agent.reasoning_effort`` to the active profile's config.yaml.
Mirrors CLI ``/reasoning <level>``: same key, same valid values
(``none`` | ``minimal`` | ``low`` | ``medium`` | ``high`` | ``xhigh``).
Raises ``ValueError`` on an unrecognised level so callers can return 400.
"""
raw = str(effort or "").strip().lower()
if not raw:
raise ValueError("effort is required")
if raw != "none" and raw not in VALID_REASONING_EFFORTS:
raise ValueError(
f"Unknown reasoning effort '{effort}'. "
f"Valid: none, {', '.join(VALID_REASONING_EFFORTS)}."
)
config_path = _get_config_path()
with _cfg_lock:
config_data = _load_yaml_config_file(config_path)
agent_cfg = config_data.get("agent")
if not isinstance(agent_cfg, dict):
agent_cfg = {}
agent_cfg["reasoning_effort"] = raw
config_data["agent"] = agent_cfg
_save_yaml_config_file(config_path, config_data)
reload_config()
return get_reasoning_status()
def set_hermes_default_model(model_id: str) -> dict:
"""Persist the Hermes default model in config.yaml and reload runtime config."""
selected_model = str(model_id or "").strip()
if not selected_model:
raise ValueError("model is required")
config_path = _get_config_path()
# Hold _cfg_lock only around the read-modify-write of the YAML file.
# reload_config() acquires _cfg_lock internally (it's not reentrant) so
# it must be called AFTER releasing the lock to avoid deadlock.
with _cfg_lock:
config_data = _load_yaml_config_file(config_path)
model_cfg = config_data.get("model", {})
if not isinstance(model_cfg, dict):
model_cfg = {}
previous_provider = str(model_cfg.get("provider") or "").strip()
resolved_model, resolved_provider, resolved_base_url = resolve_model_provider(
selected_model
)
fix(models): preserve @nous: prefix in settings + fix cross-namespace 404 for Nous (#895 #894) (#901) * fix(models): preserve @nous: prefix in settings + fix cross-namespace 404 for Nous (#895 #894) * fix(review): persist bare form for CLI compatibility + picker smart-match The PR persisted `@nous:anthropic/claude-opus-4.6` verbatim to config.yaml to make the Settings picker match its dropdown options (which carry the `@nous:` prefix after #885). That fixes the WebUI picker but introduces a cross-tool regression: hermes-agent's CLI reads `config.yaml -> model.default` directly and passes it to the provider API verbatim. For aggregator providers (Nous is one — see hermes_cli/model_normalize.py `_AGGREGATOR_PROVIDERS`), `normalize_model_for_provider` is skipped entirely (run_agent.py:887), so the literal `@nous:anthropic/...` string flows to the Nous API, which rejects it — breaking every user who runs `hermes` in the terminal right after saving via WebUI. Fix the tension at the picker rather than the persistence: the existing `_findModelInDropdown()` smart matcher already normalises both sides (lowercase, strip namespace prefix, dashes→dots) so a saved bare `anthropic/claude-opus-4.6` resolves to the `@nous:anthropic/claude-opus-4.6` option automatically. Applied this in panels.js via `_applyModelToDropdown()`. Changes: api/config.py revert the @-prefix preservation; persist the resolved bare/slash form (CLI-compatible) static/panels.js Settings picker uses _applyModelToDropdown() instead of raw `.value =` so saved bare forms still select the matching @nous: option tests test renamed + asserts bare persisted form; new test locks the smart-matcher contract This also improves behaviour for a dormant case not flagged in #895: a user who set their default via `hermes model X` and opens Settings for the first time used to see a blank picker (bare form vs prefixed options). Now the smart matcher finds the right option, so the "open Settings → save → bare form in config.yaml" round-trip is stable for both CLI- and WebUI-origin saves. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * chore: update CHANGELOG v0.50.171 — bare-form persistence + picker smart-match --------- Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-23 17:44:10 +00:00
# Persist the resolved bare/slash form, NOT the `@provider:` prefix. The
# prefix is a WebUI-internal routing hint that the hermes-agent CLI does
# not understand — if we wrote `@nous:anthropic/claude-opus-4.6` to
# config.yaml, a user who ran `hermes` in the terminal right after
# saving via WebUI would have the agent send that literal string to the
# Nous API, which would reject it (Nous expects `anthropic/claude-opus-4.6`,
# not the prefixed form). The Settings picker handles the resulting
# CLI-shaped bare form via `_applyModelToDropdown()`'s normalising
# matcher — see `static/panels.js` (#895).
persisted_model = str(resolved_model or selected_model).strip()
persisted_provider = str(resolved_provider or previous_provider or "").strip()
# Never persist the bogus ``local`` value — see #1384. The auto-detect
# block in ``_build_available_models_uncached`` was rewriting unknown
# loopback hosts to ``provider: "local"``, which is not registered and
# broke compression/vision mid-conversation. Route through ``custom``
# so the agent's auxiliary client uses the ``no-key-required`` path.
if persisted_provider.lower() == "local":
persisted_provider = "custom"
model_cfg["default"] = persisted_model
if persisted_provider:
model_cfg["provider"] = persisted_provider
if resolved_base_url:
model_cfg["base_url"] = str(resolved_base_url).strip().rstrip("/")
elif persisted_provider != previous_provider:
if persisted_provider == "openai":
model_cfg["base_url"] = "https://api.openai.com/v1"
elif not persisted_provider.startswith("custom:"):
model_cfg.pop("base_url", None)
config_data["model"] = model_cfg
_save_yaml_config_file(config_path, config_data)
# Reload outside the lock — reload_config() acquires _cfg_lock itself.
reload_config()
fix(models): preserve @nous: prefix in settings + fix cross-namespace 404 for Nous (#895 #894) (#901) * fix(models): preserve @nous: prefix in settings + fix cross-namespace 404 for Nous (#895 #894) * fix(review): persist bare form for CLI compatibility + picker smart-match The PR persisted `@nous:anthropic/claude-opus-4.6` verbatim to config.yaml to make the Settings picker match its dropdown options (which carry the `@nous:` prefix after #885). That fixes the WebUI picker but introduces a cross-tool regression: hermes-agent's CLI reads `config.yaml -> model.default` directly and passes it to the provider API verbatim. For aggregator providers (Nous is one — see hermes_cli/model_normalize.py `_AGGREGATOR_PROVIDERS`), `normalize_model_for_provider` is skipped entirely (run_agent.py:887), so the literal `@nous:anthropic/...` string flows to the Nous API, which rejects it — breaking every user who runs `hermes` in the terminal right after saving via WebUI. Fix the tension at the picker rather than the persistence: the existing `_findModelInDropdown()` smart matcher already normalises both sides (lowercase, strip namespace prefix, dashes→dots) so a saved bare `anthropic/claude-opus-4.6` resolves to the `@nous:anthropic/claude-opus-4.6` option automatically. Applied this in panels.js via `_applyModelToDropdown()`. Changes: api/config.py revert the @-prefix preservation; persist the resolved bare/slash form (CLI-compatible) static/panels.js Settings picker uses _applyModelToDropdown() instead of raw `.value =` so saved bare forms still select the matching @nous: option tests test renamed + asserts bare persisted form; new test locks the smart-matcher contract This also improves behaviour for a dormant case not flagged in #895: a user who set their default via `hermes model X` and opens Settings for the first time used to see a blank picker (bare form vs prefixed options). Now the smart matcher finds the right option, so the "open Settings → save → bare form in config.yaml" round-trip is stable for both CLI- and WebUI-origin saves. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * chore: update CHANGELOG v0.50.171 — bare-form persistence + picker smart-match --------- Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-23 17:44:10 +00:00
# Invalidate the TTL cache so the next /api/models call returns fresh data
# with the new default model. Do NOT call get_available_models() here —
# it triggers a live provider fetch (up to 8s) that blocks the HTTP response
# to the browser, causing a visible freeze on every Settings save (#895).
invalidate_models_cache()
fix(models): preserve @nous: prefix in settings + fix cross-namespace 404 for Nous (#895 #894) (#901) * fix(models): preserve @nous: prefix in settings + fix cross-namespace 404 for Nous (#895 #894) * fix(review): persist bare form for CLI compatibility + picker smart-match The PR persisted `@nous:anthropic/claude-opus-4.6` verbatim to config.yaml to make the Settings picker match its dropdown options (which carry the `@nous:` prefix after #885). That fixes the WebUI picker but introduces a cross-tool regression: hermes-agent's CLI reads `config.yaml -> model.default` directly and passes it to the provider API verbatim. For aggregator providers (Nous is one — see hermes_cli/model_normalize.py `_AGGREGATOR_PROVIDERS`), `normalize_model_for_provider` is skipped entirely (run_agent.py:887), so the literal `@nous:anthropic/...` string flows to the Nous API, which rejects it — breaking every user who runs `hermes` in the terminal right after saving via WebUI. Fix the tension at the picker rather than the persistence: the existing `_findModelInDropdown()` smart matcher already normalises both sides (lowercase, strip namespace prefix, dashes→dots) so a saved bare `anthropic/claude-opus-4.6` resolves to the `@nous:anthropic/claude-opus-4.6` option automatically. Applied this in panels.js via `_applyModelToDropdown()`. Changes: api/config.py revert the @-prefix preservation; persist the resolved bare/slash form (CLI-compatible) static/panels.js Settings picker uses _applyModelToDropdown() instead of raw `.value =` so saved bare forms still select the matching @nous: option tests test renamed + asserts bare persisted form; new test locks the smart-matcher contract This also improves behaviour for a dormant case not flagged in #895: a user who set their default via `hermes model X` and opens Settings for the first time used to see a blank picker (bare form vs prefixed options). Now the smart matcher finds the right option, so the "open Settings → save → bare form in config.yaml" round-trip is stable for both CLI- and WebUI-origin saves. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * chore: update CHANGELOG v0.50.171 — bare-form persistence + picker smart-match --------- Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-23 17:44:10 +00:00
return {"ok": True, "model": persisted_model}
# ── TTL cache for get_available_models() ─────────────────────────────────────
_available_models_cache: dict | None = None
_available_models_cache_ts: float = 0.0
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
_AVAILABLE_MODELS_CACHE_TTL: float = 86400.0 # 24 hours
_available_models_cache_lock = threading.RLock() # must be RLock: cold path refactoring moved slow work inside this lock, requiring re-entry
_cache_build_cv = threading.Condition(_available_models_cache_lock) # shares underlying RLock so notify_all() is safe inside with _available_models_cache_lock
_cache_build_in_progress = False # True while a cold path is actively building
# Cache for credential pool results -- calling load_pool() per-provider per-server
# session is expensive (~10s for zai due to endpoint probing). The credential pool
# only changes when the user adds/removes credentials, which is rare; a 24h TTL
# is plenty safe and ensures get_available_models() cold paths are fast.
_CREDENTIAL_POOL_CACHE: dict[str, tuple[float, "CredentialPool"]] = {} # pid -> (ts, pool)
_provider_models_invalidated_ts: dict[str, float] = {} # provider_id -> timestamp of last invalidation
# Disk-backed in-memory cache for get_available_models().
# Written to disk on every cache population so the cache survives server restarts.
# Invalidated (file deleted) whenever a provider is added/changed/removed or
# config.yaml changes. A TTL is still used as a fallback in case the invalidation
# signal is somehow missed, but the cache will always be warm after the first
# page load following a server start.
# Cache file lives inside STATE_DIR so each server instance (different
# HERMES_WEBUI_STATE_DIR / port) has its own file and test runs never
# pollute the production server's cache. Also works on macOS and Windows
# where /dev/shm does not exist.
_models_cache_path = STATE_DIR / "models_cache.json"
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
def _delete_models_cache_on_disk() -> None:
try:
os.unlink(str(_models_cache_path))
except OSError:
pass # already absent
def _is_valid_models_cache(cache: object) -> bool:
"""Return True when a disk cache payload has the full /api/models shape."""
if not isinstance(cache, dict):
return False
if not {"active_provider", "default_model", "configured_model_badges", "groups"}.issubset(cache):
return False
active_provider = cache.get("active_provider")
return (
(active_provider is None or isinstance(active_provider, str))
and isinstance(cache.get("default_model"), str)
and isinstance(cache.get("configured_model_badges"), dict)
and isinstance(cache.get("groups"), list)
)
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
def _load_models_cache_from_disk() -> dict | None:
"""Load /api/models cache from disk if it exists and has current metadata."""
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
try:
import json as _j
2026-04-29 04:00:27 +00:00
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
if not _models_cache_path.exists():
return None
with open(_models_cache_path, encoding="utf-8") as f:
cache = _j.load(f)
return cache if _is_valid_models_cache(cache) else None
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
except Exception:
return None
def _save_models_cache_to_disk(cache: dict) -> None:
"""Save cache to disk so it survives server restarts."""
try:
if not _is_valid_models_cache(cache):
return
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
tmp = str(_models_cache_path) + f".{os.getpid()}.tmp"
with open(tmp, "w", encoding="utf-8") as f:
json.dump(
{
"active_provider": cache["active_provider"],
"default_model": cache["default_model"],
"configured_model_badges": cache["configured_model_badges"],
"groups": cache["groups"],
},
f,
indent=2,
)
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
os.rename(tmp, str(_models_cache_path))
except Exception:
pass # Non-fatal -- cache will rebuild on next call
2026-04-29 04:00:27 +00:00
def _get_fresh_memory_models_cache(now: float) -> dict | None:
"""Return a valid fresh in-memory /api/models cache, or clear stale shapes."""
global _available_models_cache, _available_models_cache_ts
if _available_models_cache is None:
return None
if (now - _available_models_cache_ts) >= _AVAILABLE_MODELS_CACHE_TTL:
return None
if _is_valid_models_cache(_available_models_cache):
return copy.deepcopy(_available_models_cache)
_available_models_cache = None
_available_models_cache_ts = 0.0
return None
def invalidate_models_cache():
"""Force the TTL cache for get_available_models() to be cleared.
Call this after modifying config.cfg in-memory (e.g. in tests) so
the next call to get_available_models() picks up the changes rather
than returning a stale cached result.
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
Also deletes the on-disk cache so that a subsequent cold build does
not immediately reload a stale disk snapshot and skip the fresh build.
This is essential for test isolation: without the disk delete, tests
that call invalidate_models_cache() still get back the previous test's
result from the disk cache because the disk hit is checked before the memory
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
cache rebuild runs.
"""
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
global _cache_build_in_progress, _available_models_cache, _available_models_cache_ts, _cache_build_cv
with _available_models_cache_lock:
_available_models_cache = None
_available_models_cache_ts = 0.0
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
_cache_build_in_progress = False
_cache_build_cv.notify_all()
# Clear the credential pool cache too. The cache key is provider_id
# only, so without this, tests (and live provider key edits) see a
# stale CredentialPool from a prior auth_store payload — the test_
# credential_pool_providers suite was hitting this directly.
_CREDENTIAL_POOL_CACHE.clear()
# Also delete the disk cache so the next cold build starts fresh.
# Disk delete is outside the lock — file I/O shouldn't block other readers.
_delete_models_cache_on_disk()
def invalidate_provider_models_cache(provider_id: str):
"""Invalidate cached models for a single provider.
Also invalidates the full cache so that the next get_available_models()
call rebuilds all groups cleanly (the rebuilt provider is merged with any
other cached groups from the 24h TTL window). After the next
get_available_models() call, _provider_models_invalidated_ts[provider_id]
is cleared so the provider's fresh models are used.
Args:
provider_id: canonical provider id (e.g. 'openai', 'anthropic', 'custom:my-key')
"""
global _available_models_cache, _available_models_cache_ts, _CREDENTIAL_POOL_CACHE
with _available_models_cache_lock:
_available_models_cache = None
_available_models_cache_ts = 0.0
_provider_models_invalidated_ts[provider_id] = time.time()
# Also evict the credential pool so the next cold path re-loads it.
# Must evict both the original key and its canonical form (load_pool
# may be called with either, and both paths cache under their own key).
_CREDENTIAL_POOL_CACHE.pop(provider_id, None)
_CREDENTIAL_POOL_CACHE.pop(_resolve_provider_alias(provider_id), None)
_delete_models_cache_on_disk()
def _get_label_for_model(model_id: str, existing_groups: list) -> str:
"""Return a human-friendly label for *model_id*.
Resolution order:
1. If the model already appears in *existing_groups* with a label, use it.
2. Strip @provider: prefix and namespace prefix, then title-case.
This ensures the injected default model entry in the dropdown always shows
the same label as the live-fetched or static-catalog version, rather than
the raw lowercase ID string (#909).
"""
# Strip @provider: prefix for lookup
lookup_id = model_id
if lookup_id.startswith("@") and ":" in lookup_id:
lookup_id = lookup_id.split(":", 1)[1]
# Check existing groups for a matching label
_norm = lambda s: (s.split("/", 1)[-1] if "/" in s else s).replace("-", ".").lower()
norm_lookup = _norm(lookup_id)
for g in existing_groups:
for m in g.get("models", []):
if m.get("label") and _norm(str(m.get("id", ""))) == norm_lookup:
return m["label"]
# Fall back: capitalize each hyphen-separated word, preserve dots in version numbers.
# The catalog lookup above handles well-known models; this only fires for unlisted IDs.
bare = lookup_id.split("/")[-1] if "/" in lookup_id else lookup_id
return " ".join(
w.upper() if (len(w) <= 3 and w.replace(".", "").isalnum() and not w.isdigit()) else w.capitalize()
for w in bare.replace("_", "-").split("-")
)
2026-03-31 07:02:47 +00:00
def get_available_models() -> dict:
"""
Return available models grouped by provider.
Discovery order:
1. Read config.yaml 'model' section for active provider info
2. Check for known API keys in env or ~/.hermes/.env
3. Fetch models from custom endpoint if base_url is configured
4. Fall back to hardcoded model list (OpenRouter-style)
2026-03-31 07:02:47 +00:00
Returns: {
'active_provider': str|None,
'default_model': str,
'groups': [{'provider': str, 'models': [{'id': str, 'label': str}]}]
}
"""
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
global _cache_build_in_progress, _available_models_cache, _available_models_cache_ts, _cache_build_cv
# Config mtime check — must come before any config reads.
# (Test #585 verifies _current_mtime appears before active_provider = None)
try:
_current_mtime = Path(_get_config_path()).stat().st_mtime
except OSError:
_current_mtime = 0.0
if _current_mtime != _cfg_mtime:
reload_config()
# ── COLD PATH helper ─────────────────────────────────────────────────────
# Extracted so it runs inside _available_models_cache_lock (RLock) to
# prevent thundering-herd: only one thread rebuilds while others wait.
def _build_available_models_uncached() -> dict:
active_provider = None
default_model = get_effective_default_model(cfg)
groups = []
def _norm_model_id(model_id: str) -> str:
s = str(model_id or "").strip().lower()
if s.startswith("@") and ":" in s:
s = s.split(":", 1)[1]
if "/" in s:
s = s.split("/", 1)[1]
return s.replace("-", ".")
def _build_configured_model_badges() -> dict[str, dict[str, str]]:
configured_entries: list[dict[str, str]] = []
if active_provider and default_model:
configured_entries.append(
{
"provider": active_provider,
"model": default_model,
"role": "primary",
"label": "Primary",
}
)
fallback_cfg = cfg.get("fallback_providers", [])
if isinstance(fallback_cfg, list):
for idx, entry in enumerate(fallback_cfg, start=1):
if not isinstance(entry, dict):
continue
provider = _resolve_provider_alias(entry.get("provider"))
model = str(entry.get("model") or "").strip()
if not provider or not model:
continue
configured_entries.append(
{
"provider": provider,
"model": model,
"role": "fallback",
"label": f"Fallback {idx}",
}
)
option_ids = [m.get("id", "") for g in groups for m in g.get("models", []) if m.get("id")]
option_lookup = {str(opt_id): str(opt_id) for opt_id in option_ids}
option_provider_lookup = {
str(m.get("id")): str(g.get("provider_id") or "")
for g in groups
for m in g.get("models", [])
if m.get("id")
}
norm_lookup: dict[str, list[str]] = {}
for opt_id in option_ids:
norm_lookup.setdefault(_norm_model_id(opt_id), []).append(opt_id)
badges: dict[str, dict[str, str]] = {}
for entry in configured_entries:
provider = entry["provider"]
model = entry["model"]
raw_candidates = []
for candidate in (
model,
f"{provider}/{model}",
f"@{provider}:{model}",
):
if candidate and candidate not in raw_candidates:
raw_candidates.append(candidate)
match_id = None
exact_match = next((option_lookup[c] for c in raw_candidates if c in option_lookup), None)
for candidate in raw_candidates:
if candidate in option_lookup and option_provider_lookup.get(candidate) == provider:
match_id = option_lookup[candidate]
break
if match_id is None:
for candidate in raw_candidates:
normalized = _norm_model_id(candidate)
matches = norm_lookup.get(normalized, [])
if not matches:
continue
provider_match = next(
(m for m in matches if option_provider_lookup.get(m) == provider),
None,
)
match_id = provider_match or exact_match or matches[0]
if match_id:
break
badge_payload = {"role": entry["role"], "label": entry["label"], "provider": provider}
for candidate in raw_candidates:
candidate_provider = option_provider_lookup.get(candidate)
if candidate_provider and candidate_provider != provider:
continue
badges[candidate] = badge_payload
if match_id:
badges[match_id] = badge_payload
return badges
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
# 1. Read config.yaml model section
cfg_base_url = "" # must be defined before conditional blocks (#117)
model_cfg = cfg.get("model", {})
cfg_base_url = ""
if isinstance(model_cfg, str):
pass # default_model already set by get_effective_default_model
elif isinstance(model_cfg, dict):
active_provider = model_cfg.get("provider")
cfg_default = model_cfg.get("default", "")
cfg_base_url = model_cfg.get("base_url", "")
if cfg_default:
default_model = cfg_default
# Normalize active_provider to its canonical key
if active_provider:
active_provider = _resolve_provider_alias(active_provider)
# 2. Read auth store (active_provider fallback + credential_pool inspection)
auth_store = {}
try:
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
from api.profiles import get_active_hermes_home as _gah
2026-03-31 07:02:47 +00:00
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
auth_store_path = _gah() / "auth.json"
except ImportError:
auth_store_path = HOME / ".hermes" / "auth.json"
if auth_store_path.exists():
try:
import json as _j
2026-03-31 07:02:47 +00:00
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
auth_store = _j.loads(auth_store_path.read_text(encoding="utf-8"))
if not active_provider:
active_provider = _resolve_provider_alias(auth_store.get("active_provider"))
except Exception:
logger.debug("Failed to load auth store from %s", auth_store_path)
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
# 3. Detect available providers.
detected_providers = set()
if active_provider:
detected_providers.add(active_provider)
try:
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
_pool = auth_store.get("credential_pool", {}) if isinstance(auth_store, dict) else {}
if isinstance(_pool, dict) and _pool:
try:
from agent.credential_pool import load_pool as _load_pool
for _pid in list(_pool.keys()):
try:
_canonical_pid = _resolve_provider_alias(str(_pid))
# Check credential pool cache first
_cached = _CREDENTIAL_POOL_CACHE.get(_pid)
if _cached is not None:
_cp_ts, _cp_pool = _cached
if (time.time() - _cp_ts) < 86400.0:
_all_entries = _cp_pool.entries()
else:
_lp_t0 = time.monotonic()
_cp_pool = _load_pool(_pid)
_CREDENTIAL_POOL_CACHE[_pid] = (time.time(), _cp_pool)
_all_entries = _cp_pool.entries()
else:
_lp_t0 = time.monotonic()
_cp_pool = _load_pool(_pid)
_CREDENTIAL_POOL_CACHE[_pid] = (time.time(), _cp_pool)
_all_entries = _cp_pool.entries()
_explicit = [
e for e in _all_entries
if not _is_ambient_gh_cli_entry(
str(getattr(e, "source", "") or ""),
str(getattr(e, "label", "") or ""),
str(getattr(e, "key_source", "") or ""),
)
]
if _explicit:
detected_providers.add(_canonical_pid)
except Exception:
logger.debug("credential_pool.load_pool(%s) failed", _pid)
except ImportError:
for _pid, _entries in _pool.items():
if not isinstance(_entries, list) or len(_entries) == 0:
continue
_has_explicit_cred = any(
isinstance(_entry, dict)
and not _is_ambient_gh_cli_entry(
str(_entry.get("source", "") or ""),
str(_entry.get("label", "") or ""),
str(_entry.get("key_source", "") or ""),
)
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
for _entry in _entries
)
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
if _has_explicit_cred:
detected_providers.add(_resolve_provider_alias(str(_pid)))
except Exception:
logger.debug("Failed to inspect credential_pool from auth store")
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
all_env: dict = {}
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
_hermes_auth_used = False
try:
from hermes_cli.models import list_available_providers as _lap
from hermes_cli.auth import get_auth_status as _gas
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
for _p in _lap():
if not _p.get("authenticated"):
continue
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
try:
_src = _gas(_p["id"]).get("key_source", "")
if _src == "gh auth token":
continue
except Exception:
logger.debug("Failed to get key source for provider %s", _p.get("id", "unknown"))
detected_providers.add(_p["id"])
_hermes_auth_used = True
except Exception:
logger.debug("Failed to detect auth providers from hermes")
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
if not _hermes_auth_used:
try:
from api.profiles import get_active_hermes_home as _gah2
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
hermes_env_path = _gah2() / ".env"
except ImportError:
hermes_env_path = HOME / ".hermes" / ".env"
env_keys = {}
if hermes_env_path.exists():
try:
for line in hermes_env_path.read_text(encoding="utf-8").splitlines():
line = line.strip()
if line and not line.startswith("#") and "=" in line:
k, v = line.split("=", 1)
env_keys[k.strip()] = v.strip().strip('"').strip("'")
except Exception:
logger.debug("Failed to parse hermes env file")
all_env = {**env_keys}
for k in (
"ANTHROPIC_API_KEY",
"OPENAI_API_KEY",
"OPENROUTER_API_KEY",
"GOOGLE_API_KEY",
"GEMINI_API_KEY",
"GLM_API_KEY",
"KIMI_API_KEY",
"DEEPSEEK_API_KEY",
"OPENCODE_ZEN_API_KEY",
"OPENCODE_GO_API_KEY",
"MINIMAX_API_KEY",
"MINIMAX_CN_API_KEY",
v0.50.223: model picker, idle retry, drag-drop, CSP, clipboard copy (#1127) * fix(#604): model picker shows all configured providers Two fixes to ensure the model picker surface every provider a user has configured: 1. Added env var detection for XAI_API_KEY (→ x-ai) and MISTRAL_API_KEY (→ mistralai). Previously these providers were only detectable via hermes auth or credential pool, not via environment variables. 2. Added config.yaml providers section scanning. Users who configure providers in config.yaml (e.g. providers.anthropic.api_key) without setting the corresponding env var will now see those providers in the model picker. Only providers with known model catalogs are added. - Added 12 regression tests * fix(#1112): allow Google Fonts in CSP style-src and font-src Mermaid themes inject @import for fonts.googleapis.com at render time. CSP style-src blocked these requests, causing console violations. - Add https://fonts.googleapis.com to style-src (CSS stylesheets) - Add https://fonts.gstatic.com to font-src (WOFF2/WOFF font files) - Add 3 regression tests + verify existing CSP tests still pass * fix(#1118): retry api() calls on network errors after long idle After a long idle period, the browser's TCP keep-alive connection to the server can become stale. The next fetch() throws a TypeError (network failure), causing 'Failed to load session' instead of transparently reconnecting. - Added retry loop in api() (workspace.js): up to 3 attempts - Only retries on TypeError (network failures), NOT on HTTP errors (4xx/5xx) - 401 redirects still fire immediately - Added 6 regression tests * feat(#1116): composer placeholder reflects active profile name When a named profile is active (not 'default'), the composer placeholder and title bar show the profile name (capitalised) instead of the global bot_name. Falls back to bot_name/'Hermes' for the default profile. - boot.js: applyBotName() checks S.activeProfile before _botName - panels.js: switchToProfile() calls applyBotName() after switch - Added 5 regression tests * feat(#1097): drag and drop workspace files into chat composer Files and folders in the workspace file tree are now draggable. Dropping them into the composer inserts @path reference at cursor position. OS file drag-and-drop (attach files) still works. - ui.js: _renderTreeItems sets draggable + dragstart with ws-path - panels.js: drop handler checks for application/ws-path first, inserts @path with smart spacing and cursor positioning - Added 9 regression tests * fix(#1096): copy buttons work — add clipboard-write Permissions-Policy Copy buttons on messages and code blocks were silently failing because the Permissions-Policy header did not include clipboard-write=(self). Firefox blocks navigator.clipboard.writeText() without explicit permission. - api/helpers.py: add clipboard-write=(self) to Permissions-Policy - ui.js: _copyText now catches clipboard API errors and falls back to execCommand('copy'). _fallbackCopy extracted as separate function with proper focus() call and visible-but-hidden positioning (not -9999px) - Added 8 regression tests * chore: CHANGELOG for v0.50.223 --------- Co-authored-by: bergeouss <bergeouss@users.noreply.github.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com>
2026-04-26 22:29:02 +00:00
"XAI_API_KEY",
"MISTRAL_API_KEY",
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
):
val = os.getenv(k)
if val:
all_env[k] = val
if all_env.get("ANTHROPIC_API_KEY"):
detected_providers.add("anthropic")
if all_env.get("OPENAI_API_KEY"):
detected_providers.add("openai")
# openai-codex uses ChatGPT OAuth (not OPENAI_API_KEY) for its default endpoint.
# Detecting it here lets users who have both credentials configured find it in the
# picker without a manual config.yaml edit. Users without Codex OAuth will see
# picker entries but hit auth errors at inference time (#1189 known limitation).
detected_providers.add("openai-codex")
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
if all_env.get("OPENROUTER_API_KEY"):
detected_providers.add("openrouter")
if all_env.get("GOOGLE_API_KEY"):
detected_providers.add("google")
if all_env.get("GEMINI_API_KEY"):
detected_providers.add("gemini")
if all_env.get("GLM_API_KEY"):
detected_providers.add("zai")
if all_env.get("KIMI_API_KEY"):
detected_providers.add("kimi-coding")
2026-04-29 07:50:32 +00:00
if all_env.get("MINIMAX_API_KEY"):
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
detected_providers.add("minimax")
2026-04-29 07:50:32 +00:00
if all_env.get("MINIMAX_CN_API_KEY"):
detected_providers.add("minimax-cn")
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
if all_env.get("DEEPSEEK_API_KEY"):
detected_providers.add("deepseek")
v0.50.223: model picker, idle retry, drag-drop, CSP, clipboard copy (#1127) * fix(#604): model picker shows all configured providers Two fixes to ensure the model picker surface every provider a user has configured: 1. Added env var detection for XAI_API_KEY (→ x-ai) and MISTRAL_API_KEY (→ mistralai). Previously these providers were only detectable via hermes auth or credential pool, not via environment variables. 2. Added config.yaml providers section scanning. Users who configure providers in config.yaml (e.g. providers.anthropic.api_key) without setting the corresponding env var will now see those providers in the model picker. Only providers with known model catalogs are added. - Added 12 regression tests * fix(#1112): allow Google Fonts in CSP style-src and font-src Mermaid themes inject @import for fonts.googleapis.com at render time. CSP style-src blocked these requests, causing console violations. - Add https://fonts.googleapis.com to style-src (CSS stylesheets) - Add https://fonts.gstatic.com to font-src (WOFF2/WOFF font files) - Add 3 regression tests + verify existing CSP tests still pass * fix(#1118): retry api() calls on network errors after long idle After a long idle period, the browser's TCP keep-alive connection to the server can become stale. The next fetch() throws a TypeError (network failure), causing 'Failed to load session' instead of transparently reconnecting. - Added retry loop in api() (workspace.js): up to 3 attempts - Only retries on TypeError (network failures), NOT on HTTP errors (4xx/5xx) - 401 redirects still fire immediately - Added 6 regression tests * feat(#1116): composer placeholder reflects active profile name When a named profile is active (not 'default'), the composer placeholder and title bar show the profile name (capitalised) instead of the global bot_name. Falls back to bot_name/'Hermes' for the default profile. - boot.js: applyBotName() checks S.activeProfile before _botName - panels.js: switchToProfile() calls applyBotName() after switch - Added 5 regression tests * feat(#1097): drag and drop workspace files into chat composer Files and folders in the workspace file tree are now draggable. Dropping them into the composer inserts @path reference at cursor position. OS file drag-and-drop (attach files) still works. - ui.js: _renderTreeItems sets draggable + dragstart with ws-path - panels.js: drop handler checks for application/ws-path first, inserts @path with smart spacing and cursor positioning - Added 9 regression tests * fix(#1096): copy buttons work — add clipboard-write Permissions-Policy Copy buttons on messages and code blocks were silently failing because the Permissions-Policy header did not include clipboard-write=(self). Firefox blocks navigator.clipboard.writeText() without explicit permission. - api/helpers.py: add clipboard-write=(self) to Permissions-Policy - ui.js: _copyText now catches clipboard API errors and falls back to execCommand('copy'). _fallbackCopy extracted as separate function with proper focus() call and visible-but-hidden positioning (not -9999px) - Added 8 regression tests * chore: CHANGELOG for v0.50.223 --------- Co-authored-by: bergeouss <bergeouss@users.noreply.github.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com>
2026-04-26 22:29:02 +00:00
if all_env.get("XAI_API_KEY"):
detected_providers.add("x-ai")
if all_env.get("MISTRAL_API_KEY"):
detected_providers.add("mistralai")
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
if all_env.get("OPENCODE_ZEN_API_KEY"):
detected_providers.add("opencode-zen")
if all_env.get("OPENCODE_GO_API_KEY"):
detected_providers.add("opencode-go")
v0.50.223: model picker, idle retry, drag-drop, CSP, clipboard copy (#1127) * fix(#604): model picker shows all configured providers Two fixes to ensure the model picker surface every provider a user has configured: 1. Added env var detection for XAI_API_KEY (→ x-ai) and MISTRAL_API_KEY (→ mistralai). Previously these providers were only detectable via hermes auth or credential pool, not via environment variables. 2. Added config.yaml providers section scanning. Users who configure providers in config.yaml (e.g. providers.anthropic.api_key) without setting the corresponding env var will now see those providers in the model picker. Only providers with known model catalogs are added. - Added 12 regression tests * fix(#1112): allow Google Fonts in CSP style-src and font-src Mermaid themes inject @import for fonts.googleapis.com at render time. CSP style-src blocked these requests, causing console violations. - Add https://fonts.googleapis.com to style-src (CSS stylesheets) - Add https://fonts.gstatic.com to font-src (WOFF2/WOFF font files) - Add 3 regression tests + verify existing CSP tests still pass * fix(#1118): retry api() calls on network errors after long idle After a long idle period, the browser's TCP keep-alive connection to the server can become stale. The next fetch() throws a TypeError (network failure), causing 'Failed to load session' instead of transparently reconnecting. - Added retry loop in api() (workspace.js): up to 3 attempts - Only retries on TypeError (network failures), NOT on HTTP errors (4xx/5xx) - 401 redirects still fire immediately - Added 6 regression tests * feat(#1116): composer placeholder reflects active profile name When a named profile is active (not 'default'), the composer placeholder and title bar show the profile name (capitalised) instead of the global bot_name. Falls back to bot_name/'Hermes' for the default profile. - boot.js: applyBotName() checks S.activeProfile before _botName - panels.js: switchToProfile() calls applyBotName() after switch - Added 5 regression tests * feat(#1097): drag and drop workspace files into chat composer Files and folders in the workspace file tree are now draggable. Dropping them into the composer inserts @path reference at cursor position. OS file drag-and-drop (attach files) still works. - ui.js: _renderTreeItems sets draggable + dragstart with ws-path - panels.js: drop handler checks for application/ws-path first, inserts @path with smart spacing and cursor positioning - Added 9 regression tests * fix(#1096): copy buttons work — add clipboard-write Permissions-Policy Copy buttons on messages and code blocks were silently failing because the Permissions-Policy header did not include clipboard-write=(self). Firefox blocks navigator.clipboard.writeText() without explicit permission. - api/helpers.py: add clipboard-write=(self) to Permissions-Policy - ui.js: _copyText now catches clipboard API errors and falls back to execCommand('copy'). _fallbackCopy extracted as separate function with proper focus() call and visible-but-hidden positioning (not -9999px) - Added 8 regression tests * chore: CHANGELOG for v0.50.223 --------- Co-authored-by: bergeouss <bergeouss@users.noreply.github.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com>
2026-04-26 22:29:02 +00:00
# Also detect providers explicitly listed in config.yaml providers section.
# A user may configure a provider key via config.yaml providers.<name>.api_key
# without setting the corresponding env var. (#604)
_cfg_providers = cfg.get("providers", {})
if isinstance(_cfg_providers, dict):
for _pid_key in _cfg_providers:
if _pid_key in _PROVIDER_MODELS or _pid_key in cfg.get("providers", {}):
v0.50.223: model picker, idle retry, drag-drop, CSP, clipboard copy (#1127) * fix(#604): model picker shows all configured providers Two fixes to ensure the model picker surface every provider a user has configured: 1. Added env var detection for XAI_API_KEY (→ x-ai) and MISTRAL_API_KEY (→ mistralai). Previously these providers were only detectable via hermes auth or credential pool, not via environment variables. 2. Added config.yaml providers section scanning. Users who configure providers in config.yaml (e.g. providers.anthropic.api_key) without setting the corresponding env var will now see those providers in the model picker. Only providers with known model catalogs are added. - Added 12 regression tests * fix(#1112): allow Google Fonts in CSP style-src and font-src Mermaid themes inject @import for fonts.googleapis.com at render time. CSP style-src blocked these requests, causing console violations. - Add https://fonts.googleapis.com to style-src (CSS stylesheets) - Add https://fonts.gstatic.com to font-src (WOFF2/WOFF font files) - Add 3 regression tests + verify existing CSP tests still pass * fix(#1118): retry api() calls on network errors after long idle After a long idle period, the browser's TCP keep-alive connection to the server can become stale. The next fetch() throws a TypeError (network failure), causing 'Failed to load session' instead of transparently reconnecting. - Added retry loop in api() (workspace.js): up to 3 attempts - Only retries on TypeError (network failures), NOT on HTTP errors (4xx/5xx) - 401 redirects still fire immediately - Added 6 regression tests * feat(#1116): composer placeholder reflects active profile name When a named profile is active (not 'default'), the composer placeholder and title bar show the profile name (capitalised) instead of the global bot_name. Falls back to bot_name/'Hermes' for the default profile. - boot.js: applyBotName() checks S.activeProfile before _botName - panels.js: switchToProfile() calls applyBotName() after switch - Added 5 regression tests * feat(#1097): drag and drop workspace files into chat composer Files and folders in the workspace file tree are now draggable. Dropping them into the composer inserts @path reference at cursor position. OS file drag-and-drop (attach files) still works. - ui.js: _renderTreeItems sets draggable + dragstart with ws-path - panels.js: drop handler checks for application/ws-path first, inserts @path with smart spacing and cursor positioning - Added 9 regression tests * fix(#1096): copy buttons work — add clipboard-write Permissions-Policy Copy buttons on messages and code blocks were silently failing because the Permissions-Policy header did not include clipboard-write=(self). Firefox blocks navigator.clipboard.writeText() without explicit permission. - api/helpers.py: add clipboard-write=(self) to Permissions-Policy - ui.js: _copyText now catches clipboard API errors and falls back to execCommand('copy'). _fallbackCopy extracted as separate function with proper focus() call and visible-but-hidden positioning (not -9999px) - Added 8 regression tests * chore: CHANGELOG for v0.50.223 --------- Co-authored-by: bergeouss <bergeouss@users.noreply.github.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com>
2026-04-26 22:29:02 +00:00
detected_providers.add(_pid_key)
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
# 4. Fetch models from custom endpoint if base_url is configured
auto_detected_models = []
if cfg_base_url:
try:
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
import ipaddress
import urllib.request
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
base_url = cfg_base_url.strip()
if base_url.endswith("/v1"):
endpoint_url = base_url + "/models"
else:
endpoint_url = base_url.rstrip("/") + "/v1/models"
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
provider = "custom"
parsed = urlparse(base_url if "://" in base_url else f"http://{base_url}")
host = (parsed.netloc or parsed.path).lower()
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
if parsed.hostname:
try:
addr = ipaddress.ip_address(parsed.hostname)
if addr.is_private or addr.is_loopback or addr.is_link_local:
if "ollama" in host or "127.0.0.1" in host or "localhost" in host:
provider = "ollama"
elif "lmstudio" in host or "lm-studio" in host:
provider = "lmstudio"
else:
# Unknown loopback/private endpoint: route through
# the generic ``custom`` provider so the agent's
# auxiliary client (compression, vision, web
# extraction) takes the OpenAI-compat custom path
# with ``no-key-required`` semantics. Writing
# ``provider: local`` here used to break
# compression mid-conversation because ``local``
# is not a registered provider in
# ``hermes_cli.auth.PROVIDER_REGISTRY`` — see #1384.
provider = "custom"
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
except ValueError:
pass
headers = {}
api_key = ""
if isinstance(model_cfg, dict):
api_key = (model_cfg.get("api_key") or "").strip()
if not api_key:
providers_cfg = cfg.get("providers", {})
if isinstance(providers_cfg, dict):
for provider_key in filter(None, [active_provider, "custom"]):
provider_cfg = providers_cfg.get(provider_key, {})
if isinstance(provider_cfg, dict):
api_key = (provider_cfg.get("api_key") or "").strip()
if api_key:
break
if not api_key:
api_key_vars = (
"HERMES_API_KEY",
"HERMES_OPENAI_API_KEY",
"OPENAI_API_KEY",
"LOCAL_API_KEY",
"OPENROUTER_API_KEY",
"API_KEY",
)
for key in api_key_vars:
api_key = (all_env.get(key) or os.getenv(key) or "").strip()
if api_key:
break
if api_key:
headers["Authorization"] = f"Bearer {api_key}"
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
import socket
v0.50.221: copy HTTP fix, inline images, mobile tap, custom providers x2 (#1117) * fix(#1096): copy buttons fall back to execCommand on HTTP contexts - Add _copyText() helper: tries navigator.clipboard first, falls back to document.execCommand('copy') with hidden textarea when not in secure context - Update copyMsg() and addCopyButtons() to use helper instead of direct navigator.clipboard.writeText() - Code block copy button now has .catch() handler (was silently failing) - Error messages use t('copy_failed') for i18n instead of hardcoded string - Add copy_failed key to all 6 locale blocks (en, ru, es, de, zh, zh-Hant) - Add 10 regression tests * fix(#1095): render pasted/dragged images as inline preview instead of paperclip badge - User message attachments with image extensions now render as <img> via api/media endpoint, with click-to-fullscreen support - Non-image attachments still show paperclip + filename badge - Extracts filename from full path for display - Add 5 regression tests * fix: hoist _IMAGE_EXTS to module scope, add avif (absorb fix) * fix: improve mobile touch responsiveness for session list items iPad Safari has known issues with the click/dblclick pattern on touch: - :hover-triggered padding-right layout shift causes the first tap click to target the wrong element (actions button that just appeared) - No touch-action:manipulation means iOS still delays taps for double-tap zoom detection - The old onclick+ondblclick pattern is designed for mouse, not touch Changes: - CSS: Remove :hover from padding-right rule to prevent layout shift - CSS: Add touch-action:manipulation and -webkit-tap-highlight-color to .session-item for immediate tap response - JS: Replace onclick/ondblclick with onpointerup + manual 350ms double-tap detection — works consistently on mouse and touch * fix(#1106): iterate custom_providers[].models dict keys for dropdown population - After reading singular 'model' field, also iterate 'models' dict keys - Deduplicate: model field value not repeated if also in models dict - Skip non-string keys gracefully - Works for both named and unnamed custom_providers entries - Add 7 regression tests * fix(#1105): allow custom_providers hostnames through SSRF check - Build trusted hostname set from custom_providers[].base_url in config.yaml - These are user-explicitly configured endpoints — not SSRF risks - Hardcoded allowlist (ollama, localhost, 127.0.0.1, lmstudio) still active - Unknown private IPs still blocked - Add 7 tests (5 source analysis + 2 functional with mocked socket) * fix(tests): update hover padding assertions for #1110 touch fix (absorb) * fix(css): restore hover padding via @media (hover:hover) for mouse devices (absorb) * fix: filter right/middle-click from pointerup handler (absorb) * docs: v0.50.221 release notes and version bump --------- Co-authored-by: bergeouss <bergeouss@users.noreply.github.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: sheng <378978764@qq.com>
2026-04-26 17:36:59 +00:00
# Build set of hostnames from custom_providers config — these are
# user-explicitly configured endpoints and should not be blocked by SSRF.
_ssrf_trusted_hosts: set[str] = set()
# Also trust the base_url from model config (explicitly configured by user)
if cfg_base_url:
_base_parsed = urlparse(cfg_base_url if "://" in cfg_base_url else f"http://{cfg_base_url}")
if _base_parsed.hostname:
_ssrf_trusted_hosts.add(_base_parsed.hostname.lower())
v0.50.221: copy HTTP fix, inline images, mobile tap, custom providers x2 (#1117) * fix(#1096): copy buttons fall back to execCommand on HTTP contexts - Add _copyText() helper: tries navigator.clipboard first, falls back to document.execCommand('copy') with hidden textarea when not in secure context - Update copyMsg() and addCopyButtons() to use helper instead of direct navigator.clipboard.writeText() - Code block copy button now has .catch() handler (was silently failing) - Error messages use t('copy_failed') for i18n instead of hardcoded string - Add copy_failed key to all 6 locale blocks (en, ru, es, de, zh, zh-Hant) - Add 10 regression tests * fix(#1095): render pasted/dragged images as inline preview instead of paperclip badge - User message attachments with image extensions now render as <img> via api/media endpoint, with click-to-fullscreen support - Non-image attachments still show paperclip + filename badge - Extracts filename from full path for display - Add 5 regression tests * fix: hoist _IMAGE_EXTS to module scope, add avif (absorb fix) * fix: improve mobile touch responsiveness for session list items iPad Safari has known issues with the click/dblclick pattern on touch: - :hover-triggered padding-right layout shift causes the first tap click to target the wrong element (actions button that just appeared) - No touch-action:manipulation means iOS still delays taps for double-tap zoom detection - The old onclick+ondblclick pattern is designed for mouse, not touch Changes: - CSS: Remove :hover from padding-right rule to prevent layout shift - CSS: Add touch-action:manipulation and -webkit-tap-highlight-color to .session-item for immediate tap response - JS: Replace onclick/ondblclick with onpointerup + manual 350ms double-tap detection — works consistently on mouse and touch * fix(#1106): iterate custom_providers[].models dict keys for dropdown population - After reading singular 'model' field, also iterate 'models' dict keys - Deduplicate: model field value not repeated if also in models dict - Skip non-string keys gracefully - Works for both named and unnamed custom_providers entries - Add 7 regression tests * fix(#1105): allow custom_providers hostnames through SSRF check - Build trusted hostname set from custom_providers[].base_url in config.yaml - These are user-explicitly configured endpoints — not SSRF risks - Hardcoded allowlist (ollama, localhost, 127.0.0.1, lmstudio) still active - Unknown private IPs still blocked - Add 7 tests (5 source analysis + 2 functional with mocked socket) * fix(tests): update hover padding assertions for #1110 touch fix (absorb) * fix(css): restore hover padding via @media (hover:hover) for mouse devices (absorb) * fix: filter right/middle-click from pointerup handler (absorb) * docs: v0.50.221 release notes and version bump --------- Co-authored-by: bergeouss <bergeouss@users.noreply.github.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: sheng <378978764@qq.com>
2026-04-26 17:36:59 +00:00
_custom_providers_cfg = cfg.get("custom_providers", [])
if isinstance(_custom_providers_cfg, list):
for _cp in _custom_providers_cfg:
if not isinstance(_cp, dict):
continue
_cp_base = (_cp.get("base_url") or "").strip()
if _cp_base:
_cp_parsed = urlparse(_cp_base if "://" in _cp_base else f"http://{_cp_base}")
if _cp_parsed.hostname:
_ssrf_trusted_hosts.add(_cp_parsed.hostname.lower())
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
parsed_url = urlparse(
endpoint_url if "://" in endpoint_url else f"http://{endpoint_url}"
)
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
if parsed_url.scheme not in ("", "http", "https"):
raise ValueError(f"Invalid URL scheme: {parsed_url.scheme}")
if parsed_url.hostname:
try:
resolved_ips = socket.getaddrinfo(parsed_url.hostname, None)
for _, _, _, _, addr in resolved_ips:
addr_obj = ipaddress.ip_address(addr[0])
if addr_obj.is_private or addr_obj.is_loopback or addr_obj.is_link_local:
is_known_local = any(
k in (parsed_url.hostname or "").lower()
for k in (
"ollama",
"localhost",
"127.0.0.1",
"lmstudio",
"lm-studio",
)
v0.50.221: copy HTTP fix, inline images, mobile tap, custom providers x2 (#1117) * fix(#1096): copy buttons fall back to execCommand on HTTP contexts - Add _copyText() helper: tries navigator.clipboard first, falls back to document.execCommand('copy') with hidden textarea when not in secure context - Update copyMsg() and addCopyButtons() to use helper instead of direct navigator.clipboard.writeText() - Code block copy button now has .catch() handler (was silently failing) - Error messages use t('copy_failed') for i18n instead of hardcoded string - Add copy_failed key to all 6 locale blocks (en, ru, es, de, zh, zh-Hant) - Add 10 regression tests * fix(#1095): render pasted/dragged images as inline preview instead of paperclip badge - User message attachments with image extensions now render as <img> via api/media endpoint, with click-to-fullscreen support - Non-image attachments still show paperclip + filename badge - Extracts filename from full path for display - Add 5 regression tests * fix: hoist _IMAGE_EXTS to module scope, add avif (absorb fix) * fix: improve mobile touch responsiveness for session list items iPad Safari has known issues with the click/dblclick pattern on touch: - :hover-triggered padding-right layout shift causes the first tap click to target the wrong element (actions button that just appeared) - No touch-action:manipulation means iOS still delays taps for double-tap zoom detection - The old onclick+ondblclick pattern is designed for mouse, not touch Changes: - CSS: Remove :hover from padding-right rule to prevent layout shift - CSS: Add touch-action:manipulation and -webkit-tap-highlight-color to .session-item for immediate tap response - JS: Replace onclick/ondblclick with onpointerup + manual 350ms double-tap detection — works consistently on mouse and touch * fix(#1106): iterate custom_providers[].models dict keys for dropdown population - After reading singular 'model' field, also iterate 'models' dict keys - Deduplicate: model field value not repeated if also in models dict - Skip non-string keys gracefully - Works for both named and unnamed custom_providers entries - Add 7 regression tests * fix(#1105): allow custom_providers hostnames through SSRF check - Build trusted hostname set from custom_providers[].base_url in config.yaml - These are user-explicitly configured endpoints — not SSRF risks - Hardcoded allowlist (ollama, localhost, 127.0.0.1, lmstudio) still active - Unknown private IPs still blocked - Add 7 tests (5 source analysis + 2 functional with mocked socket) * fix(tests): update hover padding assertions for #1110 touch fix (absorb) * fix(css): restore hover padding via @media (hover:hover) for mouse devices (absorb) * fix: filter right/middle-click from pointerup handler (absorb) * docs: v0.50.221 release notes and version bump --------- Co-authored-by: bergeouss <bergeouss@users.noreply.github.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: sheng <378978764@qq.com>
2026-04-26 17:36:59 +00:00
) or (parsed_url.hostname or "").lower() in _ssrf_trusted_hosts
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
if not is_known_local:
raise ValueError(
f"SSRF: resolved hostname to private IP {addr[0]}"
)
except socket.gaierror:
pass
req = urllib.request.Request(endpoint_url, method="GET")
req.add_header("User-Agent", "OpenAI/Python 1.0")
for k, v in headers.items():
req.add_header(k, v)
with urllib.request.urlopen(req, timeout=10) as response: # nosec B310
data = json.loads(response.read().decode("utf-8"))
models_list = []
if "data" in data and isinstance(data["data"], list):
models_list = data["data"]
elif "models" in data and isinstance(data["models"], list):
models_list = data["models"]
for model in models_list:
if not isinstance(model, dict):
continue
model_id = (
model.get("id", "")
or model.get("name", "")
or model.get("model", "")
)
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
model_name = model.get("name", "") or model.get("model", "") or model_id
if model_id and model_name:
label = _format_ollama_label(model_id) if provider in ("ollama", "ollama-cloud") else model_name
auto_detected_models.append({"id": model_id, "label": label})
detected_providers.add(provider.lower())
except Exception:
logger.debug("Custom endpoint unreachable or misconfigured for provider: %s", provider)
_custom_providers_cfg = cfg.get("custom_providers", [])
_named_custom_groups: dict = {}
if isinstance(_custom_providers_cfg, list):
_seen_custom_ids = {m["id"] for m in auto_detected_models}
for _cp in _custom_providers_cfg:
if not isinstance(_cp, dict):
continue
_cp_name = (_cp.get("name") or "").strip()
v0.50.221: copy HTTP fix, inline images, mobile tap, custom providers x2 (#1117) * fix(#1096): copy buttons fall back to execCommand on HTTP contexts - Add _copyText() helper: tries navigator.clipboard first, falls back to document.execCommand('copy') with hidden textarea when not in secure context - Update copyMsg() and addCopyButtons() to use helper instead of direct navigator.clipboard.writeText() - Code block copy button now has .catch() handler (was silently failing) - Error messages use t('copy_failed') for i18n instead of hardcoded string - Add copy_failed key to all 6 locale blocks (en, ru, es, de, zh, zh-Hant) - Add 10 regression tests * fix(#1095): render pasted/dragged images as inline preview instead of paperclip badge - User message attachments with image extensions now render as <img> via api/media endpoint, with click-to-fullscreen support - Non-image attachments still show paperclip + filename badge - Extracts filename from full path for display - Add 5 regression tests * fix: hoist _IMAGE_EXTS to module scope, add avif (absorb fix) * fix: improve mobile touch responsiveness for session list items iPad Safari has known issues with the click/dblclick pattern on touch: - :hover-triggered padding-right layout shift causes the first tap click to target the wrong element (actions button that just appeared) - No touch-action:manipulation means iOS still delays taps for double-tap zoom detection - The old onclick+ondblclick pattern is designed for mouse, not touch Changes: - CSS: Remove :hover from padding-right rule to prevent layout shift - CSS: Add touch-action:manipulation and -webkit-tap-highlight-color to .session-item for immediate tap response - JS: Replace onclick/ondblclick with onpointerup + manual 350ms double-tap detection — works consistently on mouse and touch * fix(#1106): iterate custom_providers[].models dict keys for dropdown population - After reading singular 'model' field, also iterate 'models' dict keys - Deduplicate: model field value not repeated if also in models dict - Skip non-string keys gracefully - Works for both named and unnamed custom_providers entries - Add 7 regression tests * fix(#1105): allow custom_providers hostnames through SSRF check - Build trusted hostname set from custom_providers[].base_url in config.yaml - These are user-explicitly configured endpoints — not SSRF risks - Hardcoded allowlist (ollama, localhost, 127.0.0.1, lmstudio) still active - Unknown private IPs still blocked - Add 7 tests (5 source analysis + 2 functional with mocked socket) * fix(tests): update hover padding assertions for #1110 touch fix (absorb) * fix(css): restore hover padding via @media (hover:hover) for mouse devices (absorb) * fix: filter right/middle-click from pointerup handler (absorb) * docs: v0.50.221 release notes and version bump --------- Co-authored-by: bergeouss <bergeouss@users.noreply.github.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: sheng <378978764@qq.com>
2026-04-26 17:36:59 +00:00
_slug = ("custom:" + _cp_name.lower().replace(" ", "-")) if _cp_name else None
# Collect model IDs: singular "model" field first, then "models" dict keys
_cp_model_ids: list[str] = []
_cp_model = _cp.get("model", "")
if _cp_model:
_cp_model_ids.append(_cp_model)
_cp_models_dict = _cp.get("models")
if isinstance(_cp_models_dict, dict):
for _m_id in _cp_models_dict:
if isinstance(_m_id, str) and _m_id.strip() and _m_id not in _cp_model_ids:
_cp_model_ids.append(_m_id.strip())
for _cp_model in _cp_model_ids:
if _cp_model and _cp_model not in _seen_custom_ids:
_cp_label = _get_label_for_model(_cp_model, [])
_seen_custom_ids.add(_cp_model)
if _slug:
if _slug not in _named_custom_groups:
_named_custom_groups[_slug] = (_cp_name, [])
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
detected_providers.add(_slug)
2026-05-01 15:14:12 +00:00
_cp_option_id = _cp_model
if active_provider != _slug and not _cp_option_id.startswith("@"):
_cp_option_id = f"@{_slug}:{_cp_option_id}"
v0.50.221: copy HTTP fix, inline images, mobile tap, custom providers x2 (#1117) * fix(#1096): copy buttons fall back to execCommand on HTTP contexts - Add _copyText() helper: tries navigator.clipboard first, falls back to document.execCommand('copy') with hidden textarea when not in secure context - Update copyMsg() and addCopyButtons() to use helper instead of direct navigator.clipboard.writeText() - Code block copy button now has .catch() handler (was silently failing) - Error messages use t('copy_failed') for i18n instead of hardcoded string - Add copy_failed key to all 6 locale blocks (en, ru, es, de, zh, zh-Hant) - Add 10 regression tests * fix(#1095): render pasted/dragged images as inline preview instead of paperclip badge - User message attachments with image extensions now render as <img> via api/media endpoint, with click-to-fullscreen support - Non-image attachments still show paperclip + filename badge - Extracts filename from full path for display - Add 5 regression tests * fix: hoist _IMAGE_EXTS to module scope, add avif (absorb fix) * fix: improve mobile touch responsiveness for session list items iPad Safari has known issues with the click/dblclick pattern on touch: - :hover-triggered padding-right layout shift causes the first tap click to target the wrong element (actions button that just appeared) - No touch-action:manipulation means iOS still delays taps for double-tap zoom detection - The old onclick+ondblclick pattern is designed for mouse, not touch Changes: - CSS: Remove :hover from padding-right rule to prevent layout shift - CSS: Add touch-action:manipulation and -webkit-tap-highlight-color to .session-item for immediate tap response - JS: Replace onclick/ondblclick with onpointerup + manual 350ms double-tap detection — works consistently on mouse and touch * fix(#1106): iterate custom_providers[].models dict keys for dropdown population - After reading singular 'model' field, also iterate 'models' dict keys - Deduplicate: model field value not repeated if also in models dict - Skip non-string keys gracefully - Works for both named and unnamed custom_providers entries - Add 7 regression tests * fix(#1105): allow custom_providers hostnames through SSRF check - Build trusted hostname set from custom_providers[].base_url in config.yaml - These are user-explicitly configured endpoints — not SSRF risks - Hardcoded allowlist (ollama, localhost, 127.0.0.1, lmstudio) still active - Unknown private IPs still blocked - Add 7 tests (5 source analysis + 2 functional with mocked socket) * fix(tests): update hover padding assertions for #1110 touch fix (absorb) * fix(css): restore hover padding via @media (hover:hover) for mouse devices (absorb) * fix: filter right/middle-click from pointerup handler (absorb) * docs: v0.50.221 release notes and version bump --------- Co-authored-by: bergeouss <bergeouss@users.noreply.github.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: sheng <378978764@qq.com>
2026-04-26 17:36:59 +00:00
_named_custom_groups[_slug][1].append(
2026-05-01 15:14:12 +00:00
{"id": _cp_option_id, "label": _cp_label}
v0.50.221: copy HTTP fix, inline images, mobile tap, custom providers x2 (#1117) * fix(#1096): copy buttons fall back to execCommand on HTTP contexts - Add _copyText() helper: tries navigator.clipboard first, falls back to document.execCommand('copy') with hidden textarea when not in secure context - Update copyMsg() and addCopyButtons() to use helper instead of direct navigator.clipboard.writeText() - Code block copy button now has .catch() handler (was silently failing) - Error messages use t('copy_failed') for i18n instead of hardcoded string - Add copy_failed key to all 6 locale blocks (en, ru, es, de, zh, zh-Hant) - Add 10 regression tests * fix(#1095): render pasted/dragged images as inline preview instead of paperclip badge - User message attachments with image extensions now render as <img> via api/media endpoint, with click-to-fullscreen support - Non-image attachments still show paperclip + filename badge - Extracts filename from full path for display - Add 5 regression tests * fix: hoist _IMAGE_EXTS to module scope, add avif (absorb fix) * fix: improve mobile touch responsiveness for session list items iPad Safari has known issues with the click/dblclick pattern on touch: - :hover-triggered padding-right layout shift causes the first tap click to target the wrong element (actions button that just appeared) - No touch-action:manipulation means iOS still delays taps for double-tap zoom detection - The old onclick+ondblclick pattern is designed for mouse, not touch Changes: - CSS: Remove :hover from padding-right rule to prevent layout shift - CSS: Add touch-action:manipulation and -webkit-tap-highlight-color to .session-item for immediate tap response - JS: Replace onclick/ondblclick with onpointerup + manual 350ms double-tap detection — works consistently on mouse and touch * fix(#1106): iterate custom_providers[].models dict keys for dropdown population - After reading singular 'model' field, also iterate 'models' dict keys - Deduplicate: model field value not repeated if also in models dict - Skip non-string keys gracefully - Works for both named and unnamed custom_providers entries - Add 7 regression tests * fix(#1105): allow custom_providers hostnames through SSRF check - Build trusted hostname set from custom_providers[].base_url in config.yaml - These are user-explicitly configured endpoints — not SSRF risks - Hardcoded allowlist (ollama, localhost, 127.0.0.1, lmstudio) still active - Unknown private IPs still blocked - Add 7 tests (5 source analysis + 2 functional with mocked socket) * fix(tests): update hover padding assertions for #1110 touch fix (absorb) * fix(css): restore hover padding via @media (hover:hover) for mouse devices (absorb) * fix: filter right/middle-click from pointerup handler (absorb) * docs: v0.50.221 release notes and version bump --------- Co-authored-by: bergeouss <bergeouss@users.noreply.github.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: sheng <378978764@qq.com>
2026-04-26 17:36:59 +00:00
)
else:
auto_detected_models.append({"id": _cp_model, "label": _cp_label})
detected_providers.add("custom")
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
_has_custom_providers = isinstance(_custom_providers_cfg, list) and len(_custom_providers_cfg) > 0
if active_provider and active_provider != "custom" and not _has_custom_providers:
detected_providers.discard("custom")
for _slug in list(detected_providers):
if _slug.startswith("custom:") and not _has_custom_providers:
detected_providers.discard(_slug)
elif active_provider == "custom" and _has_custom_providers:
_has_unnamed = any(
isinstance(_cp, dict) and not (_cp.get("name") or "").strip()
for _cp in _custom_providers_cfg
)
if not _has_unnamed:
detected_providers.discard("custom")
release: v0.50.240 ## Release v0.50.240 Batch release of 13 PRs that passed full triage + code review + test suite (3199 tests, 0 failures). --- ### Added - **Compact tool activity mode** (`simplified_tool_calling`, default on) — groups tool calls and thinking traces into a single collapsed "Activity" disclosure card per assistant turn. Also adds a new **Calm Console** theme with earth/slate palette and serif prose. @Michaelyklam — #1282 - **PDF first-page preview** — `MEDIA:` `.pdf` files render a canvas thumbnail via PDF.js CDN (4 MB cap). **HTML sandbox iframe** — `.html`/`.htm` files render inline in a sandboxed `<iframe srcdoc>` (256 KB cap). 10 i18n keys × 7 locales. @bergeouss — #1280, closes #480 #482 - **Inline Excalidraw diagram preview** — `.excalidraw` files render as pure SVG (no external deps; rectangles, ellipses, diamonds, text, lines, arrows, freehand; 512 KB cap). @bergeouss — #1279, closes #479 - **Inline CSV table rendering** — fenced `csv` blocks and `MEDIA:` CSV files render as scrollable HTML tables with auto-separator detection. @bergeouss — #1277, closes #485 - **Inline SVG, audio, and video rendering** — SVG as `<img>`, audio as `<audio controls>`, video as `<video controls>`. @bergeouss — #1276, closes #481 - **Batch session select mode** — multi-select sessions for bulk Archive/Delete/Move. 11 i18n keys × 7 locales. @bergeouss — #1275, closes #568 - **Collapsible skill category headers** — click to collapse/expand without re-render; state persists across filter cycles. @bergeouss — #1281 - **`providers.only_configured` setting** — opt-in flag to restrict the model picker to explicitly configured providers. @KingBoyAndGirl — #1268 - **OpenCode Go model catalog** — adds Kimi K2.6, DeepSeek V4 Pro/Flash, MiMo V2.5/Pro, Qwen3.6/3.5 Plus. @nesquena-hermes — #1284, closes #1269 ### Fixed - **Profile `TERMINAL_CWD` TypeError** — `_build_agent_thread_env()` helper merges env before `_set_thread_env()` call. @hi-friday — #1266 - **Service worker subpath cache bypass** — regex now matches `/api/*` under any mount prefix. @Michaelyklam — #1278 - **SSE client disconnect leaks** — `TimeoutError`/`OSError` treated as clean disconnects; server backlog 64, threads daemonized; session list renders before saved-session restore. @KayZz69 — #1267 - **i18n locale corrections** — Korean MCP strings (23), Chinese MCP strings (23), zh-Hant missing keys (41), de missing keys (229). @bergeouss — #1274, closes #1273 --- ### Test results ``` 3199 passed, 2 skipped, 3 xpassed in 72.79s ``` ### PRs on hold (not included) #1265 (draft), #1271 (superseded by #1266), #1272 (skipped XSS tests), #1232 (partial test run), #1222 (review questions open), #1134 (live-server tests), #1132 (superseded by #1134), #1108 (negative UX review), #1084 (empty description)
2026-04-30 00:42:32 +00:00
# Filter providers if providers.only_configured is set
providers_cfg = cfg.get("providers", {})
only_show_configured = providers_cfg.get("only_configured", False) if isinstance(providers_cfg, dict) else False
if only_show_configured:
configured_providers = set()
if active_provider:
configured_providers.add(active_provider)
cfg_providers = cfg.get("providers", {})
if isinstance(cfg_providers, dict):
configured_providers.update(cfg_providers.keys())
# Only show providers that are both detected and configured
detected_providers = detected_providers.intersection(configured_providers)
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
# 5. Build model groups
if detected_providers:
for pid in sorted(detected_providers):
if pid.startswith("custom:") and pid in _named_custom_groups:
_nc_display, _nc_models = _named_custom_groups[pid]
if _nc_models:
groups.append({"provider": _nc_display, "provider_id": pid, "models": _nc_models})
continue
provider_name = _PROVIDER_DISPLAY.get(pid, pid.title())
if pid == "openrouter":
groups.append(
{
"provider": "OpenRouter",
"provider_id": "openrouter",
"models": [
{"id": m["id"], "label": m["label"]}
for m in _FALLBACK_MODELS
],
}
)
elif pid == "ollama-cloud":
raw_models = []
try:
from hermes_cli.models import provider_model_ids as _provider_model_ids
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
raw_models = [
{"id": mid, "label": _format_ollama_label(mid)}
for mid in (_provider_model_ids("ollama-cloud") or [])
]
except Exception:
logger.warning("Failed to load Ollama Cloud models from hermes_cli")
if raw_models:
models = _apply_provider_prefix(raw_models, pid, active_provider)
groups.append(
{
"provider": provider_name,
"provider_id": pid,
"models": models,
}
)
elif pid in _PROVIDER_MODELS or pid in cfg.get("providers", {}):
raw_models = copy.deepcopy(_PROVIDER_MODELS.get(pid, []))
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
provider_cfg = cfg.get("providers", {}).get(pid, {})
if isinstance(provider_cfg, dict) and "models" in provider_cfg:
cfg_models = provider_cfg["models"]
if isinstance(cfg_models, dict):
raw_models = [{"id": k, "label": k} for k in cfg_models.keys()]
elif isinstance(cfg_models, list):
raw_models = [{"id": k, "label": k} for k in cfg_models]
models = _apply_provider_prefix(raw_models, pid, active_provider)
groups.append(
{
"provider": provider_name,
"provider_id": pid,
"models": models,
}
)
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
else:
if auto_detected_models:
groups.append(
{
"provider": provider_name,
"provider_id": pid,
"models": auto_detected_models,
}
)
else:
if default_model:
label = _get_label_for_model(default_model, groups)
groups.append(
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
{"provider": "Default", "provider_id": "default", "models": [{"id": default_model, "label": label}]}
)
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
if default_model:
_norm = lambda mid: (mid.split("/", 1)[-1] if "/" in mid else mid).replace("-", ".")
all_ids_norm = {_norm(m["id"]) for g in groups for m in g.get("models", [])}
if _norm(default_model) not in all_ids_norm:
label = _get_label_for_model(default_model, groups)
target_display = (
_PROVIDER_DISPLAY.get(active_provider, active_provider or "").lower()
if active_provider
else ""
)
injected = False
for g in groups:
if target_display and g.get("provider", "").lower() == target_display:
g["models"].insert(0, {"id": default_model, "label": label})
injected = True
break
if not injected and groups:
groups.append(
{
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
"provider": "Default",
"provider_id": active_provider or "default",
"models": [{"id": default_model, "label": label}],
}
)
2026-03-31 07:02:47 +00:00
# Post-process: ensure model IDs are globally unique across groups.
# When multiple providers expose the same bare model ID, prefix
# collisions with @provider_id: so the frontend can distinguish them.
_deduplicate_model_ids(groups)
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
return {
"active_provider": active_provider,
"default_model": default_model,
"configured_model_badges": _build_configured_model_badges(),
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
"groups": groups,
}
# ── FAST PATH ─────────────────────────────────────────────────────────────
# Mark that a build may be in progress BEFORE acquiring the lock.
# If another thread has already started the cold path, we will wait for
# its result rather than running the cold path concurrently.
should_wait = _cache_build_in_progress
# Check config mtime OUTSIDE the lock so this cheap check doesn't serialize
# concurrent requests. Must come before any config reads in the cold path.
try:
_current_mtime = Path(_get_config_path()).stat().st_mtime
except OSError:
_current_mtime = 0.0
_cfg_changed = _current_mtime != _cfg_mtime
# Disk load BEFORE lock: ~0.1ms, lets concurrent requests skip entirely.
# Then acquire lock and check memory cache. Cold path runs inside the lock
# so only one thread rebuilds while others wait.
disk_groups = None
if _available_models_cache is None:
disk_groups = _load_models_cache_from_disk()
with _available_models_cache_lock:
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
# If another thread is already building, wait for its result instead
# of re-entering the cold path (avoids duplicate 10s zai load_pool calls).
if should_wait:
_cache_build_cv.wait_for(
lambda: not _cache_build_in_progress and _available_models_cache is not None,
timeout=60
)
2026-04-29 04:00:27 +00:00
cached = _get_fresh_memory_models_cache(time.monotonic())
if cached is not None:
return cached
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
# Reload config if changed
if _cfg_changed:
reload_config()
_available_models_cache = None
_available_models_cache_ts = 0.0
2026-04-29 04:00:27 +00:00
disk_groups = None
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
# Serve from memory cache if fresh
now = time.monotonic()
2026-04-29 04:00:27 +00:00
cached = _get_fresh_memory_models_cache(now)
if cached is not None:
return cached
v0.50.212: model cache perf (~30s→~1ms), session switch UX, cache isolation fix (#1063) * fix(models): disk cache now used on restart, cold path locked, 24h TTL Root causes fixed: - reload_config() was deleting disk cache on every server start (cfg_mtime 0.0 vs real mtime). Now saves old mtime before update and skips cache deletion on first-ever load. - Cold path was running outside the lock causing thundering herd on startup. Now extracted to _build_available_models_uncached() helper running inside RLock. - Disk cache was never being checked before lock acquisition. Now loads from disk BEFORE acquiring lock; cache hit returns without lock contention. - Credential pool load_pool() was called per-provider per-request (~10s for zai). Now cached in _CREDENTIAL_POOL_CACHE with 24h TTL. Result: /api/models returns in ~1ms on restart instead of ~30s. * fix(ui): block stale SSE events, cancel old stream on switch, clear pending files after send, focus textarea after switch, instant click for inactive sessions, rename session via titlebar dblclick Key UX improvements: - Block stale SSE responses from old sessions reaching new session DOM after switch - Cancel in-flight streaming when switching sessions - Clear pending files after send (prevents ghost attachments in tray) - Auto-focus message textarea after session switch - Instant click for inactive sessions (no loading spinner blocking) - Double-click app titlebar to rename active session - Persist/restore composer draft across session switches * style: add user-select:none to session titles to prevent accidental text selection * fix(models): prevent concurrent cold path runs with _cache_build_in_progress guard Thread 2 was re-entering the cold path (via RLock) while Thread 1 was still inside it, causing duplicate 10s zai load_pool() calls. The RLock allows re-entry from the same thread, defeating the 'only one cold path' guarantee. Now threads wait on _cache_build_cv instead of re-entering. * fix(models): add missing global declarations, move mtime check to outer scope for test * fix(models): attach _cache_build_cv to the RLock so notify_all() is safe * fix(models): evict _CREDENTIAL_POOL_CACHE entries when provider cache is invalidated Without this, invalidate_provider_models_cache(provider_id) cleared the models cache but left stale CredentialPool objects in _CREDENTIAL_POOL_CACHE for up to 24h. The next get_available_models() cold path would re-use the stale pool instead of re-loading, meaning new credentials added by the user wouldn't show up until the pool TTL expired. Now evicts both provider_id and its canonical alias from the pool cache so the next cold path re-loads from disk. * fix(merge): restore #1024/#1025 work in static/sessions.js after rebase The merge of master (commit 05d1ba9) resolved the static/sessions.js conflict by keeping the contributor's version, which silently dropped several pieces of work that had landed via PR #1024 and #1025: PR #1024 (session attention indicators): - _renderOneSession(s, isPinnedGroup=false) signature - body.appendChild(_renderOneSession(s, Boolean(g.isPinned))) - pinned-group dedup: if(s.pinned&&!isPinnedGroup) ... - last_message_at preference in _sessionTimestampMs - Right-slot attention indicator + hide-timestamp-when-attentive PR #1025 (session restore speed): - &resolve_model=0 on the loadSession metadata fetch - S.session._modelResolutionDeferred=true after assignment - _resolveSessionModelForDisplaySoon(sid) helper + invocation - &resolve_model=0 on the lazy full-message fetch Restoration approach: reset sessions.js to current master, then layer the contributor's #1060 additions on top: - _loadingSessionId global for stale-response discard - composer draft persistence on session switch (via S.composerDrafts) - _loadingSessionId !== sid bail-outs at every async await point - Cleanup _loadingSessionId = null at all exit paths Test outcome: - tests/test_issue856_pinned_indicator_layout.py: 5/5 (was 5/5 fail) - tests/test_session_metadata_fast_path.py: 5/5 (was 3/5 fail) - tests/test_session_sidebar_relative_time.py: 5/5 (was 1/5 fail) - Full suite: 2233 passed, 0 failed fix(models): clear _CREDENTIAL_POOL_CACHE in invalidate_models_cache The 24h-TTL credential pool cache introduced in this PR was keyed by provider_id only, so when a user added/changed credentials, or when tests called invalidate_models_cache() between cases with different auth payloads, the cached CredentialPool from the prior payload leaked into the new run. Two complementary fixes: 1. invalidate_models_cache() now also clears _CREDENTIAL_POOL_CACHE 2. invalidate_provider_models_cache(provider_id) pops just that provider's entry — surgical eviction for live key edits Pinned by tests/test_credential_pool_providers.py — 23/23 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: invalidate disk cache in invalidate_models_cache(); reset _cache_build_in_progress on exception 1. invalidate_models_cache() now calls _delete_models_cache_on_disk() so that the on-disk snapshot at /dev/shm is removed alongside the memory cache. Without this, _load_models_cache_from_disk() serves a stale prior-test result immediately after invalidation, breaking all test_credential_pool_providers and test_model_resolver tests that rely on get_available_models() returning fresh mocked data. 2. Wrap _build_available_models_uncached() in try/except so _cache_build_in_progress is always reset (+ notify_all) even if the rebuild raises unexpectedly, preventing waiting threads from being stuck at wait_for() for the full 60s timeout. 3. Fix misleading comment: "avoid deadlock" → "file I/O outside the lock". Co-authored-by: JKJameson <JKJameson@users.noreply.github.com> * docs: v0.50.212 release notes and version bump Model cache perf, session switch UX improvements, cache isolation fixes. --------- Co-authored-by: Josh <josh@fyul.link> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: JKJameson <JKJameson@users.noreply.github.com>
2026-04-26 01:24:30 +00:00
# Cold path: disk cache hit — use it (fast, no lock contention)
if disk_groups is not None:
_available_models_cache = disk_groups
_available_models_cache_ts = now
_save_models_cache_to_disk(disk_groups)
return copy.deepcopy(disk_groups)
# Cold path: full rebuild — only one thread reaches here at a time
with _cache_build_cv:
_cache_build_in_progress = True
try:
result = _build_available_models_uncached()
except Exception:
# Always reset the flag so waiting threads don't block for 60s
with _cache_build_cv:
_cache_build_in_progress = False
_cache_build_cv.notify_all()
raise
with _cache_build_cv:
_available_models_cache = result
_available_models_cache_ts = time.monotonic()
_cache_build_in_progress = False
_cache_build_cv.notify_all()
_save_models_cache_to_disk(result)
return copy.deepcopy(result)
2026-03-31 07:02:47 +00:00
# ── Static file path ─────────────────────────────────────────────────────────
_INDEX_HTML_PATH = REPO_ROOT / "static" / "index.html"
# ── Thread synchronisation ───────────────────────────────────────────────────
LOCK = threading.Lock()
SESSIONS_MAX = 100
CHAT_LOCK = threading.Lock()
STREAMS: dict = {}
STREAMS_LOCK = threading.Lock()
CANCEL_FLAGS: dict = {}
v0.46.0: security, Docker UID/GID, model discovery, i18n, cancel fix * fix: decode HTML entities before markdown processing + zh/zh-Hant translations (#239) Adds decode() helper in renderMd() to fix double-escaping of HTML entities from LLM output (e.g. &lt;code&gt; becoming &amp;lt;code&amp;gt; instead of rendering). XSS-safe: decode runs before esc(), only 5 entity patterns. Also adds 40+ missing zh (Simplified Chinese) translation keys and a new zh-Hant (Traditional Chinese) locale with 163 keys. Fix applied: removed duplicate settings_label_notifications key in both zh and zh-Hant locales. Fixes #240 * fix: restore custom model list discovery with config api key (#238) get_available_models() now reads api_key from config.yaml before env vars: 1. model.api_key 2. providers.<active>.api_key / providers.custom.api_key 3. env var fallbacks (HERMES_API_KEY, OPENAI_API_KEY, etc.) Also adds OpenAI/Python User-Agent header and a regression test covering authenticated /v1/models discovery. Fixes users with LM Studio / Ollama custom endpoints configured in config.yaml whose model picker silently collapsed to the default model. * feat: Docker UID/GID matching to avoid root-owned .hermes files (#237) Adds docker_init.bash with hermeswebuitoo/hermeswebui user pattern so container files match the host user UID/GID. Prevents .hermes volume mounts from being owned by root when using a non-root host user. Configure via WANTED_UID and WANTED_GID env vars (default 1000/1000). Readme updated with setup instructions. Fix applied: removed duplicate WANTED_GID=1000 line in docker-compose.yml that was overriding the ${GID:-1000} variable expansion. * security: redact credentials from API responses and fix credential file permissions (#243) Adds response-layer credential redaction to three endpoints: - GET /api/session — messages[], tool_calls[], and title - GET /api/session/export — download also redacted - SSE done event — session payload in stream - GET /api/memory — MEMORY.md and USER.md content Adds api/startup.py with fix_credential_permissions() at server startup. Adds 13 tests in tests/test_security_redaction.py. Merged with #237 container detection changes in server.py. * fix: cancel button now interrupts agent and cleans up UI state (#244) Wires agent.interrupt() into cancel_stream() so the backend actually stops tool execution when the user clicks Cancel, rather than only stopping the SSE stream while the agent keeps running. Changes: - api/config.py: adds AGENT_INSTANCES dict (stream_id -> AIAgent) - api/streaming.py: stores agent in AGENT_INSTANCES after creation, checks CANCEL_FLAGS immediately after store (race condition fix), calls agent.interrupt() in cancel_stream(), cleans up in finally block - static/boot.js: removes stale setStatus(cancelling) call - static/messages.js: setBusy(false)/setStatus('') unconditionally on cancel Race condition fix: after storing agent in AGENT_INSTANCES, immediately checks if CANCEL_FLAGS[stream_id] is already set (cancel arrived during agent init) and interrupts before starting. Check is inside the same STREAMS_LOCK acquisition, making it atomic. New test file: tests/test_cancel_interrupt.py with 6 unit tests. * docs: v0.46.0 release notes, bump version, update test counts --------- Co-authored-by: Nathan Esquenazi <nesquena@gmail.com>
2026-04-11 17:17:52 +00:00
AGENT_INSTANCES: dict = {} # stream_id -> AIAgent instance for interrupt propagation
STREAM_PARTIAL_TEXT: dict = {} # stream_id -> partial assistant text accumulated during streaming
STREAM_REASONING_TEXT: dict = {} # stream_id -> reasoning trace accumulated during streaming (#1361 §A)
STREAM_LIVE_TOOL_CALLS: dict = {} # stream_id -> live tool calls accumulated during streaming (#1361 §B)
SERVER_START_TIME = time.time()
v0.50.210: gpt-5.5, cron titles, agent cache, bfcache fix, onboarding fix, mermaid CSP, PWA auth (#1056) * feat(models): add gpt-5.5 to openai, openai-codex, copilot catalogs Adds GPT-5.5 and GPT-5.5 Mini entries to the static _PROVIDER_MODELS catalog so they appear in the model picker for the openai, openai-codex, and copilot providers. Signed-off-by: Pix (PiClaw, claude-opus-4-7) via Hermes Agent * fix(models): add gpt-5.5-mini to copilot provider catalog * fix(renderer): suppress Mermaid Google Fonts CSP violation via fontFamily inherit (#1044) Mermaid's built-in 'dark' and 'default' themes inject an @import for fonts.googleapis.com/Manrope into every generated SVG. The CSP style-src only allows cdn.jsdelivr.net, so this request is blocked on every diagram render, filling the console with CSP errors. Fix: pass fontFamily:'inherit' (and fontSize:'14px') in the themeVariables block of mermaid.initialize() in renderMermaidBlocks(). This suppresses Mermaid's external font import and uses the page's existing font stack. Avoids adding fonts.googleapis.com to the CSP — no new external dependency, no font FOUT, consistent with the rest of the UI typography. 3 regression tests added in tests/test_1044_mermaid_csp_font.py. 2215/2215 tests passing. * fix(onboarding): non-standard provider/path cluster (#1029) * fix(bfcache): restore full layout on tab/session restore — rail, topbar, panels (#1045) The pageshow handler added for #822 only cleared the session search filter and re-rendered the session list. This left the rest of the layout chrome (topbar, rail icons, workspace panel, resize handles, gateway SSE) in the stale bfcache DOM state, causing a broken layout (oversized search icon, uninitialized rail) that required a hard refresh to fix. Fix: extend the pageshow handler to re-run the full set of layout sync calls that the boot IIFE runs on a fresh page load: syncTopbar() — restores model chip, title, topbar state syncWorkspacePanelState() — restores workspace panel open/closed _initResizePanels() — reattaches panel resize drag listeners startGatewaySSE() — reconnects the gateway SSE watcher (bfcache-persisted connections are dead) All four calls are typeof-guarded for safe degradation if a helper is not yet defined. The existing #822 fixes (sessionSearch clear + renderSessionListFromCache) are preserved unchanged. loadSession() is intentionally NOT re-called — it would cause message flicker; the sync calls above are sufficient to restore visual state. 7 regression tests added in tests/test_1045_bfcache_layout_restore.py. 2219/2219 tests passing. * fix(bfcache): also close open dropdowns on bfcache restore (#1045) Additional symptom noted in issue #1045: bfcache freezes the DOM including any open dropdown/popover state. The thinking-level selector (and other composer dropdowns) left open when navigating away would appear open without user interaction on tab restore. Extend the pageshow handler to call all four named close functions before the layout sync: closeModelDropdown() — composer model selector closeReasoningDropdown() — thinking/reasoning effort selector closeWsDropdown() — workspace chip dropdown closeProfileDropdown() — profile switcher dropdown All calls are typeof-guarded, matching the style of the layout sync calls already in the handler. 2 new tests (9 total in test_1045_bfcache_layout_restore.py): - pageshow closes all four named dropdowns - dropdown closes appear before layout sync calls (clean state first) 2221/2221 tests passing. * fix(bfcache): remove _initResizePanels() — bfcache preserves listeners * fix(bfcache): remove _initResizePanels from pageshow — bfcache preserves listeners; update test * fix(sessions): use cron job name as session title when available (#1032) * fix(test): add id column to messages table in cron title test fixture * fix(merge): inject cron title lookup into read_importable loop, remove stale sqlite3 block * fix(pwa): redirect to /login client-side on 401 — fixes iOS PWA auth expiry trap (#1038) When an auth session expires, the server returns a 302→/login for page requests. In a normal browser this works fine, but in an iOS PWA running in standalone mode the redirect navigates out of the PWA shell into Safari, leaving the app permanently stuck on 'Authentication required' with no recovery path. Fix: intercept 401 responses client-side before surfacing any error. - workspace.js api(): check res.status===401 first; call window.location.href='/login' and return immediately (no throw) - ui.js: add _redirectIfUnauth() helper; wire into all direct fetch() calls that bypass api() — api/models, api/models/live, api/upload All fetch paths that could receive a 401 now redirect cleanly within the PWA frame rather than opening Safari. 6 regression tests added in tests/test_1038_pwa_auth_redirect.py. 2175/2175 tests passing. * fix(pwa): preserve current URL in ?next= param on 401 redirect * fix(test): update 401-redirect assertion to accept ?next= URL format * feat(pwa): add _safeNextPath() to login.js so ?next= param is honored after re-login Addresses reviewer suggestion: the ?next= URL set on 401 redirect was ignored by the login success handler (always redirected to ./). _safeNextPath() validates and returns the ?next= param with open-redirect guards: rejects non-path-absolute inputs, // protocol-relative URLs, backslash variants, and control characters. 4 new regression tests added. * Implement session agent cache for AIAgent reuse Added session agent cache to reuse AIAgent across messages. * Implement agent caching for session management * Implement session agent eviction on session deletion Added session agent eviction to prevent turn count leakage in recycled sessions. * docs: v0.50.210 release notes — 7 PRs, 2239 tests (+27) * docs(changelog): drop stale [Unreleased] entries duplicated by v0.50.210 Three entries in the [Unreleased] section are duplicates of items now listed under v0.50.210: - Mermaid CSP font fix (#1044) → v0.50.210 / Mermaid Google Fonts CSP - bfcache layout restore (#1045) → v0.50.210 / bfcache layout and dropdown restore - iOS PWA auth redirect (#1038) → v0.50.210 / Login redirects back to original URL The original drafts landed in [Unreleased] when individual PRs (#1047, #1048, #1043) were approved; the v0.50.210 release-notes commit then added the same items under the version section without removing the [Unreleased] copies. Drop the duplicates so users reading the CHANGELOG don't see the same fix listed twice. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> --------- Signed-off-by: Pix (PiClaw, claude-opus-4-7) via Hermes Agent Co-authored-by: Pix (Hermes) <aliceisjustplaying@users.noreply.github.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: qxxaa <mrhanoi@outlook.com> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-25 22:47:44 +00:00
# Agent cache: reuse AIAgent across messages in the same WebUI session so that
# _user_turn_count survives between turns. This mirrors the gateway's
# _agent_cache pattern and is required for injectionFrequency: "first-turn".
# LRU cache with size limit to prevent memory bloat.
# All cache operations (get, set, move_to_end, popitem) are protected by
# SESSION_AGENT_CACHE_LOCK for thread safety in multi-threaded ASGI servers.
import collections
SESSION_AGENT_CACHE: collections.OrderedDict = collections.OrderedDict() # LRU cache
SESSION_AGENT_CACHE_MAX = 50 # Maximum cached agents (each holds full conversation history)
v0.50.210: gpt-5.5, cron titles, agent cache, bfcache fix, onboarding fix, mermaid CSP, PWA auth (#1056) * feat(models): add gpt-5.5 to openai, openai-codex, copilot catalogs Adds GPT-5.5 and GPT-5.5 Mini entries to the static _PROVIDER_MODELS catalog so they appear in the model picker for the openai, openai-codex, and copilot providers. Signed-off-by: Pix (PiClaw, claude-opus-4-7) via Hermes Agent * fix(models): add gpt-5.5-mini to copilot provider catalog * fix(renderer): suppress Mermaid Google Fonts CSP violation via fontFamily inherit (#1044) Mermaid's built-in 'dark' and 'default' themes inject an @import for fonts.googleapis.com/Manrope into every generated SVG. The CSP style-src only allows cdn.jsdelivr.net, so this request is blocked on every diagram render, filling the console with CSP errors. Fix: pass fontFamily:'inherit' (and fontSize:'14px') in the themeVariables block of mermaid.initialize() in renderMermaidBlocks(). This suppresses Mermaid's external font import and uses the page's existing font stack. Avoids adding fonts.googleapis.com to the CSP — no new external dependency, no font FOUT, consistent with the rest of the UI typography. 3 regression tests added in tests/test_1044_mermaid_csp_font.py. 2215/2215 tests passing. * fix(onboarding): non-standard provider/path cluster (#1029) * fix(bfcache): restore full layout on tab/session restore — rail, topbar, panels (#1045) The pageshow handler added for #822 only cleared the session search filter and re-rendered the session list. This left the rest of the layout chrome (topbar, rail icons, workspace panel, resize handles, gateway SSE) in the stale bfcache DOM state, causing a broken layout (oversized search icon, uninitialized rail) that required a hard refresh to fix. Fix: extend the pageshow handler to re-run the full set of layout sync calls that the boot IIFE runs on a fresh page load: syncTopbar() — restores model chip, title, topbar state syncWorkspacePanelState() — restores workspace panel open/closed _initResizePanels() — reattaches panel resize drag listeners startGatewaySSE() — reconnects the gateway SSE watcher (bfcache-persisted connections are dead) All four calls are typeof-guarded for safe degradation if a helper is not yet defined. The existing #822 fixes (sessionSearch clear + renderSessionListFromCache) are preserved unchanged. loadSession() is intentionally NOT re-called — it would cause message flicker; the sync calls above are sufficient to restore visual state. 7 regression tests added in tests/test_1045_bfcache_layout_restore.py. 2219/2219 tests passing. * fix(bfcache): also close open dropdowns on bfcache restore (#1045) Additional symptom noted in issue #1045: bfcache freezes the DOM including any open dropdown/popover state. The thinking-level selector (and other composer dropdowns) left open when navigating away would appear open without user interaction on tab restore. Extend the pageshow handler to call all four named close functions before the layout sync: closeModelDropdown() — composer model selector closeReasoningDropdown() — thinking/reasoning effort selector closeWsDropdown() — workspace chip dropdown closeProfileDropdown() — profile switcher dropdown All calls are typeof-guarded, matching the style of the layout sync calls already in the handler. 2 new tests (9 total in test_1045_bfcache_layout_restore.py): - pageshow closes all four named dropdowns - dropdown closes appear before layout sync calls (clean state first) 2221/2221 tests passing. * fix(bfcache): remove _initResizePanels() — bfcache preserves listeners * fix(bfcache): remove _initResizePanels from pageshow — bfcache preserves listeners; update test * fix(sessions): use cron job name as session title when available (#1032) * fix(test): add id column to messages table in cron title test fixture * fix(merge): inject cron title lookup into read_importable loop, remove stale sqlite3 block * fix(pwa): redirect to /login client-side on 401 — fixes iOS PWA auth expiry trap (#1038) When an auth session expires, the server returns a 302→/login for page requests. In a normal browser this works fine, but in an iOS PWA running in standalone mode the redirect navigates out of the PWA shell into Safari, leaving the app permanently stuck on 'Authentication required' with no recovery path. Fix: intercept 401 responses client-side before surfacing any error. - workspace.js api(): check res.status===401 first; call window.location.href='/login' and return immediately (no throw) - ui.js: add _redirectIfUnauth() helper; wire into all direct fetch() calls that bypass api() — api/models, api/models/live, api/upload All fetch paths that could receive a 401 now redirect cleanly within the PWA frame rather than opening Safari. 6 regression tests added in tests/test_1038_pwa_auth_redirect.py. 2175/2175 tests passing. * fix(pwa): preserve current URL in ?next= param on 401 redirect * fix(test): update 401-redirect assertion to accept ?next= URL format * feat(pwa): add _safeNextPath() to login.js so ?next= param is honored after re-login Addresses reviewer suggestion: the ?next= URL set on 401 redirect was ignored by the login success handler (always redirected to ./). _safeNextPath() validates and returns the ?next= param with open-redirect guards: rejects non-path-absolute inputs, // protocol-relative URLs, backslash variants, and control characters. 4 new regression tests added. * Implement session agent cache for AIAgent reuse Added session agent cache to reuse AIAgent across messages. * Implement agent caching for session management * Implement session agent eviction on session deletion Added session agent eviction to prevent turn count leakage in recycled sessions. * docs: v0.50.210 release notes — 7 PRs, 2239 tests (+27) * docs(changelog): drop stale [Unreleased] entries duplicated by v0.50.210 Three entries in the [Unreleased] section are duplicates of items now listed under v0.50.210: - Mermaid CSP font fix (#1044) → v0.50.210 / Mermaid Google Fonts CSP - bfcache layout restore (#1045) → v0.50.210 / bfcache layout and dropdown restore - iOS PWA auth redirect (#1038) → v0.50.210 / Login redirects back to original URL The original drafts landed in [Unreleased] when individual PRs (#1047, #1048, #1043) were approved; the v0.50.210 release-notes commit then added the same items under the version section without removing the [Unreleased] copies. Drop the duplicates so users reading the CHANGELOG don't see the same fix listed twice. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> --------- Signed-off-by: Pix (PiClaw, claude-opus-4-7) via Hermes Agent Co-authored-by: Pix (Hermes) <aliceisjustplaying@users.noreply.github.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: qxxaa <mrhanoi@outlook.com> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-25 22:47:44 +00:00
SESSION_AGENT_CACHE_LOCK = threading.Lock()
def _evict_session_agent(session_id: str) -> None:
"""Remove a cached agent for a session (on delete, clear, or model switch)."""
with SESSION_AGENT_CACHE_LOCK:
SESSION_AGENT_CACHE.pop(session_id, None)
# ── Thread-local env context ─────────────────────────────────────────────────
_thread_ctx = threading.local()
def _set_thread_env(**kwargs):
_thread_ctx.env = kwargs
def _clear_thread_env():
_thread_ctx.env = {}
# ── Per-session agent locks ───────────────────────────────────────────────────
SESSION_AGENT_LOCKS: dict = {}
SESSION_AGENT_LOCKS_LOCK = threading.Lock()
def _get_session_agent_lock(session_id: str) -> threading.Lock:
"""Return the per-session Lock used to serialize all Session mutations.
Lock lifecycle invariant:
- A Lock is created lazily on first access and lives in SESSION_AGENT_LOCKS
for the lifetime of the session.
- The entry is pruned in /api/session/delete (under SESSION_AGENT_LOCKS_LOCK)
so deleted sessions don't leak a Lock forever.
- During context compression the agent may rotate session_id. The
streaming thread migrates the lock entry atomically under
SESSION_AGENT_LOCKS_LOCK: it aliases the new session_id to the *same*
Lock object and pops the old-id entry (see streaming.py compression
block). This ensures that subsequent callers using the new ID still
acquire the same Lock, while the old-id entry is removed to prevent a
leak. The streaming thread already holds the Lock during this
migration, so the reference stays alive even after the dict entry is
removed.
- Lock contract: hold for the in-memory mutation + s.save() only; never
across network I/O (LLM calls, HTTP requests).
"""
with SESSION_AGENT_LOCKS_LOCK:
if session_id not in SESSION_AGENT_LOCKS:
SESSION_AGENT_LOCKS[session_id] = threading.Lock()
return SESSION_AGENT_LOCKS[session_id]
2026-03-31 07:02:47 +00:00
# ── Settings persistence ─────────────────────────────────────────────────────
_SETTINGS_DEFAULTS = {
"default_workspace": str(DEFAULT_WORKSPACE),
"onboarding_completed": False,
"send_key": "enter", # 'enter' or 'ctrl+enter'
"show_token_usage": False, # show input/output token badge below assistant messages
"show_cli_sessions": False, # merge CLI sessions from state.db into the sidebar
"sync_to_insights": False, # mirror WebUI token usage to state.db for /insights
"check_for_updates": True, # check if webui/agent repos are behind upstream
"theme": "dark", # light | dark | system
"skin": "default", # accent color skin: default | ares | mono | slate | poseidon | sisyphus | charizard
"font_size": "default", # small | default | large
"language": "en", # UI locale code; must match a key in static/i18n.js LOCALES
"bot_name": os.getenv(
"HERMES_WEBUI_BOT_NAME", "Hermes"
), # display name for the assistant
"sound_enabled": False, # play notification sound when assistant finishes
"notifications_enabled": False, # browser notification when tab is in background
"show_thinking": True, # show/hide thinking/reasoning blocks in chat view
release: v0.50.240 ## Release v0.50.240 Batch release of 13 PRs that passed full triage + code review + test suite (3199 tests, 0 failures). --- ### Added - **Compact tool activity mode** (`simplified_tool_calling`, default on) — groups tool calls and thinking traces into a single collapsed "Activity" disclosure card per assistant turn. Also adds a new **Calm Console** theme with earth/slate palette and serif prose. @Michaelyklam — #1282 - **PDF first-page preview** — `MEDIA:` `.pdf` files render a canvas thumbnail via PDF.js CDN (4 MB cap). **HTML sandbox iframe** — `.html`/`.htm` files render inline in a sandboxed `<iframe srcdoc>` (256 KB cap). 10 i18n keys × 7 locales. @bergeouss — #1280, closes #480 #482 - **Inline Excalidraw diagram preview** — `.excalidraw` files render as pure SVG (no external deps; rectangles, ellipses, diamonds, text, lines, arrows, freehand; 512 KB cap). @bergeouss — #1279, closes #479 - **Inline CSV table rendering** — fenced `csv` blocks and `MEDIA:` CSV files render as scrollable HTML tables with auto-separator detection. @bergeouss — #1277, closes #485 - **Inline SVG, audio, and video rendering** — SVG as `<img>`, audio as `<audio controls>`, video as `<video controls>`. @bergeouss — #1276, closes #481 - **Batch session select mode** — multi-select sessions for bulk Archive/Delete/Move. 11 i18n keys × 7 locales. @bergeouss — #1275, closes #568 - **Collapsible skill category headers** — click to collapse/expand without re-render; state persists across filter cycles. @bergeouss — #1281 - **`providers.only_configured` setting** — opt-in flag to restrict the model picker to explicitly configured providers. @KingBoyAndGirl — #1268 - **OpenCode Go model catalog** — adds Kimi K2.6, DeepSeek V4 Pro/Flash, MiMo V2.5/Pro, Qwen3.6/3.5 Plus. @nesquena-hermes — #1284, closes #1269 ### Fixed - **Profile `TERMINAL_CWD` TypeError** — `_build_agent_thread_env()` helper merges env before `_set_thread_env()` call. @hi-friday — #1266 - **Service worker subpath cache bypass** — regex now matches `/api/*` under any mount prefix. @Michaelyklam — #1278 - **SSE client disconnect leaks** — `TimeoutError`/`OSError` treated as clean disconnects; server backlog 64, threads daemonized; session list renders before saved-session restore. @KayZz69 — #1267 - **i18n locale corrections** — Korean MCP strings (23), Chinese MCP strings (23), zh-Hant missing keys (41), de missing keys (229). @bergeouss — #1274, closes #1273 --- ### Test results ``` 3199 passed, 2 skipped, 3 xpassed in 72.79s ``` ### PRs on hold (not included) #1265 (draft), #1271 (superseded by #1266), #1272 (skipped XSS tests), #1232 (partial test run), #1222 (review questions open), #1134 (live-server tests), #1132 (superseded by #1134), #1108 (negative UX review), #1084 (empty description)
2026-04-30 00:42:32 +00:00
"simplified_tool_calling": True, # group tools/thinking into one quiet activity disclosure
"api_redact_enabled": True, # redact sensitive data (API keys, secrets) from API responses
"sidebar_density": "compact", # compact | detailed
v0.50.211: compact timestamps, adaptive title refresh, settings picker fix (#1061) * Shorten session sidebar relative time labels * feat: adaptive session title refresh based on conversation evolution Addresses #869 — the 'Optional' part: adapt session names to current conversation context instead of only generating once from the first exchange. Backend (api/streaming.py): - Add _latest_exchange_snippets() to extract last user+assistant pair - Add _count_exchanges() to count user messages - Add _get_title_refresh_interval() to read the setting - Add _run_background_title_refresh() — refreshes title from latest exchange with LLM, skips if title is unchanged or user manually renamed - Add _maybe_schedule_title_refresh() — checks exchange count and schedules refresh after stream_end (non-blocking) Config (api/config.py): - Add auto_title_refresh_every setting (default '0' = off) - Enum validation: {'0', '5', '10', '20'} Frontend: - Settings UI dropdown (static/index.html) - Wire up load/save in panels.js - i18n keys for all 6 locales (en/ru/es/de/zh/zh-Hant) Default: off. Opt-in via Settings > Conversation > Adaptive title refresh. * test: add 37 tests for adaptive title refresh helpers Covers all five new functions introduced in this PR: _count_exchanges, _latest_exchange_snippets, _get_title_refresh_interval, _run_background_title_refresh, _maybe_schedule_title_refresh Co-authored-by: bergeouss <bergeouss@users.noreply.github.com> * fix(settings): show selected state on theme/skin/font-size picker cards The CSS rule `#mainSettings .theme-pick-btn { border-color: var(--border) !important }` was overriding the inline `style.borderColor = "var(--accent)"` set by `_syncThemePicker()` and siblings — `!important` beats inline styles. Active cards showed no visual highlight. Fix: move to `.active` CSS class with `border-color:var(--accent)!important` so the active rule wins over the base rule, and clear the stale inline borderColor/boxShadow from the sync functions. 5 regression tests added. Closes #1057 * fix: rename test file to match PR number, fix stale issue reference * docs: v0.50.211 release notes and version bump Compact sidebar timestamps, adaptive title refresh (opt-in), settings picker fix. * docs(changelog): correct settings tab for adaptive title refresh The v0.50.211 entry for #1058 said "Settings → Appearance" but the toggle is actually rendered inside settingsPanePreferences (the Preferences tab) per static/index.html:604+. The commit message also had the wrong tab ("Conversation"). Updated CHANGELOG to match the actual UI surface so users can find the toggle. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: create state dir before writing settings file save_settings() called SETTINGS_FILE.write_text() without ensuring the parent directory exists. In fresh environments (CI, first run without HERMES_WEBUI_STATE_DIR set) this raised FileNotFoundError. Add mkdir(parents=True, exist_ok=True) before the write. --------- Co-authored-by: Pavol Biely <biely@webtec.sk> Co-authored-by: bergeouss <bergeouss@users.noreply.github.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-26 00:50:58 +00:00
"auto_title_refresh_every": "0", # adaptive title refresh: 0=off, 5/10/20=every N exchanges
v0.50.214: busy input modes + queue/interrupt/steer slash commands (#1067) * feat: busy input modes with queue/interrupt/steer slash commands - Add busy_input_mode setting (queue/interrupt/steer) to config defaults - Add /queue, /interrupt, /steer slash commands with handlers - Modify send() to respect busy_input_mode (interrupt cancels and resends, steer falls back to interrupt with toast, queue preserves existing behavior) - Add settings dropdown in settings panel with load/save/apply wiring - Initialize window._busyInputMode at boot and on settings save - Add 17 i18n keys across all 6 locale blocks (en/ru/es/de/zh/zh-Hant) Addresses #720 * test: 17 regression tests for busy_input_mode + slash commands PR description noted manual testing only. Added structural tests matching the pattern used by recent contributor PRs (#1010, #1011, #1018, #1022, #1058) so future refactors don't silently regress the wiring: Backend (api/config.py): - default 'queue' is set in _DEFAULT_SETTINGS - enum validator restricts to {queue, interrupt, steer} Slash commands (static/commands.js): - /queue, /interrupt, /steer all registered with correct fns - /interrupt and /steer set noEcho:true (the queued payload becomes the visible turn, not the slash invocation) - cmdQueue requires S.busy - cmdInterrupt + cmdSteer call queueSessionMessage before cancelStream (otherwise the drain has nothing to pick up) send() busy branch (static/messages.js): - reads window._busyInputMode - calls cancelStream on interrupt/steer - queues before cancelling (ordering invariant) Boot init + panels.js wiring (static/boot.js, static/panels.js): - both success and fallback paths set window._busyInputMode - load/save/apply path threads busy_input_mode through i18n (static/i18n.js): - all 17 new keys present in each of the 6 locale blocks Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: add noEcho:true to /queue; clear pendingFiles in all three slash handlers 1. /queue was missing noEcho:true — the dispatcher would echo the raw slash text as a user bubble, then the drain would send the queued message, causing a double-bubble in the conversation (#840 pattern). 2. cmdQueue, cmdInterrupt, and cmdSteer all captured S.pendingFiles into the queue payload but never cleared S.pendingFiles or called renderTray(). Staged files would remain in the tray and be re-attached on the next send(), duplicating attachments. Fix: add S.pendingFiles=[];renderTray() after updateQueueBadge(). 3. test_all_three_busy_commands_are_no_echo: expanded to cover /queue (was only interrupt + steer), now documents that all three must set noEcho:true. 4. test_slash_commands_clear_pending_files: new test that all three handlers clear S.pendingFiles and call renderTray() after enqueuing. Co-authored-by: bergeouss <bergeouss@users.noreply.github.com> * docs: v0.50.214 release notes and version bump --------- Co-authored-by: bergeouss <bergeouss@users.noreply.github.com> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com>
2026-04-26 01:51:06 +00:00
"busy_input_mode": "queue", # behavior when sending while agent is running: queue | interrupt | steer
"password_hash": None, # PBKDF2-HMAC-SHA256 hash; None = auth disabled
2026-03-31 07:02:47 +00:00
}
_SETTINGS_LEGACY_DROP_KEYS = {"assistant_language", "bubble_layout", "default_model"}
_SETTINGS_THEME_VALUES = {"light", "dark", "system"}
_SETTINGS_SKIN_VALUES = {
"default",
"ares",
"mono",
"slate",
"poseidon",
"sisyphus",
"charizard",
}
_SETTINGS_LEGACY_THEME_MAP = {
# Legacy full themes now map onto the closest supported theme + accent skin pair.
"slate": ("dark", "slate"),
"solarized": ("dark", "poseidon"),
"monokai": ("dark", "sisyphus"),
"nord": ("dark", "slate"),
"oled": ("dark", "default"),
}
def _normalize_appearance(theme, skin) -> tuple[str, str]:
"""Normalize a (theme, skin) pair, migrating legacy theme names.
Legacy migration table (from `_SETTINGS_LEGACY_THEME_MAP`):
slate → ("dark", "slate")
solarized → ("dark", "poseidon")
monokai → ("dark", "sisyphus")
nord → ("dark", "slate")
oled → ("dark", "default")
Unknown / custom theme names fall back to ("dark", "default"). This is a
behavior change vs. the pre-PR-#627 state, where the `theme` field was
open-ended ("no enum gate -- allows custom themes"). Users who set a
custom CSS theme via `data-theme` will need to re-apply via skin or
custom CSS — see CHANGELOG entry for details.
The same mapping is mirrored in `static/boot.js` (`_LEGACY_THEME_MAP`)
so client and server normalize identically; keep them in sync.
"""
raw_theme = theme.strip().lower() if isinstance(theme, str) else ""
raw_skin = skin.strip().lower() if isinstance(skin, str) else ""
legacy = _SETTINGS_LEGACY_THEME_MAP.get(raw_theme)
if legacy:
next_theme, legacy_skin = legacy
elif raw_theme in _SETTINGS_THEME_VALUES:
next_theme, legacy_skin = raw_theme, "default"
else:
# Unknown themes used to exist; default to dark so upgrades stay visually stable.
next_theme, legacy_skin = "dark", "default"
next_skin = (
raw_skin
if raw_skin in _SETTINGS_SKIN_VALUES
else legacy_skin
)
return next_theme, next_skin
2026-03-31 07:02:47 +00:00
2026-03-31 07:02:47 +00:00
def load_settings() -> dict:
"""Load settings from disk, merging with defaults for any missing keys."""
settings = dict(_SETTINGS_DEFAULTS)
stored = None
try:
settings_exists = SETTINGS_FILE.exists()
except OSError:
# PermissionError or other OS-level error (e.g. UID mismatch in Docker)
# Treat as missing — start with defaults rather than crashing.
logger.debug("Cannot stat settings file %s (inaccessible?)", SETTINGS_FILE)
settings_exists = False
if settings_exists:
2026-03-31 07:02:47 +00:00
try:
stored = json.loads(SETTINGS_FILE.read_text(encoding="utf-8"))
2026-03-31 07:02:47 +00:00
if isinstance(stored, dict):
settings.update(
{
k: v
for k, v in stored.items()
if k not in _SETTINGS_LEGACY_DROP_KEYS
}
)
2026-03-31 07:02:47 +00:00
except Exception:
security: bandit fixes B310/B324/B110 + QuietHTTPServer (#354) * security: fix bandit security issues (B310, B324) - Add usedforsecurity=False to MD5 hash in gateway_watcher.py - Add URL scheme validation to prevent file:// access in config.py - Add URL validation to bootstrap.py health check - Add nosec comments where runtime validation exists * fix: handle ConnectionResetError gracefully and add debug logging - Add QuietHTTPServer class to suppress noisy connection reset errors caused by clients disconnecting abruptly (fixes log spam from 'ConnectionResetError: [Errno 54] Connection reset by peer') - Replace silent 'pass' statements with logger.debug() calls across api/auth.py, api/config.py, api/gateway_watcher.py, api/models.py, and api/onboarding.py for better observability during troubleshooting - All tests pass (25 passed in test_regressions.py) * chore: add debug logging to profiles and routes modules - Replace silent 'pass' statements with logger.debug() calls in api/profiles.py for better error visibility during profile switching and module patching - Add logger initialization to api/routes.py * security: fix B110 bare except/pass issues (bandit security scan) - Replace bare except/pass patterns with logger.debug() calls - Fixes CWE-703 (improper check/handling of exceptional conditions) - Files affected: routes.py, state_sync.py, streaming.py, workspace.py, server.py - All tests pass successfully * security: bandit fixes B310/B324/B110 + QuietHTTPServer (#354) - api/gateway_watcher.py: MD5 usedforsecurity=False (B324) - api/config.py, bootstrap.py: URL scheme validation before urlopen (B310) - 12 files: replace bare except/pass with logger.debug() (B110) - server.py: QuietHTTPServer suppresses client disconnect log noise - server.py: fix sys.exc_info() (was traceback.sys.exc_info(), impl detail) - tests/test_sprint43.py: 19 new tests covering all security fixes - CHANGELOG.md: v0.50.14 entry; 841 tests total (up from 822) --------- Co-authored-by: lawrencel1ng <lawrence.ling@global.ntt> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com>
2026-04-13 18:11:56 +00:00
logger.debug("Failed to load settings from %s", SETTINGS_FILE)
settings["theme"], settings["skin"] = _normalize_appearance(
stored.get("theme") if isinstance(stored, dict) else settings.get("theme"),
stored.get("skin") if isinstance(stored, dict) else settings.get("skin"),
)
settings["default_model"] = get_effective_default_model()
2026-03-31 07:02:47 +00:00
return settings
_SETTINGS_ALLOWED_KEYS = set(_SETTINGS_DEFAULTS.keys()) - {
"password_hash",
"default_model",
}
_SETTINGS_ENUM_VALUES = {
"send_key": {"enter", "ctrl+enter"},
"sidebar_density": {"compact", "detailed"},
"font_size": {"small", "default", "large"},
v0.50.211: compact timestamps, adaptive title refresh, settings picker fix (#1061) * Shorten session sidebar relative time labels * feat: adaptive session title refresh based on conversation evolution Addresses #869 — the 'Optional' part: adapt session names to current conversation context instead of only generating once from the first exchange. Backend (api/streaming.py): - Add _latest_exchange_snippets() to extract last user+assistant pair - Add _count_exchanges() to count user messages - Add _get_title_refresh_interval() to read the setting - Add _run_background_title_refresh() — refreshes title from latest exchange with LLM, skips if title is unchanged or user manually renamed - Add _maybe_schedule_title_refresh() — checks exchange count and schedules refresh after stream_end (non-blocking) Config (api/config.py): - Add auto_title_refresh_every setting (default '0' = off) - Enum validation: {'0', '5', '10', '20'} Frontend: - Settings UI dropdown (static/index.html) - Wire up load/save in panels.js - i18n keys for all 6 locales (en/ru/es/de/zh/zh-Hant) Default: off. Opt-in via Settings > Conversation > Adaptive title refresh. * test: add 37 tests for adaptive title refresh helpers Covers all five new functions introduced in this PR: _count_exchanges, _latest_exchange_snippets, _get_title_refresh_interval, _run_background_title_refresh, _maybe_schedule_title_refresh Co-authored-by: bergeouss <bergeouss@users.noreply.github.com> * fix(settings): show selected state on theme/skin/font-size picker cards The CSS rule `#mainSettings .theme-pick-btn { border-color: var(--border) !important }` was overriding the inline `style.borderColor = "var(--accent)"` set by `_syncThemePicker()` and siblings — `!important` beats inline styles. Active cards showed no visual highlight. Fix: move to `.active` CSS class with `border-color:var(--accent)!important` so the active rule wins over the base rule, and clear the stale inline borderColor/boxShadow from the sync functions. 5 regression tests added. Closes #1057 * fix: rename test file to match PR number, fix stale issue reference * docs: v0.50.211 release notes and version bump Compact sidebar timestamps, adaptive title refresh (opt-in), settings picker fix. * docs(changelog): correct settings tab for adaptive title refresh The v0.50.211 entry for #1058 said "Settings → Appearance" but the toggle is actually rendered inside settingsPanePreferences (the Preferences tab) per static/index.html:604+. The commit message also had the wrong tab ("Conversation"). Updated CHANGELOG to match the actual UI surface so users can find the toggle. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: create state dir before writing settings file save_settings() called SETTINGS_FILE.write_text() without ensuring the parent directory exists. In fresh environments (CI, first run without HERMES_WEBUI_STATE_DIR set) this raised FileNotFoundError. Add mkdir(parents=True, exist_ok=True) before the write. --------- Co-authored-by: Pavol Biely <biely@webtec.sk> Co-authored-by: bergeouss <bergeouss@users.noreply.github.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-26 00:50:58 +00:00
"auto_title_refresh_every": {"0", "5", "10", "20"},
v0.50.214: busy input modes + queue/interrupt/steer slash commands (#1067) * feat: busy input modes with queue/interrupt/steer slash commands - Add busy_input_mode setting (queue/interrupt/steer) to config defaults - Add /queue, /interrupt, /steer slash commands with handlers - Modify send() to respect busy_input_mode (interrupt cancels and resends, steer falls back to interrupt with toast, queue preserves existing behavior) - Add settings dropdown in settings panel with load/save/apply wiring - Initialize window._busyInputMode at boot and on settings save - Add 17 i18n keys across all 6 locale blocks (en/ru/es/de/zh/zh-Hant) Addresses #720 * test: 17 regression tests for busy_input_mode + slash commands PR description noted manual testing only. Added structural tests matching the pattern used by recent contributor PRs (#1010, #1011, #1018, #1022, #1058) so future refactors don't silently regress the wiring: Backend (api/config.py): - default 'queue' is set in _DEFAULT_SETTINGS - enum validator restricts to {queue, interrupt, steer} Slash commands (static/commands.js): - /queue, /interrupt, /steer all registered with correct fns - /interrupt and /steer set noEcho:true (the queued payload becomes the visible turn, not the slash invocation) - cmdQueue requires S.busy - cmdInterrupt + cmdSteer call queueSessionMessage before cancelStream (otherwise the drain has nothing to pick up) send() busy branch (static/messages.js): - reads window._busyInputMode - calls cancelStream on interrupt/steer - queues before cancelling (ordering invariant) Boot init + panels.js wiring (static/boot.js, static/panels.js): - both success and fallback paths set window._busyInputMode - load/save/apply path threads busy_input_mode through i18n (static/i18n.js): - all 17 new keys present in each of the 6 locale blocks Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: add noEcho:true to /queue; clear pendingFiles in all three slash handlers 1. /queue was missing noEcho:true — the dispatcher would echo the raw slash text as a user bubble, then the drain would send the queued message, causing a double-bubble in the conversation (#840 pattern). 2. cmdQueue, cmdInterrupt, and cmdSteer all captured S.pendingFiles into the queue payload but never cleared S.pendingFiles or called renderTray(). Staged files would remain in the tray and be re-attached on the next send(), duplicating attachments. Fix: add S.pendingFiles=[];renderTray() after updateQueueBadge(). 3. test_all_three_busy_commands_are_no_echo: expanded to cover /queue (was only interrupt + steer), now documents that all three must set noEcho:true. 4. test_slash_commands_clear_pending_files: new test that all three handlers clear S.pendingFiles and call renderTray() after enqueuing. Co-authored-by: bergeouss <bergeouss@users.noreply.github.com> * docs: v0.50.214 release notes and version bump --------- Co-authored-by: bergeouss <bergeouss@users.noreply.github.com> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com>
2026-04-26 01:51:06 +00:00
"busy_input_mode": {"queue", "interrupt", "steer"},
}
_SETTINGS_BOOL_KEYS = {
"onboarding_completed",
"show_token_usage",
"show_cli_sessions",
"sync_to_insights",
"check_for_updates",
"sound_enabled",
"notifications_enabled",
"show_thinking",
release: v0.50.240 ## Release v0.50.240 Batch release of 13 PRs that passed full triage + code review + test suite (3199 tests, 0 failures). --- ### Added - **Compact tool activity mode** (`simplified_tool_calling`, default on) — groups tool calls and thinking traces into a single collapsed "Activity" disclosure card per assistant turn. Also adds a new **Calm Console** theme with earth/slate palette and serif prose. @Michaelyklam — #1282 - **PDF first-page preview** — `MEDIA:` `.pdf` files render a canvas thumbnail via PDF.js CDN (4 MB cap). **HTML sandbox iframe** — `.html`/`.htm` files render inline in a sandboxed `<iframe srcdoc>` (256 KB cap). 10 i18n keys × 7 locales. @bergeouss — #1280, closes #480 #482 - **Inline Excalidraw diagram preview** — `.excalidraw` files render as pure SVG (no external deps; rectangles, ellipses, diamonds, text, lines, arrows, freehand; 512 KB cap). @bergeouss — #1279, closes #479 - **Inline CSV table rendering** — fenced `csv` blocks and `MEDIA:` CSV files render as scrollable HTML tables with auto-separator detection. @bergeouss — #1277, closes #485 - **Inline SVG, audio, and video rendering** — SVG as `<img>`, audio as `<audio controls>`, video as `<video controls>`. @bergeouss — #1276, closes #481 - **Batch session select mode** — multi-select sessions for bulk Archive/Delete/Move. 11 i18n keys × 7 locales. @bergeouss — #1275, closes #568 - **Collapsible skill category headers** — click to collapse/expand without re-render; state persists across filter cycles. @bergeouss — #1281 - **`providers.only_configured` setting** — opt-in flag to restrict the model picker to explicitly configured providers. @KingBoyAndGirl — #1268 - **OpenCode Go model catalog** — adds Kimi K2.6, DeepSeek V4 Pro/Flash, MiMo V2.5/Pro, Qwen3.6/3.5 Plus. @nesquena-hermes — #1284, closes #1269 ### Fixed - **Profile `TERMINAL_CWD` TypeError** — `_build_agent_thread_env()` helper merges env before `_set_thread_env()` call. @hi-friday — #1266 - **Service worker subpath cache bypass** — regex now matches `/api/*` under any mount prefix. @Michaelyklam — #1278 - **SSE client disconnect leaks** — `TimeoutError`/`OSError` treated as clean disconnects; server backlog 64, threads daemonized; session list renders before saved-session restore. @KayZz69 — #1267 - **i18n locale corrections** — Korean MCP strings (23), Chinese MCP strings (23), zh-Hant missing keys (41), de missing keys (229). @bergeouss — #1274, closes #1273 --- ### Test results ``` 3199 passed, 2 skipped, 3 xpassed in 72.79s ``` ### PRs on hold (not included) #1265 (draft), #1271 (superseded by #1266), #1272 (skipped XSS tests), #1232 (partial test run), #1222 (review questions open), #1134 (live-server tests), #1132 (superseded by #1134), #1108 (negative UX review), #1084 (empty description)
2026-04-30 00:42:32 +00:00
"simplified_tool_calling",
"api_redact_enabled",
}
# Language codes are validated as short alphanumeric BCP-47-like tags (e.g. 'en', 'zh', 'fr')
_SETTINGS_LANG_RE = __import__("re").compile(r"^[a-zA-Z]{2,10}(-[a-zA-Z0-9]{2,8})?$")
2026-03-31 07:02:47 +00:00
def save_settings(settings: dict) -> dict:
"""Save settings to disk. Returns the merged settings. Ignores unknown keys."""
current = load_settings()
pending_theme = current.get("theme")
pending_skin = current.get("skin")
theme_was_explicit = False
skin_was_explicit = False
# Handle _set_password: hash and store as password_hash
raw_pw = settings.pop("_set_password", None)
if raw_pw and isinstance(raw_pw, str) and raw_pw.strip():
release: v0.39.0 — security hardening, 12 fixes (#171) * Security: harden auth, CSRF, SSRF, XSS, and env race conditions Twelve fixes from a full security audit: CRITICAL - Add CSRF Origin/Referer validation on all POST endpoints (prevents cross-origin abuse of self-update, settings, file ops) HIGH - Unify password hashing: config.py now uses PBKDF2 (600k iters) instead of single-iteration SHA-256 - Add per-IP rate limiting on login (5 attempts/60s, 429 on excess) MEDIUM - Validate session IDs as hex-only before filesystem operations (prevents path traversal via crafted session ID) - SSRF: resolve DNS before private-IP check in model fetching (prevents DNS rebinding to internal services) - Warn loudly when binding non-loopback without password set - SSE env var mutations: wrap sync chat + streaming restore in _ENV_LOCK - Force Content-Disposition:attachment for HTML/XHTML/SVG uploads (prevents stored XSS via uploaded files) LOW - Extend HMAC session signature from 64 to 128 bits - Add resolve()+relative_to() check on skills path construction - Set Secure flag on session cookie when connection is HTTPS - Sanitize exception messages to strip filesystem paths No breaking changes. All fixes are backward-compatible. * fix: use getattr for Secure cookie SSL detection handler.request.getpeercert raises AttributeError on plain sockets (non-SSL). Use getattr(..., None) to safely check for SSL. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * tests: add sprint 29 security hardening coverage (PR #171) 33 tests covering all 12 security fixes: - CSRF origin/referer validation - Login rate limiting (5 attempts/60s) - Session ID hex validation (path traversal prevention) - Error path sanitization (_sanitize_error) - Secure cookie getattr safety - HMAC signature length (64->128 bit) - Skills path traversal prevention - Content-Disposition for HTML/SVG/XHTML - PBKDF2 password hashing verification - Non-loopback startup warning - SSRF DNS guard code presence - _ENV_LOCK export from streaming module * release: v0.39.0 — security hardening, 12 fixes (#171) --------- Co-authored-by: betamod <matthew.sloly@gmail.com> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-04-08 05:26:03 +00:00
# Use PBKDF2 from auth module (600k iterations) -- never raw SHA-256
from api.auth import _hash_password
current["password_hash"] = _hash_password(raw_pw.strip())
# Handle _clear_password: explicitly disable auth
if settings.pop("_clear_password", False):
current["password_hash"] = None
2026-03-31 07:02:47 +00:00
for k, v in settings.items():
if k in _SETTINGS_ALLOWED_KEYS:
if k == "theme":
if isinstance(v, str) and v.strip():
pending_theme = v
theme_was_explicit = True
continue
if k == "skin":
if isinstance(v, str) and v.strip():
pending_skin = v
skin_was_explicit = True
continue
# Validate enum-constrained keys
if k in _SETTINGS_ENUM_VALUES and v not in _SETTINGS_ENUM_VALUES[k]:
continue
# Validate language codes (BCP-47-like: 'en', 'zh', 'fr', 'zh-CN')
if k == "language" and (
not isinstance(v, str) or not _SETTINGS_LANG_RE.match(v)
):
continue
# Coerce bool keys
if k in _SETTINGS_BOOL_KEYS:
v = bool(v)
2026-03-31 07:02:47 +00:00
current[k] = v
theme_value = pending_theme
skin_value = pending_skin
if theme_was_explicit and not skin_was_explicit:
raw_theme = pending_theme.strip().lower() if isinstance(pending_theme, str) else ""
if raw_theme not in _SETTINGS_THEME_VALUES:
skin_value = None
current["theme"], current["skin"] = _normalize_appearance(theme_value, skin_value)
current["default_workspace"] = str(
resolve_default_workspace(current.get("default_workspace"))
)
persisted = {k: v for k, v in current.items() if k != "default_model"}
v0.50.211: compact timestamps, adaptive title refresh, settings picker fix (#1061) * Shorten session sidebar relative time labels * feat: adaptive session title refresh based on conversation evolution Addresses #869 — the 'Optional' part: adapt session names to current conversation context instead of only generating once from the first exchange. Backend (api/streaming.py): - Add _latest_exchange_snippets() to extract last user+assistant pair - Add _count_exchanges() to count user messages - Add _get_title_refresh_interval() to read the setting - Add _run_background_title_refresh() — refreshes title from latest exchange with LLM, skips if title is unchanged or user manually renamed - Add _maybe_schedule_title_refresh() — checks exchange count and schedules refresh after stream_end (non-blocking) Config (api/config.py): - Add auto_title_refresh_every setting (default '0' = off) - Enum validation: {'0', '5', '10', '20'} Frontend: - Settings UI dropdown (static/index.html) - Wire up load/save in panels.js - i18n keys for all 6 locales (en/ru/es/de/zh/zh-Hant) Default: off. Opt-in via Settings > Conversation > Adaptive title refresh. * test: add 37 tests for adaptive title refresh helpers Covers all five new functions introduced in this PR: _count_exchanges, _latest_exchange_snippets, _get_title_refresh_interval, _run_background_title_refresh, _maybe_schedule_title_refresh Co-authored-by: bergeouss <bergeouss@users.noreply.github.com> * fix(settings): show selected state on theme/skin/font-size picker cards The CSS rule `#mainSettings .theme-pick-btn { border-color: var(--border) !important }` was overriding the inline `style.borderColor = "var(--accent)"` set by `_syncThemePicker()` and siblings — `!important` beats inline styles. Active cards showed no visual highlight. Fix: move to `.active` CSS class with `border-color:var(--accent)!important` so the active rule wins over the base rule, and clear the stale inline borderColor/boxShadow from the sync functions. 5 regression tests added. Closes #1057 * fix: rename test file to match PR number, fix stale issue reference * docs: v0.50.211 release notes and version bump Compact sidebar timestamps, adaptive title refresh (opt-in), settings picker fix. * docs(changelog): correct settings tab for adaptive title refresh The v0.50.211 entry for #1058 said "Settings → Appearance" but the toggle is actually rendered inside settingsPanePreferences (the Preferences tab) per static/index.html:604+. The commit message also had the wrong tab ("Conversation"). Updated CHANGELOG to match the actual UI surface so users can find the toggle. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: create state dir before writing settings file save_settings() called SETTINGS_FILE.write_text() without ensuring the parent directory exists. In fresh environments (CI, first run without HERMES_WEBUI_STATE_DIR set) this raised FileNotFoundError. Add mkdir(parents=True, exist_ok=True) before the write. --------- Co-authored-by: Pavol Biely <biely@webtec.sk> Co-authored-by: bergeouss <bergeouss@users.noreply.github.com> Co-authored-by: nesquena-hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: Nathan Esquenazi <nesquena@gmail.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-26 00:50:58 +00:00
SETTINGS_FILE.parent.mkdir(parents=True, exist_ok=True)
2026-03-31 07:02:47 +00:00
SETTINGS_FILE.write_text(
json.dumps(persisted, ensure_ascii=False, indent=2),
encoding="utf-8",
2026-03-31 07:02:47 +00:00
)
# Update runtime defaults so new sessions use them immediately
global DEFAULT_WORKSPACE
if "default_workspace" in current:
DEFAULT_WORKSPACE = resolve_default_workspace(current["default_workspace"])
current["default_model"] = get_effective_default_model()
2026-03-31 07:02:47 +00:00
return current
2026-03-31 07:02:47 +00:00
# Apply saved settings on startup (override env-derived defaults)
# Exception: if HERMES_WEBUI_DEFAULT_WORKSPACE is explicitly set in the
# environment, it wins over whatever settings.json has stored. Persisted
# config must never shadow an explicit env-var override (Docker deployments
# rely on this — otherwise deleting settings.json is the only escape).
2026-03-31 07:02:47 +00:00
_startup_settings = load_settings()
try:
_settings_file_exists = SETTINGS_FILE.exists()
except OSError:
_settings_file_exists = False
if _settings_file_exists:
if not os.getenv("HERMES_WEBUI_DEFAULT_WORKSPACE"):
DEFAULT_WORKSPACE = resolve_default_workspace(
_startup_settings.get("default_workspace")
)
_startup_settings.pop("default_model", None) # always drop stale value; model comes from config.yaml
if _startup_settings.get("default_workspace") != str(DEFAULT_WORKSPACE):
_startup_settings["default_workspace"] = str(DEFAULT_WORKSPACE)
try:
SETTINGS_FILE.write_text(
json.dumps(_startup_settings, ensure_ascii=False, indent=2),
encoding="utf-8",
)
except Exception:
pass
2026-03-31 07:02:47 +00:00
# ── SESSIONS in-memory cache (LRU OrderedDict) ───────────────────────────────
SESSIONS: collections.OrderedDict = collections.OrderedDict()
# ── Profile state initialisation ────────────────────────────────────────────
# Must run after all imports are resolved to correctly patch module-level caches
try:
from api.profiles import init_profile_state
init_profile_state()
except ImportError:
pass # hermes_cli not available -- default profile only