@adhdev/daemon-standalone 1.0.58-rc.44 → 1.0.58-rc.45

package/dist/index.js

@@ -36911,10 +36911,10 @@ var require_dist3 = __commonJS({
     }
     function getDaemonBuildInfo() {
       if (cached2) return cached2;
-      const commit = readInjected(true ? "2c9a4f385d00c90bde2c4b0ae4b682cd9e5120a6" : void 0) ?? "unknown";
-      const commitShort = readInjected(true ? "2c9a4f38" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-      const version2 = readInjected(true ? "1.0.58-rc.44" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-      const builtAt = readInjected(true ? "2026-08-29T18:43:13.498Z" : void 0);
+      const commit = readInjected(true ? "f678a3c56c08e7876a714abda968b9e6a8787841" : void 0) ?? "unknown";
+      const commitShort = readInjected(true ? "f678a3c5" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+      const version2 = readInjected(true ? "1.0.58-rc.45" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+      const builtAt = readInjected(true ? "2026-08-30T01:11:37.487Z" : void 0);
       cached2 = builtAt ? { commit, commitShort, version: version2, builtAt } : { commit, commitShort, version: version2 };
       return cached2;
     }
@@ -51080,7 +51080,8 @@ ${lines.join("\n")}
       });
       if (!stamp2) return event;
       const dispatchedBySelfFallback = selfFallback && stamp2.scope === "broadcast";
-      const selfFallbackTarget = dispatchedBySelfFallback && !readNonEmptyString(event.targetCoordinatorDaemonId) && !readNonEmptyString(event.targetCoordinatorSessionId) ? readNonEmptyString(stamp2.dispatchedBy.daemonId) : void 0;
+      const isWorktreeBootstrapEvent = event.event === "worktree_bootstrap_complete" || event.event === "worktree_bootstrap_failed";
+      const selfFallbackTarget = dispatchedBySelfFallback && !isWorktreeBootstrapEvent && !readNonEmptyString(event.targetCoordinatorDaemonId) && !readNonEmptyString(event.targetCoordinatorSessionId) ? readNonEmptyString(stamp2.dispatchedBy.daemonId) : void 0;
       return {
         ...event,
         protocolVersion: stamp2.protocolVersion,
@@ -86254,11 +86255,17 @@ ${cleanBody}`;
         if (bootstrapNodeId) {
           try {
             const bootstrapWorkspace = readNonEmptyString(args.metadataEvent.worktreePath) || readNonEmptyString(args.metadataEvent.workspace);
+            const originDaemonId = readNonEmptyString(args.metadataEvent.originDaemonId) || readNonEmptyString(args.metadataEvent.daemonId);
+            const originMachineId = readNonEmptyString(args.metadataEvent.originMachineId) || readNonEmptyString(args.metadataEvent.machineId);
             components.router.markWorktreeBootstrapTerminalState(
               args.meshId,
               bootstrapNodeId,
               args.event === "worktree_bootstrap_failed" ? "failed" : "complete",
-              bootstrapWorkspace ? { workspace: bootstrapWorkspace } : void 0
+              bootstrapWorkspace || originDaemonId || originMachineId ? {
+                ...bootstrapWorkspace ? { workspace: bootstrapWorkspace } : {},
+                ...originDaemonId ? { daemonId: originDaemonId } : {},
+                ...originMachineId ? { machineId: originMachineId } : {}
+              } : void 0
             );
           } catch (e) {
             LOG2.error("MeshQueue", `Failed to stamp terminal bootstrap state for ${bootstrapNodeId} (mesh ${args.meshId}): ${e?.message || e}`);
@@ -86587,6 +86594,10 @@ ${cleanBody}`;
         interactionId: readNonEmptyString(payload.interactionId),
         status: readNonEmptyString(payload.status),
         targetDaemonId: readNonEmptyString(payload.targetDaemonId),
+        // Worker origin identity for a remotely cloned worktree's bootstrap event
+        // so the coordinator's hydrate-on-miss upsert is P2P-addressable.
+        originDaemonId: readNonEmptyString(payload.originDaemonId) || readNonEmptyString(payload.daemonId) || readNonEmptyString(payload.metadataEvent?.originDaemonId),
+        originMachineId: readNonEmptyString(payload.originMachineId) || readNonEmptyString(payload.machineId) || readNonEmptyString(payload.metadataEvent?.originMachineId),
         startedAt: readNonEmptyString(payload.startedAt),
         completedAt: readNonEmptyString(payload.completedAt),
         retryOfJobId: readNonEmptyString(payload.retryOfJobId),
@@ -87140,10 +87151,24 @@ ${cleanBody}`;
       return [];
     }
     function extractPendingEvents(raw) {
-      if (Array.isArray(raw)) return raw;
-      if (raw && typeof raw === "object") {
-        const events = raw.events;
-        if (Array.isArray(events)) return events;
+      let cursor = raw;
+      for (let depth = 0; depth < 4 && cursor && typeof cursor === "object"; depth++) {
+        if (Array.isArray(cursor)) return cursor;
+        const record2 = cursor;
+        if (Array.isArray(record2.events)) return record2.events;
+        if (record2.payload && typeof record2.payload === "object") {
+          cursor = record2.payload;
+          continue;
+        }
+        if (record2.result && typeof record2.result === "object") {
+          cursor = record2.result;
+          continue;
+        }
+        if (record2.data && typeof record2.data === "object") {
+          cursor = record2.data;
+          continue;
+        }
+        break;
       }
       return [];
     }
@@ -137601,6 +137626,7 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
             try {
               const durationMs = Date.now() - startedAtMs;
               const event = `worktree_${eventStatus2}`;
+              const hostDaemonId = readNonEmptyString(mesh?.meshHost?.hostDaemonId);
               const metadataEvent = {
                 source: "clone_mesh_node_bootstrap",
                 nodeId: node.id,
@@ -137608,6 +137634,9 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
                 worktreePath: result.worktreePath,
                 durationMs,
                 bootstrapStatus: bootstrapState2.status,
+                ...hostDaemonId ? { targetCoordinatorDaemonId: hostDaemonId } : {},
+                ...effectiveDaemonId ? { originDaemonId: effectiveDaemonId } : {},
+                ...effectiveMachineId ? { originMachineId: effectiveMachineId } : {},
                 ...bootstrapState2.error ? { error: bootstrapState2.error } : {},
                 ...bootstrapState2.exitCode !== void 0 ? { exitCode: bootstrapState2.exitCode } : {},
                 ...extraPayload || {}
@@ -137622,7 +137651,16 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
                         getCachedInlineMesh: ctx.getCachedInlineMesh
                       }
                     },
-                    { event, meshId, nodeId: node.id, workspace: result.worktreePath, metadataEvent }
+                    {
+                      event,
+                      meshId,
+                      nodeId: node.id,
+                      workspace: result.worktreePath,
+                      metadataEvent,
+                      ...hostDaemonId ? { targetCoordinatorDaemonId: hostDaemonId } : {},
+                      ...effectiveDaemonId ? { originDaemonId: effectiveDaemonId } : {},
+                      ...effectiveMachineId ? { originMachineId: effectiveMachineId } : {}
+                    }
                   );
                   if (forwarded?.success === true) return;
                 } catch {
@@ -137635,7 +137673,8 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
                 nodeId: node.id,
                 workspace: result.worktreePath,
                 metadataEvent,
-                queuedAt: Date.now()
+                queuedAt: Date.now(),
+                ...hostDaemonId ? { targetCoordinatorDaemonId: hostDaemonId } : {}
               });
             } catch {
             }
@@ -141904,6 +141943,11 @@ ${ptyResult.output.slice(-2e3)}`);
               nodeId,
               isLocalWorktree: true,
               ...opts?.workspace ? { workspace: opts.workspace } : {},
+              // Origin identity from the worker's bootstrap event: without
+              // these, isLocalAutoLaunchNode treats the shell as LOCAL and the
+              // coordinator tries to spawn the remote worktree on itself.
+              ...opts?.daemonId ? { daemonId: opts.daemonId } : {},
+              ...opts?.machineId ? { machineId: opts.machineId } : {},
               worktreeBootstrap: terminalBootstrap()
             };
             this.updateInlineMeshNode(meshId, shell, hydratedNode);