@adhdev/daemon-standalone 0.9.82-rc.367 → 0.9.82-rc.368

package/dist/index.js

@@ -30036,10 +30036,10 @@ var require_dist3 = __commonJS({
     }
     function getDaemonBuildInfo() {
       if (cached2) return cached2;
-      const commit = readInjected(true ? "bb7e66dbc483232a27d1de42cf8ecba3eb0a818c" : void 0) ?? "unknown";
-      const commitShort = readInjected(true ? "bb7e66db" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-      const version2 = readInjected(true ? "0.9.82-rc.367" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-      const builtAt = readInjected(true ? "2026-06-24T04:45:42.045Z" : void 0);
+      const commit = readInjected(true ? "8cb6cfc5399f55c6b625095bacc9a27e1741df17" : void 0) ?? "unknown";
+      const commitShort = readInjected(true ? "8cb6cfc5" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+      const version2 = readInjected(true ? "0.9.82-rc.368" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+      const builtAt = readInjected(true ? "2026-06-24T06:15:00.243Z" : void 0);
       cached2 = builtAt ? { commit, commitShort, version: version2, builtAt } : { commit, commitShort, version: version2 };
       return cached2;
     }
@@ -42656,13 +42656,25 @@ ${cleanBody}`;
       const mesh = getMeshWithCache(components, meshId);
       const node = mesh?.nodes.find((n) => readMeshNodeId(n) === nodeId);
       const localClaimAdapter = components.cliManager?.adapters?.get(sessionId);
-      if (localClaimAdapter) {
-        const sessionWorkspace = normalizeMeshWorkspaceForCompare(localClaimAdapter.workingDir);
-        const nodeWorkspace = normalizeMeshWorkspaceForCompare(readNonEmptyString2(node?.workspace));
-        if (sessionWorkspace && nodeWorkspace && sessionWorkspace !== nodeWorkspace) {
-          LOG2.info("MeshQueue", `WTCLAIM: refusing claim for node ${nodeId} (${sessionId}) \u2014 session workspace "${sessionWorkspace}" \u2260 node workspace "${nodeWorkspace}" (cross-workspace dispatch blocked)`);
+      let claimInstanceWorkspace = "";
+      let claimStampedNodeId = "";
+      try {
+        const claimState = components.instanceManager?.getInstance?.(sessionId)?.getState?.();
+        claimInstanceWorkspace = readNonEmptyString2(claimState?.workspace);
+        const claimSettings = claimState?.settings || {};
+        claimStampedNodeId = readNonEmptyString2(claimSettings.meshNodeId);
+      } catch {
+      }
+      const nodeWorkspaceRaw = readNonEmptyString2(node?.workspace);
+      const sessionWorkspaceRaw = readNonEmptyString2(localClaimAdapter?.workingDir) || claimInstanceWorkspace;
+      if (claimStampedNodeId && nodeId) {
+        if (!meshNodeIdMatches({ id: claimStampedNodeId }, nodeId)) {
+          LOG2.info("MeshQueue", `WTDISPATCH: refusing claim for node ${nodeId} (${sessionId}) \u2014 session is bound to node "${claimStampedNodeId}" (cross-node claim blocked)`);
           return false;
         }
+      } else if (sessionWorkspaceRaw && nodeWorkspaceRaw && !meshWorkspacesEquivalent(sessionWorkspaceRaw, nodeWorkspaceRaw)) {
+        LOG2.info("MeshQueue", `WTCLAIM: refusing claim for node ${nodeId} (${sessionId}) \u2014 session workspace "${normalizeMeshWorkspaceForCompare(sessionWorkspaceRaw)}" \u2260 node workspace "${normalizeMeshWorkspaceForCompare(nodeWorkspaceRaw)}" (cross-workspace dispatch blocked)`);
+        return false;
       }
       const capabilityTags = buildMeshNodeCapabilityTags(node, providerType);
       const providerMaxParallel = resolveProviderMaxParallel(node?.policy, providerType);
@@ -43940,6 +43952,25 @@ ${cleanBody}`;
         metadataEvent: buildRelayMetadataEvent(payload)
       });
     }
+    function enqueueCoordinatorForwardPush(coordinatorDaemonId, run) {
+      let lane = coordinatorForwardLanes.get(coordinatorDaemonId);
+      if (!lane) {
+        lane = { tail: Promise.resolve(), depth: 0 };
+        coordinatorForwardLanes.set(coordinatorDaemonId, lane);
+      }
+      const wasIdle = lane.depth === 0;
+      lane.depth += 1;
+      const dec = () => {
+        lane.depth -= 1;
+      };
+      if (wasIdle) {
+        lane.tail = Promise.resolve(run()).catch(() => {
+        }).then(dec, dec);
+      } else {
+        lane.tail = lane.tail.then(() => run()).catch(() => {
+        }).then(dec, dec);
+      }
+    }
     function forwardUnresolvedDelegateEvent(components, routing, event) {
       const coordinatorDaemonId = readNonEmptyString2(routing.coordinatorDaemonId);
       if (!coordinatorDaemonId) return false;
@@ -43971,7 +44002,8 @@ ${cleanBody}`;
       };
       traceMeshEventStage("outbox_enqueue", fwdTraceCtx, `coordinatorDaemon=${coordinatorDaemonId} meshId=absent`);
       traceMeshEventStage("forward_send", fwdTraceCtx, "immediate push");
-      Promise.resolve(components.dispatchMeshCommand(coordinatorDaemonId, "mesh_forward_event", payload)).then((result) => {
+      const dispatchMeshCommand = components.dispatchMeshCommand;
+      enqueueCoordinatorForwardPush(coordinatorDaemonId, () => Promise.resolve(dispatchMeshCommand(coordinatorDaemonId, "mesh_forward_event", payload)).then((result) => {
         if (result && result.success === false) {
           LOG2.warn("MeshEvents", `Immediate forward of ${eventName} to coordinator ${coordinatorDaemonId} rejected (${readNonEmptyString2(result.error) || "no reason"}) \u2014 left queued for retry`);
           traceMeshEventDrop("immediate_forward_rejected", fwdTraceCtx, readNonEmptyString2(result.error) || "no reason");
@@ -43980,7 +44012,7 @@ ${cleanBody}`;
         if (persisted) ackUnresolvedDelegateForwardByFingerprint(coordinatorDaemonId, eventName, payload);
       }).catch((e) => {
         LOG2.warn("MeshEvents", `Immediate forward of ${eventName} to coordinator ${coordinatorDaemonId} failed: ${e?.message || e} \u2014 left queued for retry`);
-      });
+      }));
       LOG2.info("MeshEvents", `Durably forwarded ${eventName} for unresolved-mesh worker at ${routing.workspace || "(no workspace)"} to coordinator daemon ${coordinatorDaemonId}`);
       return true;
     }
@@ -44081,6 +44113,7 @@ ${cleanBody}`;
     var MESH_COORDINATOR_EVENTS;
     var EVENT_TO_LEDGER_KIND;
     var MESH_FORCE_INJECT_EVENTS;
+    var coordinatorForwardLanes;
     var init_mesh_events_coordinator = __esm2({
       "src/mesh/mesh-events-coordinator.ts"() {
         "use strict";
@@ -44145,6 +44178,7 @@ ${cleanBody}`;
           "worktree_bootstrap_complete",
           "worktree_bootstrap_failed"
         ]);
+        coordinatorForwardLanes = /* @__PURE__ */ new Map();
       }
     });
     function resolveAutoPruneMinAgeMs() {
@@ -71144,6 +71178,18 @@ ${rawInput}` : rawInput;
           throw new Error(`Failed to start ${provider.displayName || provider.name || cliType}: ${spawnErr?.message}`);
         }
         this.adapters.set(key, cliInstance.getAdapter());
+        const launchMeshNodeId = typeof settings?.meshNodeId === "string" ? settings.meshNodeId.trim() : "";
+        const launchMeshNodeFor = typeof settings?.meshNodeFor === "string" ? settings.meshNodeFor.trim() : "";
+        if (launchMeshNodeId || launchMeshNodeFor) {
+          try {
+            cliInstance.getAdapter().updateRuntimeMeta?.({
+              ...launchMeshNodeId ? { meshNodeId: launchMeshNodeId } : {},
+              ...launchMeshNodeFor ? { meshNodeFor: launchMeshNodeFor } : {},
+              ...settings?.launchedByCoordinator === true ? { launchedByCoordinator: true } : {}
+            });
+          } catch {
+          }
+        }
         this.startCliExitMonitor(key, cliType);
       }
       // ─── Session start/management ──────────────────────────────