The agent that grows with you
Python aiai-agentai-agentsanthropicchatgptclaudeclaude-codecodexhermeshermes-agentllmnous-researchopenai
fix(gateway): keep an earlier release's unscoped retirement marker unscoped when retiring again
unsupportedpastelse5acfdee4018
diff --git a/hermes_state_mutation_retirement.py b/hermes_state_mutation_retirement.pyindex 1b46181f3d5..52601db2433 100644--- a/hermes_state_mutation_retirement.py+++ b/hermes_state_mutation_retirement.py@@ -284,9 +284,12 @@ def entry_session_id(raw):def _mark_retired(conn, key, *, expires, **fields):- # OR REPLACE: the marker is a fact, not a receipt; re-retiring an id that was recreated+ # Replace: the marker is a fact, not a receipt; re-retiring an id that was recreated# beside its tombstone must not abort the delete that removes it again (and restarts its horizon).# An ``expires`` (sweep) marker ages out at the horizon and never shortens a permanent one.+ # A permanent marker without ``own`` (an earlier release's, maybe another profile's shared+ # fence) stays unscoped: it is the only fence of that profile's route. An earlier release's+ # sweep marker came only from this store's own sweep, so it is replaced as written.value = {'retired_at': time.time(), **fields}if expires:conn.execute('INSERT INTO state_meta(key,value) VALUES(?,?) ON CONFLICT(key) DO UPDATE '@@ -294,7 +297,10 @@ def _mark_retired(conn, key, *, expires, **fields):"AND json_extract(state_meta.value, '$.expires')",(key, json.dumps({**value, 'expires': True})))else:- conn.execute('INSERT OR REPLACE INTO state_meta(key,value) VALUES(?,?)', (key, json.dumps(value)))+ conn.execute('INSERT INTO state_meta(key,value) VALUES(?,?) ON CONFLICT(key) DO UPDATE SET value=CASE '+ "WHEN json_valid(state_meta.value) AND (json_extract(state_meta.value, '$.own') IS NOT NULL "+ "OR json_extract(state_meta.value, '$.expires')) THEN excluded.value "+ "ELSE json_remove(excluded.value, '$.own') END", (key, json.dumps(value)))def retire_routes(conn, session_ids, *, expiring=()):diff --git a/tests/gateway/test_secondary_route_fence_scope.py b/tests/gateway/test_secondary_route_fence_scope.pyindex 6b541cff3b9..29f8b076455 100644--- a/tests/gateway/test_secondary_route_fence_scope.py+++ b/tests/gateway/test_secondary_route_fence_scope.py@@ -354,3 +354,54 @@ async def test_a_start_within_the_horizon_strips_a_pruned_route_from_an_older_mi_past_the_horizon(served.alpha.db, served.launch.db)_restart(store)assert key not in store._entries, 'a pruned route came back on startup after its fence aged out'+++async def test_deleting_the_launch_session_keeps_an_earlier_releases_shared_fence_on_every_route(tmp_path, monkeypatch):+ """Before the upgrade, alpha deleted its ``user-42`` while the launch profile had a live+ ``user-42``: the shared index got the launch store's unscoped marker, and no (profile, id)+ fence. Deleting the launch session after the upgrade rewrites that marker. It must stay+ unscoped, or alpha's deleted route comes back through a late per-entry save or the+ sessions.json import on the next start."""+ from hermes_state_mutation_retirement import RETIRED_PREFIX+ async with _served(tmp_path, monkeypatch) as served:+ store, key = served.store, 'agent:alpha:telegram:42'+ served.launch.db.create_session('user-42', source='cli')+ old = json.dumps({'retired_at': time.time() - 86400}) # an earlier release's marker+ served.launch.db.set_meta(RETIRED_PREFIX + 'user-42', old)+ served.alpha.db.set_meta(RETIRED_PREFIX + 'user-42', old)+ stale = _entry(key, 'user-42').to_dict() # alpha's route, from a snapshot taken before its delete++ served.launch.db.delete_session('user-42')+ assert served.launch.db.get_session('user-42') is None+ store._routing_db.save_gateway_routing_entry(key, json.dumps(stale), scope=store._routing_scope())+ assert key not in _durable(store), "a per-entry save restored alpha's deleted route"+ store._save_sessions_json({key: stale})+ _restart(store)+ assert key not in store._entries, "the sessions.json import restored alpha's deleted route"+ _past_the_horizon(served.launch.db)+ assert served.launch.db.get_meta(RETIRED_PREFIX + 'user-42') is not None, 'the delete shortened the marker'++[email protected]('earlier', [None, {'expires': True}], ids=['fresh', 'earlier-sweep'])+async def test_deleting_the_launch_session_writes_a_launch_only_marker(tmp_path, monkeypatch, earlier):+ """A launch delete with no earlier marker, or over an earlier release's sweep marker (only the+ launch profile's own sweep wrote one: an earlier release fenced a secondary's id permanently),+ writes the launch profile's own marker. Alpha's route to its own ``user-42`` still saves."""+ from hermes_state_mutation_retirement import RETIRED_PREFIX+ async with _served(tmp_path, monkeypatch) as served:+ store, key = served.store, 'agent:alpha:telegram:42'+ for db in (served.launch.db, served.alpha.db):+ db.create_session('user-42', source='cli')+ if earlier is not None:+ served.launch.db.set_meta(RETIRED_PREFIX + 'user-42', json.dumps({'retired_at': time.time(), **earlier}))+ served.launch.db.delete_session('user-42')+ marker = json.loads(served.launch.db.get_meta(RETIRED_PREFIX + 'user-42'))+ assert marker.get('own') is True and 'expires' not in marker, marker+ entry = _entry(key, 'user-42').to_dict()+ store._routing_db.save_gateway_routing_entry(key, json.dumps(entry), scope=store._routing_scope())+ assert key in _durable(store), "the launch delete fenced alpha's route"+ store._save_sessions_json({key: entry})+ _restart(store)+ assert store._entries[key].session_id == 'user-42'