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

package/src/rules-file-transport.test.ts

@@ -0,0 +1,237 @@
+// app#225 — 节点规则文件远程读写：走真 MCP in-process transport 的端到端。
+//
+// 验的是 #225 验收里 hub 能验的那几条：
+//   1. 客户端只用 node_id 就能发起读/写；工具的 inputSchema 里**没有**任何
+//      路径/文件名字段（验收第 5 条「不能借路径参数写任意文件」在 hub 侧的形状）。
+//   2. 节点用网络 token + alias 拉到的请求里也没有路径字段；ack 后客户端轮询拿到内容。
+//   3. SEC-1：跨网络节点发不了、别的节点 ack 不了、用户 token 拉不了。
+//   4. 单飞 + 超时回收。
+//
+// 跑法：cd server && COMMHUB_DB=/tmp/rules.db bun test src/rules-file-transport.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_file";
+const OTHER_NET = "net_rules_file_other";
+const USER = "u_rules_file_owner";
+const NODE_ID = "node_rules_file_claude";
+const NODE_ALIAS = "rules-file-claude";
+const OTHER_NODE_ID = "node_rules_file_other";
+const OTHER_NODE_ALIAS = "rules-file-other";
+const NODE_TOKEN = "tok_rules_file_node";
+const OTHER_NODE_TOKEN = "tok_rules_file_other_node";
+
+function cleanup() {
+  for (const net of [NET, OTHER_NET]) {
+    try { db.run("DELETE FROM node_rules_requests WHERE network_id = ?1", [net]); } catch {}
+    try { db.run("DELETE FROM audit_log 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() {
+  db.run(
+    `INSERT INTO users (user_id, username, password_hash, role, created_at) VALUES (?1, ?2, 'x', 'user', datetime('now'))`,
+    [USER, USER],
+  );
+  for (const net of [NET, OTHER_NET]) {
+    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]);
+  }
+  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'))`,
+    [NODE_ID, NODE_ALIAS, NODE_ALIAS, NET],
+  );
+  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'))`,
+    [OTHER_NODE_ID, OTHER_NODE_ALIAS, OTHER_NODE_ALIAS, OTHER_NET],
+  );
+  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)`,
+    [NODE_TOKEN, USER, NET, `node:${NODE_ALIAS}`, "hash_rules_file_node"],
+  );
+  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)`,
+    [OTHER_NODE_TOKEN, USER, OTHER_NET, `node:${OTHER_NODE_ALIAS}`, "hash_rules_file_other"],
+  );
+}
+
+type Identity = { net: string; alias: string; isNetworkToken: boolean; tokenId: string };
+const asUser: Identity = { net: NET, alias: USER, isNetworkToken: false, tokenId: "tok_rules_file_user" };
+const asNode: Identity = { net: NET, alias: NODE_ALIAS, isNetworkToken: true, tokenId: NODE_TOKEN };
+const asOtherNode: Identity = { net: OTHER_NET, alias: OTHER_NODE_ALIAS, isNetworkToken: true, tokenId: OTHER_NODE_TOKEN };
+
+async function connect(id: Identity) {
+  const server = new McpServer({ name: "rules-file-test", version: "1" });
+  registerTools(server, undefined, id.net, USER, id.alias, id.isNetworkToken, id.tokenId);
+  const client = new Client({ name: "rules-file-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 { client, server, call, close };
+}
+
+beforeEach(() => { cleanup(); seedWorld(); });
+afterAll(cleanup);
+
+describe("app#225 rules file — schema has no path", () => {
+  test("read/write tool inputs are node id + content only; no path / file_name / dir field anywhere", async () => {
+    // 🔴 不走 client.listTools():main 上 report_status / send_desktop_message /
+    // update_node_config / create_node 四个存量工具的 zod 形状让 SDK 的
+    // toJSONSchema 抛 `schema._zod`,listTools 整个失败(与本 PR 无关,实验见
+    // PR 正文)。这里直接看 McpServer 登记表里的 zod shape —— 它就是 hub 校验
+    // 入参用的那份,比 JSON schema 更接近真相。
+    const u = await connect(asUser);
+    try {
+      const reg: Record<string, any> = (u.server as any)._registeredTools;
+      const shapeKeys = (name: string): string[] => {
+        expect(reg[name], name).toBeDefined();
+        const schema = reg[name].inputSchema;
+        const shape = schema?.shape ?? schema?._def?.shape?.() ?? schema ?? {};
+        return Object.keys(shape).sort();
+      };
+      // `alias` (app#225 follow-up) names a TARGET node/session, not a file —
+      // the no-path regex below still covers it.
+      expect(shapeKeys("read_node_rules_file")).toEqual(["alias", "child_node_id", "network_id", "node_id"]);
+      expect(shapeKeys("write_node_rules_file")).toEqual(["alias", "child_node_id", "content", "network_id", "node_id"]);
+      expect(shapeKeys("get_rules_file_request")).toEqual([]);
+      // ack 的 file_name 是节点**回报**它用了哪个文件,不是客户端**指定**用哪个文件。
+      expect(shapeKeys("ack_rules_file_request")).toEqual(["content", "error", "exists", "file_name", "request_id", "status"]);
+      expect(shapeKeys("get_rules_file_result")).toEqual(["network_id", "request_id"]);
+      for (const name of ["read_node_rules_file", "write_node_rules_file", "get_rules_file_request", "get_rules_file_result"]) {
+        for (const k of shapeKeys(name)) expect(k, `${name}.${k}`).not.toMatch(/path|dir|file|cwd/i);
+      }
+    } finally { await u.close(); }
+  }, 20_000);
+});
+
+describe("app#225 rules file — read round trip", () => {
+  test("user enqueues read → node pulls (no path in request) → acks content → user polls done", async () => {
+    const u = await connect(asUser);
+    const n = await connect(asNode);
+    try {
+      const enq = await u.call("read_node_rules_file", { node_id: NODE_ID });
+      expect(enq).toMatchObject({ ok: true, op: "read" });
+      expect(enq.request_id).toMatch(/^rf_/);
+
+      expect(await u.call("get_rules_file_result", { request_id: enq.request_id })).toMatchObject({ ok: true, status: "pending", op: "read" });
+
+      const pulled = await n.call("get_rules_file_request", {});
+      expect(pulled.ok).toBe(true);
+      expect(Object.keys(pulled.request).sort()).toEqual(["op", "request_id"]);
+      expect(pulled.request).toEqual({ request_id: enq.request_id, op: "read" });
+      // 第二次拉:已经 in_progress,不再重复下发
+      expect(await n.call("get_rules_file_request", {})).toEqual({ ok: true, request: null });
+
+      expect(await n.call("ack_rules_file_request", {
+        request_id: enq.request_id, status: "done", file_name: "CLAUDE.md", exists: true, content: "# 规则\n",
+      })).toMatchObject({ ok: true, status: "done" });
+
+      const res = await u.call("get_rules_file_result", { request_id: enq.request_id });
+      expect(res).toMatchObject({ ok: true, status: "done", op: "read", file_name: "CLAUDE.md", exists: true, content: "# 规则\n", error: null });
+    } finally { await u.close(); await n.close(); }
+  }, 20_000);
+
+  test("write: content travels to the node verbatim; result carries no content back", async () => {
+    const u = await connect(asUser);
+    const n = await connect(asNode);
+    try {
+      const body = "# new rules\n\n- 不碰生产 DB\n";
+      const enq = await u.call("write_node_rules_file", { node_id: NODE_ID, content: body });
+      expect(enq).toMatchObject({ ok: true, op: "write" });
+      const pulled = await n.call("get_rules_file_request", {});
+      expect(pulled.request).toEqual({ request_id: enq.request_id, op: "write", content: body });
+      await n.call("ack_rules_file_request", { request_id: enq.request_id, status: "done", file_name: "CLAUDE.md", exists: true });
+      const res = await u.call("get_rules_file_result", { request_id: enq.request_id });
+      expect(res).toMatchObject({ ok: true, status: "done", op: "write", file_name: "CLAUDE.md" });
+      expect(res.content).toBeUndefined();
+    } finally { await u.close(); await n.close(); }
+  }, 20_000);
+
+  test("node failure is surfaced with its reason", async () => {
+    const u = await connect(asUser);
+    const n = await connect(asNode);
+    try {
+      const enq = await u.call("write_node_rules_file", { node_id: NODE_ID, content: "x" });
+      await n.call("get_rules_file_request", {});
+      await n.call("ack_rules_file_request", { request_id: enq.request_id, status: "failed", file_name: "CLAUDE.md", error: "EACCES: permission denied" });
+      expect(await u.call("get_rules_file_result", { request_id: enq.request_id })).toMatchObject({ ok: true, status: "failed", error: "EACCES: permission denied" });
+    } finally { await u.close(); await n.close(); }
+  }, 20_000);
+});
+
+describe("app#225 rules file — SEC-1 and lifecycle", () => {
+  test("cross-network node cannot be targeted", async () => {
+    const u = await connect(asUser);
+    try {
+      expect(await u.call("read_node_rules_file", { node_id: OTHER_NODE_ID })).toMatchObject({ ok: false, error: "cross_network_node" });
+      expect(db.get<{ c: number }>("SELECT COUNT(*) AS c FROM node_rules_requests WHERE node_id = ?1", OTHER_NODE_ID)?.c).toBe(0);
+    } finally { await u.close(); }
+  }, 20_000);
+
+  test("a node in another network can neither pull nor ack this node's request", async () => {
+    const u = await connect(asUser);
+    const o = await connect(asOtherNode);
+    try {
+      const enq = await u.call("read_node_rules_file", { node_id: NODE_ID });
+      expect(await o.call("get_rules_file_request", {})).toEqual({ ok: true, request: null });
+      expect(await o.call("ack_rules_file_request", { request_id: enq.request_id, status: "done", content: "stolen" })).toMatchObject({ ok: true, ignored: "unknown_or_foreign_request" });
+      expect(db.get<{ status: string }>("SELECT status FROM node_rules_requests WHERE request_id = ?1", enq.request_id)?.status).toBe("pending");
+    } finally { await u.close(); await o.close(); }
+  }, 20_000);
+
+  test("user token (not a network token) cannot use the node-side pull/ack", async () => {
+    const u = await connect(asUser);
+    try {
+      expect(await u.call("get_rules_file_request", {})).toMatchObject({ ok: false, error: "network_token_required" });
+      expect(await u.call("ack_rules_file_request", { request_id: "rf_nope", status: "done" })).toMatchObject({ ok: false, error: "network_token_required" });
+    } finally { await u.close(); }
+  }, 20_000);
+
+  test("single flight: a second request while one is pending is refused; a stale one is superseded", async () => {
+    const u = await connect(asUser);
+    try {
+      const first = await u.call("read_node_rules_file", { node_id: NODE_ID });
+      expect(await u.call("read_node_rules_file", { node_id: NODE_ID })).toMatchObject({ ok: false, error: "request_in_flight", existing_request_id: first.request_id });
+      db.run("UPDATE node_rules_requests SET created_at = ?1 WHERE request_id = ?2", [Date.now() - 120_000, first.request_id]);
+      const second = await u.call("read_node_rules_file", { node_id: NODE_ID });
+      expect(second.ok).toBe(true);
+      expect(db.get<{ status: string }>("SELECT status FROM node_rules_requests WHERE request_id = ?1", first.request_id)?.status).toBe("timeout");
+    } finally { await u.close(); }
+  }, 20_000);
+
+  test("polling a request the node never answered flips it to timeout with a readable reason", async () => {
+    const u = await connect(asUser);
+    try {
+      const enq = await u.call("read_node_rules_file", { node_id: NODE_ID });
+      db.run("UPDATE node_rules_requests SET created_at = ?1 WHERE request_id = ?2", [Date.now() - 120_000, enq.request_id]);
+      const res = await u.call("get_rules_file_result", { request_id: enq.request_id });
+      expect(res).toMatchObject({ ok: true, status: "timeout" });
+      expect(res.error).toMatch(/did not answer/);
+    } finally { await u.close(); }
+  }, 20_000);
+
+  test("oversized content is refused before anything is queued", async () => {
+    const u = await connect(asUser);
+    try {
+      const r: any = await u.client.callTool({ name: "write_node_rules_file", arguments: { node_id: NODE_ID, content: "x".repeat(256 * 1024 + 1) } });
+      expect(r.isError).toBe(true);
+      expect(db.get<{ c: number }>("SELECT COUNT(*) AS c FROM node_rules_requests WHERE node_id = ?1", NODE_ID)?.c).toBe(0);
+    } finally { await u.close(); }
+  }, 20_000);
+});

package/src/runtime-label.test.ts

@@ -0,0 +1,22 @@
+import { describe, expect, test } from "bun:test";
+import { normalizeSessionRuntime } from "./runtime-label";
+
+describe("session runtime projection", () => {
+  test("preserves exact co-presence and CLI runtimes", () => {
+    expect(normalizeSessionRuntime("agent-node:codex-app-server")).toBe("codex-app-server");
+    expect(normalizeSessionRuntime("agent-node:grok-build-cli")).toBe("grok-build-cli");
+  });
+  test("keeps legacy labels backward-compatible", () => {
+    expect(normalizeSessionRuntime("agent-node:codex")).toBe("codex-sdk");
+    expect(normalizeSessionRuntime("agent-node:claude")).toBe("claude-agent-sdk");
+    expect(normalizeSessionRuntime("agent-node:grok")).toBe("grok-build-acp");
+    expect(normalizeSessionRuntime("agent-node:opencode")).toBe("opencode-cli");
+    expect(normalizeSessionRuntime("claude-code")).toBe("claude-code-cli");
+  });
+  test("does not invent unknown runtimes", () => {
+    expect(normalizeSessionRuntime("agent-node:future-runtime")).toBeNull();
+    expect(normalizeSessionRuntime("agent-node:codex-app-server-evil")).toBeNull();
+    expect(normalizeSessionRuntime("agent-node:grok-build-cli-preview")).toBeNull();
+    expect(normalizeSessionRuntime(null)).toBeNull();
+  });
+});

package/src/runtime-label.ts

@@ -0,0 +1,21 @@
+/** Preserve exact agent-node runtimes before applying legacy family aliases. */
+export function normalizeSessionRuntime(agent: unknown): string | null {
+  if (typeof agent !== "string" || agent.length === 0) return null;
+  if (agent === "claude-code") return "claude-code-cli";
+  const reported = agent.startsWith("agent-node:") ? agent.slice("agent-node:".length) : "";
+  const exact: Record<string, string> = {
+    "codex-app-server": "codex-app-server",
+    "grok-build-cli": "grok-build-cli",
+    opencode: "opencode-cli",
+    "opencode-cli": "opencode-cli",
+    codex: "codex-sdk",
+    "codex-sdk": "codex-sdk",
+    claude: "claude-agent-sdk",
+    "claude-agent-sdk": "claude-agent-sdk",
+    grok: "grok-build-acp",
+    "grok-build-acp": "grok-build-acp",
+  };
+  if (exact[reported]) return exact[reported];
+  if (agent === "http-api" || agent === "http" || agent === "api") return "http-api";
+  return null;
+}

package/src/runtime-readiness.ts

@@ -0,0 +1,90 @@
+// #622 —— daemon 逐 runtime 自检结果(`config_snapshot.daemon_capabilities.runtime_readiness`)。
+//
+// 上报侧:agent-node/src/runtime/runtime-readiness.ts。这里两件事:
+//   1. report_status 的 zod 形状 —— **收得宽**:任何一格坏都只丢这一格(或整个
+//      runtime_readiness),绝不拒掉整份 report(同 create_capability_observed_ms_ago
+//      的教训:zod 对象里一个已知字段验证失败 = 整份被拒 = 节点在 hub 上失联)。
+//   2. /api/host-supervisors 读取时再消毒一次(库里可能存着任何旧形状)。
+//
+// 向后兼容:旧 daemon 不报 ⇒ 响应里**没有**这个键(不是 {}、不是 null)。
+
+import { z } from "zod/v4";
+
+export const READINESS_STATES = ["ready", "missing_cli", "not_logged_in", "no_network", "unknown"] as const;
+export type ReadinessState = typeof READINESS_STATES[number];
+
+const MAX_RUNTIMES = 16;
+const MAX_REASON = 600;
+
+const MAX_JSON_BYTES = 16 * 1024;
+
+/** report_status 里 `daemon_capabilities.runtime_readiness` 的 schema。永不拒整份 report。
+ *
+ *  🔴 故意只验外形(对象、键数、总字节),逐格消毒放在读取侧 `sanitizeRuntimeReadiness`:
+ *     这份 schema 会进每个节点的 `tools/list`(#476 按角色的字节天花板),逐字段声明
+ *     一遍要多花 ~500 B;而读取侧本来就必须再消毒一次(库里可能存着任何旧形状)。
+ *     总字节上限挡住一个异常 daemon 往库里塞大对象。 */
+export const runtimeReadinessSchema = z
+  .record(z.string().max(64), z.record(z.string(), z.unknown()))
+  .refine((r) => Object.keys(r).length <= MAX_RUNTIMES && JSON.stringify(r).length <= MAX_JSON_BYTES)
+  .optional()
+  .catch(undefined);
+
+export interface RuntimeReadinessOut {
+  ok: boolean;
+  state: ReadinessState;
+  reason: string;
+  version?: string;
+  checked_at?: string;
+  cli?: string;
+  auth?: string;
+  network?: string;
+  shared_login_count?: number;
+  /** Copied only for runtime key `opencode-cli`. */
+  generation?: "v1" | "v2";
+  accepted?: boolean;
+}
+
+const ENUMS: Record<string, readonly string[]> = {
+  cli: ["found", "missing", "bundled", "unknown"],
+  auth: ["present", "absent", "not_required", "unknown"],
+  network: ["reachable", "unreachable", "skipped"],
+};
+
+/** 读取侧消毒。返回 undefined 表示「daemon 没报」—— 调用方据此**不输出**这个键。 */
+export function sanitizeRuntimeReadiness(raw: unknown): Record<string, RuntimeReadinessOut> | undefined {
+  if (!raw || typeof raw !== "object" || Array.isArray(raw)) return undefined;
+  const out: Record<string, RuntimeReadinessOut> = {};
+  let n = 0;
+  for (const [rt, v] of Object.entries(raw as Record<string, unknown>)) {
+    if (n >= MAX_RUNTIMES) break;
+    if (typeof rt !== "string" || rt.length === 0 || rt.length > 64) continue;
+    if (!v || typeof v !== "object" || Array.isArray(v)) continue;
+    const e = v as Record<string, unknown>;
+    const state: ReadinessState = (READINESS_STATES as readonly string[]).includes(e.state as string)
+      ? e.state as ReadinessState
+      : "unknown";
+    const entry: RuntimeReadinessOut = {
+      // ok 只在 state=ready 时可能为真:不让一个自相矛盾的上报朝「没问题」方向错。
+      ok: e.ok === true && state === "ready",
+      state,
+      reason: typeof e.reason === "string" ? e.reason.slice(0, MAX_REASON) : "",
+    };
+    if (typeof e.version === "string" && e.version.length > 0) entry.version = e.version.slice(0, 64);
+    if (typeof e.checked_at === "string" && e.checked_at.length > 0) entry.checked_at = e.checked_at.slice(0, 40);
+    for (const k of ["cli", "auth", "network"] as const) {
+      if (typeof e[k] === "string" && ENUMS[k].includes(e[k] as string)) entry[k] = e[k] as string;
+    }
+    if (typeof e.shared_login_count === "number" && Number.isInteger(e.shared_login_count)
+        && e.shared_login_count >= 0 && e.shared_login_count <= 100_000) {
+      entry.shared_login_count = e.shared_login_count;
+    }
+    if (rt === "opencode-cli" && (e.generation === "v1" || e.generation === "v2")) {
+      entry.generation = e.generation;
+      if (typeof e.accepted === "boolean") entry.accepted = e.accepted;
+    }
+    out[rt] = entry;
+    n++;
+  }
+  return Object.keys(out).length > 0 ? out : undefined;
+}