@adhdev/daemon-standalone 0.7.46 → 0.8.1

package/dist/index.js

@@ -27570,7 +27570,7 @@ var require_dist = __commonJS({
         };
       }
     };
-    var os5 = __toESM2(require("os"));
+    var os6 = __toESM2(require("os"));
     var path22 = __toESM2(require("path"));
     var net3 = __toESM2(require("net"));
     var import_crypto22 = require("crypto");
@@ -27583,7 +27583,7 @@ var require_dist = __commonJS({
       }
       return {
         kind: "unix",
-        path: path22.join(os5.tmpdir(), `${appName}-session-host.sock`)
+        path: path22.join(os6.tmpdir(), `${appName}-session-host.sock`)
       };
     }
     function serializeEnvelope3(envelope) {
@@ -28488,10 +28488,10 @@ var require_dist2 = __commonJS({
       normalizeCliProviderForRuntime: () => normalizeCliProviderForRuntime
     });
     function stripAnsi(str) {
-      return str.replace(/\x1B\[\d*[A-HJKSTfG]/g, " ").replace(/\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g, "").replace(/\x1B\][^\x07]*\x07/g, "").replace(/\x1B\][^\x1B]*\x1B\\/g, "").replace(/  +/g, " ");
+      return str.replace(/\x1B\][^\x07]*\x07/g, "").replace(/\x1B\][\s\S]*?\x1B\\/g, "").replace(/\x1B[P^_X][\s\S]*?(?:\x07|\x1B\\)/g, "").replace(/\x1B\[\d*[A-HJKSTfG]/g, " ").replace(/\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g, "").replace(/  +/g, " ");
     }
     function stripTerminalNoise(str) {
-      return String(str || "").replace(/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F-\x9F]/g, "").replace(/(^|[\s([])(?:\??\d{1,4}(?:;\d{1,4})*[A-Za-z])(?=$|[\s)\]])/g, "$1").replace(/(^|[\s([])(?:\[\??\d{1,4}(?:;\d{1,4})*[A-Za-z])(?=$|[\s)\]])/g, "$1").replace(/(^|[\s([])(?:\d{1,4};\?)(?=$|[\s)\]])/g, "$1").replace(/\r+/g, "\n").replace(/[ \t]+\n/g, "\n").replace(/\n{3,}/g, "\n\n").replace(/ {2,}/g, " ");
+      return String(str || "").replace(/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F-\x9F]/g, "").replace(/(^|[\s([])(?:\??\d{1,4}(?:;\d{1,4})*[A-Za-z])(?=$|[\s)\]])/g, "$1").replace(/(^|[\s([])(?:\[\??\d{1,4}(?:;\d{1,4})*[A-Za-z])(?=$|[\s)\]])/g, "$1").replace(/(^|[\s([])(?:\d{1,4};\?)(?=$|[\s)\]])/g, "$1").replace(/(^|[\s([])(?:\d+\$r[0-9;\" ]*[A-Za-z]?)(?=$|[\s)\]])/g, "$1").replace(/(^|[\s([])(?:>\|[A-Za-z0-9_.:-]+(?:\([^)]*\))?)(?=$|[\s)\]])/g, "$1").replace(/(^|[\s([])(?:[A-Z]\d(?:\s+[A-Z]\d)+)(?=$|[\s)\]])/g, "$1").replace(/(^|[\s([])(?:\d+;[^\s)\]]+)(?=$|[\s)\]])/g, "$1").replace(/\r+/g, "\n").replace(/[ \t]+\n/g, "\n").replace(/\n{3,}/g, "\n\n").replace(/ {2,}/g, " ");
     }
     function sanitizeTerminalText(str) {
       return stripTerminalNoise(stripAnsi(str));
@@ -28534,12 +28534,12 @@ var require_dist2 = __commonJS({
     function isScriptBinary(binaryPath) {
       if (!path7.isAbsolute(binaryPath)) return false;
       try {
-        const fs14 = require("fs");
-        const resolved = fs14.realpathSync(binaryPath);
+        const fs15 = require("fs");
+        const resolved = fs15.realpathSync(binaryPath);
         const head = Buffer.alloc(8);
-        const fd = fs14.openSync(resolved, "r");
-        fs14.readSync(fd, head, 0, 8, 0);
-        fs14.closeSync(fd);
+        const fd = fs15.openSync(resolved, "r");
+        fs15.readSync(fd, head, 0, 8, 0);
+        fs15.closeSync(fd);
         let i = 0;
         if (head[0] === 239 && head[1] === 187 && head[2] === 191) i = 3;
         return head[i] === 35 && head[i + 1] === 33;
@@ -28550,12 +28550,12 @@ var require_dist2 = __commonJS({
     function looksLikeMachOOrElf(filePath) {
       if (!path7.isAbsolute(filePath)) return false;
       try {
-        const fs14 = require("fs");
-        const resolved = fs14.realpathSync(filePath);
+        const fs15 = require("fs");
+        const resolved = fs15.realpathSync(filePath);
         const buf = Buffer.alloc(8);
-        const fd = fs14.openSync(resolved, "r");
-        fs14.readSync(fd, buf, 0, 8, 0);
-        fs14.closeSync(fd);
+        const fd = fs15.openSync(resolved, "r");
+        fs15.readSync(fd, buf, 0, 8, 0);
+        fs15.closeSync(fd);
         let i = 0;
         if (buf[0] === 239 && buf[1] === 187 && buf[2] === 191) i = 3;
         const b2 = buf.subarray(i);
@@ -28608,6 +28608,9 @@ var require_dist2 = __commonJS({
       ).length;
       return matched >= required2;
     }
+    function normalizeScreenSnapshot(text) {
+      return sanitizeTerminalText(String(text || "")).replace(/\s+/g, " ").trim();
+    }
     function parsePatternEntry(x) {
       if (x instanceof RegExp) return x;
       if (x && typeof x === "object" && typeof x.source === "string") {
@@ -28650,14 +28653,14 @@ var require_dist2 = __commonJS({
           pty2 = require("node-pty");
           if (os8.platform() !== "win32") {
             try {
-              const fs14 = require("fs");
+              const fs15 = require("fs");
               const ptyDir = path7.resolve(path7.dirname(require.resolve("node-pty")), "..");
               const platformArch = `${os8.platform()}-${os8.arch()}`;
               const helper = path7.join(ptyDir, "prebuilds", platformArch, "spawn-helper");
-              if (fs14.existsSync(helper)) {
-                const stat4 = fs14.statSync(helper);
+              if (fs15.existsSync(helper)) {
+                const stat4 = fs15.statSync(helper);
                 if (!(stat4.mode & 73)) {
-                  fs14.chmodSync(helper, stat4.mode | 493);
+                  fs15.chmodSync(helper, stat4.mode | 493);
                   LOG2.info("CLI", "[node-pty] Fixed spawn-helper permissions");
                 }
               }
@@ -28691,10 +28694,25 @@ var require_dist2 = __commonJS({
             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.providerResolutionMeta = {
+              type: provider.type,
+              name: provider.name,
+              resolvedVersion: provider._resolvedVersion || null,
+              resolvedOs: provider._resolvedOs || null,
+              providerDir: provider._resolvedProviderDir || null,
+              scriptDir: provider._resolvedScriptDir || null,
+              scriptsPath: provider._resolvedScriptsPath || null,
+              scriptsSource: provider._resolvedScriptsSource || null,
+              versionWarning: provider._versionWarning || null
+            };
             this.cliScripts = provider.scripts || {};
             const scriptNames = Object.keys(this.cliScripts).filter((k) => typeof this.cliScripts[k] === "function");
             if (scriptNames.length > 0) {
               LOG2.info("CLI", `[${this.cliType}] CLI scripts: [${scriptNames.join(", ")}]`);
+              LOG2.info(
+                "CLI",
+                `[${this.cliType}] Provider resolution: providerDir=${this.providerResolutionMeta.providerDir || "-"} scriptDir=${this.providerResolutionMeta.scriptDir || "-"} scriptsPath=${this.providerResolutionMeta.scriptsPath || "-"} source=${this.providerResolutionMeta.scriptsSource || "-"} version=${this.providerResolutionMeta.resolvedVersion || "-"}`
+              );
             } else {
               LOG2.warn("CLI", `[${this.cliType}] \u26A0 No CLI scripts loaded! Provider needs scripts/{version}/scripts.js`);
             }
@@ -28727,6 +28745,10 @@ var require_dist2 = __commonJS({
           ptyOutputBuffer = "";
           ptyOutputFlushTimer = null;
           pendingTerminalQueryTail = "";
+          lastOutputAt = 0;
+          lastNonEmptyOutputAt = 0;
+          lastScreenChangeAt = 0;
+          lastScreenSnapshot = "";
           // Server log forwarding
           serverConn = null;
           logBuffer = [];
@@ -28747,6 +28769,7 @@ var require_dist2 = __commonJS({
           submitRetryTimer = null;
           submitRetryUsed = false;
           submitRetryPromptSnippet = "";
+          idleFinishCandidate = null;
           // Resize redraw suppression
           resizeSuppressUntil = 0;
           // Debug: status transition history
@@ -28762,6 +28785,12 @@ var require_dist2 = __commonJS({
           /** Max accumulated buffer size (last 50KB) */
           static MAX_ACCUMULATED_BUFFER = 5e4;
           currentTurnScope = null;
+          traceEntries = [];
+          traceSeq = 0;
+          traceSessionId = `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`;
+          static MAX_TRACE_ENTRIES = 250;
+          providerResolutionMeta;
+          static IDLE_FINISH_CONFIRM_MS = 900;
           syncMessageViews() {
             this.messages = [...this.committedMessages];
             this.structuredMessages = [...this.committedMessages];
@@ -28797,8 +28826,89 @@ var require_dist2 = __commonJS({
             this.currentStatus = status;
             this.statusHistory.push({ status, at: Date.now(), trigger });
             if (this.statusHistory.length > 50) this.statusHistory.shift();
+            this.recordTrace("status", {
+              previousStatus: prev,
+              trigger: trigger || null
+            });
             LOG2.info("CLI", `[${this.cliType}] status: ${prev} \u2192 ${status}${trigger ? ` (${trigger})` : ""}`);
           }
+          clearIdleFinishCandidate(reason) {
+            if (!this.idleFinishCandidate) return;
+            this.recordTrace("idle_candidate_reset", {
+              reason,
+              candidate: this.idleFinishCandidate
+            });
+            this.idleFinishCandidate = null;
+          }
+          armIdleFinishCandidate(assistantLength) {
+            const now = Date.now();
+            this.idleFinishCandidate = {
+              armedAt: now,
+              lastOutputAt: this.lastOutputAt,
+              lastScreenChangeAt: this.lastScreenChangeAt,
+              responseEpoch: this.responseEpoch,
+              assistantLength
+            };
+            this.recordTrace("idle_candidate_armed", {
+              confirmMs: _ProviderCliAdapter.IDLE_FINISH_CONFIRM_MS,
+              candidate: this.idleFinishCandidate,
+              ...this.buildTraceParseSnapshot(this.currentTurnScope, this.responseBuffer)
+            });
+            if (this.settleTimer) clearTimeout(this.settleTimer);
+            this.settleTimer = setTimeout(() => {
+              this.settleTimer = null;
+              this.settledBuffer = this.recentOutputBuffer;
+              this.evaluateSettled();
+            }, _ProviderCliAdapter.IDLE_FINISH_CONFIRM_MS);
+          }
+          summarizeTraceText(text, max = 800) {
+            const value = sanitizeTerminalText(String(text || ""));
+            if (value.length <= max) return value;
+            return `\u2026${value.slice(-max)}`;
+          }
+          summarizeTraceMessages(messages, limit = 3) {
+            return messages.slice(-limit).map((message) => ({
+              role: message.role,
+              content: this.summarizeTraceText(message.content, 240),
+              timestamp: message.timestamp
+            }));
+          }
+          buildTraceParseSnapshot(scope, partialResponse = "") {
+            const scopedBuffer = scope ? this.sliceFromOffset(this.accumulatedBuffer, scope.bufferStart) || this.accumulatedBuffer : this.accumulatedBuffer;
+            const scopedRawBuffer = scope ? this.sliceFromOffset(this.accumulatedRawBuffer, scope.rawBufferStart) || this.accumulatedRawBuffer : this.accumulatedRawBuffer;
+            return {
+              currentTurnScope: scope || null,
+              responseBuffer: this.summarizeTraceText(this.responseBuffer, 1200),
+              partialResponse: this.summarizeTraceText(partialResponse || this.responseBuffer, 1200),
+              turnBuffer: this.summarizeTraceText(scopedBuffer, 1600),
+              turnRawPreview: this.summarizeTraceText(scopedRawBuffer, 1600),
+              turnSanitizedRawPreview: this.summarizeTraceText(sanitizeTerminalText(scopedRawBuffer), 1600)
+            };
+          }
+          recordTrace(type, payload = {}) {
+            const entry = {
+              id: ++this.traceSeq,
+              at: Date.now(),
+              type,
+              status: this.currentStatus,
+              isWaitingForResponse: this.isWaitingForResponse,
+              activeModal: this.activeModal ? { message: this.activeModal.message, buttons: [...this.activeModal.buttons] } : null,
+              payload
+            };
+            this.traceEntries.push(entry);
+            if (this.traceEntries.length > _ProviderCliAdapter.MAX_TRACE_ENTRIES) {
+              this.traceEntries.splice(0, this.traceEntries.length - _ProviderCliAdapter.MAX_TRACE_ENTRIES);
+            }
+          }
+          resetTraceSession() {
+            this.traceEntries = [];
+            this.traceSeq = 0;
+            this.traceSessionId = `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`;
+            this.recordTrace("session_start", {
+              providerType: this.cliType,
+              workingDir: this.workingDir
+            });
+          }
           // Resolved timeouts
           timeouts;
           // Provider approval key mapping
@@ -28844,6 +28954,7 @@ var require_dist2 = __commonJS({
             const isWin = os8.platform() === "win32";
             const allArgs = [...spawnConfig.args, ...this.extraArgs];
             LOG2.info("CLI", `[${this.cliType}] Spawning in ${this.workingDir}`);
+            this.resetTraceSession();
             let shellCmd;
             let shellArgs;
             const useShellUnix = !isWin && (!!spawnConfig.shell || !path7.isAbsolute(binaryPath) || isScriptBinary(binaryPath) || !looksLikeMachOOrElf(binaryPath));
@@ -28869,6 +28980,14 @@ var require_dist2 = __commonJS({
               cwd: this.workingDir,
               env: buildCliSpawnEnv(process.env, spawnConfig.env)
             };
+            this.recordTrace("spawn", {
+              shellCommand: shellCmd,
+              shellArgs,
+              cwd: ptyOpts.cwd,
+              cols: ptyOpts.cols,
+              rows: ptyOpts.rows,
+              providerResolution: this.providerResolutionMeta
+            });
             try {
               this.ptyProcess = this.transportFactory.spawn(shellCmd, shellArgs, ptyOpts);
             } catch (err) {
@@ -28911,6 +29030,7 @@ var require_dist2 = __commonJS({
             this.ptyProcess.onExit(({ exitCode }) => {
               LOG2.info("CLI", `[${this.cliType}] Exit code ${exitCode}`);
               this.flushPendingOutputParse();
+              this.recordTrace("exit", { exitCode });
               this.ptyProcess = null;
               this.setStatus("stopped", "pty_exit");
               this.ready = false;
@@ -28926,6 +29046,9 @@ var require_dist2 = __commonJS({
             this.currentTurnScope = null;
             this.ready = false;
             await this.ptyProcess.ready;
+            this.recordTrace("ready", {
+              runtimeMeta: this.getRuntimeMetadata()
+            });
             this.setStatus("idle", "pty_ready");
             this.onStatusChange?.();
           }
@@ -28933,6 +29056,24 @@ var require_dist2 = __commonJS({
           handleOutput(rawData) {
             this.terminalScreen.write(rawData);
             const cleanData = sanitizeTerminalText(rawData);
+            const now = Date.now();
+            const normalizedScreenSnapshot = normalizeScreenSnapshot(this.terminalScreen.getText());
+            this.lastOutputAt = now;
+            if (cleanData.trim()) this.lastNonEmptyOutputAt = now;
+            if (normalizedScreenSnapshot !== this.lastScreenSnapshot) {
+              this.lastScreenSnapshot = normalizedScreenSnapshot;
+              this.lastScreenChangeAt = now;
+            }
+            if (this.idleFinishCandidate && (rawData.length > 0 || cleanData.length > 0)) {
+              this.clearIdleFinishCandidate("new_output");
+            }
+            this.recordTrace("output", {
+              rawLength: rawData.length,
+              cleanLength: cleanData.length,
+              rawPreview: this.summarizeTraceText(rawData, 300),
+              cleanPreview: this.summarizeTraceText(cleanData, 300),
+              screenText: this.summarizeTraceText(this.terminalScreen.getText(), 1200)
+            });
             if (this.isWaitingForResponse && cleanData) {
               this.responseBuffer = (this.responseBuffer + cleanData).slice(-8e3);
             }
@@ -28950,11 +29091,17 @@ var require_dist2 = __commonJS({
               this.startupBuffer += cleanData;
               const elapsed = Date.now() - this.spawnAt;
               const scriptStatus = this.runDetectStatus(this.startupBuffer);
-              const isReady = scriptStatus === "idle" || scriptStatus === "waiting_approval" || elapsed > 8e3 || this.startupBuffer.length > 12e3;
+              const screenText = this.terminalScreen.getText() || "";
+              const hasInteractivePrompt = this.looksLikeVisibleIdlePrompt(screenText);
+              const startupStableMs = this.lastScreenChangeAt ? now - this.lastScreenChangeAt : 0;
+              const isReady = (scriptStatus === "idle" || scriptStatus === "waiting_approval") && hasInteractivePrompt && startupStableMs >= 700 || elapsed > 8e3 || this.startupBuffer.length > 12e3;
               if (isReady) {
                 this.startupParseGate = false;
                 this.ready = true;
-                LOG2.info("CLI", `[${this.cliType}] Startup ready (${elapsed}ms, scriptStatus=${scriptStatus})`);
+                LOG2.info(
+                  "CLI",
+                  `[${this.cliType}] Startup ready (${elapsed}ms, scriptStatus=${scriptStatus}, prompt=${hasInteractivePrompt}, stableMs=${startupStableMs}) providerDir=${this.providerResolutionMeta.providerDir || "-"} scriptDir=${this.providerResolutionMeta.scriptDir || "-"} scriptsPath=${this.providerResolutionMeta.scriptsPath || "-"}`
+                );
                 this.onStatusChange?.();
               }
             }
@@ -28999,6 +29146,41 @@ var require_dist2 = __commonJS({
             if (!text.trim()) return false;
             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);
           }
+          async waitForInteractivePrompt(maxWaitMs = 5e3) {
+            const startedAt = Date.now();
+            let loggedWait = false;
+            while (Date.now() - startedAt < maxWaitMs) {
+              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 !== "starting" && status !== "generating";
+              if (interactiveReady) {
+                if (loggedWait) {
+                  LOG2.info(
+                    "CLI",
+                    `[${this.cliType}] Interactive prompt ready after ${Date.now() - startedAt}ms (stableMs=${stableMs}, recentOutputMs=${recentlyOutput}, startup=${startupLikelyActive})`
+                  );
+                }
+                return;
+              }
+              if (!loggedWait && Date.now() - startedAt >= 400) {
+                loggedWait = true;
+                LOG2.info(
+                  "CLI",
+                  `[${this.cliType}] Waiting for interactive prompt: hasPrompt=${hasPrompt} stableMs=${stableMs} recentOutputMs=${recentlyOutput} status=${status} startup=${startupLikelyActive} screen=${JSON.stringify(this.summarizeTraceText(screenText, 220)).slice(0, 260)}`
+                );
+              }
+              await new Promise((resolve10) => setTimeout(resolve10, 50));
+            }
+            const finalScreenText = this.terminalScreen.getText() || "";
+            LOG2.warn(
+              "CLI",
+              `[${this.cliType}] Interactive prompt wait timed out after ${maxWaitMs}ms; proceeding with screen=${JSON.stringify(this.summarizeTraceText(finalScreenText, 240)).slice(0, 280)}`
+            );
+          }
           evaluateSettled() {
             const now = Date.now();
             if (this.submitPendingUntil > now || this.responseSettleIgnoreUntil > now) {
@@ -29016,6 +29198,30 @@ var require_dist2 = __commonJS({
             const modal = this.runParseApproval(tail);
             const rawScriptStatus = this.runDetectStatus(tail);
             const scriptStatus = rawScriptStatus;
+            const parsedTranscript = this.parseCurrentTranscript(
+              this.committedMessages,
+              this.responseBuffer,
+              this.currentTurnScope
+            );
+            const parsedMessages = Array.isArray(parsedTranscript?.messages) ? this.normalizeParsedMessages(parsedTranscript.messages) : [];
+            const lastParsedAssistant = [...parsedMessages].reverse().find((message) => message.role === "assistant");
+            this.recordTrace("settled", {
+              tail: this.summarizeTraceText(tail, 500),
+              screenText: this.summarizeTraceText(screenText, 1200),
+              detectStatus: scriptStatus,
+              parsedStatus: parsedTranscript?.status || null,
+              parsedMessageCount: parsedMessages.length,
+              parsedLastAssistant: lastParsedAssistant ? this.summarizeTraceText(lastParsedAssistant.content, 280) : "",
+              parsedActiveModal: parsedTranscript?.activeModal ?? null,
+              approval: modal,
+              ...this.buildTraceParseSnapshot(this.currentTurnScope, this.responseBuffer)
+            });
+            if (this.currentTurnScope && !lastParsedAssistant) {
+              LOG2.info(
+                "CLI",
+                `[${this.cliType}] Settled without assistant: prompt=${JSON.stringify(this.currentTurnScope.prompt).slice(0, 140)} responseBuffer=${JSON.stringify(this.summarizeTraceText(this.responseBuffer, 220)).slice(0, 260)} screen=${JSON.stringify(this.summarizeTraceText(screenText, 220)).slice(0, 260)} providerDir=${this.providerResolutionMeta.providerDir || "-"} scriptDir=${this.providerResolutionMeta.scriptDir || "-"}`
+              );
+            }
             if (!scriptStatus) return;
             const prevStatus = this.currentStatus;
             const clearPendingScriptStatus = () => {
@@ -29051,6 +29257,7 @@ var require_dist2 = __commonJS({
               clearPendingScriptStatus();
             }
             if (scriptStatus === "waiting_approval") {
+              this.clearIdleFinishCandidate("waiting_approval");
               const inCooldown = this.lastApprovalResolvedAt && Date.now() - this.lastApprovalResolvedAt < this.timeouts.approvalCooldown;
               const visibleIdlePrompt = this.looksLikeVisibleIdlePrompt(screenText);
               if ((inCooldown || visibleIdlePrompt) && !modal) {
@@ -29084,6 +29291,7 @@ var require_dist2 = __commonJS({
               }
             }
             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));
@@ -29120,13 +29328,58 @@ var require_dist2 = __commonJS({
                 this.lastApprovalResolvedAt = Date.now();
               }
               if (this.isWaitingForResponse) {
+                const visibleIdlePrompt = 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 idleQuietThresholdMs = Math.max(220, this.timeouts.outputSettle);
+                const idleStableThresholdMs = Math.max(120, Math.min(220, this.timeouts.outputSettle));
+                const idleReady = visibleIdlePrompt && !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 >= _ProviderCliAdapter.IDLE_FINISH_CONFIRM_MS;
+                const canFinishImmediately = idleReady && candidateQuiet;
+                this.recordTrace("idle_decision", {
+                  visibleIdlePrompt,
+                  quietForMs,
+                  screenStableMs,
+                  hasAssistantTurn,
+                  assistantLength,
+                  hasModal: !!modal,
+                  idleQuietThresholdMs,
+                  idleStableThresholdMs,
+                  idleReady,
+                  idleFinishConfirmMs: _ProviderCliAdapter.IDLE_FINISH_CONFIRM_MS,
+                  idleFinishCandidate: candidate,
+                  candidateQuiet,
+                  canFinishImmediately,
+                  submitPendingUntil: this.submitPendingUntil,
+                  responseSettleIgnoreUntil: this.responseSettleIgnoreUntil,
+                  ...this.buildTraceParseSnapshot(this.currentTurnScope, this.responseBuffer)
+                });
+                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") {
+                    this.clearIdleFinishCandidate("idle_timeout_finish");
                     this.finishResponse();
                   }
                 }, this.timeouts.idleFinish);
               } else if (prevStatus !== "idle") {
+                this.clearIdleFinishCandidate("idle_without_response");
                 this.setStatus("idle", "script_detect");
                 this.onStatusChange?.();
               }
@@ -29135,6 +29388,10 @@ var require_dist2 = __commonJS({
           finishResponse() {
             if (this.submitPendingUntil > Date.now()) return;
             if (this.responseSettleIgnoreUntil > Date.now()) return;
+            this.clearIdleFinishCandidate("finish_response_enter");
+            this.recordTrace("finish_response", {
+              ...this.buildTraceParseSnapshot(this.currentTurnScope, this.responseBuffer)
+            });
             this.commitCurrentTranscript();
             if (this.responseTimeout) {
               clearTimeout(this.responseTimeout);
@@ -29171,6 +29428,20 @@ var require_dist2 = __commonJS({
             if (parsed && Array.isArray(parsed.messages)) {
               this.committedMessages = this.normalizeParsedMessages(parsed.messages);
               this.syncMessageViews();
+              const lastAssistant = [...this.committedMessages].reverse().find((message) => message.role === "assistant");
+              this.recordTrace("commit_transcript", {
+                parsedStatus: parsed.status || null,
+                messageCount: this.committedMessages.length,
+                lastAssistant: lastAssistant ? this.summarizeTraceText(lastAssistant.content, 320) : "",
+                messages: this.summarizeTraceMessages(this.committedMessages),
+                ...this.buildTraceParseSnapshot(this.currentTurnScope, this.responseBuffer)
+              });
+              if (!lastAssistant && this.currentTurnScope) {
+                LOG2.warn(
+                  "CLI",
+                  `[${this.cliType}] Commit without assistant turn: prompt=${JSON.stringify(this.currentTurnScope.prompt).slice(0, 140)} responseBuffer=${JSON.stringify(this.summarizeTraceText(this.responseBuffer, 220)).slice(0, 260)} providerDir=${this.providerResolutionMeta.providerDir || "-"} scriptDir=${this.providerResolutionMeta.scriptDir || "-"} scriptsPath=${this.providerResolutionMeta.scriptsPath || "-"}`
+                );
+              }
             }
           }
           // ─── Script Execution ──────────────────────────
@@ -29294,16 +29565,23 @@ ${data.message || ""}`.trim();
             }
             if (!this.ready) throw new Error(`${this.cliName} not ready (status: ${this.currentStatus})`);
             if (this.isWaitingForResponse) return;
+            await this.waitForInteractivePrompt();
             this.committedMessages.push({ role: "user", content: text, timestamp: Date.now() });
             this.syncMessageViews();
             this.isWaitingForResponse = true;
             this.responseBuffer = "";
+            this.clearIdleFinishCandidate("send_message");
             this.currentTurnScope = {
               prompt: text,
               startedAt: Date.now(),
               bufferStart: this.accumulatedBuffer.length,
               rawBufferStart: this.accumulatedRawBuffer.length
             };
+            this.recordTrace("send_message", {
+              text: this.summarizeTraceText(text, 500),
+              estimatedLines: estimatePromptDisplayLines(text),
+              turnScope: this.currentTurnScope
+            });
             LOG2.info("CLI", `[${this.cliType}] sendMessage turn scope buffer=${this.currentTurnScope.bufferStart} raw=${this.currentTurnScope.rawBufferStart} prompt=${JSON.stringify(text).slice(0, 120)}`);
             this.submitRetryUsed = false;
             this.submitRetryPromptSnippet = extractPromptRetrySnippet(text);
@@ -29333,6 +29611,11 @@ ${data.message || ""}`.trim();
             const submit = () => {
               if (!this.ptyProcess) return;
               this.submitPendingUntil = 0;
+              this.recordTrace("submit_write", {
+                mode: "submit_key",
+                sendKey: this.sendKey,
+                screenText: this.summarizeTraceText(this.terminalScreen.getText(), 500)
+              });
               this.ptyProcess.write(this.sendKey);
               const retrySubmitIfStuck = (attempt) => {
                 this.submitRetryTimer = null;
@@ -29344,6 +29627,12 @@ ${data.message || ""}`.trim();
                 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;
                 LOG2.info("CLI", `[${this.cliType}] Retrying submit key for stuck prompt (attempt ${attempt})`);
+                this.recordTrace("submit_write", {
+                  mode: "submit_retry",
+                  attempt,
+                  sendKey: this.sendKey,
+                  screenText: this.summarizeTraceText(screenText, 500)
+                });
                 this.ptyProcess.write(this.sendKey);
                 if (attempt >= 3) {
                   this.submitRetryUsed = true;
@@ -29356,6 +29645,12 @@ ${data.message || ""}`.trim();
             };
             if (this.submitStrategy === "immediate") {
               this.submitPendingUntil = 0;
+              this.recordTrace("submit_write", {
+                mode: "immediate",
+                text: this.summarizeTraceText(text, 500),
+                sendKey: this.sendKey,
+                screenText: this.summarizeTraceText(this.terminalScreen.getText(), 500)
+              });
               this.ptyProcess.write(text + this.sendKey);
               this.submitRetryTimer = setTimeout(() => {
                 this.submitRetryTimer = null;
@@ -29366,6 +29661,12 @@ ${data.message || ""}`.trim();
                 if (!promptLikelyVisible(screenText, normalizedPromptSnippet)) return;
                 LOG2.info("CLI", `[${this.cliType}] Retrying submit key for stuck prompt (attempt 1)`);
                 this.responseSettleIgnoreUntil = Date.now() + this.timeouts.outputSettle + 400;
+                this.recordTrace("submit_write", {
+                  mode: "immediate_retry",
+                  attempt: 1,
+                  sendKey: this.sendKey,
+                  screenText: this.summarizeTraceText(screenText, 500)
+                });
                 this.ptyProcess.write(this.sendKey);
                 this.submitRetryUsed = true;
               }, retryDelayMs);
@@ -29376,6 +29677,12 @@ ${data.message || ""}`.trim();
               this.submitPendingUntil = Date.now() + submitDelayMs;
             }
             this.ptyProcess.write(text);
+            this.recordTrace("submit_write", {
+              mode: "type_then_submit",
+              text: this.summarizeTraceText(text, 500),
+              sendKey: this.sendKey,
+              screenText: this.summarizeTraceText(this.terminalScreen.getText(), 500)
+            });
             const submitStartedAt = Date.now();
             let lastNormalizedScreen = "";
             let lastScreenChangeAt = submitStartedAt;
@@ -29476,6 +29783,7 @@ ${data.message || ""}`.trim();
             });
           }
           shutdown() {
+            this.clearIdleFinishCandidate("shutdown");
             if (this.settleTimer) {
               clearTimeout(this.settleTimer);
               this.settleTimer = null;
@@ -29516,6 +29824,7 @@ ${data.message || ""}`.trim();
             }
           }
           detach() {
+            this.clearIdleFinishCandidate("detach");
             if (this.settleTimer) {
               clearTimeout(this.settleTimer);
               this.settleTimer = null;
@@ -29556,6 +29865,7 @@ ${data.message || ""}`.trim();
             this.onStatusChange?.();
           }
           clearHistory() {
+            this.clearIdleFinishCandidate("clear_history");
             this.committedMessages = [];
             this.syncMessageViews();
             this.accumulatedBuffer = "";
@@ -29585,10 +29895,19 @@ ${data.message || ""}`.trim();
             return this.ready;
           }
           writeRaw(data) {
+            this.recordTrace("write_raw", {
+              keys: JSON.stringify(data),
+              length: data.length
+            });
             this.ptyProcess?.write(data);
           }
           resolveModal(buttonIndex) {
             if (!this.ptyProcess || this.currentStatus !== "waiting_approval" && !this.activeModal) return;
+            this.clearIdleFinishCandidate("resolve_modal");
+            this.recordTrace("resolve_modal", {
+              buttonIndex,
+              activeModal: this.activeModal
+            });
             this.activeModal = null;
             this.lastApprovalResolvedAt = Date.now();
             this.responseSettleIgnoreUntil = Date.now() + this.timeouts.outputSettle + 400;
@@ -29620,6 +29939,7 @@ ${data.message || ""}`.trim();
             return {
               type: this.cliType,
               name: this.cliName,
+              providerResolution: this.providerResolutionMeta,
               status: this.currentStatus,
               ready: this.ready,
               startupParseGate: this.startupParseGate,
@@ -29639,6 +29959,10 @@ ${data.message || ""}`.trim();
               rawBufferPreview: this.accumulatedRawBuffer.slice(-1e3),
               sanitizedRawPreview: sanitizeTerminalText(this.accumulatedRawBuffer).slice(-1e3),
               responseBuffer: this.responseBuffer.slice(-1e3),
+              lastOutputAt: this.lastOutputAt,
+              lastNonEmptyOutputAt: this.lastNonEmptyOutputAt,
+              lastScreenChangeAt: this.lastScreenChangeAt,
+              lastScreenSnapshot: this.lastScreenSnapshot.slice(-500),
               isWaitingForResponse: this.isWaitingForResponse,
               activeModal: this.activeModal,
               lastApprovalResolvedAt: this.lastApprovalResolvedAt,
@@ -29650,6 +29974,8 @@ ${data.message || ""}`.trim();
               resizeSuppressUntil: this.resizeSuppressUntil,
               hasCliScripts: this.hasCliScripts(),
               scriptNames: Object.keys(this.cliScripts).filter((k) => typeof this.cliScripts[k] === "function"),
+              traceSessionId: this.traceSessionId,
+              traceEntryCount: this.traceEntries.length,
               statusHistory: this.statusHistory.slice(-30),
               timeouts: this.timeouts,
               pendingOutputParseBufferLength: this.pendingOutputParseBuffer.length,
@@ -29657,6 +29983,25 @@ ${data.message || ""}`.trim();
               ptyAlive: !!this.ptyProcess
             };
           }
+          getTraceState(limit = 120) {
+            const cappedLimit = Math.max(1, Math.min(500, Number.isFinite(limit) ? Math.floor(limit) : 120));
+            return {
+              sessionId: this.traceSessionId,
+              providerResolution: this.providerResolutionMeta,
+              entryCount: this.traceEntries.length,
+              entries: this.traceEntries.slice(-cappedLimit),
+              screenText: this.summarizeTraceText(this.terminalScreen.getText(), 4e3),
+              recentOutputBuffer: this.summarizeTraceText(this.recentOutputBuffer, 1e3),
+              responseBuffer: this.summarizeTraceText(this.responseBuffer, 1200),
+              status: this.currentStatus,
+              activeModal: this.activeModal,
+              currentTurnScope: this.currentTurnScope,
+              messages: this.summarizeTraceMessages(this.committedMessages, 5)
+            };
+          }
+          getProviderResolutionMeta() {
+            return { ...this.providerResolutionMeta };
+          }
           respondToTerminalQueries(data) {
             if (!this.ptyProcess || !data) return;
             const combined = this.pendingTerminalQueryTail + data;
@@ -29752,22 +30097,22 @@ ${data.message || ""}`.trim();
     });
     module2.exports = __toCommonJS2(index_exports);
     init_config();
-    var fs3 = __toESM2(require("fs"));
-    var os5 = __toESM2(require("os"));
+    var fs4 = __toESM2(require("fs"));
+    var os6 = __toESM2(require("os"));
     var path5 = __toESM2(require("path"));
     var import_crypto22 = require("crypto");
     var MAX_WORKSPACES = 50;
     function expandPath(p) {
       const t = (p || "").trim();
       if (!t) return "";
-      if (t.startsWith("~")) return path5.join(os5.homedir(), t.slice(1).replace(/^\//, ""));
+      if (t.startsWith("~")) return path5.join(os6.homedir(), t.slice(1).replace(/^\//, ""));
       return path5.resolve(t);
     }
     function validateWorkspacePath(absPath) {
       try {
         if (!absPath) return { ok: false, error: "Path required" };
-        if (!fs3.existsSync(absPath)) return { ok: false, error: "Path does not exist" };
-        const st2 = fs3.statSync(absPath);
+        if (!fs4.existsSync(absPath)) return { ok: false, error: "Path does not exist" };
+        const st2 = fs4.statSync(absPath);
         if (!st2.isDirectory()) return { ok: false, error: "Not a directory" };
         return { ok: true };
       } catch (e) {
@@ -29833,7 +30178,7 @@ ${data.message || ""}`.trim();
         };
       }
       if (a.useHome === true) {
-        return { ok: true, path: os5.homedir(), source: "home" };
+        return { ok: true, path: os6.homedir(), source: "home" };
       }
       return {
         ok: false,
@@ -29874,9 +30219,9 @@ ${data.message || ""}`.trim();
       const abs = expandPath(rawPath);
       const createIfMissing = options?.createIfMissing === true;
       if (!abs) return { error: "Path required" };
-      if (!fs3.existsSync(abs) && createIfMissing) {
+      if (!fs4.existsSync(abs) && createIfMissing) {
         try {
-          fs3.mkdirSync(abs, { recursive: true });
+          fs4.mkdirSync(abs, { recursive: true });
         } catch (e) {
           return { error: e?.message || "Could not create directory" };
         }
@@ -31824,6 +32169,7 @@ ${data.message || ""}`.trim();
               role: msg.role,
               content: msg.content || "",
               kind: typeof msg.kind === "string" ? msg.kind : void 0,
+              senderName: typeof msg.senderName === "string" ? msg.senderName : void 0,
               agent: agentType,
               instanceId,
               historySessionId: effectiveHistoryKey,
@@ -31862,6 +32208,7 @@ ${data.message || ""}`.trim();
             kind: "system",
             content,
             receivedAt: options.receivedAt,
+            senderName: options.senderName,
             historyDedupKey: options.dedupKey
           }],
           options.sessionTitle,
@@ -33192,6 +33539,12 @@ ${data.message || ""}`.trim();
     function getTargetedCliAdapter(h, args, providerType) {
       return h.getCliAdapter(args?.targetSessionId || providerType || h.currentSession?.providerType || h.currentManagerKey);
     }
+    function getTargetInstance(h, args) {
+      const targetSessionId = typeof args?.targetSessionId === "string" ? args.targetSessionId.trim() : "";
+      const sessionId = targetSessionId || h.currentSession?.sessionId || "";
+      if (!sessionId) return null;
+      return h.ctx.instanceManager?.getInstance(sessionId);
+    }
     function getTargetTransport(h, provider) {
       if (h.currentSession?.transport) return h.currentSession.transport;
       switch (provider?.category) {
@@ -33934,6 +34287,7 @@ ${data.message || ""}`.trim();
           adapter.writeRaw?.(keys);
         }
         LOG2.info("Command", `[resolveAction] CLI PTY \u2192 buttonIndex=${buttonIndex} "${buttons[buttonIndex] ?? "?"}"`);
+        getTargetInstance(h, args)?.recordApprovalSelection?.(buttons[buttonIndex] ?? button);
         return { success: true, buttonIndex, button: buttons[buttonIndex] ?? button };
       }
       if (isExtensionTransport(transport) && h.agentStream && h.getCdp() && h.currentSession?.sessionId) {
@@ -34015,9 +34369,9 @@ ${data.message || ""}`.trim();
       }
       return { success: false, error: "resolveAction script not available for this provider" };
     }
-    var fs4 = __toESM2(require("fs"));
+    var fs42 = __toESM2(require("fs"));
     var path6 = __toESM2(require("path"));
-    var os6 = __toESM2(require("os"));
+    var os62 = __toESM2(require("os"));
     var KEY_TO_VK = {
       Backspace: 8,
       Tab: 9,
@@ -34244,7 +34598,7 @@ ${data.message || ""}`.trim();
       return { success: true, agents };
     }
     function resolveSafePath(requestedPath) {
-      const home = os6.homedir();
+      const home = os62.homedir();
       let resolved;
       if (requestedPath.startsWith("~")) {
         resolved = path6.join(home, requestedPath.slice(1));
@@ -34258,7 +34612,7 @@ ${data.message || ""}`.trim();
     async function handleFileRead(h, args) {
       try {
         const filePath = resolveSafePath(args?.path);
-        const content = fs4.readFileSync(filePath, "utf-8");
+        const content = fs42.readFileSync(filePath, "utf-8");
         return { success: true, content, path: filePath };
       } catch (e) {
         return { success: false, error: e.message };
@@ -34267,8 +34621,8 @@ ${data.message || ""}`.trim();
     async function handleFileWrite(h, args) {
       try {
         const filePath = resolveSafePath(args?.path);
-        fs4.mkdirSync(path6.dirname(filePath), { recursive: true });
-        fs4.writeFileSync(filePath, args?.content || "", "utf-8");
+        fs42.mkdirSync(path6.dirname(filePath), { recursive: true });
+        fs42.writeFileSync(filePath, args?.content || "", "utf-8");
         return { success: true, path: filePath };
       } catch (e) {
         return { success: false, error: e.message };
@@ -34277,11 +34631,11 @@ ${data.message || ""}`.trim();
     async function handleFileList(h, args) {
       try {
         const dirPath = resolveSafePath(args?.path || ".");
-        const entries = fs4.readdirSync(dirPath, { withFileTypes: true });
+        const entries = fs42.readdirSync(dirPath, { withFileTypes: true });
         const files = entries.map((e) => ({
           name: e.name,
           type: e.isDirectory() ? "directory" : "file",
-          size: e.isFile() ? fs4.statSync(path6.join(dirPath, e.name)).size : void 0
+          size: e.isFile() ? fs42.statSync(path6.join(dirPath, e.name)).size : void 0
         }));
         return { success: true, files, path: dirPath };
       } catch (e) {
@@ -35095,6 +35449,7 @@ ${data.message || ""}`.trim();
       generatingDebouncePending = null;
       lastApprovalEventAt = 0;
       historyWriter;
+      runtimeMessages = [];
       instanceId;
       presentationMode;
       providerSessionId;
@@ -35157,6 +35512,7 @@ ${data.message || ""}`.trim();
         }
         const runtime = this.adapter.getRuntimeMetadata();
         const parsedMessages = Array.isArray(parsedStatus?.messages) ? parsedStatus.messages : [];
+        const mergedMessages = this.mergeConversationMessages(parsedMessages);
         const dirName = this.workingDir.split("/").filter(Boolean).pop() || "session";
         if (parsedMessages.length > 0) {
           let messagesToSave = parsedMessages;
@@ -35186,7 +35542,7 @@ ${data.message || ""}`.trim();
             id: `${this.type}_${this.workingDir}`,
             title: parsedStatus?.title || dirName,
             status: parsedStatus?.status || adapterStatus.status,
-            messages: parsedMessages,
+            messages: mergedMessages,
             activeModal: parsedStatus?.activeModal ?? adapterStatus.activeModal,
             inputContent: ""
           },
@@ -35285,6 +35641,11 @@ ${data.message || ""}`.trim();
             const approvalCooldown = 5e3;
             if (this.lastStatus !== "waiting_approval" && (!this.lastApprovalEventAt || now - this.lastApprovalEventAt > approvalCooldown)) {
               this.lastApprovalEventAt = now;
+              this.appendRuntimeSystemMessage(
+                this.formatApprovalRequestMessage(modal?.message, modal?.buttons),
+                `approval_request:${now}`,
+                now
+              );
               this.pushEvent({
                 event: "agent:waiting_approval",
                 chatTitle,
@@ -35356,11 +35717,71 @@ ${data.message || ""}`.trim();
       get cliName() {
         return this.provider.name;
       }
+      recordApprovalSelection(buttonText) {
+        const cleanButton = String(buttonText || "").trim();
+        if (!cleanButton) return;
+        const now = Date.now();
+        this.appendRuntimeSystemMessage(
+          `Approval selected: ${cleanButton}`,
+          `approval_selection:${now}:${cleanButton}`,
+          now
+        );
+      }
       formatMarkerTimestamp(timestamp) {
         const date5 = new Date(timestamp);
         const pad = (value) => String(value).padStart(2, "0");
         return `${date5.getFullYear()}-${pad(date5.getMonth() + 1)}-${pad(date5.getDate())} ${pad(date5.getHours())}:${pad(date5.getMinutes())}:${pad(date5.getSeconds())}`;
       }
+      appendRuntimeSystemMessage(content, dedupKey, receivedAt = Date.now()) {
+        const normalizedContent = String(content || "").trim();
+        if (!normalizedContent) return;
+        if (this.runtimeMessages.some((entry) => entry.key === dedupKey)) return;
+        this.runtimeMessages.push({
+          key: dedupKey,
+          message: {
+            role: "system",
+            senderName: "System",
+            content: normalizedContent,
+            receivedAt,
+            timestamp: receivedAt
+          }
+        });
+        if (this.runtimeMessages.length > 50) {
+          this.runtimeMessages = this.runtimeMessages.slice(-50);
+        }
+        this.historyWriter.appendNewMessages(
+          this.type,
+          [{
+            role: "system",
+            senderName: "System",
+            content: normalizedContent,
+            receivedAt,
+            historyDedupKey: dedupKey
+          }],
+          this.adapter.getScriptParsedStatus?.()?.title || this.workingDir.split("/").filter(Boolean).pop() || "session",
+          this.instanceId,
+          this.providerSessionId
+        );
+      }
+      mergeConversationMessages(parsedMessages) {
+        if (this.runtimeMessages.length === 0) return parsedMessages;
+        return [...parsedMessages, ...this.runtimeMessages.map((entry) => entry.message)].map((message, index) => ({ message, index })).sort((a, b2) => {
+          const aTime = a.message.receivedAt || a.message.timestamp || 0;
+          const bTime = b2.message.receivedAt || b2.message.timestamp || 0;
+          if (aTime !== bTime) return aTime - bTime;
+          return a.index - b2.index;
+        }).map((entry) => entry.message);
+      }
+      formatApprovalRequestMessage(modalMessage, buttons) {
+        const lines = ["Approval requested"];
+        const cleanMessage = String(modalMessage || "").trim();
+        if (cleanMessage) lines.push(cleanMessage);
+        const labels = (buttons || []).map((button) => String(button || "").trim()).filter(Boolean);
+        if (labels.length > 0) {
+          lines.push(labels.map((label) => `[${label}]`).join(" "));
+        }
+        return lines.join("\n");
+      }
       promoteProviderSessionId(sessionId) {
         const nextSessionId = String(sessionId || "").trim();
         if (!nextSessionId || nextSessionId === this.providerSessionId) return;
@@ -37364,6 +37785,7 @@ ${installInfo}`
       resolve(type, context) {
         const base = this.providers.get(type);
         if (!base) return void 0;
+        const providerDir = this.findProviderDirInternal(type) || void 0;
         const currentOs = context?.os || process.platform;
         const currentVersion = context?.version ?? this.versionArchive?.getLatest(type) ?? void 0;
         const resolved = JSON.parse(JSON.stringify(base));
@@ -37373,6 +37795,9 @@ ${installInfo}`
         if (base.scripts) {
           resolved.scripts = { ...base.scripts };
         }
+        if (providerDir) {
+          resolved._resolvedProviderDir = providerDir;
+        }
         if (base.os?.[currentOs]) {
           const osOverride = base.os[currentOs];
           if (osOverride.scripts) {
@@ -37393,6 +37818,12 @@ ${installInfo}`
                 if (loaded) {
                   resolved.scripts = loaded;
                   this.log(`  [compatibility] ${type} v${currentVersion} \u2192 ${entry.scriptDir}`);
+                  resolved._resolvedScriptDir = entry.scriptDir;
+                  resolved._resolvedScriptsSource = `compatibility:${entry.ideVersion}`;
+                  if (providerDir) {
+                    const fullDir = path10.join(providerDir, entry.scriptDir);
+                    resolved._resolvedScriptsPath = fs6.existsSync(path10.join(fullDir, "scripts.js")) ? path10.join(fullDir, "scripts.js") : fullDir;
+                  }
                   matched = true;
                 }
                 break;
@@ -37403,6 +37834,12 @@ ${installInfo}`
               if (loaded) {
                 resolved.scripts = loaded;
                 this.log(`  [compatibility] ${type} v${currentVersion} \u2192 default: ${base.defaultScriptDir}`);
+                resolved._resolvedScriptDir = base.defaultScriptDir;
+                resolved._resolvedScriptsSource = "defaultScriptDir:version_miss";
+                if (providerDir) {
+                  const fullDir = path10.join(providerDir, base.defaultScriptDir);
+                  resolved._resolvedScriptsPath = fs6.existsSync(path10.join(fullDir, "scripts.js")) ? path10.join(fullDir, "scripts.js") : fullDir;
+                }
               }
               resolved._versionWarning = `Version ${currentVersion} not in compatibility matrix. Using default scripts.`;
             }
@@ -37415,6 +37852,12 @@ ${installInfo}`
                 if (loaded) {
                   resolved.scripts = loaded;
                   this.log(`  [version override] ${type} ${range} \u2192 ${dirOverride}`);
+                  resolved._resolvedScriptDir = dirOverride;
+                  resolved._resolvedScriptsSource = `versions:${range}`;
+                  if (providerDir) {
+                    const fullDir = path10.join(providerDir, dirOverride);
+                    resolved._resolvedScriptsPath = fs6.existsSync(path10.join(fullDir, "scripts.js")) ? path10.join(fullDir, "scripts.js") : fullDir;
+                  }
                 }
               } else if (override.scripts) {
                 resolved.scripts = { ...resolved.scripts, ...override.scripts };
@@ -37426,6 +37869,12 @@ ${installInfo}`
           if (loaded) {
             resolved.scripts = loaded;
             this.log(`  [compatibility] ${type} no version detected \u2192 default: ${base.defaultScriptDir}`);
+            resolved._resolvedScriptDir = base.defaultScriptDir;
+            resolved._resolvedScriptsSource = "defaultScriptDir:no_version";
+            if (providerDir) {
+              const fullDir = path10.join(providerDir, base.defaultScriptDir);
+              resolved._resolvedScriptsPath = fs6.existsSync(path10.join(fullDir, "scripts.js")) ? path10.join(fullDir, "scripts.js") : fullDir;
+            }
           }
         }
         if (base.overrides) {
@@ -37494,6 +37943,9 @@ ${installInfo}`
               awaitWriteFinish: { stabilityThreshold: 200, pollInterval: 50 }
             });
             const handleChange = (filePath) => {
+              if (/[\/\\]fixtures[\/\\]/.test(filePath)) {
+                return;
+              }
               if (filePath.endsWith(".js") || filePath.endsWith(".json")) {
                 this.log(`File changed: ${path10.basename(filePath)}, reloading...`);
                 this.reload();
@@ -38184,7 +38636,7 @@ ${installInfo}`
         }
       } else if (plat === "win32") {
         try {
-          const fs14 = require("fs");
+          const fs15 = require("fs");
           const appNameMap = getMacAppIdentifiers();
           const appName = appNameMap[ideId];
           if (appName) {
@@ -38193,8 +38645,8 @@ ${installInfo}`
               appName,
               "storage.json"
             );
-            if (fs14.existsSync(storagePath)) {
-              const data = JSON.parse(fs14.readFileSync(storagePath, "utf-8"));
+            if (fs15.existsSync(storagePath)) {
+              const data = JSON.parse(fs15.readFileSync(storagePath, "utf-8"));
               const workspaces = data?.openedPathsList?.workspaces3 || data?.openedPathsList?.entries || [];
               if (workspaces.length > 0) {
                 const recent = workspaces[0];
@@ -38654,7 +39106,7 @@ ${installInfo}`
     function getNpmExecutable() {
       return process.platform === "win32" ? "npm.cmd" : "npm";
     }
-    function killPid(pid) {
+    function killPid2(pid) {
       try {
         if (process.platform === "win32") {
           (0, import_child_process7.execFileSync)("taskkill", ["/PID", String(pid), "/T", "/F"], { stdio: "ignore" });
@@ -38683,7 +39135,7 @@ ${installInfo}`
         if (fs8.existsSync(pidFile)) {
           const pid = Number.parseInt(fs8.readFileSync(pidFile, "utf8").trim(), 10);
           if (Number.isFinite(pid)) {
-            killPid(pid);
+            killPid2(pid);
           }
         }
       } catch {
@@ -38699,7 +39151,7 @@ ${installInfo}`
           for (const line of raw.split("\n")) {
             const pid = Number.parseInt(line.trim(), 10);
             if (Number.isFinite(pid)) {
-              killPid(pid);
+              killPid2(pid);
             }
           }
         } catch {
@@ -39904,6 +40356,15 @@ ${installInfo}`
                       cdpManagerKey: ideType,
                       instanceKey: `ide:${ideType}`
                     });
+                    const activeSessionId2 = agentStreamManager.getActiveSessionId(parentSessionId);
+                    if (!activeSessionId2 || enabledExtTypes.size === 1) {
+                      await agentStreamManager.setActiveSession(
+                        cdp,
+                        parentSessionId,
+                        extInstance.getInstanceId()
+                      );
+                      LOG2.info("AgentStream", `Auto-activated enabled extension: ${extType} (${ideType})`);
+                    }
                   }
                   LOG2.info("AgentStream", `Extension added: ${extType} (enabled for ${ideType})`);
                 }
@@ -40354,8 +40815,8 @@ ${installInfo}`
       return results;
     }
     var http2 = __toESM2(require("http"));
-    var fs13 = __toESM2(require("fs"));
-    var path17 = __toESM2(require("path"));
+    var fs14 = __toESM2(require("fs"));
+    var path18 = __toESM2(require("path"));
     function generateFiles(type, name, category, opts = {}) {
       const { cdpPorts, cli, processName, installPath, binary, extensionId, version: version2 = "0.1" } = opts;
       if (category === "cli" || category === "acp") {
@@ -41690,6 +42151,162 @@ async (params) => {
         ctx.json(res, 500, { error: `DOM context collection failed: ${e.message}` });
       }
     }
+    var fs12 = __toESM2(require("fs"));
+    var path16 = __toESM2(require("path"));
+    function slugifyFixtureName(value) {
+      const normalized = String(value || "").trim().toLowerCase().replace(/[^a-z0-9._-]+/g, "-").replace(/^-+|-+$/g, "");
+      return normalized || `fixture-${Date.now()}`;
+    }
+    function getCliFixtureDir(ctx, type) {
+      const providerDir = ctx.providerLoader.findProviderDir(type);
+      if (!providerDir) {
+        throw new Error(`Provider directory not found for '${type}'`);
+      }
+      return path16.join(providerDir, "fixtures");
+    }
+    function readCliFixture(ctx, type, name) {
+      const fixtureDir = getCliFixtureDir(ctx, type);
+      const filePath = path16.join(fixtureDir, `${name}.json`);
+      if (!fs12.existsSync(filePath)) {
+        throw new Error(`Fixture not found: ${filePath}`);
+      }
+      return JSON.parse(fs12.readFileSync(filePath, "utf-8"));
+    }
+    function getExerciseTranscriptText(result) {
+      const parts = [];
+      const debugMessages = Array.isArray(result?.debug?.messages) ? result.debug.messages : [];
+      const traceMessages = Array.isArray(result?.trace?.messages) ? result.trace.messages : [];
+      for (const message of [...debugMessages, ...traceMessages]) {
+        if (!message || typeof message.content !== "string") continue;
+        parts.push(message.content);
+      }
+      if (typeof result?.debug?.partialResponse === "string") parts.push(result.debug.partialResponse);
+      if (typeof result?.trace?.responseBuffer === "string") parts.push(result.trace.responseBuffer);
+      return parts.join("\n");
+    }
+    function getExerciseLastAssistant(result) {
+      const debugMessages = Array.isArray(result?.debug?.messages) ? result.debug.messages : [];
+      const traceMessages = Array.isArray(result?.trace?.messages) ? result.trace.messages : [];
+      for (const messages of [debugMessages, traceMessages]) {
+        for (let i = messages.length - 1; i >= 0; i -= 1) {
+          const message = messages[i];
+          if (message?.role === "assistant" && typeof message.content === "string" && message.content.trim()) {
+            return message.content;
+          }
+        }
+      }
+      return "";
+    }
+    function getExerciseMessageCount(result) {
+      const debugMessages = Array.isArray(result?.debug?.messages) ? result.debug.messages : [];
+      const traceMessages = Array.isArray(result?.trace?.messages) ? result.trace.messages : [];
+      return Math.max(debugMessages.length, traceMessages.length);
+    }
+    function compileFixtureRegex(source) {
+      const value = String(source || "").trim();
+      if (!value) return null;
+      const delimited = value.match(/^\/([\s\S]+)\/([dgimsuvy]*)$/);
+      try {
+        if (delimited) {
+          return new RegExp(delimited[1], delimited[2]);
+        }
+        return new RegExp(value, "m");
+      } catch {
+        return null;
+      }
+    }
+    function statusesContainSequence(actual, expected) {
+      if (!expected.length) return true;
+      let index = 0;
+      for (const status of actual) {
+        if (status === expected[index]) index += 1;
+        if (index >= expected.length) return true;
+      }
+      return false;
+    }
+    function validateCliFixtureResult(result, assertions) {
+      const failures = [];
+      const transcriptText = getExerciseTranscriptText(result);
+      const lastAssistant = getExerciseLastAssistant(result);
+      const mustContainAny = assertions.mustContainAny || [];
+      const mustNotContainAny = assertions.mustNotContainAny || [];
+      const mustMatchAny = assertions.mustMatchAny || [];
+      const mustNotMatchAny = assertions.mustNotMatchAny || [];
+      const lastAssistantMustContainAny = assertions.lastAssistantMustContainAny || [];
+      const lastAssistantMustNotContainAny = assertions.lastAssistantMustNotContainAny || [];
+      const lastAssistantMustMatchAny = assertions.lastAssistantMustMatchAny || [];
+      const lastAssistantMustNotMatchAny = assertions.lastAssistantMustNotMatchAny || [];
+      const statusesSeen = Array.isArray(result?.statusesSeen) ? result.statusesSeen.map((value) => String(value)) : [];
+      if (assertions.requireNotTimedOut !== false && result?.timedOut) {
+        failures.push("Exercise timed out");
+      }
+      const missingRequired = mustContainAny.filter((value) => !transcriptText.includes(value));
+      if (missingRequired.length > 0) {
+        failures.push(`Missing required substrings: ${missingRequired.join(", ")}`);
+      }
+      const presentBanned = mustNotContainAny.filter((value) => transcriptText.includes(value));
+      if (presentBanned.length > 0) {
+        failures.push(`Found banned substrings: ${presentBanned.join(", ")}`);
+      }
+      const missingRegex = mustMatchAny.filter((value) => {
+        const regex = compileFixtureRegex(value);
+        return !regex || !regex.test(transcriptText);
+      });
+      if (missingRegex.length > 0) {
+        failures.push(`Missing required regex matches: ${missingRegex.join(", ")}`);
+      }
+      const presentBannedRegex = mustNotMatchAny.filter((value) => {
+        const regex = compileFixtureRegex(value);
+        return !!regex && regex.test(transcriptText);
+      });
+      if (presentBannedRegex.length > 0) {
+        failures.push(`Found banned regex matches: ${presentBannedRegex.join(", ")}`);
+      }
+      const missingLastAssistant = lastAssistantMustContainAny.filter((value) => !lastAssistant.includes(value));
+      if (missingLastAssistant.length > 0) {
+        failures.push(`Missing required lastAssistant substrings: ${missingLastAssistant.join(", ")}`);
+      }
+      const presentBannedLastAssistant = lastAssistantMustNotContainAny.filter((value) => lastAssistant.includes(value));
+      if (presentBannedLastAssistant.length > 0) {
+        failures.push(`Found banned lastAssistant substrings: ${presentBannedLastAssistant.join(", ")}`);
+      }
+      const missingLastAssistantRegex = lastAssistantMustMatchAny.filter((value) => {
+        const regex = compileFixtureRegex(value);
+        return !regex || !regex.test(lastAssistant);
+      });
+      if (missingLastAssistantRegex.length > 0) {
+        failures.push(`Missing required lastAssistant regex matches: ${missingLastAssistantRegex.join(", ")}`);
+      }
+      const presentBannedLastAssistantRegex = lastAssistantMustNotMatchAny.filter((value) => {
+        const regex = compileFixtureRegex(value);
+        return !!regex && regex.test(lastAssistant);
+      });
+      if (presentBannedLastAssistantRegex.length > 0) {
+        failures.push(`Found banned lastAssistant regex matches: ${presentBannedLastAssistantRegex.join(", ")}`);
+      }
+      if (assertions.statusesSeen?.length && !statusesContainSequence(statusesSeen, assertions.statusesSeen)) {
+        failures.push(`Expected statuses sequence not observed: ${assertions.statusesSeen.join(" -> ")}`);
+      }
+      if (result && typeof result === "object") {
+        result.lastAssistant = lastAssistant;
+      }
+      return failures;
+    }
+    function getCliProviderResolutionMeta(ctx, type, adapter) {
+      const adapterMeta = typeof adapter?.getProviderResolutionMeta === "function" ? adapter.getProviderResolutionMeta() : adapter?.getDebugState?.()?.providerResolution || null;
+      const resolvedProvider = ctx.providerLoader.resolve(type);
+      if (!adapterMeta && !resolvedProvider) return null;
+      return {
+        type,
+        providerDir: adapterMeta?.providerDir || resolvedProvider?._resolvedProviderDir || ctx.providerLoader.findProviderDir(type),
+        scriptDir: adapterMeta?.scriptDir || resolvedProvider?._resolvedScriptDir || null,
+        scriptsPath: adapterMeta?.scriptsPath || resolvedProvider?._resolvedScriptsPath || null,
+        scriptsSource: adapterMeta?.scriptsSource || resolvedProvider?._resolvedScriptsSource || null,
+        resolvedVersion: adapterMeta?.resolvedVersion || resolvedProvider?._resolvedVersion || null,
+        resolvedOs: adapterMeta?.resolvedOs || resolvedProvider?._resolvedOs || null,
+        versionWarning: adapterMeta?.versionWarning || resolvedProvider?._versionWarning || null
+      };
+    }
     function findCliTarget(ctx, type, instanceId) {
       if (!ctx.instanceManager) return null;
       const cliStates = ctx.instanceManager.collectAllStates().filter((s15) => s15.category === "cli" || s15.category === "acp");
@@ -41698,6 +42315,331 @@ async (params) => {
       const matches = cliStates.filter((s15) => s15.type === type);
       return matches[matches.length - 1] || null;
     }
+    function getCliTargetBundle(ctx, type, instanceId) {
+      if (!ctx.instanceManager) return null;
+      const target = findCliTarget(ctx, type, instanceId);
+      if (!target) return null;
+      const instance = ctx.instanceManager.getInstance(target.instanceId);
+      if (!instance) return null;
+      const adapter = instance.getAdapter?.() || instance.adapter;
+      if (!adapter) return null;
+      return { target, instance, adapter };
+    }
+    function sleep(ms2) {
+      return new Promise((resolve10) => setTimeout(resolve10, ms2));
+    }
+    async function waitForCliReady(ctx, type, instanceId, timeoutMs) {
+      const startedAt = Date.now();
+      while (Date.now() - startedAt < timeoutMs) {
+        const bundle = getCliTargetBundle(ctx, type, instanceId);
+        if (bundle) {
+          const debug = typeof bundle.adapter.getDebugState === "function" ? bundle.adapter.getDebugState() : null;
+          const startupParseGate = !!debug?.startupParseGate;
+          const adapterReady = !!debug?.ready;
+          const visibleStatusReady = bundle.target.status === "generating" || bundle.target.status === "waiting_approval";
+          const idleReady = bundle.target.status === "idle" && !startupParseGate;
+          if (adapterReady || visibleStatusReady || idleReady) {
+            return bundle;
+          }
+        }
+        await sleep(100);
+      }
+      return getCliTargetBundle(ctx, type, instanceId);
+    }
+    async function runCliExerciseInternal(ctx, body) {
+      if (!ctx.cliManager) {
+        throw new Error("CliManager not available");
+      }
+      if (!ctx.instanceManager) {
+        throw new Error("InstanceManager not available");
+      }
+      const {
+        type,
+        text,
+        instanceId: requestedInstanceId,
+        workingDir,
+        args,
+        autoLaunch = true,
+        freshSession = true,
+        autoResolveApprovals = true,
+        approvalButtonIndex = 0,
+        timeoutMs = 45e3,
+        readyTimeoutMs = 15e3,
+        idleSettledMs = 1200,
+        traceLimit = 160,
+        stopWhenDone = false
+      } = body || {};
+      if (!type) {
+        throw new Error("type required (e.g. claude-cli, codex-cli)");
+      }
+      if (!text || typeof text !== "string") {
+        throw new Error("text required (prompt to send to the CLI)");
+      }
+      let resolvedInstanceId = requestedInstanceId;
+      if (freshSession) {
+        const staleTargets = ctx.instanceManager.collectAllStates().filter((state) => (state.category === "cli" || state.category === "acp") && state.type === type).map((state) => state.instanceId);
+        for (const staleId of staleTargets) {
+          ctx.instanceManager.removeInstance(staleId);
+        }
+        resolvedInstanceId = void 0;
+      }
+      let bundle = getCliTargetBundle(ctx, type, resolvedInstanceId);
+      if (!bundle && autoLaunch) {
+        const launchArgs = [type, workingDir || process.cwd(), Array.isArray(args) ? args : []];
+        let launched = null;
+        let lastLaunchError = null;
+        for (let attempt = 1; attempt <= 2; attempt += 1) {
+          try {
+            launched = await ctx.cliManager.startSession(...launchArgs);
+            lastLaunchError = null;
+            break;
+          } catch (error48) {
+            lastLaunchError = error48 instanceof Error ? error48 : new Error(String(error48?.message || error48));
+            const message = String(lastLaunchError.message || "");
+            const retryable = /ECONNREFUSED|session-host|Session host/i.test(message);
+            if (!retryable || attempt === 2) break;
+            await sleep(1e3);
+          }
+        }
+        if (!launched) {
+          throw lastLaunchError || new Error(`Failed to start ${type}`);
+        }
+        resolvedInstanceId = launched.runtimeSessionId;
+        bundle = await waitForCliReady(ctx, type, resolvedInstanceId, Math.max(1e3, readyTimeoutMs));
+      }
+      if (!bundle) {
+        throw new Error(`No running instance found for: ${resolvedInstanceId || type}`);
+      }
+      const initialDebug = typeof bundle.adapter.getDebugState === "function" ? bundle.adapter.getDebugState() : null;
+      const initialTrace = typeof bundle.adapter.getTraceState === "function" ? bundle.adapter.getTraceState(traceLimit) : null;
+      const providerResolution = getCliProviderResolutionMeta(ctx, bundle.target.type, bundle.adapter);
+      const preTraceCount = Number(initialTrace?.entryCount || 0);
+      const startAt = Date.now();
+      const statusesSeen = [];
+      const approvalsResolved = [];
+      let lastStatus = "";
+      let lastModalKey = "";
+      let idleSince = 0;
+      let sawBusy = false;
+      ctx.instanceManager.sendEvent(bundle.target.instanceId, "send_message", { text });
+      while (Date.now() - startAt < Math.max(1e3, timeoutMs)) {
+        await sleep(150);
+        bundle = getCliTargetBundle(ctx, type, bundle.target.instanceId);
+        if (!bundle) {
+          throw new Error("CLI instance disappeared during exercise");
+        }
+        const debug = typeof bundle.adapter.getDebugState === "function" ? bundle.adapter.getDebugState() : null;
+        const trace = typeof bundle.adapter.getTraceState === "function" ? bundle.adapter.getTraceState(traceLimit) : null;
+        const status = String(debug?.status || bundle.target.status || "unknown");
+        const traceEntries = Array.isArray(trace?.entries) ? trace.entries : [];
+        const sawSendMessage = traceEntries.some((entry) => entry?.type === "send_message");
+        const sawSubmitWrite = traceEntries.some((entry) => entry?.type === "submit_write");
+        const hasTurnStarted = sawSendMessage || sawSubmitWrite || !!debug?.currentTurnScope;
+        if (status !== lastStatus) {
+          statusesSeen.push(status);
+          lastStatus = status;
+        }
+        if (status === "generating" || status === "waiting_approval") {
+          sawBusy = true;
+          idleSince = 0;
+        }
+        const modal = debug?.activeModal || trace?.activeModal || null;
+        if (autoResolveApprovals && status === "waiting_approval" && modal && Array.isArray(modal.buttons) && modal.buttons.length > 0) {
+          const clampedIndex = Math.max(0, Math.min(Number(approvalButtonIndex) || 0, modal.buttons.length - 1));
+          const modalKey = JSON.stringify({
+            message: modal.message || "",
+            buttons: modal.buttons,
+            index: clampedIndex
+          });
+          if (modalKey !== lastModalKey && typeof bundle.adapter.resolveModal === "function") {
+            lastModalKey = modalKey;
+            approvalsResolved.push({
+              at: Date.now(),
+              buttonIndex: clampedIndex,
+              label: modal.buttons[clampedIndex] || null
+            });
+            bundle.adapter.resolveModal(clampedIndex);
+            continue;
+          }
+        }
+        const traceCount = Number(trace?.entryCount || 0);
+        const hasProgress = hasTurnStarted && (traceCount > preTraceCount || statusesSeen.length > 1 || approvalsResolved.length > 0);
+        if (status === "idle" && hasProgress && sawBusy) {
+          if (!idleSince) idleSince = Date.now();
+          if (Date.now() - idleSince >= Math.max(200, idleSettledMs)) {
+            const payload2 = {
+              exercised: true,
+              instanceId: bundle.target.instanceId,
+              providerState: {
+                type: bundle.target.type,
+                name: bundle.target.name,
+                status: bundle.target.status,
+                mode: "mode" in bundle.target ? bundle.target.mode : void 0
+              },
+              providerResolution,
+              initialDebug,
+              initialTrace,
+              debug,
+              trace,
+              statusesSeen,
+              approvalsResolved,
+              elapsedMs: Date.now() - startAt,
+              timedOut: false
+            };
+            payload2.lastAssistant = getExerciseLastAssistant(payload2);
+            payload2.messageCount = getExerciseMessageCount(payload2);
+            if (stopWhenDone) {
+              ctx.instanceManager.removeInstance(bundle.target.instanceId);
+            }
+            return payload2;
+          }
+        } else if (status === "idle" && hasProgress) {
+          if (!idleSince) idleSince = Date.now();
+          if (Date.now() - idleSince >= Math.max(500, idleSettledMs) && Date.now() - startAt >= 750) {
+            const payload2 = {
+              exercised: true,
+              instanceId: bundle.target.instanceId,
+              providerState: {
+                type: bundle.target.type,
+                name: bundle.target.name,
+                status: bundle.target.status,
+                mode: "mode" in bundle.target ? bundle.target.mode : void 0
+              },
+              providerResolution,
+              initialDebug,
+              initialTrace,
+              debug,
+              trace,
+              statusesSeen,
+              approvalsResolved,
+              elapsedMs: Date.now() - startAt,
+              timedOut: false
+            };
+            payload2.lastAssistant = getExerciseLastAssistant(payload2);
+            payload2.messageCount = getExerciseMessageCount(payload2);
+            if (stopWhenDone) {
+              ctx.instanceManager.removeInstance(bundle.target.instanceId);
+            }
+            return payload2;
+          }
+        } else {
+          idleSince = 0;
+        }
+      }
+      const finalBundle = getCliTargetBundle(ctx, type, bundle.target.instanceId) || bundle;
+      const finalDebug = typeof finalBundle.adapter.getDebugState === "function" ? finalBundle.adapter.getDebugState() : null;
+      const finalTrace = typeof finalBundle.adapter.getTraceState === "function" ? finalBundle.adapter.getTraceState(traceLimit) : null;
+      if (stopWhenDone) {
+        ctx.instanceManager.removeInstance(finalBundle.target.instanceId);
+      }
+      const payload = {
+        exercised: true,
+        instanceId: finalBundle.target.instanceId,
+        providerState: {
+          type: finalBundle.target.type,
+          name: finalBundle.target.name,
+          status: finalBundle.target.status,
+          mode: "mode" in finalBundle.target ? finalBundle.target.mode : void 0
+        },
+        providerResolution: getCliProviderResolutionMeta(ctx, finalBundle.target.type, finalBundle.adapter),
+        initialDebug,
+        initialTrace,
+        debug: finalDebug,
+        trace: finalTrace,
+        statusesSeen,
+        approvalsResolved,
+        elapsedMs: Date.now() - startAt,
+        timedOut: true
+      };
+      payload.lastAssistant = getExerciseLastAssistant(payload);
+      payload.messageCount = getExerciseMessageCount(payload);
+      return payload;
+    }
+    async function runCliAutoImplVerification(ctx, type, verification) {
+      const assertions = {
+        mustContainAny: verification?.mustContainAny || [],
+        mustNotContainAny: verification?.mustNotContainAny || [],
+        mustMatchAny: verification?.mustMatchAny || [],
+        mustNotMatchAny: verification?.mustNotMatchAny || [],
+        lastAssistantMustContainAny: verification?.lastAssistantMustContainAny || [],
+        lastAssistantMustNotContainAny: verification?.lastAssistantMustNotContainAny || [],
+        lastAssistantMustMatchAny: verification?.lastAssistantMustMatchAny || [],
+        lastAssistantMustNotMatchAny: verification?.lastAssistantMustNotMatchAny || [],
+        requireNotTimedOut: true
+      };
+      const rawFixtureNames = Array.isArray(verification?.fixtureNames) ? verification.fixtureNames.map((value) => String(value || "").trim()).filter(Boolean) : [];
+      if (rawFixtureNames.length > 0) {
+        const results = [];
+        for (const rawFixtureName2 of rawFixtureNames) {
+          const name = slugifyFixtureName(rawFixtureName2);
+          const fixture = readCliFixture(ctx, type, name);
+          const mergedAssertions = {
+            ...fixture.assertions,
+            ...assertions
+          };
+          const result2 = await runCliExerciseInternal(ctx, {
+            ...fixture.request,
+            type
+          });
+          const failures2 = validateCliFixtureResult(result2, mergedAssertions);
+          results.push({
+            fixtureName: name,
+            pass: failures2.length === 0,
+            failures: failures2,
+            result: result2,
+            assertions: mergedAssertions,
+            fixture
+          });
+        }
+        const firstFailure = results.find((item) => !item.pass) || results[results.length - 1];
+        return {
+          mode: "fixture_replay_suite",
+          pass: results.every((item) => item.pass),
+          failures: results.flatMap((item) => item.failures.map((failure) => `${item.fixtureName}: ${failure}`)),
+          result: firstFailure.result,
+          assertions: firstFailure.assertions,
+          fixture: firstFailure.fixture,
+          results
+        };
+      }
+      const rawFixtureName = String(verification?.fixtureName || "").trim();
+      if (rawFixtureName) {
+        const name = slugifyFixtureName(rawFixtureName);
+        try {
+          const fixture = readCliFixture(ctx, type, name);
+          const mergedAssertions = {
+            ...fixture.assertions,
+            ...assertions
+          };
+          const result2 = await runCliExerciseInternal(ctx, {
+            ...fixture.request,
+            type
+          });
+          const failures2 = validateCliFixtureResult(result2, mergedAssertions);
+          return {
+            mode: "fixture_replay",
+            pass: failures2.length === 0,
+            failures: failures2,
+            result: result2,
+            assertions: mergedAssertions,
+            fixture
+          };
+        } catch {
+        }
+      }
+      const result = await runCliExerciseInternal(ctx, {
+        ...verification?.request || {},
+        type
+      });
+      const failures = validateCliFixtureResult(result, assertions);
+      return {
+        mode: "exercise",
+        pass: failures.length === 0,
+        failures,
+        result,
+        assertions
+      };
+    }
     async function handleCliStatus(ctx, _req, res) {
       if (!ctx.instanceManager) {
         ctx.json(res, 503, { error: "InstanceManager not available (daemon not fully initialized)" });
@@ -41836,12 +42778,14 @@ async (params) => {
               status: target.status,
               mode: "mode" in target ? target.mode : void 0
             },
+            providerResolution: getCliProviderResolutionMeta(ctx, target.type, adapter),
             debug: debugState
           });
         } else {
           ctx.json(res, 200, {
             instanceId: target.instanceId,
             providerState: target,
+            providerResolution: getCliProviderResolutionMeta(ctx, target.type, adapter),
             debug: null,
             message: "No debug state available (adapter.getDebugState not found)"
           });
@@ -41850,6 +42794,191 @@ async (params) => {
         ctx.json(res, 500, { error: `Debug state failed: ${e.message}` });
       }
     }
+    async function handleCliTrace(ctx, type, req, res) {
+      if (!ctx.instanceManager) {
+        ctx.json(res, 503, { error: "InstanceManager not available" });
+        return;
+      }
+      const target = findCliTarget(ctx, type);
+      if (!target) {
+        const allStates = ctx.instanceManager.collectAllStates();
+        ctx.json(res, 404, {
+          error: `No running instance for: ${type}`,
+          available: allStates.filter((s15) => s15.category === "cli" || s15.category === "acp").map((s15) => s15.type)
+        });
+        return;
+      }
+      const instance = ctx.instanceManager.getInstance(target.instanceId);
+      if (!instance) {
+        ctx.json(res, 404, { error: `Instance not found: ${target.instanceId}` });
+        return;
+      }
+      try {
+        const adapter = instance.getAdapter?.() || instance.adapter;
+        const url2 = new URL(req.url || "/", "http://127.0.0.1");
+        const limit = parseInt(url2.searchParams.get("limit") || "120", 10);
+        if (adapter && typeof adapter.getTraceState === "function") {
+          const trace = adapter.getTraceState(limit);
+          const debug = typeof adapter.getDebugState === "function" ? adapter.getDebugState() : null;
+          ctx.json(res, 200, {
+            instanceId: target.instanceId,
+            providerState: {
+              type: target.type,
+              name: target.name,
+              status: target.status,
+              mode: "mode" in target ? target.mode : void 0
+            },
+            providerResolution: getCliProviderResolutionMeta(ctx, target.type, adapter),
+            debug,
+            trace
+          });
+        } else {
+          ctx.json(res, 200, {
+            instanceId: target.instanceId,
+            providerState: target,
+            providerResolution: getCliProviderResolutionMeta(ctx, target.type, adapter),
+            debug: typeof adapter?.getDebugState === "function" ? adapter.getDebugState() : null,
+            trace: null,
+            message: "No trace state available (adapter.getTraceState not found)"
+          });
+        }
+      } catch (e) {
+        ctx.json(res, 500, { error: `Trace state failed: ${e.message}` });
+      }
+    }
+    async function handleCliExercise(ctx, req, res) {
+      try {
+        const body = await ctx.readBody(req);
+        const result = await runCliExerciseInternal(ctx, body || {});
+        ctx.json(res, 200, result);
+      } catch (e) {
+        ctx.json(res, 500, { error: `Exercise failed: ${e.message}` });
+      }
+    }
+    async function handleCliFixtureCapture(ctx, req, res) {
+      try {
+        const body = await ctx.readBody(req);
+        const type = String(body?.type || "");
+        const request = body?.request || {};
+        if (!type) {
+          ctx.json(res, 400, { error: "type required" });
+          return;
+        }
+        if (!request?.text) {
+          ctx.json(res, 400, { error: "request.text required" });
+          return;
+        }
+        const fixtureDir = getCliFixtureDir(ctx, type);
+        fs12.mkdirSync(fixtureDir, { recursive: true });
+        const name = slugifyFixtureName(String(body?.name || `${type}-${Date.now()}`));
+        const result = await runCliExerciseInternal(ctx, { ...request, type });
+        const fixture = {
+          version: 1,
+          kind: "cli-exercise-fixture",
+          name,
+          type,
+          createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+          providerDir: ctx.providerLoader.findProviderDir(type),
+          providerResolution: result?.providerResolution || null,
+          request: { ...request, type },
+          result,
+          assertions: {
+            mustContainAny: Array.isArray(body?.assertions?.mustContainAny) ? body.assertions.mustContainAny : [],
+            mustNotContainAny: Array.isArray(body?.assertions?.mustNotContainAny) ? body.assertions.mustNotContainAny : [],
+            mustMatchAny: Array.isArray(body?.assertions?.mustMatchAny) ? body.assertions.mustMatchAny : [],
+            mustNotMatchAny: Array.isArray(body?.assertions?.mustNotMatchAny) ? body.assertions.mustNotMatchAny : [],
+            lastAssistantMustContainAny: Array.isArray(body?.assertions?.lastAssistantMustContainAny) ? body.assertions.lastAssistantMustContainAny : [],
+            lastAssistantMustNotContainAny: Array.isArray(body?.assertions?.lastAssistantMustNotContainAny) ? body.assertions.lastAssistantMustNotContainAny : [],
+            lastAssistantMustMatchAny: Array.isArray(body?.assertions?.lastAssistantMustMatchAny) ? body.assertions.lastAssistantMustMatchAny : [],
+            lastAssistantMustNotMatchAny: Array.isArray(body?.assertions?.lastAssistantMustNotMatchAny) ? body.assertions.lastAssistantMustNotMatchAny : [],
+            statusesSeen: Array.isArray(body?.assertions?.statusesSeen) ? body.assertions.statusesSeen : void 0,
+            requireNotTimedOut: body?.assertions?.requireNotTimedOut !== false
+          },
+          notes: typeof body?.notes === "string" ? body.notes : void 0
+        };
+        const filePath = path16.join(fixtureDir, `${name}.json`);
+        fs12.writeFileSync(filePath, JSON.stringify(fixture, null, 2));
+        ctx.json(res, 200, {
+          saved: true,
+          name,
+          path: filePath,
+          fixture,
+          verification: {
+            pass: validateCliFixtureResult(result, fixture.assertions).length === 0,
+            failures: validateCliFixtureResult(result, fixture.assertions)
+          }
+        });
+      } catch (e) {
+        ctx.json(res, 500, { error: `Fixture capture failed: ${e.message}` });
+      }
+    }
+    async function handleCliFixtureList(ctx, type, _req, res) {
+      try {
+        const fixtureDir = getCliFixtureDir(ctx, type);
+        if (!fs12.existsSync(fixtureDir)) {
+          ctx.json(res, 200, { fixtures: [], count: 0 });
+          return;
+        }
+        const fixtures = fs12.readdirSync(fixtureDir).filter((file2) => file2.endsWith(".json")).sort((a, b2) => b2.localeCompare(a, void 0, { numeric: true, sensitivity: "base" })).map((file2) => {
+          const fullPath = path16.join(fixtureDir, file2);
+          try {
+            const raw = JSON.parse(fs12.readFileSync(fullPath, "utf-8"));
+            return {
+              name: raw.name || file2.replace(/\.json$/i, ""),
+              path: fullPath,
+              createdAt: raw.createdAt || null,
+              notes: raw.notes || null,
+              requestText: raw.request?.text || "",
+              assertions: raw.assertions || {}
+            };
+          } catch {
+            return {
+              name: file2.replace(/\.json$/i, ""),
+              path: fullPath,
+              createdAt: null,
+              notes: "Unreadable fixture",
+              requestText: "",
+              assertions: {}
+            };
+          }
+        });
+        ctx.json(res, 200, { fixtures, count: fixtures.length });
+      } catch (e) {
+        ctx.json(res, 500, { error: `Fixture list failed: ${e.message}` });
+      }
+    }
+    async function handleCliFixtureReplay(ctx, req, res) {
+      try {
+        const body = await ctx.readBody(req);
+        const type = String(body?.type || "");
+        const rawName = String(body?.name || "").trim();
+        if (!type || !rawName) {
+          ctx.json(res, 400, { error: "type and name required" });
+          return;
+        }
+        const name = slugifyFixtureName(rawName);
+        const fixture = readCliFixture(ctx, type, name);
+        const result = await runCliExerciseInternal(ctx, {
+          ...fixture.request,
+          type
+        });
+        const assertions = {
+          ...fixture.assertions,
+          ...body?.assertions || {}
+        };
+        const failures = validateCliFixtureResult(result, assertions);
+        ctx.json(res, 200, {
+          replayed: true,
+          pass: failures.length === 0,
+          failures,
+          fixture,
+          result,
+          assertions
+        });
+      } catch (e) {
+        ctx.json(res, 500, { error: `Fixture replay failed: ${e.message}` });
+      }
+    }
     async function handleCliResolve(ctx, req, res) {
       const body = await ctx.readBody(req);
       const { type, buttonIndex, instanceId } = body;
@@ -41924,9 +43053,29 @@ async (params) => {
         ctx.json(res, 500, { error: `Raw send failed: ${e.message}` });
       }
     }
-    var fs12 = __toESM2(require("fs"));
-    var path16 = __toESM2(require("path"));
+    var fs13 = __toESM2(require("fs"));
+    var path17 = __toESM2(require("path"));
     var os17 = __toESM2(require("os"));
+    function getAutoImplPid(ctx) {
+      const proc = ctx.autoImplProcess;
+      return proc && typeof proc.pid === "number" && proc.pid > 0 ? proc.pid : null;
+    }
+    function isPidAlive(pid) {
+      try {
+        process.kill(pid, 0);
+        return true;
+      } catch (error48) {
+        return error48?.code === "EPERM";
+      }
+    }
+    function clearStaleAutoImplState(ctx, reason) {
+      if (!ctx.autoImplStatus.running && !ctx.autoImplProcess) return;
+      const pid = getAutoImplPid(ctx);
+      if (pid && isPidAlive(pid)) return;
+      ctx.log(`Clearing stale auto-implement state: ${reason}${pid ? ` (pid ${pid})` : ""}`);
+      ctx.autoImplProcess = null;
+      ctx.autoImplStatus.running = false;
+    }
     function getDefaultAutoImplReference(ctx, category, type) {
       if (category === "cli") {
         return type === "codex-cli" ? "claude-cli" : "codex-cli";
@@ -41942,45 +43091,45 @@ async (params) => {
       return fallback?.type || null;
     }
     function getLatestScriptVersionDir(scriptsDir) {
-      if (!fs12.existsSync(scriptsDir)) return null;
-      const versions = fs12.readdirSync(scriptsDir).filter((d) => {
+      if (!fs13.existsSync(scriptsDir)) return null;
+      const versions = fs13.readdirSync(scriptsDir).filter((d) => {
         try {
-          return fs12.statSync(path16.join(scriptsDir, d)).isDirectory();
+          return fs13.statSync(path17.join(scriptsDir, d)).isDirectory();
         } catch {
           return false;
         }
       }).sort((a, b2) => b2.localeCompare(a, void 0, { numeric: true, sensitivity: "base" }));
       if (versions.length === 0) return null;
-      return path16.join(scriptsDir, versions[0]);
+      return path17.join(scriptsDir, versions[0]);
     }
     function resolveAutoImplWritableProviderDir(ctx, category, type, requestedDir) {
-      const canonicalUserDir = path16.resolve(ctx.providerLoader.getUserProviderDir(category, type));
-      const desiredDir = requestedDir ? path16.resolve(requestedDir) : canonicalUserDir;
-      const upstreamRoot = path16.resolve(ctx.providerLoader.getUpstreamDir());
-      if (desiredDir === upstreamRoot || desiredDir.startsWith(`${upstreamRoot}${path16.sep}`)) {
+      const canonicalUserDir = path17.resolve(ctx.providerLoader.getUserProviderDir(category, type));
+      const desiredDir = requestedDir ? path17.resolve(requestedDir) : canonicalUserDir;
+      const upstreamRoot = path17.resolve(ctx.providerLoader.getUpstreamDir());
+      if (desiredDir === upstreamRoot || desiredDir.startsWith(`${upstreamRoot}${path17.sep}`)) {
         return { dir: null, reason: `Refusing to write into upstream provider directory: ${desiredDir}` };
       }
-      if (path16.basename(desiredDir) !== type) {
+      if (path17.basename(desiredDir) !== type) {
         return { dir: null, reason: `Requested writable provider directory must end with '${type}': ${desiredDir}` };
       }
       const sourceDir = ctx.findProviderDir(type);
       if (!sourceDir) {
         return { dir: null, reason: `Provider source directory not found for '${type}'` };
       }
-      if (!fs12.existsSync(desiredDir)) {
-        fs12.mkdirSync(path16.dirname(desiredDir), { recursive: true });
-        fs12.cpSync(sourceDir, desiredDir, { recursive: true });
+      if (!fs13.existsSync(desiredDir)) {
+        fs13.mkdirSync(path17.dirname(desiredDir), { recursive: true });
+        fs13.cpSync(sourceDir, desiredDir, { recursive: true });
         ctx.log(`Auto-implement writable copy created: ${desiredDir}`);
       }
-      const providerJson = path16.join(desiredDir, "provider.json");
-      if (!fs12.existsSync(providerJson)) {
+      const providerJson = path17.join(desiredDir, "provider.json");
+      if (!fs13.existsSync(providerJson)) {
         return { dir: null, reason: `provider.json not found in writable provider directory: ${desiredDir}` };
       }
       try {
-        const providerData = JSON.parse(fs12.readFileSync(providerJson, "utf-8"));
+        const providerData = JSON.parse(fs13.readFileSync(providerJson, "utf-8"));
         if (providerData.disableUpstream !== true) {
           providerData.disableUpstream = true;
-          fs12.writeFileSync(providerJson, JSON.stringify(providerData, null, 2));
+          fs13.writeFileSync(providerJson, JSON.stringify(providerData, null, 2));
         }
       } catch (error48) {
         return {
@@ -41993,15 +43142,15 @@ async (params) => {
     function loadAutoImplReferenceScripts(ctx, referenceType) {
       if (!referenceType) return {};
       const refDir = ctx.findProviderDir(referenceType);
-      if (!refDir || !fs12.existsSync(refDir)) return {};
+      if (!refDir || !fs13.existsSync(refDir)) return {};
       const referenceScripts = {};
-      const scriptsDir = path16.join(refDir, "scripts");
+      const scriptsDir = path17.join(refDir, "scripts");
       const latestDir = getLatestScriptVersionDir(scriptsDir);
       if (!latestDir) return referenceScripts;
-      for (const file2 of fs12.readdirSync(latestDir)) {
+      for (const file2 of fs13.readdirSync(latestDir)) {
         if (!file2.endsWith(".js")) continue;
         try {
-          referenceScripts[file2] = fs12.readFileSync(path16.join(latestDir, file2), "utf-8");
+          referenceScripts[file2] = fs13.readFileSync(path17.join(latestDir, file2), "utf-8");
         } catch {
         }
       }
@@ -42009,11 +43158,20 @@ async (params) => {
     }
     async function handleAutoImplement(ctx, type, req, res) {
       const body = await ctx.readBody(req);
-      const { agent = "claude-cli", functions, reference, model, comment, providerDir: requestedProviderDir } = body;
+      const {
+        agent = "claude-cli",
+        functions,
+        reference,
+        model,
+        comment,
+        providerDir: requestedProviderDir,
+        verification
+      } = body;
       if (!functions || !Array.isArray(functions) || functions.length === 0) {
         ctx.json(res, 400, { error: 'functions[] is required (e.g. ["readChat", "sendMessage"])' });
         return;
       }
+      clearStaleAutoImplState(ctx, "new auto-implement request");
       if (ctx.autoImplStatus.running) {
         ctx.json(res, 409, { error: "Auto-implement already in progress", type: ctx.autoImplStatus.type });
         return;
@@ -42031,7 +43189,55 @@ async (params) => {
         return;
       }
       const providerDir = writableProvider.dir;
+      ctx.autoImplStatus = { running: false, type, progress: [] };
+      if (provider.category === "cli" && verification && (verification.fixtureName || verification.fixtureNames && verification.fixtureNames.length > 0)) {
+        sendAutoImplSSE(ctx, {
+          event: "progress",
+          data: {
+            function: "_preflight",
+            status: "verifying",
+            message: "Running preflight verification before spawning agent..."
+          }
+        });
+        try {
+          const preflight = await runCliAutoImplVerification(ctx, type, verification);
+          sendAutoImplSSE(ctx, { event: "verification", data: preflight });
+          if (preflight.pass) {
+            sendAutoImplSSE(ctx, {
+              event: "complete",
+              data: {
+                success: true,
+                exitCode: 0,
+                functions,
+                message: `\u2705 No-op: exact ${preflight.mode} already passes`,
+                verification: preflight,
+                skipped: true
+              }
+            });
+            ctx.json(res, 200, {
+              started: false,
+              skipped: true,
+              type,
+              functions,
+              providerDir,
+              verification: preflight,
+              message: "Preflight verification already passes. No auto-implement run needed."
+            });
+            return;
+          }
+        } catch (error48) {
+          sendAutoImplSSE(ctx, {
+            event: "progress",
+            data: {
+              function: "_preflight",
+              status: "verify_failed",
+              message: `Preflight verification errored, continuing to agent run: ${error48?.message || error48}`
+            }
+          });
+        }
+      }
       try {
+        ctx.autoImplStatus = { running: true, type, progress: ctx.autoImplStatus.progress };
         const resolvedReference = resolveAutoImplReference(ctx, provider.category, reference, type);
         sendAutoImplSSE(ctx, {
           event: "progress",
@@ -42051,17 +43257,17 @@ async (params) => {
           }
         });
         const referenceScripts = loadAutoImplReferenceScripts(ctx, resolvedReference);
-        const prompt = buildAutoImplPrompt(ctx, type, provider, providerDir, functions, domContext, referenceScripts, comment, resolvedReference);
-        const tmpDir = path16.join(os17.tmpdir(), "adhdev-autoimpl");
-        if (!fs12.existsSync(tmpDir)) fs12.mkdirSync(tmpDir, { recursive: true });
-        const promptFile = path16.join(tmpDir, `prompt-${type}-${Date.now()}.md`);
-        fs12.writeFileSync(promptFile, prompt, "utf-8");
+        const prompt = buildAutoImplPrompt(ctx, type, provider, providerDir, functions, domContext, referenceScripts, comment, resolvedReference, verification);
+        const tmpDir = path17.join(os17.tmpdir(), "adhdev-autoimpl");
+        if (!fs13.existsSync(tmpDir)) fs13.mkdirSync(tmpDir, { recursive: true });
+        const promptFile = path17.join(tmpDir, `prompt-${type}-${Date.now()}.md`);
+        fs13.writeFileSync(promptFile, prompt, "utf-8");
         ctx.log(`Auto-implement prompt written to ${promptFile} (${prompt.length} chars)`);
         const agentProvider = ctx.providerLoader.resolve(agent) || ctx.providerLoader.getMeta(agent);
         const spawn4 = agentProvider?.spawn;
         if (!spawn4?.command) {
           try {
-            fs12.unlinkSync(promptFile);
+            fs13.unlinkSync(promptFile);
           } catch {
           }
           ctx.json(res, 400, { error: `Agent '${agent}' has no spawn config. Select a CLI provider with a spawn configuration.` });
@@ -42070,7 +43276,8 @@ async (params) => {
         const agentCategory = agentProvider?.category;
         if (agentCategory === "acp") {
           sendAutoImplSSE(ctx, { event: "progress", data: { function: "_init", status: "spawning", message: `Spawning ACP agent: ${spawn4.command} ${(spawn4.args || []).join(" ")}` } });
-          ctx.autoImplStatus = { running: true, type, progress: [] };
+          ctx.autoImplStatus.running = true;
+          ctx.autoImplStatus.type = type;
           const { ClientSideConnection: ClientSideConnection2, ndJsonStream: ndJsonStream2, PROTOCOL_VERSION: PROTOCOL_VERSION2 } = await Promise.resolve().then(() => (init_acp(), acp_exports));
           const { Readable: Readable2, Writable: Writable2 } = await import("stream");
           const { spawn: spawnFn2 } = await import("child_process");
@@ -42162,7 +43369,7 @@ async (params) => {
             } catch {
             }
             try {
-              fs12.unlinkSync(promptFile);
+              fs13.unlinkSync(promptFile);
             } catch {
             }
             ctx.log(`Auto-implement (ACP) ${success2 ? "completed" : "failed"}: ${type} (exit: ${code})`);
@@ -42240,7 +43447,8 @@ async (params) => {
           }
         }
         sendAutoImplSSE(ctx, { event: "progress", data: { function: "_init", status: "spawning", message: `Spawning agent: ${shellCmd.substring(0, 200)}... (prompt: ${prompt.length} chars)` } });
-        ctx.autoImplStatus = { running: true, type, progress: [] };
+        ctx.autoImplStatus.running = true;
+        ctx.autoImplStatus.type = type;
         const spawnedAt = Date.now();
         let child;
         let isPty = false;
@@ -42283,6 +43491,7 @@ async (params) => {
         let approvalKeys = { 0: "y\r" };
         let approvalBuffer = "";
         let lastApprovalTime = 0;
+        let completionSignalSeen = false;
         try {
           const { normalizeCliProviderForRuntime: normalizeCliProviderForRuntime2 } = await Promise.resolve().then(() => (init_provider_cli_adapter(), provider_cli_adapter_exports));
           const normalized = normalizeCliProviderForRuntime2(agentProvider);
@@ -42296,6 +43505,7 @@ async (params) => {
           approvalBuffer = (approvalBuffer + cleanData).slice(-1500);
           const elapsed = Date.now() - spawnedAt;
           if (elapsed > 15e3 && cleanData.includes("_PIPELINE_COMPLETE_SIGNAL_")) {
+            completionSignalSeen = true;
             ctx.log(`Agent finished task after ${Math.round(elapsed / 1e3)}s. Terminating interactive CLI session to unblock pipeline.`);
             sendAutoImplSSE(ctx, { event: "output", data: { chunk: `
 [\u{1F916} ADHDev Pipeline] Completion token detected. Proceeding...
@@ -42319,6 +43529,55 @@ async (params) => {
             lastApprovalTime = Date.now();
           }
         };
+        const finalizeCliAutoImpl = async (code) => {
+          ctx.autoImplProcess = null;
+          let success2 = completionSignalSeen || code === 0;
+          let message = success2 ? completionSignalSeen && code !== 0 ? "\u2705 Auto-implement complete (completion signal)" : "\u2705 Auto-implement complete" : `\u274C Agent exited (code: ${code})`;
+          let verificationSummary = null;
+          try {
+            ctx.providerLoader.reload();
+          } catch {
+          }
+          if (provider.category === "cli" && verification) {
+            sendAutoImplSSE(ctx, {
+              event: "progress",
+              data: {
+                function: "_verify",
+                status: "running",
+                message: "Running exact post-patch verification..."
+              }
+            });
+            try {
+              verificationSummary = await runCliAutoImplVerification(ctx, type, verification);
+              sendAutoImplSSE(ctx, { event: "verification", data: verificationSummary });
+              success2 = verificationSummary.pass;
+              message = verificationSummary.pass ? `\u2705 Auto-implement complete (${verificationSummary.mode})` : `\u274C Post-patch verification failed (${verificationSummary.mode}): ${verificationSummary.failures.join("; ") || "unknown failure"}`;
+            } catch (error48) {
+              success2 = false;
+              message = `\u274C Post-patch verification error: ${error48?.message || error48}`;
+              sendAutoImplSSE(ctx, {
+                event: "verification",
+                data: { pass: false, error: error48?.message || String(error48) }
+              });
+            }
+          }
+          ctx.autoImplStatus.running = false;
+          sendAutoImplSSE(ctx, {
+            event: "complete",
+            data: {
+              success: success2,
+              exitCode: code,
+              functions,
+              message,
+              verification: verificationSummary
+            }
+          });
+          try {
+            fs13.unlinkSync(promptFile);
+          } catch {
+          }
+          ctx.log(`Auto-implement ${success2 ? "completed" : "failed"}: ${type} (exit: ${code})${verificationSummary ? ` verify=${verificationSummary.pass ? "pass" : "fail"}` : ""}`);
+        };
         if (isPty) {
           child.onData((data) => {
             stdout += data;
@@ -42330,21 +43589,7 @@ async (params) => {
             sendAutoImplSSE(ctx, { event: "output", data: { chunk: data, stream: "stdout" } });
           });
           child.onExit(({ exitCode: code }) => {
-            ctx.autoImplProcess = null;
-            ctx.autoImplStatus.running = false;
-            const success2 = code === 0;
-            sendAutoImplSSE(ctx, {
-              event: "complete",
-              data: { success: success2, exitCode: code, functions, message: success2 ? "\u2705 Auto-implement complete" : `\u274C Agent exited (code: ${code})` }
-            });
-            try {
-              ctx.providerLoader.reload();
-            } catch {
-            }
-            try {
-              fs12.unlinkSync(promptFile);
-            } catch {
-            }
+            void finalizeCliAutoImpl(code);
           });
         } else {
           child.stdout?.on("data", (d) => {
@@ -42361,27 +43606,7 @@ async (params) => {
             sendAutoImplSSE(ctx, { event: "output", data: { chunk, stream: "stderr" } });
           });
           child.on("exit", (code) => {
-            ctx.autoImplProcess = null;
-            ctx.autoImplStatus.running = false;
-            const success2 = code === 0;
-            sendAutoImplSSE(ctx, {
-              event: "complete",
-              data: {
-                success: success2,
-                exitCode: code,
-                functions,
-                message: success2 ? "\u2705 Auto-implement complete" : `\u274C Agent exited (code: ${code})`
-              }
-            });
-            try {
-              ctx.providerLoader.reload();
-            } catch {
-            }
-            try {
-              fs12.unlinkSync(promptFile);
-            } catch {
-            }
-            ctx.log(`Auto-implement ${success2 ? "completed" : "failed"}: ${type} (exit: ${code})`);
+            void finalizeCliAutoImpl(code);
           });
         }
         ctx.json(res, 202, {
@@ -42398,9 +43623,9 @@ async (params) => {
         ctx.json(res, 500, { error: `Auto-implement failed: ${e.message}` });
       }
     }
-    function buildAutoImplPrompt(ctx, type, provider, providerDir, functions, domContext, referenceScripts, userComment, referenceType) {
+    function buildAutoImplPrompt(ctx, type, provider, providerDir, functions, domContext, referenceScripts, userComment, referenceType, verification) {
       if (provider.category === "cli") {
-        return buildCliAutoImplPrompt(ctx, type, provider, providerDir, functions, referenceScripts, userComment, referenceType);
+        return buildCliAutoImplPrompt(ctx, type, provider, providerDir, functions, referenceScripts, userComment, referenceType, verification);
       }
       const lines = [];
       lines.push("You are implementing browser automation scripts for an IDE provider.");
@@ -42425,7 +43650,7 @@ async (params) => {
         setMode: "set_mode.js"
       };
       const targetFileNames = new Set(functions.map((fn2) => funcToFile[fn2]).filter(Boolean));
-      const scriptsDir = path16.join(providerDir, "scripts");
+      const scriptsDir = path17.join(providerDir, "scripts");
       const latestScriptsDir = getLatestScriptVersionDir(scriptsDir);
       if (latestScriptsDir) {
         lines.push(`Scripts version directory: \`${latestScriptsDir}\``);
@@ -42433,10 +43658,10 @@ async (params) => {
         lines.push("## \u270F\uFE0F Target Files (EDIT THESE)");
         lines.push("These are the ONLY files you are allowed to modify. Replace the TODO stubs with working implementations.");
         lines.push("");
-        for (const file2 of fs12.readdirSync(latestScriptsDir)) {
+        for (const file2 of fs13.readdirSync(latestScriptsDir)) {
           if (file2.endsWith(".js") && targetFileNames.has(file2)) {
             try {
-              const content = fs12.readFileSync(path16.join(latestScriptsDir, file2), "utf-8");
+              const content = fs13.readFileSync(path17.join(latestScriptsDir, file2), "utf-8");
               lines.push(`### \`${file2}\` \u270F\uFE0F EDIT`);
               lines.push("```javascript");
               lines.push(content);
@@ -42446,14 +43671,14 @@ async (params) => {
             }
           }
         }
-        const refFiles = fs12.readdirSync(latestScriptsDir).filter((f) => f.endsWith(".js") && !targetFileNames.has(f));
+        const refFiles = fs13.readdirSync(latestScriptsDir).filter((f) => f.endsWith(".js") && !targetFileNames.has(f));
         if (refFiles.length > 0) {
           lines.push("## \u{1F512} Other Scripts (REFERENCE ONLY \u2014 DO NOT EDIT)");
           lines.push("These files are shown for context only. Do NOT modify them under any circumstances.");
           lines.push("");
           for (const file2 of refFiles) {
             try {
-              const content = fs12.readFileSync(path16.join(latestScriptsDir, file2), "utf-8");
+              const content = fs13.readFileSync(path17.join(latestScriptsDir, file2), "utf-8");
               lines.push(`### \`${file2}\` \u{1F512}`);
               lines.push("```javascript");
               lines.push(content);
@@ -42494,11 +43719,11 @@ async (params) => {
           lines.push("");
         }
       }
-      const docsDir = path16.join(providerDir, "../../docs");
+      const docsDir = path17.join(providerDir, "../../docs");
       const loadGuide = (name) => {
         try {
-          const p = path16.join(docsDir, name);
-          if (fs12.existsSync(p)) return fs12.readFileSync(p, "utf-8");
+          const p = path17.join(docsDir, name);
+          if (fs13.existsSync(p)) return fs13.readFileSync(p, "utf-8");
         } catch {
         }
         return null;
@@ -42656,8 +43881,69 @@ async (params) => {
       lines.push("Start NOW. Do not ask for permission. Explore the DOM -> Code -> Test.");
       return lines.join("\n");
     }
-    function buildCliAutoImplPrompt(ctx, type, provider, providerDir, functions, referenceScripts, userComment, referenceType) {
+    function buildCliAutoImplPrompt(ctx, type, provider, providerDir, functions, referenceScripts, userComment, referenceType, verification) {
       const lines = [];
+      const defaultExercisePayload = {
+        type,
+        workingDir: providerDir,
+        freshSession: true,
+        autoLaunch: true,
+        autoResolveApprovals: true,
+        approvalButtonIndex: 0,
+        timeoutMs: 45e3,
+        traceLimit: 200,
+        text: "Create a file at tmp/adhdev_provider_fix_test.py that prints the current working directory and the squares of 1 through 5, then run python3 tmp/adhdev_provider_fix_test.py and tell me the exact output."
+      };
+      const exercisePayload = {
+        ...defaultExercisePayload,
+        ...verification?.request || {},
+        type,
+        workingDir: providerDir
+      };
+      const exerciseJson = JSON.stringify(exercisePayload).replace(/\\/g, "\\\\").replace(/'/g, `'\\''`);
+      const verificationInspectFields = verification?.inspectFields?.length ? verification.inspectFields : [
+        "debug.messages",
+        "trace.entries[].payload.parsedLastAssistant",
+        "trace.entries[].payload.lastAssistant"
+      ];
+      const verificationMustContainAny = verification?.mustContainAny || [];
+      const verificationMustNotContainAny = verification?.mustNotContainAny || [];
+      const verificationMustMatchAny = verification?.mustMatchAny || [];
+      const verificationMustNotMatchAny = verification?.mustNotMatchAny || [];
+      const verificationLastAssistantMustContainAny = verification?.lastAssistantMustContainAny || [];
+      const verificationLastAssistantMustNotContainAny = verification?.lastAssistantMustNotContainAny || [];
+      const verificationLastAssistantMustMatchAny = verification?.lastAssistantMustMatchAny || [];
+      const verificationLastAssistantMustNotMatchAny = verification?.lastAssistantMustNotMatchAny || [];
+      const quotedMustContain = verificationMustContainAny.map((value) => JSON.stringify(value)).join(", ");
+      const quotedMustNotContain = verificationMustNotContainAny.map((value) => JSON.stringify(value)).join(", ");
+      const quotedMustMatch = verificationMustMatchAny.map((value) => JSON.stringify(value)).join(", ");
+      const quotedMustNotMatch = verificationMustNotMatchAny.map((value) => JSON.stringify(value)).join(", ");
+      const quotedLastAssistantMustContain = verificationLastAssistantMustContainAny.map((value) => JSON.stringify(value)).join(", ");
+      const quotedLastAssistantMustNotContain = verificationLastAssistantMustNotContainAny.map((value) => JSON.stringify(value)).join(", ");
+      const quotedLastAssistantMustMatch = verificationLastAssistantMustMatchAny.map((value) => JSON.stringify(value)).join(", ");
+      const quotedLastAssistantMustNotMatch = verificationLastAssistantMustNotMatchAny.map((value) => JSON.stringify(value)).join(", ");
+      const fixtureName = verification?.fixtureName || `${type}-provider-fix`;
+      const fixtureNames = Array.isArray(verification?.fixtureNames) ? verification.fixtureNames.map((value) => String(value || "").trim()).filter(Boolean) : [];
+      const fixtureCaptureJson = JSON.stringify({
+        type,
+        name: fixtureName,
+        request: exercisePayload,
+        assertions: {
+          mustContainAny: verificationMustContainAny,
+          mustNotContainAny: verificationMustNotContainAny,
+          mustMatchAny: verificationMustMatchAny,
+          mustNotMatchAny: verificationMustNotMatchAny,
+          lastAssistantMustContainAny: verificationLastAssistantMustContainAny,
+          lastAssistantMustNotContainAny: verificationLastAssistantMustNotContainAny,
+          lastAssistantMustMatchAny: verificationLastAssistantMustMatchAny,
+          lastAssistantMustNotMatchAny: verificationLastAssistantMustNotMatchAny,
+          requireNotTimedOut: true
+        }
+      }).replace(/\\/g, "\\\\").replace(/'/g, `'\\''`);
+      const fixtureReplayJson = JSON.stringify({
+        type,
+        name: fixtureName
+      }).replace(/\\/g, "\\\\").replace(/'/g, `'\\''`);
       lines.push("You are implementing PTY parsing scripts for a CLI provider.");
       lines.push("Be concise. Do NOT explain your reasoning. Edit files directly and verify with the local DevServer.");
       lines.push("");
@@ -42671,7 +43957,7 @@ async (params) => {
         parseApproval: "parse_approval.js"
       };
       const targetFileNames = new Set(functions.map((fn2) => funcToFile[fn2]).filter(Boolean));
-      const scriptsDir = path16.join(providerDir, "scripts");
+      const scriptsDir = path17.join(providerDir, "scripts");
       const latestScriptsDir = getLatestScriptVersionDir(scriptsDir);
       if (latestScriptsDir) {
         lines.push(`Scripts version directory: \`${latestScriptsDir}\``);
@@ -42679,11 +43965,11 @@ async (params) => {
         lines.push("## \u270F\uFE0F Target Files (EDIT THESE)");
         lines.push("These are the ONLY files you are allowed to modify. Replace TODO or heuristic-only logic with working PTY-aware implementations.");
         lines.push("");
-        for (const file2 of fs12.readdirSync(latestScriptsDir)) {
+        for (const file2 of fs13.readdirSync(latestScriptsDir)) {
           if (!file2.endsWith(".js")) continue;
           if (!targetFileNames.has(file2)) continue;
           try {
-            const content = fs12.readFileSync(path16.join(latestScriptsDir, file2), "utf-8");
+            const content = fs13.readFileSync(path17.join(latestScriptsDir, file2), "utf-8");
             lines.push(`### \`${file2}\` \u270F\uFE0F EDIT`);
             lines.push("```javascript");
             lines.push(content);
@@ -42692,14 +43978,14 @@ async (params) => {
           } catch {
           }
         }
-        const refFiles = fs12.readdirSync(latestScriptsDir).filter((f) => f.endsWith(".js") && !targetFileNames.has(f));
+        const refFiles = fs13.readdirSync(latestScriptsDir).filter((f) => f.endsWith(".js") && !targetFileNames.has(f));
         if (refFiles.length > 0) {
           lines.push("## \u{1F512} Other Scripts (REFERENCE ONLY \u2014 DO NOT EDIT)");
           lines.push("These files are shown for context only. Do NOT modify them under any circumstances.");
           lines.push("");
           for (const file2 of refFiles) {
             try {
-              const content = fs12.readFileSync(path16.join(latestScriptsDir, file2), "utf-8");
+              const content = fs13.readFileSync(path17.join(latestScriptsDir, file2), "utf-8");
               lines.push(`### \`${file2}\` \u{1F512}`);
               lines.push("```javascript");
               lines.push(content);
@@ -42732,17 +44018,17 @@ async (params) => {
           lines.push("");
         }
       }
-      const docsDir = path16.join(providerDir, "../../docs");
+      const docsDir = path17.join(providerDir, "../../docs");
       const loadGuide = (name) => {
         try {
-          const p = path16.join(docsDir, name);
-          if (fs12.existsSync(p)) return fs12.readFileSync(p, "utf-8");
+          const p = path17.join(docsDir, name);
+          if (fs13.existsSync(p)) return fs13.readFileSync(p, "utf-8");
         } catch {
         }
         return null;
       };
       const providerGuide = loadGuide("PROVIDER_GUIDE.md");
-      if (providerGuide) {
+      if (providerGuide && provider.category !== "cli") {
         lines.push("## Documentation: PROVIDER_GUIDE.md");
         lines.push("```markdown");
         lines.push(providerGuide);
@@ -42784,6 +44070,11 @@ async (params) => {
       lines.push("13. After the first successful live repro, stop broad diagnosis. Edit the scripts, reload, and verify. Do not burn tokens on repeated re-inspection without code changes.");
       lines.push("14. If the visible current screen is clean and sufficient, do NOT fall back to complex buffer heuristics. Simpler current-screen parsing is preferred.");
       lines.push("15. Before changing parser logic, verify whether `provider.json` submit/approval behavior (`sendDelayMs`, `approvalKeys`, submit strategy) is the simpler and more correct fix.");
+      lines.push('16. Do NOT patch transcript bugs by piling up one-off literal string exceptions (`includes("foo")`, `=== "bar"`, ad hoc allowlists/denylists) for every observed variant. Model the UI as PATTERN FAMILIES using reusable regex classifiers and normalization first.');
+      lines.push("17. If you find yourself adding a second or third near-duplicate literal check for spinner words, tool headers, approval prompts, footer chrome, or OSC residue, STOP and replace them with a broader regex or helper classifier.");
+      lines.push('18. Prefer a small number of named classifiers such as "status line", "tool header", "tool detail", "footer chrome", "approval cue", "prompt line", and "OSC residue" over a long chain of unrelated string checks.');
+      lines.push("19. Literal string checks are allowed only for stable proper nouns or exact product chrome that cannot be expressed safely as a broader pattern. Everything else should generalize.");
+      lines.push("20. When a bug comes from noisy PTY text, first normalize and classify the line family; do NOT just append another special-case substring to the parser.");
       lines.push("");
       lines.push("## Task");
       lines.push(`Edit files in \`${providerDir}\` to implement: **${functions.join(", ")}**`);
@@ -42791,35 +44082,145 @@ async (params) => {
       lines.push("## Verification API");
       lines.push("Use the DevServer CLI debug endpoints, not DOM/CDP routes.");
       lines.push("");
-      lines.push("### 1. Launch the target CLI");
+      lines.push("### 1. Preferred: run a full autonomous repro");
+      lines.push("Use the exercise endpoint first. It launches a fresh CLI session, sends the repro prompt, auto-resolves approvals, waits for the session to settle, and returns the final debug + trace payload in one response.");
       lines.push("```bash");
-      lines.push(`curl -sS -X POST http://127.0.0.1:${DEV_SERVER_PORT}/api/cli/launch \\`);
+      lines.push(`curl -sS -X POST http://127.0.0.1:${DEV_SERVER_PORT}/api/cli/exercise \\`);
       lines.push('  -H "Content-Type: application/json" \\');
-      lines.push(`  -d '{"type":"${type}","workingDir":"${providerDir.replace(/\\/g, "\\\\")}"}'`);
+      lines.push(`  -d '${exerciseJson}'`);
       lines.push("```");
       lines.push("");
+      if (verification?.description) {
+        lines.push("Verification intent:");
+        lines.push(verification.description);
+        lines.push("");
+      }
+      lines.push("Read the JSON response carefully. It already includes:");
+      lines.push("1. `instanceId`");
+      lines.push("2. `statusesSeen` and `approvalsResolved`");
+      lines.push("3. `debug` for the final settled state");
+      lines.push("4. `trace.entries` for the repro turn");
+      lines.push("");
+      lines.push("Save the response to a temp file and inspect the exact parsed transcript fields before editing:");
+      lines.push("```bash");
+      lines.push(`EXERCISE_JSON=$(mktemp)`);
+      lines.push(`curl -sS -X POST http://127.0.0.1:${DEV_SERVER_PORT}/api/cli/exercise \\`);
+      lines.push('  -H "Content-Type: application/json" \\');
+      lines.push(`  -d '${exerciseJson}' > "$EXERCISE_JSON"`);
+      lines.push(`jq '{timedOut,statusesSeen,approvalsResolved,inspect:{${verificationInspectFields.map((field, index) => `f${index + 1}: .${field}`).join(", ")}}}' "$EXERCISE_JSON"`);
+      lines.push("```");
+      lines.push("");
+      if (verificationMustContainAny.length > 0 || verificationMustNotContainAny.length > 0 || verificationMustMatchAny.length > 0 || verificationMustNotMatchAny.length > 0 || verificationLastAssistantMustContainAny.length > 0 || verificationLastAssistantMustNotContainAny.length > 0 || verificationLastAssistantMustMatchAny.length > 0 || verificationLastAssistantMustNotMatchAny.length > 0) {
+        lines.push("The exact repro below is mandatory. Do NOT declare success unless these transcript assertions pass on the exercise JSON from the PATCHED provider.");
+        lines.push("```bash");
+        if (verificationMustContainAny.length > 0) {
+          lines.push(`node -e 'const fs=require("fs");const text=fs.readFileSync(process.argv[1],"utf8");const required=[${quotedMustContain}];const missing=required.filter(v=>!text.includes(v));if(missing.length){console.error("Missing required substrings:\\n"+missing.join("\\n"));process.exit(1);}' "$EXERCISE_JSON"`);
+        }
+        if (verificationMustNotContainAny.length > 0) {
+          lines.push(`node -e 'const fs=require("fs");const text=fs.readFileSync(process.argv[1],"utf8");const banned=[${quotedMustNotContain}];const hits=banned.filter(v=>text.includes(v));if(hits.length){console.error("Found banned substrings:\\n"+hits.join("\\n"));process.exit(1);}' "$EXERCISE_JSON"`);
+        }
+        if (verificationMustMatchAny.length > 0) {
+          lines.push(`node -e 'const fs=require("fs");const text=fs.readFileSync(process.argv[1],"utf8");const required=[${quotedMustMatch}].map(v=>new RegExp(v,"m"));const missing=required.filter(v=>!v.test(text)).map(v=>String(v));if(missing.length){console.error("Missing required regex matches:\\n"+missing.join("\\n"));process.exit(1);}' "$EXERCISE_JSON"`);
+        }
+        if (verificationMustNotMatchAny.length > 0) {
+          lines.push(`node -e 'const fs=require("fs");const text=fs.readFileSync(process.argv[1],"utf8");const banned=[${quotedMustNotMatch}].map(v=>new RegExp(v,"m"));const hits=banned.filter(v=>v.test(text)).map(v=>String(v));if(hits.length){console.error("Found banned regex matches:\\n"+hits.join("\\n"));process.exit(1);}' "$EXERCISE_JSON"`);
+        }
+        if (verificationLastAssistantMustContainAny.length > 0) {
+          lines.push(`node -e 'const fs=require("fs");const payload=JSON.parse(fs.readFileSync(process.argv[1],"utf8"));const text=String(payload.lastAssistant||"");const required=[${quotedLastAssistantMustContain}];const missing=required.filter(v=>!text.includes(v));if(missing.length){console.error("Missing required lastAssistant substrings:\\n"+missing.join("\\n"));process.exit(1);}' "$EXERCISE_JSON"`);
+        }
+        if (verificationLastAssistantMustNotContainAny.length > 0) {
+          lines.push(`node -e 'const fs=require("fs");const payload=JSON.parse(fs.readFileSync(process.argv[1],"utf8"));const text=String(payload.lastAssistant||"");const banned=[${quotedLastAssistantMustNotContain}];const hits=banned.filter(v=>text.includes(v));if(hits.length){console.error("Found banned lastAssistant substrings:\\n"+hits.join("\\n"));process.exit(1);}' "$EXERCISE_JSON"`);
+        }
+        if (verificationLastAssistantMustMatchAny.length > 0) {
+          lines.push(`node -e 'const fs=require("fs");const payload=JSON.parse(fs.readFileSync(process.argv[1],"utf8"));const text=String(payload.lastAssistant||"");const required=[${quotedLastAssistantMustMatch}].map(v=>new RegExp(v,"m"));const missing=required.filter(v=>!v.test(text)).map(v=>String(v));if(missing.length){console.error("Missing required lastAssistant regex matches:\\n"+missing.join("\\n"));process.exit(1);}' "$EXERCISE_JSON"`);
+        }
+        if (verificationLastAssistantMustNotMatchAny.length > 0) {
+          lines.push(`node -e 'const fs=require("fs");const payload=JSON.parse(fs.readFileSync(process.argv[1],"utf8"));const text=String(payload.lastAssistant||"");const banned=[${quotedLastAssistantMustNotMatch}].map(v=>new RegExp(v,"m"));const hits=banned.filter(v=>v.test(text)).map(v=>String(v));if(hits.length){console.error("Found banned lastAssistant regex matches:\\n"+hits.join("\\n"));process.exit(1);}' "$EXERCISE_JSON"`);
+        }
+        lines.push("```");
+        lines.push("");
+      }
+      lines.push("If you need a manual follow-up repro after patching, use the SAME endpoint again with the SAME prompt and compare the new trace to the previous one.");
+      lines.push("");
+      lines.push("### 1b. Persist or replay the exact repro as a reusable fixture");
+      if (fixtureNames.length > 0) {
+        lines.push(`Replay this exact fixture suite before editing, and replay the SAME suite again after patching. Do not declare success unless EVERY fixture passes: ${fixtureNames.map((name) => `\`${name}\``).join(", ")}.`);
+        for (const name of fixtureNames) {
+          const replayJson = JSON.stringify({ type, name }).replace(/\\/g, "\\\\").replace(/'/g, `'\\''`);
+          lines.push("```bash");
+          lines.push(`curl -sS -X POST http://127.0.0.1:${DEV_SERVER_PORT}/api/cli/fixture/replay \\`);
+          lines.push('  -H "Content-Type: application/json" \\');
+          lines.push(`  -d '${replayJson}'`);
+          lines.push("```");
+          lines.push("");
+        }
+        lines.push("Do not create new fixtures unless one of the listed fixtures is missing or stale.");
+      } else if (verification?.fixtureName) {
+        lines.push(`Replay the EXISTING saved fixture \`${fixtureName}\` before editing, and replay the SAME fixture again after patching. Do not declare success unless that exact fixture passes.`);
+        lines.push("```bash");
+        lines.push(`curl -sS -X POST http://127.0.0.1:${DEV_SERVER_PORT}/api/cli/fixture/replay \\`);
+        lines.push('  -H "Content-Type: application/json" \\');
+        lines.push(`  -d '${fixtureReplayJson}'`);
+        lines.push("```");
+        lines.push("");
+        lines.push("Only if the named fixture is missing or outdated should you recapture it. Prefer replaying the existing failing fixture over creating a new one.");
+        lines.push("```bash");
+        lines.push(`curl -sS -X POST http://127.0.0.1:${DEV_SERVER_PORT}/api/cli/fixture/capture \\`);
+        lines.push('  -H "Content-Type: application/json" \\');
+        lines.push(`  -d '${fixtureCaptureJson}'`);
+        lines.push("```");
+      } else {
+        lines.push("Capture the exact exercise once before editing. After patching, replay THIS fixture and do not declare success unless replay passes.");
+        lines.push("```bash");
+        lines.push(`curl -sS -X POST http://127.0.0.1:${DEV_SERVER_PORT}/api/cli/fixture/capture \\`);
+        lines.push('  -H "Content-Type: application/json" \\');
+        lines.push(`  -d '${fixtureCaptureJson}'`);
+        lines.push("");
+        lines.push(`curl -sS -X POST http://127.0.0.1:${DEV_SERVER_PORT}/api/cli/fixture/replay \\`);
+        lines.push('  -H "Content-Type: application/json" \\');
+        lines.push(`  -d '${fixtureReplayJson}'`);
+        lines.push("```");
+      }
+      lines.push("");
+      lines.push("The capture endpoint saves the exact request, initial result, and transcript assertions into the provider directory. The replay endpoint reruns the SAME exercise against your patched scripts and returns pass/fail.");
+      lines.push("");
       lines.push("### 2. Inspect parsed + raw adapter state");
       lines.push("```bash");
+      lines.push(`curl -sS -X POST http://127.0.0.1:${DEV_SERVER_PORT}/api/cli/launch \\`);
+      lines.push('  -H "Content-Type: application/json" \\');
+      lines.push(`  -d '{"type":"${type}","workingDir":"${providerDir.replace(/\\/g, "\\\\")}"}'`);
       lines.push(`curl -sS http://127.0.0.1:${DEV_SERVER_PORT}/api/cli/debug/${type}`);
+      lines.push(`curl -sS http://127.0.0.1:${DEV_SERVER_PORT}/api/cli/trace/${type}`);
       lines.push(`curl -sS http://127.0.0.1:${DEV_SERVER_PORT}/api/cli/status`);
       lines.push("```");
       lines.push("");
+      lines.push("The CLI trace endpoint is the primary debugging source. Read it BEFORE editing any parser code.");
+      lines.push("Use the trace timeline to find the latest `settled` or `commit_transcript` frame for the repro turn and inspect these fields first:");
+      lines.push("1. `payload.screenText`");
+      lines.push("2. `payload.detectStatus` and `payload.parsedStatus`");
+      lines.push("3. `payload.parsedLastAssistant`");
+      lines.push("4. `payload.approval` / `payload.parsedActiveModal`");
+      lines.push("5. `payload.rawPreview` only when control-sequence residue matters");
+      lines.push("");
       lines.push("The debug payload should be read in this priority order:");
       lines.push("1. `screenText` / current visible state");
       lines.push("2. parsed `status`, `messages`, `activeModal`");
       lines.push("3. `rawBuffer` only for style/control-sequence cues");
       lines.push("4. `buffer` only when the current screen is insufficient");
       lines.push("");
-      lines.push("Extract the current `instanceId` from the launch or status response and keep using it below.");
+      lines.push("If the bug is transcript corruption, quote the exact bad `parsedLastAssistant` or bad committed assistant message from the trace and patch against that concrete failure.");
+      lines.push("Do NOT guess based only on the final chat bubble or a truncated UI preview.");
       lines.push("");
-      lines.push("### 3. Send a realistic approval-triggering prompt");
+      lines.push("Extract the current `instanceId` from the exercise, launch, or status response and keep using it below.");
+      lines.push("");
+      lines.push("### 3. Manual fallback only: send a realistic approval-triggering prompt");
       lines.push("```bash");
       lines.push(`curl -sS -X POST http://127.0.0.1:${DEV_SERVER_PORT}/api/cli/send \\`);
       lines.push('  -H "Content-Type: application/json" \\');
       lines.push(`  -d '{"type":"${type}","instanceId":"<INSTANCE_ID>","text":"Create a file at tmp/adhdev_provider_fix_test.py that prints the current working directory and the squares of 1 through 5, then run python3 tmp/adhdev_provider_fix_test.py and tell me the exact output."}'`);
       lines.push("```");
       lines.push("");
-      lines.push("### 4. If approval appears, resolve it until the CLI reaches idle");
+      lines.push("### 4. Manual fallback only: if approval appears, resolve it until the CLI reaches idle");
       lines.push("```bash");
       lines.push(`curl -sS -X POST http://127.0.0.1:${DEV_SERVER_PORT}/api/cli/resolve \\`);
       lines.push('  -H "Content-Type: application/json" \\');
@@ -42829,10 +44230,14 @@ async (params) => {
       lines.push(`  -d '{"type":"${type}","instanceId":"<INSTANCE_ID>","keys":"1"}'`);
       lines.push("```");
       lines.push("");
-      lines.push("Use `resolve` when the parsed modal buttons are correct. Use `raw` when the CLI expects a literal keystroke like `1`, `y`, or Enter. Repeat until idle.");
+      lines.push("Use `resolve` when the parsed modal buttons are correct. Use `raw` when the CLI expects a literal keystroke like `1`, `y`, or Enter. Repeat until idle. Prefer the exercise endpoint instead of doing this by hand.");
       lines.push("");
       lines.push("### Patch Discipline");
       lines.push("Once the repro is confirmed, immediately edit the target files. Avoid loops where you keep re-reading long files or re-running the same debug commands without changing code.");
+      lines.push("For CLI transcript bugs, reproduce once with the exercise endpoint, inspect the returned trace once, patch immediately, then re-run the SAME exercise and compare the new `commit_transcript` frame.");
+      lines.push("If the patched run still fails the exact required/banned substring checks above, the task is NOT complete even if the CLI exits normally.");
+      lines.push("When you patch, write down the pattern family you are fixing: e.g. spinner/status, tool block, approval modal, footer chrome, OSC/control residue, prompt echo, or long-output continuation. Patch that family once instead of adding case-by-case literals.");
+      lines.push('Bad fix pattern: add another `includes("Drizzling")` or `includes("Show more (")` check. Good fix pattern: broaden the regex/helper that recognizes spinner words, collapsed tool overflow lines, or footer chrome as a family.');
       lines.push("");
       lines.push("### 5. Verify the side effects outside the CLI");
       lines.push("```bash");
@@ -42857,6 +44262,8 @@ async (params) => {
       lines.push("7. Re-run the debug endpoints after edits. Do NOT finish until the parsed result looks correct.");
       lines.push("8. Confirm the parser still works after a redraw or scroll change without duplicating transcript history.");
       lines.push("9. Confirm the implementation prefers current-screen signals over stale history when both are present.");
+      lines.push("10. For transcript-cleanliness bugs, confirm the latest `commit_transcript` trace frame no longer contains tool headers, approval prompts, OSC residue like `0;`, or footer chrome unless they are truly user-facing answer content.");
+      lines.push("11. Confirm the implementation uses generalized pattern classifiers or regexes for noisy UI families instead of accumulating one-off literal string exceptions for each observed sample.");
       lines.push("");
       if (userComment) {
         lines.push("## \u26A0\uFE0F User Instructions (HIGH PRIORITY)");
@@ -42865,10 +44272,11 @@ async (params) => {
         lines.push(userComment);
         lines.push("");
       }
-      lines.push("Start NOW. Launch the CLI, inspect PTY state, edit the scripts, and verify via the CLI debug endpoints.");
+      lines.push("Start NOW. Launch the CLI, inspect the trace and PTY state, edit the scripts, and verify via the CLI debug + trace endpoints.");
       return lines.join("\n");
     }
     function handleAutoImplSSE(ctx, type, req, res) {
+      clearStaleAutoImplState(ctx, "SSE connection opened");
       res.writeHead(200, {
         "Content-Type": "text/event-stream",
         "Cache-Control": "no-cache",
@@ -42890,6 +44298,7 @@ data: ${JSON.stringify(p.data)}
       });
     }
     function handleAutoImplCancel(ctx, _type, _req, res) {
+      clearStaleAutoImplState(ctx, "cancel request");
       if (ctx.autoImplProcess) {
         ctx.autoImplProcess.kill("SIGTERM");
         setTimeout(() => {
@@ -42971,11 +44380,16 @@ data: ${JSON.stringify(msg.data)}
         { method: "GET", pattern: "/api/cli/status", handler: (q2, s15) => this.handleCliStatus(q2, s15) },
         { method: "POST", pattern: "/api/cli/launch", handler: (q2, s15) => this.handleCliLaunch(q2, s15) },
         { method: "POST", pattern: "/api/cli/send", handler: (q2, s15) => this.handleCliSend(q2, s15) },
+        { method: "POST", pattern: "/api/cli/exercise", handler: (q2, s15) => this.handleCliExercise(q2, s15) },
+        { method: "POST", pattern: "/api/cli/fixture/capture", handler: (q2, s15) => this.handleCliFixtureCapture(q2, s15) },
+        { method: "POST", pattern: "/api/cli/fixture/replay", handler: (q2, s15) => this.handleCliFixtureReplay(q2, s15) },
         { method: "POST", pattern: "/api/cli/resolve", handler: (q2, s15) => this.handleCliResolve(q2, s15) },
         { method: "POST", pattern: "/api/cli/raw", handler: (q2, s15) => this.handleCliRaw(q2, s15) },
         { method: "POST", pattern: "/api/cli/stop", handler: (q2, s15) => this.handleCliStop(q2, s15) },
         { method: "GET", pattern: "/api/cli/events", handler: (q2, s15) => this.handleCliSSE(q2, s15) },
         { method: "GET", pattern: /^\/api\/cli\/debug\/([^/]+)$/, handler: (q2, s15, p) => this.handleCliDebug(p[0], q2, s15) },
+        { method: "GET", pattern: /^\/api\/cli\/trace\/([^/]+)$/, handler: (q2, s15, p) => this.handleCliTrace(p[0], q2, s15) },
+        { method: "GET", pattern: /^\/api\/cli\/fixtures\/([^/]+)$/, handler: (q2, s15, p) => this.handleCliFixtureList(p[0], q2, s15) },
         // Dynamic routes (provider :type param)
         { method: "POST", pattern: /^\/api\/providers\/([^/]+)\/script$/, handler: (q2, s15, p) => this.handleRunScript(p[0], q2, s15) },
         { method: "GET", pattern: /^\/api\/providers\/([^/]+)\/files$/, handler: (q2, s15, p) => this.handleListFiles(p[0], q2, s15) },
@@ -43009,8 +44423,8 @@ data: ${JSON.stringify(msg.data)}
       }
       getEndpointList() {
         return this.routes.map((r) => {
-          const path18 = typeof r.pattern === "string" ? r.pattern : r.pattern.source.replace(/\\\//g, "/").replace(/\(\[.*?\]\+\)/g, ":type").replace(/[\^$]/g, "");
-          return `${r.method.padEnd(5)} ${path18}`;
+          const path19 = typeof r.pattern === "string" ? r.pattern : r.pattern.source.replace(/\\\//g, "/").replace(/\(\[.*?\]\+\)/g, ":type").replace(/[\^$]/g, "");
+          return `${r.method.padEnd(5)} ${path19}`;
         });
       }
       async start(port = DEV_SERVER_PORT) {
@@ -43292,12 +44706,12 @@ data: ${JSON.stringify(msg.data)}
       // ─── DevConsole SPA ───
       getConsoleDistDir() {
         const candidates = [
-          path17.resolve(__dirname, "../../web-devconsole/dist"),
-          path17.resolve(__dirname, "../../../web-devconsole/dist"),
-          path17.join(process.cwd(), "packages/web-devconsole/dist")
+          path18.resolve(__dirname, "../../web-devconsole/dist"),
+          path18.resolve(__dirname, "../../../web-devconsole/dist"),
+          path18.join(process.cwd(), "packages/web-devconsole/dist")
         ];
         for (const dir of candidates) {
-          if (fs13.existsSync(path17.join(dir, "index.html"))) return dir;
+          if (fs14.existsSync(path18.join(dir, "index.html"))) return dir;
         }
         return null;
       }
@@ -43307,9 +44721,9 @@ data: ${JSON.stringify(msg.data)}
           this.json(res, 500, { error: "DevConsole not found. Run: npm run build -w packages/web-devconsole" });
           return;
         }
-        const htmlPath = path17.join(distDir, "index.html");
+        const htmlPath = path18.join(distDir, "index.html");
         try {
-          const html = fs13.readFileSync(htmlPath, "utf-8");
+          const html = fs14.readFileSync(htmlPath, "utf-8");
           res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
           res.end(html);
         } catch (e) {
@@ -43332,15 +44746,15 @@ data: ${JSON.stringify(msg.data)}
           this.json(res, 404, { error: "Not found" });
           return;
         }
-        const safePath = path17.normalize(pathname).replace(/^\.\.\//, "");
-        const filePath = path17.join(distDir, safePath);
+        const safePath = path18.normalize(pathname).replace(/^\.\.\//, "");
+        const filePath = path18.join(distDir, safePath);
         if (!filePath.startsWith(distDir)) {
           this.json(res, 403, { error: "Forbidden" });
           return;
         }
         try {
-          const content = fs13.readFileSync(filePath);
-          const ext = path17.extname(filePath);
+          const content = fs14.readFileSync(filePath);
+          const ext = path18.extname(filePath);
           const contentType = _DevServer.MIME_MAP[ext] || "application/octet-stream";
           res.writeHead(200, { "Content-Type": contentType, "Cache-Control": "public, max-age=31536000, immutable" });
           res.end(content);
@@ -43448,14 +44862,14 @@ data: ${JSON.stringify(msg.data)}
         const files = [];
         const scan = (d, prefix) => {
           try {
-            for (const entry of fs13.readdirSync(d, { withFileTypes: true })) {
+            for (const entry of fs14.readdirSync(d, { withFileTypes: true })) {
               if (entry.name.startsWith(".") || entry.name.endsWith(".bak")) continue;
               const rel = prefix ? `${prefix}/${entry.name}` : entry.name;
               if (entry.isDirectory()) {
                 files.push({ path: rel, size: 0, type: "dir" });
-                scan(path17.join(d, entry.name), rel);
+                scan(path18.join(d, entry.name), rel);
               } else {
-                const stat4 = fs13.statSync(path17.join(d, entry.name));
+                const stat4 = fs14.statSync(path18.join(d, entry.name));
                 files.push({ path: rel, size: stat4.size, type: "file" });
               }
             }
@@ -43478,16 +44892,16 @@ data: ${JSON.stringify(msg.data)}
           this.json(res, 404, { error: `Provider directory not found: ${type}` });
           return;
         }
-        const fullPath = path17.resolve(dir, path17.normalize(filePath));
+        const fullPath = path18.resolve(dir, path18.normalize(filePath));
         if (!fullPath.startsWith(dir)) {
           this.json(res, 403, { error: "Forbidden" });
           return;
         }
-        if (!fs13.existsSync(fullPath) || fs13.statSync(fullPath).isDirectory()) {
+        if (!fs14.existsSync(fullPath) || fs14.statSync(fullPath).isDirectory()) {
           this.json(res, 404, { error: `File not found: ${filePath}` });
           return;
         }
-        const content = fs13.readFileSync(fullPath, "utf-8");
+        const content = fs14.readFileSync(fullPath, "utf-8");
         this.json(res, 200, { type, path: filePath, content, lines: content.split("\n").length });
       }
       /** POST /api/providers/:type/file — write a file { path, content } */
@@ -43503,15 +44917,15 @@ data: ${JSON.stringify(msg.data)}
           this.json(res, 404, { error: `Provider directory not found: ${type}` });
           return;
         }
-        const fullPath = path17.resolve(dir, path17.normalize(filePath));
+        const fullPath = path18.resolve(dir, path18.normalize(filePath));
         if (!fullPath.startsWith(dir)) {
           this.json(res, 403, { error: "Forbidden" });
           return;
         }
         try {
-          if (fs13.existsSync(fullPath)) fs13.copyFileSync(fullPath, fullPath + ".bak");
-          fs13.mkdirSync(path17.dirname(fullPath), { recursive: true });
-          fs13.writeFileSync(fullPath, content, "utf-8");
+          if (fs14.existsSync(fullPath)) fs14.copyFileSync(fullPath, fullPath + ".bak");
+          fs14.mkdirSync(path18.dirname(fullPath), { recursive: true });
+          fs14.writeFileSync(fullPath, content, "utf-8");
           this.log(`File saved: ${fullPath} (${content.length} chars)`);
           this.providerLoader.reload();
           this.json(res, 200, { saved: true, path: filePath, chars: content.length });
@@ -43527,9 +44941,9 @@ data: ${JSON.stringify(msg.data)}
           return;
         }
         for (const name of ["scripts.js", "provider.json"]) {
-          const p = path17.join(dir, name);
-          if (fs13.existsSync(p)) {
-            const source = fs13.readFileSync(p, "utf-8");
+          const p = path18.join(dir, name);
+          if (fs14.existsSync(p)) {
+            const source = fs14.readFileSync(p, "utf-8");
             this.json(res, 200, { type, path: p, source, lines: source.split("\n").length });
             return;
           }
@@ -43548,11 +44962,11 @@ data: ${JSON.stringify(msg.data)}
           this.json(res, 404, { error: `Provider not found: ${type}` });
           return;
         }
-        const target = fs13.existsSync(path17.join(dir, "scripts.js")) ? "scripts.js" : "provider.json";
-        const targetPath = path17.join(dir, target);
+        const target = fs14.existsSync(path18.join(dir, "scripts.js")) ? "scripts.js" : "provider.json";
+        const targetPath = path18.join(dir, target);
         try {
-          if (fs13.existsSync(targetPath)) fs13.copyFileSync(targetPath, targetPath + ".bak");
-          fs13.writeFileSync(targetPath, source, "utf-8");
+          if (fs14.existsSync(targetPath)) fs14.copyFileSync(targetPath, targetPath + ".bak");
+          fs14.writeFileSync(targetPath, source, "utf-8");
           this.log(`Saved provider: ${targetPath} (${source.length} chars)`);
           this.providerLoader.reload();
           this.json(res, 200, { saved: true, path: targetPath, chars: source.length });
@@ -43709,21 +45123,21 @@ data: ${JSON.stringify(msg.data)}
         }
         let targetDir;
         targetDir = this.providerLoader.getUserProviderDir(category, type);
-        const jsonPath = path17.join(targetDir, "provider.json");
-        if (fs13.existsSync(jsonPath)) {
+        const jsonPath = path18.join(targetDir, "provider.json");
+        if (fs14.existsSync(jsonPath)) {
           this.json(res, 409, { error: `Provider already exists at ${targetDir}`, path: targetDir });
           return;
         }
         try {
           const result = generateFiles(type, name, category, { cdpPorts, cli, processName, installPath, binary, extensionId, version: version2, osPaths, processNames });
-          fs13.mkdirSync(targetDir, { recursive: true });
-          fs13.writeFileSync(jsonPath, result["provider.json"], "utf-8");
+          fs14.mkdirSync(targetDir, { recursive: true });
+          fs14.writeFileSync(jsonPath, result["provider.json"], "utf-8");
           const createdFiles = ["provider.json"];
           if (result.files) {
             for (const [relPath, content] of Object.entries(result.files)) {
-              const fullPath = path17.join(targetDir, relPath);
-              fs13.mkdirSync(path17.dirname(fullPath), { recursive: true });
-              fs13.writeFileSync(fullPath, content, "utf-8");
+              const fullPath = path18.join(targetDir, relPath);
+              fs14.mkdirSync(path18.dirname(fullPath), { recursive: true });
+              fs14.writeFileSync(fullPath, content, "utf-8");
               createdFiles.push(relPath);
             }
           }
@@ -43772,45 +45186,45 @@ data: ${JSON.stringify(msg.data)}
       }
       // ─── Phase 2: Auto-Implement Backend ───
       getLatestScriptVersionDir(scriptsDir) {
-        if (!fs13.existsSync(scriptsDir)) return null;
-        const versions = fs13.readdirSync(scriptsDir).filter((d) => {
+        if (!fs14.existsSync(scriptsDir)) return null;
+        const versions = fs14.readdirSync(scriptsDir).filter((d) => {
           try {
-            return fs13.statSync(path17.join(scriptsDir, d)).isDirectory();
+            return fs14.statSync(path18.join(scriptsDir, d)).isDirectory();
           } catch {
             return false;
           }
         }).sort((a, b2) => b2.localeCompare(a, void 0, { numeric: true, sensitivity: "base" }));
         if (versions.length === 0) return null;
-        return path17.join(scriptsDir, versions[0]);
+        return path18.join(scriptsDir, versions[0]);
       }
       resolveAutoImplWritableProviderDir(category, type, requestedDir) {
-        const canonicalUserDir = path17.resolve(this.providerLoader.getUserProviderDir(category, type));
-        const desiredDir = requestedDir ? path17.resolve(requestedDir) : canonicalUserDir;
-        const upstreamRoot = path17.resolve(this.providerLoader.getUpstreamDir());
-        if (desiredDir === upstreamRoot || desiredDir.startsWith(`${upstreamRoot}${path17.sep}`)) {
+        const canonicalUserDir = path18.resolve(this.providerLoader.getUserProviderDir(category, type));
+        const desiredDir = requestedDir ? path18.resolve(requestedDir) : canonicalUserDir;
+        const upstreamRoot = path18.resolve(this.providerLoader.getUpstreamDir());
+        if (desiredDir === upstreamRoot || desiredDir.startsWith(`${upstreamRoot}${path18.sep}`)) {
           return { dir: null, reason: `Refusing to write into upstream provider directory: ${desiredDir}` };
         }
-        if (path17.basename(desiredDir) !== type) {
+        if (path18.basename(desiredDir) !== type) {
           return { dir: null, reason: `Requested writable provider directory must end with '${type}': ${desiredDir}` };
         }
         const sourceDir = this.findProviderDir(type);
         if (!sourceDir) {
           return { dir: null, reason: `Provider source directory not found for '${type}'` };
         }
-        if (!fs13.existsSync(desiredDir)) {
-          fs13.mkdirSync(path17.dirname(desiredDir), { recursive: true });
-          fs13.cpSync(sourceDir, desiredDir, { recursive: true });
+        if (!fs14.existsSync(desiredDir)) {
+          fs14.mkdirSync(path18.dirname(desiredDir), { recursive: true });
+          fs14.cpSync(sourceDir, desiredDir, { recursive: true });
           this.log(`Auto-implement writable copy created: ${desiredDir}`);
         }
-        const providerJson = path17.join(desiredDir, "provider.json");
-        if (!fs13.existsSync(providerJson)) {
+        const providerJson = path18.join(desiredDir, "provider.json");
+        if (!fs14.existsSync(providerJson)) {
           return { dir: null, reason: `provider.json not found in writable provider directory: ${desiredDir}` };
         }
         try {
-          const providerData = JSON.parse(fs13.readFileSync(providerJson, "utf-8"));
+          const providerData = JSON.parse(fs14.readFileSync(providerJson, "utf-8"));
           if (providerData.disableUpstream !== true) {
             providerData.disableUpstream = true;
-            fs13.writeFileSync(providerJson, JSON.stringify(providerData, null, 2));
+            fs14.writeFileSync(providerJson, JSON.stringify(providerData, null, 2));
           }
         } catch (error48) {
           return {
@@ -43850,7 +45264,7 @@ data: ${JSON.stringify(msg.data)}
           setMode: "set_mode.js"
         };
         const targetFileNames = new Set(functions.map((fn2) => funcToFile[fn2]).filter(Boolean));
-        const scriptsDir = path17.join(providerDir, "scripts");
+        const scriptsDir = path18.join(providerDir, "scripts");
         const latestScriptsDir = this.getLatestScriptVersionDir(scriptsDir);
         if (latestScriptsDir) {
           lines.push(`Scripts version directory: \`${latestScriptsDir}\``);
@@ -43858,10 +45272,10 @@ data: ${JSON.stringify(msg.data)}
           lines.push("## \u270F\uFE0F Target Files (EDIT THESE)");
           lines.push("These are the ONLY files you are allowed to modify. Replace the TODO stubs with working implementations.");
           lines.push("");
-          for (const file2 of fs13.readdirSync(latestScriptsDir)) {
+          for (const file2 of fs14.readdirSync(latestScriptsDir)) {
             if (file2.endsWith(".js") && targetFileNames.has(file2)) {
               try {
-                const content = fs13.readFileSync(path17.join(latestScriptsDir, file2), "utf-8");
+                const content = fs14.readFileSync(path18.join(latestScriptsDir, file2), "utf-8");
                 lines.push(`### \`${file2}\` \u270F\uFE0F EDIT`);
                 lines.push("```javascript");
                 lines.push(content);
@@ -43871,14 +45285,14 @@ data: ${JSON.stringify(msg.data)}
               }
             }
           }
-          const refFiles = fs13.readdirSync(latestScriptsDir).filter((f) => f.endsWith(".js") && !targetFileNames.has(f));
+          const refFiles = fs14.readdirSync(latestScriptsDir).filter((f) => f.endsWith(".js") && !targetFileNames.has(f));
           if (refFiles.length > 0) {
             lines.push("## \u{1F512} Other Scripts (REFERENCE ONLY \u2014 DO NOT EDIT)");
             lines.push("These files are shown for context only. Do NOT modify them under any circumstances.");
             lines.push("");
             for (const file2 of refFiles) {
               try {
-                const content = fs13.readFileSync(path17.join(latestScriptsDir, file2), "utf-8");
+                const content = fs14.readFileSync(path18.join(latestScriptsDir, file2), "utf-8");
                 lines.push(`### \`${file2}\` \u{1F512}`);
                 lines.push("```javascript");
                 lines.push(content);
@@ -43919,11 +45333,11 @@ data: ${JSON.stringify(msg.data)}
             lines.push("");
           }
         }
-        const docsDir = path17.join(providerDir, "../../docs");
+        const docsDir = path18.join(providerDir, "../../docs");
         const loadGuide = (name) => {
           try {
-            const p = path17.join(docsDir, name);
-            if (fs13.existsSync(p)) return fs13.readFileSync(p, "utf-8");
+            const p = path18.join(docsDir, name);
+            if (fs14.existsSync(p)) return fs14.readFileSync(p, "utf-8");
           } catch {
           }
           return null;
@@ -44096,7 +45510,7 @@ data: ${JSON.stringify(msg.data)}
           parseApproval: "parse_approval.js"
         };
         const targetFileNames = new Set(functions.map((fn2) => funcToFile[fn2]).filter(Boolean));
-        const scriptsDir = path17.join(providerDir, "scripts");
+        const scriptsDir = path18.join(providerDir, "scripts");
         const latestScriptsDir = this.getLatestScriptVersionDir(scriptsDir);
         if (latestScriptsDir) {
           lines.push(`Scripts version directory: \`${latestScriptsDir}\``);
@@ -44104,11 +45518,11 @@ data: ${JSON.stringify(msg.data)}
           lines.push("## \u270F\uFE0F Target Files (EDIT THESE)");
           lines.push("These are the ONLY files you are allowed to modify. Replace TODO or heuristic-only logic with working PTY-aware implementations.");
           lines.push("");
-          for (const file2 of fs13.readdirSync(latestScriptsDir)) {
+          for (const file2 of fs14.readdirSync(latestScriptsDir)) {
             if (!file2.endsWith(".js")) continue;
             if (!targetFileNames.has(file2)) continue;
             try {
-              const content = fs13.readFileSync(path17.join(latestScriptsDir, file2), "utf-8");
+              const content = fs14.readFileSync(path18.join(latestScriptsDir, file2), "utf-8");
               lines.push(`### \`${file2}\` \u270F\uFE0F EDIT`);
               lines.push("```javascript");
               lines.push(content);
@@ -44117,14 +45531,14 @@ data: ${JSON.stringify(msg.data)}
             } catch {
             }
           }
-          const refFiles = fs13.readdirSync(latestScriptsDir).filter((f) => f.endsWith(".js") && !targetFileNames.has(f));
+          const refFiles = fs14.readdirSync(latestScriptsDir).filter((f) => f.endsWith(".js") && !targetFileNames.has(f));
           if (refFiles.length > 0) {
             lines.push("## \u{1F512} Other Scripts (REFERENCE ONLY \u2014 DO NOT EDIT)");
             lines.push("These files are shown for context only. Do NOT modify them under any circumstances.");
             lines.push("");
             for (const file2 of refFiles) {
               try {
-                const content = fs13.readFileSync(path17.join(latestScriptsDir, file2), "utf-8");
+                const content = fs14.readFileSync(path18.join(latestScriptsDir, file2), "utf-8");
                 lines.push(`### \`${file2}\` \u{1F512}`);
                 lines.push("```javascript");
                 lines.push(content);
@@ -44157,11 +45571,11 @@ data: ${JSON.stringify(msg.data)}
             lines.push("");
           }
         }
-        const docsDir = path17.join(providerDir, "../../docs");
+        const docsDir = path18.join(providerDir, "../../docs");
         const loadGuide = (name) => {
           try {
-            const p = path17.join(docsDir, name);
-            if (fs13.existsSync(p)) return fs13.readFileSync(p, "utf-8");
+            const p = path18.join(docsDir, name);
+            if (fs14.existsSync(p)) return fs14.readFileSync(p, "utf-8");
           } catch {
           }
           return null;
@@ -44226,6 +45640,7 @@ data: ${JSON.stringify(msg.data)}
         lines.push("### 2. Inspect parsed + raw adapter state");
         lines.push("```bash");
         lines.push(`curl -sS http://127.0.0.1:${DEV_SERVER_PORT}/api/cli/debug/${type}`);
+        lines.push(`curl -sS http://127.0.0.1:${DEV_SERVER_PORT}/api/cli/trace/${type}`);
         lines.push(`curl -sS http://127.0.0.1:${DEV_SERVER_PORT}/api/cli/status`);
         lines.push("```");
         lines.push("");
@@ -44360,6 +45775,16 @@ data: ${JSON.stringify(msg.data)}
       async handleCliSend(req, res) {
         return handleCliSend(this, req, res);
       }
+      /** POST /api/cli/exercise — launch/send/approve/wait helper for provider-fix loops */
+      async handleCliExercise(req, res) {
+        return handleCliExercise(this, req, res);
+      }
+      async handleCliFixtureCapture(req, res) {
+        return handleCliFixtureCapture(this, req, res);
+      }
+      async handleCliFixtureReplay(req, res) {
+        return handleCliFixtureReplay(this, req, res);
+      }
       /** POST /api/cli/stop — stop a running CLI { type } */
       async handleCliStop(req, res) {
         return handleCliStop(this, req, res);
@@ -44383,6 +45808,13 @@ data: ${JSON.stringify(msg.data)}
       async handleCliDebug(type, _req, res) {
         return handleCliDebug(this, type, _req, res);
       }
+      /** GET /api/cli/trace/:type — recent CLI trace timeline plus current debug snapshot */
+      async handleCliTrace(type, _req, res) {
+        return handleCliTrace(this, type, _req, res);
+      }
+      async handleCliFixtureList(type, _req, res) {
+        return handleCliFixtureList(this, type, _req, res);
+      }
       /** POST /api/cli/resolve — resolve an approval modal { type, buttonIndex } */
       async handleCliResolve(req, res) {
         return handleCliResolve(this, req, res);
@@ -44549,7 +45981,18 @@ data: ${JSON.stringify(msg.data)}
         });
       }
       async boot() {
-        await this.client.connect();
+        if (typeof this.options.ensureReady === "function") {
+          await this.options.ensureReady();
+        }
+        try {
+          await this.client.connect();
+        } catch (error48) {
+          if (typeof this.options.ensureReady !== "function") {
+            throw error48;
+          }
+          await this.options.ensureReady();
+          await this.client.connect();
+        }
         this.unsubscribe = this.client.onEvent((event) => this.handleEvent(event));
         let record2 = null;
         if (this.options.attachExisting) {
@@ -44924,8 +46367,8 @@ data: ${JSON.stringify(msg.data)}
           const res = await fetch(extension.vsixUrl);
           if (res.ok) {
             const buffer = Buffer.from(await res.arrayBuffer());
-            const fs14 = await import("fs");
-            fs14.writeFileSync(vsixPath, buffer);
+            const fs15 = await import("fs");
+            fs15.writeFileSync(vsixPath, buffer);
             return new Promise((resolve10) => {
               const cmd = `"${ide.cliCommand}" --install-extension "${vsixPath}" --force`;
               (0, import_child_process10.exec)(cmd, { timeout: 6e4 }, (error48, _stdout, stderr) => {
@@ -45238,15 +46681,18 @@ data: ${JSON.stringify(msg.data)}
 var import_http = require("http");
 var import_ws = require("ws");
 var path4 = __toESM(require("path"));
-var fs2 = __toESM(require("fs"));
-var os4 = __toESM(require("os"));
+var fs3 = __toESM(require("fs"));
+var os5 = __toESM(require("os"));
 var import_daemon_core2 = __toESM(require_dist2());
 
 // src/session-host.ts
 var import_child_process = require("child_process");
+var fs2 = __toESM(require("fs"));
+var os2 = __toESM(require("os"));
 var path = __toESM(require("path"));
 var import_daemon_core = __toESM(require_dist2());
 var SESSION_HOST_APP_NAME = process.env.ADHDEV_SESSION_HOST_NAME || "adhdev";
+var SESSION_HOST_START_TIMEOUT_MS = 15e3;
 function buildSessionHostEnv(baseEnv) {
   const env = {};
   for (const [key, value] of Object.entries(baseEnv)) {
@@ -45267,12 +46713,58 @@ function resolveSessionHostEntry() {
     path.resolve(__dirname, "../../vendor/session-host-daemon/index.js")
   ];
   for (const candidate of localCandidates) {
-    if (require("fs").existsSync(candidate)) {
+    if (fs2.existsSync(candidate)) {
       return candidate;
     }
   }
   return require.resolve("@adhdev/session-host-daemon");
 }
+function getSessionHostPidFile() {
+  return path.join(os2.homedir(), ".adhdev", `${SESSION_HOST_APP_NAME}-session-host.pid`);
+}
+function killPid(pid) {
+  try {
+    if (process.platform === "win32") {
+      (0, import_child_process.execFileSync)("taskkill", ["/PID", String(pid), "/T", "/F"], { stdio: "ignore" });
+    } else {
+      process.kill(pid, "SIGTERM");
+    }
+    return true;
+  } catch {
+    return false;
+  }
+}
+function stopSessionHost() {
+  let stopped = false;
+  const pidFile = getSessionHostPidFile();
+  try {
+    if (fs2.existsSync(pidFile)) {
+      const pid = Number.parseInt(fs2.readFileSync(pidFile, "utf8").trim(), 10);
+      if (Number.isFinite(pid)) {
+        stopped = killPid(pid) || stopped;
+      }
+    }
+  } catch {
+  } finally {
+    try {
+      fs2.unlinkSync(pidFile);
+    } catch {
+    }
+  }
+  if (process.platform !== "win32") {
+    try {
+      const raw = (0, import_child_process.execFileSync)("pgrep", ["-f", "session-host-daemon"], { encoding: "utf8" }).trim();
+      for (const line of raw.split("\n")) {
+        const pid = Number.parseInt(line.trim(), 10);
+        if (Number.isFinite(pid)) {
+          stopped = killPid(pid) || stopped;
+        }
+      }
+    } catch {
+    }
+  }
+  return stopped;
+}
 async function runSessionHostCli(args) {
   const entry = resolveSessionHostEntry();
   const child = (0, import_child_process.spawn)(process.execPath, [entry, ...args], {
@@ -45285,19 +46777,34 @@ async function runSessionHostCli(args) {
   });
 }
 async function ensureSessionHostReady() {
-  return (0, import_daemon_core.ensureSessionHostReady)({
-    appName: SESSION_HOST_APP_NAME,
-    spawnHost: () => {
-      const entry = resolveSessionHostEntry();
-      const child = (0, import_child_process.spawn)(process.execPath, [entry], {
-        detached: true,
-        stdio: "ignore",
-        windowsHide: true,
-        env: buildSessionHostEnv(process.env)
-      });
-      child.unref();
-    }
-  });
+  const spawnHost = () => {
+    const entry = resolveSessionHostEntry();
+    const child = (0, import_child_process.spawn)(process.execPath, [entry], {
+      detached: true,
+      stdio: "ignore",
+      windowsHide: true,
+      env: buildSessionHostEnv(process.env)
+    });
+    child.unref();
+  };
+  try {
+    return await (0, import_daemon_core.ensureSessionHostReady)({
+      appName: SESSION_HOST_APP_NAME,
+      spawnHost,
+      timeoutMs: SESSION_HOST_START_TIMEOUT_MS
+    });
+  } catch (error48) {
+    stopSessionHost();
+    return (0, import_daemon_core.ensureSessionHostReady)({
+      appName: SESSION_HOST_APP_NAME,
+      spawnHost,
+      timeoutMs: SESSION_HOST_START_TIMEOUT_MS
+    }).catch((retryError) => {
+      const initialMessage = error48 instanceof Error ? error48.message : String(error48);
+      const retryMessage = retryError instanceof Error ? retryError.message : String(retryError);
+      throw new Error(`Session host failed to start after retry (${initialMessage}; retry: ${retryMessage})`);
+    });
+  }
 }
 async function listHostedCliRuntimes(endpoint) {
   return (0, import_daemon_core.listHostedCliRuntimes)(endpoint);
@@ -45315,7 +46822,7 @@ async function proxySessionHostAttach(target, options = {}) {
 }
 
 // ../session-host-core/dist/index.mjs
-var os2 = __toESM(require("os"), 1);
+var os3 = __toESM(require("os"), 1);
 var path2 = __toESM(require("path"), 1);
 var net = __toESM(require("net"), 1);
 var import_crypto = require("crypto");
@@ -45328,7 +46835,7 @@ function getDefaultSessionHostEndpoint(appName = "adhdev") {
   }
   return {
     kind: "unix",
-    path: path2.join(os2.tmpdir(), `${appName}-session-host.sock`)
+    path: path2.join(os3.tmpdir(), `${appName}-session-host.sock`)
   };
 }
 function serializeEnvelope(envelope) {
@@ -45612,7 +47119,7 @@ if (pkgVersion === "unknown") {
     ];
     for (const candidate of possiblePaths) {
       try {
-        const data = JSON.parse(fs2.readFileSync(candidate, "utf-8"));
+        const data = JSON.parse(fs3.readFileSync(candidate, "utf-8"));
         if (data.version) {
           pkgVersion = data.version;
           break;
@@ -45714,6 +47221,10 @@ var StandaloneServer = class {
         },
         createPtyTransportFactory: ({ runtimeId, providerType, workspace, cliArgs, providerSessionId, attachExisting }) => new import_daemon_core2.SessionHostPtyTransportFactory({
           endpoint: sessionHostEndpoint,
+          ensureReady: async () => {
+            const activeEndpoint = await this.ensureActiveSessionHostEndpoint();
+            this.sessionHostEndpoint = activeEndpoint;
+          },
           clientId: `daemon-${process.pid}`,
           runtimeId,
           providerType,
@@ -45972,7 +47483,7 @@ var StandaloneServer = class {
     if (publicDir) {
       const filePath = url2 === "/" ? "/index.html" : url2;
       const fullPath = path4.join(publicDir, filePath);
-      if (fs2.existsSync(fullPath) && fs2.statSync(fullPath).isFile()) {
+      if (fs3.existsSync(fullPath) && fs3.statSync(fullPath).isFile()) {
         const ext = path4.extname(fullPath);
         const mimeTypes = {
           ".html": "text/html",
@@ -45985,13 +47496,13 @@ var StandaloneServer = class {
           ".woff2": "font/woff2"
         };
         res.writeHead(200, { "Content-Type": mimeTypes[ext] || "application/octet-stream" });
-        fs2.createReadStream(fullPath).pipe(res);
+        fs3.createReadStream(fullPath).pipe(res);
         return;
       }
       const indexPath = path4.join(publicDir, "index.html");
-      if (fs2.existsSync(indexPath) && !url2.startsWith("/api/")) {
+      if (fs3.existsSync(indexPath) && !url2.startsWith("/api/")) {
         res.writeHead(200, { "Content-Type": "text/html" });
-        fs2.createReadStream(indexPath).pipe(res);
+        fs3.createReadStream(indexPath).pipe(res);
         return;
       }
     }
@@ -46251,7 +47762,7 @@ var StandaloneServer = class {
   }
   // ─── Network ───
   getLanIPs() {
-    const interfaces = os4.networkInterfaces();
+    const interfaces = os5.networkInterfaces();
     const ips = [];
     for (const iface of Object.values(interfaces)) {
       if (!iface) continue;
@@ -46370,7 +47881,7 @@ Runtime commands:
       path4.join(process.cwd(), "public")
     ];
     for (const candidate of candidates) {
-      if (fs2.existsSync(path4.join(candidate, "index.html"))) {
+      if (fs3.existsSync(path4.join(candidate, "index.html"))) {
         options.publicDir = candidate;
         break;
       }