@adhdev/daemon-core 0.7.41 → 0.7.43

package/dist/index.mjs

@@ -28,7 +28,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/config/config.ts
 var config_exports = {};
 __export(config_exports, {
-  generateConnectionToken: () => generateConnectionToken,
   generateMachineId: () => generateMachineId,
   getConfigDir: () => getConfigDir,
   isSetupComplete: () => isSetupComplete,
@@ -43,6 +42,57 @@ import { homedir } from "os";
 import { join } from "path";
 import { existsSync, mkdirSync, readFileSync, writeFileSync, chmodSync } from "fs";
 import { randomUUID } from "crypto";
+function isPlainObject(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function asStringArray(value) {
+  if (!Array.isArray(value)) return [];
+  return value.filter((item) => typeof item === "string");
+}
+function asNullableString(value) {
+  return typeof value === "string" ? value : null;
+}
+function asOptionalString(value) {
+  return typeof value === "string" && value.trim() ? value : void 0;
+}
+function asBoolean(value, fallback) {
+  return typeof value === "boolean" ? value : fallback;
+}
+function normalizeConfig(raw) {
+  const parsed = isPlainObject(raw) ? raw : {};
+  const legacySessionReads = isPlainObject(parsed.recentSessionReads) ? parsed.recentSessionReads : {};
+  const sessionReads = isPlainObject(parsed.sessionReads) ? parsed.sessionReads : {};
+  const mergedSessionReads = Object.fromEntries(
+    Object.entries({ ...legacySessionReads, ...sessionReads }).filter(([, value]) => typeof value === "number" && Number.isFinite(value))
+  );
+  const sessionReadMarkers = Object.fromEntries(
+    Object.entries(isPlainObject(parsed.sessionReadMarkers) ? parsed.sessionReadMarkers : {}).filter(([, value]) => typeof value === "string")
+  );
+  return {
+    serverUrl: typeof parsed.serverUrl === "string" && parsed.serverUrl.trim() ? parsed.serverUrl : DEFAULT_CONFIG.serverUrl,
+    selectedIde: asNullableString(parsed.selectedIde),
+    configuredIdes: asStringArray(parsed.configuredIdes),
+    installedExtensions: asStringArray(parsed.installedExtensions),
+    userEmail: asNullableString(parsed.userEmail),
+    userName: asNullableString(parsed.userName),
+    setupCompleted: asBoolean(parsed.setupCompleted, DEFAULT_CONFIG.setupCompleted),
+    setupDate: asNullableString(parsed.setupDate),
+    enabledIdes: asStringArray(parsed.enabledIdes),
+    workspaces: Array.isArray(parsed.workspaces) ? parsed.workspaces : [],
+    defaultWorkspaceId: asNullableString(parsed.defaultWorkspaceId) ?? asNullableString(parsed.activeWorkspaceId),
+    recentActivity: Array.isArray(parsed.recentActivity) ? parsed.recentActivity : [],
+    sessionReads: mergedSessionReads,
+    sessionReadMarkers,
+    machineNickname: asNullableString(parsed.machineNickname),
+    machineId: asOptionalString(parsed.machineId),
+    machineSecret: parsed.machineSecret === null ? null : asOptionalString(parsed.machineSecret),
+    registeredMachineId: asOptionalString(parsed.registeredMachineId),
+    providerSettings: isPlainObject(parsed.providerSettings) ? parsed.providerSettings : {},
+    ideSettings: isPlainObject(parsed.ideSettings) ? parsed.ideSettings : {},
+    disableUpstream: asBoolean(parsed.disableUpstream, DEFAULT_CONFIG.disableUpstream ?? false),
+    providerDir: asOptionalString(parsed.providerDir)
+  };
+}
 function generateMachineId() {
   return `${MACHINE_ID_PREFIX}${randomUUID().replace(/-/g, "")}`;
 }
@@ -86,14 +136,10 @@ function loadConfig() {
   try {
     const raw = readFileSync(configPath, "utf-8");
     const parsed = JSON.parse(raw);
-    const merged = { ...DEFAULT_CONFIG, ...parsed };
-    if (merged.defaultWorkspaceId == null && merged.activeWorkspaceId != null) {
-      merged.defaultWorkspaceId = merged.activeWorkspaceId;
-    }
-    delete merged.activeWorkspaceId;
-    const ensured = ensureMachineId(merged);
+    const normalizedInput = normalizeConfig(parsed);
+    const ensured = ensureMachineId(normalizedInput);
     const normalized = ensured.config;
-    if (ensured.changed) {
+    if (ensured.changed || JSON.stringify(parsed) !== JSON.stringify(normalized)) {
       try {
         saveConfig(normalized);
       } catch {
@@ -108,10 +154,11 @@ function loadConfig() {
 function saveConfig(config) {
   const configPath = getConfigPath();
   const dir = getConfigDir();
+  const normalized = normalizeConfig(config);
   if (!existsSync(dir)) {
     mkdirSync(dir, { recursive: true, mode: 448 });
   }
-  writeFileSync(configPath, JSON.stringify(config, null, 2), { encoding: "utf-8", mode: 384 });
+  writeFileSync(configPath, JSON.stringify(normalized, null, 2), { encoding: "utf-8", mode: 384 });
   try {
     chmodSync(configPath, 384);
   } catch {
@@ -140,32 +187,19 @@ function isSetupComplete() {
 function resetConfig() {
   saveConfig({ ...DEFAULT_CONFIG });
 }
-function generateConnectionToken() {
-  const chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-  let token = "db_";
-  for (let i = 0; i < 32; i++) {
-    token += chars.charAt(Math.floor(Math.random() * chars.length));
-  }
-  return token;
-}
 var DEFAULT_CONFIG, MACHINE_ID_PREFIX;
 var init_config = __esm({
   "src/config/config.ts"() {
     "use strict";
     DEFAULT_CONFIG = {
       serverUrl: "https://api.adhf.dev",
-      apiToken: null,
-      connectionToken: null,
       selectedIde: null,
       configuredIdes: [],
       installedExtensions: [],
-      autoConnect: true,
-      notifications: true,
       userEmail: null,
       userName: null,
       setupCompleted: false,
       setupDate: null,
-      configuredCLIs: [],
       enabledIdes: [],
       workspaces: [],
       defaultWorkspaceId: null,
@@ -481,6 +515,9 @@ var init_ghostty_vt_backend = __esm({
       getText() {
         return this.terminal.formatPlainText({ trim: true }) || "";
       }
+      getCursorPosition() {
+        return this.terminal.getCursorPosition();
+      }
       dispose() {
         this.terminal.dispose();
       }
@@ -538,6 +575,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();
       }
@@ -624,6 +668,9 @@ var init_terminal_screen = __esm({
       getText() {
         return this.terminal.getText();
       }
+      getCursorPosition() {
+        return this.terminal.getCursorPosition();
+      }
       dispose() {
         this.terminal.dispose();
       }
@@ -654,6 +701,7 @@ var init_pty_transport = __esm({
         this.handle = handle;
       }
       ready = Promise.resolve();
+      terminalQueriesHandled = false;
       get pid() {
         return this.handle.pid;
       }
@@ -710,6 +758,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 = os12.platform() === "win32";
   try {
@@ -796,36 +870,6 @@ 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") {
@@ -937,6 +981,7 @@ var init_provider_cli_adapter = __esm({
       pendingOutputParseTimer = null;
       ptyOutputBuffer = "";
       ptyOutputFlushTimer = null;
+      pendingTerminalQueryTail = "";
       // Server log forwarding
       serverConn = null;
       logBuffer = [];
@@ -968,9 +1013,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;
@@ -978,6 +1021,13 @@ var init_provider_cli_adapter = __esm({
         this.messages = [...this.committedMessages];
         this.structuredMessages = [...this.committedMessages];
       }
+      normalizeParsedMessages(parsedMessages) {
+        return parsedMessages.filter((message) => message && (message.role === "user" || message.role === "assistant")).map((message) => ({
+          role: message.role,
+          content: typeof message.content === "string" ? message.content : String(message.content || ""),
+          timestamp: typeof message.timestamp === "number" && Number.isFinite(message.timestamp) ? message.timestamp : Date.now()
+        }));
+      }
       sliceFromOffset(text, start) {
         if (!text) return "";
         if (!Number.isFinite(start) || start <= 0) return text;
@@ -985,15 +1035,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
         };
@@ -1071,13 +1119,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);
@@ -1095,8 +1140,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) {
@@ -1131,8 +1176,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;
@@ -1142,7 +1187,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);
@@ -1374,6 +1418,15 @@ var init_provider_cli_adapter = __esm({
         this.onStatusChange?.();
       }
       commitCurrentTranscript() {
+        const parsed = this.parseCurrentTranscript(
+          this.committedMessages,
+          this.responseBuffer,
+          this.currentTurnScope
+        );
+        if (parsed && Array.isArray(parsed.messages)) {
+          this.committedMessages = this.normalizeParsedMessages(parsed.messages);
+          this.syncMessageViews();
+        }
       }
       // ─── Script Execution ──────────────────────────
       runDetectStatus(text) {
@@ -1409,8 +1462,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
         };
       }
       /**
@@ -1418,12 +1470,25 @@ var init_provider_cli_adapter = __esm({
        * Called by command handler / dashboard for rich content rendering.
        */
       getScriptParsedStatus() {
+        const parsed = this.parseCurrentTranscript(
+          this.committedMessages,
+          this.responseBuffer,
+          this.currentTurnScope
+        );
+        if (parsed && Array.isArray(parsed.messages)) {
+          return {
+            id: parsed.id || "cli_session",
+            status: parsed.status || this.currentStatus,
+            title: parsed.title || this.cliName,
+            messages: parsed.messages,
+            activeModal: parsed.activeModal ?? this.activeModal
+          };
+        }
         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,
@@ -1491,10 +1556,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);
@@ -1679,6 +1743,7 @@ ${data.message || ""}`.trim();
           this.pendingOutputParseTimer = null;
         }
         this.pendingOutputParseBuffer = "";
+        this.pendingTerminalQueryTail = "";
         if (this.ptyOutputFlushTimer) {
           clearTimeout(this.ptyOutputFlushTimer);
           this.ptyOutputFlushTimer = null;
@@ -1718,6 +1783,7 @@ ${data.message || ""}`.trim();
           this.pendingOutputParseTimer = null;
         }
         this.pendingOutputParseBuffer = "";
+        this.pendingTerminalQueryTail = "";
         if (this.ptyOutputFlushTimer) {
           clearTimeout(this.ptyOutputFlushTimer);
           this.ptyOutputFlushTimer = null;
@@ -1744,7 +1810,6 @@ ${data.message || ""}`.trim();
         this.syncMessageViews();
         this.accumulatedBuffer = "";
         this.accumulatedRawBuffer = "";
-        this.terminalHistory = "";
         this.currentTurnScope = null;
         this.submitRetryUsed = false;
         this.submitRetryPromptSnippet = "";
@@ -1753,6 +1818,7 @@ ${data.message || ""}`.trim();
           this.pendingOutputParseTimer = null;
         }
         this.pendingOutputParseBuffer = "";
+        this.pendingTerminalQueryTail = "";
         if (this.ptyOutputFlushTimer) {
           clearTimeout(this.ptyOutputFlushTimer);
           this.ptyOutputFlushTimer = null;
@@ -1814,7 +1880,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),
@@ -1842,6 +1907,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);
+      }
     };
   }
 });
@@ -3744,6 +3823,8 @@ var ExtensionProviderInstance = class {
         this.detectTransition(newStatus, data);
         this.currentStatus = newStatus;
       }
+    } else if (event === "stream_reset") {
+      this.resetStreamState();
     } else if (event === "extension_connected") {
       this.ideType = data?.ideType || "";
     }
@@ -3823,6 +3904,30 @@ var ExtensionProviderInstance = class {
     const title = typeof data?.title === "string" && data.title.trim() ? data.title.trim() : this.chatTitle;
     return title || this.agentName || this.provider.name;
   }
+  resetStreamState() {
+    if (this.currentStatus !== "idle") {
+      this.detectTransition("idle", {
+        title: this.chatTitle,
+        agentName: this.agentName,
+        extensionId: this.extensionId,
+        messages: this.messages
+      });
+    }
+    this.agentStreams = [];
+    this.messages = [];
+    this.activeModal = null;
+    this.currentModel = "";
+    this.currentMode = "";
+    this.controlValues = {};
+    this.currentStatus = "idle";
+    this.chatId = null;
+    this.chatTitle = null;
+    this.agentName = "";
+    this.extensionId = "";
+    this.lastAgentStatus = "idle";
+    this.generatingStartedAt = 0;
+    this.monitor.reset();
+  }
 };
 
 // src/config/chat-history.ts
@@ -3836,8 +3941,6 @@ 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
@@ -3895,51 +3998,10 @@ 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() {
@@ -4105,11 +4167,23 @@ var IdeProviderInstance = class {
     } else if (event === "cdp_disconnected") {
       this.cachedChat = null;
       this.currentStatus = "idle";
+      for (const ext of this.extensions.values()) {
+        ext.onEvent("stream_reset");
+      }
     } else if (event === "stream_update") {
       const extType = data?.extensionType;
       if (extType && this.extensions.has(extType)) {
         this.extensions.get(extType).onEvent("stream_update", data);
       }
+    } else if (event === "stream_reset") {
+      const extType = data?.extensionType;
+      if (extType && this.extensions.has(extType)) {
+        this.extensions.get(extType).onEvent("stream_reset");
+      }
+    } else if (event === "stream_reset_all") {
+      for (const ext of this.extensions.values()) {
+        ext.onEvent("stream_reset");
+      }
     }
   }
   dispose() {
@@ -4776,6 +4850,57 @@ var WORKING_STATUSES = /* @__PURE__ */ new Set([
   "thinking",
   "active"
 ]);
+var STATUS_ACTIVE_CHAT_MESSAGE_LIMIT = 60;
+var STATUS_ACTIVE_CHAT_TOTAL_BYTES_LIMIT = 96 * 1024;
+var STATUS_ACTIVE_CHAT_STRING_LIMIT = 4 * 1024;
+var STATUS_ACTIVE_CHAT_FALLBACK_STRING_LIMIT = 1024;
+var STATUS_INPUT_CONTENT_LIMIT = 2 * 1024;
+var STATUS_MODAL_MESSAGE_LIMIT = 2 * 1024;
+var STATUS_MODAL_BUTTON_LIMIT = 120;
+function truncateString(value, maxChars) {
+  if (value.length <= maxChars) return value;
+  if (maxChars <= 12) return value.slice(0, Math.max(0, maxChars));
+  return `${value.slice(0, maxChars - 12)}...[truncated]`;
+}
+function trimStructuredStrings(value, maxChars) {
+  if (typeof value === "string") return truncateString(value, maxChars);
+  if (Array.isArray(value)) return value.map((item) => trimStructuredStrings(item, maxChars));
+  if (!value || typeof value !== "object") return value;
+  return Object.fromEntries(
+    Object.entries(value).map(([key, nested]) => [key, trimStructuredStrings(nested, maxChars)])
+  );
+}
+function estimateBytes(value) {
+  try {
+    return JSON.stringify(value).length;
+  } catch {
+    return String(value ?? "").length;
+  }
+}
+function trimMessageForStatus(message, stringLimit) {
+  if (!message || typeof message !== "object") return message;
+  return trimStructuredStrings(message, stringLimit);
+}
+function trimMessagesForStatus(messages) {
+  if (!Array.isArray(messages) || messages.length === 0) return [];
+  const recent = messages.slice(-STATUS_ACTIVE_CHAT_MESSAGE_LIMIT);
+  const kept = [];
+  let totalBytes = 0;
+  for (let i = recent.length - 1; i >= 0; i -= 1) {
+    let normalized = trimMessageForStatus(recent[i], STATUS_ACTIVE_CHAT_STRING_LIMIT);
+    let size = estimateBytes(normalized);
+    if (size > STATUS_ACTIVE_CHAT_TOTAL_BYTES_LIMIT) {
+      normalized = trimMessageForStatus(recent[i], STATUS_ACTIVE_CHAT_FALLBACK_STRING_LIMIT);
+      size = estimateBytes(normalized);
+    }
+    if (kept.length > 0 && totalBytes + size > STATUS_ACTIVE_CHAT_TOTAL_BYTES_LIMIT) {
+      continue;
+    }
+    kept.push(normalized);
+    totalBytes += size;
+  }
+  return kept.reverse();
+}
 function hasApprovalButtons(activeModal) {
   return (activeModal?.buttons?.length ?? 0) > 0;
 }
@@ -4802,7 +4927,15 @@ function normalizeActiveChatData(activeChat) {
   if (!activeChat) return activeChat;
   return {
     ...activeChat,
-    status: normalizeManagedStatus(activeChat.status, { activeModal: activeChat.activeModal })
+    status: normalizeManagedStatus(activeChat.status, { activeModal: activeChat.activeModal }),
+    messages: trimMessagesForStatus(activeChat.messages),
+    activeModal: activeChat.activeModal ? {
+      message: truncateString(activeChat.activeModal.message || "", STATUS_MODAL_MESSAGE_LIMIT),
+      buttons: (activeChat.activeModal.buttons || []).map(
+        (button) => truncateString(String(button || ""), STATUS_MODAL_BUTTON_LIMIT)
+      )
+    } : activeChat.activeModal,
+    inputContent: activeChat.inputContent ? truncateString(activeChat.inputContent, STATUS_INPUT_CONTENT_LIMIT) : activeChat.inputContent
   };
 }
 
@@ -4900,6 +5033,11 @@ var PTY_SESSION_CAPABILITIES = [
   "terminal_io",
   "resize_terminal"
 ];
+var CLI_CHAT_SESSION_CAPABILITIES = [
+  "read_chat",
+  "send_message",
+  "resolve_action"
+];
 var ACP_SESSION_CAPABILITIES = [
   "read_chat",
   "send_message",
@@ -4989,11 +5127,10 @@ function buildCliSession(state) {
     runtimeWorkspaceLabel: state.runtime?.workspaceLabel,
     runtimeWriteOwner: state.runtime?.writeOwner || null,
     runtimeAttachedClients: state.runtime?.attachedClients || [],
-    launchMode: state.launchMode,
     mode: state.mode,
     resume: state.resume,
     activeChat,
-    capabilities: PTY_SESSION_CAPABILITIES,
+    capabilities: state.mode === "terminal" ? PTY_SESSION_CAPABILITIES : CLI_CHAT_SESSION_CAPABILITIES,
     controlValues: state.controlValues,
     providerControls: buildFallbackControls(
       state.providerControls
@@ -6167,6 +6304,13 @@ async function handleFileListBrowse(h, args) {
 
 // src/commands/stream-commands.ts
 init_logger();
+function getCliPresentationMode(h, targetSessionId) {
+  if (!targetSessionId) return null;
+  const instance = h.ctx.instanceManager?.getInstance(targetSessionId);
+  if (instance?.category !== "cli") return null;
+  const mode = instance.getPresentationMode?.();
+  return mode === "chat" || mode === "terminal" ? mode : null;
+}
 async function handleFocusSession(h, args) {
   if (!h.agentStream || !h.getCdp()) return { success: false, error: "AgentStream or CDP not available" };
   const sessionId = args?.targetSessionId || h.currentSession?.sessionId;
@@ -6177,6 +6321,9 @@ async function handleFocusSession(h, args) {
 function handlePtyInput(h, args) {
   const { cliType, data, targetSessionId } = args || {};
   if (!data) return { success: false, error: "data required" };
+  if (getCliPresentationMode(h, targetSessionId) === "chat") {
+    return { success: false, error: "CLI session is in chat mode", code: "CLI_VIEW_MODE_NOT_TERMINAL" };
+  }
   const adapter = h.getCliAdapter(targetSessionId || cliType);
   if (!adapter || typeof adapter.writeRaw !== "function") {
     return { success: false, error: `CLI adapter not found: ${targetSessionId || cliType || "unknown"}` };
@@ -6187,6 +6334,9 @@ function handlePtyInput(h, args) {
 function handlePtyResize(h, args) {
   const { cliType, cols, rows, force, targetSessionId } = args || {};
   if (!cols || !rows) return { success: false, error: "cols and rows required" };
+  if (getCliPresentationMode(h, targetSessionId) === "chat") {
+    return { success: false, error: "CLI session is in chat mode", code: "CLI_VIEW_MODE_NOT_TERMINAL" };
+  }
   const adapter = h.getCliAdapter(targetSessionId || cliType);
   if (!adapter || typeof adapter.resize !== "function") {
     return { success: false, error: `CLI adapter not found: ${targetSessionId || cliType || "unknown"}` };
@@ -8594,6 +8744,7 @@ var DaemonCommandRouter = class {
       // ─── CLI / ACP commands ───
       case "launch_cli":
       case "stop_cli":
+      case "set_cli_view_mode":
       case "agent_command": {
         return this.deps.cliManager.handleCliCommand(cmd, args);
       }
@@ -8938,6 +9089,20 @@ var DaemonStatusReporter = class {
   ts() {
     return (/* @__PURE__ */ new Date()).toISOString().slice(11, 23);
   }
+  summarizeLargePayloadSessions(payload) {
+    const sessions = Array.isArray(payload.sessions) ? payload.sessions : [];
+    return sessions.map((session) => ({
+      id: String(session?.id || ""),
+      providerType: String(session?.providerType || ""),
+      bytes: (() => {
+        try {
+          return JSON.stringify(session).length;
+        } catch {
+          return 0;
+        }
+      })()
+    })).sort((a, b) => b.bytes - a.bytes).slice(0, 3).map((session) => `${session.providerType || "unknown"}:${session.id}=${session.bytes}b`).join(", ");
+  }
   async sendUnifiedStatusReport(opts) {
     const { serverConn, p2p } = this.deps;
     if (!serverConn?.isConnected()) return;
@@ -8990,9 +9155,16 @@ var DaemonStatusReporter = class {
       screenshotUsage: this.deps.getScreenshotUsage?.() || null,
       connectedExtensions: []
     };
+    const payloadBytes = JSON.stringify(payload).length;
     const p2pSent = this.sendP2PPayload(payload);
     if (p2pSent) {
-      LOG.debug("P2P", `sent (${JSON.stringify(payload).length} bytes)`);
+      LOG.debug("P2P", `sent (${payloadBytes} bytes)`);
+      if (payloadBytes > 256 * 1024) {
+        LOG.warn(
+          "P2P",
+          `large status payload (${payloadBytes} bytes) top sessions: ${this.summarizeLargePayloadSessions(payload) || "n/a"}`
+        );
+      }
     }
     if (opts?.p2pOnly) return;
     const wsPayload = {
@@ -9022,7 +9194,9 @@ var DaemonStatusReporter = class {
         acpModes: session.acpModes
       })),
       p2p: payload.p2p,
-      timestamp: now
+      timestamp: now,
+      detectedIdes: payload.detectedIdes,
+      availableProviders: payload.availableProviders
     };
     serverConn.sendMessage("status_report", wsPayload);
     LOG.debug("Server", `sent status_report (${JSON.stringify(wsPayload).length} bytes)`);
@@ -9068,14 +9242,13 @@ init_provider_cli_adapter();
 import * as crypto3 from "crypto";
 init_logger();
 var CliProviderInstance = class {
-  constructor(provider, workingDir, cliArgs = [], instanceId, transportFactory, launchModeId) {
+  constructor(provider, workingDir, cliArgs = [], instanceId, transportFactory) {
     this.provider = provider;
     this.workingDir = workingDir;
     this.cliArgs = cliArgs;
     this.type = provider.type;
     this.instanceId = instanceId || crypto3.randomUUID();
-    this.launchMode = launchModeId && provider.launchModes?.find((m) => m.id === launchModeId) || null;
-    this.resolvedOutputFormat = this.resolveOutputFormat();
+    this.presentationMode = "chat";
     this.adapter = new ProviderCliAdapter(provider, workingDir, cliArgs, transportFactory);
     this.monitor = new StatusMonitor();
     this.historyWriter = new ChatHistoryWriter();
@@ -9094,26 +9267,7 @@ var CliProviderInstance = class {
   lastApprovalEventAt = 0;
   historyWriter;
   instanceId;
-  launchMode;
-  resolvedOutputFormat;
-  /**
-   * Determine output rendering format from:
-   * 1. launchMode.outputFormat (explicit override)
-   * 2. launchOptions[].outputFormatMap — check actual args for matching values
-   * 3. Default: 'terminal'
-   */
-  resolveOutputFormat() {
-    if (this.launchMode?.outputFormat) return this.launchMode.outputFormat;
-    if (this.provider.launchOptions?.length) {
-      for (const opt of this.provider.launchOptions) {
-        if (!opt.outputFormatMap) continue;
-        for (const [val, fmt] of Object.entries(opt.outputFormatMap)) {
-          if (this.cliArgs.includes(val)) return fmt;
-        }
-      }
-    }
-    return "terminal";
-  }
+  presentationMode;
   // ─── Lifecycle ─────────────────────────────────
   async init(context) {
     this.context = context;
@@ -9138,30 +9292,21 @@ var CliProviderInstance = class {
   }
   getState() {
     const adapterStatus = this.adapter.getStatus();
+    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,
       category: "cli",
       status: adapterStatus.status,
-      mode: this.resolvedOutputFormat === "stream-json" ? "chat" : "terminal",
-      launchMode: this.launchMode?.id,
+      mode: this.presentationMode,
       activeChat: {
         id: `${this.type}_${this.workingDir}`,
-        title: `${this.provider.name} \xB7 ${dirName}`,
-        status: adapterStatus.status,
-        messages: [],
-        activeModal: adapterStatus.activeModal,
-        terminalHistory: adapterStatus.terminalHistory,
+        title: parsedStatus?.title || `${this.provider.name} \xB7 ${dirName}`,
+        status: parsedStatus?.status || adapterStatus.status,
+        messages: Array.isArray(parsedStatus?.messages) ? parsedStatus.messages : [],
+        activeModal: parsedStatus?.activeModal ?? adapterStatus.activeModal,
         inputContent: ""
       },
       workspace: this.workingDir,
@@ -9183,6 +9328,13 @@ var CliProviderInstance = class {
       providerControls: this.provider.controls
     };
   }
+  setPresentationMode(mode) {
+    if (this.presentationMode === mode) return;
+    this.presentationMode = mode;
+  }
+  getPresentationMode() {
+    return this.presentationMode;
+  }
   onEvent(event, data) {
     if (event === "send_message" && data?.text) {
       void this.adapter.sendMessage(data.text).catch((e) => {
@@ -10246,6 +10398,15 @@ var DaemonCliManager = class {
     const hash = __require("crypto").createHash("md5").update(__require("path").resolve(dir)).digest("hex").slice(0, 8);
     return `${cliType}_${hash}`;
   }
+  getSessionPresentationMode(sessionId) {
+    if (!sessionId) return null;
+    const instance = this.deps.getInstanceManager()?.getInstance(sessionId);
+    const mode = instance?.category === "cli" ? instance.getPresentationMode?.() : null;
+    return mode === "chat" || mode === "terminal" ? mode : null;
+  }
+  isTerminalSession(sessionId) {
+    return this.getSessionPresentationMode(sessionId) === "terminal";
+  }
   persistRecentActivity(entry) {
     try {
       saveConfig(appendRecentActivity(loadConfig(), entry));
@@ -10301,12 +10462,12 @@ var DaemonCliManager = class {
       }
     }, 3e3);
   }
-  async registerCliInstance(key, normalizedType, cliType, resolvedDir, cliArgs, provider, settings, attachExisting = false, launchModeId) {
+  async registerCliInstance(key, normalizedType, cliType, resolvedDir, cliArgs, provider, settings, attachExisting = false) {
     const instanceManager = this.deps.getInstanceManager();
     const sessionRegistry = this.deps.getSessionRegistry?.() || null;
     if (!instanceManager) throw new Error("InstanceManager not available");
     const transportFactory = this.getTransportFactory(key, normalizedType, resolvedDir, cliArgs, attachExisting);
-    const cliInstance = new CliProviderInstance(provider, resolvedDir, cliArgs, key, transportFactory, launchModeId);
+    const cliInstance = new CliProviderInstance(provider, resolvedDir, cliArgs, key, transportFactory);
     try {
       await instanceManager.addInstance(key, cliInstance, {
         serverConn: this.deps.getServerConn(),
@@ -10332,7 +10493,7 @@ var DaemonCliManager = class {
     this.startCliExitMonitor(key, cliType);
   }
   // ─── Session start/management ──────────────────────────────
-  async startSession(cliType, workingDir, cliArgs, initialModel, launchMode, launchOptionValues) {
+  async startSession(cliType, workingDir, cliArgs, initialModel) {
     const trimmed = (workingDir || "").trim();
     if (!trimmed) throw new Error("working directory required");
     const resolvedDir = trimmed.startsWith("~") ? trimmed.replace(/^~/, os13.homedir()) : path10.resolve(trimmed);
@@ -10424,29 +10585,7 @@ ${installInfo}`
     if (provider) {
       console.log(colorize("cyan", `  \u{1F4E6} Using provider: ${provider.name} (${provider.type})`));
     }
-    let resolvedCliArgs = cliArgs;
-    let resolvedLaunchMode = launchMode;
-    const activeMode = provider?.launchModes?.length ? launchMode ? provider.launchModes.find((m) => m.id === launchMode) : provider.launchModes.find((m) => m.default) : void 0;
-    if (activeMode) {
-      resolvedLaunchMode = activeMode.id;
-    }
-    if (provider?.launchArgBuilder) {
-      const defaults = {};
-      for (const opt of provider.launchOptions || []) {
-        if (opt.default !== void 0) defaults[opt.id] = opt.default;
-      }
-      const modeOptions = activeMode?.options || {};
-      const userOptions = launchOptionValues || {};
-      const merged = { ...defaults, ...modeOptions, ...userOptions };
-      const extraArgs = provider.launchArgBuilder(merged);
-      if (extraArgs.length) {
-        resolvedCliArgs = [...cliArgs || [], ...extraArgs];
-        console.log(colorize("cyan", `  \u{1F680} Launch options applied: ${extraArgs.join(" ")}`));
-      }
-    } else if (activeMode?.extraArgs?.length) {
-      resolvedCliArgs = [...cliArgs || [], ...activeMode.extraArgs];
-      console.log(colorize("cyan", `  \u{1F680} Launch mode '${activeMode.name}': appending args ${activeMode.extraArgs.join(" ")}`));
-    }
+    const resolvedCliArgs = cliArgs;
     const instanceManager = this.deps.getInstanceManager();
     if (provider && instanceManager) {
       const resolvedProvider = this.providerLoader.resolve(cliType, { version: cliInfo.version }) || provider;
@@ -10458,8 +10597,7 @@ ${installInfo}`
         resolvedCliArgs,
         resolvedProvider,
         {},
-        false,
-        resolvedLaunchMode
+        false
       );
       console.log(colorize("green", `  \u2713 CLI started: ${cliInfo.displayName} v${cliInfo.version || "unknown"} in ${resolvedDir}`));
     } else {
@@ -10571,8 +10709,7 @@ ${installInfo}`
           record.cliArgs,
           resolvedProvider,
           {},
-          true,
-          record.launchMode
+          true
         );
         restored += 1;
         LOG.info("CLI", `\u267B Restored hosted runtime: ${record.runtimeKey || record.runtimeId} (${record.displayName || record.workspace})`);
@@ -10614,6 +10751,14 @@ ${installInfo}`
     }
     return null;
   }
+  findAdapterBySessionId(instanceKey) {
+    if (!instanceKey) return null;
+    let ik = instanceKey;
+    const colonIdx = ik.lastIndexOf(":");
+    if (colonIdx >= 0) ik = ik.substring(colonIdx + 1);
+    const adapter = this.adapters.get(ik);
+    return adapter ? { adapter, key: ik } : null;
+  }
   // ─── CLI command handling ────────────────────────────
   async handleCliCommand(cmd, args) {
     switch (cmd) {
@@ -10642,7 +10787,7 @@ ${installInfo}`
         const dir = resolved.path;
         const launchSource = resolved.source;
         if (!cliType) throw new Error("cliType required");
-        await this.startSession(cliType, dir, args?.cliArgs, args?.initialModel, args?.launchMode, args?.launchOptionValues);
+        await this.startSession(cliType, dir, args?.cliArgs, args?.initialModel);
         let newKey = null;
         for (const [k, adapter] of this.adapters) {
           if (adapter.cliType === cliType && adapter.workingDir === dir) {
@@ -10664,6 +10809,23 @@ ${installInfo}`
         }
         return { success: true, cliType, dir, stopped: true, mode };
       }
+      case "set_cli_view_mode": {
+        const mode = args?.mode === "chat" ? "chat" : "terminal";
+        const targetSessionId = typeof args?.targetSessionId === "string" ? args.targetSessionId : "";
+        const cliType = args?.cliType || args?.agentType || "";
+        const dir = args?.dir || "";
+        const found = this.findAdapterBySessionId(targetSessionId) || (cliType ? this.findAdapter(cliType, { instanceKey: targetSessionId, dir }) : null);
+        if (!found) {
+          return { success: false, error: "CLI session not found", code: "CLI_SESSION_NOT_FOUND" };
+        }
+        const instance = this.deps.getInstanceManager()?.getInstance(found.key);
+        if (!(instance instanceof CliProviderInstance)) {
+          return { success: false, error: "CLI instance not found", code: "CLI_INSTANCE_NOT_FOUND" };
+        }
+        instance.setPresentationMode(mode);
+        this.deps.onStatusChange();
+        return { success: true, id: found.key, mode };
+      }
       case "restart_session": {
         const cliType = args?.cliType || args?.agentType || args?.ideType;
         const cfg = loadConfig();
@@ -11282,7 +11444,12 @@ var AgentStreamPoller = class {
         } catch {
         }
       }
-      if (!resolvedActiveSessionId || !parentSessionId) continue;
+      if (!resolvedActiveSessionId || !parentSessionId) {
+        if (parentSessionId) {
+          this.deps.onStreamsUpdated?.(ideType, []);
+        }
+        continue;
+      }
       try {
         await agentStreamManager.syncActiveSession(cdp, parentSessionId);
         const stream = await agentStreamManager.collectActiveSession(cdp, parentSessionId);
@@ -11297,7 +11464,11 @@ var AgentStreamPoller = class {
 function forwardAgentStreamsToIdeInstance(instanceManager, ideType, streams) {
   const ideInstance = instanceManager.getInstance(`ide:${ideType}`);
   if (!ideInstance?.onEvent) return;
+  const seenExtensionTypes = /* @__PURE__ */ new Set();
   for (const stream of streams) {
+    if (typeof stream.agentType === "string" && stream.agentType) {
+      seenExtensionTypes.add(stream.agentType);
+    }
     ideInstance.onEvent("stream_update", {
       extensionType: stream.agentType,
       streams: [stream],
@@ -11314,6 +11485,16 @@ function forwardAgentStreamsToIdeInstance(instanceManager, ideType, streams) {
       inputContent: stream.inputContent || ""
     });
   }
+  const extensionTypes = ideInstance.getExtensionTypes?.() || [];
+  if (streams.length === 0) {
+    ideInstance.onEvent("stream_reset_all");
+    return;
+  }
+  for (const extensionType of extensionTypes) {
+    if (!seenExtensionTypes.has(extensionType)) {
+      ideInstance.onEvent("stream_reset", { extensionType });
+    }
+  }
 }
 
 // src/providers/provider-instance-manager.ts
@@ -15716,6 +15897,7 @@ var SessionHostRuntimeTransport = class {
     this.ready = this.boot();
   }
   ready;
+  terminalQueriesHandled = true;
   client;
   dataCallbacks = /* @__PURE__ */ new Set();
   exitCallbacks = /* @__PURE__ */ new Set();