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

package/dist/index.js

@@ -316,10 +316,10 @@ function readInjected(value) {
 }
 function getDaemonBuildInfo() {
   if (cached) return cached;
-  const commit = readInjected(true ? "bb7e66dbc483232a27d1de42cf8ecba3eb0a818c" : void 0) ?? "unknown";
-  const commitShort = readInjected(true ? "bb7e66db" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-  const version = 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:13.384Z" : 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 version = 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:14:32.255Z" : void 0);
   cached = builtAt ? { commit, commitShort, version, builtAt } : { commit, commitShort, version };
   return cached;
 }
@@ -12870,13 +12870,25 @@ function tryAssignQueueTask(components, meshId, nodeId, sessionId, providerType)
   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) {
-      LOG.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)) {
+      LOG.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)) {
+    LOG.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);
@@ -14154,6 +14166,25 @@ function handleMeshForwardEvent(components, payload) {
     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;
@@ -14185,7 +14216,8 @@ function forwardUnresolvedDelegateEvent(components, routing, event) {
   };
   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) {
       LOG.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");
@@ -14194,7 +14226,7 @@ function forwardUnresolvedDelegateEvent(components, routing, event) {
     if (persisted) ackUnresolvedDelegateForwardByFingerprint(coordinatorDaemonId, eventName, payload);
   }).catch((e) => {
     LOG.warn("MeshEvents", `Immediate forward of ${eventName} to coordinator ${coordinatorDaemonId} failed: ${e?.message || e} \u2014 left queued for retry`);
-  });
+  }));
   LOG.info("MeshEvents", `Durably forwarded ${eventName} for unresolved-mesh worker at ${routing.workspace || "(no workspace)"} to coordinator daemon ${coordinatorDaemonId}`);
   return true;
 }
@@ -14277,7 +14309,7 @@ function setupMeshEventForwarding(components) {
     });
   });
 }
-var import_fs13, REMOTE_IDLE_SESSION_TTL_MS, meshByWorkspaceCache, MESH_WORKSPACE_CACHE_TTL_MS, IDLE_AUTO_FAST_FORWARD_THROTTLE_MS, idleAutoFastForwardLastAttempt, INTENTIONAL_CLEANUP_STOP_SUPPRESSION_MS, RECENT_COMPLETION_FINGERPRINT_TTL_MS, DISPATCH_CONFIRM_TIMEOUT_MS, autoLaunchInProgress, autoLaunchCooldownUntil, AUTO_LAUNCH_COOLDOWN_MS, AUTO_LAUNCH_AWAIT_CLAIM_MS, lastAutoLaunchLedgerKey, AUTO_LAUNCH_LEDGER_DEDUP_MAX, MESH_COORDINATOR_EVENTS, EVENT_TO_LEDGER_KIND, MESH_FORCE_INJECT_EVENTS;
+var import_fs13, REMOTE_IDLE_SESSION_TTL_MS, meshByWorkspaceCache, MESH_WORKSPACE_CACHE_TTL_MS, IDLE_AUTO_FAST_FORWARD_THROTTLE_MS, idleAutoFastForwardLastAttempt, INTENTIONAL_CLEANUP_STOP_SUPPRESSION_MS, RECENT_COMPLETION_FINGERPRINT_TTL_MS, DISPATCH_CONFIRM_TIMEOUT_MS, autoLaunchInProgress, autoLaunchCooldownUntil, AUTO_LAUNCH_COOLDOWN_MS, AUTO_LAUNCH_AWAIT_CLAIM_MS, lastAutoLaunchLedgerKey, AUTO_LAUNCH_LEDGER_DEDUP_MAX, MESH_COORDINATOR_EVENTS, EVENT_TO_LEDGER_KIND, MESH_FORCE_INJECT_EVENTS, coordinatorForwardLanes;
 var init_mesh_events_coordinator = __esm({
   "src/mesh/mesh-events-coordinator.ts"() {
     "use strict";
@@ -14342,6 +14374,7 @@ var init_mesh_events_coordinator = __esm({
       "worktree_bootstrap_complete",
       "worktree_bootstrap_failed"
     ]);
+    coordinatorForwardLanes = /* @__PURE__ */ new Map();
   }
 });
 
@@ -41537,6 +41570,18 @@ var DaemonCliManager = class {
       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 ──────────────────────────────