@adhdev/daemon-standalone 0.9.82-rc.284 → 0.9.82-rc.285

package/dist/index.js

@@ -29983,10 +29983,10 @@ var require_dist3 = __commonJS({
     }
     function getDaemonBuildInfo() {
       if (cached2) return cached2;
-      const commit = readInjected(true ? "746fc68e4c297b988b76207bb8c63ab6062a38e1" : void 0) ?? "unknown";
-      const commitShort = readInjected(true ? "746fc68e" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-      const version2 = readInjected(true ? "0.9.82-rc.284" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-      const builtAt = readInjected(true ? "2026-06-15T13:40:25.431Z" : void 0);
+      const commit = readInjected(true ? "ff6934b27530406c46b2c1835f9f3708f8fa4aba" : void 0) ?? "unknown";
+      const commitShort = readInjected(true ? "ff6934b2" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+      const version2 = readInjected(true ? "0.9.82-rc.285" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+      const builtAt = readInjected(true ? "2026-06-16T00:32:01.678Z" : void 0);
       cached2 = builtAt ? { commit, commitShort, version: version2, builtAt } : { commit, commitShort, version: version2 };
       return cached2;
     }
@@ -38418,6 +38418,14 @@ Next step: ${nextStep}`;
       if (machineId) ids.add(machineId);
       return [...ids];
     }
+    function daemonHostsMesh(mesh, daemonIds) {
+      const host = mesh.meshHost;
+      if (!host) return true;
+      if (host.role && host.role !== "host") return false;
+      const hostDaemonId = readNonEmptyString2(host.hostDaemonId);
+      if (!hostDaemonId) return true;
+      return daemonIds.includes(hostDaemonId);
+    }
     function findLiveCoordinators(components) {
       const out = [];
       for (const inst of components.instanceManager.getByCategory("cli")) {
@@ -38439,16 +38447,6 @@ Next step: ${nextStep}`;
       });
     }
     async function runMeshReconcileTick(components) {
-      const coordinators = findLiveCoordinators(components);
-      if (coordinators.length === 0) {
-        return;
-      }
-      const byMesh = /* @__PURE__ */ new Map();
-      for (const c of coordinators) {
-        const list = byMesh.get(c.meshId);
-        if (list) list.push(c);
-        else byMesh.set(c.meshId, [c]);
-      }
       const localDaemonId = readNonEmptyString2(loadConfig2().machineId) || void 0;
       const drainDaemonIds = resolveCoordinatorDaemonIds(components);
       const dispatchMeshCommand = components.dispatchMeshCommand;
@@ -38459,14 +38457,27 @@ Next step: ${nextStep}`;
           return void 0;
         }
       })();
-      for (const [meshId, meshCoordinators] of byMesh) {
-        if (dispatchMeshCommand) {
+      if (dispatchMeshCommand) {
+        for (const mesh of listMeshes()) {
+          if (!daemonHostsMesh(mesh, drainDaemonIds)) continue;
           try {
-            await pullRemoteNodeQueues(components, meshId, localDaemonId);
+            await pullRemoteNodeQueues(components, mesh, localDaemonId, drainDaemonIds);
           } catch (e) {
-            LOG2.warn("MeshReconcile", `Remote node pull failed for mesh ${meshId}: ${e?.message || e}`);
+            LOG2.warn("MeshReconcile", `Remote node pull failed for mesh ${mesh.id}: ${e?.message || e}`);
           }
         }
+      }
+      const coordinators = findLiveCoordinators(components);
+      if (coordinators.length === 0) {
+        return;
+      }
+      const byMesh = /* @__PURE__ */ new Map();
+      for (const c of coordinators) {
+        const list = byMesh.get(c.meshId);
+        if (list) list.push(c);
+        else byMesh.set(c.meshId, [c]);
+      }
+      for (const [meshId, meshCoordinators] of byMesh) {
         const idleCoordinators = meshCoordinators.filter((c) => c.idle);
         const generatingCoordinators = meshCoordinators.filter((c) => !c.idle);
         const targetCoordinators = idleCoordinators.length > 0 ? idleCoordinators : generatingCoordinators;
@@ -38498,32 +38509,30 @@ Next step: ${nextStep}`;
         }
       }
     }
-    async function pullRemoteNodeQueues(components, meshId, localDaemonId) {
+    async function pullRemoteNodeQueues(components, mesh, localDaemonId, drainDaemonIds) {
       const dispatchMeshCommand = components.dispatchMeshCommand;
       if (!dispatchMeshCommand) return;
-      const mesh = listMeshes().find((m) => m.id === meshId);
-      if (!mesh) return;
-      const pendingEventArgs = {
-        meshId,
-        ...localDaemonId ? { coordinatorDaemonId: localDaemonId } : {}
-      };
+      const meshId = mesh.id;
+      const pulls = drainDaemonIds.length > 0 ? drainDaemonIds.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;
-        let events;
-        try {
-          events = await dispatchMeshCommand(nodeDaemonId, "get_pending_mesh_events", pendingEventArgs);
-        } catch {
-          continue;
-        }
-        const list = extractPendingEvents(events).filter((e) => readNonEmptyString2(e?.meshId) === meshId);
-        for (const event of list) {
-          const payload = buildForwardPayloadFromPending(event);
-          if (!payload.event || !payload.meshId) continue;
+        for (const pendingEventArgs of pulls) {
+          let events;
           try {
-            handleMeshForwardEvent(components, payload);
+            events = await dispatchMeshCommand(nodeDaemonId, "get_pending_mesh_events", pendingEventArgs);
           } catch {
+            break;
+          }
+          const list = extractPendingEvents(events).filter((e) => readNonEmptyString2(e?.meshId) === meshId);
+          for (const event of list) {
+            const payload = buildForwardPayloadFromPending(event);
+            if (!payload.event || !payload.meshId) continue;
+            try {
+              handleMeshForwardEvent(components, payload);
+            } catch {
+            }
           }
         }
       }