The agent that grows with you
Python aiai-agentai-agentsanthropicchatgptclaudeclaude-codecodexhermeshermes-agentllmnous-researchopenai
fix(gateway): preserve named custom provider session identity
Kiro Agent4fc133d5c9bb
diff --git a/agent/voice_turn_route.py b/agent/voice_turn_route.pyindex 64d96fa73fd..7a50939e55e 100644--- a/agent/voice_turn_route.py+++ b/agent/voice_turn_route.py@@ -177,7 +177,8 @@ class _SessionRuntimeView:def __init__(self, agent: Any, state: dict[str, Any]) -> None:snapshot = state.get("snapshot") or {}- own = {name: snapshot[name] for name in ("model", "provider", "base_url", "api_mode") if name in snapshot}+ own = {name: snapshot[name] for name in+ ("model", "provider", "requested_provider", "base_url", "api_mode") if name in snapshot}if "anthropic_base_url" in snapshot:own["_anthropic_base_url"] = snapshot["anthropic_base_url"]own["reasoning_config"] = state.get("reasoning_config")diff --git a/gateway/run_turn_prepare.py b/gateway/run_turn_prepare.pyindex e919ad71bb6..7d2b3ecf5af 100644--- a/gateway/run_turn_prepare.py+++ b/gateway/run_turn_prepare.py@@ -258,7 +258,24 @@ class GatewayTurnPrepareMixin:model = getattr(agent, "model", None)if not model:return- runtime = {k: getattr(agent, k, None) for k in ("provider", "base_url", "api_mode")}+ adapter_provider = str(getattr(agent, "provider", "") or "").strip()+ requested_provider = str(getattr(agent, "requested_provider", "") or "").strip()+ provider = adapter_provider+ if adapter_provider.lower() == "custom":+ if requested_provider.lower() not in {"", "custom", "auto"}:+ provider = requested_provider+ else:+ try:+ from hermes_cli.runtime_provider import canonical_custom_identity+ provider = canonical_custom_identity(+ base_url=str(getattr(agent, "base_url", "") or ""), model=model) or provider+ except Exception:+ logger.debug("custom provider identity lookup failed", exc_info=True)+ runtime = {+ "provider": provider,+ "base_url": getattr(agent, "base_url", None),+ "api_mode": getattr(agent, "api_mode", None),+ }runtime["fallback_active"] = bool(getattr(agent, "_fallback_activated", False))runtime = {k: v for k, v in runtime.items() if v not in (None, "")}try:diff --git a/gateway/session_local_inventory.py b/gateway/session_local_inventory.pyindex 837280f40cf..1a942ccec7c 100644--- a/gateway/session_local_inventory.py+++ b/gateway/session_local_inventory.py@@ -140,7 +140,11 @@ def session_inventory(authority, policy, agent, cwd):if agent is not None:from agent.voice_turn_route import session_runtime_viewview = session_runtime_view(agent)- info["provider"] = getattr(view, "provider", "") or ""+ provider = str(getattr(view, "provider", "") or "")+ requested = str(getattr(view, "requested_provider", "") or "").strip()+ if provider.lower() == "custom" and requested.lower() not in {"", "custom", "auto"}:+ provider = requested+ info["provider"] = providerinfo["tools"] = _grouped(getattr(agent, "tools", None))info["system_prompt"] = getattr(agent, "_cached_system_prompt", "") or ""compressor = getattr(agent, "context_compressor", None)@@ -207,7 +211,12 @@ def agent_inventory(agent) -> dict:info: dict = {}with contextlib.suppress(Exception):from agent.voice_turn_route import session_runtime_view- info["provider"] = getattr(session_runtime_view(agent), "provider", "") or ""+ view = session_runtime_view(agent)+ provider = str(getattr(view, "provider", "") or "")+ requested = str(getattr(view, "requested_provider", "") or "").strip()+ if provider.lower() == "custom" and requested.lower() not in {"", "custom", "auto"}:+ provider = requested+ info["provider"] = providerwith contextlib.suppress(Exception):info["tools"] = _grouped(getattr(agent, "tools", None))info["system_prompt"] = getattr(agent, "_cached_system_prompt", "") or ""diff --git a/tests/agent/test_voice_turn_route.py b/tests/agent/test_voice_turn_route.pyindex 05f2a346a49..3da76262b2a 100644--- a/tests/agent/test_voice_turn_route.py+++ b/tests/agent/test_voice_turn_route.py@@ -7,6 +7,7 @@ server actually received rather than on agent attributes.from __future__ import annotationsfrom pathlib import Path+from types import SimpleNamespaceimport pytest@@ -74,6 +75,25 @@ def test_reasoning_off_falls_to_the_lowest_valid_level(model, api_mode, expectedassert got == ({"enabled": True, "effort": expected} if expected else {"enabled": False})+def test_session_runtime_view_preserves_requested_provider_during_voice_turn():+ from agent.voice_turn_route import session_runtime_view++ main = SimpleNamespace(+ model="voice-model", provider="custom", requested_provider="custom:voice",+ base_url="https://voice.example/v1", api_mode="chat_completions",+ reasoning_config={"enabled": False}, _voice_route_state=None,+ )+ main._voice_route_state = {+ "snapshot": {+ "model": "main-model", "provider": "custom", "requested_provider": "custom:main",+ "base_url": "https://main.example/v1", "api_mode": "chat_completions",+ },+ "reasoning_config": {"enabled": True},+ }+ view = session_runtime_view(main)+ assert (view.provider, view.requested_provider) == ("custom", "custom:main")++def test_voice_usage_never_becomes_the_session_route(tmp_path):from hermes_state import SessionDBdiff --git a/tests/gateway/test_named_custom_provider_session_identity.py b/tests/gateway/test_named_custom_provider_session_identity.pynew file mode 100644index 00000000000..d9198ea13e8--- /dev/null+++ b/tests/gateway/test_named_custom_provider_session_identity.py@@ -0,0 +1,148 @@+"""Named custom provider identity survives gateway sync and canonical resume reads."""++from copy import deepcopy+from types import SimpleNamespace++import pytest++from gateway.run_turn_prepare import GatewayTurnPrepareMixin+from hermes_state import SessionDB+from tui_gateway.server import _session_info, _stored_session_runtime_overrides, _runtime_model_config+from gateway.session_local_inventory import agent_inventory+++SHARED_URL = "https://relay.example/v1"+CONFIG = {+ "model": {"default": "alpha-model", "provider": "custom:alpha"},+ "custom_providers": [+ {"name": "alpha", "base_url": SHARED_URL, "api_key": "sk-alpha", "model": "alpha-model"},+ {"name": "beta", "base_url": SHARED_URL, "api_key": "sk-beta", "model": "beta-model"},+ ],+}+++def _agent(*, model="beta-model", provider="custom", requested_provider="custom:beta"):+ return SimpleNamespace(+ model=model,+ provider=provider,+ requested_provider=requested_provider,+ base_url=SHARED_URL,+ api_mode="chat_completions",+ _fallback_activated=False,+ )+++def _runner(db):+ return SimpleNamespace(_session_db=SimpleNamespace(_db=db))++[email protected]("alpha_model", ["alpha-model", "beta-model"])+def test_named_custom_resolver_sync_row_reader_and_canonical_projection_keep_owner(tmp_path, alpha_model):+ """The selected slug chooses its key even when entries share endpoint and model."""+ from hermes_cli import runtime_provider+ from hermes_cli.config import atomic_config_write, get_config_path++ config = deepcopy(CONFIG)+ config["custom_providers"][0]["model"] = alpha_model+ atomic_config_write(get_config_path(), config)+ runtime = runtime_provider.resolve_runtime_provider(requested="custom:beta", target_model="beta-model")+ assert runtime["provider"] == "custom"+ assert runtime["requested_provider"] == "custom:beta"+ assert runtime["api_key"] == "sk-beta"++ db = SessionDB(tmp_path / "state.db")+ try:+ db.create_session("s1", source="telegram", model="old-model")+ GatewayTurnPrepareMixin._sync_session_model_from_agent(_runner(db), "s1", _agent())++ row = db.get_session("s1")+ route = SessionDB.session_gateway_runtime(row)+ assert route["provider"] == "custom:beta"+ assert route["base_url"] == SHARED_URL+ assert "sk-beta" not in str(row["model_config"])+ assert "api_key" not in str(row["model_config"])++ resume = _stored_session_runtime_overrides(row)+ assert resume["provider_override"] == "custom:beta"+ assert resume["model_override"]["provider"] == "custom:beta"+ assert resume["model_override"]["base_url"] == SHARED_URL+ restored = runtime_provider.resolve_runtime_provider(+ requested=resume["provider_override"], target_model=resume["model_override"]["model"])+ assert restored["api_key"] == "sk-beta"++ # Canonical session.info's provider field is the durable chosen identity, not+ # the resolved adapter class ``custom``.+ assert agent_inventory(_agent())["provider"] == "custom:beta"+ finally:+ db.close()++[email protected]("requested", ["", "auto", "custom"])+def test_bare_custom_sync_uses_canonical_endpoint_fallback(tmp_path, monkeypatch, requested):+ """Legacy/bare runtime shapes keep the existing URL-based fallback semantics."""+ from hermes_cli import runtime_provider++ monkeypatch.setattr(runtime_provider, "load_config", lambda: CONFIG)+ db = SessionDB(tmp_path / "state.db")+ try:+ db.create_session("s1", source="telegram", model="old-model")+ GatewayTurnPrepareMixin._sync_session_model_from_agent(+ _runner(db), "s1", _agent(requested_provider=requested)+ )+ row = db.get_session("s1")+ assert SessionDB.session_gateway_runtime(row)["provider"] == "custom:alpha"+ finally:+ db.close()+++def test_tui_runtime_config_and_session_info_keep_requested_custom_slug(monkeypatch):+ agent = _agent()+ monkeypatch.setattr("tui_gateway.server._load_approval_mode", lambda: "manual")+ config = _runtime_model_config(agent)+ assert config["provider"] == "custom:beta"+ info = _session_info(agent, {"agent": agent, "session_key": "s1"})+ assert info["provider"] == "custom:beta"+ assert "sk-beta" not in str(config)++def test_tui_non_custom_adapter_keeps_adapter_identity(monkeypatch):+ from hermes_cli import runtime_provider++ def fail_lookup(**_kwargs):+ raise AssertionError("custom identity lookup must not run for a native adapter")++ monkeypatch.setattr(runtime_provider, "canonical_custom_identity", fail_lookup)+ agent = _agent(provider="anthropic", requested_provider="custom:beta")+ assert _runtime_model_config(agent)["provider"] == "anthropic"+++async def test_canonical_session_info_snapshot_uses_named_custom_identity(tmp_path, monkeypatch):+ from gateway.session_contract import SessionRef+ from gateway.session_local_inventory import snapshot_info+ from tests.gateway.test_surface_admission import _authority++ agent = _agent()+ authority = await _authority(tmp_path, monkeypatch, lambda _event: "ok")+ authority.runner._cached_agent_for = lambda _route: agent+ info = await snapshot_info(authority, SessionRef("p", "s"))+ assert info["provider"] == "custom:beta"+++def test_non_custom_adapter_does_not_take_requested_custom_identity(tmp_path, monkeypatch):+ """A native/fallback adapter owns its route even if a stale request label is present."""+ from hermes_cli import runtime_provider++ def fail_lookup(*, base_url=None, config_provider=None, model=None):+ raise AssertionError("custom identity lookup must not run for a native adapter")++ monkeypatch.setattr(runtime_provider, "canonical_custom_identity", fail_lookup)+ db = SessionDB(tmp_path / "state.db")+ try:+ db.create_session("s1", source="telegram", model="old-model")+ GatewayTurnPrepareMixin._sync_session_model_from_agent(+ _runner(db), "s1", _agent(provider="anthropic", requested_provider="custom:beta")+ )+ row = db.get_session("s1")+ assert SessionDB.session_gateway_runtime(row)["provider"] == "anthropic"+ finally:+ db.close()diff --git a/tui_gateway/agent_factory.py b/tui_gateway/agent_factory.pyindex 09694452b12..17204c2f3a5 100644--- a/tui_gateway/agent_factory.py+++ b/tui_gateway/agent_factory.py@@ -187,15 +187,19 @@ def _runtime_model_config(agent, existing: dict | None = None) -> dict:from agent.voice_turn_route import session_runtime_viewagent = session_runtime_view(agent)attr = lambda k: str(getattr(agent, k, "") or "").strip()- model, provider, base_url = attr("model"), attr("provider"), attr("base_url")+ model, provider, requested_provider, base_url = (+ attr("model"), attr("provider"), attr("requested_provider"), attr("base_url"))if provider.lower() == "custom":- # ``agent.provider`` resolves every named custom entry to the literal "custom", losing the entry- # identity (api_key is never persisted): recover ``custom:<name>`` from the endpoint URL.- try:- from hermes_cli.runtime_provider import canonical_custom_identity- provider = canonical_custom_identity(base_url=base_url, model=model or None) or provider- except Exception:- logger.debug("custom provider identity lookup failed", exc_info=True)+ # ``agent.provider`` is the adapter class for every named custom entry. Keep the+ # requested identity when available; endpoint matching is ambiguous when entries share a host.+ if requested_provider and requested_provider.lower() not in {"custom", "auto"}:+ provider = requested_provider+ else:+ try:+ from hermes_cli.runtime_provider import canonical_custom_identity+ provider = canonical_custom_identity(base_url=base_url, model=model or None) or provider+ except Exception:+ logger.debug("custom provider identity lookup failed", exc_info=True)reasoning_config = getattr(agent, "reasoning_config", None)live = {"model": model, "provider": provider, "base_url": base_url, "api_mode": attr("api_mode"),diff --git a/tui_gateway/server.py b/tui_gateway/server.pyindex bf378e18e4a..74587050132 100644--- a/tui_gateway/server.py+++ b/tui_gateway/server.py@@ -1571,6 +1571,9 @@ def _session_info(agent, session: dict | None = None) -> dict:pending_model = str(pending_switch.get("display_model") or "").strip()pending_provider = str(pending_switch.get("display_provider") or "").strip()provider = mirror.get("provider", getattr(agent, "provider", ""))+ requested_provider = str(getattr(agent, "requested_provider", "") or "").strip()+ if provider == "custom" and requested_provider.lower() not in {"", "custom", "auto"}:+ provider = requested_providerif provider == "custom" and "provider" not in mirror and agent is not None:# Clients reuse this identity for new chats without carrying the endpoint or key.# Broadcast/resume callers need not be bound to this session's profile.