@sleep2agi/commhub-server 0.9.0-preview.104 → 0.9.0-preview.106

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sleep2agi/commhub-server",
-  "version": "0.9.0-preview.104",
+  "version": "0.9.0-preview.106",
   "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/create-node-validate.test.ts

@@ -3,7 +3,7 @@ import {
   ValidationError,
   validateName, validateRuntime, validateModel, validateFlagValue, RUNTIMES,
   validateEnvRefs, validateChannelsP1, serializeEnvLocal, buildAnetArgs,
-  MAX_ENV_KEYS_PER_NODE,
+  MAX_ENV_KEYS_PER_NODE, validateFlagsForRuntime, COPRESENCE_FLAG_RUNTIMES,
 } from "./create-node-validate.js";
 
 const okSecret = (k: string, _net: string, key: string) => k === key ? `value-of-${k}` : undefined;
@@ -273,3 +273,38 @@ describe("#1298 RUNTIMES —— 七个都放行，且与 CLI 侧一致", () => {
     expect(() => validateRuntime("")).toThrow();
   });
 });
+
+// #584 —— app「Codex（TUI 共存）」经 daemon 建出来的是无头节点:create_node 没有任何字段能表达「要共存」。
+describe("#584 flags.copresence —— 建节点时的共存开关", () => {
+  test("is a known flag key and must be boolean", () => {
+    expect(() => validateFlagValue("copresence", true)).not.toThrow();
+    expect(() => validateFlagValue("copresence", false)).not.toThrow();
+    for (const bad of ["true", 1, null, {}]) {
+      try { validateFlagValue("copresence", bad); throw new Error("did not throw"); }
+      catch (e) { expect((e as ValidationError).code).toBe("flag_value_invalid"); }
+    }
+  });
+  test("only codex-app-server accepts it — elsewhere it would be swallowed silently", () => {
+    expect(() => validateFlagsForRuntime("codex-app-server", { copresence: true })).not.toThrow();
+    expect(() => validateFlagsForRuntime("claude-agent-sdk", { permissionMode: "default" })).not.toThrow();
+    expect(() => validateFlagsForRuntime("claude-agent-sdk", undefined)).not.toThrow();
+    for (const rt of ["claude-agent-sdk", "claude-code-cli", "codex-sdk", "grok-build-acp", "grok-build-cli", "opencode-cli"]) {
+      try { validateFlagsForRuntime(rt, { copresence: true }); throw new Error(`did not throw for ${rt}`); }
+      catch (e) {
+        expect((e as ValidationError).code).toBe("flag_not_applicable_to_runtime");
+        expect((e as ValidationError).detail).toMatchObject({ field: "copresence", runtime: rt, applicable: [...COPRESENCE_FLAG_RUNTIMES] });
+      }
+    }
+  });
+  test("buildAnetArgs emits the CLI's boolean `--copresence` (no value), and nothing for false", () => {
+    expect(buildAnetArgs({ name: "cx", runtime: "codex-app-server", flags: { copresence: true } }))
+      .toEqual(["node", "create", "cx", "--runtime", "codex-app-server", "--copresence"]);
+    expect(buildAnetArgs({ name: "cx", runtime: "codex-app-server", flags: { copresence: false } }))
+      .toEqual(["node", "create", "cx", "--runtime", "codex-app-server"]);
+    expect(() => buildAnetArgs({ name: "cx", runtime: "codex-sdk", flags: { copresence: true } })).toThrow(ValidationError);
+  });
+  test("the old request shape (no flag) is unchanged", () => {
+    expect(buildAnetArgs({ name: "cx", runtime: "codex-app-server", flags: { permissionMode: "default" } }))
+      .toEqual(["node", "create", "cx", "--runtime", "codex-app-server", "--permission-mode", "default"]);
+  });
+});

package/src/create-node-validate.ts

@@ -46,7 +46,16 @@ export const RUNTIMES = [
 ] as const;
 export type Runtime = typeof RUNTIMES[number];
 
-export const FLAG_KEYS = ["permissionMode", "dangerouslySkipPermissions", "maxTurns", "budget", "timeout"] as const;
+// #584 —— `copresence` 是**建节点时**的开关,不是 agent 的运行参数:为 true 时 daemon 把它写成子节点
+// config 的 `codexCopresence: true`,之后一条 `anet node start` 就起共享 TUI(app 向导的「Codex（TUI 共存）」)。
+// 🔴 故意放在 flags 里而不是 node_spec 顶层:老 hub 的 zod 会静默丢弃未知顶层字段、老 daemon 也静默忽略
+//    —— 那正是 #584 的形状(用户选了共存,拿到无头节点,没有任何报错)。flags 的未知键在老 hub(这份
+//    FLAG_KEYS)和老 daemon(buildAnetArgsDaemon)都**拒绝**,新 app 撞到老组件得到的是一条报错。
+export const FLAG_KEYS = ["permissionMode", "dangerouslySkipPermissions", "maxTurns", "budget", "timeout", "copresence"] as const;
+
+/** #584 —— 只有这些 runtime 认 `flags.copresence`。目前只有 codex-app-server 的共存靠 config 字段
+ *  (`codexCopresence`)决定;grok-build-cli / opencode-cli 各有自己的字段,接进来之前一律拒,不静默吞。 */
+export const COPRESENCE_FLAG_RUNTIMES = ["codex-app-server"] as const;
 export type FlagKey = typeof FLAG_KEYS[number];
 
 export const PERMISSION_MODES = ["default", "acceptEdits", "plan", "bypassPermissions"] as const;
@@ -124,11 +133,25 @@ export function validateFlagValue(k: string, v: unknown): void {
         throw new ValidationError("flag_value_invalid", { field: k, reason: "must be integer 1..86400" });
       }
       return;
+    case "copresence":
+      if (typeof v !== "boolean") throw new ValidationError("flag_value_invalid", { field: k, reason: "must be boolean" });
+      return;
     default:
       throw new ValidationError("flag_key_unknown", { field: k });
   }
 }
 
+/** #584 —— 逐键校验之外的跨字段一条:`copresence` 只对 COPRESENCE_FLAG_RUNTIMES 有意义。
+ *  在别的 runtime 上收下它而什么都不做,就是又一个「选了共存、拿到无头」。 */
+export function validateFlagsForRuntime(runtime: string, flags: Record<string, unknown> | undefined | null): void {
+  if (!flags || !Object.prototype.hasOwnProperty.call(flags, "copresence")) return;
+  if (!(COPRESENCE_FLAG_RUNTIMES as readonly string[]).includes(runtime)) {
+    throw new ValidationError("flag_not_applicable_to_runtime", {
+      field: "copresence", runtime, applicable: [...COPRESENCE_FLAG_RUNTIMES],
+    });
+  }
+}
+
 // §4.4.7 — env_refs 7-step gate. networkSecretsGet is injected so
 // callers can supply either a real DB lookup (hub) or a fixture (tests).
 // The 6th step also reports the resolved value size; we return the
@@ -281,8 +304,11 @@ export function buildAnetArgs(spec: NodeSpec): string[] {
         throw new ValidationError("flag_key_unknown", { field: k });
       }
       validateFlagValue(k, v);
+      // `anet node create --copresence` 是布尔开关,不吃值。
+      if (k === "copresence") { if (v === true) args.push("--copresence"); continue; }
       args.push(`--${kebab(k)}`, String(v));
     }
+    validateFlagsForRuntime(spec.runtime, spec.flags);
   }
   return args;
 }

package/src/stop-delete-node.test.ts

@@ -435,6 +435,34 @@ describe("get_stop_request + ack_stop_request — daemon flow", () => {
     expect((await call(u.stop_node, { child_node_id: CHILD_A_ID, daemon_node_id: DAEMON_A_ID, network_id: NET_A })).ok).toBe(true);
   });
 
+  // #571 — 手工起的节点(id `n_…`)没有任何 daemon 链接。改前:authority==null 时
+  // 放行调用方点名的任意同网 daemon → 门铃发过去,那台 daemon 本地无记录,按 alias
+  // 全机 pgrep+SIGTERM,误杀同 alias 的别的 agent-node。改后:不论传没传 daemon 一律拒。
+  test("#571: stop/delete of a hand-started node refuse even with an explicit same-network daemon", async () => {
+    setupAlphaNetwork();
+    const HAND_ID = "n_571abcde";
+    const HAND_ALIAS = "sd-hand-571";
+    seedChild(NET_A, HAND_ID, HAND_ALIAS, USER_A_ID, "tok_sd_hand_571");
+    const u = buildHandlers(USER_A_ID);
+    const s = await call(u.stop_node, { child_node_id: HAND_ID, daemon_node_id: DAEMON_A_ID, network_id: NET_A });
+    expect(s.ok).toBe(false);
+    expect(s.error).toBe("not_daemon_managed");
+    expect(String(s.message)).toContain("anet node stop");
+    const d = await call(u.delete_node, { child_node_id: HAND_ID, daemon_node_id: DAEMON_A_ID, confirm_alias: HAND_ALIAS, network_id: NET_A });
+    expect(d.error).toBe("not_daemon_managed");
+    // 没有任何副作用:状态没动、没写 stop 请求行
+    expect(readNode(HAND_ID)?.lifecycle_state).toBe("active");
+    const rows = db.get<{ n: number }>(`SELECT COUNT(*) AS n FROM node_stop_requests WHERE child_node_id = ?1`, HAND_ID);
+    expect(Number(rows?.n ?? 0)).toBe(0);
+    // 回归钉:daemon 建的 child(有 create 记录)照常可停
+    db.run(
+      `INSERT INTO node_create_requests(request_id,daemon_node_id,child_name,network_id,runtime,model,flags_json,env_keys,status,created_at,created_by_token,child_node_id)
+       VALUES(?1,?2,?3,?4,'claude-agent-sdk','x','{}','[]','succeeded',1,'t',?5)`,
+      [`cr_${CHILD_A_ID.slice(5)}`, DAEMON_A_ID, CHILD_A_ALIAS, NET_A, CHILD_A_ID],
+    );
+    expect((await call(u.stop_node, { child_node_id: CHILD_A_ID, network_id: NET_A })).ok).toBe(true);
+  });
+
   // #1448 finding-5 — delete 完成时按派发时定住的 token_id 精确撤 ntok,而非按
   // name='node:<alias>' 广撤。改前:同 alias 在 delete 未收敛窗口内被重建、拿到同名新
   // token,ack 会把新 token 一并误撤(下面 REBUILT_TOK 断言 not revoked 会红)。

package/src/tools.ts

@@ -30,6 +30,7 @@ import {
   validateEnvRefs,
   FLAG_KEYS,
   validateFlagValue,
+  validateFlagsForRuntime,
   ValidationError,
 } from "./create-node-validate.js";
 import {
@@ -4252,6 +4253,7 @@ export function registerTools(server: McpServer, clientIP?: string, enforceNetwo
           if (!(FLAG_KEYS as readonly string[]).includes(k)) throw new ValidationError("flag_key_unknown", { field: k });
           validateFlagValue(k, v);
         }
+        validateFlagsForRuntime(node_spec.runtime, node_spec.flags);
       } catch (e) {
         return validationFailReply(e);
       }
@@ -4698,7 +4700,8 @@ export function registerTools(server: McpServer, clientIP?: string, enforceNetwo
           ok: false, error: "not_daemon_managed",
           message:
             `node ${child_node_id} was not created by a daemon (it was started by hand with ` +
-            `\`anet node start\` on some machine), so no daemon on the Hub can stop it. ` +
+            `\`anet node start\` on some machine), so no daemon on the Hub can stop it ` +
+            `(naming a daemon_node_id does not change that). ` +
             `Run \`anet node stop <alias>\` on that machine instead. ` +
             `Daemon-created children have ids beginning with \`node_\`; this one does not.`,
         };
@@ -4826,6 +4829,16 @@ export function registerTools(server: McpServer, clientIP?: string, enforceNetwo
     // authority==null(create 记录被裁剪的旧 child)加拒,避免给它们的 stop/delete 引入
     // 新失败面——handler 的 daemon_node_id??resolveDaemonForChild 已兜住无法解析的情形。
     const authoritativeDaemonId = resolveDaemonForChild(args.child_node_id);
+    // #571 — 手工起的节点(id 不以 `node_` 开头)**没有**任何 daemon 链接。此前
+    // authority==null 时放行调用方点名的任意同网 daemon → 门铃发给那台 daemon,
+    // 它本地没这个 child 的记录,会走「按 alias 全机 pgrep + SIGTERM」的收敛分支,
+    // 杀掉那台机器上所有同 alias 的 agent-node(不分工作目录/HOME/网络)。
+    // 对 hand-started 节点这条路在概念上就不成立(见 explainUnresolvableDaemon ①),
+    // 所以不管调用方传没传 daemon_node_id 一律拒。`node_` 开头但缺 create 记录的
+    // (②,显式传 daemon 是文档化的出路)保持原行为。
+    if (!authoritativeDaemonId && !args.child_node_id.startsWith("node_")) {
+      return explainUnresolvableDaemon(args.child_node_id);
+    }
     if (authoritativeDaemonId && authoritativeDaemonId !== args.daemon_node_id) {
       return { ok: false, error: "daemon_child_mismatch", message: "daemon_node_id is not this child's authoritative creator daemon" };
     }