@adhdev/daemon-core 0.6.56 → 0.6.58

package/dist/index.js

@@ -718,6 +718,68 @@ function shSingleQuote(arg) {
   if (/^[a-zA-Z0-9@%_+=:,./-]+$/.test(arg)) return arg;
   return `'${arg.replace(/'/g, `'\\''`)}'`;
 }
+function estimatePromptDisplayLines(text, cols = 100) {
+  const normalized = String(text || "").replace(/\r/g, "");
+  if (!normalized) return 1;
+  return normalized.split("\n").reduce((sum, line) => sum + Math.max(1, Math.ceil(Math.max(1, line.length) / cols)), 0);
+}
+function extractPromptRetrySnippet(text) {
+  const lines = String(text || "").replace(/\r/g, "").split("\n").map((line) => line.trim()).filter(Boolean);
+  const candidate = lines[lines.length - 1] || lines[0] || "";
+  return candidate.slice(-120);
+}
+function normalizePromptText(text) {
+  return String(text || "").replace(/\s+/g, " ").trim();
+}
+function compactPromptText(text) {
+  return String(text || "").replace(/\s+/g, "").trim();
+}
+function promptLikelyVisible(screenText, promptSnippet) {
+  const snippet = normalizePromptText(promptSnippet);
+  if (!snippet) return false;
+  const normalizedScreen = normalizePromptText(screenText);
+  if (normalizedScreen.includes(snippet)) return true;
+  const compactScreen = compactPromptText(screenText);
+  const compactSnippet = compactPromptText(promptSnippet);
+  if (compactSnippet && compactScreen.includes(compactSnippet)) return true;
+  const tokens = snippet.split(/[^A-Za-z0-9_.:/-]+/).map((token) => token.trim()).filter((token) => token.length >= 4);
+  if (tokens.length === 0) return false;
+  const required = Math.min(tokens.length, 3);
+  const matched = tokens.filter(
+    (token) => normalizedScreen.includes(token) || compactScreen.includes(compactPromptText(token))
+  ).length;
+  return matched >= required;
+}
+function splitHistoryLines(text) {
+  return String(text || "").split("\n").map((line) => line.replace(/\s+$/, ""));
+}
+function normalizeHistoryLine(line) {
+  return String(line || "").replace(/\s+/g, " ").trim();
+}
+function mergeTerminalHistory(existing, snapshot) {
+  const next = String(snapshot || "").trim();
+  if (!next) return existing;
+  const prev = String(existing || "").trim();
+  if (!prev) return next;
+  if (prev === next || prev.endsWith(next)) return prev;
+  const prevLines = splitHistoryLines(prev);
+  const nextLines = splitHistoryLines(next);
+  const prevNorm = prevLines.map(normalizeHistoryLine);
+  const nextNorm = nextLines.map(normalizeHistoryLine);
+  const maxOverlap = Math.min(prevLines.length, nextLines.length);
+  for (let overlap = maxOverlap; overlap >= 1; overlap -= 1) {
+    const prevTail = prevNorm.slice(prevNorm.length - overlap);
+    const nextHead = nextNorm.slice(0, overlap);
+    if (prevTail.every((line, index) => line === nextHead[index])) {
+      return [...prevLines, ...nextLines.slice(overlap)].join("\n").trim();
+    }
+  }
+  const compactPrev = prevNorm.join("\n");
+  const compactNext = nextNorm.join("\n");
+  if (compactPrev.includes(compactNext)) return prev;
+  return `${prev}
+${next}`.trim();
+}
 function parsePatternEntry(x) {
   if (x instanceof RegExp) return x;
   if (x && typeof x === "object" && typeof x.source === "string") {
@@ -794,6 +856,7 @@ var init_provider_cli_adapter = __esm({
         this.approvalKeys = rawKeys && typeof rawKeys === "object" ? rawKeys : {};
         this.sendDelayMs = typeof provider.sendDelayMs === "number" ? Math.max(0, provider.sendDelayMs) : 0;
         this.sendKey = typeof provider.sendKey === "string" && provider.sendKey.length > 0 ? provider.sendKey : "\r";
+        this.submitStrategy = provider.submitStrategy === "immediate" ? "immediate" : "wait_for_echo";
         this.cliScripts = provider.scripts || {};
         const scriptNames = Object.keys(this.cliScripts).filter((k) => typeof this.cliScripts[k] === "function");
         if (scriptNames.length > 0) {
@@ -808,6 +871,7 @@ var init_provider_cli_adapter = __esm({
       provider;
       ptyProcess = null;
       messages = [];
+      committedMessages = [];
       structuredMessages = [];
       currentStatus = "starting";
       onStatusChange = null;
@@ -837,6 +901,11 @@ var init_provider_cli_adapter = __esm({
       settleTimer = null;
       settledBuffer = "";
       submitPendingUntil = 0;
+      responseSettleIgnoreUntil = 0;
+      responseEpoch = 0;
+      submitRetryTimer = null;
+      submitRetryUsed = false;
+      submitRetryPromptSnippet = "";
       // Resize redraw suppression
       resizeSuppressUntil = 0;
       // Debug: status transition history
@@ -849,8 +918,35 @@ var init_provider_cli_adapter = __esm({
       accumulatedRawBuffer = "";
       /** Current visible terminal screen snapshot */
       terminalScreen = new TerminalScreen(40, 120);
+      /** Rolling append-only terminal transcript built from screen snapshots */
+      terminalHistory = "";
       /** Max accumulated buffer size (last 50KB) */
       static MAX_ACCUMULATED_BUFFER = 5e4;
+      currentTurnScope = null;
+      syncMessageViews() {
+        this.messages = [...this.committedMessages];
+        this.structuredMessages = [...this.committedMessages];
+      }
+      sliceFromOffset(text, start) {
+        if (!text) return "";
+        if (!Number.isFinite(start) || start <= 0) return text;
+        if (start >= text.length) return "";
+        return text.slice(start);
+      }
+      buildParseInput(baseMessages, partialResponse, scope) {
+        const buffer = scope ? this.sliceFromOffset(this.terminalHistory, scope.terminalHistoryStart) || this.sliceFromOffset(this.accumulatedBuffer, scope.bufferStart) || this.accumulatedBuffer : this.accumulatedBuffer;
+        const rawBuffer = scope ? this.sliceFromOffset(this.accumulatedRawBuffer, scope.rawBufferStart) || this.accumulatedRawBuffer : this.accumulatedRawBuffer;
+        const terminalHistory = scope ? this.sliceFromOffset(this.terminalHistory, scope.terminalHistoryStart) || this.terminalHistory : this.terminalHistory;
+        return {
+          buffer,
+          rawBuffer,
+          recentBuffer: buffer.slice(-1e3) || this.recentOutputBuffer,
+          screenText: this.terminalScreen.getText(),
+          terminalHistory,
+          messages: [...baseMessages],
+          partialResponse
+        };
+      }
       setStatus(status, trigger) {
         const prev = this.currentStatus;
         if (prev === status) return;
@@ -865,6 +961,7 @@ var init_provider_cli_adapter = __esm({
       approvalKeys;
       sendDelayMs;
       sendKey;
+      submitStrategy;
       /** Inject CLI scripts after construction (e.g. when resolved by ProviderLoader) */
       setCliScripts(scripts) {
         this.cliScripts = scripts;
@@ -960,7 +1057,9 @@ var init_provider_cli_adapter = __esm({
         this.startupParseGate = true;
         this.startupBuffer = "";
         this.terminalScreen.reset(40, 120);
-        this.ready = true;
+        this.terminalHistory = "";
+        this.currentTurnScope = null;
+        this.ready = false;
         this.setStatus("idle", "pty_ready");
         this.onStatusChange?.();
       }
@@ -971,6 +1070,7 @@ var init_provider_cli_adapter = __esm({
           this.ptyProcess?.write("\x1B[1;1R");
         }
         this.terminalScreen.write(rawData);
+        this.terminalHistory = mergeTerminalHistory(this.terminalHistory, this.terminalScreen.getText());
         const cleanData = stripAnsi(rawData);
         if (this.isWaitingForResponse && cleanData) {
           this.responseBuffer = (this.responseBuffer + cleanData).slice(-8e3);
@@ -1005,7 +1105,9 @@ var init_provider_cli_adapter = __esm({
           const isReady = scriptStatus === "idle" || elapsed > 8e3 || bufCap;
           if (isReady) {
             this.startupParseGate = false;
+            this.ready = true;
             LOG.info("CLI", `[${this.cliType}] Startup gate end (${elapsed}ms, scriptStatus=${scriptStatus})`);
+            this.onStatusChange?.();
           } else {
             return;
           }
@@ -1014,19 +1116,45 @@ var init_provider_cli_adapter = __esm({
       }
       scheduleSettle() {
         if (this.settleTimer) clearTimeout(this.settleTimer);
+        const settleEpoch = this.responseEpoch;
         const delay = Math.max(
           this.timeouts.outputSettle,
           this.submitPendingUntil > Date.now() ? this.submitPendingUntil - Date.now() + this.timeouts.outputSettle : 0
         );
         this.settleTimer = setTimeout(() => {
           this.settleTimer = null;
+          if (settleEpoch !== this.responseEpoch) return;
           this.settledBuffer = this.recentOutputBuffer;
           this.evaluateSettled();
         }, delay);
       }
+      armApprovalExitTimeout() {
+        if (this.approvalExitTimeout) clearTimeout(this.approvalExitTimeout);
+        this.approvalExitTimeout = setTimeout(() => {
+          if (this.currentStatus !== "waiting_approval") return;
+          const tail = this.recentOutputBuffer;
+          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"] };
+            this.onStatusChange?.();
+            this.armApprovalExitTimeout();
+            return;
+          }
+          LOG.warn("CLI", `[${this.cliType}] Approval timeout \u2014 auto-clearing`);
+          this.activeModal = null;
+          this.lastApprovalResolvedAt = Date.now();
+          this.setStatus("idle", "approval_timeout");
+          this.onStatusChange?.();
+        }, 6e4);
+      }
       evaluateSettled() {
+        if (this.submitPendingUntil > Date.now()) return;
+        if (this.responseSettleIgnoreUntil > Date.now()) return;
         const tail = this.settledBuffer;
-        const scriptStatus = this.runDetectStatus(tail);
+        const modal = this.runParseApproval(tail);
+        const rawScriptStatus = this.runDetectStatus(tail);
+        const scriptStatus = rawScriptStatus === "waiting_approval" || modal ? "waiting_approval" : rawScriptStatus;
         if (!scriptStatus) return;
         const prevStatus = this.currentStatus;
         if (scriptStatus === "waiting_approval") {
@@ -1034,19 +1162,9 @@ var init_provider_cli_adapter = __esm({
           if (!inCooldown) {
             this.isWaitingForResponse = true;
             this.setStatus("waiting_approval", "script_detect");
-            const modal = this.runParseApproval(tail);
             this.activeModal = modal || { message: "Approval required", buttons: ["Allow", "Deny"] };
             if (this.idleTimeout) clearTimeout(this.idleTimeout);
-            if (this.approvalExitTimeout) clearTimeout(this.approvalExitTimeout);
-            this.approvalExitTimeout = setTimeout(() => {
-              if (this.currentStatus === "waiting_approval") {
-                LOG.warn("CLI", `[${this.cliType}] Approval timeout \u2014 auto-clearing`);
-                this.activeModal = null;
-                this.lastApprovalResolvedAt = Date.now();
-                this.setStatus("idle", "approval_timeout");
-                this.onStatusChange?.();
-              }
-            }, 6e4);
+            this.armApprovalExitTimeout();
             this.onStatusChange?.();
             return;
           }
@@ -1082,7 +1200,12 @@ var init_provider_cli_adapter = __esm({
             this.lastApprovalResolvedAt = Date.now();
           }
           if (this.isWaitingForResponse) {
-            this.finishResponse();
+            if (this.idleTimeout) clearTimeout(this.idleTimeout);
+            this.idleTimeout = setTimeout(() => {
+              if (this.isWaitingForResponse && this.currentStatus !== "waiting_approval") {
+                this.finishResponse();
+              }
+            }, this.timeouts.idleFinish);
           } else if (prevStatus !== "idle") {
             this.setStatus("idle", "script_detect");
             this.onStatusChange?.();
@@ -1090,6 +1213,9 @@ var init_provider_cli_adapter = __esm({
         }
       }
       finishResponse() {
+        if (this.submitPendingUntil > Date.now()) return;
+        if (this.responseSettleIgnoreUntil > Date.now()) return;
+        this.commitCurrentTranscript();
         if (this.responseTimeout) {
           clearTimeout(this.responseTimeout);
           this.responseTimeout = null;
@@ -1102,12 +1228,67 @@ var init_provider_cli_adapter = __esm({
           clearTimeout(this.approvalExitTimeout);
           this.approvalExitTimeout = null;
         }
+        if (this.submitRetryTimer) {
+          clearTimeout(this.submitRetryTimer);
+          this.submitRetryTimer = null;
+        }
         this.responseBuffer = "";
         this.isWaitingForResponse = false;
+        this.responseSettleIgnoreUntil = 0;
+        this.submitRetryUsed = false;
+        this.submitRetryPromptSnippet = "";
+        this.currentTurnScope = null;
         this.activeModal = null;
         this.setStatus("idle", "response_finished");
         this.onStatusChange?.();
       }
+      commitCurrentTranscript() {
+        const baseMessages = [...this.committedMessages];
+        const parsed = this.parseCurrentTranscript(baseMessages, "", this.currentTurnScope);
+        if (parsed && Array.isArray(parsed.messages) && parsed.messages.length > 0) {
+          const parsedMessages = parsed.messages.filter((m) => m && (m.role === "user" || m.role === "assistant")).map((m) => ({
+            role: m.role,
+            content: typeof m.content === "string" ? m.content : String(m.content || ""),
+            timestamp: m.timestamp
+          }));
+          const latestAssistant = [...parsedMessages].reverse().find((m) => m.role === "assistant" && m.content.trim());
+          if (latestAssistant) {
+            LOG.info("CLI", `[${this.cliType}] commitCurrentTranscript parsed assistant len=${latestAssistant.content.length} scopePrompt=${JSON.stringify(this.currentTurnScope?.prompt || "").slice(0, 120)}`);
+            const nextMessages = [...baseMessages];
+            const last2 = nextMessages[nextMessages.length - 1];
+            if (last2?.role === "assistant") {
+              last2.content = latestAssistant.content;
+              last2.timestamp = latestAssistant.timestamp || last2.timestamp;
+            } else if (last2?.role === "user") {
+              nextMessages.push({
+                role: "assistant",
+                content: latestAssistant.content,
+                timestamp: latestAssistant.timestamp || Date.now()
+              });
+            } else {
+              nextMessages.push({
+                role: "assistant",
+                content: latestAssistant.content,
+                timestamp: latestAssistant.timestamp || Date.now()
+              });
+            }
+            this.committedMessages = nextMessages;
+            this.syncMessageViews();
+            return;
+          }
+        }
+        const fallback = String(this.responseBuffer || "").trim();
+        LOG.info("CLI", `[${this.cliType}] commitCurrentTranscript fallback len=${fallback.length} scopePrompt=${JSON.stringify(this.currentTurnScope?.prompt || "").slice(0, 120)}`);
+        if (!fallback) return;
+        const last = baseMessages[baseMessages.length - 1];
+        if (last?.role === "assistant") {
+          last.content = fallback;
+        } else {
+          baseMessages.push({ role: "assistant", content: fallback, timestamp: Date.now() });
+        }
+        this.committedMessages = baseMessages;
+        this.syncMessageViews();
+      }
       // ─── Script Execution ──────────────────────────
       runDetectStatus(text) {
         if (!this.cliScripts?.detectStatus) return null;
@@ -1137,24 +1318,12 @@ var init_provider_cli_adapter = __esm({
       }
       // ─── Public API (CliAdapter) ───────────────────
       getStatus() {
-        const scriptResult = this.getScriptParsedStatus();
-        if (scriptResult) {
-          return {
-            status: this.currentStatus,
-            messages: (scriptResult.messages || []).map((m) => ({
-              role: m.role,
-              content: m.content,
-              timestamp: m.timestamp
-            })),
-            workingDir: this.workingDir,
-            activeModal: this.activeModal
-          };
-        }
         return {
           status: this.currentStatus,
-          messages: [...this.messages],
+          messages: [...this.committedMessages],
           workingDir: this.workingDir,
-          activeModal: this.activeModal
+          activeModal: this.activeModal,
+          terminalHistory: this.terminalHistory
         };
       }
       /**
@@ -1162,31 +1331,32 @@ var init_provider_cli_adapter = __esm({
        * Called by command handler / dashboard for rich content rendering.
        */
       getScriptParsedStatus() {
+        const messages = [...this.committedMessages];
+        return {
+          id: "cli_session",
+          status: this.currentStatus,
+          title: this.cliName,
+          terminalHistory: this.terminalHistory,
+          messages: messages.slice(-50).map((message, index) => ({
+            id: `msg_${index}`,
+            role: message.role,
+            content: message.content,
+            timestamp: message.timestamp,
+            index,
+            kind: "standard"
+          })),
+          activeModal: this.activeModal
+        };
+      }
+      parseCurrentTranscript(baseMessages, partialResponse, scope) {
         if (!this.cliScripts?.parseOutput) return null;
         try {
-          const input = {
-            buffer: this.accumulatedBuffer,
-            rawBuffer: this.accumulatedRawBuffer,
-            recentBuffer: this.recentOutputBuffer,
-            screenText: this.terminalScreen.getText(),
-            messages: [...this.structuredMessages.length > 0 ? this.structuredMessages : this.messages],
-            partialResponse: this.responseBuffer
-          };
-          const result = this.cliScripts.parseOutput(input);
-          if (result && typeof result === "object") {
-            if (Array.isArray(result.messages)) {
-              this.structuredMessages = result.messages.map((m) => ({
-                role: m.role,
-                content: m.content,
-                timestamp: m.timestamp
-              }));
-            }
-            return result;
-          }
+          const input = this.buildParseInput(baseMessages, partialResponse, scope);
+          return this.cliScripts.parseOutput(input);
         } catch (e) {
           LOG.warn("CLI", `[${this.cliType}] parseOutput error: ${e.message}`);
+          return null;
         }
-        return null;
       }
       /** Whether this adapter has CLI scripts loaded */
       hasCliScripts() {
@@ -1218,29 +1388,125 @@ ${data.message || ""}`.trim();
       }
       async sendMessage(text) {
         if (!this.ptyProcess) throw new Error(`${this.cliName} is not running`);
+        if (this.startupParseGate) {
+          const deadline = Date.now() + 1e4;
+          while (this.startupParseGate && Date.now() < deadline) {
+            await new Promise((resolve8) => setTimeout(resolve8, 50));
+          }
+        }
         if (!this.ready) throw new Error(`${this.cliName} not ready (status: ${this.currentStatus})`);
         if (this.isWaitingForResponse) return;
-        this.messages.push({ role: "user", content: text, timestamp: Date.now() });
-        this.structuredMessages.push({ role: "user", content: text, timestamp: Date.now() });
+        this.committedMessages.push({ role: "user", content: text, timestamp: Date.now() });
+        this.syncMessageViews();
         this.isWaitingForResponse = true;
         this.responseBuffer = "";
+        this.currentTurnScope = {
+          prompt: text,
+          startedAt: Date.now(),
+          bufferStart: this.accumulatedBuffer.length,
+          rawBufferStart: this.accumulatedRawBuffer.length,
+          terminalHistoryStart: this.terminalHistory.length
+        };
+        LOG.info("CLI", `[${this.cliType}] sendMessage turn scope buffer=${this.currentTurnScope.bufferStart} raw=${this.currentTurnScope.rawBufferStart} terminal=${this.currentTurnScope.terminalHistoryStart} prompt=${JSON.stringify(text).slice(0, 120)}`);
+        this.submitRetryUsed = false;
+        this.submitRetryPromptSnippet = extractPromptRetrySnippet(text);
+        const normalizedPromptSnippet = normalizePromptText(this.submitRetryPromptSnippet);
+        if (this.submitRetryTimer) {
+          clearTimeout(this.submitRetryTimer);
+          this.submitRetryTimer = null;
+        }
+        const estimatedLines = estimatePromptDisplayLines(text);
+        const submitDelayMs = this.sendDelayMs + Math.min(2e3, Math.max(0, estimatedLines - 1) * 350);
+        const maxEchoWaitMs = submitDelayMs + Math.max(1500, Math.min(5e3, estimatedLines * 500));
+        const retryDelayMs = Math.max(350, Math.min(1500, Math.max(this.sendDelayMs, submitDelayMs)));
+        if (this.settleTimer) {
+          clearTimeout(this.settleTimer);
+          this.settleTimer = null;
+        }
+        this.responseEpoch += 1;
+        this.responseSettleIgnoreUntil = Date.now() + submitDelayMs + this.timeouts.outputSettle + 250;
         this.setStatus("generating", "sendMessage");
         this.onStatusChange?.();
-        this.ptyProcess.write(text);
+        const startResponseTimeout = () => {
+          if (this.responseTimeout) clearTimeout(this.responseTimeout);
+          this.responseTimeout = setTimeout(() => {
+            if (this.isWaitingForResponse) this.finishResponse();
+          }, this.timeouts.maxResponse);
+        };
         const submit = () => {
           if (!this.ptyProcess) return;
           this.submitPendingUntil = 0;
           this.ptyProcess.write(this.sendKey);
-          this.responseTimeout = setTimeout(() => {
-            if (this.isWaitingForResponse) this.finishResponse();
-          }, this.timeouts.maxResponse);
+          const retrySubmitIfStuck = (attempt) => {
+            this.submitRetryTimer = null;
+            if (!this.ptyProcess || !this.isWaitingForResponse || this.submitRetryUsed) return;
+            if (this.currentStatus !== "generating") return;
+            if ((this.responseBuffer || "").trim()) return;
+            const screenText = this.terminalScreen.getText();
+            if (!promptLikelyVisible(screenText, 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(screenText)) return;
+            this.responseSettleIgnoreUntil = Date.now() + this.timeouts.outputSettle + 400;
+            LOG.info("CLI", `[${this.cliType}] Retrying submit key for stuck prompt (attempt ${attempt})`);
+            this.ptyProcess.write(this.sendKey);
+            if (attempt >= 3) {
+              this.submitRetryUsed = true;
+              return;
+            }
+            this.submitRetryTimer = setTimeout(() => retrySubmitIfStuck(attempt + 1), retryDelayMs);
+          };
+          this.submitRetryTimer = setTimeout(() => retrySubmitIfStuck(1), retryDelayMs);
+          startResponseTimeout();
         };
-        if (this.sendDelayMs > 0) {
-          this.submitPendingUntil = Date.now() + this.sendDelayMs;
-          setTimeout(submit, this.sendDelayMs);
-        } else {
-          submit();
+        if (this.submitStrategy === "immediate") {
+          this.submitPendingUntil = 0;
+          this.ptyProcess.write(text + this.sendKey);
+          this.submitRetryTimer = setTimeout(() => {
+            this.submitRetryTimer = null;
+            if (!this.ptyProcess || !this.isWaitingForResponse || this.submitRetryUsed) return;
+            if (this.currentStatus !== "generating") return;
+            if ((this.responseBuffer || "").trim()) return;
+            const screenText = this.terminalScreen.getText();
+            if (!promptLikelyVisible(screenText, normalizedPromptSnippet)) return;
+            LOG.info("CLI", `[${this.cliType}] Retrying submit key for stuck prompt (attempt 1)`);
+            this.responseSettleIgnoreUntil = Date.now() + this.timeouts.outputSettle + 400;
+            this.ptyProcess.write(this.sendKey);
+            this.submitRetryUsed = true;
+          }, retryDelayMs);
+          startResponseTimeout();
+          return;
         }
+        if (submitDelayMs > 0) {
+          this.submitPendingUntil = Date.now() + submitDelayMs;
+        }
+        this.ptyProcess.write(text);
+        const submitStartedAt = Date.now();
+        let lastNormalizedScreen = "";
+        let lastScreenChangeAt = submitStartedAt;
+        const waitForEchoAndSubmit = () => {
+          if (!this.ptyProcess) return;
+          const now = Date.now();
+          const elapsed = now - submitStartedAt;
+          const screenText = this.terminalScreen.getText();
+          const normalizedScreen = normalizePromptText(screenText);
+          if (normalizedScreen !== lastNormalizedScreen) {
+            lastNormalizedScreen = normalizedScreen;
+            lastScreenChangeAt = now;
+          }
+          const echoVisible = !normalizedPromptSnippet || promptLikelyVisible(screenText, normalizedPromptSnippet);
+          if (echoVisible) {
+            const screenSettled = now - lastScreenChangeAt >= 500;
+            if (elapsed >= submitDelayMs && screenSettled) {
+              submit();
+              return;
+            }
+          }
+          if (elapsed >= maxEchoWaitMs) {
+            submit();
+            return;
+          }
+          setTimeout(waitForEchoAndSubmit, 50);
+        };
+        waitForEchoAndSubmit();
       }
       getPartialResponse() {
         if (!this.isWaitingForResponse) return "";
@@ -1258,6 +1524,10 @@ ${data.message || ""}`.trim();
           clearTimeout(this.approvalExitTimeout);
           this.approvalExitTimeout = null;
         }
+        if (this.submitRetryTimer) {
+          clearTimeout(this.submitRetryTimer);
+          this.submitRetryTimer = null;
+        }
         if (this.ptyProcess) {
           this.ptyProcess.write("");
           setTimeout(() => {
@@ -1275,10 +1545,14 @@ ${data.message || ""}`.trim();
         }
       }
       clearHistory() {
-        this.messages = [];
-        this.structuredMessages = [];
+        this.committedMessages = [];
+        this.syncMessageViews();
         this.accumulatedBuffer = "";
         this.accumulatedRawBuffer = "";
+        this.terminalHistory = "";
+        this.currentTurnScope = null;
+        this.submitRetryUsed = false;
+        this.submitRetryPromptSnippet = "";
         this.terminalScreen.reset();
         this.onStatusChange?.();
       }
@@ -1292,7 +1566,16 @@ ${data.message || ""}`.trim();
         this.ptyProcess?.write(data);
       }
       resolveModal(buttonIndex) {
-        if (!this.ptyProcess || this.currentStatus !== "waiting_approval") return;
+        if (!this.ptyProcess || this.currentStatus !== "waiting_approval" && !this.activeModal) return;
+        this.activeModal = null;
+        this.lastApprovalResolvedAt = Date.now();
+        this.responseSettleIgnoreUntil = Date.now() + this.timeouts.outputSettle + 400;
+        if (this.approvalExitTimeout) {
+          clearTimeout(this.approvalExitTimeout);
+          this.approvalExitTimeout = null;
+        }
+        this.setStatus("generating", "approval_resolved");
+        this.onStatusChange?.();
         if (buttonIndex in this.approvalKeys) {
           this.ptyProcess.write(this.approvalKeys[buttonIndex]);
         } else {
@@ -1321,9 +1604,12 @@ ${data.message || ""}`.trim();
           spawnAt: this.spawnAt,
           workingDir: this.workingDir,
           messages: this.messages.slice(-20),
+          committedMessages: this.committedMessages.slice(-20),
           structuredMessages: this.structuredMessages.slice(-20),
-          messageCount: this.messages.length,
+          messageCount: this.committedMessages.length,
           screenText: this.terminalScreen.getText().slice(-4e3),
+          terminalHistory: this.terminalHistory.slice(-8e3),
+          currentTurnScope: this.currentTurnScope,
           startupBuffer: this.startupBuffer.slice(-4e3),
           recentOutputBuffer: this.recentOutputBuffer.slice(-500),
           settledBuffer: this.settledBuffer.slice(-500),
@@ -1334,6 +1620,11 @@ ${data.message || ""}`.trim();
           isWaitingForResponse: this.isWaitingForResponse,
           activeModal: this.activeModal,
           lastApprovalResolvedAt: this.lastApprovalResolvedAt,
+          sendDelayMs: this.sendDelayMs,
+          sendKey: this.sendKey,
+          submitStrategy: this.submitStrategy,
+          submitPendingUntil: this.submitPendingUntil,
+          responseSettleIgnoreUntil: this.responseSettleIgnoreUntil,
           resizeSuppressUntil: this.resizeSuppressUntil,
           hasCliScripts: this.hasCliScripts(),
           scriptNames: Object.keys(this.cliScripts).filter((k) => typeof this.cliScripts[k] === "function"),
@@ -3124,6 +3415,8 @@ var ChatHistoryWriter = class {
   lastSeenCounts = /* @__PURE__ */ new Map();
   /** Last seen message hash per agent (deduplication) */
   lastSeenHashes = /* @__PURE__ */ new Map();
+  /** Last seen append-only terminal transcript per agent */
+  lastSeenTerminal = /* @__PURE__ */ new Map();
   rotated = false;
   /**
   * Append new messages to history
@@ -3181,10 +3474,51 @@ var ChatHistoryWriter = class {
     } catch {
     }
   }
+  appendTerminalHistory(agentType, terminalHistory, sessionTitle, instanceId) {
+    const next = String(terminalHistory || "");
+    if (!next.trim()) return;
+    try {
+      const dedupKey = instanceId ? `${agentType}:${instanceId}:terminal` : `${agentType}:terminal`;
+      const prev = this.lastSeenTerminal.get(dedupKey) || "";
+      if (prev === next) return;
+      let delta = "";
+      if (!prev) {
+        delta = next;
+      } else if (next.startsWith(prev)) {
+        delta = next.slice(prev.length);
+      } else if (prev.includes(next)) {
+        this.lastSeenTerminal.set(dedupKey, next);
+        return;
+      } else {
+        delta = `
+
+[terminal snapshot reset ${(/* @__PURE__ */ new Date()).toISOString()} | ${sessionTitle || agentType}]
+${next}`;
+      }
+      if (!delta) {
+        this.lastSeenTerminal.set(dedupKey, next);
+        return;
+      }
+      const dir = path4.join(HISTORY_DIR, this.sanitize(agentType));
+      fs3.mkdirSync(dir, { recursive: true });
+      const date = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
+      const filePrefix = instanceId ? `${this.sanitize(instanceId)}_` : "";
+      const filePath = path4.join(dir, `${filePrefix}${date}.terminal.log`);
+      fs3.appendFileSync(filePath, delta, "utf-8");
+      this.lastSeenTerminal.set(dedupKey, next);
+      if (!this.rotated) {
+        this.rotated = true;
+        this.rotateOldFiles().catch(() => {
+        });
+      }
+    } catch {
+    }
+  }
   /** Called when agent session is explicitly changed */
   onSessionChange(agentType) {
     this.lastSeenHashes.delete(agentType);
     this.lastSeenCounts.delete(agentType);
+    this.lastSeenTerminal.delete(`${agentType}:terminal`);
   }
   /** Delete history files older than 30 days */
   async rotateOldFiles() {
@@ -3194,7 +3528,7 @@ var ChatHistoryWriter = class {
       const agentDirs = fs3.readdirSync(HISTORY_DIR, { withFileTypes: true }).filter((d) => d.isDirectory());
       for (const dir of agentDirs) {
         const dirPath = path4.join(HISTORY_DIR, dir.name);
-        const files = fs3.readdirSync(dirPath).filter((f) => f.endsWith(".jsonl"));
+        const files = fs3.readdirSync(dirPath).filter((f) => f.endsWith(".jsonl") || f.endsWith(".terminal.log"));
         for (const file of files) {
           const filePath = path4.join(dirPath, file);
           const stat = fs3.statSync(filePath);
@@ -4102,7 +4436,13 @@ async function handleReadChat(h, args) {
       _log(`${provider.category} adapter: ${adapter.cliType}`);
       const status = adapter.getStatus?.();
       if (status) {
-        return { success: true, messages: status.messages || [], status: status.status, activeModal: status.activeModal };
+        return {
+          success: true,
+          messages: status.messages || [],
+          status: status.status,
+          activeModal: status.activeModal,
+          terminalHistory: status.terminalHistory || ""
+        };
       }
     }
     return { success: false, error: `${provider.category} adapter not found` };
@@ -7982,31 +8322,12 @@ var CliProviderInstance = class {
   async onTick() {
   }
   getState() {
-    const rawStatus = this.adapter.getStatus();
-    const parsedStatus = this.adapter.getScriptParsedStatus();
-    const adapterStatus = parsedStatus ? {
-      ...rawStatus,
-      messages: parsedStatus.messages || rawStatus.messages,
-      activeModal: parsedStatus.activeModal || rawStatus.activeModal
-    } : rawStatus;
+    const adapterStatus = this.adapter.getStatus();
     const dirName = this.workingDir.split("/").filter(Boolean).pop() || "session";
     const recentMessages = adapterStatus.messages.slice(-50).map((m) => {
       const content = typeof m.content === "string" && m.content.length > 8e3 ? m.content.slice(0, 8e3) + "\n... (truncated)" : m.content;
       return { ...m, content };
     });
-    const partial = this.adapter.getPartialResponse();
-    const shouldAppendRawPartial = !parsedStatus;
-    if (shouldAppendRawPartial && adapterStatus.status === "generating" && partial) {
-      const cleaned = partial.trim();
-      if (cleaned && cleaned !== "(generating...)") {
-        recentMessages.push({
-          role: "assistant",
-          content: (cleaned.length > 8e3 ? cleaned.slice(0, 8e3) + "..." : cleaned) + "...",
-          timestamp: Date.now(),
-          meta: { streaming: true }
-        });
-      }
-    }
     if (recentMessages.length > 0) {
       const dirName2 = this.workingDir.split("/").filter(Boolean).pop() || "session";
       this.historyWriter.appendNewMessages(
@@ -8016,6 +8337,14 @@ var CliProviderInstance = class {
         this.instanceId
       );
     }
+    if (adapterStatus.terminalHistory?.trim()) {
+      this.historyWriter.appendTerminalHistory(
+        this.type,
+        adapterStatus.terminalHistory,
+        `${this.provider.name} \xB7 ${dirName}`,
+        this.instanceId
+      );
+    }
     return {
       type: this.type,
       name: this.provider.name,
@@ -8028,6 +8357,7 @@ var CliProviderInstance = class {
         status: adapterStatus.status,
         messages: recentMessages,
         activeModal: adapterStatus.activeModal,
+        terminalHistory: adapterStatus.terminalHistory,
         inputContent: ""
       },
       workspace: this.workingDir,
@@ -10188,7 +10518,8 @@ async function detectAllVersions(loader, archive) {
       binary: null,
       detectedAt: (/* @__PURE__ */ new Date()).toISOString()
     };
-    const versionCommand = provider.versionCommand;
+    const verCmdConfig = provider.versionCommand;
+    const versionCommand = typeof verCmdConfig === "object" && verCmdConfig !== null ? verCmdConfig[currentOs] : verCmdConfig;
     if (provider.category === "ide") {
       const osPaths = provider.paths?.[currentOs] || [];
       const appPath = checkPathExists2(osPaths);
@@ -11600,11 +11931,7 @@ var DevServer = class _DevServer {
       return;
     }
     let targetDir;
-    if (location === "user") {
-      targetDir = this.providerLoader.getUserProviderDir(category, type);
-    } else {
-      targetDir = this.providerLoader.getBuiltinProviderDir(category, type);
-    }
+    targetDir = this.providerLoader.getUserProviderDir(category, type);
     const jsonPath = path12.join(targetDir, "provider.json");
     if (fs9.existsSync(jsonPath)) {
       this.json(res, 409, { error: `Provider already exists at ${targetDir}`, path: targetDir });
@@ -12402,8 +12729,7 @@ var DevServer = class _DevServer {
   }
   loadAutoImplReferenceScripts(category, referenceType) {
     if (!referenceType) return {};
-    const builtinDir = this.providerLoader.getPrimaryBuiltinDir();
-    const refDir = path12.join(builtinDir, category, referenceType);
+    const refDir = this.providerLoader.getUpstreamProviderDir(category, referenceType);
     if (!fs9.existsSync(refDir)) return {};
     const referenceScripts = {};
     const scriptsDir = path12.join(refDir, "scripts");
@@ -12642,7 +12968,7 @@ var DevServer = class _DevServer {
         }
         if (model) args.push("--model", model);
         const escapedArgs = args.map((a) => `'${a.replace(/'/g, "'\\''")}'`).join(" ");
-        const metaPrompt = `Read the file at ${promptFile} and follow ALL instructions recursively. You have full authority to implement ALL required script files, update provider.json configurations based on the reference patterns, and independently test them against 127.0.0.1:19280 via CDP CURL. Upon complete validation of ALL assigned files, print exactly "_PIPELINE_COMPLETE_SIGNAL_" to gracefully close the pipeline. DO NOT WAIT FOR APPROVAL, execute completely autonomously.`;
+        const metaPrompt = `Read the file at ${promptFile} and follow ALL instructions strictly. DO NOT spend time exploring the filesystem or other providers. You have full authority to implement ALL required script files and independently test them against 127.0.0.1:19280 via CDP CURL. Upon complete validation of ALL assigned files, print exactly "_PIPELINE_COMPLETE_SIGNAL_" to gracefully close the pipeline. DO NOT WAIT FOR APPROVAL, execute completely autonomously.`;
         shellCmd = `${command} ${escapedArgs} "${metaPrompt}"`;
       } else {
         const escapedArgs = baseArgs.map((a) => `'${a.replace(/'/g, "'\\''")}'`).join(" ");
@@ -12905,6 +13231,8 @@ var DevServer = class _DevServer {
     lines.push("5. Do NOT modify `scripts.js` router \u2014 only edit individual `*.js` files");
     lines.push("6. All scripts run in the browser (CDP evaluate) \u2014 use DOM APIs only");
     lines.push('7. **Cross-Platform Compatibility**: If you use ARIA labels that contain keyboard shortcuts (e.g., `Cascade (\u2318L)`), you MUST use substring matches (`aria-label*="Cascade"`) or handle both macOS (`\u2318`, `Cmd`) and Windows (`Ctrl`) so the script does not break on other operating systems.');
+    lines.push("8. **CRITICAL: DO NOT explore the filesystem or read other providers.** The reference implementation pattern is already provided below. Do not run `find`, `rg`, or `cat` on upstream providers. Doing so wastes context tokens and will crash the agent session. Focus entirely on modifying the target files.");
+    lines.push("9. Do NOT delete any files. Implement the logic by replacing the empty stubs.");
     lines.push("");
     lines.push("## Required Return Format");
     lines.push("| Function | Return JSON |");