@sleep2agi/commhub-server 0.9.0-preview.1 → 0.9.0-preview.13

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sleep2agi/commhub-server",
-  "version": "0.9.0-preview.1",
-  "description": "CommHub Server \u2014 AI Agent communication hub with MCP protocol, multi-network isolation, user auth, and 17 MCP tools.",
+  "version": "0.9.0-preview.13",
+  "description": "CommHub Server — AI Agent communication hub with MCP protocol, multi-network isolation, user auth, and 17 MCP tools.",
   "type": "module",
   "main": "src/index.ts",
   "bin": {
@@ -48,6 +48,7 @@
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.12.0",
     "bun-types": "^1.3.13",
-    "hono": "^4.12.25"
+    "hono": "^4.12.25",
+    "zod": "^4.4.3"
   }
 }

package/src/ack-create-request.test.ts

@@ -0,0 +1,331 @@
+import { afterAll, beforeEach, describe, expect, test } from "bun:test";
+import { db } from "./db.js";
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { registerTools } from "./tools.js";
+
+// RFC-026 §9.3 D2 / #338 PR3 — ack_create_request HANDLER tests.
+//
+// 通信龙 pre-review caught B1 + B2: my first cut of PR3 added a new daemon
+// ack status `runtime_capability_check_failed` to create-node-daemon.ts but
+// the hub's zod enum only accepted ["started", "failed", "rejected"] — the
+// new status was silently zod-rejected on the hub side and the daemon's
+// `.catch(()=>{})` swallowed the rejection. The PR body also claimed
+// `daemon_capability_lied` audit was written when in fact the action wasn't
+// in the audit enum and no insert ran.
+//
+// This handler-driven suite drives the registered MCP tool through
+// registerTools() so a daemon's exact ack shape (status + runtime field)
+// flows through the real zod schema + handler branch + audit insert. It
+// would have caught the lane-recurring "single component passes but cross-
+// component path stays broken" failure mode immediately.
+
+const NET = "net_ack_t";
+const DAEMON_NODE_ID = "node_ack_daemon";
+const DAEMON_ALIAS = "ack-daemon";
+const DAEMON_USER = "u_ack_owner";
+const DAEMON_TOKEN_ID = "tok_ack_daemon";
+const DAEMON_TOKEN_HASH = "hash_ack_daemon";
+
+interface ToolHandler { (args: any, extra?: any): Promise<{ content: Array<{ type: "text"; text: string }> }>; }
+interface AckReply { ok?: boolean; error?: string; status?: string; }
+
+function cleanup() {
+  try { db.run("DELETE FROM audit_log WHERE network_id = ?1", [NET]); } catch {}
+  try { db.run("DELETE FROM node_create_requests WHERE network_id = ?1", [NET]); } catch {}
+  try { db.run("DELETE FROM nodes WHERE network_id = ?1", [NET]); } catch {}
+  try { db.run("DELETE FROM api_tokens WHERE network_id = ?1", [NET]); } catch {}
+  try { db.run("DELETE FROM network_members WHERE network_id = ?1", [NET]); } catch {}
+  try { db.run("DELETE FROM networks WHERE network_id = ?1", [NET]); } catch {}
+  try { db.run("DELETE FROM users WHERE user_id = ?1", [DAEMON_USER]); } catch {}
+}
+
+beforeEach(cleanup);
+afterAll(cleanup);
+
+function seedDaemonWorld() {
+  db.run(
+    `INSERT INTO users (user_id, username, password_hash, role, created_at)
+     VALUES (?1, ?2, 'x', 'user', datetime('now'))`,
+    [DAEMON_USER, DAEMON_USER],
+  );
+  db.run(
+    `INSERT OR REPLACE INTO networks (network_id, network_name, owner_id, created_at)
+     VALUES (?1, ?2, ?3, datetime('now'))`,
+    [NET, NET, DAEMON_USER],
+  );
+  db.run(
+    `INSERT INTO network_members (user_id, network_id, role, joined_at)
+     VALUES (?1, ?2, 'owner', datetime('now'))`,
+    [DAEMON_USER, NET],
+  );
+  // daemon node — must exist for resolveCallerDaemonTokenBound to bind.
+  db.run(
+    `INSERT INTO nodes (node_id, node_name, alias, network_id, created_at, updated_at)
+     VALUES (?1, ?2, ?3, ?4, datetime('now'), datetime('now'))`,
+    [DAEMON_NODE_ID, DAEMON_ALIAS, DAEMON_ALIAS, NET],
+  );
+  // daemon ntok — bound to the daemon node via name='node:<alias>'.
+  db.run(
+    `INSERT INTO api_tokens (token_id, user_id, network_id, scope, name, token_hash, expires_at, revoked_at)
+     VALUES (?1, ?2, ?3, 'network', ?4, ?5, NULL, NULL)`,
+    [DAEMON_TOKEN_ID, DAEMON_USER, NET, `node:${DAEMON_ALIAS}`, DAEMON_TOKEN_HASH],
+  );
+}
+
+function seedCreateRequest(opts: {
+  request_id: string,
+  child_token_id?: string,
+  status?: "pending" | "delivered" | "succeeded" | "failed",
+  child_name?: string,
+  runtime?: string,
+}) {
+  const childName = opts.child_name ?? `child_${opts.request_id}`;
+  if (opts.child_token_id) {
+    db.run(
+      `INSERT INTO api_tokens (token_id, user_id, network_id, scope, name, token_hash, expires_at, revoked_at)
+       VALUES (?1, ?2, ?3, 'network', ?4, ?5, NULL, NULL)`,
+      [opts.child_token_id, DAEMON_USER, NET, `node:${childName}`, `hash_${opts.child_token_id}`],
+    );
+  }
+  db.run(
+    `INSERT INTO node_create_requests
+       (request_id, daemon_node_id, child_name, network_id, runtime, model, flags_json, env_keys, status, child_token_id, created_at, created_by_token)
+     VALUES (?1, ?2, ?3, ?4, ?5, 'x', '{}', '[]', ?6, ?7, ?8, ?9)`,
+    [
+      opts.request_id, DAEMON_NODE_ID, childName, NET,
+      opts.runtime ?? "claude-agent-sdk",
+      opts.status ?? "delivered",
+      opts.child_token_id ?? null,
+      Date.now(),
+      DAEMON_TOKEN_ID,
+    ],
+  );
+}
+
+/** Build a server with registerTools wired as if the daemon's ntok bound. */
+function buildAckHandler(): ToolHandler {
+  const server = new McpServer({ name: "test", version: "0" }) as any;
+  const tools: Record<string, ToolHandler> = {};
+  const origTool = server.tool.bind(server);
+  server.tool = (name: string, _desc: string, _schema: any, handler: ToolHandler) => {
+    tools[name] = handler;
+    return origTool(name, _desc, _schema, handler);
+  };
+  const origRegisterTool = server.registerTool?.bind(server);
+  if (origRegisterTool) {
+    server.registerTool = (name: string, _cfg: any, handler: ToolHandler) => {
+      tools[name] = handler;
+      return origRegisterTool(name, _cfg, handler);
+    };
+  }
+  registerTools(
+    server,
+    /* clientIP */ undefined,
+    /* enforceNetworkId */ NET,
+    /* enforceUserId */ DAEMON_USER,
+    /* callerAlias */ DAEMON_ALIAS,
+    /* callerTokenIsNetwork */ true,
+    /* callerTokenId */ DAEMON_TOKEN_ID,
+  );
+  const h = tools["ack_create_request"];
+  if (!h) throw new Error("ack_create_request tool not registered");
+  return h;
+}
+
+async function callAck(handler: ToolHandler, args: any): Promise<AckReply> {
+  const r = await handler(args);
+  return JSON.parse(r.content[0].text) as AckReply;
+}
+
+function readRequest(request_id: string) {
+  return db.get<{ status: string; error: string | null; acked_at: number | null }>(
+    `SELECT status, error, acked_at FROM node_create_requests WHERE request_id = ?1`,
+    request_id,
+  );
+}
+
+function readToken(token_id: string) {
+  return db.get<{ revoked_at: string | null }>(
+    `SELECT revoked_at FROM api_tokens WHERE token_id = ?1`,
+    token_id,
+  );
+}
+
+function readAuditRows(action: string, target_id: string) {
+  return db.all<{ action: string; network_id: string; target_id: string; detail: string }>(
+    `SELECT action, network_id, target_id, detail FROM audit_log
+     WHERE action = ?1 AND target_id = ?2 ORDER BY id DESC`,
+    [action, target_id],
+  );
+}
+
+describe("ack_create_request HANDLER — B1 schema accepts runtime_capability_check_failed", () => {
+  test("schema accepts runtime_capability_check_failed + runtime field (no zod reject)", async () => {
+    seedDaemonWorld();
+    const reqId = "cr_ack_b1_accept";
+    seedCreateRequest({ request_id: reqId });
+    const handler = buildAckHandler();
+    const reply = await callAck(handler, {
+      request_id: reqId,
+      status: "runtime_capability_check_failed",
+      error: "child died within 5000ms post-spawn",
+      runtime: "codex-sdk",
+    });
+    // PR3 v1 BUG: hub zod enum rejected this status → reply.ok=false /
+    // tool would even throw before getting here. Now must accept.
+    expect(reply.ok).toBe(true);
+    expect(reply.status).toBe("runtime_capability_check_failed");
+  });
+
+  test("request flips to terminal runtime_capability_check_failed status", async () => {
+    seedDaemonWorld();
+    const reqId = "cr_ack_b1_terminal";
+    seedCreateRequest({ request_id: reqId, status: "delivered" });
+    const handler = buildAckHandler();
+    await callAck(handler, {
+      request_id: reqId,
+      status: "runtime_capability_check_failed",
+      error: "boom",
+      runtime: "codex-sdk",
+    });
+    const row = readRequest(reqId);
+    expect(row?.status).toBe("runtime_capability_check_failed");
+    expect(row?.error).toBe("boom");
+    expect(row?.acked_at).toBeGreaterThan(0);
+  });
+
+  test("child ntok is revoked on capability-check-failed (same teardown as 'failed')", async () => {
+    seedDaemonWorld();
+    const reqId = "cr_ack_b1_revoke";
+    const childTok = "tok_ack_child_b1";
+    seedCreateRequest({ request_id: reqId, child_token_id: childTok });
+    expect(readToken(childTok)?.revoked_at).toBeNull();
+    const handler = buildAckHandler();
+    await callAck(handler, {
+      request_id: reqId,
+      status: "runtime_capability_check_failed",
+      runtime: "codex-sdk",
+    });
+    expect(readToken(childTok)?.revoked_at).not.toBeNull();
+  });
+});
+
+describe("ack_create_request HANDLER — B2 audit_log daemon_capability_lied", () => {
+  test("writes daemon_capability_lied audit row with runtime + daemon + error in detail", async () => {
+    seedDaemonWorld();
+    const reqId = "cr_ack_b2_audit";
+    seedCreateRequest({ request_id: reqId });
+    const handler = buildAckHandler();
+    await callAck(handler, {
+      request_id: reqId,
+      status: "runtime_capability_check_failed",
+      error: "OPENAI_API_KEY unset",
+      runtime: "codex-sdk",
+    });
+    const rows = readAuditRows("daemon_capability_lied", reqId);
+    // PR3 v1 BUG: action wasn't in auditCreateNode enum → 0 rows + no
+    // surface for ops to spot lying daemons. Now must write exactly 1.
+    expect(rows.length).toBe(1);
+    expect(rows[0].network_id).toBe(NET);
+    const detail = JSON.parse(rows[0].detail);
+    expect(detail.runtime).toBe("codex-sdk");
+    expect(detail.daemon_node_id).toBe(DAEMON_NODE_ID);
+    expect(detail.error).toBe("OPENAI_API_KEY unset");
+    expect(typeof detail.acked_at).toBe("number");
+  });
+
+  test("does NOT write daemon_capability_lied on generic 'failed' ack (status discriminates)", async () => {
+    seedDaemonWorld();
+    const reqId = "cr_ack_b2_no_audit_on_failed";
+    seedCreateRequest({ request_id: reqId });
+    const handler = buildAckHandler();
+    await callAck(handler, {
+      request_id: reqId,
+      status: "failed",
+      error: "child died immediately after spawn",
+    });
+    const rows = readAuditRows("daemon_capability_lied", reqId);
+    expect(rows.length).toBe(0);
+  });
+
+  test("does NOT write daemon_capability_lied on 'started' (happy path silence)", async () => {
+    seedDaemonWorld();
+    const reqId = "cr_ack_b2_no_audit_on_started";
+    seedCreateRequest({ request_id: reqId });
+    const handler = buildAckHandler();
+    await callAck(handler, { request_id: reqId, status: "started", child_pid: 12345 });
+    const rows = readAuditRows("daemon_capability_lied", reqId);
+    expect(rows.length).toBe(0);
+  });
+
+  test("runtime field nullable if daemon omitted it (older daemon back-compat)", async () => {
+    // Older daemon (preview.10 and earlier) wouldn't send `runtime`.
+    // The hub must still accept + audit, just with runtime=null.
+    seedDaemonWorld();
+    const reqId = "cr_ack_b2_nullable_runtime";
+    seedCreateRequest({ request_id: reqId });
+    const handler = buildAckHandler();
+    const reply = await callAck(handler, {
+      request_id: reqId,
+      status: "runtime_capability_check_failed",
+      error: "child died",
+    });
+    expect(reply.ok).toBe(true);
+    const rows = readAuditRows("daemon_capability_lied", reqId);
+    expect(rows.length).toBe(1);
+    const detail = JSON.parse(rows[0].detail);
+    expect(detail.runtime).toBeNull();
+  });
+
+  test("error string is truncated to 500 chars in audit detail (defense vs giant payload)", async () => {
+    seedDaemonWorld();
+    const reqId = "cr_ack_b2_trunc";
+    seedCreateRequest({ request_id: reqId });
+    const handler = buildAckHandler();
+    const giant = "x".repeat(900);
+    await callAck(handler, {
+      request_id: reqId,
+      status: "runtime_capability_check_failed",
+      error: giant,
+      runtime: "codex-sdk",
+    });
+    const rows = readAuditRows("daemon_capability_lied", reqId);
+    expect(rows.length).toBe(1);
+    const detail = JSON.parse(rows[0].detail);
+    expect(detail.error.length).toBe(500);
+  });
+});
+
+describe("ack_create_request HANDLER — pre-existing happy-path stays green (regression)", () => {
+  test("status='started' still flips acked_at without terminal teardown", async () => {
+    seedDaemonWorld();
+    const reqId = "cr_ack_started_regression";
+    const childTok = "tok_ack_child_started";
+    seedCreateRequest({ request_id: reqId, child_token_id: childTok });
+    const handler = buildAckHandler();
+    const reply = await callAck(handler, { request_id: reqId, status: "started", child_pid: 7777 });
+    expect(reply.ok).toBe(true);
+    expect(reply.status).toBe("awaiting_register");
+    const row = readRequest(reqId);
+    // 'started' doesn't flip to terminal; status stays 'delivered'.
+    expect(row?.status).toBe("delivered");
+    expect(row?.acked_at).toBeGreaterThan(0);
+    // child ntok is NOT revoked on 'started'.
+    expect(readToken(childTok)?.revoked_at).toBeNull();
+  });
+
+  test("status='failed' still revokes child + flips to failed (no audit_log daemon_capability_lied)", async () => {
+    seedDaemonWorld();
+    const reqId = "cr_ack_failed_regression";
+    const childTok = "tok_ack_child_failed";
+    seedCreateRequest({ request_id: reqId, child_token_id: childTok });
+    const handler = buildAckHandler();
+    const reply = await callAck(handler, { request_id: reqId, status: "failed", error: "fork failed" });
+    expect(reply.ok).toBe(true);
+    const row = readRequest(reqId);
+    expect(row?.status).toBe("failed");
+    expect(row?.error).toBe("fork failed");
+    expect(readToken(childTok)?.revoked_at).not.toBeNull();
+    expect(readAuditRows("daemon_capability_lied", reqId).length).toBe(0);
+  });
+});

package/src/api-nodes-shape.test.ts

@@ -0,0 +1,172 @@
+import { afterAll, beforeEach, describe, expect, test } from "bun:test";
+import { db } from "./db.js";
+
+// Regression test for SELECT * fragility on GET /api/nodes.
+//
+// Prior behavior: `SELECT * FROM nodes` returned whatever columns the
+// table happened to have. When RFC-024 added config_revision +
+// config_snapshot columns (read by the per-node GET /api/nodes/:id/config
+// endpoint, NOT meant for the list endpoint), they silently leaked into
+// the list response and broke V3 Networks tests that asserted on the
+// nodes-list row shape.
+//
+// Current behavior: explicit column list — the response contract is:
+//   node_id, node_name, alias, runtime, model, config_path, channels,
+//   server, hostname, network_id, created_at, updated_at
+// This test runs the same SQL the handler uses, on a row that DOES have
+// config_revision + config_snapshot populated, and asserts those fields
+// do NOT appear in the returned row. If anyone reverts the handler to
+// SELECT *, or adds an internal column to the SELECT, this test breaks.
+
+const TEST_NETWORK = "net_test_shape";
+const TEST_NODE = "node_test_shape_abc";
+
+beforeEach(() => {
+  // Best-effort cleanup (test runs in shared test DB; rows are isolated by id)
+  try { db.run("DELETE FROM nodes WHERE node_id = ?1", [TEST_NODE]); } catch {}
+});
+afterAll(() => {
+  try { db.run("DELETE FROM nodes WHERE node_id = ?1", [TEST_NODE]); } catch {}
+});
+
+// Helper: mirror handler's role-extraction pass to mimic the production
+// response shape exactly. Keeps the test the source of truth for the
+// contract; if the handler changes, the assertions still lock what
+// the dashboard / external clients see.
+function mapRow(r: Record<string, unknown>): Record<string, unknown> {
+  let role: string | null = null;
+  const snap = r.config_snapshot;
+  if (snap) {
+    try { role = (typeof snap === "string" ? JSON.parse(snap) : snap)?.role ?? null; }
+    catch { /* malformed */ }
+  }
+  const { config_snapshot, ...rest } = r;
+  return { ...rest, role };
+}
+
+describe("RFC-024 regression — GET /api/nodes response shape (no SELECT *)", () => {
+  test("explicit columns + role extracted: config_snapshot NOT in response, role IS", () => {
+    // Insert a row with the leak-prone columns populated. Use INSERT OR
+    // REPLACE so concurrent test runs don't trip on PRIMARY KEY.
+    db.run(
+      `INSERT OR REPLACE INTO nodes (
+         node_id, node_name, alias, runtime, model, config_path,
+         channels, server, hostname, network_id,
+         config_revision, config_snapshot
+       ) VALUES (
+         ?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12
+       )`,
+      [TEST_NODE, "test-shape", "test-shape", "claude-agent-sdk", "claude-opus",
+       "/tmp/cfg.json", "[]", "localhost", "test-host", TEST_NETWORK,
+       7, JSON.stringify({ model: "claude-opus", flags: { x: true }, role: "host_supervisor" })],
+    );
+
+    // Mirror handler SQL + mapping
+    const raw = db.all<Record<string, unknown>>(
+      `SELECT node_id, node_name, alias, runtime, model,
+              config_path, channels, server, hostname,
+              network_id, created_at, updated_at,
+              config_snapshot
+       FROM nodes WHERE node_id = ?1`,
+      TEST_NODE,
+    );
+    const rows = raw.map(mapRow);
+
+    expect(rows).toHaveLength(1);
+    const row = rows[0]!;
+    // Expected fields present (13 = 12 contract + new role)
+    for (const k of ["node_id", "node_name", "alias", "runtime", "model",
+                     "config_path", "channels", "server", "hostname",
+                     "network_id", "created_at", "updated_at", "role"]) {
+      expect(row).toHaveProperty(k);
+    }
+    // Internal fields NOT present
+    expect(row).not.toHaveProperty("config_revision");
+    expect(row).not.toHaveProperty("config_snapshot");
+    // role is EXTRACTED from config_snapshot JSON, not the raw blob
+    expect(row.role).toBe("host_supervisor");
+    // Belt: full key set is exactly the 13 contract fields
+    expect(Object.keys(row).sort()).toEqual([
+      "alias", "channels", "config_path", "created_at", "hostname",
+      "model", "network_id", "node_id", "node_name", "role", "runtime",
+      "server", "updated_at",
+    ]);
+  });
+
+  test("role is null when config_snapshot is empty / missing / malformed", () => {
+    // Empty snapshot → null
+    db.run(
+      `INSERT OR REPLACE INTO nodes (node_id, node_name, alias, network_id, config_snapshot)
+       VALUES (?1, ?2, ?3, ?4, NULL)`,
+      [TEST_NODE, "test-shape", "test-shape", TEST_NETWORK],
+    );
+    let row = mapRow(db.get<Record<string, unknown>>(
+      `SELECT node_id, node_name, alias, runtime, model, config_path, channels,
+              server, hostname, network_id, created_at, updated_at, config_snapshot
+       FROM nodes WHERE node_id = ?1`,
+      TEST_NODE,
+    )!);
+    expect(row.role).toBeNull();
+    expect(row).not.toHaveProperty("config_snapshot");
+
+    // Malformed JSON → null (handler doesn't throw, just leaves role null)
+    db.run(`UPDATE nodes SET config_snapshot = ?1 WHERE node_id = ?2`, ["not-json{", TEST_NODE]);
+    row = mapRow(db.get<Record<string, unknown>>(
+      `SELECT node_id, node_name, alias, runtime, model, config_path, channels,
+              server, hostname, network_id, created_at, updated_at, config_snapshot
+       FROM nodes WHERE node_id = ?1`,
+      TEST_NODE,
+    )!);
+    expect(row.role).toBeNull();
+
+    // Snapshot without role key → null
+    db.run(`UPDATE nodes SET config_snapshot = ?1 WHERE node_id = ?2`,
+           [JSON.stringify({ model: "x", flags: {} }), TEST_NODE]);
+    row = mapRow(db.get<Record<string, unknown>>(
+      `SELECT node_id, node_name, alias, runtime, model, config_path, channels,
+              server, hostname, network_id, created_at, updated_at, config_snapshot
+       FROM nodes WHERE node_id = ?1`,
+      TEST_NODE,
+    )!);
+    expect(row.role).toBeNull();
+  });
+
+  test("daemon discovery use-case: dashboard finds role=host_supervisor without prefix heuristic", () => {
+    // Daemon registered with arbitrary node_id (NO `node_daemon_` prefix)
+    db.run(
+      `INSERT OR REPLACE INTO nodes (node_id, node_name, alias, network_id, config_snapshot)
+       VALUES (?1, ?2, ?3, ?4, ?5)`,
+      [TEST_NODE, "my-daemon", "my-daemon", TEST_NETWORK,
+       JSON.stringify({ role: "host_supervisor", runtime: "claude-agent-sdk" })],
+    );
+    const rows = db.all<Record<string, unknown>>(
+      `SELECT node_id, node_name, alias, runtime, model, config_path, channels,
+              server, hostname, network_id, created_at, updated_at, config_snapshot
+       FROM nodes WHERE network_id = ?1`,
+      TEST_NETWORK,
+    ).map(mapRow);
+    // Dashboard's lookup: find first node with role==='host_supervisor'
+    const daemon = rows.find(r => r.role === "host_supervisor");
+    expect(daemon).toBeTruthy();
+    expect(daemon!.node_id).toBe(TEST_NODE);
+    // Even though node_id does NOT start with `node_daemon_` (the prior heuristic)
+    expect(String(daemon!.node_id).startsWith("node_daemon_")).toBe(false);
+  });
+
+  test("internal columns are still readable via dedicated query (config snapshot endpoint path)", () => {
+    db.run(
+      `INSERT OR REPLACE INTO nodes (node_id, node_name, alias, network_id,
+                                     config_revision, config_snapshot)
+       VALUES (?1, ?2, ?3, ?4, ?5, ?6)`,
+      [TEST_NODE, "test-shape", "test-shape", TEST_NETWORK,
+       42, JSON.stringify({ model: "claude-opus" })],
+    );
+    // Mirrors the SELECT in GET /api/nodes/:id/config (server/src/index.ts):
+    const cfgRow = db.get<{ config_revision: number; config_snapshot: string }>(
+      "SELECT config_revision, config_snapshot FROM nodes WHERE node_id = ?1",
+      TEST_NODE,
+    );
+    expect(cfgRow?.config_revision).toBe(42);
+    expect(cfgRow?.config_snapshot).toContain("claude-opus");
+  });
+});

package/src/auth.ts

@@ -211,7 +211,9 @@ export function resolveToken(token: string): { user: AuthUser; networkId: string
     `SELECT t.token_id, t.user_id, t.network_id, t.scope, t.name AS token_name,
             u.username, u.display_name, u.email, u.role
      FROM api_tokens t JOIN users u ON t.user_id = u.user_id
-     WHERE t.token_hash = ?1 AND (t.expires_at IS NULL OR t.expires_at > datetime('now'))`,
+     WHERE t.token_hash = ?1
+       AND (t.expires_at IS NULL OR t.expires_at > datetime('now'))
+       AND t.revoked_at IS NULL`,
     tHash);
 
   if (!row) return null;