@clawos-dev/clawd 0.2.191 → 0.2.192-beta.386.33a5833

package/dist/dispatch/mcp-server.cjs

@@ -39549,6 +39549,8 @@ async function handlePersonaDispatchToolCall(input, ctx) {
   log("personaDispatch tool entered", {
     targetPersona: input.targetPersona,
     promptLen: input.prompt.length,
+    hasTargetSessionId: Boolean(input.targetSessionId),
+    hasTargetDeviceId: Boolean(input.targetDeviceId),
     sessionId: ctx.sessionId,
     daemonUrl: ctx.daemonUrl
   });
@@ -39578,7 +39580,9 @@ async function handlePersonaDispatchToolCall(input, ctx) {
         targetPersona: input.targetPersona,
         prompt: input.prompt,
         // 跨设备：非空时透传，daemon run handler 据此走 A 角色转发分支。
-        ...input.targetDeviceId ? { targetDeviceId: input.targetDeviceId } : {}
+        ...input.targetDeviceId ? { targetDeviceId: input.targetDeviceId } : {},
+        // 精确寻址：非空时透传，daemon 校验权限并走 resumeDispatchedSession 路径。
+        ...input.targetSessionId ? { targetSessionId: input.targetSessionId } : {}
       })
     });
   } catch (err) {
@@ -39607,10 +39611,19 @@ async function handlePersonaDispatchToolCall(input, ctx) {
     };
   }
   const outcome = json.result.outcome;
-  log("personaDispatch resolved", { outcomeKind: outcome.kind });
+  const dispatchedSessionId = json.result.dispatchedSessionId;
+  log("personaDispatch resolved", {
+    outcomeKind: outcome.kind,
+    dispatchedSessionId
+  });
+  const idTail = `
+
+(dispatchedSessionId: ${dispatchedSessionId} \u2014 pass this as targetSessionId in a follow-up call to reuse this same B session.)`;
   if (outcome.kind === "failure") {
     return {
-      content: [{ type: "text", text: `Dispatch failed: ${outcome.reason}` }],
+      content: [
+        { type: "text", text: `Dispatch failed: ${outcome.reason}${idTail}` }
+      ],
       isError: true
     };
   }
@@ -39619,7 +39632,7 @@ async function handlePersonaDispatchToolCall(input, ctx) {
 Related files:
 ${outcome.filePaths.map((p) => `- ${p}`).join("\n")}` : "";
   return {
-    content: [{ type: "text", text: `${outcome.text}${paths}` }]
+    content: [{ type: "text", text: `${outcome.text}${paths}${idTail}` }]
   };
 }
 async function handlePersonaDispatchCompleteToolCall(input, ctx) {
@@ -39628,16 +39641,16 @@ async function handlePersonaDispatchCompleteToolCall(input, ctx) {
     isFailure: Boolean(input.isFailure),
     textLen: input.text?.length ?? 0,
     filePathCount: input.filePaths?.length ?? 0,
-    dispatchId: ctx.dispatchId,
+    sessionId: ctx.sessionId,
     daemonUrl: ctx.daemonUrl
   });
-  if (!ctx.dispatchId) {
-    log("personaDispatchComplete CLAWD_DISPATCH_ID missing");
+  if (!ctx.sessionId) {
+    log("personaDispatchComplete CLAWD_SESSION_ID missing");
     return {
       content: [
         {
           type: "text",
-          text: "Error: CLAWD_DISPATCH_ID env not set; this session was not dispatched."
+          text: "Error: CLAWD_SESSION_ID env not set; daemon cannot resolve in-flight dispatch without sessionId."
         }
       ],
       isError: true
@@ -39652,14 +39665,15 @@ async function handlePersonaDispatchCompleteToolCall(input, ctx) {
     filePaths: input.filePaths
   };
   const url = `${ctx.daemonUrl}/api/rpc/personaDispatch.complete`;
-  log("personaDispatchComplete pre-fetch", { url, hasSessionId: Boolean(ctx.sessionId) });
-  const headers = { "content-type": "application/json" };
-  if (ctx.sessionId) headers["x-clawd-session-id"] = ctx.sessionId;
+  log("personaDispatchComplete pre-fetch", { url, sessionId: ctx.sessionId });
   try {
     const res = await f(url, {
       method: "POST",
-      headers,
-      body: JSON.stringify({ dispatchId: ctx.dispatchId, outcome })
+      headers: {
+        "content-type": "application/json",
+        "x-clawd-session-id": ctx.sessionId
+      },
+      body: JSON.stringify({ outcome })
     });
     log("personaDispatchComplete post-fetch", { url, status: res.status });
   } catch (err) {
@@ -39683,12 +39697,10 @@ async function handlePersonaDispatchCompleteToolCall(input, ctx) {
 async function main() {
   const daemonUrl = process.env.CLAWD_DAEMON_URL;
   const sessionId = process.env.CLAWD_SESSION_ID;
-  const dispatchId = process.env.CLAWD_DISPATCH_ID;
   log("boot", {
     pid: process.pid,
     hasDaemonUrl: Boolean(daemonUrl),
     hasSessionId: Boolean(sessionId),
-    hasDispatchId: Boolean(dispatchId),
     logPath: DISPATCH_LOG ?? "(stderr)"
   });
   if (!daemonUrl) {
@@ -39705,7 +39717,7 @@ 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. The tool blocks until the other persona finishes and returns its result.",
+      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. The tool blocks until the other persona finishes and returns its result. To reuse the same B session (continue an earlier task), pass its dispatchedSessionId (from a previous call's output tail) as targetSessionId \u2014 cross-device continuation additionally requires the original targetDeviceId. Omit targetSessionId to spawn a fresh B session.",
       inputSchema: {
         targetPersona: external_exports.string().describe("persona id (e.g. persona-app-builder)"),
         prompt: external_exports.string().describe(
@@ -39713,6 +39725,9 @@ async function main() {
         ),
         targetDeviceId: external_exports.string().optional().describe(
           "contact deviceId of the remote device when delegating cross-device (omit for a local persona)"
+        ),
+        targetSessionId: external_exports.string().optional().describe(
+          "existing B session id to reuse (from a previous dispatchedSessionId). Omit to spawn a fresh B session."
         )
       }
     },
@@ -39731,8 +39746,8 @@ async function main() {
       }
     },
     // sessionId 透传：complete RPC 必须带 x-clawd-session-id header（rpc-adapter 强制）。
-    // B session 的 cc env 有 CLAWD_SESSION_ID = B 的 sessionId。
-    async (input) => handlePersonaDispatchCompleteToolCall(input, { daemonUrl, sessionId, dispatchId })
+    // daemon 用该 sessionId 反查 PersonaDispatchManager 里该 B 的 in-flight dispatchId 配对回 A 的 waiter。
+    async (input) => handlePersonaDispatchCompleteToolCall(input, { daemonUrl, sessionId })
   );
   await server.connect(new StdioServerTransport());
 }