@clawos-dev/clawd 0.2.231 → 0.2.232

package/dist/cli.cjs

@@ -5556,11 +5556,12 @@ var init_schemas = __esm({
 });
 
 // ../protocol/src/frames.ts
-var PROTOCOL_VERSION;
+var PROTOCOL_VERSION, DISPATCH_MCP_ID;
 var init_frames = __esm({
   "../protocol/src/frames.ts"() {
     "use strict";
     PROTOCOL_VERSION = 1;
+    DISPATCH_MCP_ID = "dispatch";
   }
 });
 
@@ -12148,17 +12149,8 @@ function buildSpawnArgs(ctx) {
   if (ctx.addDirs) {
     for (const dir of ctx.addDirs) args.push("--add-dir", dir);
   }
-  if (ctx.dispatchMcpConfigPath) {
-    args.push("--mcp-config", ctx.dispatchMcpConfigPath);
-  }
-  if (ctx.ticketMcpConfigPath) {
-    args.push("--mcp-config", ctx.ticketMcpConfigPath);
-  }
-  if (ctx.shiftMcpConfigPath) {
-    args.push("--mcp-config", ctx.shiftMcpConfigPath);
-  }
-  if (ctx.inboxMcpConfigPath) {
-    args.push("--mcp-config", ctx.inboxMcpConfigPath);
+  for (const mcp of ctx.mcpConfigs ?? []) {
+    args.push("--mcp-config", mcp.path);
   }
   args.push("--disallowed-tools", "CronCreate,CronDelete,CronList,ScheduleWakeup,RemoteTrigger");
   if (ctx.effort) args.push("--effort", ctx.effort);
@@ -41818,6 +41810,7 @@ var import_node_os4 = __toESM(require("os"), 1);
 var import_node_path7 = __toESM(require("path"), 1);
 
 // src/session/reducer.ts
+init_protocol();
 init_runtime();
 
 // src/permission/rules.ts
@@ -42045,10 +42038,7 @@ function buildSpawnContext(state, deps) {
   if (dispatchId) env.CLAWD_DISPATCH_ID = dispatchId;
   const personaId = file.ownerPersonaId;
   if (personaId) env.CLAWD_PERSONA_ID = personaId;
-  const dispatchMcpConfigPath2 = deps.getDispatchMcpConfigPath?.() ?? null;
-  const ticketMcpConfigPath2 = deps.getTicketMcpConfigPath?.() ?? null;
-  const shiftMcpConfigPath2 = deps.getShiftMcpConfigPath?.() ?? null;
-  const inboxMcpConfigPath2 = deps.getInboxMcpConfigPath?.() ?? null;
+  const mcpConfigs = deps.getMcpConfigs?.() ?? [];
   const ctx = {
     cwd: file.cwd,
     toolSessionId: file.toolSessionId,
@@ -42059,12 +42049,7 @@ function buildSpawnContext(state, deps) {
     // Phase 2 capability platform (plan §3): personaRoot 透传给 buildSpawnArgs;
     // 内部 shouldSandbox(cwd, personaRoot) 决定是否注入 --settings sandbox-settings.
     personaRoot: deps.personaRoot,
-    // Persona dispatch：所有 session（A 和 B）都挂同一份 dispatch.mcp.json，让两边的 cc
-    // 都能看到 personaDispatch / personaDispatchComplete tool；按 env 区分实际行为。
-    dispatchMcpConfigPath: dispatchMcpConfigPath2 ?? void 0,
-    ticketMcpConfigPath: ticketMcpConfigPath2 ?? void 0,
-    shiftMcpConfigPath: shiftMcpConfigPath2 ?? void 0,
-    inboxMcpConfigPath: inboxMcpConfigPath2 ?? void 0,
+    ...mcpConfigs.length > 0 ? { mcpConfigs } : {},
     // shift v1：把 SessionFile.ownerPersonaId 透传到 SpawnContext；buildSpawnArgs 等下游
     // 不直接读这个字段（只读 env），但保留显式字段方便 daemon 内部诊断/日志。
     personaId
@@ -42092,7 +42077,7 @@ function buildSpawnContext(state, deps) {
     }
     ctx.extraSystemPrompt = buildConnectionPrompt(promptArgs);
   }
-  if (dispatchMcpConfigPath2) {
+  if (mcpConfigs.some((c) => c.id === DISPATCH_MCP_ID)) {
     ctx.extraSystemPrompt = (ctx.extraSystemPrompt ? ctx.extraSystemPrompt + "\n\n" : "") + DISPATCH_SYSTEM_PROMPT_HINT;
   }
   if (daemonUrl) {
@@ -42875,13 +42860,9 @@ var SessionRunner = class {
       // 单栏 refactor (spec 2026-06-02 §5.1): cc 子进程 env 注入 CLAWD_DAEMON_URL，让 assistant
       // curl daemon HTTP RPC adapter (/api/rpc/<method>) 触发管理操作。null = HTTP adapter 未启。
       getDaemonUrl: this.hooks.getDaemonUrl,
-      // Persona dispatch：透传 dispatch.mcp.json 路径闭包 + B→dispatchId 反查闭包。
-      // 见 reducer.buildSpawnContext 注 CLAWD_DISPATCH_ID env / 派生 SpawnContext.dispatchMcpConfigPath
-      getDispatchMcpConfigPath: this.hooks.getDispatchMcpConfigPath,
-      getShiftMcpConfigPath: this.hooks.getShiftMcpConfigPath,
-      getInboxMcpConfigPath: this.hooks.getInboxMcpConfigPath,
-      // Ticket MCP：透传 ticket.mcp.json 路径闭包（所有 persona session 都挂，无 gating）
-      getTicketMcpConfigPath: this.hooks.getTicketMcpConfigPath,
+      // daemon 级 MCP server 列表闭包透传；见 reducer.buildSpawnContext 派生
+      // SpawnContext.mcpConfigs + 按 DISPATCH_MCP_ID 判断 dispatch 教学注入
+      getMcpConfigs: this.hooks.getMcpConfigs,
       lookupDispatchByBSessionId: this.hooks.lookupDispatchByBSessionId,
       // ReadyGate v2：透传 mode 让 reducer send / ready-detected 分支决定走暂存队列还是直写
       mode: this.hooks.mode,
@@ -43711,12 +43692,9 @@ var SessionManager = class {
       // 单栏 refactor (spec 2026-06-02 §5.1): 透传 daemon HTTP RPC base URL 闭包,
       // reducer 把它注入 cc 子进程 env CLAWD_DAEMON_URL.
       getDaemonUrl: this.deps.getDaemonUrl,
-      // Persona dispatch (Task 7): dispatch.mcp.json 路径 + B sessionId → dispatchId 反查
-      // 闭包透传给 reducer，让 cc spawn 加 --mcp-config flag + B session 注 CLAWD_DISPATCH_ID env.
-      getDispatchMcpConfigPath: this.deps.dispatchMcpConfigPath ? () => this.deps.dispatchMcpConfigPath ?? null : void 0,
-      getTicketMcpConfigPath: this.deps.ticketMcpConfigPath ? () => this.deps.ticketMcpConfigPath ?? null : void 0,
-      getShiftMcpConfigPath: this.deps.shiftMcpConfigPath ? () => this.deps.shiftMcpConfigPath ?? null : void 0,
-      getInboxMcpConfigPath: this.deps.inboxMcpConfigPath ? () => this.deps.inboxMcpConfigPath ?? null : void 0,
+      // daemon 级 MCP server 列表闭包透传给 reducer，cc spawn 逐项加 --mcp-config flag；
+      // B session 的 CLAWD_DISPATCH_ID env 由下方 lookupDispatchByBSessionId 反查闭包负责。
+      getMcpConfigs: () => this.deps.mcpConfigs ?? [],
       lookupDispatchByBSessionId: this.deps.personaDispatchManager ? (bSid) => this.deps.personaDispatchManager?.lookupDispatchByBSessionId(bSid) : void 0,
       // file-sharing (spec §6 PR 3)：闭包 scope + sessionId，runner 只暴露 tool/relPath/cwd
       onFileEdit: attachmentGroup ? (input) => attachmentGroup.onFileEdit({
@@ -48169,17 +48147,8 @@ function buildTuiSpawnArgs(ctx, isResume = false) {
   if (ctx.addDirs) {
     for (const dir of ctx.addDirs) args.push("--add-dir", dir);
   }
-  if (ctx.dispatchMcpConfigPath) {
-    args.push("--mcp-config", ctx.dispatchMcpConfigPath);
-  }
-  if (ctx.ticketMcpConfigPath) {
-    args.push("--mcp-config", ctx.ticketMcpConfigPath);
-  }
-  if (ctx.shiftMcpConfigPath) {
-    args.push("--mcp-config", ctx.shiftMcpConfigPath);
-  }
-  if (ctx.inboxMcpConfigPath) {
-    args.push("--mcp-config", ctx.inboxMcpConfigPath);
+  for (const mcp of ctx.mcpConfigs ?? []) {
+    args.push("--mcp-config", mcp.path);
   }
   args.push("--disallowed-tools", "CronCreate,CronDelete,CronList,ScheduleWakeup,RemoteTrigger");
   if (ctx.effort) args.push("--effort", ctx.effort);
@@ -59689,6 +59658,7 @@ async function startDaemon(config) {
   const groupFileStore = new GroupFileStore({ dataDir: config.dataDir, logger });
   const personaDispatchManager = new PersonaDispatchManager({ genId: () => v4_default() });
   const here = typeof __dirname === "string" ? __dirname : import_node_path64.default.dirname((0, import_node_url4.fileURLToPath)(import_meta6.url));
+  const mcpConfigs = [];
   const dispatchServerCandidates = [
     import_node_path64.default.join(here, "dispatch", "mcp-server.cjs"),
     // 生产 dist/index → dist/dispatch/mcp-server.cjs
@@ -59696,16 +59666,16 @@ async function startDaemon(config) {
     // dev tsx src/index → ../dist/dispatch/mcp-server.cjs
   ];
   const dispatchServerScriptPath = dispatchServerCandidates.find((p2) => import_node_fs52.default.existsSync(p2));
-  let dispatchMcpConfigPath2;
   if (dispatchServerScriptPath) {
     const dispatchLogPath = import_node_path64.default.join(logDir, "dispatch-mcp-server.log");
-    dispatchMcpConfigPath2 = writeDispatchMcpConfig({
+    const dispatchCfgPath = writeDispatchMcpConfig({
       dataDir: config.dataDir,
       serverScriptPath: dispatchServerScriptPath,
       logPath: dispatchLogPath
     });
+    mcpConfigs.push({ id: DISPATCH_MCP_ID, path: dispatchCfgPath });
     logger.info("dispatch.mcp.json written", {
-      path: dispatchMcpConfigPath2,
+      path: dispatchCfgPath,
       server: dispatchServerScriptPath,
       serverLog: dispatchLogPath
     });
@@ -59719,18 +59689,18 @@ async function startDaemon(config) {
     import_node_path64.default.join(here, "..", "dist", "ticket", "mcp-server.cjs")
   ];
   const ticketServerScriptPath = ticketServerCandidates.find((p2) => import_node_fs52.default.existsSync(p2));
-  let ticketMcpConfigPath2;
   if (ticketServerScriptPath) {
     const ticketLogPath = import_node_path64.default.join(logDir, "ticket-mcp-server.log");
-    ticketMcpConfigPath2 = writeTicketMcpConfig({
+    const ticketCfgPath = writeTicketMcpConfig({
       dataDir: config.dataDir,
       serverScriptPath: ticketServerScriptPath,
       apiBaseUrl: config.clawosApi ?? DEFAULT_CLAWOS_API,
       apiKey: resolveClawdTicketsApiKey(),
       logPath: ticketLogPath
     });
+    mcpConfigs.push({ id: "ticket", path: ticketCfgPath });
     logger.info("ticket.mcp.json written", {
-      path: ticketMcpConfigPath2,
+      path: ticketCfgPath,
       server: ticketServerScriptPath,
       serverLog: ticketLogPath
     });
@@ -59744,16 +59714,16 @@ async function startDaemon(config) {
     import_node_path64.default.join(here, "..", "dist", "shift", "mcp-server.cjs")
   ];
   const shiftServerScriptPath = shiftServerCandidates.find((p2) => import_node_fs52.default.existsSync(p2));
-  let shiftMcpConfigPath2;
   if (shiftServerScriptPath) {
     const shiftLogPath = import_node_path64.default.join(logDir, "shift-mcp-server.log");
-    shiftMcpConfigPath2 = await writeShiftMcpConfig({
+    const shiftCfgPath = await writeShiftMcpConfig({
       dataDir: config.dataDir,
       serverScriptPath: shiftServerScriptPath,
       logPath: shiftLogPath
     });
+    mcpConfigs.push({ id: "shift", path: shiftCfgPath });
     logger.info("shift.mcp.json written", {
-      path: shiftMcpConfigPath2,
+      path: shiftCfgPath,
       server: shiftServerScriptPath,
       serverLog: shiftLogPath
     });
@@ -59768,16 +59738,16 @@ async function startDaemon(config) {
     import_node_path64.default.join(here, "..", "dist", "inbox", "mcp-server.cjs")
   ];
   const inboxServerScriptPath = inboxServerCandidates.find((p2) => import_node_fs52.default.existsSync(p2));
-  let inboxMcpConfigPath2;
   if (inboxServerScriptPath) {
     const inboxLogPath = import_node_path64.default.join(logDir, "inbox-mcp-server.log");
-    inboxMcpConfigPath2 = await writeInboxMcpConfig({
+    const inboxCfgPath = await writeInboxMcpConfig({
       dataDir: config.dataDir,
       serverScriptPath: inboxServerScriptPath,
       logPath: inboxLogPath
     });
+    mcpConfigs.push({ id: "inbox", path: inboxCfgPath });
     logger.info("inbox.mcp.json written", {
-      path: inboxMcpConfigPath2,
+      path: inboxCfgPath,
       server: inboxServerScriptPath,
       serverLog: inboxLogPath
     });
@@ -59823,18 +59793,12 @@ async function startDaemon(config) {
     // 127.0.0.1（不是 config.host）—— cc 跑在本机，loopback 最稳；外部访问限制 + http-router
     // 的 isLoopback 兜底已确保安全。
     getDaemonUrl: () => `http://127.0.0.1:${config.port}`,
-    // Persona dispatch (Task 8): manager 通过这两个 deps 跟 PersonaDispatchManager 协作。
-    // - personaDispatchManager: manager.createDispatchedSession 用它 registerBSession；
-    //   reducer 通过闭包反查 dispatchId 注 CLAWD_DISPATCH_ID env。
-    // - dispatchMcpConfigPath: reducer 透传到 SpawnContext，cc spawn 加 --mcp-config flag。
+    // Persona dispatch (Task 8): manager.createDispatchedSession 用 personaDispatchManager
+    // registerBSession；reducer 通过闭包反查 dispatchId 注 CLAWD_DISPATCH_ID env。
     personaDispatchManager,
-    dispatchMcpConfigPath: dispatchMcpConfigPath2,
-    ticketMcpConfigPath: ticketMcpConfigPath2,
-    // shift v1：所有 persona session 都挂 shift.mcp.json（不做 persona gating）。
-    // 缺省 = shift-mcp-server.cjs 没 build 出来，cc 看不到 shift tool 但 scheduler 仍跑。
-    shiftMcpConfigPath: shiftMcpConfigPath2,
-    // sendDm MCP tool：所有 persona session 都挂 inbox.mcp.json（无 gating）。
-    inboxMcpConfigPath: inboxMcpConfigPath2,
+    // daemon 级 MCP server 登记表（dispatch / ticket / shift / inbox / ...，上方各 writer
+    // 块写盘成功即登记）；reducer 透传到 SpawnContext.mcpConfigs，cc spawn 逐项 --mcp-config。
+    mcpConfigs,
     broadcastFrame: (frame, target) => {
       if (target === "all") {
         transport?.broadcastAll(frame);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawos-dev/clawd",
-  "version": "0.2.231",
+  "version": "0.2.232",
   "description": "Standalone clawd daemon — Claude Code (and future Codex) session server over WebSocket",
   "type": "module",
   "license": "MIT",