The agent that grows with you
Python aiai-agentai-agentsanthropicchatgptclaudeclaude-codecodexhermeshermes-agentllmnous-researchopenai
fix(gateway): a model pick replaces the picked provider's frozen secrets whole
Tekniumccd242e85197
diff --git a/gateway/session_mutation_model.py b/gateway/session_mutation_model.pyindex 908574b0afa..647a7b11bf0 100644--- a/gateway/session_mutation_model.py+++ b/gateway/session_mutation_model.py@@ -70,7 +70,7 @@ async def prepare_model(authority, live, payload, prepared):return refusalfrozen = old.config()# The committed selection freezes the ONE picked endpoint (its key stays a private secret).- provider_secrets = {} if old.follows_profile else _freeze_selected_provider(+ provider_secrets, retired = ({}, ()) if old.follows_profile else _freeze_selected_provider(resolution, frozen, result.target_provider)if old.follows_profile:# A following session switches FROM the profile's current route: measured from its creation@@ -119,6 +119,9 @@ async def prepare_model(authority, live, payload, prepared):# Creation identity (request_json) remains immutable; runtime selection lives in the policy.policy = replace(old, model=result.new_model, config_json=json.dumps(frozen))secrets = recover_config_secrets(authority, old) if old.config_secret_ref else {}+ # The picked entry's private subtree is replaced whole: a key or header its current declaration+ # withdrew must not follow it to the new endpoint.+ secrets = {path: value for path, value in secrets.items() if path[:2] not in retired}secrets.update(provider_secrets)# A cleared field's private value must not be re-hydrated into the new route by config().secrets = {path: value for path, value in secrets.items()@@ -182,18 +185,20 @@ def _freeze_selected_provider(config, frozen, provider):"""Copy only the picked named provider's declaration into the frozen session route.The next turn resolves from the session's own configuration, not a later profile edit. Private- fields move to the policy's secret store, as policy creation does; nothing else moves.+ fields move to the policy's secret store, as policy creation does; nothing else moves. Returns+ ``(secrets, retired)``: the entry's private values and the ``(section, key)`` whose previous+ private subtree they replace."""from copy import deepcopyfrom gateway.session_policy import _extract_config_secretsfrom hermes_cli.runtime_provider_custom import named_custom_provider_config_pathpath = named_custom_provider_config_path(provider, config)if path is None:- return {}+ return {}, ()section, index = pathentries = config.get(section)if not isinstance(entries, (dict, list)) or not isinstance(entries[index], dict):- return {}+ return {}, ()copied = deepcopy(entries[index])if section == 'providers':frozen[section] = {**(frozen.get(section) if isinstance(frozen.get(section), dict) else {}), index: copied}@@ -211,7 +216,7 @@ def _freeze_selected_provider(config, frozen, provider):frozen[section] = frozen_entriessecrets = {}_extract_config_secrets(frozen[section][index], secrets, (section, index))- return secrets+ return secrets, {(section, index)}def _alias_credential(authority, result):diff --git a/tests/gateway/test_session_mutation_model_provider_replacement.py b/tests/gateway/test_session_mutation_model_provider_replacement.pynew file mode 100644index 00000000000..c4b46baea5a--- /dev/null+++ b/tests/gateway/test_session_mutation_model_provider_replacement.py@@ -0,0 +1,136 @@+"""A model pick replaces the picked provider's frozen entry whole: real picker/config/runtime and a+loopback wire (never a vendor), plus a real gateway process for the withdrawn-key case."""+import asyncio+from contextlib import contextmanager+from copy import deepcopy+from dataclasses import asdict+import json+from pathlib import Path+import sqlite3+from types import SimpleNamespace++import httpx+import pytest++from tests.gateway.fixtures.local_recovery_probe import child_env, daemon, rpc, websocket+from tests.waiting import async_wait_until++from tests.gateway.test_session_mutation_model import _loopback++@contextmanager+def peers():+ a, at, au = _loopback()+ b, bt, bu = _loopback()+ try:+ yield a, au, b, bu+ finally:+ for p, t in [(a, at), (b, bt)]:+ p.release.set()+ p.shutdown()+ p.server_close()+ t.join(timeout=5)+++async def pick(tmp_path, monkeypatch, before, after, provider, *, request=None):+ from gateway.session_mutation_model import prepare_model+ from gateway.session_policy import build_policy, bind_launch_key, restore_policy+ from gateway.run_turn_prepare import _resolve_policy_agent_runtime+ from hermes_state import SessionDB+ monkeypatch.setenv('HERMES_HOME', str(tmp_path))+ (tmp_path / 'config.yaml').write_text(json.dumps(before))+ private = {}+ policy = build_policy({'cwd': str(tmp_path), 'model': 'original', **(request or {})},+ deepcopy(before), private_secrets=private)+ with SessionDB(tmp_path / 'state.db') as db:+ authority = SimpleNamespace(instance_id='review', epoch=1, profile_id='review', db=db)+ runner = SimpleNamespace(session_authority=authority)+ authority.runner = runner+ policy = bind_launch_key(authority, 'sid', policy, None, config_secrets=private)+ runner._resolve_session_agent_runtime = lambda **k: _resolve_policy_agent_runtime(runner, policy, fallback=False)+ (tmp_path / 'config.yaml').write_text(json.dumps(after))+ prepared = {'snapshot': {'receipt': {'session_id': 'sid', 'policy': asdict(policy)}}}+ committed = await prepare_model(authority, SimpleNamespace(source=None, route='r'),+ {'model': 'switched', 'provider': provider}, prepared)+ new = restore_policy(committed['policy'])+ config = new.config(authority)+ _, runtime = _resolve_policy_agent_runtime(runner, new, fallback=False)+ # A real HTTP post using the runtime fields the next agent client receives.+ response = await asyncio.to_thread(httpx.post, runtime['base_url'].rstrip('/') + '/chat/completions',+ headers={'Authorization': f"Bearer {runtime['api_key']}"},+ json={'model':'switched','messages':[{'role':'user','content':'REVIEW'}]}, timeout=10)+ assert response.status_code == 200+ # A cold owner (no in-memory secrets) recovers the same route from the profile's own paths.+ authority._local_config_secrets = {}+ _, cold = _resolve_policy_agent_runtime(runner, new, fallback=False)+ assert (cold['base_url'], cold['api_key']) == (runtime['base_url'], runtime['api_key'])+ return config, runtime++[email protected]('replacement', ['removed', 'rotated', 'key_env', 'headers_removed'])+async def test_named_provider_replacement_does_not_keep_withdrawn_secrets(tmp_path, monkeypatch, replacement):+ with peers() as (_a, au, b, bu):+ old_entry = {'base_url': au, 'api_key':'old-review-key', 'models': {'original':{}, 'switched':{}}}+ new_entry = {'base_url': bu, 'models': {'original':{}, 'switched':{}}}+ expected = 'no-key-required'+ if replacement == 'rotated':+ new_entry['api_key'] = expected = 'new-review-key'+ if replacement == 'key_env':+ monkeypatch.setenv('REVIEW_NEW_KEY', 'env-review-key')+ new_entry['key_env'] = 'REVIEW_NEW_KEY'+ expected = 'env-review-key'+ if replacement == 'headers_removed':+ old_entry['extra_headers'] = {'X-Review-Secret': 'removed-header'}+ before = {'model': {'provider':'reviewprovider', 'default':'original'}, 'providers': {'reviewprovider':old_entry}}+ after = {**before, 'providers': {'reviewprovider':new_entry}}+ config, runtime = await pick(tmp_path, monkeypatch, before, after, 'reviewprovider')+ assert runtime['base_url'].rstrip('/') == bu+ assert b.bearers == [f'Bearer {expected}']+ assert config['providers']['reviewprovider'].get('extra_headers') is None++[email protected]('linux')+def test_removed_provider_key_is_not_sent_to_retargeted_endpoint(tmp_path):+ root = Path(__file__).resolve().parents[2]+ home, user = tmp_path / 'state', tmp_path / 'user'+ home.mkdir(); user.mkdir()+ with peers() as (_origin, origin_url, picked, picked_url):+ cfg = {'gateway': {'multiplex_profiles':False},+ 'model': {'provider':'custom', 'default':'original', 'base_url':origin_url},+ 'providers': {'loop': {'base_url':origin_url, 'api_key':'withdrawn-review-key',+ 'models':{'original':{}, 'switched':{}}}},+ 'auxiliary': {'title_generation':{'enabled':False}}, 'platform_toolsets':{'cli':[]}}+ (home / 'config.yaml').write_text(json.dumps(cfg))+ (home / 'models_dev_cache.json').write_text(json.dumps({'custom': {'id':'custom','models':{+ name:{'id':name,'name':name,'limit':{'context':100000,'output':4000}} for name in ('original','switched')}}}))+ env = child_env()+ env.update(HOME=str(user), USERPROFILE=str(user), HERMES_HOME=str(home),+ XDG_CONFIG_HOME=str(user / '.config'), HERMES_GATEWAY_LOCK_DIR=str(home / 'locks'),+ PYTHONPATH=str(root), PYTHONUNBUFFERED='1',+ OPENAI_API_KEY='original-only-key', OPENAI_BASE_URL=origin_url)+ async def run(desc):+ async with websocket(home, desc) as ws:+ async def call(method, **params):+ result = await rpc(ws, method, **params)+ assert 'result' in result, result+ return result['result']+ async def turn(sid, marker):+ await call('prompt.submit', session_id=sid, input_id=marker, text=marker)+ def terminal():+ with sqlite3.connect(home / 'state.db') as db:+ row = db.execute('SELECT status FROM session_admissions WHERE request_id=?', (marker,)).fetchone()+ return row and row[0] == 'terminal'+ await async_wait_until(terminal, timeout=30, what='real gateway turn terminal')+ return await call('session.resume', session_id=sid)+ sid = (await call('session.create', source='gui', request_id='review-create',toolsets=[]))['session_id']+ before = await turn(sid, 'BEFORE')+ (home / 'config.yaml').write_text(json.dumps({**cfg, 'providers':{'loop':{+ 'base_url':picked_url,'models':{'switched':{}}}}}))+ result = await call('session.mutate', session_id=sid, request_id='review-pick', operation='model',+ payload={'model':'switched','provider':'loop'}, expected_revision=before['revision'],+ expected_generation=before['execution_generation'])+ assert result['model'] == 'switched'+ await turn(sid, 'AFTER')+ with daemon(root, home, env, barrier=False) as (_, desc):+ asyncio.run(run(desc))+ assert picked.bearers and all(value == 'Bearer no-key-required' for value in picked.bearers), picked.bearers