@adhdev/daemon-core 0.9.82-rc.286 → 0.9.82-rc.287

package/dist/index.js

@@ -275,10 +275,10 @@ function readInjected(value) {
 }
 function getDaemonBuildInfo() {
   if (cached) return cached;
-  const commit = readInjected(true ? "ff6934b27530406c46b2c1835f9f3708f8fa4aba" : void 0) ?? "unknown";
-  const commitShort = readInjected(true ? "ff6934b2" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-  const version = readInjected(true ? "0.9.82-rc.286" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-  const builtAt = readInjected(true ? "2026-06-16T00:50:00.386Z" : void 0);
+  const commit = readInjected(true ? "542b47e003c32fc24f6325d1fd48a6b3ed745edd" : void 0) ?? "unknown";
+  const commitShort = readInjected(true ? "542b47e0" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+  const version = readInjected(true ? "0.9.82-rc.287" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+  const builtAt = readInjected(true ? "2026-06-16T02:16:32.113Z" : void 0);
   cached = builtAt ? { commit, commitShort, version, builtAt } : { commit, commitShort, version };
   return cached;
 }
@@ -8655,6 +8655,20 @@ function daemonHostsMesh(mesh, daemonIds) {
   if (!hostDaemonId) return true;
   return daemonIds.includes(hostDaemonId);
 }
+function resolveCoordinatorSelfIds(mesh, drainDaemonIds) {
+  const ids = new Set(drainDaemonIds);
+  for (const node of mesh.nodes) {
+    const nodeDaemonId = readNonEmptyString2(node.daemonId);
+    const nodeMachineId = readNonEmptyString2(node.machineId);
+    const isSelf = nodeDaemonId && drainDaemonIds.includes(nodeDaemonId) || nodeMachineId && drainDaemonIds.includes(nodeMachineId);
+    if (!isSelf) continue;
+    if (nodeDaemonId) ids.add(nodeDaemonId);
+    if (nodeMachineId) ids.add(nodeMachineId);
+  }
+  const hostDaemonId = readNonEmptyString2(mesh.meshHost?.hostDaemonId);
+  if (hostDaemonId && ids.has(hostDaemonId)) ids.add(hostDaemonId);
+  return [...ids];
+}
 function findLiveCoordinators(components) {
   const out = [];
   for (const inst of components.instanceManager.getByCategory("cli")) {
@@ -8688,9 +8702,10 @@ async function runMeshReconcileTick(components) {
   })();
   if (dispatchMeshCommand) {
     for (const mesh of listMeshes()) {
-      if (!daemonHostsMesh(mesh, drainDaemonIds)) continue;
+      const selfIds = resolveCoordinatorSelfIds(mesh, drainDaemonIds);
+      if (!daemonHostsMesh(mesh, selfIds)) continue;
       try {
-        await pullRemoteNodeQueues(components, mesh, localDaemonId, drainDaemonIds);
+        await pullRemoteNodeQueues(components, mesh, localDaemonId, selfIds);
       } catch (e) {
         LOG.warn("MeshReconcile", `Remote node pull failed for mesh ${mesh.id}: ${e?.message || e}`);
       }
@@ -8738,15 +8753,16 @@ async function runMeshReconcileTick(components) {
     }
   }
 }
-async function pullRemoteNodeQueues(components, mesh, localDaemonId, drainDaemonIds) {
+async function pullRemoteNodeQueues(components, mesh, localDaemonId, candidateDaemonIds) {
   const dispatchMeshCommand = components.dispatchMeshCommand;
   if (!dispatchMeshCommand) return;
   const meshId = mesh.id;
-  const pulls = drainDaemonIds.length > 0 ? drainDaemonIds.map((id) => ({ meshId, coordinatorDaemonId: id })) : [{ meshId }];
+  const pulls = candidateDaemonIds.length > 0 ? candidateDaemonIds.map((id) => ({ meshId, coordinatorDaemonId: id })) : [{ meshId }];
   for (const node of mesh.nodes) {
     const nodeDaemonId = readNonEmptyString2(node.daemonId);
     if (!nodeDaemonId) continue;
     if (localDaemonId && nodeDaemonId === localDaemonId) continue;
+    if (candidateDaemonIds.includes(nodeDaemonId)) continue;
     for (const pendingEventArgs of pulls) {
       let events;
       try {