fix(tui): honor provider_routing config in the desktop/TUI backend (#44953)

* fix(tui): honor provider_routing config in the desktop/TUI backend

The messaging gateway and classic CLI both read `provider_routing` from
config.yaml and pass the OpenRouter routing prefs (only / ignore / order /
sort / require_parameters / data_collection) into the agent. The tui_gateway
backend that powers the desktop app and TUI never did, so it built agents
with every routing pref left at its default — OpenRouter then selected
providers freely (effectively at random), ignoring the user's config.

Load `provider_routing` in `_make_agent` and forward the same six prefs the
gateway does, restoring parity across CLI / gateway / desktop. Background
subagent kwargs already propagate these from the parent agent, so they now
inherit correctly too.

* test(tui): cover provider_routing forwarding in _make_agent

Asserts the six OpenRouter routing prefs flow from config.yaml into AIAgent,
and that an absent provider_routing section forwards None/False (unchanged
behavior for users who never configured routing).
This commit is contained in:
xxxigm 2026-06-13 14:58:15 +07:00 committed by GitHub
parent 9cd3d8a6ac
commit b6c7ebf028
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 121 additions and 0 deletions

View file

@ -60,6 +60,103 @@ def test_make_agent_passes_resolved_provider():
assert call_kwargs.kwargs["api_mode"] == "anthropic_messages"
def test_make_agent_forwards_provider_routing():
"""Parity with the messaging gateway + CLI: ``provider_routing`` in
config.yaml must reach AIAgent so OpenRouter honors the user's sort /
only / ignore / order / require_parameters / data_collection prefs.
Regression for the desktop report (LewisDB): Discord respected
provider_routing but the desktop app (tui_gateway backend) built agents
with no routing prefs, so OpenRouter selected providers at random.
"""
fake_runtime = {
"provider": "openrouter",
"base_url": "https://openrouter.ai/api/v1",
"api_key": "sk-or-test",
"api_mode": "chat_completions",
"command": None,
"args": None,
"credential_pool": None,
}
fake_cfg = {
"agent": {"system_prompt": ""},
"model": {"default": "openrouter/some-model"},
"provider_routing": {
"only": ["anthropic", "google"],
"ignore": ["deepinfra"],
"order": ["anthropic", "together"],
"sort": "throughput",
"require_parameters": True,
"data_collection": "deny",
},
}
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(
"hermes_cli.runtime_provider.resolve_runtime_provider",
return_value=fake_runtime,
),
patch("run_agent.AIAgent") as mock_agent,
):
from tui_gateway.server import _make_agent
_make_agent("sid-pr", "key-pr")
kwargs = mock_agent.call_args.kwargs
assert kwargs["providers_allowed"] == ["anthropic", "google"]
assert kwargs["providers_ignored"] == ["deepinfra"]
assert kwargs["providers_order"] == ["anthropic", "together"]
assert kwargs["provider_sort"] == "throughput"
assert kwargs["provider_require_parameters"] is True
assert kwargs["provider_data_collection"] == "deny"
def test_make_agent_provider_routing_defaults_when_unset():
"""No ``provider_routing`` section → no routing prefs forwarded (None /
False), so behavior is unchanged for users who never configured it."""
fake_runtime = {
"provider": "openrouter",
"base_url": "https://openrouter.ai/api/v1",
"api_key": "sk-or-test",
"api_mode": "chat_completions",
"command": None,
"args": None,
"credential_pool": None,
}
fake_cfg = {"agent": {"system_prompt": ""}, "model": {"default": "glm-5"}}
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(
"hermes_cli.runtime_provider.resolve_runtime_provider",
return_value=fake_runtime,
),
patch("run_agent.AIAgent") as mock_agent,
):
from tui_gateway.server import _make_agent
_make_agent("sid-pr-default", "key-pr-default")
kwargs = mock_agent.call_args.kwargs
assert kwargs["providers_allowed"] is None
assert kwargs["providers_ignored"] is None
assert kwargs["providers_order"] is None
assert kwargs["provider_sort"] is None
assert kwargs["provider_require_parameters"] is False
assert kwargs["provider_data_collection"] is None
def test_make_agent_ignores_display_personality_without_system_prompt():
"""The TUI matches the classic CLI: personality only becomes active once
it has been saved to agent.system_prompt."""

View file

@ -1693,6 +1693,20 @@ def _load_service_tier() -> str | None:
return None
def _load_provider_routing() -> dict:
"""OpenRouter provider-routing prefs from config.yaml (``provider_routing``).
Parity with the messaging gateway (``gateway/run.py::_load_provider_routing``)
and the classic CLI: without this the desktop/TUI backend builds agents with
no routing prefs, so OpenRouter falls back to its default (effectively random)
provider selection even when the user configured ``provider_routing``.
"""
try:
return _load_cfg().get("provider_routing", {}) or {}
except Exception:
return {}
def _load_show_reasoning() -> bool:
return bool((_load_cfg().get("display") or {}).get("show_reasoning", False))
@ -3308,6 +3322,7 @@ def _make_agent(
requested=requested_provider,
target_model=model or None,
)
_pr = _load_provider_routing()
return AIAgent(
model=model,
max_iterations=_cfg_max_turns(cfg, 90),
@ -3335,6 +3350,15 @@ def _make_agent(
else _load_service_tier()
),
enabled_toolsets=_load_enabled_toolsets(),
# OpenRouter provider-routing prefs (config.yaml `provider_routing`).
# Mirrors the messaging gateway + CLI so the desktop/TUI honors the same
# routing instead of letting OpenRouter pick providers at random.
providers_allowed=_pr.get("only"),
providers_ignored=_pr.get("ignore"),
providers_order=_pr.get("order"),
provider_sort=_pr.get("sort"),
provider_require_parameters=_pr.get("require_parameters", False),
provider_data_collection=_pr.get("data_collection"),
platform="tui",
session_id=session_id or key,
session_db=session_db if session_db is not None else _get_db(),