@adhdev/daemon-standalone 0.9.82-rc.195 → 0.9.82-rc.196

package/dist/index.js

@@ -38106,14 +38106,32 @@ Valid status values: \`completed\` | \`failed\` | \`blocked\` | \`partial\`.`;
     function legacyQueuePath(meshId) {
       return (0, import_path7.join)(getLedgerDir(), `${safeMeshId(meshId)}.queue.json`);
     }
+    function meshRuntimeStorePath() {
+      const dir = getLedgerDir();
+      const nextPath = (0, import_path7.join)(dir, "mesh-runtime.db");
+      if ((0, import_fs7.existsSync)(nextPath)) return nextPath;
+      const legacyPath = (0, import_path7.join)(dir, "beads.db");
+      if (!(0, import_fs7.existsSync)(legacyPath)) return nextPath;
+      try {
+        (0, import_fs7.renameSync)(legacyPath, nextPath);
+        for (const suffix of ["-wal", "-shm"]) {
+          const legacyCompanion = `${legacyPath}${suffix}`;
+          if ((0, import_fs7.existsSync)(legacyCompanion)) {
+            (0, import_fs7.renameSync)(legacyCompanion, `${nextPath}${suffix}`);
+          }
+        }
+      } catch {
+      }
+      return nextPath;
+    }
     var import_fs7;
     var import_path7;
     var import_module;
     var import_meta;
     var DatabaseCtor;
-    var BeadsDB;
-    var init_beads_db = __esm2({
-      "src/mesh/beads-db.ts"() {
+    var MeshRuntimeStore;
+    var init_mesh_runtime_store = __esm2({
+      "src/mesh/mesh-runtime-store.ts"() {
         "use strict";
         import_fs7 = require("fs");
         import_path7 = require("path");
@@ -38121,7 +38139,7 @@ Valid status values: \`completed\` | \`failed\` | \`blocked\` | \`partial\`.`;
         init_mesh_ledger();
         init_mesh_work_queue();
         import_meta = {};
-        BeadsDB = class _BeadsDB {
+        MeshRuntimeStore = class _MeshRuntimeStore {
           static instance;
           db;
           dbPath;
@@ -38144,7 +38162,7 @@ Valid status values: \`completed\` | \`failed\` | \`blocked\` | \`partial\`.`;
           }
           static getInstance() {
             if (!this.instance) {
-              this.instance = new _BeadsDB((0, import_path7.join)(getLedgerDir(), "beads.db"));
+              this.instance = new _MeshRuntimeStore(meshRuntimeStorePath());
             }
             return this.instance;
           }
@@ -38229,13 +38247,13 @@ Valid status values: \`completed\` | \`failed\` | \`blocked\` | \`partial\`.`;
             this.db.prepare("DELETE FROM mesh_completion_fingerprints WHERE expires_at <= ?").run(Date.now());
           }
           maybeCheckpointWal() {
-            if (++this.walWriteCounter < _BeadsDB.WAL_CHECK_INTERVAL) return;
+            if (++this.walWriteCounter < _MeshRuntimeStore.WAL_CHECK_INTERVAL) return;
             this.walWriteCounter = 0;
             try {
               const walPath = `${this.dbPath}-wal`;
               if (!(0, import_fs7.existsSync)(walPath)) return;
               const size = (0, import_fs7.statSync)(walPath).size;
-              if (size < _BeadsDB.WAL_MAX_BYTES) return;
+              if (size < _MeshRuntimeStore.WAL_MAX_BYTES) return;
               process.stderr.write(
                 `[adhdev-mesh] WAL file ${Math.round(size / 1024 / 1024)}MB exceeds threshold; forcing checkpoint
 `
@@ -38544,7 +38562,7 @@ Valid status values: \`completed\` | \`failed\` | \`blocked\` | \`partial\`.`;
       __clearDirectDispatchesForTests: () => __clearDirectDispatchesForTests,
       __clearMeshQueueForTests: () => __clearMeshQueueForTests,
       __replaceMeshQueueForTests: () => __replaceMeshQueueForTests,
-      __resetBeadsDBForTests: () => __resetBeadsDBForTests,
+      __resetMeshRuntimeStoreForTests: () => __resetMeshRuntimeStoreForTests,
       buildMeshNodeCapabilityTags: () => buildMeshNodeCapabilityTags,
       cancelTask: () => cancelTask,
       claimNextTask: () => claimNextTask,
@@ -38622,7 +38640,7 @@ Valid status values: \`completed\` | \`failed\` | \`blocked\` | \`partial\`.`;
       return required2.every((tag) => available.has(tag));
     }
     function withQueueLock(_meshId, fn) {
-      return BeadsDB.getInstance().transaction(fn);
+      return MeshRuntimeStore.getInstance().transaction(fn);
     }
     function enqueueTask(meshId, message, opts) {
       requireMeshHostQueueOwner(opts);
@@ -38642,55 +38660,55 @@ Valid status values: \`completed\` | \`failed\` | \`blocked\` | \`partial\`.`;
         createdAt: (/* @__PURE__ */ new Date()).toISOString(),
         updatedAt: (/* @__PURE__ */ new Date()).toISOString()
       };
-      BeadsDB.getInstance().insertQueueEntry(entry);
+      MeshRuntimeStore.getInstance().insertQueueEntry(entry);
       return entry;
     }
     function getQueue(meshId, opts) {
-      return BeadsDB.getInstance().getQueueEntries(meshId, opts?.status?.length ? opts.status : void 0);
+      return MeshRuntimeStore.getInstance().getQueueEntries(meshId, opts?.status?.length ? opts.status : void 0);
     }
     function getMeshQueueRevision(meshId) {
-      return BeadsDB.getInstance().getQueueRevision(meshId);
+      return MeshRuntimeStore.getInstance().getQueueRevision(meshId);
     }
     function claimNextTask(meshId, nodeId, sessionId, capabilityTags) {
-      return BeadsDB.getInstance().claimNextQueueTask(meshId, nodeId, sessionId, capabilityTags);
+      return MeshRuntimeStore.getInstance().claimNextQueueTask(meshId, nodeId, sessionId, capabilityTags);
     }
     function updateTaskStatus(meshId, taskId, status, opts) {
       requireMeshHostQueueOwner(opts);
       return withQueueLock(meshId, () => {
-        const entry = BeadsDB.getInstance().findQueueEntryById(meshId, taskId);
+        const entry = MeshRuntimeStore.getInstance().findQueueEntryById(meshId, taskId);
         if (!entry) return null;
         entry.status = status;
-        BeadsDB.getInstance().updateQueueEntry(entry);
+        MeshRuntimeStore.getInstance().updateQueueEntry(entry);
         return entry;
       });
     }
     function recordTaskAutoLaunch(meshId, taskId, autoLaunch) {
       return withQueueLock(meshId, () => {
-        const entry = BeadsDB.getInstance().findQueueEntryById(meshId, taskId);
+        const entry = MeshRuntimeStore.getInstance().findQueueEntryById(meshId, taskId);
         if (!entry) return null;
         const now = (/* @__PURE__ */ new Date()).toISOString();
         entry.autoLaunch = { ...autoLaunch, updatedAt: now };
-        BeadsDB.getInstance().updateQueueEntry(entry);
+        MeshRuntimeStore.getInstance().updateQueueEntry(entry);
         return entry;
       });
     }
     function cancelTask(meshId, taskId, opts) {
       requireMeshHostQueueOwner(opts);
       return withQueueLock(meshId, () => {
-        const entry = BeadsDB.getInstance().findQueueEntryById(meshId, taskId);
+        const entry = MeshRuntimeStore.getInstance().findQueueEntryById(meshId, taskId);
         if (!entry) return null;
         const now = (/* @__PURE__ */ new Date()).toISOString();
         entry.status = "cancelled";
         entry.cancelledAt = now;
         if (opts?.reason) entry.cancelReason = opts.reason;
-        BeadsDB.getInstance().updateQueueEntry(entry);
+        MeshRuntimeStore.getInstance().updateQueueEntry(entry);
         return entry;
       });
     }
     function requeueTask(meshId, taskId, opts) {
       requireMeshHostQueueOwner(opts);
       return withQueueLock(meshId, () => {
-        const entry = BeadsDB.getInstance().findQueueEntryById(meshId, taskId);
+        const entry = MeshRuntimeStore.getInstance().findQueueEntryById(meshId, taskId);
         if (!entry) return null;
         entry.status = "pending";
         delete entry.assignedNodeId;
@@ -38704,22 +38722,22 @@ Valid status values: \`completed\` | \`failed\` | \`blocked\` | \`partial\`.`;
         entry.requeuedAt = (/* @__PURE__ */ new Date()).toISOString();
         entry.requeueCount = (entry.requeueCount || 0) + 1;
         if (opts?.reason) entry.requeueReason = opts.reason;
-        BeadsDB.getInstance().updateQueueEntry(entry);
+        MeshRuntimeStore.getInstance().updateQueueEntry(entry);
         return entry;
       });
     }
     function updateSessionTaskStatus(meshId, sessionId, status, opts) {
       return withQueueLock(meshId, () => {
         const occurredAtIso = opts?.occurredAt ? new Date(opts.occurredAt).toISOString() : void 0;
-        const entry = BeadsDB.getInstance().findAssignedBySession(meshId, sessionId, occurredAtIso);
+        const entry = MeshRuntimeStore.getInstance().findAssignedBySession(meshId, sessionId, occurredAtIso);
         if (!entry) return null;
         entry.status = status;
-        BeadsDB.getInstance().updateQueueEntry(entry);
+        MeshRuntimeStore.getInstance().updateQueueEntry(entry);
         return entry;
       });
     }
     function getMeshQueueStats(meshId) {
-      const rows = BeadsDB.getInstance().getQueueStatsByStatus(meshId);
+      const rows = MeshRuntimeStore.getInstance().getQueueStatsByStatus(meshId);
       const counts = {};
       for (const r of rows) counts[r.status] = r.count;
       const pending = counts["pending"] ?? 0;
@@ -38738,26 +38756,26 @@ Valid status values: \`completed\` | \`failed\` | \`blocked\` | \`partial\`.`;
         cancelled,
         activeCounts: { pending, assigned },
         historicalCounts: { completed, failed, cancelled },
-        activeAssignments: BeadsDB.getInstance().getActiveAssignmentDetails(meshId)
+        activeAssignments: MeshRuntimeStore.getInstance().getActiveAssignmentDetails(meshId)
       };
     }
     function __replaceMeshQueueForTests(meshId, queue) {
-      BeadsDB.getInstance().transaction(() => {
-        BeadsDB.getInstance().replaceQueue(meshId, queue);
+      MeshRuntimeStore.getInstance().transaction(() => {
+        MeshRuntimeStore.getInstance().replaceQueue(meshId, queue);
       });
     }
     function __clearMeshQueueForTests(meshId) {
-      BeadsDB.getInstance().deleteQueue(meshId);
+      MeshRuntimeStore.getInstance().deleteQueue(meshId);
     }
     function __clearDirectDispatchesForTests(meshId) {
-      BeadsDB.getInstance().deleteDirectDispatches(meshId);
+      MeshRuntimeStore.getInstance().deleteDirectDispatches(meshId);
     }
-    function __resetBeadsDBForTests() {
-      BeadsDB.resetForTests();
+    function __resetMeshRuntimeStoreForTests() {
+      MeshRuntimeStore.resetForTests();
     }
     function insertDirectDispatch(meshId, data) {
       try {
-        BeadsDB.getInstance().insertDirectDispatch({ ...data, meshId });
+        MeshRuntimeStore.getInstance().insertDirectDispatch({ ...data, meshId });
       } catch (e) {
         process.stderr.write(`[adhdev-mesh] insertDirectDispatch failed for task ${data.taskId}: ${e?.message || e}
 `);
@@ -38765,26 +38783,26 @@ Valid status values: \`completed\` | \`failed\` | \`blocked\` | \`partial\`.`;
     }
     function getActiveDirectDispatches(meshId) {
       try {
-        return BeadsDB.getInstance().getActiveDirectDispatches(meshId);
+        return MeshRuntimeStore.getInstance().getActiveDirectDispatches(meshId);
       } catch {
         return [];
       }
     }
     function updateDirectDispatchStatus(meshId, sessionId, status) {
       try {
-        BeadsDB.getInstance().updateDirectDispatchStatus(meshId, sessionId, status);
+        MeshRuntimeStore.getInstance().updateDirectDispatchStatus(meshId, sessionId, status);
       } catch {
       }
     }
     function cleanupTerminalDirectDispatches(olderThanMs = 7 * 24 * 60 * 6e4) {
       try {
-        BeadsDB.getInstance().cleanupTerminalDirectDispatches(olderThanMs);
+        MeshRuntimeStore.getInstance().cleanupTerminalDirectDispatches(olderThanMs);
       } catch {
       }
     }
     function markStaleDirectDispatches(meshId, olderThanMs = 60 * 6e4) {
       try {
-        BeadsDB.getInstance().markStaleDirectDispatches(meshId, olderThanMs);
+        MeshRuntimeStore.getInstance().markStaleDirectDispatches(meshId, olderThanMs);
       } catch {
       }
     }
@@ -38798,7 +38816,7 @@ Valid status values: \`completed\` | \`failed\` | \`blocked\` | \`partial\`.`;
         "use strict";
         import_crypto5 = require("crypto");
         init_mesh_host_ownership();
-        init_beads_db();
+        init_mesh_runtime_store();
         ACTIVE_MESH_QUEUE_STATUSES = ["pending", "assigned"];
         HISTORICAL_MESH_QUEUE_STATUSES = ["completed", "failed", "cancelled"];
         MESH_TASK_MODES = ["code_change", "validation", "live_debug_readonly", "launch_app", "convergence"];
@@ -38978,7 +38996,7 @@ Valid status values: \`completed\` | \`failed\` | \`blocked\` | \`partial\`.`;
     }
     function sweepExpiredRemoteIdleSessions() {
       try {
-        BeadsDB.getInstance().pruneExpiredRemoteIdleSessions();
+        MeshRuntimeStore.getInstance().pruneExpiredRemoteIdleSessions();
       } catch {
       }
     }
@@ -39254,14 +39272,14 @@ Valid status values: \`completed\` | \`failed\` | \`blocked\` | \`partial\`.`;
     }
     function hasFingerprintSeen(fingerprint) {
       try {
-        return BeadsDB.getInstance().hasCompletionFingerprint(fingerprint);
+        return MeshRuntimeStore.getInstance().hasCompletionFingerprint(fingerprint);
       } catch {
         return false;
       }
     }
     function recordFingerprintSeen(fingerprint) {
       try {
-        const db = BeadsDB.getInstance();
+        const db = MeshRuntimeStore.getInstance();
         db.recordCompletionFingerprint(fingerprint, RECENT_COMPLETION_FINGERPRINT_TTL_MS);
         db.sweepExpiredFingerprints();
       } catch {
@@ -39881,7 +39899,7 @@ Valid status values: \`completed\` | \`failed\` | \`blocked\` | \`partial\`.`;
       }
       let remoteSessions = [];
       try {
-        remoteSessions = BeadsDB.getInstance().getRemoteIdleSessions();
+        remoteSessions = MeshRuntimeStore.getInstance().getRemoteIdleSessions();
       } catch {
       }
       for (const idle of remoteSessions) {
@@ -39891,7 +39909,7 @@ Valid status values: \`completed\` | \`failed\` | \`blocked\` | \`partial\`.`;
           const assigned = tryAssignQueueTask(components, meshId, idle.nodeId, idle.sessionId, idle.providerType);
           if (assigned) {
             try {
-              BeadsDB.getInstance().deleteRemoteIdleSession(idle.nodeId, idle.sessionId);
+              MeshRuntimeStore.getInstance().deleteRemoteIdleSession(idle.nodeId, idle.sessionId);
             } catch {
             }
           }
@@ -40093,7 +40111,7 @@ Next step: ${nextStep}`;
       if (intentionalCleanupStop) {
         if (eventSessionId && eventNodeId) {
           try {
-            BeadsDB.getInstance().deleteRemoteIdleSession(eventNodeId, eventSessionId);
+            MeshRuntimeStore.getInstance().deleteRemoteIdleSession(eventNodeId, eventSessionId);
           } catch {
           }
         }
@@ -40261,14 +40279,14 @@ Next step: ${nextStep}`;
         if (sessionId && nodeId && providerType) {
           sweepExpiredRemoteIdleSessions();
           try {
-            BeadsDB.getInstance().setRemoteIdleSession(nodeId, sessionId, providerType, Date.now() + REMOTE_IDLE_SESSION_TTL_MS);
+            MeshRuntimeStore.getInstance().setRemoteIdleSession(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) BeadsDB.getInstance().deleteRemoteIdleSession(nodeId, sessionId);
+                if (assigned) MeshRuntimeStore.getInstance().deleteRemoteIdleSession(nodeId, sessionId);
               } catch (e) {
                 LOG2.warn("MeshQueue", `Failed to assign idle queue task after maintenance for ${nodeId}: ${e?.message || e}`);
               }
@@ -40280,7 +40298,7 @@ Next step: ${nextStep}`;
         const nodeId = readNonEmptyString2(args.nodeId) || readNonEmptyString2(args.metadataEvent.meshNodeId);
         if (sessionId && nodeId) {
           try {
-            BeadsDB.getInstance().deleteRemoteIdleSession(nodeId, sessionId);
+            MeshRuntimeStore.getInstance().deleteRemoteIdleSession(nodeId, sessionId);
           } catch {
           }
         }
@@ -40292,7 +40310,7 @@ Next step: ${nextStep}`;
         const nodeId = readNonEmptyString2(args.nodeId) || readNonEmptyString2(args.metadataEvent.meshNodeId);
         if (sessionId && nodeId) {
           try {
-            BeadsDB.getInstance().deleteRemoteIdleSession(nodeId, sessionId);
+            MeshRuntimeStore.getInstance().deleteRemoteIdleSession(nodeId, sessionId);
           } catch {
           }
         }
@@ -40582,7 +40600,7 @@ Next step: ${nextStep}`;
         init_logger();
         init_mesh_ledger();
         init_mesh_work_queue();
-        init_beads_db();
+        init_mesh_runtime_store();
         init_mesh_fast_forward();
         REMOTE_IDLE_SESSION_TTL_MS = 5 * 60 * 1e3;
         meshByWorkspaceCache = /* @__PURE__ */ new Map();
@@ -43527,11 +43545,12 @@ ${cont}` : cont;
           }
           applyGenerating(ctx) {
             const { modal, parsedMessages, lastParsedAssistant, parsedStatus, prevStatus } = ctx;
+            const noActiveTurn = !this.currentTurnScope;
+            if (!this.isWaitingForResponse && noActiveTurn && !modal) return;
             this.clearIdleFinishCandidate("generating");
             this.cancelPendingIdleFinish("generating_signal_returned");
             const snap = this.transport.getSnapshot();
             const effectiveScreenText = snap.screenText || snap.accumulatedBuffer;
-            const noActiveTurn = !this.currentTurnScope;
             const looksIdleChrome = /(^|\n)\s*[❯›>]\s*(?:\n|$)/m.test(effectiveScreenText);
             const parsedShowsLiveProgress = parsedStatus === "generating" && !!lastParsedAssistant;
             if (prevStatus === "idle" && !this.isWaitingForResponse && noActiveTurn && !modal && looksIdleChrome && !parsedShowsLiveProgress) return;
@@ -43791,7 +43810,25 @@ ${cont}` : cont;
             const parsedStatus = typeof parsed?.status === "string" ? parsed.status.trim() : "";
             if (parsedStatus !== "idle") return true;
             if (parsed?.activeModal || parsed?.modal) return true;
-            return !this.parsedStatusHasFinalStandardAssistantMessage(parsed);
+            const messages = Array.isArray(parsed?.messages) ? parsed.messages : [];
+            let lastUserIdx = -1;
+            for (let i = messages.length - 1; i >= 0; i--) {
+              if (messages[i]?.role === "user") {
+                lastUserIdx = i;
+                break;
+              }
+            }
+            if (lastUserIdx < 0) {
+              if (messages.length === 0) return false;
+              return !this.parsedStatusHasFinalStandardAssistantMessage(parsed);
+            }
+            const hasCurrentTurnAssistant = messages.slice(lastUserIdx + 1).some((m) => {
+              if (!m || m.role !== "assistant") return false;
+              if (typeof m.content !== "string" || !m.content.trim()) return false;
+              const kind = typeof m.kind === "string" && m.kind.trim() ? m.kind.trim() : "standard";
+              return kind === "standard" && m.meta?.streaming !== true;
+            });
+            return !hasCurrentTurnAssistant;
           }
           rescheduleTranscriptFinishCheck(reason) {
             this.clearIdleFinishCandidate(reason);
@@ -46567,14 +46604,19 @@ ${lastSnapshot}`;
         if (question.multiSelect) throw new Error("Claude TUI multi-select prompts are not supported yet");
         const answer = response.answers[question.questionId];
         if (!answer) throw new Error(`Missing answer for ${question.questionId}`);
-        if (answer.freeformText) throw new Error("Claude TUI freeform answers are not supported yet");
-        if (answer.selectedLabels.length !== 1) throw new Error(`Expected one selected label for ${question.questionId}`);
-        const selectedIndex = question.options.findIndex((option) => option.label === answer.selectedLabels[0]);
-        if (selectedIndex < 0) throw new Error(`Unknown option for ${question.questionId}: ${answer.selectedLabels[0]}`);
-        for (let i = 0; i < selectedIndex; i += 1) {
-          steps.push("\x1B[B");
+        const freeformText = answer.freeformText?.trim() ?? "";
+        if (freeformText) {
+          const typeOptionIndex = question.options.findIndex((o) => /^Type something\.?$/i.test(o.label));
+          const optionNumber = typeOptionIndex >= 0 ? typeOptionIndex + 1 : question.options.length;
+          steps.push(String(optionNumber));
+          for (const ch of freeformText) steps.push(ch);
+          steps.push("\r");
+        } else {
+          if (answer.selectedLabels.length !== 1) throw new Error(`Expected one selected label for ${question.questionId}`);
+          const selectedIndex = question.options.findIndex((option) => option.label === answer.selectedLabels[0]);
+          if (selectedIndex < 0) throw new Error(`Unknown option for ${question.questionId}: ${answer.selectedLabels[0]}`);
+          steps.push(String(selectedIndex + 1));
         }
-        steps.push("\r");
       }
       steps.push("\r");
       return steps;
@@ -54797,6 +54839,7 @@ ${effect.notification.body || ""}`.trim();
       if (hasApprovalButtons(opts?.activeModal)) return "waiting_approval";
       const normalized = String(status || "idle").trim().toLowerCase();
       if (normalized === "waiting_approval") return "waiting_approval";
+      if (normalized === "waiting_choice") return "waiting_choice";
       if (WORKING_STATUSES.has(normalized)) return "generating";
       if (normalized === "error") return "error";
       if (normalized === "stopped") return "stopped";
@@ -60765,10 +60808,47 @@ ${formatManifestValidationIssues2(validation.issues)}`,
       for (const sec of spec.layout.sections) {
         let from = 0;
         let to = total;
-        if (sec.from_top !== void 0) {
+        if (sec.anchor_regex !== void 0) {
+          try {
+            const re = new RegExp(sec.anchor_regex, sec.anchor_flags ?? "");
+            const prevRe = sec.anchor_context?.prev !== void 0 ? new RegExp(sec.anchor_context.prev, sec.anchor_context.prev_flags ?? "") : null;
+            const nextRe = sec.anchor_context?.next !== void 0 ? new RegExp(sec.anchor_context.next, sec.anchor_context.next_flags ?? "") : null;
+            const matches = (i) => re.test(lines[i]) && (prevRe === null || i > 0 && prevRe.test(lines[i - 1])) && (nextRe === null || i < total - 1 && nextRe.test(lines[i + 1]));
+            let idx = -1;
+            if (sec.anchor_last) {
+              for (let i = total - 1; i >= 0; i--) {
+                if (matches(i)) {
+                  idx = i;
+                  break;
+                }
+              }
+            } else {
+              for (let i = 0; i < total; i++) {
+                if (matches(i)) {
+                  idx = i;
+                  break;
+                }
+              }
+            }
+            if (idx !== -1) {
+              from = idx;
+              to = total;
+              if (sec.until_regex !== void 0) {
+                try {
+                  const ure = new RegExp(sec.until_regex, sec.until_regex_flags ?? "");
+                  const end = lines.findIndex((l, i) => i > idx && ure.test(l));
+                  if (end !== -1) to = end;
+                } catch {
+                }
+              } else if (sec.lines !== void 0) {
+                to = Math.min(total, from + sec.lines);
+              }
+            }
+          } catch {
+          }
+        } else if (sec.from_top !== void 0) {
           from = resolveSize(sec.from_top, total);
-        }
-        if (sec.from_bottom !== void 0) {
+        } else if (sec.from_bottom !== void 0) {
           const sz = resolveSize(sec.from_bottom, total);
           from = total - sz;
           to = total;
@@ -61082,6 +61162,9 @@ ${formatManifestValidationIssues2(validation.issues)}`,
           "type": "string",
           "minLength": 1
         },
+        "requiresFinalAssistantBeforeIdle": {
+          "type": "boolean"
+        },
         "debounce": {
           "type": "object",
           "additionalProperties": false,
@@ -61096,7 +61179,8 @@ ${formatManifestValidationIssues2(validation.issues)}`,
                 "section": { "type": "string", "minLength": 1 },
                 "regex": { "type": "string", "minLength": 1 },
                 "flags": { "type": "string" },
-                "hold_ms": { "type": "integer", "minimum": 0 }
+                "hold_ms": { "type": "integer", "minimum": 0 },
+                "force_after_ms": { "type": "integer", "minimum": 0 }
               }
             }
           }
@@ -61144,7 +61228,23 @@ ${formatManifestValidationIssues2(validation.issues)}`,
                   "type": "string"
                 }
               }
-            }
+            },
+            "anchor_regex": { "type": "string", "minLength": 1 },
+            "anchor_flags": { "type": "string" },
+            "anchor_last": { "type": "boolean" },
+            "anchor_context": {
+              "type": "object",
+              "additionalProperties": false,
+              "properties": {
+                "prev": { "type": "string" },
+                "prev_flags": { "type": "string" },
+                "next": { "type": "string" },
+                "next_flags": { "type": "string" }
+              }
+            },
+            "lines": { "type": "integer", "minimum": 1 },
+            "until_regex": { "type": "string", "minLength": 1 },
+            "until_regex_flags": { "type": "string" }
           }
         },
         "sectionRegex": {
@@ -61576,6 +61676,7 @@ ${formatManifestValidationIssues2(validation.issues)}`,
     function resolveSpecPath(providerDir) {
       return path18.join(providerDir, "spec.json");
     }
+    init_logger();
     var STARTUP_GRACE_MS = 2500;
     var BUSY_HOLD_MS = 6e3;
     var SUBMIT_DELAY_FLOOR_MS = 200;
@@ -61603,9 +61704,16 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         return null;
       }
     }
-    function matchesCompletionIdleTargetState(spec, ev, screen) {
+    function matchesCompletionIdleTargetState(spec, ev, screen, cursor) {
       const target = spec.states.find((state) => state.id === spec.default_state) ?? spec.states.find((state) => state.id === "idle");
-      if (!target?.when?.regex) return false;
+      if (!target?.when) return false;
+      const hasCursorGuard = target.when.cursor_row_min !== void 0 || target.when.cursor_row_max !== void 0 || target.when.cursor_col_min !== void 0 || target.when.cursor_col_max !== void 0;
+      if (hasCursorGuard && cursor !== void 0) {
+        const { cursor_row_min, cursor_row_max, cursor_col_min, cursor_col_max } = target.when;
+        const cursorOk = (cursor_row_min === void 0 || cursor.row >= cursor_row_min) && (cursor_row_max === void 0 || cursor.row <= cursor_row_max) && (cursor_col_min === void 0 || cursor.col >= cursor_col_min) && (cursor_col_max === void 0 || cursor.col <= cursor_col_max);
+        if (cursorOk) return true;
+      }
+      if (!target.when.regex) return false;
       const haystack = target.when.section ? ev.sections.find((section) => section.id === target.when.section)?.text ?? "" : screen;
       if (!haystack) return false;
       try {
@@ -61767,6 +61875,7 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         if (this.busyExpiryTimer) clearTimeout(this.busyExpiryTimer);
         this.busyExpiryTimer = setTimeout(() => {
           this.busyExpiryTimer = null;
+          LOG2.debug("SpecDriver", `[${this.opts.specPath.split("/").slice(-3).join("/")}] busyExpiry fired holdMs=${holdMs}`);
           this.reevaluate();
         }, Math.max(holdMs + 50, 100));
       }
@@ -61791,11 +61900,16 @@ ${formatManifestValidationIssues2(validation.issues)}`,
             if (completionKey !== this.completionIdleKey) {
               this.completionIdleKey = completionKey;
               this.completionIdleFirstSeenAt = now;
+              LOG2.debug("SpecDriver", `[${this.opts.specPath.split("/").slice(-3).join("/")}] completion_idle_after matched: key="${completionKey}"`);
             }
             const holdMs = Math.max(0, completionIdleRule.hold_ms || 0);
+            const forceAfterMs = typeof completionIdleRule.force_after_ms === "number" ? completionIdleRule.force_after_ms : null;
             const ageMs = now - this.completionIdleFirstSeenAt;
             if (ageMs >= holdMs) {
-              if (matchesCompletionIdleTargetState(this.spec, ev, screen)) {
+              const targetMatches = matchesCompletionIdleTargetState(this.spec, ev, screen, cursor);
+              const forced = !targetMatches && forceAfterMs !== null && ageMs >= holdMs + forceAfterMs;
+              LOG2.debug("SpecDriver", `[${this.opts.specPath.split("/").slice(-3).join("/")}] completion_idle_after hold expired ageMs=${ageMs} targetState=${targetMatches} forced=${forced} screenTail="${screen.split(/\r?\n/).slice(-3).join("\\n").slice(-200)}"`);
+              if (targetMatches || forced) {
                 const idle = this.spec.states.find((state) => state.id === this.spec.default_state) ?? this.spec.states.find((state) => state.id === "idle");
                 evState = idle ? { id: idle.id, label: idle.label, title: null } : { id: "idle", label: "Ready", title: null };
               } else {
@@ -62926,16 +63040,19 @@ ${formatManifestValidationIssues2(validation.issues)}`,
           controlValues: this.controlValues
         });
         const activeChatStatus = parseErrorMessage ? "error" : autoApproveActive && parsedStatus?.status === "waiting_approval" ? "generating" : adapterStatus.status !== "idle" ? visibleStatus : suppressStaleParsedBusyStatus ? visibleStatus : parsedChatStatus || visibleStatus;
+        const hasInteractivePrompt = !!this.activeInteractivePrompt;
+        const finalStatus = hasInteractivePrompt ? "waiting_choice" : visibleStatus;
+        const finalChatStatus = hasInteractivePrompt ? "waiting_choice" : activeChatStatus;
         return {
           type: this.type,
           name: this.provider.name,
           category: "cli",
-          status: visibleStatus,
+          status: finalStatus,
           mode: this.presentationMode,
           activeChat: {
             id: activeChatId,
             title: parsedStatus?.title || dirName,
-            status: activeChatStatus,
+            status: finalChatStatus,
             messages: statusMessages,
             activeModal: autoApproveActive ? null : parsedStatus?.activeModal ?? adapterStatus.activeModal,
             activeInteractivePrompt: this.activeInteractivePrompt,
@@ -63406,6 +63523,7 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         const adapterOwnsMessagesElsewhere = this.adapter?.chatMessagesOwnedExternally === true;
         const finalAssistantEvidence = this.completionFinalAssistantEvidence(parsed?.messages);
         const allowMissingAssistantTimeout = !!(this.settings.meshNodeFor || this.settings.meshActiveTaskId || this.settings.launchedByCoordinator);
+        LOG2.debug("CLI", `[${this.type}] finalAssistantEvidence: present=${finalAssistantEvidence.present} source=${finalAssistantEvidence.source} adapterOwnsMessagesElsewhere=${adapterOwnsMessagesElsewhere} parsedStatus=${parsedStatus}`);
         if (!finalAssistantEvidence.present) {
           if (adapterOwnsMessagesElsewhere) {
             if (finalAssistantEvidence.source === "external-native") {
@@ -63414,6 +63532,10 @@ ${formatManifestValidationIssues2(validation.issues)}`,
                 LOG2.info("CLI", `[${this.type}] external transcript probe: msgCount=${probe.msgCount} lastRole=${probe.lastRole || "none"} lastKind=${probe.lastKind || "none"} contentLen=${probe.contentLen} sourceMtime=${probe.sourceMtimeMs ?? "unknown"} mtimeAge=${probe.mtimeAgeMs ?? "unknown"}ms`);
                 pending.loggedTranscriptProbe = true;
               }
+              LOG2.debug("CLI", `[${this.type}] external-native probe result: lastRole=${probe?.lastRole} contentLen=${probe?.contentLen}`);
+              if (probe?.lastRole === "assistant" && (probe.contentLen ?? 0) > 0) {
+                return null;
+              }
               if (this.type === "antigravity-cli") {
                 return null;
               }
@@ -63423,6 +63545,7 @@ ${formatManifestValidationIssues2(validation.issues)}`,
               return { reason: "missing_final_assistant", terminal: true, allowTimeout: allowMissingAssistantTimeout };
             }
           } else {
+            LOG2.debug("CLI", `[${this.type}] missing_final_assistant (not ownsExternal) requiresFinalAssistant=${!!this.provider.requiresFinalAssistantBeforeIdle}`);
             return {
               reason: "missing_final_assistant",
               terminal: this.provider.requiresFinalAssistantBeforeIdle === true,
@@ -63456,6 +63579,7 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         const latestAutoApproveActive = latestStatus.status === "waiting_approval" && this.shouldAutoApprove();
         const externalNativeFinal = this.getExternalNativeFinalReconciliation(void 0, latestStatus);
         const latestVisibleStatus = externalNativeFinal && isCliGeneratingLikeStatus(latestStatus.status) ? "idle" : latestAutoApproveActive ? "generating" : latestStatus.status;
+        LOG2.debug("CLI", `[${this.type}] flush attempt: adapterStatus=${latestStatus.status} latestVisible=${latestVisibleStatus} externalNativeFinal=${!!externalNativeFinal} generatingStartedAt=${this.generatingStartedAt} isWaitingForResponse=${!!this.adapter?.isWaitingForResponse} hasPartial=${!!this.adapter.getPartialResponse?.()}`);
         if (latestVisibleStatus !== "idle") {
           LOG2.info("CLI", `[${this.type}] cancelled pending completed (resumed ${latestVisibleStatus})`);
           this.completedDebouncePending = null;
@@ -63466,6 +63590,7 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         if (block2) {
           const blockReason = block2.reason;
           const waitedMs = Date.now() - pending.firstObservedAt;
+          LOG2.debug("CLI", `[${this.type}] finalization block: reason=${blockReason} terminal=${block2.terminal} waitedMs=${waitedMs} maxWait=${COMPLETED_FINALIZATION_MAX_WAIT_MS}`);
           if (block2.terminal && !block2.allowTimeout || waitedMs < COMPLETED_FINALIZATION_MAX_WAIT_MS) {
             if (pending.loggedBlockReason !== blockReason) {
               LOG2.info("CLI", `[${this.type}] waiting to emit completed until transcript finalizes (${blockReason})`);
@@ -63580,9 +63705,13 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         if (newStatus !== this.lastStatus) {
           LOG2.info("CLI", `[${this.type}] status: ${this.lastStatus} \u2192 ${newStatus}`);
           if (this.lastStatus === "idle" && newStatus === "generating") {
+            if (this.completedDebouncePending && this.generatingStartedAt === 0) {
+              LOG2.debug("CLI", `[${this.type}] ignoring post-completion PTY generating blip (generatingStartedAt=0)`);
+              return;
+            }
             this.suppressIdleHistoryReplay = false;
             if (this.completedDebouncePending) {
-              LOG2.info("CLI", `[${this.type}] cancelled pending completed (resumed generating)`);
+              LOG2.info("CLI", `[${this.type}] cancelled pending completed (resumed generating) generatingStartedAt=${this.generatingStartedAt} isWaitingForResponse=${!!this.adapter?.isWaitingForResponse}`);
               if (this.completedDebounceTimer) {
                 clearTimeout(this.completedDebounceTimer);
                 this.completedDebounceTimer = null;
@@ -63680,7 +63809,10 @@ ${formatManifestValidationIssues2(validation.issues)}`,
                 firstObservedAt: now,
                 previousStatus: this.lastStatus
               };
-              this.scheduleCompletedDebounceFlush(3e3);
+              const ownsExternalHistory = !!this.adapter?.chatMessagesOwnedExternally;
+              const flushDelay = ownsExternalHistory ? 0 : 3e3;
+              LOG2.debug("CLI", `[${this.type}] set completedDebouncePending duration=${duration3}s ownsExternalHistory=${ownsExternalHistory} flushDelay=${flushDelay}ms generatingStartedAt=${this.generatingStartedAt}`);
+              this.scheduleCompletedDebounceFlush(flushDelay);
             }
           } else if (newStatus === "idle" && this.lastStatus === "starting") {
             this.pushEvent({ event: "agent:ready", chatTitle, timestamp: now });