@sleep2agi/commhub-server 0.9.0-preview.57 → 0.9.0-preview.58

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sleep2agi/commhub-server",
-  "version": "0.9.0-preview.57",
+  "version": "0.9.0-preview.58",
   "description": "CommHub Server — AI Agent communication hub with MCP protocol, multi-network isolation, user auth, and MCP tools (17 collaboration-core + node/provider ops tools; authoritative list: docs-site/docs/api/mcp-tools.md).",
   "type": "module",
   "main": "src/index.ts",

package/src/rules-file-duplicate-alias.test.ts

@@ -0,0 +1,234 @@
+// Duplicate-alias node rows vs the node pull/ack paths (field report).
+//
+// Re-creating a node under the same alias leaves the old `nodes` row behind, so
+// one alias can own several rows in a network. The pull/ack tools used to
+// resolve the caller by `WHERE alias = ? AND network_id = ?` + `db.get`, i.e.
+// the first row SQLite yields — the stale one. Field shape: the client queued a
+// rules-file read for the live node, the node pulled with its own (bound)
+// token, the hub looked under the stale node_id, answered `request: null`, and
+// the read timed out with only `[rules-file] doorbell received` in the node log.
+//
+// 跑法：cd server && COMMHUB_DB=/tmp/rules-dup.db bun test src/rules-file-duplicate-alias.test.ts
+import { afterAll, beforeEach, describe, expect, test } from "bun:test";
+import { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import { InMemoryTransport } from "@modelcontextprotocol/sdk/inMemory.js";
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { db } from "./db.js";
+import { registerTools } from "./tools.js";
+
+const NET = "net_rules_dup";
+const USER = "u_rules_dup_owner";
+const ALIAS = "rules-dup-node";
+// Inserted first → the row a plain `db.get` on the alias returns.
+const STALE_ID = "node_rules_dup_stale";
+const LIVE_ID = "node_rules_dup_live";
+const STALE_TOKEN = "tok_rules_dup_stale";
+const LIVE_TOKEN = "tok_rules_dup_live";
+const UNBOUND_TOKEN = "tok_rules_dup_unbound";
+
+function cleanup() {
+  try { db.run("DELETE FROM node_rules_requests WHERE network_id = ?1", [NET]); } catch {}
+  try { db.run("DELETE FROM node_config_updates WHERE network_id = ?1", [NET]); } catch {}
+  try { db.run("DELETE FROM audit_log WHERE network_id = ?1", [NET]); } catch {}
+  try { db.run("DELETE FROM sessions 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", [USER]); } catch {}
+}
+
+function seedWorld(opts: { liveSession?: boolean } = {}) {
+  db.run(
+    `INSERT INTO users (user_id, username, password_hash, role, created_at) VALUES (?1, ?2, 'x', 'user', datetime('now'))`,
+    [USER, USER],
+  );
+  db.run(`INSERT INTO networks (network_id, network_name, owner_id, created_at) VALUES (?1, ?2, ?3, datetime('now'))`, [NET, NET, USER]);
+  db.run(`INSERT INTO network_members (user_id, network_id, role, joined_at) VALUES (?1, ?2, 'owner', datetime('now'))`, [USER, NET]);
+  // Stale row first (older created_at AND lower rowid), live row second.
+  db.run(
+    `INSERT INTO nodes (node_id, node_name, alias, network_id, created_at, updated_at) VALUES (?1, ?2, ?3, ?4, '2026-09-16 01:40:40', '2026-09-16 01:40:40')`,
+    [STALE_ID, ALIAS, ALIAS, NET],
+  );
+  db.run(
+    `INSERT INTO nodes (node_id, node_name, alias, network_id, created_at, updated_at) VALUES (?1, ?2, ?3, ?4, '2026-09-16 01:42:46', '2026-09-16 01:42:46')`,
+    [LIVE_ID, ALIAS, ALIAS, NET],
+  );
+  for (const [tok, bound, hash] of [
+    [STALE_TOKEN, STALE_ID, "hash_rules_dup_stale"],
+    [LIVE_TOKEN, LIVE_ID, "hash_rules_dup_live"],
+    [UNBOUND_TOKEN, null, "hash_rules_dup_unbound"],
+  ] as const) {
+    db.run(
+      `INSERT INTO api_tokens (token_id, user_id, network_id, scope, name, token_hash, expires_at, revoked_at, bound_node_id) VALUES (?1, ?2, ?3, 'network', ?4, ?5, NULL, NULL, ?6)`,
+      [tok, USER, NET, `node:${ALIAS}`, hash, bound],
+    );
+  }
+  if (opts.liveSession !== false) {
+    db.run(
+      `INSERT INTO sessions (resume_id, alias, network_id, node_id, status, updated_at) VALUES (?1, ?2, ?3, ?4, 'idle', datetime('now'))`,
+      [`sdk-${LIVE_ID}`, ALIAS, NET, LIVE_ID],
+    );
+  }
+}
+
+type Identity = { alias: string; isNetworkToken: boolean; tokenId: string };
+const asUser: Identity = { alias: USER, isNetworkToken: false, tokenId: "tok_rules_dup_user" };
+const asLive: Identity = { alias: ALIAS, isNetworkToken: true, tokenId: LIVE_TOKEN };
+const asStale: Identity = { alias: ALIAS, isNetworkToken: true, tokenId: STALE_TOKEN };
+const asUnbound: Identity = { alias: ALIAS, isNetworkToken: true, tokenId: UNBOUND_TOKEN };
+
+async function connect(id: Identity) {
+  const server = new McpServer({ name: "rules-dup-test", version: "1" });
+  registerTools(server, undefined, NET, USER, id.alias, id.isNetworkToken, id.tokenId);
+  const client = new Client({ name: "rules-dup-client", version: "1" });
+  const [ct, st] = InMemoryTransport.createLinkedPair();
+  await server.connect(st);
+  await client.connect(ct);
+  const call = async (name: string, args: Record<string, unknown>) => {
+    const r: any = await client.callTool({ name, arguments: args });
+    const first = r.content?.[0];
+    if (!first || first.type !== "text") throw new Error(`no text result from ${name}`);
+    return JSON.parse(first.text);
+  };
+  const close = async () => { await client.close(); await server.close(); };
+  return { call, close };
+}
+
+function queuedNodeId(requestId: string): string | undefined {
+  return db.get<{ node_id: string }>("SELECT node_id FROM node_rules_requests WHERE request_id = ?1", requestId)?.node_id;
+}
+
+beforeEach(() => { cleanup(); });
+afterAll(cleanup);
+
+describe("duplicate alias — rules file pull/ack", () => {
+  test("field case: read queued for the live node_id is pulled and acked by the live node's bound token", async () => {
+    seedWorld();
+    const u = await connect(asUser);
+    const n = await connect(asLive);
+    try {
+      const enq = await u.call("read_node_rules_file", { node_id: LIVE_ID });
+      expect(enq).toMatchObject({ ok: true, op: "read" });
+      const pulled = await n.call("get_rules_file_request", {});
+      expect(pulled).toEqual({ ok: true, request: { request_id: enq.request_id, op: "read" } });
+      const ack = await n.call("ack_rules_file_request", { request_id: enq.request_id, status: "done", file_name: "AGENTS.md", exists: true, content: "# live" });
+      expect(ack).toMatchObject({ ok: true, status: "done" });
+      expect(await u.call("get_rules_file_result", { request_id: enq.request_id })).toMatchObject({ status: "done", content: "# live" });
+    } finally { await u.close(); await n.close(); }
+  }, 20_000);
+
+  test("a token bound to the stale row can neither pull nor ack the live node's request", async () => {
+    seedWorld();
+    const u = await connect(asUser);
+    const stale = await connect(asStale);
+    try {
+      const enq = await u.call("read_node_rules_file", { node_id: LIVE_ID });
+      expect(await stale.call("get_rules_file_request", {})).toEqual({ ok: true, request: null });
+      expect(await stale.call("ack_rules_file_request", { request_id: enq.request_id, status: "done", content: "# forged" }))
+        .toEqual({ ok: true, ignored: "unknown_or_foreign_request" });
+      expect(await u.call("get_rules_file_result", { request_id: enq.request_id })).toMatchObject({ status: "pending" });
+    } finally { await u.close(); await stale.close(); }
+  }, 20_000);
+
+  test("the live token does not pull a request queued for the stale row", async () => {
+    seedWorld();
+    const u = await connect(asUser);
+    const n = await connect(asLive);
+    try {
+      await u.call("read_node_rules_file", { node_id: STALE_ID });
+      expect(await n.call("get_rules_file_request", {})).toEqual({ ok: true, request: null });
+    } finally { await u.close(); await n.close(); }
+  }, 20_000);
+
+  test("client targeting by alias queues under the row the alias's session points at", async () => {
+    seedWorld();
+    const u = await connect(asUser);
+    try {
+      const enq = await u.call("read_node_rules_file", { alias: ALIAS });
+      expect(enq).toMatchObject({ ok: true, op: "read" });
+      expect(queuedNodeId(enq.request_id)).toBe(LIVE_ID);
+      const sk = await u.call("list_node_skills", { alias: ALIAS });
+      expect(sk).toMatchObject({ ok: true });
+      expect(queuedNodeId(sk.request_id)).toBe(LIVE_ID);
+    } finally { await u.close(); }
+  }, 20_000);
+
+  test("without a session row, alias targeting falls back to the newest row", async () => {
+    seedWorld({ liveSession: false });
+    const u = await connect(asUser);
+    try {
+      const enq = await u.call("read_node_rules_file", { alias: ALIAS });
+      expect(queuedNodeId(enq.request_id)).toBe(LIVE_ID);
+    } finally { await u.close(); }
+  }, 20_000);
+
+  test("the session mapping wins over recency: alias targeting picks the older row when the session points at it", async () => {
+    seedWorld({ liveSession: false });
+    db.run(
+      `INSERT INTO sessions (resume_id, alias, network_id, node_id, status, updated_at) VALUES (?1, ?2, ?3, ?4, 'idle', datetime('now'))`,
+      [`sdk-${STALE_ID}`, ALIAS, NET, STALE_ID],
+    );
+    const u = await connect(asUser);
+    try {
+      const enq = await u.call("read_node_rules_file", { alias: ALIAS });
+      expect(queuedNodeId(enq.request_id)).toBe(STALE_ID);
+    } finally { await u.close(); }
+  }, 20_000);
+
+  test("a token bound to a node whose row is gone does not fall back to another row with its alias", async () => {
+    seedWorld();
+    db.run("UPDATE api_tokens SET bound_node_id = 'node_rules_dup_deleted' WHERE token_id = ?1", [STALE_TOKEN]);
+    const u = await connect(asUser);
+    const stale = await connect(asStale);
+    try {
+      const enq = await u.call("read_node_rules_file", { node_id: LIVE_ID });
+      expect(await stale.call("get_rules_file_request", {})).toEqual({ ok: true, request: null });
+      expect(await u.call("get_rules_file_result", { request_id: enq.request_id })).toMatchObject({ status: "pending" });
+    } finally { await u.close(); await stale.close(); }
+  }, 20_000);
+
+  test("an unbound legacy token resolves its alias to the session-mapped row", async () => {
+    seedWorld();
+    const u = await connect(asUser);
+    const n = await connect(asUnbound);
+    try {
+      const enq = await u.call("read_node_rules_file", { node_id: LIVE_ID });
+      expect(await n.call("get_rules_file_request", {})).toEqual({ ok: true, request: { request_id: enq.request_id, op: "read" } });
+    } finally { await u.close(); await n.close(); }
+  }, 20_000);
+});
+
+describe("duplicate alias — config update pull/ack", () => {
+  function queueUpdate(nodeId: string, updateId: string) {
+    db.run(
+      `INSERT INTO node_config_updates (update_id, node_id, network_id, patch_json, apply_mode, base_revision, status, created_at, created_by_token) VALUES (?1, ?2, ?3, '{"model":"m"}', 'hot', 0, 'pending', ?4, 'tok_rules_dup_user')`,
+      [updateId, nodeId, NET, Date.now()],
+    );
+  }
+
+  test("the live node's bound token pulls and acks its own pending update", async () => {
+    seedWorld();
+    queueUpdate(LIVE_ID, "cu_rules_dup_live");
+    const n = await connect(asLive);
+    try {
+      const pulled = await n.call("get_config_update", {});
+      expect(pulled.update?.update_id).toBe("cu_rules_dup_live");
+      const ack = await n.call("ack_config_update", { update_id: "cu_rules_dup_live", status: "applied", new_revision: 1 });
+      expect(ack.ok).toBe(true);
+      expect(ack.ignored).toBeUndefined();
+      expect(db.get<{ status: string }>("SELECT status FROM node_config_updates WHERE update_id = 'cu_rules_dup_live'")?.status).toBe("applied");
+    } finally { await n.close(); }
+  }, 20_000);
+
+  test("a token bound to the stale row cannot pull or ack the live node's update", async () => {
+    seedWorld();
+    queueUpdate(LIVE_ID, "cu_rules_dup_live2");
+    const stale = await connect(asStale);
+    try {
+      expect((await stale.call("get_config_update", {})).update).toBeNull();
+      await stale.call("ack_config_update", { update_id: "cu_rules_dup_live2", status: "applied", new_revision: 1 });
+      expect(db.get<{ status: string }>("SELECT status FROM node_config_updates WHERE update_id = 'cu_rules_dup_live2'")?.status).toBe("pending");
+    } finally { await stale.close(); }
+  }, 20_000);
+});

package/src/task-consumption.test.ts

@@ -126,6 +126,17 @@ describe("task consumed_at identity and lifecycle", () => {
     expect([...first.tasks, ...second.tasks].some((task: any) => task.task_id === "foreign-node-row")).toBe(false);
     expect((await call(handler, { from_node_id: `id_${NODE_B}`, durable_cursor: true, limit: 100 })).error).toBe("from_node_id_identity_mismatch");
   });
+  test("a legacy unbound node token is refused the durable cursor even for its own node", async () => {
+    // Pre-RFC-036 tokens carry no immutable node binding. The durable outbox
+    // cursor must stay closed to them (no bind-on-first-use); agent-node
+    // degrades to inbox-only compensation on this exact error code.
+    db.run("UPDATE api_tokens SET bound_node_id = NULL WHERE token_id = ?1", [`token_${NODE_A}`]);
+    const handler = toolsFor({ alias: NODE_A, nodeToken: true }).list_tasks;
+    expect((await call(handler, { from_node_id: `id_${NODE_A}`, durable_cursor: true, limit: 10 })).error).toBe("from_node_id_identity_mismatch");
+    expect((await call(handler, { from_node_id: `id_${NODE_B}`, durable_cursor: true, limit: 10 })).error).toBe("from_node_id_identity_mismatch");
+    const bound = db.get<{ bound_node_id: string | null }>("SELECT bound_node_id FROM api_tokens WHERE token_id = ?1", `token_${NODE_A}`);
+    expect(bound?.bound_node_id).toBeNull();
+  });
   test("terminal sequence paginates beyond 2000 and admits late completion of an old task", async () => {
     db.run(
       `INSERT INTO tasks (task_id, from_node_id, from_name, to_name, status, content, network_id, created_at)

package/src/tools.ts

@@ -2982,6 +2982,51 @@ export function registerTools(server: McpServer, clientIP?: string, enforceNetwo
     },
   );
 
+  // One alias can own several `nodes` rows in a network: re-creating a node
+  // under the same alias leaves the old row behind, and `db.get` on
+  // `WHERE alias = ? AND network_id = ?` then returns whichever row SQLite
+  // happens to yield first. A field report showed the result: the client
+  // queued a rules-file read for the live node, the node pulled with its own
+  // token, the hub resolved its alias to the stale row, found nothing pending
+  // and returned `request: null` until the read timed out.
+  //
+  // resolveNodeByAlias: prefer the row the alias's session points at (sessions
+  // are UNIQUE per network+alias and carry the node_id that last reported),
+  // then the newest row. Used where only an alias is known (a client targeting
+  // by alias; unbound legacy node tokens).
+  const resolveNodeByAlias = (alias: string, networkId: string) =>
+    db.get<{ node_id: string; alias: string; network_id: string | null }>(
+      `SELECT n.node_id, n.alias, n.network_id FROM nodes n
+         LEFT JOIN sessions s ON s.alias = n.alias AND s.network_id = n.network_id AND s.node_id = n.node_id
+        WHERE n.alias = ?1 AND n.network_id = ?2
+        ORDER BY (s.node_id IS NOT NULL) DESC, n.created_at DESC, n.rowid DESC
+        LIMIT 1`,
+      alias,
+      networkId,
+    ) ?? null;
+  // resolveCallerNode: the node a network token pulls/acks for. A token bound
+  // to a node resolves to exactly that node (and never to another row that
+  // shares its alias); only unbound legacy tokens fall back to the alias.
+  // Callers have already required callerTokenIsNetwork + enforceNetworkId +
+  // callerAlias.
+  const resolveCallerNode = (): { node_id: string; network_id: string | null } | null => {
+    const bound = callerTokenId
+      ? db.get<{ bound_node_id: string | null }>(
+          "SELECT bound_node_id FROM api_tokens WHERE token_id = ?1 AND network_id = ?2",
+          callerTokenId,
+          enforceNetworkId,
+        )?.bound_node_id ?? null
+      : null;
+    if (bound) {
+      return db.get<{ node_id: string; network_id: string | null }>(
+        "SELECT node_id, network_id FROM nodes WHERE node_id = ?1 AND network_id = ?2",
+        bound,
+        enforceNetworkId,
+      ) ?? null;
+    }
+    return resolveNodeByAlias(callerAlias!, enforceNetworkId!);
+  };
+
   server.tool(
     "get_config_update",
     "Node pulls its pending config update (called from agent-node when SSE config_update doorbell arrives). RFC-024.",
@@ -3005,11 +3050,7 @@ export function registerTools(server: McpServer, clientIP?: string, enforceNetwo
       // Unconditional network_id filter (was previously conditional on
       // enforceNetworkId being set; the new ntok guard above guarantees
       // it's non-null so the filter is always applied).
-      const node = db.get<any>(
-        "SELECT node_id, network_id FROM nodes WHERE alias = ?1 AND network_id = ?2",
-        callerAlias,
-        enforceNetworkId,
-      );
+      const node = resolveCallerNode();
       if (!node) {
         return { content: [{ type: "text" as const, text: JSON.stringify({ ok: true, update: null }) }] };
       }
@@ -3062,11 +3103,7 @@ export function registerTools(server: McpServer, clientIP?: string, enforceNetwo
       // Cross-tenant guard: the ack-er must own the update being acked.
       // Resolve node by caller's alias under the enforced network.
       // Network filter is unconditional (guard above guarantees non-null).
-      const node = db.get<any>(
-        "SELECT node_id FROM nodes WHERE alias = ?1 AND network_id = ?2",
-        callerAlias,
-        enforceNetworkId,
-      );
+      const node = resolveCallerNode();
       if (!node) {
         // Silently ignore stale ack — return ok so the node doesn't retry forever.
         return { content: [{ type: "text" as const, text: JSON.stringify({ ok: true, ignored: "alias_unknown" }) }] };
@@ -3155,11 +3192,7 @@ export function registerTools(server: McpServer, clientIP?: string, enforceNetwo
       node = resolved.row as any;
     } else {
       const scopeNet = effectiveNetId || "default";
-      const byAlias = db.get<{ node_id: string; alias: string; network_id: string | null }>(
-        "SELECT node_id, alias, network_id FROM nodes WHERE alias = ?1 AND network_id = ?2",
-        a.alias,
-        scopeNet,
-      );
+      const byAlias = resolveNodeByAlias(a.alias, scopeNet);
       if (byAlias) {
         node = byAlias;
       } else {
@@ -3278,11 +3311,7 @@ export function registerTools(server: McpServer, clientIP?: string, enforceNetwo
       if (!callerAlias) {
         return { content: [{ type: "text" as const, text: JSON.stringify({ ok: false, error: "alias_required" }) }] };
       }
-      const node = db.get<any>(
-        "SELECT node_id FROM nodes WHERE alias = ?1 AND network_id = ?2",
-        callerAlias,
-        enforceNetworkId,
-      );
+      const node = resolveCallerNode();
       // app#225 follow-up — no `nodes` row: this is a session-only target
       // (claude-code). Its queue key is `session:<alias>`, always paired with the
       // caller's network so a same-named alias in another network never matches.
@@ -3333,11 +3362,7 @@ export function registerTools(server: McpServer, clientIP?: string, enforceNetwo
       if (!callerAlias) {
         return { content: [{ type: "text" as const, text: JSON.stringify({ ok: false, error: "alias_required" }) }] };
       }
-      const node = db.get<any>(
-        "SELECT node_id FROM nodes WHERE alias = ?1 AND network_id = ?2",
-        callerAlias,
-        enforceNetworkId,
-      );
+      const node = resolveCallerNode();
       const queueKey: string = node ? node.node_id : `session:${callerAlias}`;
       const req = db.get<any>(
         "SELECT request_id, node_id, network_id, status FROM node_rules_requests WHERE request_id = ?1",