@adhdev/daemon-standalone 0.9.82-rc.274 → 0.9.82-rc.276

package/dist/index.js

@@ -29983,10 +29983,10 @@ var require_dist3 = __commonJS({
     }
     function getDaemonBuildInfo() {
       if (cached2) return cached2;
-      const commit = readInjected(true ? "89d1ac61612c1dfe7fac53be61ec5dbfa67d00b2" : void 0) ?? "unknown";
-      const commitShort = readInjected(true ? "89d1ac61" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-      const version2 = readInjected(true ? "0.9.82-rc.274" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-      const builtAt = readInjected(true ? "2026-06-15T07:05:20.920Z" : void 0);
+      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.276" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+      const builtAt = readInjected(true ? "2026-06-15T09:29:38.830Z" : void 0);
       cached2 = builtAt ? { commit, commitShort, version: version2, builtAt } : { commit, commitShort, version: version2 };
       return cached2;
     }
@@ -34007,12 +34007,34 @@ Valid status values: \`completed\` | \`failed\` | \`blocked\` | \`partial\`.`;
             this.maybeCheckpointWal();
             return result.changes > 0;
           }
-          drainPendingEvents(meshId, coordinatorDaemonId) {
+          /**
+           * Drain undrained pending events for a mesh, atomically marking them drained.
+           * When `opts.onlyEvents` is supplied, ONLY rows whose `event` is in that set are
+           * drained — the rest stay queued (drained=0) for a later drain. This is how the
+           * reconcile loop force-drains terminal/force-inject events into a *generating*
+           * coordinator while leaving non-force progress events for the coordinator's next
+           * idle transition. Filtering happens inside the same transaction as the
+           * drained=1 marking, so force-drain + a concurrent full drain can never both
+           * consume the same row.
+           */
+          drainPendingEvents(meshId, coordinatorDaemonId, opts) {
             return this.transaction(() => {
-              const whereClause = coordinatorDaemonId ? `WHERE mesh_id = ? AND drained = 0 AND (coordinator_daemon_id IS NULL OR coordinator_daemon_id = ?)` : `WHERE mesh_id = ? AND drained = 0`;
-              const params = coordinatorDaemonId ? [meshId, coordinatorDaemonId] : [meshId];
+              const onlyEvents = opts?.onlyEvents;
+              if (onlyEvents && onlyEvents.size === 0) return [];
+              const eventList = onlyEvents ? [...onlyEvents] : [];
+              const daemonIds = (Array.isArray(coordinatorDaemonId) ? coordinatorDaemonId : coordinatorDaemonId ? [coordinatorDaemonId] : []).filter((id) => typeof id === "string" && id.length > 0);
+              const clauses = ["mesh_id = ?", "drained = 0"];
+              const params = [meshId];
+              if (daemonIds.length > 0) {
+                clauses.push(`(coordinator_daemon_id IS NULL OR coordinator_daemon_id IN (${daemonIds.map(() => "?").join(",")}))`);
+                params.push(...daemonIds);
+              }
+              if (eventList.length > 0) {
+                clauses.push(`event IN (${eventList.map(() => "?").join(",")})`);
+                params.push(...eventList);
+              }
               const rows = this.db.prepare(
-                `SELECT id, event, payload FROM mesh_pending_events ${whereClause} ORDER BY queued_at ASC LIMIT 100`
+                `SELECT id, event, payload FROM mesh_pending_events WHERE ${clauses.join(" AND ")} ORDER BY queued_at ASC LIMIT 100`
               ).all(...params);
               if (rows.length === 0) return [];
               const ids = rows.map((r) => r.id);
@@ -34035,8 +34057,9 @@ Valid status values: \`completed\` | \`failed\` | \`blocked\` | \`partial\`.`;
           }
           /** Non-destructive peek — returns undrained events without marking them drained. */
           peekPendingEvents(meshId, coordinatorDaemonId) {
-            const whereClause = coordinatorDaemonId ? `WHERE mesh_id = ? AND drained = 0 AND (coordinator_daemon_id IS NULL OR coordinator_daemon_id = ?)` : `WHERE mesh_id = ? AND drained = 0`;
-            const params = coordinatorDaemonId ? [meshId, coordinatorDaemonId] : [meshId];
+            const daemonIds = (Array.isArray(coordinatorDaemonId) ? coordinatorDaemonId : coordinatorDaemonId ? [coordinatorDaemonId] : []).filter((id) => typeof id === "string" && id.length > 0);
+            const whereClause = daemonIds.length > 0 ? `WHERE mesh_id = ? AND drained = 0 AND (coordinator_daemon_id IS NULL OR coordinator_daemon_id IN (${daemonIds.map(() => "?").join(",")}))` : `WHERE mesh_id = ? AND drained = 0`;
+            const params = daemonIds.length > 0 ? [meshId, ...daemonIds] : [meshId];
             const rows = this.db.prepare(
               `SELECT id, event, payload FROM mesh_pending_events ${whereClause} ORDER BY queued_at ASC LIMIT 100`
             ).all(...params);
@@ -36090,6 +36113,19 @@ Next step: ${nextStep}`;
         "use strict";
       }
     });
+    function normalizeCoordinatorDaemonIds(coordinatorDaemonId) {
+      const raw = Array.isArray(coordinatorDaemonId) ? coordinatorDaemonId : coordinatorDaemonId != null ? [coordinatorDaemonId] : [];
+      const seen = /* @__PURE__ */ new Set();
+      const out = [];
+      for (const id of raw) {
+        if (typeof id !== "string") continue;
+        const trimmed = id.trim();
+        if (!trimmed || seen.has(trimmed)) continue;
+        seen.add(trimmed);
+        out.push(trimmed);
+      }
+      return out;
+    }
     function readRefineJobId2(event) {
       const metadata = readRecord3(event.metadataEvent) || event;
       const result = readRecord3(metadata.result);
@@ -36144,7 +36180,9 @@ Next step: ${nextStep}`;
     }
     function readPendingMeshCoordinatorEventsFromDisk(meshId, coordinatorDaemonId) {
       if (!meshId) return [];
-      const paths = coordinatorDaemonId ? [getPendingEventsPath(meshId, coordinatorDaemonId), getPendingEventsPath(meshId)] : [getPendingEventsPath(meshId)];
+      const daemonIds = normalizeCoordinatorDaemonIds(coordinatorDaemonId);
+      const primaryDaemonId = daemonIds[0];
+      const paths = primaryDaemonId ? [getPendingEventsPath(meshId, primaryDaemonId), getPendingEventsPath(meshId)] : [getPendingEventsPath(meshId)];
       const events = [];
       for (const path39 of paths) {
         if (!(0, import_fs8.existsSync)(path39)) continue;
@@ -36157,7 +36195,7 @@ Next step: ${nextStep}`;
               return [];
             }
           });
-          const filtered = coordinatorDaemonId && path39 === getPendingEventsPath(meshId) ? parsed.filter((e) => !e.targetCoordinatorDaemonId || e.targetCoordinatorDaemonId === coordinatorDaemonId) : parsed;
+          const filtered = primaryDaemonId && path39 === getPendingEventsPath(meshId) ? parsed.filter((e) => !e.targetCoordinatorDaemonId || daemonIds.includes(e.targetCoordinatorDaemonId)) : parsed;
           events.push(...filtered);
         } catch {
         }
@@ -36286,8 +36324,59 @@ Next step: ${nextStep}`;
         return null;
       }
     }
-    function drainPendingMeshCoordinatorEvents(meshId, coordinatorDaemonId) {
+    function selectiveDrainFile(path39, predicate) {
+      const tmpPath = `${path39}.draining`;
+      try {
+        (0, import_fs8.renameSync)(path39, tmpPath);
+      } catch {
+        return [];
+      }
+      let content;
+      try {
+        content = (0, import_fs8.readFileSync)(tmpPath, "utf-8");
+      } catch {
+        try {
+          (0, import_fs8.unlinkSync)(tmpPath);
+        } catch {
+        }
+        return [];
+      }
+      const consumed = [];
+      const keptLines = [];
+      for (const line of content.split("\n")) {
+        if (!line) continue;
+        let parsed;
+        try {
+          parsed = JSON.parse(line);
+        } catch {
+          parsed = void 0;
+        }
+        if (parsed && predicate(parsed)) {
+          consumed.push(parsed);
+        } else {
+          keptLines.push(line);
+        }
+      }
+      try {
+        if (keptLines.length > 0) {
+          (0, import_fs8.writeFileSync)(path39, keptLines.join("\n") + "\n", "utf-8");
+        }
+        (0, import_fs8.unlinkSync)(tmpPath);
+      } catch {
+        try {
+          if ((0, import_fs8.existsSync)(tmpPath) && !(0, import_fs8.existsSync)(path39)) (0, import_fs8.renameSync)(tmpPath, path39);
+        } catch {
+        }
+        return [];
+      }
+      return consumed;
+    }
+    function drainPendingMeshCoordinatorEvents(meshId, coordinatorDaemonId, opts) {
       if (!meshId) return [];
+      const daemonIds = normalizeCoordinatorDaemonIds(coordinatorDaemonId);
+      const primaryDaemonId = daemonIds[0];
+      const onlyEvents = opts?.onlyEvents;
+      const matchesFilter = (eventName) => !onlyEvents || onlyEvents.has(eventName);
       const merged = [];
       const seenFingerprints = /* @__PURE__ */ new Set();
       const pushUnique = (event) => {
@@ -36301,15 +36390,23 @@ Next step: ${nextStep}`;
       try {
         const store = MeshRuntimeStore.getInstance();
         if (store.pendingEventCount(meshId) > 0) {
-          for (const row of store.drainPendingEvents(meshId, coordinatorDaemonId)) {
+          for (const row of store.drainPendingEvents(meshId, daemonIds.length > 0 ? daemonIds : void 0, onlyEvents ? { onlyEvents } : void 0)) {
             const event = row.payload;
             if (event) pushUnique(event);
           }
         }
       } catch {
       }
-      const paths = coordinatorDaemonId ? [getPendingEventsPath(meshId, coordinatorDaemonId), getPendingEventsPath(meshId)] : [getPendingEventsPath(meshId)];
+      const paths = primaryDaemonId ? [getPendingEventsPath(meshId, primaryDaemonId), getPendingEventsPath(meshId)] : [getPendingEventsPath(meshId)];
       for (const path39 of paths) {
+        const isSharedFile = !!primaryDaemonId && path39 === getPendingEventsPath(meshId);
+        const targets = (e) => !isSharedFile || !e.targetCoordinatorDaemonId || daemonIds.includes(e.targetCoordinatorDaemonId);
+        if (onlyEvents) {
+          for (const event of selectiveDrainFile(path39, (e) => targets(e) && matchesFilter(e.event))) {
+            pushUnique(event);
+          }
+          continue;
+        }
         const content = atomicDrainFile(path39);
         if (!content) continue;
         const parsed = content.split("\n").filter(Boolean).flatMap((line) => {
@@ -36319,7 +36416,7 @@ Next step: ${nextStep}`;
             return [];
           }
         });
-        const filtered = coordinatorDaemonId && path39 === getPendingEventsPath(meshId) ? parsed.filter((e) => !e.targetCoordinatorDaemonId || e.targetCoordinatorDaemonId === coordinatorDaemonId) : parsed;
+        const filtered = isSharedFile ? parsed.filter(targets) : parsed;
         for (const event of filtered) pushUnique(event);
       }
       if (merged.length === 0) return [];
@@ -36327,6 +36424,7 @@ Next step: ${nextStep}`;
     }
     function getPendingMeshCoordinatorEvents(meshId, coordinatorDaemonId) {
       if (!meshId) return [];
+      const daemonIds = normalizeCoordinatorDaemonIds(coordinatorDaemonId);
       const merged = [];
       const seenFingerprints = /* @__PURE__ */ new Set();
       const pushUnique = (event) => {
@@ -36340,14 +36438,14 @@ Next step: ${nextStep}`;
       try {
         const store = MeshRuntimeStore.getInstance();
         if (store.pendingEventCount(meshId) > 0) {
-          for (const row of store.peekPendingEvents(meshId, coordinatorDaemonId)) {
+          for (const row of store.peekPendingEvents(meshId, daemonIds.length > 0 ? daemonIds : void 0)) {
             const event = row.payload;
             if (event) pushUnique(event);
           }
         }
       } catch {
       }
-      for (const event of readPendingMeshCoordinatorEventsFromDisk(meshId, coordinatorDaemonId)) {
+      for (const event of readPendingMeshCoordinatorEventsFromDisk(meshId, daemonIds)) {
         pushUnique(event);
       }
       return reconcilePendingMeshCoordinatorEvents(meshId, merged);
@@ -37052,6 +37150,14 @@ Next step: ${nextStep}`;
         recentUnroutableDiagnostics = /* @__PURE__ */ new Map();
       }
     });
+    function resolveCoordinatorDrainDaemonIds(components) {
+      const ids = /* @__PURE__ */ new Set();
+      const statusInstanceId = readNonEmptyString2(components.statusInstanceId);
+      if (statusInstanceId) ids.add(statusInstanceId);
+      const machineId = readNonEmptyString2(loadConfig2().machineId);
+      if (machineId) ids.add(machineId);
+      return [...ids];
+    }
     function getCachedMeshByWorkspace(workspace) {
       const now = Date.now();
       const cached22 = meshByWorkspaceCache.get(workspace);
@@ -38176,8 +38282,8 @@ Next step: ${nextStep}`;
                 const status = readNonEmptyString2(flushState.status).toLowerCase();
                 if (status === "idle") {
                   try {
-                    const localDaemonId = readNonEmptyString2(loadConfig2().machineId) || void 0;
-                    const pendingEvents = drainPendingMeshCoordinatorEvents(coordinatorMeshId, localDaemonId);
+                    const drainDaemonIds = resolveCoordinatorDrainDaemonIds(components);
+                    const pendingEvents = drainPendingMeshCoordinatorEvents(coordinatorMeshId, drainDaemonIds.length > 0 ? drainDaemonIds : void 0);
                     if (pendingEvents.length > 0) {
                       LOG2.info("MeshEvents", `Auto-flushing ${pendingEvents.length} pending coordinator event(s) for mesh ${coordinatorMeshId} on coordinator idle`);
                       for (const pending of pendingEvents) {
@@ -38304,6 +38410,14 @@ Next step: ${nextStep}`;
       }
       return DEFAULT_RECONCILE_INTERVAL_MS;
     }
+    function resolveCoordinatorDaemonIds(components) {
+      const ids = /* @__PURE__ */ new Set();
+      const statusInstanceId = readNonEmptyString2(components.statusInstanceId);
+      if (statusInstanceId) ids.add(statusInstanceId);
+      const machineId = readNonEmptyString2(loadConfig2().machineId);
+      if (machineId) ids.add(machineId);
+      return [...ids];
+    }
     function findLiveCoordinators(components) {
       const out = [];
       for (const inst of components.instanceManager.getByCategory("cli")) {
@@ -38336,6 +38450,7 @@ Next step: ${nextStep}`;
         else byMesh.set(c.meshId, [c]);
       }
       const localDaemonId = readNonEmptyString2(loadConfig2().machineId) || void 0;
+      const drainDaemonIds = resolveCoordinatorDaemonIds(components);
       const dispatchMeshCommand = components.dispatchMeshCommand;
       const store = (() => {
         try {
@@ -38353,7 +38468,9 @@ Next step: ${nextStep}`;
           }
         }
         const idleCoordinators = meshCoordinators.filter((c) => c.idle);
-        if (idleCoordinators.length === 0) continue;
+        const generatingCoordinators = meshCoordinators.filter((c) => !c.idle);
+        const targetCoordinators = idleCoordinators.length > 0 ? idleCoordinators : generatingCoordinators;
+        const forceOnly = idleCoordinators.length === 0;
         if (store) {
           try {
             if (store.pendingEventCount(meshId) === 0) continue;
@@ -38362,15 +38479,20 @@ Next step: ${nextStep}`;
         }
         let pendingEvents = [];
         try {
-          pendingEvents = drainPendingMeshCoordinatorEvents(meshId, localDaemonId);
+          pendingEvents = drainPendingMeshCoordinatorEvents(
+            meshId,
+            drainDaemonIds.length > 0 ? drainDaemonIds : localDaemonId,
+            forceOnly ? { onlyEvents: MESH_FORCE_INJECT_EVENTS } : void 0
+          );
         } catch (e) {
           LOG2.warn("MeshReconcile", `Drain failed for mesh ${meshId}: ${e?.message || e}`);
           continue;
         }
         if (pendingEvents.length === 0) continue;
-        LOG2.info("MeshReconcile", `Reconcile inject: ${pendingEvents.length} pending event(s) \u2192 ${idleCoordinators.length} idle coordinator(s) for mesh ${meshId}`);
+        const mode = forceOnly ? "force-drain \u2192 generating" : "inject \u2192 idle";
+        LOG2.info("MeshReconcile", `Reconcile ${mode}: ${pendingEvents.length} pending event(s) \u2192 ${targetCoordinators.length} coordinator(s) for mesh ${meshId}`);
         for (const pending of pendingEvents) {
-          for (const c of idleCoordinators) {
+          for (const c of targetCoordinators) {
             injectPendingIntoCoordinator(c.instance, pending);
           }
         }
@@ -85175,7 +85297,8 @@ data: ${JSON.stringify(msg.data)}
         detectedIdes: detectedIdesRef,
         refreshProviderAvailability,
         dispatchMeshCommand: config2.dispatchMeshCommand,
-        onMeshCoordinatorEventForwarded: config2.onMeshCoordinatorEventForwarded
+        onMeshCoordinatorEventForwarded: config2.onMeshCoordinatorEventForwarded,
+        statusInstanceId: config2.statusInstanceId
       };
       setupMeshEventForwarding(components);
       components.meshReconcileLoop = setupMeshReconcileLoop(components);