feat: add agent ID and token support for thread creation, enabling admin assignment

Author: Killea

src/main.py

@@ -817,6 +817,8 @@ class ThreadCreate(BaseModel):
     metadata: dict | None = None
     system_prompt: str | None = None
     template: str | None = None   # Template ID for defaults (UP-18)
+    agent_id: str | None = None   # Optional creator agent ID for admin assignment
+    token: str | None = None      # Optional creator token (required when agent_id is provided)
 
 
 class TemplateCreate(BaseModel):
@@ -968,12 +970,41 @@ async def api_create_thread(body: ThreadCreate):
 
     try:
         db = await asyncio.wait_for(get_db(), timeout=DB_TIMEOUT)
+
+        creator_agent = None
+        if body.agent_id:
+            if not body.token:
+                raise HTTPException(status_code=401, detail="token is required when agent_id is provided")
+            token_valid = await asyncio.wait_for(
+                crud.agent_verify_token(db, body.agent_id, body.token),
+                timeout=DB_TIMEOUT,
+            )
+            if not token_valid:
+                raise HTTPException(status_code=401, detail="Invalid agent_id/token")
+            creator_agent = await asyncio.wait_for(crud.agent_get(db, body.agent_id), timeout=DB_TIMEOUT)
+            if creator_agent is None:
+                raise HTTPException(status_code=404, detail="Creator agent not found")
+
         t = await asyncio.wait_for(
             crud.thread_create(db, body.topic, body.metadata, body.system_prompt, template=body.template),
             timeout=DB_TIMEOUT
         )
+
+        if creator_agent is not None:
+            settings = await asyncio.wait_for(crud.thread_settings_get_or_create(db, t.id), timeout=DB_TIMEOUT)
+            if settings.auto_administrator_enabled:
+                creator_name = creator_agent.display_name or creator_agent.name
+                await asyncio.wait_for(
+                    crud.thread_settings_set_creator_admin(db, t.id, creator_agent.id, creator_name),
+                    timeout=DB_TIMEOUT,
+                )
+                await asyncio.wait_for(
+                    crud._set_agent_activity(db, creator_agent.id, "thread_create", touch_heartbeat=True),
+                    timeout=DB_TIMEOUT,
+                )
+
         sync = await asyncio.wait_for(
-            crud.issue_reply_token(db, thread_id=t.id),
+            crud.issue_reply_token(db, thread_id=t.id, agent_id=creator_agent.id if creator_agent else None),
             timeout=DB_TIMEOUT,
         )
     except asyncio.TimeoutError:

tests/test_admin_decision_api.py

@@ -38,6 +38,16 @@ def _register_agent(client: httpx.Client) -> str:
     return resp.json()["agent_id"]
 
 
+def _register_agent_with_token(client: httpx.Client) -> tuple[str, str]:
+    resp = client.post(
+        "/api/agents/register",
+        json={"ide": "VS Code", "model": "GPT-5.3-Codex"},
+    )
+    assert resp.status_code == 200, resp.text
+    payload = resp.json()
+    return payload["agent_id"], payload["token"]
+
+
 def test_admin_decision_switch_then_keep():
     with _build_client() as client:
         _require_server_or_skip(client)
@@ -100,3 +110,26 @@ def test_admin_decision_switch_replaces_previous_admin():
         admin_resp = client.get(f"/api/threads/{thread_id}/admin")
         assert admin_resp.status_code == 200, admin_resp.text
         assert admin_resp.json()["admin_id"] == agent_b
+
+
+def test_thread_creator_agent_is_admin():
+    with _build_client() as client:
+        _require_server_or_skip(client)
+        creator_id, creator_token = _register_agent_with_token(client)
+
+        create_resp = client.post(
+            "/api/threads",
+            json={
+                "topic": f"creator-admin-{uuid.uuid4()}",
+                "agent_id": creator_id,
+                "token": creator_token,
+            },
+        )
+        assert create_resp.status_code == 201, create_resp.text
+        thread_id = create_resp.json()["id"]
+
+        admin_resp = client.get(f"/api/threads/{thread_id}/admin")
+        assert admin_resp.status_code == 200, admin_resp.text
+        payload = admin_resp.json()
+        assert payload["admin_id"] == creator_id
+        assert payload["admin_type"] == "creator"