@adhdev/daemon-standalone 0.9.82-rc.260 → 0.9.82-rc.261

package/dist/index.js

@@ -58358,8 +58358,12 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         this.rows = opts.rows ?? import_session_host_core6.DEFAULT_SESSION_HOST_ROWS;
         this.screenDebounceMs = opts.screenChangeDebounceMs ?? 80;
         this.tickIntervalMs = opts.tickIntervalMs ?? 0;
-        const { NodePtyTransportFactory: NodePtyTransportFactory2 } = (init_pty_transport(), __toCommonJS2(pty_transport_exports));
-        this.factory = opts.transportFactory ?? new NodePtyTransportFactory2();
+        if (opts.transportFactory) {
+          this.factory = opts.transportFactory;
+        } else {
+          const { NodePtyTransportFactory: NodePtyTransportFactory2 } = (init_pty_transport(), __toCommonJS2(pty_transport_exports));
+          this.factory = new NodePtyTransportFactory2();
+        }
         this.screen = new TerminalScreen(this.rows, this.cols);
       }
       rows;
@@ -58514,6 +58518,10 @@ ${formatManifestValidationIssues2(validation.issues)}`,
       specWatcher = null;
       /** Last full FSM evaluation, kept for the debugger. */
       lastFsmEval = null;
+      /** Ring buffer (max 20) of the full FSM evaluation captured at each
+       *  transition — the rich pre-transition table that lastFsmEval only keeps
+       *  for the single most recent evaluation. Separate from stateHistory. */
+      fsmSnapshotHistory = [];
       subscribe(listener) {
         this.listeners.add(listener);
         return () => {
@@ -58604,6 +58612,9 @@ ${formatManifestValidationIssues2(validation.issues)}`,
       getStateHistory() {
         return this.stateHistory;
       }
+      getFsmSnapshotHistory() {
+        return this.fsmSnapshotHistory;
+      }
       getSections() {
         try {
           const screen = this.adapter.snapshot();
@@ -58699,7 +58710,7 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         this.lastFsmEval = ev;
         this.prevScreenLines = currentLines;
         if (ev.fired) {
-          this.commitTransition(ev.fired, now);
+          this.commitTransition(ev.fired, now, ev);
           this.emitStateChanged(forceEmit);
           this.scheduleWakeForState();
           return;
@@ -58708,8 +58719,9 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         this.scheduleWakeForState();
         this.maybeMarkReady();
       }
-      commitTransition(fired, now) {
+      commitTransition(fired, now, ev) {
         const from = this.currentStateId;
+        this.pushFsmSnapshot(from, fired, now, ev);
         this.currentStateId = fired.to;
         this.stateEnteredAt = now;
         this.regionLastChangedAt.clear();
@@ -58720,6 +58732,22 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         });
         LOG2.info("FsmDriver", `[${this.specTag()}] ${from} \u2192 ${fired.to} (${fired.label})`);
       }
+      /** Snapshot the full FSM evaluation that produced a transition into the
+       *  separate fsmSnapshotHistory ring buffer (max 20). The transitions[]
+       *  table is captured by reference — it is freshly built per evaluation in
+       *  evaluateFsm and never mutated after, so no clone is needed. */
+      pushFsmSnapshot(from, fired, now, ev) {
+        this.fsmSnapshotHistory.push({
+          stateFrom: from,
+          stateTo: fired.to,
+          at: now,
+          firedTo: fired.to,
+          firedLabel: fired.label,
+          reason: summarizeTransition(fired),
+          transitions: ev.transitions
+        });
+        if (this.fsmSnapshotHistory.length > 20) this.fsmSnapshotHistory.shift();
+      }
       /** Re-derive the visible modal + controls for the current state and emit a
        *  state_changed if anything differs from the last emit. */
       emitStateChanged(forceEmit) {
@@ -59748,7 +59776,7 @@ ${formatManifestValidationIssues2(validation.issues)}`,
     function stripAnsi3(text) {
       return String(text || "").replace(/\x1B\][^\x07]*(?:\x07|\x1B\\)/g, "").replace(/\x1B[P^_X][\s\S]*?(?:\x07|\x1B\\)/g, "").replace(/\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g, "");
     }
-    var SpecCliAdapter = class {
+    var SpecCliAdapter = class _SpecCliAdapter {
       cliType;
       cliName;
       workingDir;
@@ -59773,6 +59801,23 @@ ${formatManifestValidationIssues2(validation.issues)}`,
       activeInteractivePrompt = null;
       interactivePromptTransport = null;
       claudeTuiPromptCaptureInFlight = false;
+      /**
+       * Wall clock of the first frame on which a held interactive prompt was
+       * observed to have left the screen. Mirrors the approval FSM's
+       * `modalLostAt` hysteresis (see cli-state-engine.ts): claude-cli's TUI
+       * repaints the choice picker as several PTY chunks, so a single frame
+       * with no "Enter to select" footer is not proof the prompt is gone — it
+       * may just be mid-repaint. We only clear the held prompt once it has
+       * been absent across a short grace window. Reset to null the moment the
+       * prompt footer reappears.
+       *
+       * Without this, a choice prompt resolved *directly in the terminal* (the
+       * user picked an option without going through ADHDev's
+       * setInteractivePromptResponse) was never cleared from
+       * `activeInteractivePrompt`, so getStatus() re-emitted the same prompt
+       * forever — the choice-resolve-stuck bug.
+       */
+      interactivePromptLostAt = null;
       jsonLineTail = "";
       exited = false;
       spawned = false;
@@ -60033,6 +60078,11 @@ ${formatManifestValidationIssues2(validation.issues)}`,
           // transition from the current state with its per-condition match
           // result + countdown — the canonical "why isn't it moving" answer.
           fsm: this.driver.getFsmDebug?.() ?? null,
+          // v4 FSM transition snapshot history (null for v3 specs). The full
+          // pre-transition evaluation table captured at each transition —
+          // answers "why did this rule fire" after the fact, unlike the live
+          // `fsm` field which only reflects the current instant.
+          fsmHistory: this.driver.getFsmSnapshotHistory?.() ?? null,
           // Extended fields
           name: this.cliName,
           status: this.getStatus().status,
@@ -60070,11 +60120,13 @@ ${formatManifestValidationIssues2(validation.issues)}`,
             if (ev.state.title) {
               LOG2.debug("SpecAdapter", `[${this.cliType}] state.title=${JSON.stringify(ev.state.title)}`);
             }
+            this.maybeClearResolvedClaudeTuiPrompt();
             this.maybeCaptureClaudeTuiPrompt();
             this.statusCallback?.();
             return;
           case "pty_data":
             this.detectInteractivePromptFromPtyChunk(ev.chunk);
+            this.maybeClearResolvedClaudeTuiPrompt();
             this.maybeCaptureClaudeTuiPrompt();
             try {
               this.ptyDataCallback?.(ev.chunk);
@@ -60107,6 +60159,7 @@ ${formatManifestValidationIssues2(validation.issues)}`,
             if (!prompt) continue;
             this.activeInteractivePrompt = prompt;
             this.interactivePromptTransport = "stream-json";
+            this.interactivePromptLostAt = null;
             this.statusCallback?.();
           } catch {
           }
@@ -60160,6 +60213,47 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         }
         return messages;
       }
+      /**
+       * Grace window a held interactive prompt must be absent from the screen
+       * before we treat it as resolved-in-terminal and clear it. claude-cli
+       * repaints the picker across multiple PTY chunks, so a single
+       * footer-less frame is not proof the prompt is gone. Sized in the same
+       * spirit as the approval FSM's `approvalCooldown` modal-lost hysteresis.
+       */
+      static INTERACTIVE_PROMPT_LOST_GRACE_MS = 1500;
+      /**
+       * Clear a held interactive prompt once the user has resolved it directly
+       * in the terminal (the choice picker leaves the screen without going
+       * through setInteractivePromptResponse). The approval path already does
+       * this via the FSM's modal-lost hysteresis; the interactive-prompt path
+       * had no equivalent, so a terminal-side answer left activeInteractivePrompt
+       * set and getStatus() re-emitted the same choice modal forever.
+       *
+       * Detection mirrors capture: the claude TUI picker is on-screen exactly
+       * while its "Enter to select" footer is rendered. When the footer is gone
+       * for INTERACTIVE_PROMPT_LOST_GRACE_MS the prompt is genuinely resolved.
+       */
+      maybeClearResolvedClaudeTuiPrompt() {
+        if (this.cliType !== "claude-cli" || !this.activeInteractivePrompt) return;
+        let screenText = "";
+        try {
+          screenText = this.driver.snapshot();
+        } catch {
+          return;
+        }
+        const stillOnScreen = screenText.includes("Enter to select");
+        if (stillOnScreen) {
+          this.interactivePromptLostAt = null;
+          return;
+        }
+        const lostAt = this.interactivePromptLostAt ?? Date.now();
+        if (this.interactivePromptLostAt === null) this.interactivePromptLostAt = lostAt;
+        if (Date.now() - lostAt < _SpecCliAdapter.INTERACTIVE_PROMPT_LOST_GRACE_MS) return;
+        this.activeInteractivePrompt = null;
+        this.interactivePromptTransport = null;
+        this.interactivePromptLostAt = null;
+        this.statusCallback?.();
+      }
       maybeCaptureClaudeTuiPrompt() {
         if (this.cliType !== "claude-cli" || this.activeInteractivePrompt || this.claudeTuiPromptCaptureInFlight) return;
         const screenText = this.driver.snapshot();
@@ -60173,6 +60267,7 @@ ${formatManifestValidationIssues2(validation.issues)}`,
           if (!prompt) return;
           this.activeInteractivePrompt = prompt;
           this.interactivePromptTransport = "tui";
+          this.interactivePromptLostAt = null;
           this.statusCallback?.();
           return;
         }
@@ -60209,6 +60304,7 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         if (!prompt) return;
         this.activeInteractivePrompt = prompt;
         this.interactivePromptTransport = "tui";
+        this.interactivePromptLostAt = null;
         this.statusCallback?.();
       }
       getDebugState() {
@@ -60263,6 +60359,9 @@ ${formatManifestValidationIssues2(validation.issues)}`,
           // and countdown. This is the canonical "why isn't it transitioning"
           // answer — no screenshots needed.
           fsm: this.driver.getFsmDebug?.() ?? null,
+          // v4 FSM transition snapshot history — the captured pre-transition
+          // evaluation table at each transition (null for v3 specs).
+          fsmHistory: this.driver.getFsmSnapshotHistory?.() ?? null,
           messages,
           committedMessages: messages
         };