@adhdev/daemon-core 0.9.82-rc.430 → 0.9.82-rc.432

package/dist/index.js

@@ -409,10 +409,10 @@ function readInjected(value) {
 }
 function getDaemonBuildInfo() {
   if (cached) return cached;
-  const commit = readInjected(true ? "c7dba412b544423c5eee2bac9e1004739ecab503" : void 0) ?? "unknown";
-  const commitShort = readInjected(true ? "c7dba412" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-  const version = readInjected(true ? "0.9.82-rc.430" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-  const builtAt = readInjected(true ? "2026-06-30T05:29:05.430Z" : void 0);
+  const commit = readInjected(true ? "818d857089de19d818903a7a416b3f84ccb594e3" : void 0) ?? "unknown";
+  const commitShort = readInjected(true ? "818d8570" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+  const version = readInjected(true ? "0.9.82-rc.432" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+  const builtAt = readInjected(true ? "2026-06-30T07:51:07.054Z" : void 0);
   cached = builtAt ? { commit, commitShort, version, builtAt } : { commit, commitShort, version };
   return cached;
 }
@@ -16782,7 +16782,9 @@ function flushPendingForMeshIdleCoordinators(components, meshId) {
       if (readNonEmptyString2(settings.meshCoordinatorFor) !== meshId) continue;
       const status = readNonEmptyString2(state.status).toLowerCase();
       const modalParked = typeof inst.isModalParked === "function" ? inst.isModalParked() === true : status === "waiting_choice" || status === "waiting_approval";
-      if (status === "idle" && !modalParked) {
+      const drainStatus = typeof inst.getDrainStatus === "function" ? inst.getDrainStatus() : null;
+      const idle = drainStatus !== null ? drainStatus === "idle" : status === "idle";
+      if (idle && !modalParked) {
         idleCoordinators.push({ instance: inst, sessionId: readNonEmptyString2(state.instanceId) });
       }
     }
@@ -16955,6 +16957,9 @@ function resolveAutoPruneMinAgeMs() {
   }
   return DEFAULT_AUTO_PRUNE_MIN_AGE_MS;
 }
+function resolvePendingHeldDrainEscalateMs() {
+  return resolveTunedReconcileMs("MESH_PENDING_HELD_DRAIN_ESCALATE_MS", DEFAULT_PENDING_HELD_DRAIN_ESCALATE_MS, 4e3, 5 * 6e4);
+}
 function resolveReconcileIntervalMs() {
   const raw = readNonEmptyString2(process.env.MESH_RECONCILE_INTERVAL_MS);
   if (raw) {
@@ -17017,6 +17022,8 @@ function findLiveCoordinators(components) {
     if (!meshId) continue;
     const status = readNonEmptyString2(state.status).toLowerCase();
     const modalParked = typeof inst.isModalParked === "function" ? inst.isModalParked() === true : status === "waiting_choice" || status === "waiting_approval";
+    const drainStatus = typeof inst.getDrainStatus === "function" ? inst.getDrainStatus() : null;
+    const idle = drainStatus !== null ? drainStatus === "idle" : status === "idle";
     const sessionId = readNonEmptyString2(state.instanceId);
     if (getLogLevel() === "debug") {
       let adapterRaw = "?";
@@ -17031,7 +17038,7 @@ function findLiveCoordinators(components) {
       const lastStatus = readNonEmptyString2(inst.lastStatus) || "?";
       const autoApproveBusy = inst.autoApproveBusy;
       const maskSince = inst.autoApproveMaskSince;
-      LOG.debug("MeshReconcile", `coordDiag sess=${sessionId || "?"} mesh=${meshId} getState=${status || "?"} lastStatus=${lastStatus} adapterRaw=${adapterRaw} autoApproveBusy=${autoApproveBusy === true} maskSince=${maskSince || 0}`);
+      LOG.debug("MeshReconcile", `coordDiag sess=${sessionId || "?"} mesh=${meshId} getState=${status || "?"} drainStatus=${drainStatus || "n/a"} lastStatus=${lastStatus} adapterRaw=${adapterRaw} autoApproveBusy=${autoApproveBusy === true} maskSince=${maskSince || 0}`);
     }
     const stateKey = `${meshId}::${sessionId || "?"}`;
     const prevParked = coordinatorModalParkState.get(stateKey);
@@ -17043,7 +17050,7 @@ function findLiveCoordinators(components) {
         LOG.info("MeshReconcile", `Coordinator ${sessionId || "?"} (mesh ${meshId}) left modal-park (status=${status}) \u2014 held events will drain on this/next tick`);
       }
     }
-    out.push({ meshId, instance: inst, sessionId, idle: status === "idle", modalParked });
+    out.push({ meshId, instance: inst, sessionId, idle, modalParked });
   }
   return out;
 }
@@ -17138,6 +17145,63 @@ function recordHeldTerminalEventsToLedger(meshId, drainDaemonIds, reason, heldFo
     }
   }
 }
+function oldestHeldTerminalEventAgeMs(meshId, drainDaemonIds) {
+  let pending;
+  try {
+    pending = getPendingMeshCoordinatorEvents(meshId, drainDaemonIds.length > 0 ? drainDaemonIds : void 0);
+  } catch {
+    return 0;
+  }
+  const now = Date.now();
+  let maxAge = 0;
+  for (const event of pending) {
+    if (!shouldForceInjectMeshEvent(event.event)) continue;
+    const queuedAt = typeof event.queuedAt === "number" ? event.queuedAt : now;
+    const age = now - queuedAt;
+    if (age > maxAge) maxAge = age;
+  }
+  return maxAge;
+}
+function reconfirmGenuinelyIdleCoordinators(generating) {
+  const out = [];
+  for (const c of generating) {
+    const inst = c.instance;
+    const drainStatus = typeof inst?.getDrainStatus === "function" ? inst.getDrainStatus() : null;
+    const genuinelyIdle = drainStatus !== null ? drainStatus === "idle" : c.idle;
+    if (genuinelyIdle) out.push({ ...c, idle: true });
+  }
+  return out;
+}
+function drainAndInjectIntoTargets(meshId, drainDaemonIds, localDaemonId, targetCoordinators, logLabel) {
+  let pendingEvents = [];
+  try {
+    pendingEvents = drainPendingMeshCoordinatorEvents(
+      meshId,
+      drainDaemonIds.length > 0 ? drainDaemonIds : localDaemonId
+    );
+  } catch (e) {
+    LOG.warn("MeshReconcile", `Drain failed for mesh ${meshId}: ${e?.message || e}`);
+    return 0;
+  }
+  if (pendingEvents.length === 0) return 0;
+  LOG.info("MeshReconcile", `Reconcile inject \u2192 ${logLabel}: ${pendingEvents.length} pending event(s) \u2192 ${targetCoordinators.length} coordinator(s) for mesh ${meshId}`);
+  for (const pending of pendingEvents) {
+    const wantSession = readNonEmptyString2(pending.targetCoordinatorSessionId);
+    if (wantSession) {
+      const matched = targetCoordinators.filter((c) => c.sessionId === wantSession);
+      if (matched.length === 0) {
+        holdOrExpireStrictUnmatchedEvent(pending, wantSession, meshId);
+        continue;
+      }
+      for (const c of matched) injectPendingIntoCoordinator(c.instance, pending);
+      continue;
+    }
+    for (const c of targetCoordinators) {
+      injectPendingIntoCoordinator(c.instance, pending);
+    }
+  }
+  return pendingEvents.length;
+}
 function recoverStrandedAssignedDispatches(meshId, store) {
   const assigned = getQueue(meshId, { status: ["assigned"] });
   if (!assigned.length) return;
@@ -17349,6 +17413,19 @@ async function runMeshReconcileTick(components) {
           }
         }
         if (hasPending) {
+          const escalateMs = resolvePendingHeldDrainEscalateMs();
+          const heldAgeMs = oldestHeldTerminalEventAgeMs(
+            meshId,
+            drainDaemonIds.length > 0 ? drainDaemonIds : localDaemonId ? [localDaemonId] : []
+          );
+          if (heldAgeMs >= escalateMs) {
+            const escapeTargets = reconfirmGenuinelyIdleCoordinators(generatingCoordinators);
+            if (escapeTargets.length > 0) {
+              LOG.info("MeshReconcile", `Reconcile age-escape \u2192 generating-hold: held terminal event(s) for mesh ${meshId} aged ${Math.round(heldAgeMs / 1e3)}s (\u2265 ${Math.round(escalateMs / 1e3)}s) and ${escapeTargets.length} coordinator(s) re-confirmed genuinely idle on the raw adapter \u2014 draining once`);
+              const drained = drainAndInjectIntoTargets(meshId, drainDaemonIds, localDaemonId, escapeTargets, "age-escape");
+              if (drained > 0) continue;
+            }
+          }
           LOG.info("MeshReconcile", `Reconcile skip \u2192 generating: holding pending event(s) for mesh ${meshId} (${generatingCoordinators.length} coordinator(s) busy; events left queued for the next idle tick)`);
           if (getLogLevel() === "debug") {
             LOG.debug("MeshReconcile", `coordHoldGenerating mesh=${meshId} heldFor=[${generatingCoordinators.map((c) => c.sessionId || "?").join(",")}] (these were classified busy; cross-ref same-tick coordDiag by sessionId)`);
@@ -17369,33 +17446,7 @@ async function runMeshReconcileTick(components) {
       } catch {
       }
     }
-    let pendingEvents = [];
-    try {
-      pendingEvents = drainPendingMeshCoordinatorEvents(
-        meshId,
-        drainDaemonIds.length > 0 ? drainDaemonIds : localDaemonId
-      );
-    } catch (e) {
-      LOG.warn("MeshReconcile", `Drain failed for mesh ${meshId}: ${e?.message || e}`);
-      continue;
-    }
-    if (pendingEvents.length === 0) continue;
-    LOG.info("MeshReconcile", `Reconcile inject \u2192 idle: ${pendingEvents.length} pending event(s) \u2192 ${targetCoordinators.length} coordinator(s) for mesh ${meshId}`);
-    for (const pending of pendingEvents) {
-      const wantSession = readNonEmptyString2(pending.targetCoordinatorSessionId);
-      if (wantSession) {
-        const matched = targetCoordinators.filter((c) => c.sessionId === wantSession);
-        if (matched.length === 0) {
-          holdOrExpireStrictUnmatchedEvent(pending, wantSession, meshId);
-          continue;
-        }
-        for (const c of matched) injectPendingIntoCoordinator(c.instance, pending);
-        continue;
-      }
-      for (const c of targetCoordinators) {
-        injectPendingIntoCoordinator(c.instance, pending);
-      }
-    }
+    drainAndInjectIntoTargets(meshId, drainDaemonIds, localDaemonId, targetCoordinators, "idle");
   }
 }
 function holdOrExpireStrictUnmatchedEvent(pending, wantSession, meshId) {
@@ -17845,7 +17896,7 @@ function setupMeshReconcileLoop(components) {
     }
   };
 }
-var DEFAULT_RECONCILE_INTERVAL_MS, DEFAULT_AUTO_PRUNE_MIN_AGE_MS, ACKED_DEATH_CONSECUTIVE_READ_FAILURES, inFlightAckedHoldState, coordinatorModalParkState, heldEventLedgerRecorded, ASSIGNED_STRANDED_DEADLINE_MS, STRICT_SESSION_MATCH_TTL_MS, unresolvedForwardRejectionCounts, MAX_FORWARD_REJECTIONS;
+var DEFAULT_RECONCILE_INTERVAL_MS, DEFAULT_AUTO_PRUNE_MIN_AGE_MS, DEFAULT_PENDING_HELD_DRAIN_ESCALATE_MS, ACKED_DEATH_CONSECUTIVE_READ_FAILURES, inFlightAckedHoldState, coordinatorModalParkState, heldEventLedgerRecorded, ASSIGNED_STRANDED_DEADLINE_MS, STRICT_SESSION_MATCH_TTL_MS, unresolvedForwardRejectionCounts, MAX_FORWARD_REJECTIONS;
 var init_mesh_reconcile_loop = __esm({
   "src/mesh/mesh-reconcile-loop.ts"() {
     "use strict";
@@ -17867,6 +17918,7 @@ var init_mesh_reconcile_loop = __esm({
     init_chat_message_normalization();
     DEFAULT_RECONCILE_INTERVAL_MS = 4e3;
     DEFAULT_AUTO_PRUNE_MIN_AGE_MS = 24 * 60 * 6e4;
+    DEFAULT_PENDING_HELD_DRAIN_ESCALATE_MS = 12e3;
     ACKED_DEATH_CONSECUTIVE_READ_FAILURES = 3;
     inFlightAckedHoldState = /* @__PURE__ */ new Map();
     coordinatorModalParkState = /* @__PURE__ */ new Map();
@@ -41239,6 +41291,49 @@ var CliProviderInstance = class _CliProviderInstance {
   isModalParked() {
     return this.resolveModalParkStatus() !== null;
   }
+  /**
+   * PTY-OVERTRUST-DRAIN (Defect B). The deliverability/drain status the mesh
+   * reconcile loop must consult — the RAW adapter turn-state, with the
+   * auto-approve "hold-idle" visual mask STRIPPED.
+   *
+   * getState().status overlays `autoApproveHoldIdle`/`autoApproveActive` to paint a
+   * genuinely-idle adapter as `generating` (a UI-flicker suppression while an
+   * auto-approve key-press settles — see getState() ~:800). That mask is correct
+   * for the dashboard, but the reconcile loop trusts it as "the coordinator is
+   * busy" and therefore HOLDS a worker's completion under
+   * `generating_no_idle_coordinator` even though the coordinator's PTY is at a real
+   * turn end and would accept the inject as a turn — the completion is stranded.
+   *
+   * This accessor reports the drain truth instead:
+   *   - 'modal_parked' — a GENUINE human-await modal (AskUserQuestion / a non-
+   *     transient tool-consent). Still excluded from drain (a force-inject here
+   *     writes raw keystrokes the modal eats → data corruption). Mirrors
+   *     isModalParked(), evaluated first so a parked session never reads idle.
+   *   - 'idle' — the RAW adapter is at a turn end (adapter.getStatus(allowParse:false)
+   *     === 'idle') and the session is not modal-parked. Drain-eligible REGARDLESS
+   *     of the auto-approve mask. This is the case the mask used to hide.
+   *   - 'generating' — the raw adapter is genuinely mid-turn. Held (a raw PTY write
+   *     into a generating claude-cli is not consumed as a turn → data loss). The
+   *     intentional removal of force-inject-into-generating is preserved.
+   *   - 'other' — any other raw status (error / starting / waiting_choice handled by
+   *     modal-park above). Not a drain target.
+   *
+   * Uses allowParse:false (engine.activeModal only, side-effect-free) so it never
+   * mutates the very auto-approve mask state the diagnostics read.
+   */
+  getDrainStatus() {
+    if (this.isModalParked()) return "modal_parked";
+    let rawStatus;
+    try {
+      const raw = this.adapter.getStatus({ allowParse: false })?.status;
+      rawStatus = typeof raw === "string" ? raw.trim() : "";
+    } catch {
+      return "other";
+    }
+    if (rawStatus === "idle") return "idle";
+    if (isCliGeneratingLikeStatus(rawStatus)) return "generating";
+    return "other";
+  }
   onEvent(event, data) {
     if (event === "send_message") {
       const input = normalizeInputEnvelope(data);