hermes-agent/tests/tui_gateway/test_custom_provider_session_persistence.py
Teknium 0fa7d6f660
fix(desktop): never persist or restore a named custom provider as bare "custom" (#48547)
* Port from cline/cline#11514: encourage parallel tool calls

Add a universal system-prompt guidance block telling the model to batch
independent tool calls (reads, searches, web fetches, read-only commands)
into a single assistant turn instead of one call per turn. The runtime
already executes independent batches concurrently (read-only tools always;
non-overlapping path-scoped file ops); the open-source system prompt had
nothing steering the model to PRODUCE the batch. Fewer round-trips means
less resent context, which compounds over a long conversation.

- prompt_builder.py: new PARALLEL_TOOL_CALL_GUIDANCE block (short, static,
  cache-amortised) modeled on TASK_COMPLETION_GUIDANCE.
- system_prompt.py: inject right after the task-completion block, gated by
  agent.valid_tool_names + the new toggle.
- agent_init.py: read agent.parallel_tool_call_guidance (default True).
- config.py: add the default under the agent section.
- test_prompt_builder.py: behavior-contract tests (batching steer, dependent
  carve-out, length bound) — invariants, not wording snapshots.

Adapted from Cline's TypeScript tool-surface guidance to hermes-agent's
Python prompt-assembly architecture and config-over-env conventions.

* fix(desktop): never persist or restore a named custom provider as bare "custom"

Custom providers vanish from the Desktop/TUI model picker with
"No LLM provider configured" — repeatedly fixed (#44062, #44109, #45578)
and repeatedly regressed (#44022, #47714) because every fix only recovered
the entry identity from a persisted base_url. When a session is
persisted/restored with the resolved provider "custom" and NO base_url, bare
"custom" leaked through verbatim; resolve_runtime_provider("custom") routes to
the OpenRouter default URL with no api_key, so the next turn/resume dies.

Bare "custom" is the resolved billing class shared by every named providers:/
custom_providers: entry — it is not a routable identity. Centralize the
"never let bare custom escape" invariant in one helper,
runtime_provider.canonical_custom_identity(), and apply it at all four leak
sites in tui_gateway/server.py:

- _ensure_session_db_row  — the ORIGIN: first DB write seeds the bad row
- _runtime_model_config   — live persist
- _stored_session_runtime_overrides — resume restore (heals old rows; drops
  unrecoverable bare custom so resume falls back to config default)
- _make_agent             — rebuild / per-turn

The helper recovers custom:<name> from the endpoint URL when present, else
from config.model.provider (the durable identity left when no base_url
survived). Regression tests in test_custom_provider_session_persistence.py
lock the no-base_url vector at every site so it cannot regress again.
2026-06-18 11:11:51 -07:00

354 lines
14 KiB
Python

"""Session persistence must not strip a custom provider's identity.
``_runtime_model_config`` persists the live agent's RESOLVED provider into
the session row's ``model_config`` JSON. For any named ``providers:`` /
``custom_providers:`` entry (e.g. one called "mimo-v2.5-pro"),
``agent.provider`` is the literal string "custom", so the entry name was
lost — and the api_key is deliberately never persisted. On ``session.resume``
or ``_reset_session_agent``, ``_stored_session_runtime_overrides`` fed
provider="custom" back into ``_make_agent`` →
``resolve_runtime_provider(requested="custom")``, which cannot match an entry
named "mimo-v2.5-pro". Depending on config the rebuild either raised
"No LLM provider configured. Run `hermes model`..." (resume failed) or
silently resolved placeholder credentials ("no-key-required") against the
patched-back base_url.
Fix: persist the REQUESTED/entry identity — ``_runtime_model_config`` maps
the agent's base_url back to the canonical ``custom:<name>`` menu key via
``find_custom_provider_identity``; ``_make_agent`` performs the same
recovery for rows persisted before the fix (and falls back to handing the
stored base_url to the direct-alias branch when no entry matches).
Related investigation: GH #44070 / PR #44099 (credential-pool base_url
pinning); same family of resolved-vs-requested identity loss.
"""
import json
import types
from unittest.mock import MagicMock, patch
import hermes_cli.runtime_provider as rp
MIMO_URL = "https://token-plan-cn.xiaomimimo.com/v1"
MIMO_KEY = "sk-mimo-entry-key"
LEGACY_LIST_CONFIG = {
"custom_providers": [
{
"name": "mimo-v2.5-pro",
"base_url": MIMO_URL,
"api_key": MIMO_KEY,
"api_mode": "chat_completions",
}
]
}
PROVIDERS_DICT_CONFIG = {
"providers": {
"mimo-v2.5-pro": {
"api": MIMO_URL,
"api_key": MIMO_KEY,
}
}
}
def _custom_agent(base_url=MIMO_URL):
return types.SimpleNamespace(
model="mimo-v2.5-pro",
provider="custom",
base_url=base_url,
api_mode="chat_completions",
reasoning_config=None,
service_tier=None,
)
class TestRuntimeModelConfigPersistsEntryIdentity:
def test_persists_menu_key_instead_of_resolved_custom(self, monkeypatch):
monkeypatch.setattr(rp, "load_config", lambda: LEGACY_LIST_CONFIG)
from tui_gateway.server import _runtime_model_config
config = _runtime_model_config(_custom_agent())
assert config["provider"] == "custom:mimo-v2.5-pro"
assert config["base_url"] == MIMO_URL
# Credentials must keep coming from config/provider resolution,
# never from the session DB.
assert "api_key" not in config
def test_persists_menu_key_for_providers_dict_entry(self, monkeypatch):
monkeypatch.setattr(rp, "load_config", lambda: PROVIDERS_DICT_CONFIG)
from tui_gateway.server import _runtime_model_config
config = _runtime_model_config(_custom_agent())
assert config["provider"] == "custom:mimo-v2.5-pro"
def test_keeps_bare_custom_when_no_entry_matches(self, monkeypatch):
monkeypatch.setattr(rp, "load_config", lambda: {})
from tui_gateway.server import _runtime_model_config
config = _runtime_model_config(_custom_agent())
assert config["provider"] == "custom"
def test_non_custom_provider_untouched(self, monkeypatch):
def _boom():
raise AssertionError("identity lookup must not run for built-ins")
monkeypatch.setattr(rp, "load_config", _boom)
from tui_gateway.server import _runtime_model_config
agent = _custom_agent()
agent.provider = "anthropic"
agent.base_url = "https://api.anthropic.com"
assert _runtime_model_config(agent)["provider"] == "anthropic"
def _make_agent_with_override(override, monkeypatch, config, model_cfg=None):
"""Run _make_agent through the REAL resolve_runtime_provider against a
patched config, returning the kwargs AIAgent was constructed with."""
monkeypatch.setattr(rp, "load_config", lambda: config)
monkeypatch.setattr(rp, "_get_model_config", lambda: model_cfg or {})
# Keep credential-pool resolution off the developer's real HERMES home.
monkeypatch.setattr(rp, "_try_resolve_from_custom_pool", lambda *a, **k: None)
fake_cfg = {"agent": {"system_prompt": ""}, "model": {"default": "unused"}}
with (
patch("tui_gateway.server._load_cfg", return_value=fake_cfg),
patch("tui_gateway.server._get_db", return_value=MagicMock()),
patch("tui_gateway.server._load_reasoning_config", return_value=None),
patch("tui_gateway.server._load_service_tier", return_value=None),
patch("tui_gateway.server._load_enabled_toolsets", return_value=None),
patch("run_agent.AIAgent") as mock_agent,
):
from tui_gateway.server import _make_agent
_make_agent("sid-custom", "key-custom", model_override=override)
return mock_agent.call_args.kwargs
class TestResumeRoundTrip:
def test_round_trip_restores_entry_credentials(self, monkeypatch):
"""persist → stored-overrides → _make_agent resolves the entry's
api_key again (the exact path that raised "No LLM provider
configured" before the fix)."""
monkeypatch.setattr(rp, "load_config", lambda: LEGACY_LIST_CONFIG)
from tui_gateway.server import (
_runtime_model_config,
_stored_session_runtime_overrides,
)
model_config = _runtime_model_config(_custom_agent())
row = {
"model": "mimo-v2.5-pro",
"model_config": json.dumps(model_config),
}
overrides = _stored_session_runtime_overrides(row)
assert overrides["model_override"]["provider"] == "custom:mimo-v2.5-pro"
kwargs = _make_agent_with_override(
overrides["model_override"], monkeypatch, LEGACY_LIST_CONFIG
)
assert kwargs["provider"] == "custom"
assert kwargs["base_url"] == MIMO_URL
assert kwargs["api_key"] == MIMO_KEY
def test_legacy_row_with_bare_custom_heals_via_base_url(self, monkeypatch):
"""Rows persisted BEFORE the fix stored provider="custom"; the
rebuild must recover the entry identity from the stored base_url."""
override = {
"model": "mimo-v2.5-pro",
"provider": "custom",
"base_url": MIMO_URL,
"api_mode": "chat_completions",
}
kwargs = _make_agent_with_override(override, monkeypatch, LEGACY_LIST_CONFIG)
assert kwargs["base_url"] == MIMO_URL
assert kwargs["api_key"] == MIMO_KEY
def test_legacy_row_without_matching_entry_keeps_endpoint(self, monkeypatch):
"""No config entry owns the stored URL: the direct-alias branch must
still receive the base_url so resolution targets the session's
endpoint instead of raising auth_unavailable."""
monkeypatch.delenv("OPENAI_API_KEY", raising=False)
monkeypatch.delenv("OPENROUTER_API_KEY", raising=False)
override = {
"model": "local-model",
"provider": "custom",
"base_url": "http://127.0.0.1:8000/v1",
"api_mode": "chat_completions",
}
kwargs = _make_agent_with_override(override, monkeypatch, {})
assert kwargs["provider"] == "custom"
assert kwargs["base_url"] == "http://127.0.0.1:8000/v1"
assert kwargs["api_key"] == "no-key-required"
# --- Regression: bare "custom" WITHOUT a base_url (GH #44022 / #47714) ------
#
# The recurring Desktop/TUI "No LLM provider configured" regression. Every
# point-fix above recovers the entry identity from the persisted base_url —
# but a session can be persisted/restored with bare ``provider="custom"`` and
# NO base_url (the agent was built without one on the override). Then bare
# "custom" leaked through verbatim, ``resolve_runtime_provider("custom")``
# routed to the OpenRouter default URL with no api_key, and the next turn /
# resume failed with "No LLM provider configured". These tests lock the
# config-fallback recovery at all three leak sites so it cannot regress again.
NAMED_CONFIG = {
"model": {"default": "mimo-v2.5-pro", "provider": "custom:mimo-v2.5-pro"},
"custom_providers": [
{
"name": "mimo-v2.5-pro",
"base_url": MIMO_URL,
"api_key": MIMO_KEY,
"api_mode": "chat_completions",
}
],
}
class TestBareCustomNoBaseUrlHealsFromConfig:
"""A named custom provider must never escape as bare ``"custom"`` when the
config identifies the active entry — even when no base_url survived."""
def test_canonical_identity_recovers_from_config_when_no_base_url(
self, monkeypatch
):
monkeypatch.setattr(rp, "load_config", lambda: NAMED_CONFIG)
monkeypatch.setattr(rp, "_get_model_config", lambda: NAMED_CONFIG["model"])
# No base_url to reverse-lookup → must fall back to config.model.provider.
assert (
rp.canonical_custom_identity(base_url=None)
== "custom:mimo-v2.5-pro"
)
def test_canonical_identity_returns_none_without_a_real_entry(
self, monkeypatch
):
# config.model.provider is bare "custom" and no entry is named → no
# routable identity to recover; caller keeps its fallback behaviour.
monkeypatch.setattr(rp, "load_config", lambda: {})
monkeypatch.setattr(rp, "_get_model_config", lambda: {"provider": "custom"})
monkeypatch.delenv("HERMES_INFERENCE_PROVIDER", raising=False)
assert rp.canonical_custom_identity(base_url=None) is None
def test_persist_recovers_entry_when_agent_has_no_base_url(self, monkeypatch):
monkeypatch.setattr(rp, "load_config", lambda: NAMED_CONFIG)
monkeypatch.setattr(rp, "_get_model_config", lambda: NAMED_CONFIG["model"])
from tui_gateway.server import _runtime_model_config
agent = _custom_agent(base_url="") # the regression vector
config = _runtime_model_config(agent)
# Bare "custom" must NOT be persisted — it heals to the entry identity.
assert config["provider"] == "custom:mimo-v2.5-pro"
def test_restore_heals_bare_custom_row_without_base_url(self, monkeypatch):
monkeypatch.setattr(rp, "load_config", lambda: NAMED_CONFIG)
monkeypatch.setattr(rp, "_get_model_config", lambda: NAMED_CONFIG["model"])
from tui_gateway.server import _stored_session_runtime_overrides
# A poisoned row from before the fix: bare custom, no base_url.
row = {
"model": "mimo-v2.5-pro",
"model_config": json.dumps(
{"model": "mimo-v2.5-pro", "provider": "custom"}
),
"billing_provider": "custom",
}
overrides = _stored_session_runtime_overrides(row)
assert overrides["provider_override"] == "custom:mimo-v2.5-pro"
assert overrides["model_override"]["provider"] == "custom:mimo-v2.5-pro"
def test_restore_drops_bare_custom_when_config_cannot_heal(self, monkeypatch):
"""No recoverable identity: do NOT restore bare "custom" as a routable
override — leave it unset so resume falls back to the configured
default instead of the broken OpenRouter route."""
monkeypatch.setattr(rp, "load_config", lambda: {})
monkeypatch.setattr(rp, "_get_model_config", lambda: {})
monkeypatch.delenv("HERMES_INFERENCE_PROVIDER", raising=False)
from tui_gateway.server import _stored_session_runtime_overrides
row = {
"model": "some-model",
"model_config": json.dumps(
{"model": "some-model", "provider": "custom"}
),
"billing_provider": "custom",
}
overrides = _stored_session_runtime_overrides(row)
assert "provider_override" not in overrides
assert overrides["model_override"]["provider"] is None
def test_make_agent_heals_bare_custom_no_base_url_end_to_end(self, monkeypatch):
"""The exact failing path: stored override has bare custom + no
base_url; _make_agent must build the AIAgent with the named entry's
endpoint + key, NOT the OpenRouter default with an empty key."""
override = {
"model": "mimo-v2.5-pro",
"provider": "custom",
"base_url": None,
"api_mode": "chat_completions",
}
kwargs = _make_agent_with_override(
override, monkeypatch, NAMED_CONFIG, model_cfg=NAMED_CONFIG["model"]
)
assert kwargs["base_url"] == MIMO_URL
assert kwargs["api_key"] == MIMO_KEY
assert "openrouter.ai" not in (kwargs.get("base_url") or "")
def test_first_db_row_persists_entry_identity_not_bare_custom(self, monkeypatch):
"""The ORIGIN of poisoned rows: a fresh desktop session's first DB
write (_ensure_session_db_row, before the agent is built) copies the
composer override's RESOLVED provider. A named custom provider's
resolved value is bare "custom" — persisting that verbatim seeds the
unresumable row. It must be healed to ``custom:<name>`` here."""
monkeypatch.setattr(rp, "load_config", lambda: NAMED_CONFIG)
monkeypatch.setattr(rp, "_get_model_config", lambda: NAMED_CONFIG["model"])
captured = {}
class _DB:
def create_session(self, key, **kwargs):
captured.update(kwargs)
from tui_gateway import server as srv
monkeypatch.setattr(srv, "_get_db", lambda: _DB())
monkeypatch.setattr(srv, "_resolve_model", lambda: "mimo-v2.5-pro")
session = {
"session_key": "agent:main:desktop:dm:abc",
# composer override carrying the lossy resolved provider + no base_url
"model_override": {"model": "mimo-v2.5-pro", "provider": "custom"},
}
srv._ensure_session_db_row(session)
persisted = captured.get("model_config") or {}
assert persisted.get("provider") == "custom:mimo-v2.5-pro"