@adhdev/daemon-core 0.6.57 → 0.6.59

package/dist/index.js

@@ -750,6 +750,36 @@ function promptLikelyVisible(screenText, promptSnippet) {
   ).length;
   return matched >= required;
 }
+function splitHistoryLines(text) {
+  return String(text || "").split("\n").map((line) => line.replace(/\s+$/, ""));
+}
+function normalizeHistoryLine(line) {
+  return String(line || "").replace(/\s+/g, " ").trim();
+}
+function mergeTerminalHistory(existing, snapshot) {
+  const next = String(snapshot || "").trim();
+  if (!next) return existing;
+  const prev = String(existing || "").trim();
+  if (!prev) return next;
+  if (prev === next || prev.endsWith(next)) return prev;
+  const prevLines = splitHistoryLines(prev);
+  const nextLines = splitHistoryLines(next);
+  const prevNorm = prevLines.map(normalizeHistoryLine);
+  const nextNorm = nextLines.map(normalizeHistoryLine);
+  const maxOverlap = Math.min(prevLines.length, nextLines.length);
+  for (let overlap = maxOverlap; overlap >= 1; overlap -= 1) {
+    const prevTail = prevNorm.slice(prevNorm.length - overlap);
+    const nextHead = nextNorm.slice(0, overlap);
+    if (prevTail.every((line, index) => line === nextHead[index])) {
+      return [...prevLines, ...nextLines.slice(overlap)].join("\n").trim();
+    }
+  }
+  const compactPrev = prevNorm.join("\n");
+  const compactNext = nextNorm.join("\n");
+  if (compactPrev.includes(compactNext)) return prev;
+  return `${prev}
+${next}`.trim();
+}
 function parsePatternEntry(x) {
   if (x instanceof RegExp) return x;
   if (x && typeof x === "object" && typeof x.source === "string") {
@@ -826,6 +856,7 @@ var init_provider_cli_adapter = __esm({
         this.approvalKeys = rawKeys && typeof rawKeys === "object" ? rawKeys : {};
         this.sendDelayMs = typeof provider.sendDelayMs === "number" ? Math.max(0, provider.sendDelayMs) : 0;
         this.sendKey = typeof provider.sendKey === "string" && provider.sendKey.length > 0 ? provider.sendKey : "\r";
+        this.submitStrategy = provider.submitStrategy === "immediate" ? "immediate" : "wait_for_echo";
         this.cliScripts = provider.scripts || {};
         const scriptNames = Object.keys(this.cliScripts).filter((k) => typeof this.cliScripts[k] === "function");
         if (scriptNames.length > 0) {
@@ -840,6 +871,7 @@ var init_provider_cli_adapter = __esm({
       provider;
       ptyProcess = null;
       messages = [];
+      committedMessages = [];
       structuredMessages = [];
       currentStatus = "starting";
       onStatusChange = null;
@@ -886,8 +918,35 @@ var init_provider_cli_adapter = __esm({
       accumulatedRawBuffer = "";
       /** Current visible terminal screen snapshot */
       terminalScreen = new TerminalScreen(40, 120);
+      /** Rolling append-only terminal transcript built from screen snapshots */
+      terminalHistory = "";
       /** Max accumulated buffer size (last 50KB) */
       static MAX_ACCUMULATED_BUFFER = 5e4;
+      currentTurnScope = null;
+      syncMessageViews() {
+        this.messages = [...this.committedMessages];
+        this.structuredMessages = [...this.committedMessages];
+      }
+      sliceFromOffset(text, start) {
+        if (!text) return "";
+        if (!Number.isFinite(start) || start <= 0) return text;
+        if (start >= text.length) return "";
+        return text.slice(start);
+      }
+      buildParseInput(baseMessages, partialResponse, scope) {
+        const buffer = scope ? this.sliceFromOffset(this.terminalHistory, scope.terminalHistoryStart) || this.sliceFromOffset(this.accumulatedBuffer, scope.bufferStart) || this.accumulatedBuffer : this.accumulatedBuffer;
+        const rawBuffer = scope ? this.sliceFromOffset(this.accumulatedRawBuffer, scope.rawBufferStart) || this.accumulatedRawBuffer : this.accumulatedRawBuffer;
+        const terminalHistory = scope ? this.sliceFromOffset(this.terminalHistory, scope.terminalHistoryStart) || this.terminalHistory : this.terminalHistory;
+        return {
+          buffer,
+          rawBuffer,
+          recentBuffer: buffer.slice(-1e3) || this.recentOutputBuffer,
+          screenText: this.terminalScreen.getText(),
+          terminalHistory,
+          messages: [...baseMessages],
+          partialResponse
+        };
+      }
       setStatus(status, trigger) {
         const prev = this.currentStatus;
         if (prev === status) return;
@@ -902,6 +961,7 @@ var init_provider_cli_adapter = __esm({
       approvalKeys;
       sendDelayMs;
       sendKey;
+      submitStrategy;
       /** Inject CLI scripts after construction (e.g. when resolved by ProviderLoader) */
       setCliScripts(scripts) {
         this.cliScripts = scripts;
@@ -997,6 +1057,8 @@ var init_provider_cli_adapter = __esm({
         this.startupParseGate = true;
         this.startupBuffer = "";
         this.terminalScreen.reset(40, 120);
+        this.terminalHistory = "";
+        this.currentTurnScope = null;
         this.ready = false;
         this.setStatus("idle", "pty_ready");
         this.onStatusChange?.();
@@ -1008,6 +1070,7 @@ var init_provider_cli_adapter = __esm({
           this.ptyProcess?.write("\x1B[1;1R");
         }
         this.terminalScreen.write(rawData);
+        this.terminalHistory = mergeTerminalHistory(this.terminalHistory, this.terminalScreen.getText());
         const cleanData = stripAnsi(rawData);
         if (this.isWaitingForResponse && cleanData) {
           this.responseBuffer = (this.responseBuffer + cleanData).slice(-8e3);
@@ -1152,6 +1215,7 @@ var init_provider_cli_adapter = __esm({
       finishResponse() {
         if (this.submitPendingUntil > Date.now()) return;
         if (this.responseSettleIgnoreUntil > Date.now()) return;
+        this.commitCurrentTranscript();
         if (this.responseTimeout) {
           clearTimeout(this.responseTimeout);
           this.responseTimeout = null;
@@ -1173,10 +1237,58 @@ var init_provider_cli_adapter = __esm({
         this.responseSettleIgnoreUntil = 0;
         this.submitRetryUsed = false;
         this.submitRetryPromptSnippet = "";
+        this.currentTurnScope = null;
         this.activeModal = null;
         this.setStatus("idle", "response_finished");
         this.onStatusChange?.();
       }
+      commitCurrentTranscript() {
+        const baseMessages = [...this.committedMessages];
+        const parsed = this.parseCurrentTranscript(baseMessages, "", this.currentTurnScope);
+        if (parsed && Array.isArray(parsed.messages) && parsed.messages.length > 0) {
+          const parsedMessages = parsed.messages.filter((m) => m && (m.role === "user" || m.role === "assistant")).map((m) => ({
+            role: m.role,
+            content: typeof m.content === "string" ? m.content : String(m.content || ""),
+            timestamp: m.timestamp
+          }));
+          const latestAssistant = [...parsedMessages].reverse().find((m) => m.role === "assistant" && m.content.trim());
+          if (latestAssistant) {
+            LOG.info("CLI", `[${this.cliType}] commitCurrentTranscript parsed assistant len=${latestAssistant.content.length} scopePrompt=${JSON.stringify(this.currentTurnScope?.prompt || "").slice(0, 120)}`);
+            const nextMessages = [...baseMessages];
+            const last2 = nextMessages[nextMessages.length - 1];
+            if (last2?.role === "assistant") {
+              last2.content = latestAssistant.content;
+              last2.timestamp = latestAssistant.timestamp || last2.timestamp;
+            } else if (last2?.role === "user") {
+              nextMessages.push({
+                role: "assistant",
+                content: latestAssistant.content,
+                timestamp: latestAssistant.timestamp || Date.now()
+              });
+            } else {
+              nextMessages.push({
+                role: "assistant",
+                content: latestAssistant.content,
+                timestamp: latestAssistant.timestamp || Date.now()
+              });
+            }
+            this.committedMessages = nextMessages;
+            this.syncMessageViews();
+            return;
+          }
+        }
+        const fallback = String(this.responseBuffer || "").trim();
+        LOG.info("CLI", `[${this.cliType}] commitCurrentTranscript fallback len=${fallback.length} scopePrompt=${JSON.stringify(this.currentTurnScope?.prompt || "").slice(0, 120)}`);
+        if (!fallback) return;
+        const last = baseMessages[baseMessages.length - 1];
+        if (last?.role === "assistant") {
+          last.content = fallback;
+        } else {
+          baseMessages.push({ role: "assistant", content: fallback, timestamp: Date.now() });
+        }
+        this.committedMessages = baseMessages;
+        this.syncMessageViews();
+      }
       // ─── Script Execution ──────────────────────────
       runDetectStatus(text) {
         if (!this.cliScripts?.detectStatus) return null;
@@ -1206,24 +1318,12 @@ var init_provider_cli_adapter = __esm({
       }
       // ─── Public API (CliAdapter) ───────────────────
       getStatus() {
-        const scriptResult = this.getScriptParsedStatus();
-        if (scriptResult) {
-          return {
-            status: this.currentStatus,
-            messages: (scriptResult.messages || []).map((m) => ({
-              role: m.role,
-              content: m.content,
-              timestamp: m.timestamp
-            })),
-            workingDir: this.workingDir,
-            activeModal: this.activeModal
-          };
-        }
         return {
           status: this.currentStatus,
-          messages: [...this.messages],
+          messages: [...this.committedMessages],
           workingDir: this.workingDir,
-          activeModal: this.activeModal
+          activeModal: this.activeModal,
+          terminalHistory: this.terminalHistory
         };
       }
       /**
@@ -1231,31 +1331,32 @@ var init_provider_cli_adapter = __esm({
        * Called by command handler / dashboard for rich content rendering.
        */
       getScriptParsedStatus() {
+        const messages = [...this.committedMessages];
+        return {
+          id: "cli_session",
+          status: this.currentStatus,
+          title: this.cliName,
+          terminalHistory: this.terminalHistory,
+          messages: messages.slice(-50).map((message, index) => ({
+            id: `msg_${index}`,
+            role: message.role,
+            content: message.content,
+            timestamp: message.timestamp,
+            index,
+            kind: "standard"
+          })),
+          activeModal: this.activeModal
+        };
+      }
+      parseCurrentTranscript(baseMessages, partialResponse, scope) {
         if (!this.cliScripts?.parseOutput) return null;
         try {
-          const input = {
-            buffer: this.accumulatedBuffer,
-            rawBuffer: this.accumulatedRawBuffer,
-            recentBuffer: this.recentOutputBuffer,
-            screenText: this.terminalScreen.getText(),
-            messages: [...this.structuredMessages.length > 0 ? this.structuredMessages : this.messages],
-            partialResponse: this.responseBuffer
-          };
-          const result = this.cliScripts.parseOutput(input);
-          if (result && typeof result === "object") {
-            if (Array.isArray(result.messages)) {
-              this.structuredMessages = result.messages.map((m) => ({
-                role: m.role,
-                content: m.content,
-                timestamp: m.timestamp
-              }));
-            }
-            return result;
-          }
+          const input = this.buildParseInput(baseMessages, partialResponse, scope);
+          return this.cliScripts.parseOutput(input);
         } catch (e) {
           LOG.warn("CLI", `[${this.cliType}] parseOutput error: ${e.message}`);
+          return null;
         }
-        return null;
       }
       /** Whether this adapter has CLI scripts loaded */
       hasCliScripts() {
@@ -1290,15 +1391,23 @@ ${data.message || ""}`.trim();
         if (this.startupParseGate) {
           const deadline = Date.now() + 1e4;
           while (this.startupParseGate && Date.now() < deadline) {
-            await new Promise((resolve8) => setTimeout(resolve8, 50));
+            await new Promise((resolve7) => setTimeout(resolve7, 50));
           }
         }
         if (!this.ready) throw new Error(`${this.cliName} not ready (status: ${this.currentStatus})`);
         if (this.isWaitingForResponse) return;
-        this.messages.push({ role: "user", content: text, timestamp: Date.now() });
-        this.structuredMessages.push({ role: "user", content: text, timestamp: Date.now() });
+        this.committedMessages.push({ role: "user", content: text, timestamp: Date.now() });
+        this.syncMessageViews();
         this.isWaitingForResponse = true;
         this.responseBuffer = "";
+        this.currentTurnScope = {
+          prompt: text,
+          startedAt: Date.now(),
+          bufferStart: this.accumulatedBuffer.length,
+          rawBufferStart: this.accumulatedRawBuffer.length,
+          terminalHistoryStart: this.terminalHistory.length
+        };
+        LOG.info("CLI", `[${this.cliType}] sendMessage turn scope buffer=${this.currentTurnScope.bufferStart} raw=${this.currentTurnScope.rawBufferStart} terminal=${this.currentTurnScope.terminalHistoryStart} prompt=${JSON.stringify(text).slice(0, 120)}`);
         this.submitRetryUsed = false;
         this.submitRetryPromptSnippet = extractPromptRetrySnippet(text);
         const normalizedPromptSnippet = normalizePromptText(this.submitRetryPromptSnippet);
@@ -1318,10 +1427,12 @@ ${data.message || ""}`.trim();
         this.responseSettleIgnoreUntil = Date.now() + submitDelayMs + this.timeouts.outputSettle + 250;
         this.setStatus("generating", "sendMessage");
         this.onStatusChange?.();
-        if (submitDelayMs > 0) {
-          this.submitPendingUntil = Date.now() + submitDelayMs;
-        }
-        this.ptyProcess.write(text);
+        const startResponseTimeout = () => {
+          if (this.responseTimeout) clearTimeout(this.responseTimeout);
+          this.responseTimeout = setTimeout(() => {
+            if (this.isWaitingForResponse) this.finishResponse();
+          }, this.timeouts.maxResponse);
+        };
         const submit = () => {
           if (!this.ptyProcess) return;
           this.submitPendingUntil = 0;
@@ -1344,10 +1455,30 @@ ${data.message || ""}`.trim();
             this.submitRetryTimer = setTimeout(() => retrySubmitIfStuck(attempt + 1), retryDelayMs);
           };
           this.submitRetryTimer = setTimeout(() => retrySubmitIfStuck(1), retryDelayMs);
-          this.responseTimeout = setTimeout(() => {
-            if (this.isWaitingForResponse) this.finishResponse();
-          }, this.timeouts.maxResponse);
+          startResponseTimeout();
         };
+        if (this.submitStrategy === "immediate") {
+          this.submitPendingUntil = 0;
+          this.ptyProcess.write(text + this.sendKey);
+          this.submitRetryTimer = setTimeout(() => {
+            this.submitRetryTimer = null;
+            if (!this.ptyProcess || !this.isWaitingForResponse || this.submitRetryUsed) return;
+            if (this.currentStatus !== "generating") return;
+            if ((this.responseBuffer || "").trim()) return;
+            const screenText = this.terminalScreen.getText();
+            if (!promptLikelyVisible(screenText, normalizedPromptSnippet)) return;
+            LOG.info("CLI", `[${this.cliType}] Retrying submit key for stuck prompt (attempt 1)`);
+            this.responseSettleIgnoreUntil = Date.now() + this.timeouts.outputSettle + 400;
+            this.ptyProcess.write(this.sendKey);
+            this.submitRetryUsed = true;
+          }, retryDelayMs);
+          startResponseTimeout();
+          return;
+        }
+        if (submitDelayMs > 0) {
+          this.submitPendingUntil = Date.now() + submitDelayMs;
+        }
+        this.ptyProcess.write(text);
         const submitStartedAt = Date.now();
         let lastNormalizedScreen = "";
         let lastScreenChangeAt = submitStartedAt;
@@ -1414,10 +1545,12 @@ ${data.message || ""}`.trim();
         }
       }
       clearHistory() {
-        this.messages = [];
-        this.structuredMessages = [];
+        this.committedMessages = [];
+        this.syncMessageViews();
         this.accumulatedBuffer = "";
         this.accumulatedRawBuffer = "";
+        this.terminalHistory = "";
+        this.currentTurnScope = null;
         this.submitRetryUsed = false;
         this.submitRetryPromptSnippet = "";
         this.terminalScreen.reset();
@@ -1471,9 +1604,12 @@ ${data.message || ""}`.trim();
           spawnAt: this.spawnAt,
           workingDir: this.workingDir,
           messages: this.messages.slice(-20),
+          committedMessages: this.committedMessages.slice(-20),
           structuredMessages: this.structuredMessages.slice(-20),
-          messageCount: this.messages.length,
+          messageCount: this.committedMessages.length,
           screenText: this.terminalScreen.getText().slice(-4e3),
+          terminalHistory: this.terminalHistory.slice(-8e3),
+          currentTurnScope: this.currentTurnScope,
           startupBuffer: this.startupBuffer.slice(-4e3),
           recentOutputBuffer: this.recentOutputBuffer.slice(-500),
           settledBuffer: this.settledBuffer.slice(-500),
@@ -1486,6 +1622,7 @@ ${data.message || ""}`.trim();
           lastApprovalResolvedAt: this.lastApprovalResolvedAt,
           sendDelayMs: this.sendDelayMs,
           sendKey: this.sendKey,
+          submitStrategy: this.submitStrategy,
           submitPendingUntil: this.submitPendingUntil,
           responseSettleIgnoreUntil: this.responseSettleIgnoreUntil,
           resizeSuppressUntil: this.resizeSuppressUntil,
@@ -1713,15 +1850,15 @@ async function detectIDEs() {
 var import_child_process2 = require("child_process");
 var os2 = __toESM(require("os"));
 function execAsync(cmd, timeoutMs = 5e3) {
-  return new Promise((resolve8) => {
+  return new Promise((resolve7) => {
     const child = (0, import_child_process2.exec)(cmd, { encoding: "utf-8", timeout: timeoutMs }, (err, stdout) => {
       if (err || !stdout?.trim()) {
-        resolve8(null);
+        resolve7(null);
       } else {
-        resolve8(stdout.trim());
+        resolve7(stdout.trim());
       }
     });
-    child.on("error", () => resolve8(null));
+    child.on("error", () => resolve7(null));
   });
 }
 async function detectCLIs(providerLoader) {
@@ -1876,7 +2013,7 @@ var DaemonCdpManager = class {
   * Returns multiple entries if multiple IDE windows are open on same port
   */
   static listAllTargets(port) {
-    return new Promise((resolve8) => {
+    return new Promise((resolve7) => {
       const req = http.get(`http://127.0.0.1:${port}/json`, (res) => {
         let data = "";
         res.on("data", (chunk) => data += chunk.toString());
@@ -1892,16 +2029,16 @@ var DaemonCdpManager = class {
               (t) => !isNonMain(t.title || "") && t.url?.includes("workbench.html") && !t.url?.includes("agent")
             );
             const fallbackPages = pages.filter((t) => !isNonMain(t.title || ""));
-            resolve8(mainPages.length > 0 ? mainPages : fallbackPages);
+            resolve7(mainPages.length > 0 ? mainPages : fallbackPages);
           } catch {
-            resolve8([]);
+            resolve7([]);
           }
         });
       });
-      req.on("error", () => resolve8([]));
+      req.on("error", () => resolve7([]));
       req.setTimeout(2e3, () => {
         req.destroy();
-        resolve8([]);
+        resolve7([]);
       });
     });
   }
@@ -1941,7 +2078,7 @@ var DaemonCdpManager = class {
     }
   }
   findTargetOnPort(port) {
-    return new Promise((resolve8) => {
+    return new Promise((resolve7) => {
       const req = http.get(`http://127.0.0.1:${port}/json`, (res) => {
         let data = "";
         res.on("data", (chunk) => data += chunk.toString());
@@ -1952,7 +2089,7 @@ var DaemonCdpManager = class {
               (t) => (t.type === "page" || t.type === "browser" || t.type === "Page") && t.webSocketDebuggerUrl
             );
             if (pages.length === 0) {
-              resolve8(targets.find((t) => t.webSocketDebuggerUrl) || null);
+              resolve7(targets.find((t) => t.webSocketDebuggerUrl) || null);
               return;
             }
             const mainPages = pages.filter((t) => !this.isNonMainTitle(t.title || ""));
@@ -1962,24 +2099,24 @@ var DaemonCdpManager = class {
               const specific = list.find((t) => t.id === this._targetId);
               if (specific) {
                 this._pageTitle = specific.title || "";
-                resolve8(specific);
+                resolve7(specific);
               } else {
                 this.log(`[CDP] Target ${this._targetId} not found in page list`);
-                resolve8(null);
+                resolve7(null);
               }
               return;
             }
             this._pageTitle = list[0]?.title || "";
-            resolve8(list[0]);
+            resolve7(list[0]);
           } catch {
-            resolve8(null);
+            resolve7(null);
           }
         });
       });
-      req.on("error", () => resolve8(null));
+      req.on("error", () => resolve7(null));
       req.setTimeout(2e3, () => {
         req.destroy();
-        resolve8(null);
+        resolve7(null);
       });
     });
   }
@@ -1990,7 +2127,7 @@ var DaemonCdpManager = class {
     this.extensionProviders = providers;
   }
   connectToTarget(wsUrl) {
-    return new Promise((resolve8) => {
+    return new Promise((resolve7) => {
       this.ws = new import_ws.default(wsUrl);
       this.ws.on("open", async () => {
         this._connected = true;
@@ -2000,17 +2137,17 @@ var DaemonCdpManager = class {
         }
         this.connectBrowserWs().catch(() => {
         });
-        resolve8(true);
+        resolve7(true);
       });
       this.ws.on("message", (data) => {
         try {
           const msg = JSON.parse(data.toString());
           if (msg.id && this.pending.has(msg.id)) {
-            const { resolve: resolve9, reject } = this.pending.get(msg.id);
+            const { resolve: resolve8, reject } = this.pending.get(msg.id);
             this.pending.delete(msg.id);
             this.failureCount = 0;
             if (msg.error) reject(new Error(msg.error.message));
-            else resolve9(msg.result);
+            else resolve8(msg.result);
           } else if (msg.method === "Runtime.executionContextCreated") {
             this.contexts.add(msg.params.context.id);
           } else if (msg.method === "Runtime.executionContextDestroyed") {
@@ -2033,7 +2170,7 @@ var DaemonCdpManager = class {
       this.ws.on("error", (err) => {
         this.log(`[CDP] WebSocket error: ${err.message}`);
         this._connected = false;
-        resolve8(false);
+        resolve7(false);
       });
     });
   }
@@ -2047,7 +2184,7 @@ var DaemonCdpManager = class {
         return;
       }
       this.log(`[CDP] Connecting browser WS for target discovery...`);
-      await new Promise((resolve8, reject) => {
+      await new Promise((resolve7, reject) => {
         this.browserWs = new import_ws.default(browserWsUrl);
         this.browserWs.on("open", async () => {
           this._browserConnected = true;
@@ -2057,16 +2194,16 @@ var DaemonCdpManager = class {
           } catch (e) {
             this.log(`[CDP] setDiscoverTargets failed: ${e.message}`);
           }
-          resolve8();
+          resolve7();
         });
         this.browserWs.on("message", (data) => {
           try {
             const msg = JSON.parse(data.toString());
             if (msg.id && this.browserPending.has(msg.id)) {
-              const { resolve: resolve9, reject: reject2 } = this.browserPending.get(msg.id);
+              const { resolve: resolve8, reject: reject2 } = this.browserPending.get(msg.id);
               this.browserPending.delete(msg.id);
               if (msg.error) reject2(new Error(msg.error.message));
-              else resolve9(msg.result);
+              else resolve8(msg.result);
             }
           } catch {
           }
@@ -2086,31 +2223,31 @@ var DaemonCdpManager = class {
     }
   }
   getBrowserWsUrl() {
-    return new Promise((resolve8) => {
+    return new Promise((resolve7) => {
       const req = http.get(`http://127.0.0.1:${this.port}/json/version`, (res) => {
         let data = "";
         res.on("data", (chunk) => data += chunk.toString());
         res.on("end", () => {
           try {
             const info = JSON.parse(data);
-            resolve8(info.webSocketDebuggerUrl || null);
+            resolve7(info.webSocketDebuggerUrl || null);
           } catch {
-            resolve8(null);
+            resolve7(null);
           }
         });
       });
-      req.on("error", () => resolve8(null));
+      req.on("error", () => resolve7(null));
       req.setTimeout(3e3, () => {
         req.destroy();
-        resolve8(null);
+        resolve7(null);
       });
     });
   }
   sendBrowser(method, params = {}, timeoutMs = 15e3) {
-    return new Promise((resolve8, reject) => {
+    return new Promise((resolve7, reject) => {
       if (!this.browserWs || !this._browserConnected) return reject(new Error("Browser WS not connected"));
       const id = this.browserMsgId++;
-      this.browserPending.set(id, { resolve: resolve8, reject });
+      this.browserPending.set(id, { resolve: resolve7, reject });
       this.browserWs.send(JSON.stringify({ id, method, params }));
       setTimeout(() => {
         if (this.browserPending.has(id)) {
@@ -2150,11 +2287,11 @@ var DaemonCdpManager = class {
   }
   // ─── CDP Protocol ────────────────────────────────────────
   sendInternal(method, params = {}, timeoutMs = 15e3) {
-    return new Promise((resolve8, reject) => {
+    return new Promise((resolve7, reject) => {
       if (!this.ws || !this._connected) return reject(new Error("CDP not connected"));
       if (this.ws.readyState !== import_ws.default.OPEN) return reject(new Error("WebSocket not open"));
       const id = this.msgId++;
-      this.pending.set(id, { resolve: resolve8, reject });
+      this.pending.set(id, { resolve: resolve7, reject });
       this.ws.send(JSON.stringify({ id, method, params }));
       setTimeout(() => {
         if (this.pending.has(id)) {
@@ -2403,7 +2540,7 @@ var DaemonCdpManager = class {
     const browserWs = this.browserWs;
     let msgId = this.browserMsgId;
     const sendWs = (method, params = {}, sessionId) => {
-      return new Promise((resolve8, reject) => {
+      return new Promise((resolve7, reject) => {
         const mid = msgId++;
         this.browserMsgId = msgId;
         const handler = (raw) => {
@@ -2412,7 +2549,7 @@ var DaemonCdpManager = class {
             if (msg.id === mid) {
               browserWs.removeListener("message", handler);
               if (msg.error) reject(new Error(msg.error.message || JSON.stringify(msg.error)));
-              else resolve8(msg.result);
+              else resolve7(msg.result);
             }
           } catch {
           }
@@ -2594,14 +2731,14 @@ var DaemonCdpManager = class {
     if (!ws || ws.readyState !== import_ws.default.OPEN) {
       throw new Error("CDP not connected");
     }
-    return new Promise((resolve8, reject) => {
+    return new Promise((resolve7, reject) => {
       const id = getNextId();
       pendingMap.set(id, {
         resolve: (result) => {
           if (result?.result?.subtype === "error") {
             reject(new Error(result.result.description));
           } else {
-            resolve8(result?.result?.value);
+            resolve7(result?.result?.value);
           }
         },
         reject
@@ -2633,10 +2770,10 @@ var DaemonCdpManager = class {
       throw new Error("CDP not connected");
     }
     const sendViaSession = (method, params = {}) => {
-      return new Promise((resolve8, reject) => {
+      return new Promise((resolve7, reject) => {
         const pendingMap = this._browserConnected ? this.browserPending : this.pending;
         const id = this._browserConnected ? this.browserMsgId++ : this.msgId++;
-        pendingMap.set(id, { resolve: resolve8, reject });
+        pendingMap.set(id, { resolve: resolve7, reject });
         ws.send(JSON.stringify({ id, sessionId, method, params }));
         setTimeout(() => {
           if (pendingMap.has(id)) {
@@ -3278,6 +3415,8 @@ var ChatHistoryWriter = class {
   lastSeenCounts = /* @__PURE__ */ new Map();
   /** Last seen message hash per agent (deduplication) */
   lastSeenHashes = /* @__PURE__ */ new Map();
+  /** Last seen append-only terminal transcript per agent */
+  lastSeenTerminal = /* @__PURE__ */ new Map();
   rotated = false;
   /**
   * Append new messages to history
@@ -3335,10 +3474,51 @@ var ChatHistoryWriter = class {
     } catch {
     }
   }
+  appendTerminalHistory(agentType, terminalHistory, sessionTitle, instanceId) {
+    const next = String(terminalHistory || "");
+    if (!next.trim()) return;
+    try {
+      const dedupKey = instanceId ? `${agentType}:${instanceId}:terminal` : `${agentType}:terminal`;
+      const prev = this.lastSeenTerminal.get(dedupKey) || "";
+      if (prev === next) return;
+      let delta = "";
+      if (!prev) {
+        delta = next;
+      } else if (next.startsWith(prev)) {
+        delta = next.slice(prev.length);
+      } else if (prev.includes(next)) {
+        this.lastSeenTerminal.set(dedupKey, next);
+        return;
+      } else {
+        delta = `
+
+[terminal snapshot reset ${(/* @__PURE__ */ new Date()).toISOString()} | ${sessionTitle || agentType}]
+${next}`;
+      }
+      if (!delta) {
+        this.lastSeenTerminal.set(dedupKey, next);
+        return;
+      }
+      const dir = path4.join(HISTORY_DIR, this.sanitize(agentType));
+      fs3.mkdirSync(dir, { recursive: true });
+      const date = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
+      const filePrefix = instanceId ? `${this.sanitize(instanceId)}_` : "";
+      const filePath = path4.join(dir, `${filePrefix}${date}.terminal.log`);
+      fs3.appendFileSync(filePath, delta, "utf-8");
+      this.lastSeenTerminal.set(dedupKey, next);
+      if (!this.rotated) {
+        this.rotated = true;
+        this.rotateOldFiles().catch(() => {
+        });
+      }
+    } catch {
+    }
+  }
   /** Called when agent session is explicitly changed */
   onSessionChange(agentType) {
     this.lastSeenHashes.delete(agentType);
     this.lastSeenCounts.delete(agentType);
+    this.lastSeenTerminal.delete(`${agentType}:terminal`);
   }
   /** Delete history files older than 30 days */
   async rotateOldFiles() {
@@ -3348,7 +3528,7 @@ var ChatHistoryWriter = class {
       const agentDirs = fs3.readdirSync(HISTORY_DIR, { withFileTypes: true }).filter((d) => d.isDirectory());
       for (const dir of agentDirs) {
         const dirPath = path4.join(HISTORY_DIR, dir.name);
-        const files = fs3.readdirSync(dirPath).filter((f) => f.endsWith(".jsonl"));
+        const files = fs3.readdirSync(dirPath).filter((f) => f.endsWith(".jsonl") || f.endsWith(".terminal.log"));
         for (const file of files) {
           const filePath = path4.join(dirPath, file);
           const stat = fs3.statSync(filePath);
@@ -4256,7 +4436,13 @@ async function handleReadChat(h, args) {
       _log(`${provider.category} adapter: ${adapter.cliType}`);
       const status = adapter.getStatus?.();
       if (status) {
-        return { success: true, messages: status.messages || [], status: status.status, activeModal: status.activeModal };
+        return {
+          success: true,
+          messages: status.messages || [],
+          status: status.status,
+          activeModal: status.activeModal,
+          terminalHistory: status.terminalHistory || ""
+        };
       }
     }
     return { success: false, error: `${provider.category} adapter not found` };
@@ -5988,7 +6174,7 @@ var DaemonCommandHandler = class {
     try {
       const http3 = await import("http");
       const postData = JSON.stringify(body);
-      const result = await new Promise((resolve8, reject) => {
+      const result = await new Promise((resolve7, reject) => {
         const req = http3.request({
           hostname: "127.0.0.1",
           port: 19280,
@@ -6000,9 +6186,9 @@ var DaemonCommandHandler = class {
           res.on("data", (chunk) => data += chunk);
           res.on("end", () => {
             try {
-              resolve8(JSON.parse(data));
+              resolve7(JSON.parse(data));
             } catch {
-              resolve8({ raw: data });
+              resolve7({ raw: data });
             }
           });
         });
@@ -6020,15 +6206,15 @@ var DaemonCommandHandler = class {
     if (!providerType) return { success: false, error: "providerType required" };
     try {
       const http3 = await import("http");
-      const result = await new Promise((resolve8, reject) => {
+      const result = await new Promise((resolve7, reject) => {
         http3.get(`http://127.0.0.1:19280/api/providers/${providerType}/${endpoint}`, (res) => {
           let data = "";
           res.on("data", (chunk) => data += chunk);
           res.on("end", () => {
             try {
-              resolve8(JSON.parse(data));
+              resolve7(JSON.parse(data));
             } catch {
-              resolve8({ raw: data });
+              resolve7({ raw: data });
             }
           });
         }).on("error", reject);
@@ -6042,7 +6228,7 @@ var DaemonCommandHandler = class {
     try {
       const http3 = await import("http");
       const postData = JSON.stringify(args || {});
-      const result = await new Promise((resolve8, reject) => {
+      const result = await new Promise((resolve7, reject) => {
         const req = http3.request({
           hostname: "127.0.0.1",
           port: 19280,
@@ -6054,9 +6240,9 @@ var DaemonCommandHandler = class {
           res.on("data", (chunk) => data += chunk);
           res.on("end", () => {
             try {
-              resolve8(JSON.parse(data));
+              resolve7(JSON.parse(data));
             } catch {
-              resolve8({ raw: data });
+              resolve7({ raw: data });
             }
           });
         });
@@ -6102,9 +6288,7 @@ var ProviderLoader = class _ProviderLoader {
     if (options?.builtinDir) {
       this.builtinDirs = Array.isArray(options.builtinDir) ? options.builtinDir : [options.builtinDir];
     } else {
-      const bundledDir = path6.resolve(__dirname, "../providers/_builtin");
-      const devDir = path6.resolve(__dirname, "../../providers/_builtin");
-      this.builtinDirs = [fs5.existsSync(devDir) ? devDir : bundledDir];
+      this.builtinDirs = [];
     }
     this.userDir = options?.userDir || path6.join(os7.homedir(), ".adhdev", "providers");
     this.upstreamDir = path6.join(this.userDir, ".upstream");
@@ -6626,7 +6810,7 @@ var ProviderLoader = class _ProviderLoader {
       return { updated: false };
     }
     try {
-      const etag = await new Promise((resolve8, reject) => {
+      const etag = await new Promise((resolve7, reject) => {
         const options = {
           method: "HEAD",
           hostname: "github.com",
@@ -6644,7 +6828,7 @@ var ProviderLoader = class _ProviderLoader {
               headers: { "User-Agent": "adhdev-launcher" },
               timeout: 1e4
             }, (res2) => {
-              resolve8(res2.headers.etag || res2.headers["last-modified"] || "");
+              resolve7(res2.headers.etag || res2.headers["last-modified"] || "");
             });
             req2.on("error", reject);
             req2.on("timeout", () => {
@@ -6653,7 +6837,7 @@ var ProviderLoader = class _ProviderLoader {
             });
             req2.end();
           } else {
-            resolve8(res.headers.etag || res.headers["last-modified"] || "");
+            resolve7(res.headers.etag || res.headers["last-modified"] || "");
           }
         });
         req.on("error", reject);
@@ -6717,7 +6901,7 @@ var ProviderLoader = class _ProviderLoader {
   downloadFile(url, destPath) {
     const https = require("https");
     const http3 = require("http");
-    return new Promise((resolve8, reject) => {
+    return new Promise((resolve7, reject) => {
       const doRequest = (reqUrl, redirectCount = 0) => {
         if (redirectCount > 5) {
           reject(new Error("Too many redirects"));
@@ -6737,7 +6921,7 @@ var ProviderLoader = class _ProviderLoader {
           res.pipe(ws);
           ws.on("finish", () => {
             ws.close();
-            resolve8();
+            resolve7();
           });
           ws.on("error", reject);
         });
@@ -7102,17 +7286,17 @@ async function findFreePort(ports) {
   throw new Error("No free port found");
 }
 function checkPortFree(port) {
-  return new Promise((resolve8) => {
+  return new Promise((resolve7) => {
     const server = net.createServer();
     server.unref();
-    server.on("error", () => resolve8(false));
+    server.on("error", () => resolve7(false));
     server.listen(port, "127.0.0.1", () => {
-      server.close(() => resolve8(true));
+      server.close(() => resolve7(true));
     });
   });
 }
 async function isCdpActive(port) {
-  return new Promise((resolve8) => {
+  return new Promise((resolve7) => {
     const req = require("http").get(`http://127.0.0.1:${port}/json/version`, {
       timeout: 2e3
     }, (res) => {
@@ -7121,16 +7305,16 @@ async function isCdpActive(port) {
       res.on("end", () => {
         try {
           const info = JSON.parse(data);
-          resolve8(!!info["WebKit-Version"] || !!info["Browser"]);
+          resolve7(!!info["WebKit-Version"] || !!info["Browser"]);
         } catch {
-          resolve8(false);
+          resolve7(false);
         }
       });
     });
-    req.on("error", () => resolve8(false));
+    req.on("error", () => resolve7(false));
     req.on("timeout", () => {
       req.destroy();
-      resolve8(false);
+      resolve7(false);
     });
   });
 }
@@ -8136,31 +8320,12 @@ var CliProviderInstance = class {
   async onTick() {
   }
   getState() {
-    const rawStatus = this.adapter.getStatus();
-    const parsedStatus = this.adapter.getScriptParsedStatus();
-    const adapterStatus = parsedStatus ? {
-      ...rawStatus,
-      messages: parsedStatus.messages || rawStatus.messages,
-      activeModal: parsedStatus.activeModal || rawStatus.activeModal
-    } : rawStatus;
+    const adapterStatus = this.adapter.getStatus();
     const dirName = this.workingDir.split("/").filter(Boolean).pop() || "session";
     const recentMessages = adapterStatus.messages.slice(-50).map((m) => {
       const content = typeof m.content === "string" && m.content.length > 8e3 ? m.content.slice(0, 8e3) + "\n... (truncated)" : m.content;
       return { ...m, content };
     });
-    const partial = this.adapter.getPartialResponse();
-    const shouldAppendRawPartial = !parsedStatus;
-    if (shouldAppendRawPartial && adapterStatus.status === "generating" && partial) {
-      const cleaned = partial.trim();
-      if (cleaned && cleaned !== "(generating...)") {
-        recentMessages.push({
-          role: "assistant",
-          content: (cleaned.length > 8e3 ? cleaned.slice(0, 8e3) + "..." : cleaned) + "...",
-          timestamp: Date.now(),
-          meta: { streaming: true }
-        });
-      }
-    }
     if (recentMessages.length > 0) {
       const dirName2 = this.workingDir.split("/").filter(Boolean).pop() || "session";
       this.historyWriter.appendNewMessages(
@@ -8170,6 +8335,14 @@ var CliProviderInstance = class {
         this.instanceId
       );
     }
+    if (adapterStatus.terminalHistory?.trim()) {
+      this.historyWriter.appendTerminalHistory(
+        this.type,
+        adapterStatus.terminalHistory,
+        `${this.provider.name} \xB7 ${dirName}`,
+        this.instanceId
+      );
+    }
     return {
       type: this.type,
       name: this.provider.name,
@@ -8182,6 +8355,7 @@ var CliProviderInstance = class {
         status: adapterStatus.status,
         messages: recentMessages,
         activeModal: adapterStatus.activeModal,
+        terminalHistory: adapterStatus.terminalHistory,
         inputContent: ""
       },
       workspace: this.workingDir,
@@ -8756,13 +8930,13 @@ var AcpProviderInstance = class {
         }
         this.currentStatus = "waiting_approval";
         this.detectStatusTransition();
-        const approved = await new Promise((resolve8) => {
-          this.permissionResolvers.push(resolve8);
+        const approved = await new Promise((resolve7) => {
+          this.permissionResolvers.push(resolve7);
           setTimeout(() => {
-            const idx = this.permissionResolvers.indexOf(resolve8);
+            const idx = this.permissionResolvers.indexOf(resolve7);
             if (idx >= 0) {
               this.permissionResolvers.splice(idx, 1);
-              resolve8(false);
+              resolve7(false);
             }
           }, 3e5);
         });
@@ -10342,7 +10516,8 @@ async function detectAllVersions(loader, archive) {
       binary: null,
       detectedAt: (/* @__PURE__ */ new Date()).toISOString()
     };
-    const versionCommand = provider.versionCommand;
+    const verCmdConfig = provider.versionCommand;
+    const versionCommand = typeof verCmdConfig === "object" && verCmdConfig !== null ? verCmdConfig[currentOs] : verCmdConfig;
     if (provider.category === "ide") {
       const osPaths = provider.paths?.[currentOs] || [];
       const appPath = checkPathExists2(osPaths);
@@ -10848,15 +11023,15 @@ var DevServer = class _DevServer {
         this.json(res, 500, { error: e.message });
       }
     });
-    return new Promise((resolve8, reject) => {
+    return new Promise((resolve7, reject) => {
       this.server.listen(port, "127.0.0.1", () => {
         this.log(`Dev server listening on http://127.0.0.1:${port}`);
-        resolve8();
+        resolve7();
       });
       this.server.on("error", (e) => {
         if (e.code === "EADDRINUSE") {
           this.log(`Port ${port} in use, skipping dev server`);
-          resolve8();
+          resolve7();
         } else {
           reject(e);
         }
@@ -10939,20 +11114,20 @@ var DevServer = class _DevServer {
       child.stderr?.on("data", (d) => {
         stderr += d.toString().slice(0, 2e3);
       });
-      await new Promise((resolve8) => {
+      await new Promise((resolve7) => {
         const timer = setTimeout(() => {
           child.kill();
-          resolve8();
+          resolve7();
         }, 3e3);
         child.on("exit", () => {
           clearTimeout(timer);
-          resolve8();
+          resolve7();
         });
         child.stdout?.once("data", () => {
           setTimeout(() => {
             child.kill();
             clearTimeout(timer);
-            resolve8();
+            resolve7();
           }, 500);
         });
       });
@@ -11696,14 +11871,14 @@ var DevServer = class _DevServer {
       child.stderr?.on("data", (d) => {
         stderr += d.toString();
       });
-      await new Promise((resolve8) => {
+      await new Promise((resolve7) => {
         const timer = setTimeout(() => {
           child.kill();
-          resolve8();
+          resolve7();
         }, timeout);
         child.on("exit", () => {
           clearTimeout(timer);
-          resolve8();
+          resolve7();
         });
       });
       const elapsed = Date.now() - start;
@@ -11754,11 +11929,7 @@ var DevServer = class _DevServer {
       return;
     }
     let targetDir;
-    if (location === "user") {
-      targetDir = this.providerLoader.getUserProviderDir(category, type);
-    } else {
-      targetDir = this.providerLoader.getBuiltinProviderDir(category, type);
-    }
+    targetDir = this.providerLoader.getUserProviderDir(category, type);
     const jsonPath = path12.join(targetDir, "provider.json");
     if (fs9.existsSync(jsonPath)) {
       this.json(res, 409, { error: `Provider already exists at ${targetDir}`, path: targetDir });
@@ -12556,8 +12727,7 @@ var DevServer = class _DevServer {
   }
   loadAutoImplReferenceScripts(category, referenceType) {
     if (!referenceType) return {};
-    const builtinDir = this.providerLoader.getPrimaryBuiltinDir();
-    const refDir = path12.join(builtinDir, category, referenceType);
+    const refDir = this.providerLoader.getUpstreamProviderDir(category, referenceType);
     if (!fs9.existsSync(refDir)) return {};
     const referenceScripts = {};
     const scriptsDir = path12.join(refDir, "scripts");
@@ -12796,7 +12966,7 @@ var DevServer = class _DevServer {
         }
         if (model) args.push("--model", model);
         const escapedArgs = args.map((a) => `'${a.replace(/'/g, "'\\''")}'`).join(" ");
-        const metaPrompt = `Read the file at ${promptFile} and follow ALL instructions recursively. You have full authority to implement ALL required script files, update provider.json configurations based on the reference patterns, and independently test them against 127.0.0.1:19280 via CDP CURL. Upon complete validation of ALL assigned files, print exactly "_PIPELINE_COMPLETE_SIGNAL_" to gracefully close the pipeline. DO NOT WAIT FOR APPROVAL, execute completely autonomously.`;
+        const metaPrompt = `Read the file at ${promptFile} and follow ALL instructions strictly. DO NOT spend time exploring the filesystem or other providers. You have full authority to implement ALL required script files and independently test them against 127.0.0.1:19280 via CDP CURL. Upon complete validation of ALL assigned files, print exactly "_PIPELINE_COMPLETE_SIGNAL_" to gracefully close the pipeline. DO NOT WAIT FOR APPROVAL, execute completely autonomously.`;
         shellCmd = `${command} ${escapedArgs} "${metaPrompt}"`;
       } else {
         const escapedArgs = baseArgs.map((a) => `'${a.replace(/'/g, "'\\''")}'`).join(" ");
@@ -13059,6 +13229,8 @@ var DevServer = class _DevServer {
     lines.push("5. Do NOT modify `scripts.js` router \u2014 only edit individual `*.js` files");
     lines.push("6. All scripts run in the browser (CDP evaluate) \u2014 use DOM APIs only");
     lines.push('7. **Cross-Platform Compatibility**: If you use ARIA labels that contain keyboard shortcuts (e.g., `Cascade (\u2318L)`), you MUST use substring matches (`aria-label*="Cascade"`) or handle both macOS (`\u2318`, `Cmd`) and Windows (`Ctrl`) so the script does not break on other operating systems.');
+    lines.push("8. **CRITICAL: DO NOT explore the filesystem or read other providers.** The reference implementation pattern is already provided below. Do not run `find`, `rg`, or `cat` on upstream providers. Doing so wastes context tokens and will crash the agent session. Focus entirely on modifying the target files.");
+    lines.push("9. Do NOT delete any files. Implement the logic by replacing the empty stubs.");
     lines.push("");
     lines.push("## Required Return Format");
     lines.push("| Function | Return JSON |");
@@ -13408,14 +13580,14 @@ data: ${JSON.stringify(msg.data)}
     res.end(JSON.stringify(data, null, 2));
   }
   async readBody(req) {
-    return new Promise((resolve8) => {
+    return new Promise((resolve7) => {
       let body = "";
       req.on("data", (chunk) => body += chunk);
       req.on("end", () => {
         try {
-          resolve8(JSON.parse(body));
+          resolve7(JSON.parse(body));
         } catch {
-          resolve8({});
+          resolve7({});
         }
       });
     });
@@ -13795,10 +13967,10 @@ async function installExtension(ide, extension) {
         const buffer = Buffer.from(await res.arrayBuffer());
         const fs10 = await import("fs");
         fs10.writeFileSync(vsixPath, buffer);
-        return new Promise((resolve8) => {
+        return new Promise((resolve7) => {
           const cmd = `"${ide.cliCommand}" --install-extension "${vsixPath}" --force`;
           (0, import_child_process8.exec)(cmd, { timeout: 6e4 }, (error, _stdout, stderr) => {
-            resolve8({
+            resolve7({
               extensionId: extension.id,
               marketplaceId: extension.marketplaceId,
               success: !error,
@@ -13811,11 +13983,11 @@ async function installExtension(ide, extension) {
     } catch (e) {
     }
   }
-  return new Promise((resolve8) => {
+  return new Promise((resolve7) => {
     const cmd = `"${ide.cliCommand}" --install-extension ${extension.marketplaceId} --force`;
     (0, import_child_process8.exec)(cmd, { timeout: 6e4 }, (error, stdout, stderr) => {
       if (error) {
-        resolve8({
+        resolve7({
           extensionId: extension.id,
           marketplaceId: extension.marketplaceId,
           success: false,
@@ -13823,7 +13995,7 @@ async function installExtension(ide, extension) {
           error: stderr || error.message
         });
       } else {
-        resolve8({
+        resolve7({
           extensionId: extension.id,
           marketplaceId: extension.marketplaceId,
           success: true,