@adhdev/daemon-standalone 0.9.82-rc.388 → 0.9.82-rc.389

package/dist/index.js

@@ -30108,10 +30108,10 @@ var require_dist3 = __commonJS({
     }
     function getDaemonBuildInfo() {
       if (cached2) return cached2;
-      const commit = readInjected(true ? "9a3033a1679a8f914b9b40753006af02a09bc1b5" : void 0) ?? "unknown";
-      const commitShort = readInjected(true ? "9a3033a1" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-      const version2 = readInjected(true ? "0.9.82-rc.388" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-      const builtAt = readInjected(true ? "2026-06-26T03:26:41.986Z" : void 0);
+      const commit = readInjected(true ? "f82b4b4cdb13171d2666cc959054b788af4f2ea5" : void 0) ?? "unknown";
+      const commitShort = readInjected(true ? "f82b4b4c" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+      const version2 = readInjected(true ? "0.9.82-rc.389" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+      const builtAt = readInjected(true ? "2026-06-26T06:17:46.237Z" : void 0);
       cached2 = builtAt ? { commit, commitShort, version: version2, builtAt } : { commit, commitShort, version: version2 };
       return cached2;
     }
@@ -34323,9 +34323,16 @@ Valid status values: \`completed\` | \`failed\` | \`blocked\` | \`partial\`.`;
       }
       return false;
     }
+    function isGluedToLetterSuffix(text, matchStart, matchEnd) {
+      const letterOrMark = /[\p{L}\p{M}]/u;
+      const next = matchEnd < text.length ? text[matchEnd] : "";
+      const prev = matchStart > 0 ? text[matchStart - 1] : "";
+      return letterOrMark.test(next) || letterOrMark.test(prev);
+    }
     function isRealMutationMatch(text, matchStart, matchEnd) {
       if (hasNegationBefore(text, matchStart)) return false;
       if (hasTrailingNegation(text, matchEnd)) return false;
+      if (isGluedToLetterSuffix(text, matchStart, matchEnd)) return false;
       if (isInsidePathSegment(text, matchStart, matchEnd)) return false;
       if (isInsideQuotedSpan(text, matchStart, matchEnd)) return false;
       return isMutationKeywordInCommandContext(text, matchStart, matchEnd);
@@ -35044,10 +35051,20 @@ Valid status values: \`completed\` | \`failed\` | \`blocked\` | \`partial\`.`;
             CREATE INDEX IF NOT EXISTS idx_mesh_queue_assignment
                 ON mesh_queue(mesh_id, assigned_node_id, assigned_session_id, status);
 
+            -- mesh_id is DB-level isolation (defense-in-depth). The fingerprint STRING
+            -- also carries meshId as its first '::'-joined segment (see
+            -- buildMeshCompletionFingerprint) \u2014 that string-prefix defense is kept; this
+            -- column makes cross-mesh suppression impossible even if the string format
+            -- drifts or two meshes ever collide on a fingerprint body.
             CREATE TABLE IF NOT EXISTS mesh_completion_fingerprints (
                 fingerprint TEXT PRIMARY KEY,
-                expires_at INTEGER NOT NULL
+                expires_at INTEGER NOT NULL,
+                mesh_id TEXT NOT NULL DEFAULT ''
             );
+            -- NOTE: the (mesh_id, fingerprint) index is created in migrateMeshIsolationColumns,
+            -- NOT here. A pre-isolation DB still has the legacy table (CREATE IF NOT EXISTS is a
+            -- no-op), so referencing mesh_id in an index before the ALTER ADD COLUMN runs would
+            -- fail with "no such column". The migration adds the column then the index.
 
             CREATE TABLE IF NOT EXISTS mesh_direct_dispatches (
                 task_id TEXT PRIMARY KEY,
@@ -35067,13 +35084,18 @@ Valid status values: \`completed\` | \`failed\` | \`blocked\` | \`partial\`.`;
             CREATE INDEX IF NOT EXISTS idx_direct_dispatches_mesh_session
                 ON mesh_direct_dispatches(mesh_id, session_id, status);
 
+            -- MESH-ISOLATION-LEAK: mesh_id is part of the PK so a nodeId shared across two
+            -- meshes (same machine in multiple repos) keeps a separate idle-session row per
+            -- mesh, and getRemoteIdleSessions(meshId) can never surface another mesh's
+            -- session for a queue claim.
             CREATE TABLE IF NOT EXISTS remote_idle_sessions (
+                mesh_id TEXT NOT NULL,
                 node_id TEXT NOT NULL,
                 session_id TEXT NOT NULL,
                 provider_type TEXT NOT NULL,
                 expires_at INTEGER NOT NULL,
                 metadata TEXT,
-                PRIMARY KEY (node_id, session_id)
+                PRIMARY KEY (mesh_id, node_id, session_id)
             );
 
             CREATE TABLE IF NOT EXISTS mesh_session_delivery (
@@ -35197,19 +35219,67 @@ Valid status values: \`completed\` | \`failed\` | \`blocked\` | \`partial\`.`;
                 cursor INTEGER NOT NULL DEFAULT 0
             );
         `);
+            this.migrateMeshIsolationColumns();
+          }
+          tableColumns(table) {
+            const rows = this.db.prepare(`PRAGMA table_info(${table})`).all();
+            return new Set(rows.map((r) => r.name));
+          }
+          /**
+           * MESH-ISOLATION-LEAK migration. Two tables historically lacked a `mesh_id` column,
+           * letting one machine that belongs to multiple meshes (multiple repos) leak rows
+           * across meshes. Both migrations are idempotent and run on every boot — the column
+           * check short-circuits once the new schema is in place.
+           */
+          migrateMeshIsolationColumns() {
+            try {
+              const fpCols = this.tableColumns("mesh_completion_fingerprints");
+              if (!fpCols.has("mesh_id")) {
+                this.db.exec(`ALTER TABLE mesh_completion_fingerprints ADD COLUMN mesh_id TEXT NOT NULL DEFAULT ''`);
+                this.db.exec(`
+                    UPDATE mesh_completion_fingerprints
+                    SET mesh_id = substr(fingerprint, 1, instr(fingerprint, '::') - 1)
+                    WHERE instr(fingerprint, '::') > 0 AND mesh_id = ''
+                `);
+              }
+              this.db.exec(`
+                CREATE INDEX IF NOT EXISTS idx_mesh_completion_fingerprints_mesh
+                    ON mesh_completion_fingerprints(mesh_id, fingerprint)
+            `);
+              const idleCols = this.tableColumns("remote_idle_sessions");
+              if (!idleCols.has("mesh_id")) {
+                this.db.exec(`
+                    DROP TABLE IF EXISTS remote_idle_sessions;
+                    CREATE TABLE remote_idle_sessions (
+                        mesh_id TEXT NOT NULL,
+                        node_id TEXT NOT NULL,
+                        session_id TEXT NOT NULL,
+                        provider_type TEXT NOT NULL,
+                        expires_at INTEGER NOT NULL,
+                        metadata TEXT,
+                        PRIMARY KEY (mesh_id, node_id, session_id)
+                    );
+                `);
+              }
+            } catch (err) {
+              if (!loggedMigrationFailure) {
+                loggedMigrationFailure = true;
+                LOG2.warn("MeshRuntimeStore", `mesh-isolation column migration failed: ${err?.message || err}`);
+              }
+            }
           }
-          hasCompletionFingerprint(fingerprint) {
+          hasCompletionFingerprint(meshId, fingerprint) {
             const now = Date.now();
-            const row = this.db.prepare("SELECT 1 FROM mesh_completion_fingerprints WHERE fingerprint = ? AND expires_at > ?").get(fingerprint, now);
+            const row = this.db.prepare("SELECT 1 FROM mesh_completion_fingerprints WHERE mesh_id = ? AND fingerprint = ? AND expires_at > ?").get(meshId, fingerprint, now);
             if (++this.fingerprintSweepCounter >= 100) {
               this.fingerprintSweepCounter = 0;
               this.sweepExpiredFingerprints();
             }
             return row !== void 0;
           }
-          recordCompletionFingerprint(fingerprint, ttlMs) {
+          recordCompletionFingerprint(meshId, fingerprint, ttlMs) {
             const expiresAt = Date.now() + ttlMs;
-            this.db.prepare("INSERT OR REPLACE INTO mesh_completion_fingerprints (fingerprint, expires_at) VALUES (?, ?)").run(fingerprint, expiresAt);
+            this.db.prepare("INSERT OR REPLACE INTO mesh_completion_fingerprints (fingerprint, expires_at, mesh_id) VALUES (?, ?, ?)").run(fingerprint, expiresAt, meshId);
             this.maybeCheckpointWal();
           }
           sweepExpiredFingerprints() {
@@ -35718,14 +35788,14 @@ Valid status values: \`completed\` | \`failed\` | \`blocked\` | \`partial\`.`;
         `).run(now, meshId, cutoff);
           }
           // ── Remote Idle Sessions ─────────────────────────────────────────────────
-          setRemoteIdleSession(nodeId, sessionId, providerType, expiresAt, metadata) {
+          setRemoteIdleSession(meshId, nodeId, sessionId, providerType, expiresAt, metadata) {
             this.db.prepare(`
-            INSERT OR REPLACE INTO remote_idle_sessions (node_id, session_id, provider_type, expires_at, metadata)
-            VALUES (?, ?, ?, ?, ?)
-        `).run(nodeId, sessionId, providerType, expiresAt, metadata ? JSON.stringify(metadata) : null);
+            INSERT OR REPLACE INTO remote_idle_sessions (mesh_id, node_id, session_id, provider_type, expires_at, metadata)
+            VALUES (?, ?, ?, ?, ?, ?)
+        `).run(meshId, nodeId, sessionId, providerType, expiresAt, metadata ? JSON.stringify(metadata) : null);
           }
-          getRemoteIdleSessions() {
-            const rows = this.db.prepare("SELECT node_id, session_id, provider_type, expires_at, metadata FROM remote_idle_sessions").all();
+          getRemoteIdleSessions(meshId) {
+            const rows = this.db.prepare("SELECT node_id, session_id, provider_type, expires_at, metadata FROM remote_idle_sessions WHERE mesh_id = ?").all(meshId);
             return rows.map((r) => ({
               nodeId: r.node_id,
               sessionId: r.session_id,
@@ -35734,8 +35804,8 @@ Valid status values: \`completed\` | \`failed\` | \`blocked\` | \`partial\`.`;
               metadata: r.metadata ? JSON.parse(r.metadata) : void 0
             }));
           }
-          deleteRemoteIdleSession(nodeId, sessionId) {
-            this.db.prepare("DELETE FROM remote_idle_sessions WHERE node_id = ? AND session_id = ?").run(nodeId, sessionId);
+          deleteRemoteIdleSession(meshId, nodeId, sessionId) {
+            this.db.prepare("DELETE FROM remote_idle_sessions WHERE mesh_id = ? AND node_id = ? AND session_id = ?").run(meshId, nodeId, sessionId);
           }
           pruneExpiredRemoteIdleSessions() {
             this.db.prepare("DELETE FROM remote_idle_sessions WHERE expires_at <= ?").run(Date.now());
@@ -41110,7 +41180,7 @@ Next step: ${nextStep}`;
       }
       let remoteSessions = [];
       try {
-        remoteSessions = MeshRuntimeStore.getInstance().getRemoteIdleSessions();
+        remoteSessions = MeshRuntimeStore.getInstance().getRemoteIdleSessions(meshId);
       } catch {
       }
       const remoteCandidates = [];
@@ -41125,7 +41195,7 @@ Next step: ${nextStep}`;
         const assigned = tryAssignQueueTask(components, meshId, candidate.nodeId, candidate.sessionId, candidate.providerType);
         if (assigned && candidate.origin === "remote") {
           try {
-            MeshRuntimeStore.getInstance().deleteRemoteIdleSession(candidate.nodeId, candidate.sessionId);
+            MeshRuntimeStore.getInstance().deleteRemoteIdleSession(meshId, candidate.nodeId, candidate.sessionId);
           } catch {
           }
         }
@@ -43900,17 +43970,17 @@ ${cleanBody}`;
       if (isIntentionalCleanupStopMetadata(args.metadataEvent)) return true;
       return hasRecentIntentionalCleanupStop(args.meshId, args.sessionId, args.nodeId);
     }
-    function hasFingerprintSeen(fingerprint) {
+    function hasFingerprintSeen(meshId, fingerprint) {
       try {
-        return MeshRuntimeStore.getInstance().hasCompletionFingerprint(fingerprint);
+        return MeshRuntimeStore.getInstance().hasCompletionFingerprint(meshId, fingerprint);
       } catch {
         return false;
       }
     }
-    function recordFingerprintSeen(fingerprint) {
+    function recordFingerprintSeen(meshId, fingerprint) {
       try {
         const db = MeshRuntimeStore.getInstance();
-        db.recordCompletionFingerprint(fingerprint, RECENT_COMPLETION_FINGERPRINT_TTL_MS);
+        db.recordCompletionFingerprint(meshId, fingerprint, RECENT_COMPLETION_FINGERPRINT_TTL_MS);
         db.sweepExpiredFingerprints();
       } catch {
       }
@@ -43940,7 +44010,7 @@ ${cleanBody}`;
     function isDuplicateMeshCompletionEvent(args) {
       const fingerprint = buildMeshCompletionFingerprint(args);
       if (!fingerprint) return false;
-      if (hasFingerprintSeen(fingerprint)) {
+      if (hasFingerprintSeen(args.meshId, fingerprint)) {
         if (args.taskId) {
           recordCompletionConflict({
             meshId: args.meshId,
@@ -43952,7 +44022,7 @@ ${cleanBody}`;
         }
         return true;
       }
-      recordFingerprintSeen(fingerprint);
+      recordFingerprintSeen(args.meshId, fingerprint);
       return false;
     }
     function isDuplicateMeshApprovalEvent(args) {
@@ -43966,16 +44036,16 @@ ${cleanBody}`;
         args.providerType || "",
         approvalIdentity
       ].join("::");
-      if (hasFingerprintSeen(fingerprint)) return true;
-      recordFingerprintSeen(fingerprint);
+      if (hasFingerprintSeen(args.meshId, fingerprint)) return true;
+      recordFingerprintSeen(args.meshId, fingerprint);
       return false;
     }
     function isDuplicateRefineTerminalEvent(meshId, eventName, metadataEvent) {
       const jobId = readRefineJobId({ metadataEvent });
       const fingerprint = jobId && (/* @__PURE__ */ new Set(["refine:completed", "refine:failed"])).has(eventName) ? `${meshId}::${eventName}::${jobId}` : "";
       if (!fingerprint) return false;
-      if (hasFingerprintSeen(fingerprint)) return true;
-      recordFingerprintSeen(fingerprint);
+      if (hasFingerprintSeen(meshId, fingerprint)) return true;
+      recordFingerprintSeen(meshId, fingerprint);
       return false;
     }
     function isSynthesizedReconciledTerminal(terminalPayload) {
@@ -44029,7 +44099,7 @@ ${cleanBody}`;
       if (intentionalCleanupStop) {
         if (eventSessionId && eventNodeId) {
           try {
-            MeshRuntimeStore.getInstance().deleteRemoteIdleSession(eventNodeId, eventSessionId);
+            MeshRuntimeStore.getInstance().deleteRemoteIdleSession(args.meshId, eventNodeId, eventSessionId);
           } catch {
           }
         }
@@ -44102,7 +44172,7 @@ ${cleanBody}`;
             terminalTaskId,
             eventTaskId
           });
-          const supersedesSynthesizedTerminal = isSynthesizedReconciledTerminal(terminal.payload) && isRealProviderCompletionEvent(args.metadataEvent) && isGenuineCompletionEvidence(args.metadataEvent);
+          const supersedesSynthesizedTerminal = isSynthesizedReconciledTerminal(terminal.payload) && isRealProviderCompletionEvent(args.metadataEvent) && !isFalseIdleCompletion(args.metadataEvent);
           if (!newDispatchAfterTerminal && !supersedesWeakTerminal && !distinctTaskCompletion && !supersedesTruncatedTerminal && !supersedesSynthesizedTerminal) {
             const terminalProviderSessionId = readNonEmptyString2(terminal.payload.providerSessionId);
             const terminalFinalSummary = readNonEmptyString2(terminal.payload.finalSummary);
@@ -44245,7 +44315,25 @@ ${cleanBody}`;
           const isFalseIdle = isFalseIdleCompletion(args.metadataEvent);
           completedTaskForLedger = markSessionTerminal(sessionId, "completed", eventTimestamp, { tentativeIfDirect: isFalseIdle });
           if (nodeId && providerType) {
-            runIdleMaintenanceThenAssignQueue(components, { meshId: args.meshId, nodeId, sessionId, providerType });
+            if (!isFalseIdle) {
+              sweepExpiredRemoteIdleSessions();
+              try {
+                MeshRuntimeStore.getInstance().setRemoteIdleSession(args.meshId, nodeId, sessionId, providerType, Date.now() + REMOTE_IDLE_SESSION_TTL_MS);
+              } catch {
+              }
+              setImmediate(() => {
+                maybeAutoFastForwardIdleNode(components, { meshId: args.meshId, nodeId, sessionId, providerType }).finally(() => {
+                  try {
+                    const assigned = tryAssignQueueTask(components, args.meshId, nodeId, sessionId, providerType);
+                    if (assigned) MeshRuntimeStore.getInstance().deleteRemoteIdleSession(args.meshId, nodeId, sessionId);
+                  } catch (e) {
+                    LOG2.warn("MeshQueue", `Failed to assign idle queue task after completion for ${nodeId}: ${e?.message || e}`);
+                  }
+                });
+              });
+            } else {
+              runIdleMaintenanceThenAssignQueue(components, { meshId: args.meshId, nodeId, sessionId, providerType });
+            }
           }
           const completedTaskId = completedTaskForLedger?.id;
           if (completedTaskId && hasPendingDependents(args.meshId, completedTaskId)) {
@@ -44300,14 +44388,14 @@ ${cleanBody}`;
         if (sessionId && nodeId && providerType) {
           sweepExpiredRemoteIdleSessions();
           try {
-            MeshRuntimeStore.getInstance().setRemoteIdleSession(nodeId, sessionId, providerType, Date.now() + REMOTE_IDLE_SESSION_TTL_MS);
+            MeshRuntimeStore.getInstance().setRemoteIdleSession(args.meshId, nodeId, sessionId, providerType, Date.now() + REMOTE_IDLE_SESSION_TTL_MS);
           } catch {
           }
           setImmediate(() => {
             maybeAutoFastForwardIdleNode(components, { meshId: args.meshId, nodeId, sessionId, providerType }).finally(() => {
               try {
                 const assigned = tryAssignQueueTask(components, args.meshId, nodeId, sessionId, providerType);
-                if (assigned) MeshRuntimeStore.getInstance().deleteRemoteIdleSession(nodeId, sessionId);
+                if (assigned) MeshRuntimeStore.getInstance().deleteRemoteIdleSession(args.meshId, nodeId, sessionId);
               } catch (e) {
                 LOG2.warn("MeshQueue", `Failed to assign idle queue task after maintenance for ${nodeId}: ${e?.message || e}`);
               }
@@ -44319,7 +44407,7 @@ ${cleanBody}`;
         const nodeId = readNonEmptyString2(args.nodeId) || readNonEmptyString2(args.metadataEvent.meshNodeId);
         if (sessionId && nodeId) {
           try {
-            MeshRuntimeStore.getInstance().deleteRemoteIdleSession(nodeId, sessionId);
+            MeshRuntimeStore.getInstance().deleteRemoteIdleSession(args.meshId, nodeId, sessionId);
           } catch {
           }
         }
@@ -44356,7 +44444,7 @@ ${cleanBody}`;
         const nodeId = readNonEmptyString2(args.nodeId) || readNonEmptyString2(args.metadataEvent.meshNodeId);
         if (sessionId && nodeId) {
           try {
-            MeshRuntimeStore.getInstance().deleteRemoteIdleSession(nodeId, sessionId);
+            MeshRuntimeStore.getInstance().deleteRemoteIdleSession(args.meshId, nodeId, sessionId);
           } catch {
           }
         }
@@ -44836,6 +44924,9 @@ ${cleanBody}`;
       }
       return DEFAULT_RECONCILE_INTERVAL_MS;
     }
+    function inFlightSynthKey(meshId, taskId) {
+      return `${meshId}::${taskId}`;
+    }
     function resolveCoordinatorDaemonIds(components) {
       const statusInstanceId = readNonEmptyString2(components.statusInstanceId);
       const machineId = readNonEmptyString2(loadConfig2().machineId);
@@ -45400,6 +45491,14 @@ ${cleanBody}`;
     async function reconcileUnterminatedDirectDispatches(components, mesh, selfIds, localDaemonId) {
       const dispatches = getActiveDirectDispatches(mesh.id);
       if (dispatches.length === 0) return;
+      const activeTaskKeys = new Set(
+        dispatches.map((d) => readNonEmptyString2(d.taskId)).filter(Boolean).map((taskId) => inFlightSynthKey(mesh.id, taskId))
+      );
+      for (const key of inFlightIdleObservationCounts.keys()) {
+        if (key.startsWith(`${mesh.id}::`) && !activeTaskKeys.has(key)) {
+          inFlightIdleObservationCounts.delete(key);
+        }
+      }
       const dispatchMeshCommand = components.dispatchMeshCommand;
       const nodeById = new Map(mesh.nodes.map((n) => [n.id, n]));
       for (const dispatch of dispatches) {
@@ -45435,7 +45534,19 @@ ${cleanBody}`;
           continue;
         }
         if (!payload) continue;
-        if (readChatPayloadStatus(payload) !== "idle") continue;
+        const synthKey = inFlightSynthKey(mesh.id, taskId);
+        if (readChatPayloadStatus(payload) !== "idle") {
+          inFlightIdleObservationCounts.delete(synthKey);
+          continue;
+        }
+        if (dispatch.status === "acked") {
+          const idleStreak = (inFlightIdleObservationCounts.get(synthKey) ?? 0) + 1;
+          inFlightIdleObservationCounts.set(synthKey, idleStreak);
+          if (idleStreak < REQUIRED_CONSECUTIVE_IDLE_TICKS_FOR_INFLIGHT_SYNTH) {
+            LOG2.info("MeshReconcile", `In-flight synth hold: task ${taskId} on node ${nodeId} (mesh ${mesh.id}) read idle ${idleStreak}/${REQUIRED_CONSECUTIVE_IDLE_TICKS_FOR_INFLIGHT_SYNTH} consecutive tick(s) after generating_started \u2014 deferring completion synth until the idle settle is confirmed (guards against a mid-turn idle flicker pre-empting the real completion)`);
+            continue;
+          }
+        }
         const messages = Array.isArray(payload.messages) ? payload.messages : [];
         const evidence = extractFinalAssistantSummaryEvidence(messages);
         if (!evidence.finalSummary) continue;
@@ -45592,6 +45703,8 @@ ${cleanBody}`;
     }
     var DEFAULT_RECONCILE_INTERVAL_MS;
     var DEFAULT_AUTO_PRUNE_MIN_AGE_MS;
+    var REQUIRED_CONSECUTIVE_IDLE_TICKS_FOR_INFLIGHT_SYNTH;
+    var inFlightIdleObservationCounts;
     var coordinatorModalParkState;
     var heldEventLedgerRecorded;
     var ASSIGNED_STRANDED_DEADLINE_MS;
@@ -45619,6 +45732,8 @@ ${cleanBody}`;
         init_chat_message_normalization();
         DEFAULT_RECONCILE_INTERVAL_MS = 4e3;
         DEFAULT_AUTO_PRUNE_MIN_AGE_MS = 24 * 60 * 6e4;
+        REQUIRED_CONSECUTIVE_IDLE_TICKS_FOR_INFLIGHT_SYNTH = 2;
+        inFlightIdleObservationCounts = /* @__PURE__ */ new Map();
         coordinatorModalParkState = /* @__PURE__ */ new Map();
         heldEventLedgerRecorded = /* @__PURE__ */ new Set();
         ASSIGNED_STRANDED_DEADLINE_MS = 5 * 6e4;