@adhdev/daemon-core 0.9.6 → 0.9.7

package/dist/index.js

@@ -1512,8 +1512,35 @@ function promptLikelyVisible(screenText, promptSnippet) {
 function normalizeScreenSnapshot(text) {
   return sanitizeTerminalText(String(text || "")).replace(/\s+/g, " ").trim();
 }
+function shouldReflowComparableMessageLines(lines) {
+  return Array.isArray(lines) && lines.length > 1 && lines.slice(0, -1).every((line) => String(line || "").trim().length >= 48) && !lines.some((line) => /^```/.test(line)) && !lines.some((line) => /^\|/.test(line)) && !lines.some((line) => /^\s*(?:[-*+] |\d+\.\s)/.test(line));
+}
+function joinComparableMessageLines(lines) {
+  return lines.reduce((acc, line) => {
+    const next = String(line || "").trim();
+    if (!next) return acc;
+    if (!acc) return next;
+    if (/[,\d]$/.test(acc) && /^\d/.test(next)) {
+      return `${acc}${next}`;
+    }
+    if (/[A-Za-z]$/.test(acc) && /^\d/.test(next)) {
+      return `${acc}${next}`;
+    }
+    const fragmentMatch = acc.match(/([A-Za-z]{1,4})$/);
+    const fragment = fragmentMatch ? fragmentMatch[1].toLowerCase() : "";
+    if (/^[a-z]/.test(next) && fragment && !COMMON_COMPARABLE_WRAP_WORDS.has(fragment)) {
+      return `${acc}${next}`;
+    }
+    return `${acc} ${next}`;
+  }, "").replace(/\s+([,.;:!?])/g, "$1").replace(/(\d)\s+,/g, "$1,").replace(/\s+/g, " ").trim();
+}
 function normalizeComparableMessageContent(text) {
-  return String(text || "").replace(/\s+/g, " ").trim();
+  const lines = String(text || "").split(/\r\n|\n|\r/g).map((line) => line.trim()).filter(Boolean);
+  if (lines.length === 0) return "";
+  if (shouldReflowComparableMessageLines(lines)) {
+    return joinComparableMessageLines(lines);
+  }
+  return lines.join(" ").replace(/\s+/g, " ").trim();
 }
 function trimPromptEchoPrefix(text, promptText) {
   const prompt = normalizeComparableMessageContent(String(promptText || ""));
@@ -1546,9 +1573,6 @@ function getLastUserPromptText(messages) {
   }
   return "";
 }
-function looksLikeConfirmOnlyLabel(label) {
-  return /^(?:continue|confirm|ok|yes|trust|proceed|enter)$/i.test(String(label || "").trim());
-}
 function parsePatternEntry(x) {
   if (x instanceof RegExp) return x;
   if (x && typeof x === "object" && typeof x.source === "string") {
@@ -1575,7 +1599,7 @@ function normalizeCliProviderForRuntime(raw) {
     }
   };
 }
-var os8, path9, import_child_process4, buildCliSpawnEnv;
+var os8, path9, import_child_process4, buildCliSpawnEnv, COMMON_COMPARABLE_WRAP_WORDS;
 var init_provider_cli_shared = __esm({
   "src/cli-adapters/provider-cli-shared.ts"() {
     "use strict";
@@ -1584,6 +1608,32 @@ var init_provider_cli_shared = __esm({
     import_child_process4 = require("child_process");
     init_spawn_env();
     buildCliSpawnEnv = import_session_host_core.sanitizeSpawnEnv;
+    COMMON_COMPARABLE_WRAP_WORDS = /* @__PURE__ */ new Set([
+      "a",
+      "an",
+      "and",
+      "as",
+      "at",
+      "but",
+      "by",
+      "for",
+      "from",
+      "in",
+      "into",
+      "is",
+      "it",
+      "of",
+      "on",
+      "or",
+      "that",
+      "the",
+      "their",
+      "then",
+      "this",
+      "to",
+      "was",
+      "with"
+    ]);
   }
 });
 
@@ -1639,8 +1689,44 @@ function hydrateCliParsedMessages(parsedMessages, options) {
     };
   });
 }
+function chooseMoreComparableCliMessage(left, right) {
+  const leftComparable = normalizeComparableMessageContent(left.content || "");
+  const rightComparable = normalizeComparableMessageContent(right.content || "");
+  if (leftComparable && leftComparable === rightComparable) {
+    const leftNewlines = String(left.content || "").split(/\r\n|\n|\r/g).length - 1;
+    const rightNewlines = String(right.content || "").split(/\r\n|\n|\r/g).length - 1;
+    return rightNewlines < leftNewlines ? right : left;
+  }
+  return rightComparable.length > leftComparable.length ? right : left;
+}
+function dedupeConsecutiveComparableCliMessages(messages) {
+  const deduped = [];
+  for (const message of messages) {
+    const current = {
+      ...message,
+      content: typeof message.content === "string" ? message.content : String(message.content || "")
+    };
+    const previous = deduped[deduped.length - 1];
+    if (!previous) {
+      deduped.push(current);
+      continue;
+    }
+    const previousComparable = normalizeComparableMessageContent(previous.content || "");
+    const currentComparable = normalizeComparableMessageContent(current.content || "");
+    const sameRole = previous.role === current.role;
+    const sameKind = (previous.kind || "standard") === (current.kind || "standard");
+    const sameSender = (previous.senderName || "") === (current.senderName || "");
+    const comparableMatch = previousComparable && previousComparable === currentComparable;
+    if (sameRole && sameKind && sameSender && comparableMatch) {
+      deduped[deduped.length - 1] = chooseMoreComparableCliMessage(previous, current);
+      continue;
+    }
+    deduped.push(current);
+  }
+  return deduped;
+}
 function normalizeCliParsedMessages(parsedMessages, options) {
-  return hydrateCliParsedMessages(parsedMessages, options).map((message) => ({
+  return dedupeConsecutiveComparableCliMessages(hydrateCliParsedMessages(parsedMessages, options).map((message) => ({
     role: message.role,
     content: message.content,
     timestamp: message.timestamp,
@@ -1650,7 +1736,7 @@ function normalizeCliParsedMessages(parsedMessages, options) {
     index: message.index,
     meta: message.meta,
     senderName: message.senderName
-  }));
+  })));
 }
 function buildCliParseInput(options) {
   const {
@@ -2313,7 +2399,7 @@ var init_provider_cli_adapter = __esm({
         if (!hasStartupOutput) return;
         const stableMs = this.lastScreenChangeAt ? now - this.lastScreenChangeAt : 0;
         if (stableMs < 2e3) return;
-        const startupModal = this.getStartupConfirmationModal(screenText);
+        const startupModal = this.runParseApproval(this.recentOutputBuffer);
         this.startupParseGate = false;
         if (this.startupSettleTimer) {
           clearTimeout(this.startupSettleTimer);
@@ -2370,11 +2456,17 @@ var init_provider_cli_adapter = __esm({
           if (this.currentStatus !== "waiting_approval") return;
           const tail = this.recentOutputBuffer;
           const screenText = this.terminalScreen.getText() || "";
-          const startupModal = this.getStartupConfirmationModal(screenText);
-          const modal = this.runParseApproval(tail) || startupModal;
+          const modal = this.runParseApproval(tail);
           const stillWaiting = this.runDetectStatus(tail) === "waiting_approval" || !!modal;
           if (stillWaiting) {
-            this.activeModal = modal || this.activeModal || { message: "Approval required", buttons: ["Allow", "Deny"] };
+            if (!modal) {
+              LOG.warn("CLI", `[${this.cliType}] approval timeout check found no actionable modal; keeping approval state fail-closed`);
+              this.activeModal = null;
+              this.onStatusChange?.();
+              this.armApprovalExitTimeout();
+              return;
+            }
+            this.activeModal = modal;
             this.onStatusChange?.();
             this.armApprovalExitTimeout();
             return;
@@ -2386,81 +2478,12 @@ var init_provider_cli_adapter = __esm({
           this.onStatusChange?.();
         }, 6e4);
       }
-      looksLikeVisibleIdlePrompt(screenText) {
-        const text = String(screenText || "");
-        if (!text.trim()) return false;
-        if (this.cliType === "codex-cli" && /(^|\n)\s*[❯›>]\s+(?:Find and fix a bug in @filename|Improve documentation in @filename|Use \/skills|Write tests for @filename|Explain this codebase|Summarize recent commits|Implement \{feature\}|Run \/review on my current changes)(?:\n|$)/im.test(text)) {
-          return true;
-        }
-        return /(^|\n)\s*[❯›>]\s*(?:\n|$)/m.test(text) || /⏎\s+send/i.test(text) || /\?\s*for\s*shortcuts/i.test(text) || /Type your message(?:\s+or\s+@path\/to\/file)?/i.test(text) || /workspace\s*\(\/directory\)/i.test(text) || /for\s*shortcuts/i.test(text);
-      }
-      findLastMatchingLineIndex(lines, predicate) {
-        for (let index = lines.length - 1; index >= 0; index -= 1) {
-          if (predicate(lines[index])) return index;
-        }
-        return -1;
-      }
-      looksLikeClaudeGeneratingLine(line) {
-        const trimmed = String(line || "").trim();
-        if (!trimmed) return false;
-        if (/^⏵⏵\s+accept edits on/i.test(trimmed)) return false;
-        if (/esc to (cancel|interrupt|stop)/i.test(trimmed)) return true;
-        if (/^[✻✶✳✢✽⠂⠐⠒⠓⠦⠴⠶⠷⠿]+\s+\S+.*\b(?:thinking|thought for \d+s?)\b/i.test(trimmed)) return true;
-        if (/^[✻✶✳✢✽⠂⠐⠒⠓⠦⠴⠶⠷⠿]+\s+[A-Z][A-Za-z-]{3,}ing\b.*(?:…|\.{3})/u.test(trimmed)) return true;
-        if (/^[⏺•]\s+(?:Reading|Writing|Editing|Searching|Inspecting|Planning|Analyzing|Synthesizing|Drafting|Running|Listing|Scanning|Matching)\b.*(?:…|\.{3})/i.test(trimmed)) {
-          return /ctrl\+o to expand/i.test(trimmed) || /\b\d+\s+(?:file|files|pattern|patterns|director(?:y|ies)|match|matches|result|results)\b/i.test(trimmed);
-        }
-        return false;
-      }
-      detectClaudeGeneratingOverride(screenText, tail) {
-        if (this.cliType !== "claude-cli") return false;
-        const source = sanitizeTerminalText(screenText || tail || "");
-        if (!source.trim()) return false;
-        const allLines = source.split(/\r\n|\n|\r/g).map((line) => line.trim()).filter(Boolean);
-        if (allLines.length === 0) return false;
-        const recentLines = allLines.slice(-12);
-        const promptIndex = this.findLastMatchingLineIndex(recentLines, (line) => /^[❯›>]\s*$/.test(line));
-        const activeRegion = promptIndex >= 0 ? recentLines.slice(Math.max(0, promptIndex - 2), promptIndex) : recentLines;
-        if (activeRegion.length === 0) return false;
-        return activeRegion.some((line) => this.looksLikeClaudeGeneratingLine(line));
-      }
-      refineDetectedStatus(status, tail, screenText) {
-        if (this.startupParseGate) {
-          return this.getStartupConfirmationModal(screenText || "") ? "waiting_approval" : "starting";
-        }
-        if (status === "waiting_approval") return status;
-        if (this.detectClaudeGeneratingOverride(screenText || "", tail)) return "generating";
-        return status;
-      }
-      looksLikeVisibleAssistantCandidate(screenText) {
-        const lines = sanitizeTerminalText(String(screenText || "")).split(/\r\n|\n|\r/g);
-        for (const line of lines) {
-          const trimmed = String(line || "").trim();
-          if (!trimmed) continue;
-          if (/^➜\s+\S+/.test(trimmed)) continue;
-          if (/^Update available!/i.test(trimmed)) continue;
-          if (/Claude Code v\d/i.test(trimmed)) continue;
-          if (/^⏵⏵\s+accept edits on/i.test(trimmed)) continue;
-          if (/^[◐◑◒◓◴◵◶◷◸◹◺◿].*\/effort/i.test(trimmed)) continue;
-          if (/^[✻✶✳✢✽⠂⠐⠒⠓⠦⠴⠶⠷⠿]+$/.test(trimmed)) continue;
-          if (/esc to (cancel|interrupt|stop)/i.test(trimmed)) continue;
-          const assistantMatch = trimmed.match(/^⏺\s+(.+)$/);
-          if (!assistantMatch) continue;
-          const content = assistantMatch[1].trim();
-          if (!content) continue;
-          if (/^(?:Bash|Read|Write|Edit|MultiEdit|Task|Glob|Grep|LS|NotebookEdit)\(/.test(content)) continue;
-          if (/This command requires approval|Do you want to proceed|Allow once|Always allow/i.test(content)) continue;
-          return true;
-        }
-        return false;
-      }
       shouldRetryFinishResponse(commitResult) {
         if (!this.currentTurnScope) return false;
         if (this.currentStatus === "waiting_approval" || this.activeModal) return false;
         if (this.finishRetryCount >= _ProviderCliAdapter.MAX_FINISH_RETRIES) return false;
         if (commitResult.hasAssistant && commitResult.assistantContent.trim()) return false;
-        const screenText = this.terminalScreen.getText() || "";
-        if (!this.looksLikeVisibleAssistantCandidate(screenText)) return false;
+        if (this.runDetectStatus(this.recentOutputBuffer) !== "idle") return false;
         const now = Date.now();
         const quietForMs = this.lastNonEmptyOutputAt ? now - this.lastNonEmptyOutputAt : Number.MAX_SAFE_INTEGER;
         const screenStableMs = this.lastScreenChangeAt ? now - this.lastScreenChangeAt : 0;
@@ -2484,45 +2507,21 @@ var init_provider_cli_adapter = __esm({
         }
         return false;
       }
-      getStartupConfirmationModal(screenText) {
-        const text = sanitizeTerminalText(String(screenText || ""));
-        if (!text.trim()) return null;
-        if (this.cliType === "claude-cli") {
-          const hasTrustPrompt = /Quick safety check/i.test(text) || /Is this a project you trust/i.test(text) || /Do you trust (?:this project|the contents of this directory|the files in this folder)/i.test(text);
-          const hasConfirmFooter = /Press Enter to (?:continue|confirm)/i.test(text) || /Enter to confirm/i.test(text) || /Esc to (?:cancel|exit)/i.test(text);
-          if (hasTrustPrompt || hasConfirmFooter && /trust/i.test(text)) {
-            return {
-              message: "Confirm Claude Code project trust",
-              buttons: ["Continue"]
-            };
-          }
-        }
-        return null;
-      }
-      shouldResolveModalWithEnter(modal, buttonIndex) {
-        if (!modal || buttonIndex !== 0) return false;
-        const buttons = Array.isArray(modal.buttons) ? modal.buttons : [];
-        if (buttons.length !== 1) return false;
-        const buttonLabel = String(buttons[0] || "").trim();
-        return looksLikeConfirmOnlyLabel(buttonLabel);
-      }
       async waitForInteractivePrompt(maxWaitMs = 5e3) {
         const startedAt = Date.now();
         let loggedWait = false;
         while (Date.now() - startedAt < maxWaitMs) {
           this.resolveStartupState("interactive_wait");
           const screenText = this.terminalScreen.getText() || "";
-          const hasPrompt = this.looksLikeVisibleIdlePrompt(screenText);
           const stableMs = this.lastScreenChangeAt ? Date.now() - this.lastScreenChangeAt : 0;
           const recentlyOutput = this.lastNonEmptyOutputAt ? Date.now() - this.lastNonEmptyOutputAt : Number.MAX_SAFE_INTEGER;
           const status = this.runDetectStatus(this.recentOutputBuffer) || this.currentStatus;
-          const startupLikelyActive = /Welcome back|Tips for getting|Recent activity|Claude Code v\d/i.test(screenText);
-          const interactiveReady = hasPrompt && stableMs >= 700 && recentlyOutput >= 350 && status !== "generating";
+          const interactiveReady = status === "idle" && stableMs >= 700 && recentlyOutput >= 350;
           if (interactiveReady) {
             if (loggedWait) {
               LOG.info(
                 "CLI",
-                `[${this.cliType}] Interactive prompt ready after ${Date.now() - startedAt}ms (stableMs=${stableMs}, recentOutputMs=${recentlyOutput}, startup=${startupLikelyActive})`
+                `[${this.cliType}] Interactive prompt ready after ${Date.now() - startedAt}ms (stableMs=${stableMs}, recentOutputMs=${recentlyOutput})`
               );
             }
             return;
@@ -2531,7 +2530,7 @@ var init_provider_cli_adapter = __esm({
             loggedWait = true;
             LOG.info(
               "CLI",
-              `[${this.cliType}] Waiting for interactive prompt: hasPrompt=${hasPrompt} stableMs=${stableMs} recentOutputMs=${recentlyOutput} status=${status} startup=${startupLikelyActive} screen=${JSON.stringify(summarizeCliTraceText(screenText, 220)).slice(0, 260)}`
+              `[${this.cliType}] Waiting for interactive prompt: status=${status} stableMs=${stableMs} recentOutputMs=${recentlyOutput} screen=${JSON.stringify(summarizeCliTraceText(screenText, 220)).slice(0, 260)}`
             );
           }
           await new Promise((resolve12) => setTimeout(resolve12, 50));
@@ -2542,13 +2541,12 @@ var init_provider_cli_adapter = __esm({
           `[${this.cliType}] Interactive prompt wait timed out after ${maxWaitMs}ms; proceeding with screen=${JSON.stringify(summarizeCliTraceText(finalScreenText, 240)).slice(0, 280)}`
         );
       }
-      clearStaleIdleResponseGuard(reason) {
-        const screenText = this.terminalScreen.getText() || "";
-        const visibleIdlePrompt = this.looksLikeVisibleIdlePrompt(screenText);
-        const blockingModal = this.activeModal || this.getStartupConfirmationModal(screenText);
-        if (!this.isWaitingForResponse || this.currentStatus !== "idle" || !visibleIdlePrompt || !!blockingModal) {
-          return false;
-        }
+      trimLastAssistantEcho(messages, prompt) {
+        if (!prompt) return;
+        const last = [...messages].reverse().find((m) => m.role === "assistant" && typeof m.content === "string");
+        if (last) last.content = trimPromptEchoPrefix(last.content, prompt);
+      }
+      clearAllTimers() {
         if (this.responseTimeout) {
           clearTimeout(this.responseTimeout);
           this.responseTimeout = null;
@@ -2561,10 +2559,38 @@ var init_provider_cli_adapter = __esm({
           clearTimeout(this.approvalExitTimeout);
           this.approvalExitTimeout = null;
         }
+        if (this.submitRetryTimer) {
+          clearTimeout(this.submitRetryTimer);
+          this.submitRetryTimer = null;
+        }
         if (this.finishRetryTimer) {
           clearTimeout(this.finishRetryTimer);
           this.finishRetryTimer = null;
         }
+        if (this.settleTimer) {
+          clearTimeout(this.settleTimer);
+          this.settleTimer = null;
+        }
+        if (this.pendingScriptStatusTimer) {
+          clearTimeout(this.pendingScriptStatusTimer);
+          this.pendingScriptStatusTimer = null;
+        }
+        if (this.pendingOutputParseTimer) {
+          clearTimeout(this.pendingOutputParseTimer);
+          this.pendingOutputParseTimer = null;
+        }
+        if (this.ptyOutputFlushTimer) {
+          clearTimeout(this.ptyOutputFlushTimer);
+          this.ptyOutputFlushTimer = null;
+        }
+      }
+      clearStaleIdleResponseGuard(reason) {
+        const blockingModal = this.activeModal || this.runParseApproval(this.recentOutputBuffer);
+        const isIdle = this.runDetectStatus(this.recentOutputBuffer) === "idle";
+        if (!this.isWaitingForResponse || this.currentStatus !== "idle" || !isIdle || !!blockingModal) {
+          return false;
+        }
+        this.clearAllTimers();
         this.clearIdleFinishCandidate(reason);
         this.responseBuffer = "";
         this.isWaitingForResponse = false;
@@ -2574,10 +2600,7 @@ var init_provider_cli_adapter = __esm({
         this.finishRetryCount = 0;
         this.currentTurnScope = null;
         this.activeModal = null;
-        this.recordTrace("stale_idle_response_cleared", {
-          reason,
-          screenText: summarizeCliTraceText(screenText, 240)
-        });
+        this.recordTrace("stale_idle_response_cleared", { reason });
         return true;
       }
       hasMeaningfulResponseBuffer(promptSnippet) {
@@ -2612,16 +2635,14 @@ var init_provider_cli_adapter = __esm({
         if (this.startupParseGate) {
           return;
         }
-        const startupModal = this.getStartupConfirmationModal(screenText);
         const parsedTranscript = this.parseCurrentTranscript(
           this.committedMessages,
           this.responseBuffer,
           this.currentTurnScope
         );
         const parsedModal = parsedTranscript?.activeModal && Array.isArray(parsedTranscript.activeModal.buttons) && parsedTranscript.activeModal.buttons.some((button) => typeof button === "string" && button.trim()) ? parsedTranscript.activeModal : null;
-        const modal = this.runParseApproval(tail) || parsedModal || startupModal;
-        const rawScriptStatus = this.runDetectStatus(tail);
-        const scriptStatus = startupModal ? "waiting_approval" : parsedModal && parsedTranscript?.status === "waiting_approval" ? "waiting_approval" : rawScriptStatus;
+        const modal = this.runParseApproval(tail) || parsedModal;
+        const scriptStatus = this.runDetectStatus(tail);
         const parsedMessages = Array.isArray(parsedTranscript?.messages) ? normalizeCliParsedMessages(parsedTranscript.messages, {
           committedMessages: this.committedMessages,
           scope: this.currentTurnScope,
@@ -2676,15 +2697,44 @@ var init_provider_cli_adapter = __esm({
         }
         if (!scriptStatus) return;
         const prevStatus = this.currentStatus;
-        const clearPendingScriptStatus = () => {
+        const ctx = { now, screenText, modal, scriptStatus, parsedTranscript, parsedMessages, lastParsedAssistant, parsedShowsLiveAssistantProgress, prevStatus };
+        if (!this.applyPendingScriptStatusDebounce(ctx)) return;
+        const recentInteractiveActivity = this.hasRecentInteractiveActivity(now);
+        LOG.info(
+          "CLI",
+          `[${this.cliType}] settled diagnostics prompt=${JSON.stringify(this.currentTurnScope?.prompt || "").slice(0, 140)} scriptStatus=${String(scriptStatus || "")} parsedStatus=${String(parsedTranscript?.status || "")} parsedMsgCount=${parsedMessages.length} lastParsedAssistant=${JSON.stringify(summarizeCliTraceText(lastParsedAssistant?.content || "", 120)).slice(0, 160)} responseBuffer=${JSON.stringify(summarizeCliTraceText(this.responseBuffer, 160)).slice(0, 220)} screen=${JSON.stringify(summarizeCliTraceText(screenText, 160)).slice(0, 220)}`
+        );
+        const shouldHoldGenerating = scriptStatus === "idle" && this.isWaitingForResponse && !modal && recentInteractiveActivity && !(parsedTranscript?.status === "idle" && !!lastParsedAssistant);
+        if (shouldHoldGenerating) {
+          this.applyHoldGenerating(ctx, recentInteractiveActivity);
+          return;
+        }
+        if (scriptStatus === "waiting_approval") {
+          this.applyWaitingApproval(ctx);
+          return;
+        }
+        if (scriptStatus === "generating") {
+          this.applyGenerating(ctx);
+          return;
+        }
+        if (scriptStatus === "idle") {
+          this.applyIdle(ctx, now);
+        }
+      }
+      // Returns false if the caller should bail out (debounce pending).
+      applyPendingScriptStatusDebounce(ctx) {
+        const { now, scriptStatus, prevStatus } = ctx;
+        const shouldDebounce = prevStatus === "idle" && !this.isWaitingForResponse && !this.currentTurnScope && (scriptStatus === "generating" || scriptStatus === "waiting_approval");
+        if (!shouldDebounce) {
           this.pendingScriptStatus = null;
           this.pendingScriptStatusSince = 0;
           if (this.pendingScriptStatusTimer) {
             clearTimeout(this.pendingScriptStatusTimer);
             this.pendingScriptStatusTimer = null;
           }
-        };
-        const armPendingScriptStatus = (delayMs) => {
+          return true;
+        }
+        const armPending = (delayMs) => {
           if (this.pendingScriptStatusTimer) clearTimeout(this.pendingScriptStatusTimer);
           this.pendingScriptStatusTimer = setTimeout(() => {
             this.pendingScriptStatusTimer = null;
@@ -2692,200 +2742,187 @@ var init_provider_cli_adapter = __esm({
             this.evaluateSettled();
           }, delayMs);
         };
-        const shouldDebouncePromotion = (status) => prevStatus === "idle" && !this.isWaitingForResponse && !this.currentTurnScope && (status === "generating" || status === "waiting_approval");
-        if (shouldDebouncePromotion(scriptStatus)) {
-          if (this.pendingScriptStatus !== scriptStatus) {
-            this.pendingScriptStatus = scriptStatus;
-            this.pendingScriptStatusSince = now;
-            armPendingScriptStatus(_ProviderCliAdapter.SCRIPT_STATUS_DEBOUNCE_MS);
-            return;
-          }
-          const elapsed = now - this.pendingScriptStatusSince;
-          if (elapsed < _ProviderCliAdapter.SCRIPT_STATUS_DEBOUNCE_MS) {
-            armPendingScriptStatus(_ProviderCliAdapter.SCRIPT_STATUS_DEBOUNCE_MS - elapsed);
-            return;
-          }
-        } else {
-          clearPendingScriptStatus();
-        }
-        const recentInteractiveActivity = this.hasRecentInteractiveActivity(now);
-        const statusActivityHoldMs = this.getStatusActivityHoldMs();
-        const visibleIdlePrompt = this.looksLikeVisibleIdlePrompt(screenText);
-        const visibleAssistantCandidate = this.looksLikeVisibleAssistantCandidate(screenText);
-        if (this.currentTurnScope && this.cliType === "claude-cli") {
-          LOG.info(
-            "CLI",
-            `[${this.cliType}] settled diagnostics prompt=${JSON.stringify(this.currentTurnScope.prompt).slice(0, 140)} scriptStatus=${String(scriptStatus || "")} parsedStatus=${String(parsedTranscript?.status || "")} parsedMsgCount=${parsedMessages.length} lastParsedAssistant=${JSON.stringify(summarizeCliTraceText(lastParsedAssistant?.content || "", 120)).slice(0, 160)} visibleIdlePrompt=${String(visibleIdlePrompt)} visibleAssistantCandidate=${String(visibleAssistantCandidate)} responseBuffer=${JSON.stringify(summarizeCliTraceText(this.responseBuffer, 160)).slice(0, 220)} screen=${JSON.stringify(summarizeCliTraceText(screenText, 160)).slice(0, 220)}`
-          );
+        if (this.pendingScriptStatus !== scriptStatus) {
+          this.pendingScriptStatus = scriptStatus;
+          this.pendingScriptStatusSince = now;
+          armPending(_ProviderCliAdapter.SCRIPT_STATUS_DEBOUNCE_MS);
+          return false;
         }
-        const shouldHoldGenerating = scriptStatus === "idle" && this.isWaitingForResponse && !modal && recentInteractiveActivity && !(visibleIdlePrompt && visibleAssistantCandidate) && !(parsedTranscript?.status === "idle" && !!lastParsedAssistant);
-        if (shouldHoldGenerating) {
-          this.clearIdleFinishCandidate("hold_generating_recent_activity");
-          this.setStatus("generating", "recent_activity_hold");
-          if (this.idleTimeout) clearTimeout(this.idleTimeout);
-          this.idleTimeout = setTimeout(() => {
-            if (this.isWaitingForResponse && this.currentStatus !== "waiting_approval") {
-              if (this.shouldDeferIdleTimeoutFinish()) return;
-              this.finishResponse();
-            }
-          }, this.timeouts.generatingIdle);
-          this.recordTrace("hold_generating_recent_activity", {
-            scriptStatus,
-            recentInteractiveActivity,
-            lastNonEmptyOutputAt: this.lastNonEmptyOutputAt,
-            lastScreenChangeAt: this.lastScreenChangeAt,
-            holdMs: statusActivityHoldMs,
-            ...buildCliTraceParseSnapshot({
-              accumulatedBuffer: this.accumulatedBuffer,
-              accumulatedRawBuffer: this.accumulatedRawBuffer,
-              responseBuffer: this.responseBuffer,
-              partialResponse: this.responseBuffer,
-              scope: this.currentTurnScope
-            })
-          });
-          this.onStatusChange?.();
-          return;
+        const elapsed = now - this.pendingScriptStatusSince;
+        if (elapsed < _ProviderCliAdapter.SCRIPT_STATUS_DEBOUNCE_MS) {
+          armPending(_ProviderCliAdapter.SCRIPT_STATUS_DEBOUNCE_MS - elapsed);
+          return false;
         }
-        if (scriptStatus === "waiting_approval") {
-          this.clearIdleFinishCandidate("waiting_approval");
-          const inCooldown = this.lastApprovalResolvedAt && Date.now() - this.lastApprovalResolvedAt < this.timeouts.approvalCooldown;
-          const visibleIdlePrompt2 = this.looksLikeVisibleIdlePrompt(screenText);
-          if ((inCooldown || visibleIdlePrompt2) && !modal) {
-            if (this.approvalExitTimeout) {
-              clearTimeout(this.approvalExitTimeout);
-              this.approvalExitTimeout = null;
-            }
-            this.activeModal = null;
-            if (this.isWaitingForResponse) {
-              this.setStatus("generating", inCooldown ? "approval_cooldown_ignore" : "approval_prompt_gone");
-              if (this.idleTimeout) clearTimeout(this.idleTimeout);
-              this.idleTimeout = setTimeout(() => {
-                if (this.isWaitingForResponse && this.currentStatus !== "waiting_approval") {
-                  if (this.shouldDeferIdleTimeoutFinish()) return;
-                  this.finishResponse();
-                }
-              }, this.timeouts.generatingIdle);
-            } else {
-              this.setStatus("idle", inCooldown ? "approval_cooldown_ignore" : "approval_prompt_gone");
-            }
-            this.onStatusChange?.();
-            return;
+        return true;
+      }
+      applyHoldGenerating(ctx, recentInteractiveActivity) {
+        const { scriptStatus } = ctx;
+        this.clearIdleFinishCandidate("hold_generating_recent_activity");
+        this.setStatus("generating", "recent_activity_hold");
+        if (this.idleTimeout) clearTimeout(this.idleTimeout);
+        this.idleTimeout = setTimeout(() => {
+          if (this.isWaitingForResponse && this.currentStatus !== "waiting_approval") {
+            if (this.shouldDeferIdleTimeoutFinish()) return;
+            this.finishResponse();
+          }
+        }, this.timeouts.generatingIdle);
+        this.recordTrace("hold_generating_recent_activity", {
+          scriptStatus,
+          recentInteractiveActivity,
+          lastNonEmptyOutputAt: this.lastNonEmptyOutputAt,
+          lastScreenChangeAt: this.lastScreenChangeAt,
+          holdMs: this.getStatusActivityHoldMs(),
+          ...buildCliTraceParseSnapshot({
+            accumulatedBuffer: this.accumulatedBuffer,
+            accumulatedRawBuffer: this.accumulatedRawBuffer,
+            responseBuffer: this.responseBuffer,
+            partialResponse: this.responseBuffer,
+            scope: this.currentTurnScope
+          })
+        });
+        this.onStatusChange?.();
+      }
+      applyWaitingApproval(ctx) {
+        const { modal } = ctx;
+        this.clearIdleFinishCandidate("waiting_approval");
+        const inCooldown = this.lastApprovalResolvedAt && Date.now() - this.lastApprovalResolvedAt < this.timeouts.approvalCooldown;
+        if (inCooldown && !modal) {
+          if (this.approvalExitTimeout) {
+            clearTimeout(this.approvalExitTimeout);
+            this.approvalExitTimeout = null;
           }
-          if (!inCooldown) {
-            this.isWaitingForResponse = true;
-            this.setStatus("waiting_approval", "script_detect");
-            this.activeModal = modal || { message: "Approval required", buttons: ["Allow", "Deny"] };
+          this.activeModal = null;
+          if (this.isWaitingForResponse) {
+            this.setStatus("generating", inCooldown ? "approval_cooldown_ignore" : "approval_prompt_gone");
             if (this.idleTimeout) clearTimeout(this.idleTimeout);
-            this.armApprovalExitTimeout();
-            this.onStatusChange?.();
-            return;
+            this.idleTimeout = setTimeout(() => {
+              if (this.isWaitingForResponse && this.currentStatus !== "waiting_approval") {
+                if (this.shouldDeferIdleTimeoutFinish()) return;
+                this.finishResponse();
+              }
+            }, this.timeouts.generatingIdle);
+          } else {
+            this.setStatus("idle", inCooldown ? "approval_cooldown_ignore" : "approval_prompt_gone");
           }
+          this.onStatusChange?.();
+          return;
         }
-        if (scriptStatus === "generating") {
-          this.clearIdleFinishCandidate("generating");
-          const effectiveScreenText = screenText || this.accumulatedBuffer;
-          const noActiveTurn = !this.currentTurnScope;
-          const looksIdleChrome = /(^|\n)\s*[❯›>]\s*(?:\n|$)/m.test(effectiveScreenText) || /accept edits on/i.test(effectiveScreenText) && (/Update available!/i.test(screenText) || /\/effort/i.test(screenText) || /^.*➜\s+\S+/m.test(effectiveScreenText));
-          if (prevStatus === "idle" && !this.isWaitingForResponse && noActiveTurn && !modal && looksIdleChrome && !parsedShowsLiveAssistantProgress) {
+        if (!inCooldown) {
+          if (!modal) {
+            LOG.warn("CLI", `[${this.cliType}] detectStatus reported waiting_approval without parseApproval modal; ignoring non-actionable approval state`);
             return;
           }
-          if (prevStatus === "waiting_approval") {
-            if (this.approvalExitTimeout) {
-              clearTimeout(this.approvalExitTimeout);
-              this.approvalExitTimeout = null;
-            }
-            this.activeModal = null;
-            this.lastApprovalResolvedAt = Date.now();
-          }
-          if (!this.isWaitingForResponse) {
-            this.isWaitingForResponse = true;
-            this.responseBuffer = "";
-          }
-          this.setStatus("generating", "script_detect");
+          this.isWaitingForResponse = true;
+          this.setStatus("waiting_approval", "script_detect");
+          this.activeModal = modal;
           if (this.idleTimeout) clearTimeout(this.idleTimeout);
-          this.idleTimeout = setTimeout(() => {
-            if (this.isWaitingForResponse) {
-              if (this.shouldDeferIdleTimeoutFinish()) return;
-              this.finishResponse();
-            }
-          }, this.timeouts.generatingIdle);
+          this.armApprovalExitTimeout();
           this.onStatusChange?.();
+        }
+      }
+      applyGenerating(ctx) {
+        const { screenText, modal, parsedShowsLiveAssistantProgress, prevStatus } = ctx;
+        this.clearIdleFinishCandidate("generating");
+        const effectiveScreenText = screenText || this.accumulatedBuffer;
+        const noActiveTurn = !this.currentTurnScope;
+        const looksIdleChrome = /(^|\n)\s*[❯›>]\s*(?:\n|$)/m.test(effectiveScreenText) || /accept edits on/i.test(effectiveScreenText) && (/Update available!/i.test(screenText) || /\/effort/i.test(screenText) || /^.*➜\s+\S+/m.test(effectiveScreenText));
+        if (prevStatus === "idle" && !this.isWaitingForResponse && noActiveTurn && !modal && looksIdleChrome && !parsedShowsLiveAssistantProgress) {
           return;
         }
-        if (scriptStatus === "idle") {
-          if (prevStatus === "waiting_approval") {
-            if (this.approvalExitTimeout) {
-              clearTimeout(this.approvalExitTimeout);
-              this.approvalExitTimeout = null;
-            }
-            this.activeModal = null;
-            this.lastApprovalResolvedAt = Date.now();
+        if (prevStatus === "waiting_approval") {
+          if (this.approvalExitTimeout) {
+            clearTimeout(this.approvalExitTimeout);
+            this.approvalExitTimeout = null;
           }
+          this.activeModal = null;
+          this.lastApprovalResolvedAt = Date.now();
+        }
+        if (!this.isWaitingForResponse) {
+          this.isWaitingForResponse = true;
+          this.responseBuffer = "";
+        }
+        this.setStatus("generating", "script_detect");
+        if (this.idleTimeout) clearTimeout(this.idleTimeout);
+        this.idleTimeout = setTimeout(() => {
           if (this.isWaitingForResponse) {
-            const visibleIdlePrompt2 = this.looksLikeVisibleIdlePrompt(screenText);
-            const quietForMs = this.lastNonEmptyOutputAt ? now - this.lastNonEmptyOutputAt : Number.MAX_SAFE_INTEGER;
-            const screenStableMs = this.lastScreenChangeAt ? now - this.lastScreenChangeAt : 0;
-            const hasAssistantTurn = !!lastParsedAssistant;
-            const assistantLength = lastParsedAssistant?.content?.length || 0;
-            const idleFinishConfirmMs = this.getIdleFinishConfirmMs();
-            const idleQuietThresholdMs = Math.max(idleFinishConfirmMs, this.timeouts.outputSettle);
-            const idleStableThresholdMs = idleFinishConfirmMs;
-            const idleReady = visibleIdlePrompt2 && !modal && hasAssistantTurn && quietForMs >= idleQuietThresholdMs && screenStableMs >= idleStableThresholdMs;
-            const candidate = this.idleFinishCandidate;
-            const candidateQuiet = !!candidate && candidate.responseEpoch === this.responseEpoch && candidate.lastOutputAt === this.lastOutputAt && candidate.lastScreenChangeAt === this.lastScreenChangeAt && assistantLength >= candidate.assistantLength && now - candidate.armedAt >= idleFinishConfirmMs;
-            const canFinishImmediately = idleReady && candidateQuiet;
-            this.recordTrace("idle_decision", {
-              visibleIdlePrompt: visibleIdlePrompt2,
-              quietForMs,
-              screenStableMs,
-              hasAssistantTurn,
-              assistantLength,
-              hasModal: !!modal,
-              idleQuietThresholdMs,
-              idleStableThresholdMs,
-              idleReady,
-              idleFinishConfirmMs,
-              idleFinishCandidate: candidate,
-              candidateQuiet,
-              canFinishImmediately,
-              submitPendingUntil: this.submitPendingUntil,
-              responseSettleIgnoreUntil: this.responseSettleIgnoreUntil,
-              ...buildCliTraceParseSnapshot({
-                accumulatedBuffer: this.accumulatedBuffer,
-                accumulatedRawBuffer: this.accumulatedRawBuffer,
-                responseBuffer: this.responseBuffer,
-                partialResponse: this.responseBuffer,
-                scope: this.currentTurnScope
-              })
-            });
-            if (canFinishImmediately) {
-              this.clearIdleFinishCandidate("finish_response");
-              if (this.idleTimeout) clearTimeout(this.idleTimeout);
-              this.finishResponse();
-              return;
-            }
-            if (idleReady) {
-              if (!candidate) {
-                this.armIdleFinishCandidate(assistantLength);
-                return;
-              }
-            } else {
-              this.clearIdleFinishCandidate("idle_not_ready");
-            }
-            if (this.idleTimeout) clearTimeout(this.idleTimeout);
-            this.idleTimeout = setTimeout(() => {
-              if (this.isWaitingForResponse && this.currentStatus !== "waiting_approval") {
-                if (this.shouldDeferIdleTimeoutFinish()) return;
-                this.clearIdleFinishCandidate("idle_timeout_finish");
-                this.finishResponse();
-              }
-            }, this.timeouts.idleFinish);
-          } else if (prevStatus !== "idle") {
+            if (this.shouldDeferIdleTimeoutFinish()) return;
+            this.finishResponse();
+          }
+        }, this.timeouts.generatingIdle);
+        this.onStatusChange?.();
+      }
+      applyIdle(ctx, now) {
+        const { screenText, modal, lastParsedAssistant, prevStatus } = ctx;
+        if (prevStatus === "waiting_approval") {
+          if (this.approvalExitTimeout) {
+            clearTimeout(this.approvalExitTimeout);
+            this.approvalExitTimeout = null;
+          }
+          this.activeModal = null;
+          this.lastApprovalResolvedAt = Date.now();
+        }
+        if (!this.isWaitingForResponse) {
+          if (prevStatus !== "idle") {
             this.clearIdleFinishCandidate("idle_without_response");
             this.setStatus("idle", "script_detect");
             this.onStatusChange?.();
           }
+          return;
+        }
+        const quietForMs = this.lastNonEmptyOutputAt ? now - this.lastNonEmptyOutputAt : Number.MAX_SAFE_INTEGER;
+        const screenStableMs = this.lastScreenChangeAt ? now - this.lastScreenChangeAt : 0;
+        const hasAssistantTurn = !!lastParsedAssistant;
+        const assistantLength = lastParsedAssistant?.content?.length || 0;
+        const idleFinishConfirmMs = this.getIdleFinishConfirmMs();
+        const idleQuietThresholdMs = Math.max(idleFinishConfirmMs, this.timeouts.outputSettle);
+        const idleReady = !modal && hasAssistantTurn && quietForMs >= idleQuietThresholdMs && screenStableMs >= idleFinishConfirmMs;
+        const candidate = this.idleFinishCandidate;
+        const candidateQuiet = !!candidate && candidate.responseEpoch === this.responseEpoch && candidate.lastOutputAt === this.lastOutputAt && candidate.lastScreenChangeAt === this.lastScreenChangeAt && assistantLength >= candidate.assistantLength && now - candidate.armedAt >= idleFinishConfirmMs;
+        this.recordTrace("idle_decision", {
+          quietForMs,
+          screenStableMs,
+          hasAssistantTurn,
+          assistantLength,
+          hasModal: !!modal,
+          idleQuietThresholdMs,
+          idleStableThresholdMs: idleFinishConfirmMs,
+          idleReady,
+          idleFinishConfirmMs,
+          idleFinishCandidate: candidate,
+          candidateQuiet,
+          canFinishImmediately: idleReady && candidateQuiet,
+          submitPendingUntil: this.submitPendingUntil,
+          responseSettleIgnoreUntil: this.responseSettleIgnoreUntil,
+          ...buildCliTraceParseSnapshot({
+            accumulatedBuffer: this.accumulatedBuffer,
+            accumulatedRawBuffer: this.accumulatedRawBuffer,
+            responseBuffer: this.responseBuffer,
+            partialResponse: this.responseBuffer,
+            scope: this.currentTurnScope
+          })
+        });
+        if (idleReady && candidateQuiet) {
+          this.clearIdleFinishCandidate("finish_response");
+          if (this.idleTimeout) clearTimeout(this.idleTimeout);
+          this.finishResponse();
+          return;
         }
+        if (idleReady) {
+          if (!candidate) {
+            this.armIdleFinishCandidate(assistantLength);
+            return;
+          }
+        } else {
+          this.clearIdleFinishCandidate("idle_not_ready");
+        }
+        if (this.idleTimeout) clearTimeout(this.idleTimeout);
+        this.idleTimeout = setTimeout(() => {
+          if (this.isWaitingForResponse && this.currentStatus !== "waiting_approval") {
+            if (this.shouldDeferIdleTimeoutFinish()) return;
+            this.clearIdleFinishCandidate("idle_timeout_finish");
+            this.finishResponse();
+          }
+        }, this.timeouts.idleFinish);
       }
       finishResponse() {
         if (this.submitPendingUntil > Date.now()) return;
@@ -2924,26 +2961,7 @@ var init_provider_cli_adapter = __esm({
           }, _ProviderCliAdapter.FINISH_RETRY_DELAY_MS);
           return;
         }
-        if (this.responseTimeout) {
-          clearTimeout(this.responseTimeout);
-          this.responseTimeout = null;
-        }
-        if (this.idleTimeout) {
-          clearTimeout(this.idleTimeout);
-          this.idleTimeout = null;
-        }
-        if (this.approvalExitTimeout) {
-          clearTimeout(this.approvalExitTimeout);
-          this.approvalExitTimeout = null;
-        }
-        if (this.submitRetryTimer) {
-          clearTimeout(this.submitRetryTimer);
-          this.submitRetryTimer = null;
-        }
-        if (this.finishRetryTimer) {
-          clearTimeout(this.finishRetryTimer);
-          this.finishRetryTimer = null;
-        }
+        this.clearAllTimers();
         this.responseBuffer = "";
         this.isWaitingForResponse = false;
         this.responseSettleIgnoreUntil = 0;
@@ -2955,18 +2973,12 @@ var init_provider_cli_adapter = __esm({
         this.setStatus("idle", "response_finished");
         this.onStatusChange?.();
       }
-      maybeCommitVisibleIdleTranscript(parsed, options) {
+      maybeCommitVisibleIdleTranscript(parsed) {
         const allowImmediateScriptIdleCommit = this.provider.allowInputDuringGeneration === true;
         if (!allowImmediateScriptIdleCommit) return false;
         if (!parsed || !Array.isArray(parsed.messages) || parsed.status !== "idle" || !this.isWaitingForResponse || !this.currentTurnScope || this.activeModal || parsed.activeModal) {
           return false;
         }
-        if (options?.requireVisibleAssistantCandidate) {
-          const candidateText = options.screenText || this.terminalScreen.getText() || "";
-          if (!this.looksLikeVisibleAssistantCandidate(candidateText)) {
-            return false;
-          }
-        }
         const hydratedForIdleCommit = normalizeCliParsedMessages(parsed.messages, {
           committedMessages: this.committedMessages,
           scope: this.currentTurnScope,
@@ -2975,33 +2987,8 @@ var init_provider_cli_adapter = __esm({
         const visibleAssistant = [...hydratedForIdleCommit].reverse().find((message) => message.role === "assistant" && message.content.trim());
         if (!visibleAssistant) return false;
         this.committedMessages = hydratedForIdleCommit;
-        const promptForTrim = this.currentTurnScope?.prompt || getLastUserPromptText(this.committedMessages);
-        if (promptForTrim) {
-          const lastAssistantForTrim = [...this.committedMessages].reverse().find((message) => message.role === "assistant");
-          if (lastAssistantForTrim) {
-            lastAssistantForTrim.content = trimPromptEchoPrefix(lastAssistantForTrim.content, promptForTrim);
-          }
-        }
-        if (this.responseTimeout) {
-          clearTimeout(this.responseTimeout);
-          this.responseTimeout = null;
-        }
-        if (this.idleTimeout) {
-          clearTimeout(this.idleTimeout);
-          this.idleTimeout = null;
-        }
-        if (this.approvalExitTimeout) {
-          clearTimeout(this.approvalExitTimeout);
-          this.approvalExitTimeout = null;
-        }
-        if (this.submitRetryTimer) {
-          clearTimeout(this.submitRetryTimer);
-          this.submitRetryTimer = null;
-        }
-        if (this.finishRetryTimer) {
-          clearTimeout(this.finishRetryTimer);
-          this.finishRetryTimer = null;
-        }
+        this.trimLastAssistantEcho(this.committedMessages, this.currentTurnScope?.prompt || getLastUserPromptText(this.committedMessages));
+        this.clearAllTimers();
         this.syncMessageViews();
         this.responseBuffer = "";
         this.isWaitingForResponse = false;
@@ -3031,13 +3018,7 @@ var init_provider_cli_adapter = __esm({
             scope: this.currentTurnScope,
             lastOutputAt: this.lastOutputAt
           });
-          const promptForTrim = this.currentTurnScope?.prompt || getLastUserPromptText(this.committedMessages);
-          if (promptForTrim) {
-            const lastAssistantForTrim = [...this.committedMessages].reverse().find((message) => message.role === "assistant");
-            if (lastAssistantForTrim) {
-              lastAssistantForTrim.content = trimPromptEchoPrefix(lastAssistantForTrim.content, promptForTrim);
-            }
-          }
+          this.trimLastAssistantEcho(this.committedMessages, this.currentTurnScope?.prompt || getLastUserPromptText(this.committedMessages));
           this.syncMessageViews();
           const lastAssistant = [...this.committedMessages].reverse().find((message) => message.role === "assistant");
           if (this.currentTurnScope) {
@@ -3095,7 +3076,7 @@ var init_provider_cli_adapter = __esm({
             screen: buildCliScreenSnapshot(screenText),
             tailScreen: buildCliScreenSnapshot(text.slice(-500))
           });
-          return this.refineDetectedStatus(status, text, screenText || "");
+          return status;
         } catch (e) {
           LOG.warn("CLI", `[${this.cliType}] detectStatus error: ${e.message}`);
           return null;
@@ -3135,23 +3116,21 @@ var init_provider_cli_adapter = __esm({
         if (!inApprovalCooldown) {
           return parsed;
         }
-        const startupModal = this.getStartupConfirmationModal(screenText || "");
-        const visibleModal = this.runParseApproval(recentBuffer) || startupModal;
+        const visibleModal = this.runParseApproval(recentBuffer);
         if (visibleModal) {
           return parsed;
         }
         const detectedStatus = this.runDetectStatus(recentBuffer);
-        const fallbackStatus = detectedStatus && detectedStatus !== "waiting_approval" ? detectedStatus : this.isWaitingForResponse || this.currentTurnScope ? "generating" : this.currentStatus === "waiting_approval" ? "idle" : this.currentStatus;
+        const resolvedStatus = detectedStatus && detectedStatus !== "waiting_approval" ? detectedStatus : this.isWaitingForResponse || this.currentTurnScope ? "generating" : this.currentStatus === "waiting_approval" ? "idle" : this.currentStatus;
         return {
           ...parsed,
-          status: fallbackStatus,
+          status: resolvedStatus,
           activeModal: null
         };
       }
       // ─── Public API (CliAdapter) ───────────────────
       getStatus() {
-        const screenText = this.terminalScreen.getText() || "";
-        const startupModal = this.startupParseGate ? this.getStartupConfirmationModal(screenText) : null;
+        const startupModal = this.startupParseGate ? this.runParseApproval(this.recentOutputBuffer) : null;
         let effectiveStatus = this.projectEffectiveStatus(startupModal);
         let effectiveModal = startupModal || this.activeModal;
         if (!startupModal && !effectiveModal && typeof this.cliScripts?.parseOutput === "function") {
@@ -3232,8 +3211,7 @@ var init_provider_cli_adapter = __esm({
             receivedAt: typeof message.receivedAt === "number" ? message.receivedAt : message.timestamp
           }));
           const parsedLastAssistant = [...parsedHydratedMessages].reverse().find((message) => message.role === "assistant" && typeof message.content === "string" && message.content.trim());
-          const visibleIdlePrompt = this.looksLikeVisibleIdlePrompt(screenText);
-          const shouldAdoptParsedIdleReplay = !this.currentTurnScope && !this.activeModal && !!parsedLastAssistant && parsedTranscriptIsRicherThanCommitted(parsedHydratedMessages, committedHydratedMessages) && (this.currentStatus === "idle" || this.currentStatus === "generating" && this.isWaitingForResponse && parsed.status === "idle" && visibleIdlePrompt);
+          const shouldAdoptParsedIdleReplay = !this.currentTurnScope && !this.activeModal && !!parsedLastAssistant && parsedTranscriptIsRicherThanCommitted(parsedHydratedMessages, committedHydratedMessages) && (this.currentStatus === "idle" || this.currentStatus === "generating" && this.isWaitingForResponse && parsed.status === "idle" && this.runDetectStatus(this.recentOutputBuffer) === "idle");
           if (shouldAdoptParsedIdleReplay) {
             this.committedMessages = normalizeCliParsedMessages(parsed.messages, {
               committedMessages: this.committedMessages,
@@ -3362,17 +3340,9 @@ var init_provider_cli_adapter = __esm({
           if (parsed && typeof parsed === "object") {
             Object.assign(parsed, validateReadChatResultPayload(parsed, `${this.cliType} parseOutput`));
           }
-          const refinedStatus = this.refineDetectedStatus(typeof parsed?.status === "string" ? parsed.status : null, input.recentBuffer, input.screenText);
-          if (parsed && refinedStatus && parsed.status !== refinedStatus) {
-            parsed.status = refinedStatus;
-          }
           const normalizedParsed = this.suppressStaleParsedApproval(parsed, input.recentBuffer, input.screenText);
-          const promptForTrim = scope?.prompt || getLastUserPromptText(baseMessages);
-          if (normalizedParsed && Array.isArray(normalizedParsed.messages) && promptForTrim) {
-            const lastAssistant = [...normalizedParsed.messages].reverse().find((message) => message?.role === "assistant" && typeof message.content === "string");
-            if (lastAssistant) {
-              lastAssistant.content = trimPromptEchoPrefix(lastAssistant.content, promptForTrim);
-            }
+          if (normalizedParsed && Array.isArray(normalizedParsed.messages)) {
+            this.trimLastAssistantEcho(normalizedParsed.messages, scope?.prompt || getLastUserPromptText(baseMessages));
           }
           this.parseErrorMessage = null;
           return normalizedParsed;
@@ -3400,16 +3370,11 @@ var init_provider_cli_adapter = __esm({
             LOG.warn("CLI", `[${this.cliType}] resolveAction error: ${e.message}`);
           }
         }
-        if (!promptText && data) {
-          promptText = `Please fix the following issue:
-${data.title || ""}
-${data.explanation || ""}
-
-${data.message || ""}`.trim();
-        }
-        if (promptText) {
-          await this.sendMessage(promptText);
+        if (!promptText) {
+          LOG.warn("CLI", `[${this.cliType}] resolveAction skipped: provider script did not supply a prompt`);
+          return;
         }
+        await this.sendMessage(promptText);
       }
       async sendMessage(text) {
         if (!this.ptyProcess) throw new Error(`${this.cliName} is not running`);
@@ -3427,9 +3392,7 @@ ${data.message || ""}`.trim();
         }
         if (!this.ready) {
           this.resolveStartupState("send_precheck");
-          const screenText = this.terminalScreen.getText() || "";
-          const hasPrompt = this.looksLikeVisibleIdlePrompt(screenText);
-          if (hasPrompt && this.currentStatus === "idle") {
+          if (this.runDetectStatus(this.recentOutputBuffer) === "idle" && this.currentStatus === "idle") {
             this.ready = true;
             this.startupParseGate = false;
             LOG.info("CLI", `[${this.cliType}] sendMessage recovered idle prompt readiness`);
@@ -3535,7 +3498,10 @@ ${data.message || ""}`.trim();
               if (this.hasMeaningfulResponseBuffer(normalizedPromptSnippet)) return;
               const screenText2 = this.terminalScreen.getText();
               if (!promptLikelyVisible(screenText2, normalizedPromptSnippet)) return;
-              if (/Esc to interrupt|Do you want to proceed|This command requires approval|Allow Codex to|Approve and run now|Always approve this session|Running…|Running\.\.\./i.test(screenText2)) return;
+              const liveApproval = this.runParseApproval(screenText2) || this.runParseApproval(this.recentOutputBuffer);
+              if (liveApproval) return;
+              const liveStatus = this.runDetectStatus(screenText2) || this.runDetectStatus(this.recentOutputBuffer);
+              if (liveStatus === "generating" || liveStatus === "waiting_approval") return;
               this.responseSettleIgnoreUntil = Date.now() + this.timeouts.outputSettle + 400;
               LOG.info("CLI", `[${this.cliType}] Retrying submit key for stuck prompt (attempt ${attempt})`);
               this.recordTrace("submit_write", {
@@ -3572,6 +3538,10 @@ ${data.message || ""}`.trim();
               if (this.hasMeaningfulResponseBuffer(normalizedPromptSnippet)) return;
               const screenText = this.terminalScreen.getText();
               if (!promptLikelyVisible(screenText, normalizedPromptSnippet)) return;
+              const liveApproval = this.runParseApproval(screenText) || this.runParseApproval(this.recentOutputBuffer);
+              if (liveApproval) return;
+              const liveStatus = this.runDetectStatus(screenText) || this.runDetectStatus(this.recentOutputBuffer);
+              if (liveStatus === "generating" || liveStatus === "waiting_approval") return;
               LOG.info("CLI", `[${this.cliType}] Retrying submit key for stuck prompt (attempt 1)`);
               this.responseSettleIgnoreUntil = Date.now() + this.timeouts.outputSettle + 400;
               this.recordTrace("submit_write", {
@@ -3703,44 +3673,9 @@ ${data.message || ""}`.trim();
       }
       shutdown() {
         this.clearIdleFinishCandidate("shutdown");
-        if (this.settleTimer) {
-          clearTimeout(this.settleTimer);
-          this.settleTimer = null;
-        }
-        if (this.approvalExitTimeout) {
-          clearTimeout(this.approvalExitTimeout);
-          this.approvalExitTimeout = null;
-        }
-        if (this.submitRetryTimer) {
-          clearTimeout(this.submitRetryTimer);
-          this.submitRetryTimer = null;
-        }
-        if (this.finishRetryTimer) {
-          clearTimeout(this.finishRetryTimer);
-          this.finishRetryTimer = null;
-        }
-        if (this.responseTimeout) {
-          clearTimeout(this.responseTimeout);
-          this.responseTimeout = null;
-        }
-        if (this.idleTimeout) {
-          clearTimeout(this.idleTimeout);
-          this.idleTimeout = null;
-        }
-        if (this.pendingScriptStatusTimer) {
-          clearTimeout(this.pendingScriptStatusTimer);
-          this.pendingScriptStatusTimer = null;
-        }
-        if (this.pendingOutputParseTimer) {
-          clearTimeout(this.pendingOutputParseTimer);
-          this.pendingOutputParseTimer = null;
-        }
+        this.clearAllTimers();
         this.pendingOutputParseBuffer = "";
         this.pendingTerminalQueryTail = "";
-        if (this.ptyOutputFlushTimer) {
-          clearTimeout(this.ptyOutputFlushTimer);
-          this.ptyOutputFlushTimer = null;
-        }
         this.ptyOutputBuffer = "";
         this.finishRetryCount = 0;
         if (this.ptyProcess) {
@@ -3761,44 +3696,9 @@ ${data.message || ""}`.trim();
       }
       detach() {
         this.clearIdleFinishCandidate("detach");
-        if (this.settleTimer) {
-          clearTimeout(this.settleTimer);
-          this.settleTimer = null;
-        }
-        if (this.approvalExitTimeout) {
-          clearTimeout(this.approvalExitTimeout);
-          this.approvalExitTimeout = null;
-        }
-        if (this.submitRetryTimer) {
-          clearTimeout(this.submitRetryTimer);
-          this.submitRetryTimer = null;
-        }
-        if (this.finishRetryTimer) {
-          clearTimeout(this.finishRetryTimer);
-          this.finishRetryTimer = null;
-        }
-        if (this.responseTimeout) {
-          clearTimeout(this.responseTimeout);
-          this.responseTimeout = null;
-        }
-        if (this.idleTimeout) {
-          clearTimeout(this.idleTimeout);
-          this.idleTimeout = null;
-        }
-        if (this.pendingScriptStatusTimer) {
-          clearTimeout(this.pendingScriptStatusTimer);
-          this.pendingScriptStatusTimer = null;
-        }
-        if (this.pendingOutputParseTimer) {
-          clearTimeout(this.pendingOutputParseTimer);
-          this.pendingOutputParseTimer = null;
-        }
+        this.clearAllTimers();
         this.pendingOutputParseBuffer = "";
         this.pendingTerminalQueryTail = "";
-        if (this.ptyOutputFlushTimer) {
-          clearTimeout(this.ptyOutputFlushTimer);
-          this.ptyOutputFlushTimer = null;
-        }
         this.ptyOutputBuffer = "";
         this.finishRetryCount = 0;
         if (this.ptyProcess) {
@@ -3860,8 +3760,7 @@ ${data.message || ""}`.trim();
         this.ptyProcess?.write(data);
       }
       resolveModal(buttonIndex) {
-        const screenText = this.terminalScreen.getText() || "";
-        let modal = this.activeModal || this.getStartupConfirmationModal(screenText);
+        let modal = this.activeModal || this.runParseApproval(this.recentOutputBuffer);
         if (!modal && typeof this.cliScripts?.parseOutput === "function") {
           try {
             const parsed = this.getScriptParsedStatus();
@@ -3892,12 +3791,7 @@ ${data.message || ""}`.trim();
         }
         this.setStatus("generating", "approval_resolved");
         this.onStatusChange?.();
-        const startupTrustModal = /Quick safety check|project trust|Confirm Claude Code project trust|trust (?:this project|the contents of this directory|the files in this folder)/i.test(String(modal?.message || ""));
-        if (startupTrustModal && buttonIndex in this.approvalKeys) {
-          this.ptyProcess.write(`${this.approvalKeys[buttonIndex]}\r`);
-        } else if (this.shouldResolveModalWithEnter(modal, buttonIndex)) {
-          this.ptyProcess.write("\r");
-        } else if (buttonIndex in this.approvalKeys) {
+        if (buttonIndex in this.approvalKeys) {
           this.ptyProcess.write(this.approvalKeys[buttonIndex]);
         } else {
           const DOWN = "\x1B[B";
@@ -3917,7 +3811,7 @@ ${data.message || ""}`.trim();
       }
       getDebugState() {
         const screenText = sanitizeTerminalText(this.terminalScreen.getText());
-        const startupModal = this.startupParseGate ? this.getStartupConfirmationModal(screenText) : null;
+        const startupModal = this.startupParseGate ? this.runParseApproval(this.recentOutputBuffer) : null;
         const effectiveStatus = this.projectEffectiveStatus(startupModal);
         const effectiveReady = this.ready || !!startupModal;
         return {
@@ -11250,25 +11144,23 @@ async function handleResolveAction(h, args) {
     const effectiveModal = statusModal || surfacedModal;
     const effectiveStatus = status?.status === "waiting_approval" || targetState?.activeChat?.status === "waiting_approval" ? "waiting_approval" : status?.status;
     LOG.info("Command", `[resolveAction] CLI PTY gate target=${String(args?.targetSessionId || "")} rawStatus=${String(status?.status || "")} effectiveStatus=${String(effectiveStatus || "")} statusModal=${statusModal ? "yes" : "no"} surfacedModal=${surfacedModal ? "yes" : "no"} instance=${targetInstance ? "yes" : "no"}`);
-    if (effectiveStatus !== "waiting_approval" && !effectiveModal) {
+    if (!effectiveModal) {
       return { success: false, error: "Not in approval state" };
     }
-    const buttons = effectiveModal?.buttons || ["Allow once", "Always allow", "Deny"];
+    const buttons = Array.isArray(effectiveModal.buttons) ? effectiveModal.buttons : [];
     let buttonIndex = typeof args?.buttonIndex === "number" ? args.buttonIndex : -1;
-    if (buttonIndex < 0) {
+    if (buttonIndex < 0 && button) {
       const btnLower = button.toLowerCase();
       buttonIndex = buttons.findIndex((b) => b.toLowerCase().includes(btnLower));
     }
+    if (buttonIndex < 0 && (action === "reject" || action === "deny")) {
+      buttonIndex = buttons.findIndex((b) => /deny|reject|no/i.test(b));
+    }
+    if (buttonIndex < 0 && (action === "always" || /always/i.test(button))) {
+      buttonIndex = buttons.findIndex((b) => /always/i.test(b));
+    }
     if (buttonIndex < 0) {
-      if (action === "reject" || action === "deny") {
-        buttonIndex = buttons.findIndex((b) => /deny|reject|no/i.test(b));
-        if (buttonIndex < 0) buttonIndex = buttons.length - 1;
-      } else if (action === "always" || /always/i.test(button)) {
-        buttonIndex = buttons.findIndex((b) => /always/i.test(b));
-        if (buttonIndex < 0) buttonIndex = 1;
-      } else {
-        buttonIndex = 0;
-      }
+      return { success: false, error: "Approval action did not match any visible button" };
     }
     if (typeof adapter.resolveModal === "function") {
       adapter.resolveModal(buttonIndex);