Skip to content

The agent that grows with you

fix: a cold messaging model pick keeps the chat's saved provider

Teknium249959350e0e
diff --git a/gateway/session_messaging_picks.py b/gateway/session_messaging_picks.py
index 7ef1047e195..9e5f73a4e9a 100644
--- a/gateway/session_messaging_picks.py
+++ b/gateway/session_messaging_picks.py
@@ -43,6 +43,9 @@ async def _pick_model(authority, owner, live, payload, row):
ctx = _ModelSwitchContext(session_key=live.route, source=live.source,
config_path=get_hermes_home() / 'config.yaml', persist_global=False)
ctx.read_config()
+ # After a restart the chat's saved provider/base_url is only on disk: resolve against it, not
+ # config.yaml's provider, or the record step overwrites it (as run_turn_prepare rehydrates).
+ runner._rehydrate_session_model_override(live.route)
ctx.apply_override(runner._session_model_override(live.route) or {})
result, error = await runner._perform_model_switch(ctx, payload['model'], payload.get('provider', ''), live.source)
if error is not None:
diff --git a/tests/gateway/test_messaging_session_picks.py b/tests/gateway/test_messaging_session_picks.py
index 321b0592291..aa7df937ad6 100644
--- a/tests/gateway/test_messaging_session_picks.py
+++ b/tests/gateway/test_messaging_session_picks.py
@@ -118,3 +118,32 @@ async def test_a_messaging_pick_is_fenced_by_its_receipt_and_revision(tmp_path):
finally:
await viewer.close()
runner.session_store.close_all_db_handles()
+
+
+async def test_a_cold_model_pick_resolves_against_the_chats_saved_provider(tmp_path, monkeypatch):
+ """After a restart the chat's /model override lives only in the session store: a bare model pick
+ resolves against that saved provider and base URL and keeps them, not config.yaml's provider."""
+ from hermes_cli import model_selection_guards, model_switch
+ seen = {}
+
+ def switch(**k):
+ seen.update(k)
+ return model_switch.ModelSwitchResult(success=True, new_model=k['raw_input'],
+ target_provider=k['current_provider'], base_url=k['current_base_url'])
+ monkeypatch.setattr(model_switch, 'switch_model', switch)
+ monkeypatch.setattr(model_selection_guards, 'selection_warnings', lambda *a, **k: [])
+ runner, _source, route, viewer, root, fences = await _compressed_chat(tmp_path)
+ saved = {'model': 'saved-model', 'provider': 'custom', 'base_url': 'http://127.0.0.1:9/v1'}
+ runner.session_store.set_model_override(route, saved)
+ assert runner._session_model_override(route) is None # on disk only, as after a restart
+ try:
+ picked = await viewer.dispatch(_mutate(root, fences, 'model', {'model': 'picked'}, 'cold-pick'))
+
+ assert picked.get('result', {}).get('model') == 'picked', picked
+ assert (seen['current_provider'], seen['current_base_url']) == ('custom', 'http://127.0.0.1:9/v1'), seen
+ stored = runner.session_store.get_model_override(route)
+ assert (stored['model'], stored['provider'], stored['base_url']) == ('picked', 'custom', 'http://127.0.0.1:9/v1')
+ finally:
+ await viewer.close()
+ runner.session_store.close_all_db_handles()