Model switching routing and provider resolution bugs

Fixes on record

Merged to main. A stamp counts the issues a fix is linked to.

• #16897 fix(tui): `/model` writes HERMES_TUI_PROVIDER unconditionally (#16857)

  merged to main

  files: tests/test_tui_gateway_server.py, tui_gateway/server.py

  Show the diff

  • tests/test_tui_gateway_server.py

    @@ -1171,6 +1171,61 @@ def switch_model(self, **_kwargs):
         assert os.environ["HERMES_INFERENCE_PROVIDER"] == "anthropic"
     
     
    +def test_config_set_model_syncs_tui_provider_unconditionally(monkeypatch):
    +    """Regression for #16857: /model must set HERMES_TUI_PROVIDER even when
    +    it wasn't pre-set on launch, so a later /new (which re-runs
    +    _resolve_startup_runtime) honours the user's explicit provider choice
    +    instead of falling through to static-catalog detection and picking a
    +    coincidentally-matching native provider.
    +    """
    +
    +    class _Agent:
    +        provider = "openrouter"
    +        model = "old/model"
    +        base_url = ""
    +        api_key = "sk-or"
    +
    +        def switch_model(self, **_kwargs):
    +            return None
    +
    +    result = types.SimpleNamespace(
    +        success=True,
    +        new_model="deepseek-v4-pro",
    +        target_provider="custom:xuanji",
    +        api_key="[redacted:secret-assignment]",
    +        base_url="https://xuanji.example/v1",
    +        api_mode="chat_completions",
    +        warning_message="",
    +    )
    +
    +    server._sessions["sid"] = _session(agent=_Agent())
    +    monkeypatch.delenv("HERMES_TUI_PROVIDER", raising=False)
    +    monkeypatch.delenv("HERMES_INFERENCE_PROVIDER", raising=False)
    +    monkeypatch.setattr(
    +        "hermes_cli.model_switch.switch_model", lambda **_kwargs: result
    +    )
    +    monkeypatch.setattr(server, "_restart_slash_worker", lambda session: None)
    +    monkeypatch.setattr(server, "_emit", lambda *args, **kwargs: None)
    +
    +    server.handle_request(
    +        {
    +            "id": "1",
    +            "method": "config.set",
    +            "params": {
    +                "session_id": "sid",
    +                "key": "model",
    +                "value": "deepseek-v4-pro --provider custom:xuanji",
    +            },
    +        }
    +    )
    +
    +    # Both env vars must reflect the user's choice. HERMES_TUI_PROVIDER is
    +    # the canonical explicit-this-process carrier consumed by
    +    # _resolve_startup_runtime() on /new.
    +    assert os.environ["HERMES_TUI_PROVIDER"] == "custom:xuanji"
    +    assert os.environ["HERMES_INFERENCE_PROVIDER"] == "custom:xuanji"
    +
    +
     def test_config_set_model_syncs_tui_provider_env(monkeypatch):
         class Agent:
             model = "gpt-5.3-codex"

  • tui_gateway/server.py

    @@ -843,14 +843,19 @@ def _apply_model_switch(sid: str, session: dict, raw_input: str) -> dict:
     
         os.environ["HERMES_MODEL"] = result.new_model
         os.environ["HERMES_INFERENCE_MODEL"] = result.new_model
    -    # Keep the process-level provider env var in sync with the user's explicit
    -    # choice so any ambient re-resolution (credential pool refresh, compressor
    -    # rebuild, aux clients) resolves to the new provider instead of the
    -    # original one persisted in config or env.
    +    # Keep the process-level provider env vars in sync with the user's
    +    # explicit choice so any ambient re-resolution (credential pool refresh,
    +    # compressor rebuild, aux clients) and startup re-resolution on /new
    +    # both pick up the new provider instead of the original one persisted
    +    # in config or env.
    +    #
    +    # HERMES_TUI_PROVIDER is the canonical "explicit-this-process" carrier
    +    # consumed by _resolve_startup_runtime() — set it unconditionally on
    +    # /model so /new can't fall through to static-catalog detection and
    +    # pick a coincidentally-matching native provider (fixes #16857).
         if result.target_provider:
             os.environ["HERMES_INFERENCE_PROVIDER"] = result.target_provider
    -        if os.environ.get("HERMES_TUI_PROVIDER"):
    -            os.environ["HERMES_TUI_PROVIDER"] = result.target_provider
    +        os.environ["HERMES_TUI_PROVIDER"] = result.target_provider
         if persist_global:
             _persist_model_switch(result)
         return {"value": result.new_model, "warning": result.warning_message or ""}