@clawos-dev/clawd 0.2.249 → 0.2.250

package/dist/cli.cjs

@@ -6213,7 +6213,12 @@ var init_dispatch = __esm({
       })
     ]);
     DispatchRunArgsSchema = external_exports.object({
-      targetPersona: external_exports.string().min(1),
+      // 新开必填；续派（dispatchId 非空）时可省略——targetPersonaId 从台账行取。
+      targetPersona: external_exports.string().min(1).optional(),
+      // 续派（spec 2026-07-21，单 dispatchId 语义：一件事一行一 id）：非空 = 把 prompt
+      // 作为新 turn 打进该 dispatch 的原 worker session 接着干（台账行复位 running）。
+      // 省略 = 新开一件事，daemon 铸新 id。
+      dispatchId: external_exports.string().min(1).optional(),
       prompt: external_exports.string(),
       // 跨设备 dispatch：非空 = A 角色，转发到该 contact deviceId 的 peer daemon；
       // 省略 = 本地 dispatch / B 角色本地执行。A 转发给 B 时 body 不带此字段。
@@ -6223,6 +6228,10 @@ var init_dispatch = __esm({
       // tools/claude.ts CLAUDE_MODEL_IDS）；handler 层做二次校验，非法值 fail-fast。
       // protocol 层保持 string 便于未来跨 tool 扩展（届时 union 收合法字面量）。
       model: external_exports.string().min(1).optional()
+    }).refine((v2) => v2.targetPersona !== void 0 || v2.dispatchId !== void 0, {
+      message: "either targetPersona (new dispatch) or dispatchId (follow-up) is required"
+    }).refine((v2) => !(v2.dispatchId !== void 0 && v2.targetDeviceId !== void 0), {
+      message: "cross-device dispatch cannot be continued (dispatchId + targetDeviceId are mutually exclusive)"
     });
     DispatchCompleteArgsSchema = external_exports.object({
       dispatchId: external_exports.string().min(1),
@@ -41926,6 +41935,10 @@ tool \u4F1A**\u7ACB\u5373\u8FD4\u56DE** dispatchId\uFF08\u5F02\u6B65\u59D4\u6D3E
 - \u4E00\u53E5\u8BDD\u91CC\u591A\u4E2A \`@persona/<id>\` \u65F6\u9009\u7B2C\u4E00\u4E2A\uFF08tool \u4E00\u6B21\u53EA\u5904\u7406\u4E00\u4E2A target\uFF09
 - \u59D4\u6D3E\u5931\u8D25\uFF08tool_result.is_error=true\uFF09\u65F6\u5982\u5B9E\u544A\u8BC9\u7528\u6237\u539F\u56E0\uFF0C**\u4E0D\u8981\u91CD\u8BD5**
 
+### \u7EED\u6D3E\uFF08\u540C\u4E00\u4EF6\u4E8B\u7684\u540E\u7EED\u6307\u4EE4\uFF09
+
+\u7528\u6237\u5BF9\u4E00\u4EF6**\u5DF2\u59D4\u6D3E**\u7684\u4E8B\u4E0B\u540E\u7EED\u6307\u4EE4\u65F6\uFF0C\u8C03 \`personaDispatch({ dispatchId: <\u8BE5\u4E8B\u7684 dispatchId>, prompt: <\u65B0\u6307\u4EE4> })\`\uFF08targetPersona \u53EF\u7701\u7565\uFF09\u2014\u2014\u65B0\u6307\u4EE4\u4F1A\u8FDB\u5165\u539F worker session \u63A5\u7740\u5E72\uFF0C\u4E0A\u4E0B\u6587\u4E0D\u4E22\u3002dispatchId \u7528\u4F60\u9996\u6B21\u59D4\u6D3E\u65F6\u62FF\u5230\u7684\u90A3\u4E2A\uFF1B\u4E0D\u786E\u5B9A\u662F\u54EA\u4EF6\u4E8B\u5C31\u5148\u8C03 \`personaDispatchList\` \u67E5\u3002
+
 ### \u8DE8\u8BBE\u5907\u59D4\u6D3E\uFF08remote persona\uFF09
 
 \u5F53 @ token \u5F62\u5982 \`@persona/<id>@<deviceId>\`\uFF08\u7B2C\u4E8C\u6BB5\u662F\u8054\u7CFB\u4EBA**\u8BBE\u5907\u7684 deviceId**\uFF0CUI \u9009\u8054\u7CFB\u4EBA\u65F6\u5DF2\u89E3\u6790\u597D\u586B\u5165\uFF09\u65F6\uFF0C\u662F\u628A\u4EFB\u52A1\u59D4\u6D3E\u7ED9\u90A3\u53F0\u8BBE\u5907\u4E0A\u7684 persona\u3002\u9664 targetPersona / prompt \u5916\u518D\u5E26\u4E00\u4E2A\u53C2\u6570\uFF1A
@@ -44135,9 +44148,25 @@ var SessionManager = class {
     if (pending.length === 0) return;
     const state = this.tryGetState(sourceSessionId);
     if (state && compressStatus(state.status) === "running") return;
+    if (!this.injectIntoSession(sourceSessionId, formatDeliveryText(pending))) return;
+    const nowIso3 = new Date(this.deps.now?.() ?? Date.now()).toISOString();
+    for (const r of pending) store.update(r.dispatchId, { deliveredAt: nowIso3 });
+    this.deps.logger?.info("dispatch.deliver.ok", {
+      sourceSessionId,
+      count: pending.length,
+      dispatchIds: pending.map((r) => r.dispatchId)
+    });
+  }
+  /**
+   * 把一段 plain text 以 owner sender 注入指定 session 当新 turn——dispatch 结果投递
+   * （deliverPending）与续派任务包（handlers/persona-dispatch 经 sendFollowUp 闭包）共用。
+   * session 文件不存在或 send 抛错 → false（记 log，不 throw）。直接 runner.input
+   * （无 collector），frames 经 routeFromRunner 正常广播上 wire。
+   */
+  injectIntoSession(sessionId, text) {
     if (!this.deps.ownerPrincipalId) {
-      this.deps.logger?.warn("dispatch.deliver.no-owner-principal", { sourceSessionId });
-      return;
+      this.deps.logger?.warn("dispatch.inject.no-owner-principal", { sessionId });
+      return false;
     }
     const sender = principalToSender(
       makeOwnerPrincipal(
@@ -44147,34 +44176,24 @@ var SessionManager = class {
       )
     );
     try {
-      const file = this.findOwnedSession(sourceSessionId);
+      const file = this.findOwnedSession(sessionId);
       if (!file) {
-        this.deps.logger?.info("dispatch.deliver.source-gone", { sourceSessionId });
-        return;
+        this.deps.logger?.info("dispatch.inject.session-gone", { sessionId });
+        return false;
       }
       const runner = this.ensureRunnerForScope(file, this.scopeForFile(file));
       runner.input({
         kind: "command",
-        command: {
-          kind: "send",
-          text: formatDeliveryText(pending),
-          senderPrincipal: sender
-        }
+        command: { kind: "send", text, senderPrincipal: sender }
       });
+      return true;
     } catch (err) {
-      this.deps.logger?.warn("dispatch.deliver.send-failed", {
-        sourceSessionId,
+      this.deps.logger?.warn("dispatch.inject.send-failed", {
+        sessionId,
         reason: err instanceof Error ? err.message : String(err)
       });
-      return;
+      return false;
     }
-    const nowIso3 = new Date(this.deps.now?.() ?? Date.now()).toISOString();
-    for (const r of pending) store.update(r.dispatchId, { deliveredAt: nowIso3 });
-    this.deps.logger?.info("dispatch.deliver.ok", {
-      sourceSessionId,
-      count: pending.length,
-      dispatchIds: pending.map((r) => r.dispatchId)
-    });
   }
   /**
    * 只读拿 SessionState；session 不存在返 null（不 throw）。
@@ -48330,6 +48349,21 @@ var PersonaDispatchManager = class {
     state.waiters.push(d);
     return d.promise;
   }
+  /**
+   * 续派（spec 2026-07-21）：complete 已清掉 map 条目，续派前重建——bSessionId 映射
+   * 保证 worker 进程死后 respawn 时 reducer lookupDispatchByBSessionId 仍注回同一
+   * CLAWD_DISPATCH_ID env。台账行的复位由 handler 直接走 store（本方法只管内存态）。
+   */
+  reopen(dispatchId, args) {
+    const existing = this.map.get(dispatchId);
+    this.map.set(dispatchId, {
+      dispatchId,
+      sourceSessionId: args.sourceSessionId,
+      targetPersona: args.targetPersona,
+      bSessionId: args.workerSessionId,
+      waiters: existing?.waiters ?? []
+    });
+  }
   /** SessionManager 在 createDispatchedSession 时调，建立 dispatchId → B sessionId 映射 */
   registerBSession(dispatchId, bSessionId) {
     const state = this.map.get(dispatchId);
@@ -49063,6 +49097,17 @@ function canAccessPersona(grants, personaId, action) {
 
 // src/handlers/persona-dispatch.ts
 init_claude();
+function buildFollowUpTaskPack(dispatchId, prompt) {
+  return [
+    `[Follow-up instruction for dispatch ${dispatchId}]`,
+    "",
+    `Task: ${prompt}`,
+    "",
+    `This is a follow-up turn in the same dispatched task (dispatchId=${dispatchId}).`,
+    "When you finish this round, report back by calling personaDispatchComplete again,",
+    "exactly as you did before."
+  ].join("\n");
+}
 function buildPersonaDispatchHandlers(deps) {
   const { personaDispatchManager: mgr, spawnB, logger } = deps;
   const run = async (frame, _client, ctx) => {
@@ -49075,6 +49120,76 @@ function buildPersonaDispatchHandlers(deps) {
         `model '${args.model}' not supported; allowed: ${CLAUDE_MODEL_IDS.join(", ")}`
       );
     }
+    if (args.dispatchId) {
+      if (ctx?.principal.kind === "guest") {
+        throw new ClawdError(
+          ERROR_CODES.UNAUTHORIZED,
+          "follow-up dispatch cannot be initiated by a guest"
+        );
+      }
+      if (!sourceSessionId) {
+        throw new Error(
+          "personaDispatch:run requires sessionId (caller must pass x-clawd-session-id header)"
+        );
+      }
+      const rec3 = deps.store.get(args.dispatchId);
+      if (!rec3) {
+        throw new ClawdError(ERROR_CODES.INVALID_PARAM, `dispatch not found: ${args.dispatchId}`);
+      }
+      if (!rec3.workerSessionId) {
+        throw new ClawdError(
+          ERROR_CODES.INVALID_PARAM,
+          `dispatch ${args.dispatchId} has no worker session and cannot be continued (cross-device or spawn incomplete)`
+        );
+      }
+      if (args.targetPersona && args.targetPersona !== rec3.targetPersonaId) {
+        throw new ClawdError(
+          ERROR_CODES.INVALID_PARAM,
+          `targetPersona mismatch: dispatch ${args.dispatchId} belongs to ${rec3.targetPersonaId}`
+        );
+      }
+      if (!deps.sendFollowUp) {
+        throw new Error("follow-up dispatch not wired (sendFollowUp missing)");
+      }
+      deps.store.update(args.dispatchId, {
+        status: "running",
+        outcome: void 0,
+        completedAt: void 0,
+        deliveredAt: void 0,
+        taskText: args.prompt.slice(0, TASK_TEXT_MAX)
+      });
+      mgr.reopen(args.dispatchId, {
+        sourceSessionId,
+        targetPersona: rec3.targetPersonaId,
+        workerSessionId: rec3.workerSessionId
+      });
+      logger?.info("dispatch.run.follow-up", {
+        dispatchId: args.dispatchId,
+        workerSessionId: rec3.workerSessionId,
+        promptLen: args.prompt.length
+      });
+      const ok = deps.sendFollowUp(
+        rec3.workerSessionId,
+        buildFollowUpTaskPack(args.dispatchId, args.prompt)
+      );
+      if (!ok) {
+        mgr.complete(args.dispatchId, {
+          kind: "failure",
+          reason: "worker session unavailable for follow-up"
+        });
+        throw new ClawdError(
+          ERROR_CODES.SESSION_NOT_FOUND,
+          `worker session unavailable; follow-up failed for dispatch ${args.dispatchId}`
+        );
+      }
+      return {
+        response: { type: "personaDispatch:run:ok", dispatchId: args.dispatchId }
+      };
+    }
+    const targetPersona = args.targetPersona;
+    if (!targetPersona) {
+      throw new ClawdError(ERROR_CODES.INVALID_PARAM, "targetPersona is required for a new dispatch");
+    }
     if (args.targetDeviceId) {
       if (ctx?.principal.kind === "guest") {
         throw new ClawdError(
@@ -49092,17 +49207,17 @@ function buildPersonaDispatchHandlers(deps) {
       }
       const { dispatchId: dispatchId2 } = mgr.start({
         sourceSessionId,
-        targetPersona: args.targetPersona,
+        targetPersona,
         taskText: args.prompt
       });
       logger?.info("dispatch.run.forward", {
         dispatchId: dispatchId2,
         targetDeviceId: args.targetDeviceId,
-        targetPersona: args.targetPersona
+        targetPersona
       });
       void deps.forwardToPeer({
         targetDeviceId: args.targetDeviceId,
-        targetPersona: args.targetPersona,
+        targetPersona,
         prompt: args.prompt,
         ...args.model ? { model: args.model } : {}
       }).then((outcome) => mgr.complete(dispatchId2, outcome)).catch((err) => {
@@ -49115,28 +49230,28 @@ function buildPersonaDispatchHandlers(deps) {
       };
     }
     if (ctx?.principal.kind === "guest") {
-      const isPublic = deps.getPersonaPublic?.(args.targetPersona) ?? false;
-      if (!isPublic || !canAccessPersona(ctx.grants, args.targetPersona, "send")) {
+      const isPublic = deps.getPersonaPublic?.(targetPersona) ?? false;
+      if (!isPublic || !canAccessPersona(ctx.grants, targetPersona, "send")) {
         throw new ClawdError(
           ERROR_CODES.UNAUTHORIZED,
-          `persona not dispatchable: ${args.targetPersona}`
+          `persona not dispatchable: ${targetPersona}`
         );
       }
       const { dispatchId: dispatchId2 } = mgr.start({
         sourceSessionId: ctx.principal.id,
-        targetPersona: args.targetPersona,
+        targetPersona,
         taskText: args.prompt
       });
       logger?.info("dispatch.run.received.guest", {
         dispatchId: dispatchId2,
         sourcePrincipal: ctx.principal.id,
-        targetPersona: args.targetPersona,
+        targetPersona,
         promptLen: args.prompt.length
       });
       void spawnB({
         dispatchId: dispatchId2,
         sourceSessionId: ctx.principal.id,
-        targetPersona: args.targetPersona,
+        targetPersona,
         prompt: args.prompt,
         guestPrincipalId: ctx.principal.id,
         guestDisplayName: ctx.principal.displayName,
@@ -49163,19 +49278,19 @@ function buildPersonaDispatchHandlers(deps) {
     }
     const { dispatchId } = mgr.start({
       sourceSessionId,
-      targetPersona: args.targetPersona,
+      targetPersona,
       taskText: args.prompt
     });
     logger?.info("dispatch.run.received", {
       dispatchId,
       sourceSessionId,
-      targetPersona: args.targetPersona,
+      targetPersona,
       promptLen: args.prompt.length
     });
     void spawnB({
       dispatchId,
       sourceSessionId,
-      targetPersona: args.targetPersona,
+      targetPersona,
       prompt: args.prompt,
       ...args.model ? { model: args.model } : {}
     }).then(() => {
@@ -50707,6 +50822,9 @@ var EXPOSED_RPC_METHODS = [
   "peerExec.run",
   "personaDispatch.complete",
   "personaDispatch.list",
+  // persona 清单（spec 2026-07-21）：两级路由第一级——发起方 cc（loopback owner 语义）
+  // 用 curl 拿全量 personaId+label 紧凑清单，再按需读候选 CLAUDE.md 首段做终选。
+  "persona.list",
   // clawd-shift v1 (spec 2026-06-24-clawd-shift)：cc 子进程内的 shift MCP server 调
   // 这 5 个 method 管理 owner 的 shift（fire-and-forget 排班）。鉴权靠 body.personaId
   // （mcp-server 从 process.env.CLAWD_PERSONA_ID 读，源 = SessionFile.ownerPersonaId）。
@@ -59610,6 +59728,8 @@ async function startDaemon(config) {
   const dispatchHandlers = buildPersonaDispatchHandlers({
     personaDispatchManager,
     store: dispatchStore,
+    // 续派（spec 2026-07-21）：任务包注入 worker session，复用投递同款注入路径。
+    sendFollowUp: (workerSessionId, text) => manager.injectIntoSession(workerSessionId, text),
     logger,
     spawnB: async (args) => {
       logger.info("dispatch.spawnB.start", {

package/dist/dispatch/mcp-server.cjs

@@ -22708,7 +22708,12 @@ var DispatchOutcomeSchema = external_exports.discriminatedUnion("kind", [
   })
 ]);
 var DispatchRunArgsSchema = external_exports.object({
-  targetPersona: external_exports.string().min(1),
+  // 新开必填；续派（dispatchId 非空）时可省略——targetPersonaId 从台账行取。
+  targetPersona: external_exports.string().min(1).optional(),
+  // 续派（spec 2026-07-21，单 dispatchId 语义：一件事一行一 id）：非空 = 把 prompt
+  // 作为新 turn 打进该 dispatch 的原 worker session 接着干（台账行复位 running）。
+  // 省略 = 新开一件事，daemon 铸新 id。
+  dispatchId: external_exports.string().min(1).optional(),
   prompt: external_exports.string(),
   // 跨设备 dispatch：非空 = A 角色，转发到该 contact deviceId 的 peer daemon；
   // 省略 = 本地 dispatch / B 角色本地执行。A 转发给 B 时 body 不带此字段。
@@ -22718,6 +22723,10 @@ var DispatchRunArgsSchema = external_exports.object({
   // tools/claude.ts CLAUDE_MODEL_IDS）；handler 层做二次校验，非法值 fail-fast。
   // protocol 层保持 string 便于未来跨 tool 扩展（届时 union 收合法字面量）。
   model: external_exports.string().min(1).optional()
+}).refine((v) => v.targetPersona !== void 0 || v.dispatchId !== void 0, {
+  message: "either targetPersona (new dispatch) or dispatchId (follow-up) is required"
+}).refine((v) => !(v.dispatchId !== void 0 && v.targetDeviceId !== void 0), {
+  message: "cross-device dispatch cannot be continued (dispatchId + targetDeviceId are mutually exclusive)"
 });
 var DispatchCompleteArgsSchema = external_exports.object({
   dispatchId: external_exports.string().min(1),
@@ -23425,6 +23434,7 @@ async function handlePersonaDispatchToolCall(input, ctx) {
   const f = ctx.fetch ?? fetch;
   log("personaDispatch tool entered", {
     targetPersona: input.targetPersona,
+    dispatchId: input.dispatchId,
     promptLen: input.prompt.length,
     sessionId: ctx.sessionId,
     daemonUrl: ctx.daemonUrl
@@ -23452,8 +23462,11 @@ async function handlePersonaDispatchToolCall(input, ctx) {
         "x-clawd-session-id": ctx.sessionId
       },
       body: JSON.stringify({
-        targetPersona: input.targetPersona,
+        // 续派时可省 targetPersona（daemon 从台账取）
+        ...input.targetPersona ? { targetPersona: input.targetPersona } : {},
         prompt: input.prompt,
+        // 续派（spec 2026-07-21）：非空 = 把 prompt 打进该 dispatch 的原 worker session。
+        ...input.dispatchId ? { dispatchId: input.dispatchId } : {},
         // 跨设备：非空时透传，daemon run handler 据此走 A 角色转发分支。
         ...input.targetDeviceId ? { targetDeviceId: input.targetDeviceId } : {},
         // T-20: 可选 override B session 使用的 claude 模型；MCP tool 层已 enum 校验，
@@ -23487,12 +23500,13 @@ async function handlePersonaDispatchToolCall(input, ctx) {
     };
   }
   const dispatchId = json.result.dispatchId;
-  log("personaDispatch submitted", { dispatchId });
+  log("personaDispatch submitted", { dispatchId, followUp: Boolean(input.dispatchId) });
+  const head = input.dispatchId ? `Follow-up sent for dispatch ${dispatchId} \u2014 the new instruction was delivered into the same worker session.` : `Task dispatched to ${input.targetPersona} (dispatchId=${dispatchId}).`;
   return {
     content: [
       {
         type: "text",
-        text: `Task dispatched to ${input.targetPersona} (dispatchId=${dispatchId}). The result will be delivered back into this session when the target persona finishes \u2014 you do NOT need to wait or poll. Tell the user the task has been delegated and end your turn. Use personaDispatchList only if the user later asks about progress.`
+        text: `${head} The result will be delivered back into this session when the target persona finishes \u2014 you do NOT need to wait or poll. Tell the user the task has been delegated and end your turn. Use personaDispatchList only if the user later asks about progress.`
       }
     ]
   };
@@ -23619,9 +23633,14 @@ async function main() {
     "personaDispatch",
     {
       title: "Dispatch task to another persona",
-      description: "Delegate a task to another clawd persona. Use this when the user message contains `@persona/<id>` to hand the task off to that persona. Returns immediately with a dispatchId; the result will be delivered back into your session automatically when the target persona finishes \u2014 do not wait or poll. Use personaDispatchList to check progress if asked.",
+      description: "Delegate a task to another clawd persona. Use this when the user message contains `@persona/<id>` to hand the task off to that persona. Returns immediately with a dispatchId; the result will be delivered back into your session automatically when the target persona finishes \u2014 do not wait or poll. To continue an existing dispatched task (follow-up instruction into the same worker session), pass its dispatchId and omit targetPersona. Use personaDispatchList to check progress if asked.",
       inputSchema: {
-        targetPersona: external_exports.string().describe("persona id (e.g. persona-app-builder)"),
+        targetPersona: external_exports.string().optional().describe(
+          "persona id (e.g. persona-app-builder); omit when continuing an existing dispatch via dispatchId"
+        ),
+        dispatchId: external_exports.string().optional().describe(
+          "continue an existing dispatched task: the prompt is delivered into the same worker session as a new turn (context preserved); model cannot be changed on follow-up (the worker session keeps its original model)"
+        ),
         prompt: external_exports.string().describe(
           "the task to perform, with the @persona/<id> token stripped out"
         ),