@clawos-dev/clawd 0.2.767 → 0.2.769

package/dist/cli.cjs

@@ -50900,6 +50900,12 @@ var SessionManager = class {
       broadcast: [{ frame: { type: "session:info", ...updated }, target: "all" }]
     };
   }
+  /** A mounted cloud worker has no thread id until its turn ends; once the ledger reports it, history becomes readable. No-op if already attached. */
+  attachCloudWorkerThread(sessionId, toolSessionId) {
+    const file = this.findOwnedSession(sessionId);
+    if (!file || !file.cloudConversationId || file.toolSessionId) return null;
+    return this.applyUpdate({ sessionId, patch: { toolSessionId } });
+  }
   bindCloudWorkspace(sessionId, binding, conversationId) {
     const file = this.getFile(sessionId);
     if (!isCloudTool(file.tool) || file.cloudPendingTurns?.length)
@@ -57808,13 +57814,26 @@ function createA2aHost(deps) {
     if (v3.initiator.host === "cloud") return deps.listSessions().find((s2) => s2.cloudConversationId === ref) ?? null;
     return null;
   }
+  function mountCloudChildren(conversationRef) {
+    for (const child of [...cache2.values()]) {
+      if (child.initiator.host === "cloud" && child.initiator.sessionRef === conversationRef) onInitiatorTask(child, 0);
+    }
+  }
   function onInitiatorTask(v3, changeSeq) {
     remember(v3);
     const session = initiatorSession(v3);
     if (!session) return;
-    if (v3.targetDeviceId === null && v3.executorSessionRef && v3.executorThreadId && !v3.workerSessionId && deps.mountCloudWorker) {
-      const mounted = deps.mountCloudWorker(v3, session);
-      if (mounted) cache2.set(v3.taskId, { ...v3, workerSessionId: mounted });
+    if (v3.targetDeviceId === null && v3.executorSessionRef && deps.mountCloudWorker) {
+      let worker = v3.workerSessionId ?? deps.listSessions().find((s2) => s2.cloudConversationId === v3.executorSessionRef)?.sessionId;
+      const ran = v3.state === "working" || v3.state === "input_required" || v3.executorThreadId !== null;
+      if (!worker && ran) {
+        worker = deps.mountCloudWorker(v3, session) ?? void 0;
+        if (worker) {
+          cache2.set(v3.taskId, { ...v3, workerSessionId: worker });
+          mountCloudChildren(v3.executorSessionRef);
+        }
+      }
+      if (worker && v3.executorThreadId) deps.attachCloudWorkerThread?.(worker, v3.executorThreadId);
     }
     if (v3.initiator.host === "cloud") return;
     if (!isDeliverable(v3) || v3.deliveredAt) return;
@@ -57865,6 +57884,7 @@ function createA2aHost(deps) {
     if (ref.kind === "device") return { kind: "local", deviceId: ref.deviceId, personaId: ref.personaId };
     const p3 = deps.persona(ref.personaId);
     if (!p3) throw new ClawdError(ERROR_CODES.INVALID_PARAM, `\u672C\u673A\u6CA1\u6709 persona ${ref.personaId}\uFF1B\u8054\u7CFB\u4EBA\u8BBE\u5907\u4E0A\u7684\u5199\u6210 <personaId>@<deviceId>\uFF0C\u4E91\u4E0A\u7684\u5199\u6210 cloud:<personaId>`);
+    if (p3.cloud?.environment === "integration") throw new ClawdError(ERROR_CODES.INVALID_PARAM, `${ref.personaId} \u662F\u6D4B\u8BD5\u53D1\u5E03\u955C\u50CF\uFF0CA2A \u4E0D\u652F\u6301\uFF1B\u8BF7\u6D3E\u7ED9\u6B63\u5F0F\u73AF\u5883\u7684 persona`);
     return p3.cloud ? { kind: "cloud", personaId: p3.cloud.personaId } : { kind: "local", deviceId: deps.deviceId(), personaId: ref.personaId };
   }
   function checkTopicGate(call) {
@@ -57878,7 +57898,8 @@ function createA2aHost(deps) {
       if (ref.kind === "device") return m3.personaId === ref.personaId && m3.deviceId === ref.deviceId;
       if (m3.deviceId && m3.deviceId !== me2) return false;
       if (m3.personaId === ref.personaId) return true;
-      return ref.kind === "cloud" && deps.persona(m3.personaId)?.cloud?.personaId === ref.personaId;
+      const mirror = deps.persona(m3.personaId)?.cloud;
+      return ref.kind === "cloud" && mirror?.environment !== "integration" && mirror?.personaId === ref.personaId;
     });
     if (!ok2) throw new ClawdError(ERROR_CODES.INVALID_PARAM, `${call.target} is not a member of the channel behind topic ${topicId} \u2014\u2014 \u5148\u628A\u5B83\u52A0\u8FDB\u9891\u9053\u518D\u6D3E\u6D3B`);
   }
@@ -58075,6 +58096,12 @@ function createA2aHost(deps) {
   };
 }
 
+// src/a2a/cloud-mirror.ts
+function pickCloudMirror(personas, cloudPersonaId) {
+  const mirrors = personas.filter((p3) => p3.cloud?.personaId === cloudPersonaId);
+  return mirrors.find((p3) => p3.cloud?.environment !== "integration") ?? mirrors[0];
+}
+
 // src/a2a/handlers.ts
 init_protocol();
 var argsOf = (frame) => {
@@ -76677,7 +76704,7 @@ function computeMethodAccess(args) {
 }
 
 // src/version.ts
-var version = "0.2.767".length > 0 ? "0.2.767" : "dev";
+var version = "0.2.769".length > 0 ? "0.2.769" : "dev";
 
 // src/cli-probe/probe.ts
 var fs87 = __toESM(require("fs"), 1);
@@ -80535,14 +80562,14 @@ async function startDaemon(config) {
     injectResult: (sid, text) => manager.injectIntoSession(sid, text, "a2a-result"),
     // 云 worker 会话挂到发起会话下面：本机要有这个云 persona 的镜像（会话 cwd / 引擎从它来），没有就只留在台账里
     mountCloudWorker: (view, initiator) => {
-      const mirror = personaRegistry.list().find((p3) => p3.cloud?.personaId === view.targetPersonaId);
-      if (!mirror || !view.executorSessionRef || !view.executorThreadId) return null;
+      const mirror = pickCloudMirror(personaRegistry.list(), view.targetPersonaId);
+      if (!mirror || !view.executorSessionRef) return null;
       try {
         const { response, broadcast } = manager.create(
           {
             ownerPersonaId: mirror.personaId,
             label: (view.sessionLabel ?? view.taskText.split("\n")[0]).slice(0, 40),
-            cloudFork: { sessionId: newSessionId(), toolSessionId: view.executorThreadId, cloudConversationId: view.executorSessionRef },
+            cloudFork: { sessionId: newSessionId(), ...view.executorThreadId ? { toolSessionId: view.executorThreadId } : {}, cloudConversationId: view.executorSessionRef },
             a2aWorker: { contextId: view.contextId, sourceSessionId: initiator.sessionId }
           },
           ownerPrincipalId,
@@ -80557,6 +80584,14 @@ async function startDaemon(config) {
         return null;
       }
     },
+    attachCloudWorkerThread: (sessionId, threadId) => {
+      try {
+        const attached = manager.attachCloudWorkerThread(sessionId, threadId);
+        for (const b3 of attached?.broadcast ?? []) broadcastManagerFrame(b3.frame, b3.target);
+      } catch (err) {
+        logger.warn("a2a.attach-cloud-worker-thread-failed", { sessionId, error: err instanceof Error ? err.message : String(err) });
+      }
+    },
     every: (ms, fn) => {
       const timer = setInterval(fn, ms);
       timer.unref();