The agent that grows with you
Python aiai-agentai-agentsanthropicchatgptclaudeclaude-codecodexhermeshermes-agentllmnous-researchopenai
fix(api): refuse a deleted session id at POST /api/sessions
unsupportedpastelsd5d1b7ee1609
diff --git a/gateway/platforms/api_server.py b/gateway/platforms/api_server.pyindex 87ea195e823..e400ad2b9c0 100644--- a/gateway/platforms/api_server.py+++ b/gateway/platforms/api_server.py@@ -3107,9 +3107,9 @@ class APIServerAdapter(OpenAICompatRoutesMixin, BasePlatformAdapter):title = body.get("title")def _atomic(conn):- # One BEGIN IMMEDIATE write: a concurrent same-id create blocks and sees the row.- if conn.execute("SELECT id FROM sessions WHERE id = ?", (session_id,)).fetchone():- return None, "exists"+ from hermes_state_mutation_retirement import create_conflict+ if conflict := create_conflict(conn, session_id): # one BEGIN IMMEDIATE write: a racing create sees the row+ return None, conflictconn.execute("""INSERT INTO sessions (id, source, model, model_config, system_prompt, started_at@@ -3129,8 +3129,8 @@ class APIServerAdapter(OpenAICompatRoutesMixin, BasePlatformAdapter):return (dict(session_row) if session_row else {"id": session_id, "source": source, "model": model_name, "title": title}), Nonesession, err = await asyncio.to_thread(db._execute_write, _atomic)- if err == "exists":- return _error_response(f"Session already exists: {session_id}", 409, code="session_exists")+ if isinstance(err, tuple): # a live row, or a deleted id's fence: refused now, not on every turn+ return _error_response(f"{err[1]}: {session_id}", 409, code=err[0])if err and err.startswith("title:"):return _error_response(err[len("title:"):], 400, code="invalid_title")return web.json_response({"object": "hermes.session", "session": self._session_response(session)}, status=201)diff --git a/hermes_state_mutation_retirement.py b/hermes_state_mutation_retirement.pyindex 3fa444b4532..ba35d1097b8 100644--- a/hermes_state_mutation_retirement.py+++ b/hermes_state_mutation_retirement.py@@ -17,6 +17,16 @@ def retired_session(db, session_id):return retired_in(conn, session_id)+def create_conflict(conn, session_id):+ """``(code, message)`` refusing a create of the explicit *session_id*, else None: a live row, or a+ deleted (retired) id. A row recreated beside the fence would list fine and refuse every turn."""+ if conn.execute('SELECT 1 FROM sessions WHERE id=?', (session_id,)).fetchone():+ return 'session_exists', 'Session already exists'+ if retired_in(conn, session_id):+ return 'session_deleted', 'Session was deleted; its id cannot be reused'+ return None++def first_generation(db, derive, *, pinned=None, spent=None):"""``(n, derive(n))``: the first generation of a derived session id a NEW request may use. Auser-deleted id stays retired for good, so a derived id (header-less chat, Bot Chat, hosted-roomdiff --git a/tests/gateway/test_api_session_create_after_delete.py b/tests/gateway/test_api_session_create_after_delete.pynew file mode 100644index 00000000000..24e27174f62--- /dev/null+++ b/tests/gateway/test_api_session_create_after_delete.py@@ -0,0 +1,36 @@+"""``POST /api/sessions`` with the explicit id of a deleted session is refused when it is created.++A deleted id stays retired for good, so every turn on it is refused. Recreating the row beside the+fence used to answer 201: the session listed fine, then refused every turn. The create now says so+at once (409 ``session_deleted``), and the client mints a new id. An explicit id is the client's+own name for the conversation, so it is never remapped to another session behind its back.+"""+import pytest+from aiohttp import web+from aiohttp.test_utils import TestClient, TestServer++_KEY = 'create-after-delete-key'+_AUTH = {'Authorization': 'Bearer ' + _KEY}++[email protected]('past_horizon', [False, True], ids=['within-horizon', 'past-horizon'])+async def test_creating_a_session_with_a_deleted_id_is_refused_by_name(api, owner, past_horizon):+ from hermes_state_mutation_retirement import prune_retired_tombstones+ api._api_key = _KEY+ app = web.Application()+ app.router.add_post('/api/sessions', api._handle_create_session)+ app.router.add_delete('/api/sessions/{session_id}', api._handle_delete_session)+ async with TestClient(TestServer(app)) as client:+ created = await client.post('/api/sessions', json={'id': 'client-conv'}, headers=_AUTH)+ assert created.status == 201, await created.text()+ deleted = await client.delete('/api/sessions/client-conv', headers=_AUTH)+ assert deleted.status == 200, await deleted.text()+ if past_horizon:+ owner.db._execute_write(lambda conn: prune_retired_tombstones(conn, older_than=0))+ again = await client.post('/api/sessions', json={'id': 'client-conv'}, headers=_AUTH)+ payload = await again.json()+ assert again.status == 409 and payload['error']['code'] == 'session_deleted', payload+ assert owner.db.get_session('client-conv') is None, 'the deleted row was recreated beside its fence'+ fresh = await client.post('/api/sessions', json={'id': 'client-conv-2'}, headers=_AUTH)+ assert fresh.status == 201, await fresh.text()