adhdev 0.7.42 → 0.7.43

package/dist/cli/index.js

@@ -2539,8 +2539,6 @@ var init_chat_history = __esm({
       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
@@ -2598,51 +2596,10 @@ var init_chat_history = __esm({
         } 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 date5 = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
-          const filePrefix = instanceId ? `${this.sanitize(instanceId)}_` : "";
-          const filePath = path4.join(dir, `${filePrefix}${date5}.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() {
@@ -3488,11 +3445,6 @@ function truncateString(value, maxChars) {
   if (maxChars <= 12) return value.slice(0, Math.max(0, maxChars));
   return `${value.slice(0, maxChars - 12)}...[truncated]`;
 }
-function truncateStringTail(value, maxChars) {
-  if (value.length <= maxChars) return value;
-  if (maxChars <= 12) return value.slice(value.length - Math.max(0, maxChars));
-  return `...[truncated]${value.slice(value.length - (maxChars - 12))}`;
-}
 function trimStructuredStrings(value, maxChars) {
   if (typeof value === "string") return truncateString(value, maxChars);
   if (Array.isArray(value)) return value.map((item) => trimStructuredStrings(item, maxChars));
@@ -3566,11 +3518,10 @@ function normalizeActiveChatData(activeChat) {
         (button) => truncateString(String(button || ""), STATUS_MODAL_BUTTON_LIMIT)
       )
     } : activeChat.activeModal,
-    terminalHistory: activeChat.terminalHistory ? truncateStringTail(activeChat.terminalHistory, STATUS_TERMINAL_HISTORY_LIMIT) : activeChat.terminalHistory,
     inputContent: activeChat.inputContent ? truncateString(activeChat.inputContent, STATUS_INPUT_CONTENT_LIMIT) : activeChat.inputContent
   };
 }
-var WORKING_STATUSES, STATUS_ACTIVE_CHAT_MESSAGE_LIMIT, STATUS_ACTIVE_CHAT_TOTAL_BYTES_LIMIT, STATUS_ACTIVE_CHAT_STRING_LIMIT, STATUS_ACTIVE_CHAT_FALLBACK_STRING_LIMIT, STATUS_TERMINAL_HISTORY_LIMIT, STATUS_INPUT_CONTENT_LIMIT, STATUS_MODAL_MESSAGE_LIMIT, STATUS_MODAL_BUTTON_LIMIT;
+var WORKING_STATUSES, STATUS_ACTIVE_CHAT_MESSAGE_LIMIT, STATUS_ACTIVE_CHAT_TOTAL_BYTES_LIMIT, STATUS_ACTIVE_CHAT_STRING_LIMIT, STATUS_ACTIVE_CHAT_FALLBACK_STRING_LIMIT, STATUS_INPUT_CONTENT_LIMIT, STATUS_MODAL_MESSAGE_LIMIT, STATUS_MODAL_BUTTON_LIMIT;
 var init_normalize = __esm({
   "../../oss/packages/daemon-core/src/status/normalize.ts"() {
     "use strict";
@@ -3586,7 +3537,6 @@ var init_normalize = __esm({
     STATUS_ACTIVE_CHAT_TOTAL_BYTES_LIMIT = 96 * 1024;
     STATUS_ACTIVE_CHAT_STRING_LIMIT = 4 * 1024;
     STATUS_ACTIVE_CHAT_FALLBACK_STRING_LIMIT = 1024;
-    STATUS_TERMINAL_HISTORY_LIMIT = 8 * 1024;
     STATUS_INPUT_CONTENT_LIMIT = 2 * 1024;
     STATUS_MODAL_MESSAGE_LIMIT = 2 * 1024;
     STATUS_MODAL_BUTTON_LIMIT = 120;
@@ -9093,6 +9043,9 @@ var init_ghostty_vt_backend = __esm({
       getText() {
         return this.terminal.formatPlainText({ trim: true }) || "";
       }
+      getCursorPosition() {
+        return this.terminal.getCursorPosition();
+      }
       dispose() {
         this.terminal.dispose();
       }
@@ -18245,6 +18198,13 @@ var init_xterm_backend = __esm({
         while (last > first && !lines[last - 1]?.trim()) last--;
         return lines.slice(first, last).join("\n");
       }
+      getCursorPosition() {
+        const buffer = this.terminal.buffer.active;
+        return {
+          col: Math.max(0, buffer.cursorX || 0),
+          row: Math.max(0, buffer.cursorY || 0)
+        };
+      }
       dispose() {
         this.terminal.dispose();
       }
@@ -18331,6 +18291,9 @@ var init_terminal_screen = __esm({
       getText() {
         return this.terminal.getText();
       }
+      getCursorPosition() {
+        return this.terminal.getCursorPosition();
+      }
       dispose() {
         this.terminal.dispose();
       }
@@ -19075,6 +19038,7 @@ var init_pty_transport = __esm({
         this.handle = handle;
       }
       ready = Promise.resolve();
+      terminalQueriesHandled = false;
       get pid() {
         return this.handle.pid;
       }
@@ -19128,6 +19092,32 @@ function stripTerminalNoise(str) {
 function sanitizeTerminalText(str) {
   return stripTerminalNoise(stripAnsi(str));
 }
+function buildCliSpawnEnv(baseEnv, overrides) {
+  const env = {};
+  const source = { ...baseEnv, ...overrides || {} };
+  for (const [key, value] of Object.entries(source)) {
+    if (typeof value !== "string") continue;
+    env[key] = value;
+  }
+  for (const key of Object.keys(env)) {
+    if (key === "INIT_CWD" || key === "NO_COLOR" || key === "FORCE_COLOR" || key === "npm_command" || key === "npm_execpath" || key === "npm_node_execpath" || key.startsWith("npm_") || key.startsWith("npm_config_") || key.startsWith("npm_package_") || key.startsWith("npm_lifecycle_") || key.startsWith("PNPM_") || key.startsWith("YARN_") || key.startsWith("BUN_")) {
+      delete env[key];
+    }
+  }
+  return env;
+}
+function computeTerminalQueryTail(buffer) {
+  const prefixes = ["\x1B[6n", "\x1B[?6n"];
+  const maxLength = prefixes.reduce((n, value) => Math.max(n, value.length), 0) - 1;
+  const start = Math.max(0, buffer.length - maxLength);
+  for (let i = start; i < buffer.length; i++) {
+    const suffix = buffer.slice(i);
+    if (prefixes.some((pattern) => suffix.length < pattern.length && pattern.startsWith(suffix))) {
+      return suffix;
+    }
+  }
+  return "";
+}
 function findBinary(name) {
   const isWin = os13.platform() === "win32";
   try {
@@ -19214,36 +19204,6 @@ function promptLikelyVisible(screenText, promptSnippet) {
   ).length;
   return matched >= required2;
 }
-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") {
@@ -19358,6 +19318,7 @@ var init_provider_cli_adapter = __esm({
       pendingOutputParseTimer = null;
       ptyOutputBuffer = "";
       ptyOutputFlushTimer = null;
+      pendingTerminalQueryTail = "";
       // Server log forwarding
       serverConn = null;
       logBuffer = [];
@@ -19389,9 +19350,7 @@ var init_provider_cli_adapter = __esm({
       /** Full accumulated raw PTY output (with ANSI) */
       accumulatedRawBuffer = "";
       /** Current visible terminal screen snapshot */
-      terminalScreen = new TerminalScreen(40, 120);
-      /** Rolling append-only terminal transcript built from screen snapshots */
-      terminalHistory = "";
+      terminalScreen = new TerminalScreen(30, 100);
       /** Max accumulated buffer size (last 50KB) */
       static MAX_ACCUMULATED_BUFFER = 5e4;
       currentTurnScope = null;
@@ -19413,15 +19372,13 @@ var init_provider_cli_adapter = __esm({
         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 buffer = scope ? 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
         };
@@ -19499,13 +19456,10 @@ var init_provider_cli_adapter = __esm({
           shellArgs = allArgs;
         }
         const ptyOpts = {
-          cols: 120,
-          rows: 40,
+          cols: 100,
+          rows: 30,
           cwd: this.workingDir,
-          env: {
-            ...process.env,
-            ...spawnConfig.env
-          }
+          env: buildCliSpawnEnv(process.env, spawnConfig.env)
         };
         try {
           this.ptyProcess = this.transportFactory.spawn(shellCmd, shellArgs, ptyOpts);
@@ -19523,8 +19477,8 @@ var init_provider_cli_adapter = __esm({
         }
         this.ptyProcess.onData((data) => {
           if (Date.now() < this.resizeSuppressUntil) return;
-          if (data.includes("\x1B[6n") || data.includes("\x1B[?6n")) {
-            this.ptyProcess?.write("\x1B[1;1R");
+          if (!this.ptyProcess?.terminalQueriesHandled) {
+            this.respondToTerminalQueries(data);
           }
           this.pendingOutputParseBuffer += data;
           if (!this.pendingOutputParseTimer) {
@@ -19559,8 +19513,8 @@ var init_provider_cli_adapter = __esm({
         this.spawnAt = Date.now();
         this.startupParseGate = true;
         this.startupBuffer = "";
-        this.terminalScreen.reset(40, 120);
-        this.terminalHistory = "";
+        this.terminalScreen.reset(30, 100);
+        this.pendingTerminalQueryTail = "";
         this.currentTurnScope = null;
         this.ready = false;
         await this.ptyProcess.ready;
@@ -19570,7 +19524,6 @@ var init_provider_cli_adapter = __esm({
       // ─── Output Handling ────────────────────────────
       handleOutput(rawData) {
         this.terminalScreen.write(rawData);
-        this.terminalHistory = mergeTerminalHistory(this.terminalHistory, this.terminalScreen.getText());
         const cleanData = sanitizeTerminalText(rawData);
         if (this.isWaitingForResponse && cleanData) {
           this.responseBuffer = (this.responseBuffer + cleanData).slice(-8e3);
@@ -19846,8 +19799,7 @@ var init_provider_cli_adapter = __esm({
           status: this.currentStatus,
           messages: [...this.committedMessages],
           workingDir: this.workingDir,
-          activeModal: this.activeModal,
-          terminalHistory: this.terminalHistory
+          activeModal: this.activeModal
         };
       }
       /**
@@ -19865,7 +19817,6 @@ var init_provider_cli_adapter = __esm({
             id: parsed.id || "cli_session",
             status: parsed.status || this.currentStatus,
             title: parsed.title || this.cliName,
-            terminalHistory: this.terminalHistory,
             messages: parsed.messages,
             activeModal: parsed.activeModal ?? this.activeModal
           };
@@ -19875,7 +19826,6 @@ var init_provider_cli_adapter = __esm({
           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,
@@ -19943,10 +19893,9 @@ ${data.message || ""}`.trim();
           prompt: text,
           startedAt: Date.now(),
           bufferStart: this.accumulatedBuffer.length,
-          rawBufferStart: this.accumulatedRawBuffer.length,
-          terminalHistoryStart: this.terminalHistory.length
+          rawBufferStart: this.accumulatedRawBuffer.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)}`);
+        LOG.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);
         const normalizedPromptSnippet = normalizePromptText(this.submitRetryPromptSnippet);
@@ -20131,6 +20080,7 @@ ${data.message || ""}`.trim();
           this.pendingOutputParseTimer = null;
         }
         this.pendingOutputParseBuffer = "";
+        this.pendingTerminalQueryTail = "";
         if (this.ptyOutputFlushTimer) {
           clearTimeout(this.ptyOutputFlushTimer);
           this.ptyOutputFlushTimer = null;
@@ -20170,6 +20120,7 @@ ${data.message || ""}`.trim();
           this.pendingOutputParseTimer = null;
         }
         this.pendingOutputParseBuffer = "";
+        this.pendingTerminalQueryTail = "";
         if (this.ptyOutputFlushTimer) {
           clearTimeout(this.ptyOutputFlushTimer);
           this.ptyOutputFlushTimer = null;
@@ -20196,7 +20147,6 @@ ${data.message || ""}`.trim();
         this.syncMessageViews();
         this.accumulatedBuffer = "";
         this.accumulatedRawBuffer = "";
-        this.terminalHistory = "";
         this.currentTurnScope = null;
         this.submitRetryUsed = false;
         this.submitRetryPromptSnippet = "";
@@ -20205,6 +20155,7 @@ ${data.message || ""}`.trim();
           this.pendingOutputParseTimer = null;
         }
         this.pendingOutputParseBuffer = "";
+        this.pendingTerminalQueryTail = "";
         if (this.ptyOutputFlushTimer) {
           clearTimeout(this.ptyOutputFlushTimer);
           this.ptyOutputFlushTimer = null;
@@ -20266,7 +20217,6 @@ ${data.message || ""}`.trim();
           structuredMessages: this.structuredMessages.slice(-20),
           messageCount: this.committedMessages.length,
           screenText: sanitizeTerminalText(this.terminalScreen.getText()).slice(-4e3),
-          terminalHistory: this.terminalHistory.slice(-8e3),
           currentTurnScope: this.currentTurnScope,
           startupBuffer: this.startupBuffer.slice(-4e3),
           recentOutputBuffer: this.recentOutputBuffer.slice(-500),
@@ -20294,6 +20244,20 @@ ${data.message || ""}`.trim();
           ptyAlive: !!this.ptyProcess
         };
       }
+      respondToTerminalQueries(data) {
+        if (!this.ptyProcess || !data) return;
+        const combined = this.pendingTerminalQueryTail + data;
+        const regex = /\x1b\[(\?)?6n/g;
+        let match;
+        while ((match = regex.exec(combined)) !== null) {
+          const cursor = this.terminalScreen.getCursorPosition();
+          const row = Math.max(1, (cursor.row | 0) + 1);
+          const col = Math.max(1, (cursor.col | 0) + 1);
+          const response = match[1] ? `\x1B[?${row};${col}R` : `\x1B[${row};${col}R`;
+          this.ptyProcess.write(response);
+        }
+        this.pendingTerminalQueryTail = computeTerminalQueryTail(combined);
+      }
     };
   }
 });
@@ -20315,7 +20279,7 @@ var init_cli_provider_instance = __esm({
         this.cliArgs = cliArgs;
         this.type = provider.type;
         this.instanceId = instanceId || crypto3.randomUUID();
-        this.presentationMode = "terminal";
+        this.presentationMode = "chat";
         this.adapter = new ProviderCliAdapter(provider, workingDir, cliArgs, transportFactory);
         this.monitor = new StatusMonitor();
         this.historyWriter = new ChatHistoryWriter();
@@ -20362,14 +20326,6 @@ var init_cli_provider_instance = __esm({
         const parsedStatus = this.adapter.getScriptParsedStatus?.() || null;
         const runtime = this.adapter.getRuntimeMetadata();
         const dirName = this.workingDir.split("/").filter(Boolean).pop() || "session";
-        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,
@@ -20382,7 +20338,6 @@ var init_cli_provider_instance = __esm({
             status: parsedStatus?.status || adapterStatus.status,
             messages: Array.isArray(parsedStatus?.messages) ? parsedStatus.messages : [],
             activeModal: parsedStatus?.activeModal ?? adapterStatus.activeModal,
-            terminalHistory: adapterStatus.terminalHistory,
             inputContent: ""
           },
           workspace: this.workingDir,
@@ -43523,6 +43478,7 @@ var init_session_host_transport = __esm({
         this.ready = this.boot();
       }
       ready;
+      terminalQueriesHandled = true;
       client;
       dataCallbacks = /* @__PURE__ */ new Set();
       exitCallbacks = /* @__PURE__ */ new Set();
@@ -45932,7 +45888,7 @@ var init_adhdev_daemon = __esm({
     fs15 = __toESM(require("fs"));
     path17 = __toESM(require("path"));
     import_chalk2 = __toESM(require("chalk"));
-    pkgVersion = "0.7.42";
+    pkgVersion = "0.7.43";
     if (pkgVersion === "unknown") {
       try {
         const possiblePaths = [