@clawos-dev/clawd 0.2.721 → 0.2.722

package/dist/app-builder-plugin/mcp-server.cjs

@@ -32211,7 +32211,7 @@ var DispatchRunArgsSchema = external_exports.object({
 }).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)"
+  message: "follow-ups take only dispatchId; the target device comes from the ledger row (dispatchId + targetDeviceId are mutually exclusive)"
 }).refine((v) => !(v.tool !== void 0 && v.targetDeviceId !== void 0), {
   message: "engine override is not supported for cross-device dispatch (tool + targetDeviceId are mutually exclusive)"
 }).refine((v) => !(v.dispatchId !== void 0 && (v.tool !== void 0 || v.model !== void 0)), {
@@ -32230,6 +32230,10 @@ var DispatchRecordSchema = external_exports.object({
   targetPersonaId: external_exports.string().min(1),
   /** A-side target device attribution; absence means local for existing records. Forwarding strips it from the B-side local ledger. */
   targetDeviceId: external_exports.string().min(1).optional(),
+  /** A-side cross-device rows: the B-side ledger id, used for follow-ups and for resuming polls after an A restart. */
+  remoteDispatchId: external_exports.string().min(1).optional(),
+  /** The A-side round B last accepted; a follow-up reopened but not yet accepted has remoteRound < round, so a restart must not resume polling it. */
+  remoteRound: external_exports.number().int().positive().optional(),
   /** B 的 sessionId；registerBSession 后回填 */
   workerSessionId: external_exports.string().min(1).optional(),
   taskText: external_exports.string(),
@@ -34315,7 +34319,7 @@ var METHOD_DOCS = {
     args: PersonaIdArgsSchema
   },
   "personaDispatch:run": {
-    summary: "\u628A\u4EFB\u52A1\u59D4\u6D3E\u7ED9\u53E6\u4E00\u4E2A persona\uFF08\u53EF\u8DE8\u8BBE\u5907\uFF09\uFF0C\u5F02\u6B65\u79D2\u56DE { dispatchId }\u3002targetPersona \u4E0E dispatchId **\u81F3\u5C11\u7ED9\u4E00\u4E2A**\uFF08\u524D\u8005\u65B0\u5F00\u3001\u540E\u8005\u7EED\u6D3E\uFF09\uFF1BdispatchId \u4E0E targetDeviceId **\u4E92\u65A5**",
+    summary: "\u628A\u4EFB\u52A1\u59D4\u6D3E\u7ED9\u53E6\u4E00\u4E2A persona\uFF08\u53EF\u8DE8\u8BBE\u5907\uFF09\uFF0C\u5F02\u6B65\u79D2\u56DE { dispatchId }\u3002targetPersona \u4E0E dispatchId **\u81F3\u5C11\u7ED9\u4E00\u4E2A**\uFF08\u524D\u8005\u65B0\u5F00\u3001\u540E\u8005\u7EED\u6D3E\uFF09\uFF1BdispatchId \u4E0E targetDeviceId **\u4E92\u65A5**\uFF08\u8DE8\u8BBE\u5907\u7EED\u6D3E\u4E5F\u53EA\u4F20 dispatchId\uFF0C\u8BBE\u5907\u4ECE\u53F0\u8D26\u53D6\uFF09",
     args: DispatchRunArgsSchema,
     argsConstraints: {
       anyOf: [{ required: ["targetPersona"] }, { required: ["dispatchId"] }],

package/dist/cli.cjs

@@ -7247,7 +7247,7 @@ var init_dispatch = __esm({
     }).refine((v3) => v3.targetPersona !== void 0 || v3.dispatchId !== void 0, {
       message: "either targetPersona (new dispatch) or dispatchId (follow-up) is required"
     }).refine((v3) => !(v3.dispatchId !== void 0 && v3.targetDeviceId !== void 0), {
-      message: "cross-device dispatch cannot be continued (dispatchId + targetDeviceId are mutually exclusive)"
+      message: "follow-ups take only dispatchId; the target device comes from the ledger row (dispatchId + targetDeviceId are mutually exclusive)"
     }).refine((v3) => !(v3.tool !== void 0 && v3.targetDeviceId !== void 0), {
       message: "engine override is not supported for cross-device dispatch (tool + targetDeviceId are mutually exclusive)"
     }).refine((v3) => !(v3.dispatchId !== void 0 && (v3.tool !== void 0 || v3.model !== void 0)), {
@@ -7266,6 +7266,10 @@ var init_dispatch = __esm({
       targetPersonaId: external_exports.string().min(1),
       /** A-side target device attribution; absence means local for existing records. Forwarding strips it from the B-side local ledger. */
       targetDeviceId: external_exports.string().min(1).optional(),
+      /** A-side cross-device rows: the B-side ledger id, used for follow-ups and for resuming polls after an A restart. */
+      remoteDispatchId: external_exports.string().min(1).optional(),
+      /** The A-side round B last accepted; a follow-up reopened but not yet accepted has remoteRound < round, so a restart must not resume polling it. */
+      remoteRound: external_exports.number().int().positive().optional(),
       /** B 的 sessionId；registerBSession 后回填 */
       workerSessionId: external_exports.string().min(1).optional(),
       taskText: external_exports.string(),
@@ -9587,7 +9591,7 @@ var init_methods = __esm({
         args: PersonaIdArgsSchema
       },
       "personaDispatch:run": {
-        summary: "\u628A\u4EFB\u52A1\u59D4\u6D3E\u7ED9\u53E6\u4E00\u4E2A persona\uFF08\u53EF\u8DE8\u8BBE\u5907\uFF09\uFF0C\u5F02\u6B65\u79D2\u56DE { dispatchId }\u3002targetPersona \u4E0E dispatchId **\u81F3\u5C11\u7ED9\u4E00\u4E2A**\uFF08\u524D\u8005\u65B0\u5F00\u3001\u540E\u8005\u7EED\u6D3E\uFF09\uFF1BdispatchId \u4E0E targetDeviceId **\u4E92\u65A5**",
+        summary: "\u628A\u4EFB\u52A1\u59D4\u6D3E\u7ED9\u53E6\u4E00\u4E2A persona\uFF08\u53EF\u8DE8\u8BBE\u5907\uFF09\uFF0C\u5F02\u6B65\u79D2\u56DE { dispatchId }\u3002targetPersona \u4E0E dispatchId **\u81F3\u5C11\u7ED9\u4E00\u4E2A**\uFF08\u524D\u8005\u65B0\u5F00\u3001\u540E\u8005\u7EED\u6D3E\uFF09\uFF1BdispatchId \u4E0E targetDeviceId **\u4E92\u65A5**\uFF08\u8DE8\u8BBE\u5907\u7EED\u6D3E\u4E5F\u53EA\u4F20 dispatchId\uFF0C\u8BBE\u5907\u4ECE\u53F0\u8D26\u53D6\uFF09",
         args: DispatchRunArgsSchema,
         argsConstraints: {
           anyOf: [{ required: ["targetPersona"] }, { required: ["dispatchId"] }],
@@ -50884,15 +50888,15 @@ var SessionManager = class {
     });
   }
   /**
-   * 以 owner 身份注入新 turn；无 session 或发送失败返回 false，帧走异步广播。
+   * 默认以 owner 身份注入新 turn（跨设备续派传 guest sender，与首轮执行身份一致）；无 session 或发送失败返回 false，帧走异步广播。
    * meta 来源分型须与历史信封分类一致。sender 表达执行身份，origin 表达消息来源，不能混用。
    */
-  injectIntoSession(sessionId, text, meta) {
+  injectIntoSession(sessionId, text, meta, sender) {
     if (!this.deps.ownerPrincipalId) {
       this.deps.logger?.warn("dispatch.inject.no-owner-principal", { sessionId });
       return false;
     }
-    const sender = principalToSender(
+    const senderPrincipal = sender ?? principalToSender(
       makeOwnerPrincipal(
         this.deps.ownerPrincipalId,
         this.deps.ownerDisplayName ?? "Owner",
@@ -50908,7 +50912,7 @@ var SessionManager = class {
       const runner = this.ensureRunnerForScope(file, this.scopeForFile(file));
       runner.input({
         kind: "command",
-        command: { kind: "send", text, senderPrincipal: sender, ...meta ? { meta } : {} }
+        command: { kind: "send", text, senderPrincipal, ...meta ? { meta } : {} }
       });
       return true;
     } catch (err) {
@@ -56926,6 +56930,9 @@ var CLOCK_JUMP_THRESHOLD_MS = 5 * 6e4;
 
 // src/dispatch/store.ts
 var TASK_TEXT_MAX = 500;
+function isAwaitingPeer(r2) {
+  return r2.status === "running" && !!r2.targetDeviceId && !!r2.remoteDispatchId && r2.remoteRound === (r2.round ?? 1);
+}
 function createDispatchStore(deps) {
   let records = [];
   let flushTimer = null;
@@ -57004,7 +57011,7 @@ function createDispatchStore(deps) {
   function markInterruptedAsFailed(nowIso3) {
     let touched = false;
     for (const r2 of records) {
-      if (r2.status === "running") {
+      if (r2.status === "running" && !isAwaitingPeer(r2)) {
         r2.status = "failed";
         r2.outcome = {
           kind: "failure",
@@ -66798,6 +66805,38 @@ function canAccessPersona(grants, personaId2, action) {
 
 // src/handlers/persona-dispatch.ts
 init_claude();
+function forwardInBackground(deps, dispatchId, a2) {
+  if (!deps.forwardToPeer) {
+    throw new Error("cross-device dispatch not wired (forwardToPeer missing)");
+  }
+  void deps.forwardToPeer({
+    ...a2,
+    onSubmitted: (remoteDispatchId) => deps.store.update(dispatchId, { remoteDispatchId, remoteRound: deps.store.get(dispatchId)?.round ?? 1 })
+  }).then((outcome) => deps.personaDispatchManager.complete(dispatchId, outcome)).catch((err) => {
+    const reason = err instanceof Error ? err.message : String(err);
+    deps.logger?.warn("dispatch.forward.failed", { dispatchId, reason });
+    deps.personaDispatchManager.complete(dispatchId, { kind: "failure", reason });
+  });
+}
+function resumePeerDispatches(deps) {
+  for (const r2 of deps.store.list()) {
+    if (!isAwaitingPeer(r2) || !r2.targetDeviceId || !r2.remoteDispatchId) continue;
+    deps.logger?.info("dispatch.forward.resume", { dispatchId: r2.dispatchId, targetDeviceId: r2.targetDeviceId });
+    forwardInBackground(deps, r2.dispatchId, {
+      targetDeviceId: r2.targetDeviceId,
+      prompt: "",
+      remoteDispatchId: r2.remoteDispatchId,
+      resume: true
+    });
+  }
+}
+function visibleRecord(store, dispatchId, ctx) {
+  const rec6 = store.get(dispatchId);
+  if (!rec6 || ctx?.principal.kind === "guest" && rec6.sourceSessionId !== ctx.principal.id) {
+    throw new ClawdError(ERROR_CODES.DISPATCH_NOT_FOUND, `unknown dispatchId: ${dispatchId}`);
+  }
+  return rec6;
+}
 function buildFollowUpTaskPack(dispatchId, prompt, round, from) {
   return formatDispatchTaskEnvelope({
     dispatchId,
@@ -66816,6 +66855,12 @@ function buildFollowUpTaskPack(dispatchId, prompt, round, from) {
 }
 function buildPersonaDispatchHandlers(deps) {
   const { personaDispatchManager: mgr, spawnB, logger } = deps;
+  const assertGuestMayDispatch = (ctx, personaId2) => {
+    const isPublic = deps.getPersonaPublic?.(personaId2) ?? false;
+    if (!isPublic || !canAccessPersona(ctx.grants, personaId2, "send")) {
+      throw new ClawdError(ERROR_CODES.UNAUTHORIZED, `persona not dispatchable: ${personaId2}`);
+    }
+  };
   const run = async (frame, _client, ctx) => {
     const { type: _t2, requestId: _r2, ...rest } = frame;
     const rawSessionId = typeof rest.sessionId === "string" && rest.sessionId.length > 0 ? rest.sessionId : void 0;
@@ -66835,44 +66880,68 @@ function buildPersonaDispatchHandlers(deps) {
       );
     }
     if (args.dispatchId) {
-      if (ctx?.principal.kind === "guest") {
-        throw new ClawdError(
-          ERROR_CODES.UNAUTHORIZED,
-          "follow-up dispatch cannot be initiated by a guest"
-        );
-      }
-      const rec6 = deps.store.get(args.dispatchId);
+      const guest = ctx?.principal.kind === "guest" ? ctx : void 0;
+      const rec6 = guest ? visibleRecord(deps.store, args.dispatchId, guest) : deps.store.get(args.dispatchId);
       if (!rec6) {
         throw new ClawdError(ERROR_CODES.INVALID_PARAM, `dispatch not found: ${args.dispatchId}`);
       }
-      if (!rec6.workerSessionId) {
+      if (guest) assertGuestMayDispatch(guest, rec6.targetPersonaId);
+      if (args.targetPersona && args.targetPersona !== rec6.targetPersonaId) {
         throw new ClawdError(
           ERROR_CODES.INVALID_PARAM,
-          `dispatch ${args.dispatchId} has no worker session and cannot be continued (cross-device or spawn incomplete)`
+          `targetPersona mismatch: dispatch ${args.dispatchId} belongs to ${rec6.targetPersonaId}`
         );
       }
-      if (args.targetPersona && args.targetPersona !== rec6.targetPersonaId) {
+      const dispatchId2 = args.dispatchId;
+      const reopenRow = () => {
+        const nextRound2 = (rec6.round ?? 1) + 1;
+        deps.store.update(dispatchId2, {
+          status: "running",
+          outcome: void 0,
+          completedAt: void 0,
+          deliveredAt: void 0,
+          taskText: args.prompt.slice(0, TASK_TEXT_MAX),
+          round: nextRound2,
+          ...args.brief ? { taskBrief: args.brief } : {},
+          ...args.meta ? { meta: { ...rec6.meta ?? {}, ...args.meta } } : {}
+        });
+        return nextRound2;
+      };
+      if (rec6.targetDeviceId) {
+        if (!rec6.remoteDispatchId) {
+          throw new ClawdError(
+            ERROR_CODES.INVALID_PARAM,
+            `dispatch ${args.dispatchId} was not accepted by the peer and cannot be continued`
+          );
+        }
+        reopenRow();
+        logger?.info("dispatch.run.follow-up.forward", {
+          dispatchId: args.dispatchId,
+          targetDeviceId: rec6.targetDeviceId,
+          promptLen: args.prompt.length
+        });
+        forwardInBackground(deps, args.dispatchId, {
+          targetDeviceId: rec6.targetDeviceId,
+          prompt: args.prompt,
+          ...args.brief ? { brief: args.brief } : {},
+          remoteDispatchId: rec6.remoteDispatchId
+        });
+        return {
+          response: { type: "personaDispatch:run:ok", dispatchId: args.dispatchId }
+        };
+      }
+      if (!rec6.workerSessionId) {
         throw new ClawdError(
           ERROR_CODES.INVALID_PARAM,
-          `targetPersona mismatch: dispatch ${args.dispatchId} belongs to ${rec6.targetPersonaId}`
+          `dispatch ${args.dispatchId} has no worker session and cannot be continued (spawn incomplete)`
         );
       }
       if (!deps.sendFollowUp) {
         throw new Error("follow-up dispatch not wired (sendFollowUp missing)");
       }
-      const nextRound = (rec6.round ?? 1) + 1;
-      deps.store.update(args.dispatchId, {
-        status: "running",
-        outcome: void 0,
-        completedAt: void 0,
-        deliveredAt: void 0,
-        taskText: args.prompt.slice(0, TASK_TEXT_MAX),
-        round: nextRound,
-        ...args.brief ? { taskBrief: args.brief } : {},
-        ...args.meta ? { meta: { ...rec6.meta ?? {}, ...args.meta } } : {}
-      });
+      const nextRound = reopenRow();
       mgr.reopen(args.dispatchId, {
-        sourceSessionId,
+        sourceSessionId: guest ? guest.principal.id : sourceSessionId,
         targetPersona: rec6.targetPersonaId,
         workerSessionId: rec6.workerSessionId
       });
@@ -66888,10 +66957,13 @@ function buildPersonaDispatchHandlers(deps) {
           args.prompt,
           nextRound,
           // Legacy ledger rows may lack attribution; fall back to a current session lookup.
-          rec6.sourcePersonaId ?? deps.getSessionPersonaId?.(sourceSessionId)
+          // Cross-device rows carry the caller's display name, as in the first round.
+          guest ? guest.principal.displayName : rec6.sourcePersonaId ?? deps.getSessionPersonaId?.(sourceSessionId)
         ),
         // Realtime metadata and history envelope classification both use dispatch-task.
-        "dispatch-task"
+        "dispatch-task",
+        // Keep the first round's execution identity: a guest worker must not continue as the owner.
+        guest ? makeGuestSender(guest.principal.id, guest.principal.displayName) : void 0
       );
       if (!ok) {
         mgr.complete(args.dispatchId, {
@@ -66949,9 +67021,6 @@ function buildPersonaDispatchHandlers(deps) {
           "cross-device forward cannot be initiated by a guest"
         );
       }
-      if (!deps.forwardToPeer) {
-        throw new Error("cross-device dispatch not wired (forwardToPeer missing)");
-      }
       const { dispatchId: dispatchId2 } = mgr.start({
         sourceSessionId,
         targetPersona,
@@ -66966,28 +67035,20 @@ function buildPersonaDispatchHandlers(deps) {
         targetDeviceId: args.targetDeviceId,
         targetPersona
       });
-      void deps.forwardToPeer({
+      forwardInBackground(deps, dispatchId2, {
         targetDeviceId: args.targetDeviceId,
         targetPersona,
         prompt: args.prompt,
+        ...args.brief ? { brief: args.brief } : {},
+        ...args.sessionLabel ? { sessionLabel: args.sessionLabel } : {},
         ...args.model ? { model: args.model } : {}
-      }).then((outcome) => mgr.complete(dispatchId2, outcome)).catch((err) => {
-        const reason = err instanceof Error ? err.message : String(err);
-        logger?.warn("dispatch.forward.failed", { dispatchId: dispatchId2, reason });
-        mgr.complete(dispatchId2, { kind: "failure", reason });
       });
       return {
         response: { type: "personaDispatch:run:ok", dispatchId: dispatchId2 }
       };
     }
     if (ctx?.principal.kind === "guest") {
-      const isPublic = deps.getPersonaPublic?.(targetPersona) ?? false;
-      if (!isPublic || !canAccessPersona(ctx.grants, targetPersona, "send")) {
-        throw new ClawdError(
-          ERROR_CODES.UNAUTHORIZED,
-          `persona not dispatchable: ${targetPersona}`
-        );
-      }
+      assertGuestMayDispatch(ctx, targetPersona);
       const { dispatchId: dispatchId2 } = mgr.start({
         sourceSessionId: ctx.principal.id,
         targetPersona,
@@ -67076,11 +67137,7 @@ function buildPersonaDispatchHandlers(deps) {
   const get = async (frame, _client, ctx) => {
     const { type: _t2, requestId: _r2, ...rest } = frame;
     const args = DispatchGetArgsSchema.parse(rest);
-    const rec6 = deps.store.get(args.dispatchId);
-    const denied = ctx?.principal.kind === "guest" && rec6?.sourceSessionId !== ctx.principal.id;
-    if (!rec6 || denied) {
-      throw new ClawdError(ERROR_CODES.DISPATCH_NOT_FOUND, `unknown dispatchId: ${args.dispatchId}`);
-    }
+    const rec6 = visibleRecord(deps.store, args.dispatchId, ctx);
     return {
       response: {
         type: "personaDispatch:get:ok",
@@ -67123,40 +67180,15 @@ async function forwardDispatchToPeer(args) {
   const f2 = args.fetchImpl ?? fetch;
   const sleep2 = args.sleepImpl ?? defaultSleep;
   const base = wsUrlToHttp(args.contact.remoteUrl).replace(/\/+$/, "");
-  const url = `${base}/rpc/personaDispatch:run`;
-  let res;
-  try {
-    res = await f2(url, {
-      method: "POST",
-      headers: {
-        "content-type": "application/json",
-        authorization: `Bearer ${args.contact.connectToken}`
-      },
-      // 注意：不带 targetDeviceId —— B 端据此判定为本地执行（B 角色）。
-      body: JSON.stringify({
-        targetPersona: args.targetPersona,
-        prompt: args.prompt,
-        ...args.model ? { model: args.model } : {}
-      })
-    });
-  } catch (err) {
-    const msg = err instanceof Error ? err.message : String(err);
-    return { kind: "failure", reason: `forward to peer failed: ${msg}` };
-  }
-  let json;
-  try {
-    json = await res.json();
-  } catch {
-    return {
-      kind: "failure",
-      reason: `peer returned non-JSON response (HTTP ${res.status})`
-    };
-  }
-  if (json.ok === false) {
-    return { kind: "failure", reason: `peer rejected: ${json.error}: ${json.message}` };
+  let dispatchId;
+  if (args.resume && args.remoteDispatchId) {
+    dispatchId = args.remoteDispatchId;
+  } else {
+    const submitted = await submitRun(f2, base, args);
+    if ("outcome" in submitted) return submitted.outcome;
+    dispatchId = submitted.dispatchId;
+    args.onSubmitted?.(dispatchId);
   }
-  if ("outcome" in json.result) return json.result.outcome;
-  const dispatchId = json.result.dispatchId;
   let elapsed = 0;
   let unreachableFor = 0;
   while (elapsed < DISPATCH_POLL_TOTAL_MS) {
@@ -67208,6 +67240,40 @@ async function forwardDispatchToPeer(args) {
   }
   return { kind: "failure", reason: "dispatch polling exceeded 24h (TIMEOUT)" };
 }
+async function submitRun(f2, base, args) {
+  const body = args.remoteDispatchId ? { dispatchId: args.remoteDispatchId, prompt: args.prompt, ...args.brief ? { brief: args.brief } : {} } : {
+    targetPersona: args.targetPersona,
+    prompt: args.prompt,
+    ...args.brief ? { brief: args.brief } : {},
+    ...args.sessionLabel ? { sessionLabel: args.sessionLabel } : {},
+    ...args.model ? { model: args.model } : {}
+  };
+  let res;
+  try {
+    res = await f2(`${base}/rpc/personaDispatch:run`, {
+      method: "POST",
+      headers: {
+        "content-type": "application/json",
+        authorization: `Bearer ${args.contact.connectToken}`
+      },
+      body: JSON.stringify(body)
+    });
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    return { outcome: { kind: "failure", reason: `forward to peer failed: ${msg}` } };
+  }
+  let json;
+  try {
+    json = await res.json();
+  } catch {
+    return { outcome: { kind: "failure", reason: `peer returned non-JSON response (HTTP ${res.status})` } };
+  }
+  if (json.ok === false) {
+    return { outcome: { kind: "failure", reason: `peer rejected: ${json.error}: ${json.message}` } };
+  }
+  if ("outcome" in json.result) return { outcome: json.result.outcome };
+  return { dispatchId: json.result.dispatchId };
+}
 async function forwardInboxPostToPeer(args) {
   const f2 = args.fetchImpl ?? fetch;
   const base = wsUrlToHttp(args.contact.remoteUrl).replace(/\/+$/, "");
@@ -76060,7 +76126,7 @@ function computeMethodAccess(args) {
 }
 
 // src/version.ts
-var version = "0.2.721".length > 0 ? "0.2.721" : "dev";
+var version = "0.2.722".length > 0 ? "0.2.722" : "dev";
 
 // src/cli-probe/probe.ts
 var fs87 = __toESM(require("fs"), 1);
@@ -79676,6 +79742,19 @@ async function startDaemon(config) {
       issueWebLaunchUrl
     })
   };
+  const forwardToPeer = async ({ targetDeviceId, ...rest }) => {
+    const contact = contactStore.get(targetDeviceId);
+    if (!contact || !contact.remoteUrl || !contact.connectToken) {
+      return {
+        kind: "failure",
+        reason: `unknown or unreachable contact: ${targetDeviceId}`
+      };
+    }
+    return forwardDispatchToPeer({
+      contact: { remoteUrl: contact.remoteUrl, connectToken: contact.connectToken },
+      ...rest
+    });
+  };
   const dispatchHandlers = buildPersonaDispatchHandlers({
     personaDispatchManager,
     store: dispatchStore,
@@ -79687,7 +79766,7 @@ async function startDaemon(config) {
       if (!ch) return void 0;
       return { personas: [...ch.memberPersonas] };
     },
-    sendFollowUp: (workerSessionId, text, meta) => manager.injectIntoSession(workerSessionId, text, meta),
+    sendFollowUp: (workerSessionId, text, meta, sender) => manager.injectIntoSession(workerSessionId, text, meta, sender),
     getSessionPersonaId: (sessionId) => manager.findOwnedSession(sessionId)?.ownerPersonaId,
     logger,
     spawnB: async (args) => {
@@ -79718,26 +79797,13 @@ async function startDaemon(config) {
         ...args.label ? { label: args.label } : {}
       });
     },
-    forwardToPeer: async ({ targetDeviceId, targetPersona, prompt, model }) => {
-      const contact = contactStore.get(targetDeviceId);
-      if (!contact || !contact.remoteUrl || !contact.connectToken) {
-        return {
-          kind: "failure",
-          reason: `unknown or unreachable contact: ${targetDeviceId}`
-        };
-      }
-      return forwardDispatchToPeer({
-        contact: { remoteUrl: contact.remoteUrl, connectToken: contact.connectToken },
-        targetPersona,
-        prompt,
-        ...model ? { model } : {}
-      });
-    },
+    forwardToPeer,
     getPersonaPublic: (personaId2) => personaRegistry.get(personaId2)?.public ?? false,
     getPersonaDefaults: (personaId2) => personaRegistry.get(personaId2),
     getCapabilities: (tool, opts) => manager.getCapabilities(tool, opts)
   });
   Object.assign(handlers, dispatchHandlers);
+  resumePeerDispatches({ personaDispatchManager, store: dispatchStore, forwardToPeer, logger });
   const shiftHandlers = buildShiftInternalHandlers({
     store: shiftStore,
     ownerIdProvider: () => ownerPrincipalId