adhdev 0.7.41 → 0.7.43

package/dist/cli/index.js

@@ -34,7 +34,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // ../../oss/packages/daemon-core/src/config/config.ts
 var config_exports = {};
 __export(config_exports, {
-  generateConnectionToken: () => generateConnectionToken,
   generateMachineId: () => generateMachineId,
   getConfigDir: () => getConfigDir,
   isSetupComplete: () => isSetupComplete,
@@ -45,6 +44,57 @@ __export(config_exports, {
   saveConfig: () => saveConfig,
   updateConfig: () => updateConfig
 });
+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}${(0, import_crypto.randomUUID)().replace(/-/g, "")}`;
 }
@@ -88,14 +138,10 @@ function loadConfig() {
   try {
     const raw = (0, import_fs.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 {
@@ -110,10 +156,11 @@ function loadConfig() {
 function saveConfig(config2) {
   const configPath = getConfigPath();
   const dir = getConfigDir();
+  const normalized = normalizeConfig(config2);
   if (!(0, import_fs.existsSync)(dir)) {
     (0, import_fs.mkdirSync)(dir, { recursive: true, mode: 448 });
   }
-  (0, import_fs.writeFileSync)(configPath, JSON.stringify(config2, null, 2), { encoding: "utf-8", mode: 384 });
+  (0, import_fs.writeFileSync)(configPath, JSON.stringify(normalized, null, 2), { encoding: "utf-8", mode: 384 });
   try {
     (0, import_fs.chmodSync)(configPath, 384);
   } catch {
@@ -142,14 +189,6 @@ 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 import_os, import_path, import_fs, import_crypto, DEFAULT_CONFIG, MACHINE_ID_PREFIX;
 var init_config = __esm({
   "../../oss/packages/daemon-core/src/config/config.ts"() {
@@ -160,18 +199,13 @@ var init_config = __esm({
     import_crypto = require("crypto");
     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,
@@ -2345,6 +2379,8 @@ var init_extension_provider_instance = __esm({
             this.detectTransition(newStatus, data);
             this.currentStatus = newStatus;
           }
+        } else if (event === "stream_reset") {
+          this.resetStreamState();
         } else if (event === "extension_connected") {
           this.ideType = data?.ideType || "";
         }
@@ -2424,6 +2460,30 @@ var init_extension_provider_instance = __esm({
         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();
+      }
     };
   }
 });
@@ -2479,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
@@ -2538,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() {
@@ -2722,11 +2739,23 @@ var init_ide_provider_instance = __esm({
         } 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() {
@@ -3411,6 +3440,50 @@ var init_initializer = __esm({
 });
 
 // ../../oss/packages/daemon-core/src/status/normalize.ts
+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;
 }
@@ -3437,10 +3510,18 @@ 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
   };
 }
-var WORKING_STATUSES;
+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";
@@ -3452,6 +3533,13 @@ var init_normalize = __esm({
       "thinking",
       "active"
     ]);
+    STATUS_ACTIVE_CHAT_MESSAGE_LIMIT = 60;
+    STATUS_ACTIVE_CHAT_TOTAL_BYTES_LIMIT = 96 * 1024;
+    STATUS_ACTIVE_CHAT_STRING_LIMIT = 4 * 1024;
+    STATUS_ACTIVE_CHAT_FALLBACK_STRING_LIMIT = 1024;
+    STATUS_INPUT_CONTENT_LIMIT = 2 * 1024;
+    STATUS_MODAL_MESSAGE_LIMIT = 2 * 1024;
+    STATUS_MODAL_BUTTON_LIMIT = 120;
   }
 });
 
@@ -3601,11 +3689,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
@@ -3675,7 +3762,7 @@ function buildSessionEntries(allStates, cdpManagers) {
   }
   return sessions;
 }
-var IDE_SESSION_CAPABILITIES, EXTENSION_SESSION_CAPABILITIES, PTY_SESSION_CAPABILITIES, ACP_SESSION_CAPABILITIES;
+var IDE_SESSION_CAPABILITIES, EXTENSION_SESSION_CAPABILITIES, PTY_SESSION_CAPABILITIES, CLI_CHAT_SESSION_CAPABILITIES, ACP_SESSION_CAPABILITIES;
 var init_builders = __esm({
   "../../oss/packages/daemon-core/src/status/builders.ts"() {
     "use strict";
@@ -3708,6 +3795,11 @@ var init_builders = __esm({
       "terminal_io",
       "resize_terminal"
     ];
+    CLI_CHAT_SESSION_CAPABILITIES = [
+      "read_chat",
+      "send_message",
+      "resolve_action"
+    ];
     ACP_SESSION_CAPABILITIES = [
       "read_chat",
       "send_message",
@@ -4832,6 +4924,13 @@ var init_cdp_commands = __esm({
 });
 
 // ../../oss/packages/daemon-core/src/commands/stream-commands.ts
+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;
@@ -4842,6 +4941,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"}` };
@@ -4852,6 +4954,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"}` };
@@ -8938,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();
       }
@@ -18090,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();
       }
@@ -18176,6 +18291,9 @@ var init_terminal_screen = __esm({
       getText() {
         return this.terminal.getText();
       }
+      getCursorPosition() {
+        return this.terminal.getCursorPosition();
+      }
       dispose() {
         this.terminal.dispose();
       }
@@ -18412,6 +18530,7 @@ var init_router = __esm({
           // ─── CLI / ACP commands ───
           case "launch_cli":
           case "stop_cli":
+          case "set_cli_view_mode":
           case "agent_command": {
             return this.deps.cliManager.handleCliCommand(cmd, args);
           }
@@ -18764,6 +18883,20 @@ var init_reporter = __esm({
       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, b2) => b2.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;
@@ -18816,9 +18949,16 @@ var init_reporter = __esm({
           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 = {
@@ -18848,7 +18988,9 @@ var init_reporter = __esm({
             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)`);
@@ -18896,6 +19038,7 @@ var init_pty_transport = __esm({
         this.handle = handle;
       }
       ready = Promise.resolve();
+      terminalQueriesHandled = false;
       get pid() {
         return this.handle.pid;
       }
@@ -18949,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 {
@@ -19035,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") {
@@ -19179,6 +19318,7 @@ var init_provider_cli_adapter = __esm({
       pendingOutputParseTimer = null;
       ptyOutputBuffer = "";
       ptyOutputFlushTimer = null;
+      pendingTerminalQueryTail = "";
       // Server log forwarding
       serverConn = null;
       logBuffer = [];
@@ -19210,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;
@@ -19220,6 +19358,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;
@@ -19227,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
         };
@@ -19313,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);
@@ -19337,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) {
@@ -19373,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;
@@ -19384,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);
@@ -19616,6 +19755,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) {
@@ -19651,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
         };
       }
       /**
@@ -19660,12 +19807,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,
@@ -19733,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);
@@ -19921,6 +20080,7 @@ ${data.message || ""}`.trim();
           this.pendingOutputParseTimer = null;
         }
         this.pendingOutputParseBuffer = "";
+        this.pendingTerminalQueryTail = "";
         if (this.ptyOutputFlushTimer) {
           clearTimeout(this.ptyOutputFlushTimer);
           this.ptyOutputFlushTimer = null;
@@ -19960,6 +20120,7 @@ ${data.message || ""}`.trim();
           this.pendingOutputParseTimer = null;
         }
         this.pendingOutputParseBuffer = "";
+        this.pendingTerminalQueryTail = "";
         if (this.ptyOutputFlushTimer) {
           clearTimeout(this.ptyOutputFlushTimer);
           this.ptyOutputFlushTimer = null;
@@ -19986,7 +20147,6 @@ ${data.message || ""}`.trim();
         this.syncMessageViews();
         this.accumulatedBuffer = "";
         this.accumulatedRawBuffer = "";
-        this.terminalHistory = "";
         this.currentTurnScope = null;
         this.submitRetryUsed = false;
         this.submitRetryPromptSnippet = "";
@@ -19995,6 +20155,7 @@ ${data.message || ""}`.trim();
           this.pendingOutputParseTimer = null;
         }
         this.pendingOutputParseBuffer = "";
+        this.pendingTerminalQueryTail = "";
         if (this.ptyOutputFlushTimer) {
           clearTimeout(this.ptyOutputFlushTimer);
           this.ptyOutputFlushTimer = null;
@@ -20056,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),
@@ -20084,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);
+      }
     };
   }
 });
@@ -20099,14 +20273,13 @@ var init_cli_provider_instance = __esm({
     init_chat_history();
     init_logger();
     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();
@@ -20125,26 +20298,7 @@ var init_cli_provider_instance = __esm({
       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;
@@ -20169,30 +20323,21 @@ var init_cli_provider_instance = __esm({
       }
       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,
@@ -20214,6 +20359,13 @@ var init_cli_provider_instance = __esm({
           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) => {
@@ -20474,7 +20626,7 @@ __export(util_exports, {
   getSizableOrigin: () => getSizableOrigin,
   hexToUint8Array: () => hexToUint8Array,
   isObject: () => isObject,
-  isPlainObject: () => isPlainObject,
+  isPlainObject: () => isPlainObject2,
   issue: () => issue,
   joinValues: () => joinValues,
   jsonStringifyReplacer: () => jsonStringifyReplacer,
@@ -20643,7 +20795,7 @@ function slugify(input) {
 function isObject(data) {
   return typeof data === "object" && data !== null && !Array.isArray(data);
 }
-function isPlainObject(o) {
+function isPlainObject2(o) {
   if (isObject(o) === false)
     return false;
   const ctor = o.constructor;
@@ -20660,7 +20812,7 @@ function isPlainObject(o) {
   return true;
 }
 function shallowClone(o) {
-  if (isPlainObject(o))
+  if (isPlainObject2(o))
     return { ...o };
   if (Array.isArray(o))
     return [...o];
@@ -20796,7 +20948,7 @@ function omit(schema, mask) {
   return clone(schema, def);
 }
 function extend(schema, shape) {
-  if (!isPlainObject(shape)) {
+  if (!isPlainObject2(shape)) {
     throw new Error("Invalid input to extend: expected a plain object");
   }
   const checks = schema._zod.def.checks;
@@ -20819,7 +20971,7 @@ function extend(schema, shape) {
   return clone(schema, def);
 }
 function safeExtend(schema, shape) {
-  if (!isPlainObject(shape)) {
+  if (!isPlainObject2(shape)) {
     throw new Error("Invalid input to safeExtend: expected a plain object");
   }
   const def = mergeDefs(schema._zod.def, {
@@ -22302,7 +22454,7 @@ function mergeValues(a, b2) {
   if (a instanceof Date && b2 instanceof Date && +a === +b2) {
     return { valid: true, data: a };
   }
-  if (isPlainObject(a) && isPlainObject(b2)) {
+  if (isPlainObject2(a) && isPlainObject2(b2)) {
     const bKeys = Object.keys(b2);
     const sharedKeys = Object.keys(a).filter((key) => bKeys.indexOf(key) !== -1);
     const newObj = { ...a, ...b2 };
@@ -23497,7 +23649,7 @@ var init_schemas = __esm({
       $ZodType.init(inst, def);
       inst._zod.parse = (payload, ctx) => {
         const input = payload.value;
-        if (!isPlainObject(input)) {
+        if (!isPlainObject2(input)) {
           payload.issues.push({
             expected: "record",
             code: "invalid_type",
@@ -37601,6 +37753,15 @@ var init_cli_manager = __esm({
         const hash2 = require("crypto").createHash("md5").update(require("path").resolve(dir)).digest("hex").slice(0, 8);
         return `${cliType}_${hash2}`;
       }
+      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));
@@ -37656,12 +37817,12 @@ var init_cli_manager = __esm({
           }
         }, 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(),
@@ -37687,7 +37848,7 @@ var init_cli_manager = __esm({
         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(/^~/, os14.homedir()) : path10.resolve(trimmed);
@@ -37779,29 +37940,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;
@@ -37813,8 +37952,7 @@ ${installInfo}`
             resolvedCliArgs,
             resolvedProvider,
             {},
-            false,
-            resolvedLaunchMode
+            false
           );
           console.log(colorize("green", `  \u2713 CLI started: ${cliInfo.displayName} v${cliInfo.version || "unknown"} in ${resolvedDir}`));
         } else {
@@ -37926,8 +38064,7 @@ ${installInfo}`
               record2.cliArgs,
               resolvedProvider,
               {},
-              true,
-              record2.launchMode
+              true
             );
             restored += 1;
             LOG.info("CLI", `\u267B Restored hosted runtime: ${record2.runtimeKey || record2.runtimeId} (${record2.displayName || record2.workspace})`);
@@ -37969,6 +38106,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) {
@@ -37997,7 +38142,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) {
@@ -38019,6 +38164,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();
@@ -38670,7 +38832,12 @@ var init_poller = __esm({
             } 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);
@@ -38698,7 +38865,11 @@ var init_agent_stream = __esm({
 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],
@@ -38715,6 +38886,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 });
+    }
+  }
 }
 var init_forward = __esm({
   "../../oss/packages/daemon-core/src/agent-stream/forward.ts"() {
@@ -43297,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();
@@ -44458,13 +44640,8 @@ var init_server_connection = __esm({
           LOG.info("Server", `[ServerConn] Run 'adhdev setup' to re-authenticate.`);
           this.setState("disconnected");
           try {
-            const path18 = require("path");
-            const fs16 = require("fs");
-            const configPath = path18.join(process.env.HOME || process.env.USERPROFILE || "", ".adhdev", "config.json");
-            if (fs16.existsSync(configPath)) {
-              fs16.unlinkSync(configPath);
-              LOG.info("Server", `[ServerConn] Config file removed. Re-run 'adhdev setup'.`);
-            }
+            resetConfig();
+            LOG.info("Server", `[ServerConn] Config reset. Re-run 'adhdev setup'.`);
           } catch {
           }
           return;
@@ -44733,10 +44910,9 @@ ${e?.stack || ""}`);
       async fetchTurnCredentials() {
         try {
           const serverUrl = process.env.ADHDEV_SERVER_URL || "https://api.adhf.dev";
-          const configPath = path15.join(os18.homedir(), ".adhdev", "config.json");
           let token = "";
           try {
-            const config2 = JSON.parse(fs13.readFileSync(configPath, "utf-8"));
+            const config2 = loadConfig();
             token = config2.machineSecret || "";
           } catch {
           }
@@ -45035,8 +45211,9 @@ ${e?.stack || ""}`);
               log(`pty_input: REJECTED \u2014 permission=${permission} peer=${peerId}`);
               return;
             }
-            if (this.ptyInputHandler && parsed.data) {
-              this.ptyInputHandler(parsed.cliType || "", parsed.data);
+            const sessionId = parsed.sessionId || parsed.cliId || parsed.cliType || "";
+            if (this.ptyInputHandler && parsed.data && sessionId) {
+              this.ptyInputHandler(sessionId, parsed.data);
             }
             return;
           }
@@ -45046,8 +45223,9 @@ ${e?.stack || ""}`);
               log(`pty_resize: REJECTED \u2014 permission=${permission} peer=${peerId}`);
               return;
             }
-            if (this.ptyResizeHandler && parsed.cols && parsed.rows) {
-              this.ptyResizeHandler(parsed.cliType || "", parsed.cols, parsed.rows);
+            const sessionId = parsed.sessionId || parsed.cliId || parsed.cliType || "";
+            if (this.ptyResizeHandler && parsed.cols && parsed.rows && sessionId) {
+              this.ptyResizeHandler(sessionId, parsed.cols, parsed.rows);
             }
             return;
           }
@@ -45075,8 +45253,8 @@ ${e?.stack || ""}`);
         return sentAny;
       }
       /** Broadcast PTY output to all connected peers */
-      broadcastPtyOutput(cliType, data) {
-        const msg = JSON.stringify({ type: "pty_output", cliType, data });
+      broadcastPtyOutput(sessionId, data) {
+        const msg = JSON.stringify({ type: "pty_output", sessionId, data });
         let sentAny = false;
         for (const peer of this.peers.values()) {
           if (peer.state !== "connected" || !peer.dataChannel) continue;
@@ -45710,7 +45888,7 @@ var init_adhdev_daemon = __esm({
     fs15 = __toESM(require("fs"));
     path17 = __toESM(require("path"));
     import_chalk2 = __toESM(require("chalk"));
-    pkgVersion = "0.7.41";
+    pkgVersion = "0.7.43";
     if (pkgVersion === "unknown") {
       try {
         const possiblePaths = [
@@ -45755,6 +45933,16 @@ var init_adhdev_daemon = __esm({
       constructor() {
         this.localPort = 19222;
       }
+      getCliPresentationMode(sessionId) {
+        if (!sessionId || !this.components) return null;
+        const instance = this.components.instanceManager.getInstance(sessionId);
+        if (instance?.category !== "cli") return null;
+        const mode = instance.getPresentationMode?.();
+        return mode === "chat" || mode === "terminal" ? mode : null;
+      }
+      isTerminalCliSession(sessionId) {
+        return this.getCliPresentationMode(sessionId) === "terminal";
+      }
       async start(options = {}) {
         try {
           const { installGlobalInterceptor: installGlobalInterceptor2 } = require("./logging/logger");
@@ -45784,9 +45972,6 @@ ${err?.stack || ""}`);
           const authToken = config2.machineSecret;
           if (!authToken) {
             console.log(import_chalk2.default.red("\n\u2717 No machine secret found."));
-            if (config2.connectionToken) {
-              console.log(import_chalk2.default.yellow("  Legacy connectionToken detected \u2014 please re-run setup."));
-            }
             console.log(import_chalk2.default.gray("  Run `adhdev setup` first.\n"));
             process.exit(1);
           }
@@ -45796,7 +45981,12 @@ ${err?.stack || ""}`);
             providerLogFn: LOG.forComponent("Provider").asLogFn(),
             cliManagerDeps: {
               getServerConn: () => this.serverConn,
-              getP2p: () => this.p2p,
+              getP2p: () => ({
+                broadcastPtyOutput: (key, data) => {
+                  if (!this.isTerminalCliSession(key)) return;
+                  this.p2p?.broadcastPtyOutput(key, data);
+                }
+              }),
               onStatusChange: () => this.statusReporter?.onStatusChange(),
               removeAgentTracking: (key) => this.statusReporter?.removeAgentTracking(key),
               createPtyTransportFactory: ({ runtimeId, providerType, workspace, cliArgs, attachExisting }) => new SessionHostPtyTransportFactory({
@@ -45873,14 +46063,16 @@ ${err?.stack || ""}`);
                 return { id: req.id, success: result.success, entries: result.files, error: result.error };
               }
             });
-            this.p2p.onPtyInput((cliId, data) => {
-              const found = this.components.cliManager.findAdapter(cliId, { instanceKey: cliId });
+            this.p2p.onPtyInput((sessionId, data) => {
+              if (!this.isTerminalCliSession(sessionId)) return;
+              const found = this.components.cliManager.findAdapter(sessionId, { instanceKey: sessionId });
               if (found && typeof found.adapter.writeRaw === "function") {
                 found.adapter.writeRaw(data);
               }
             });
-            this.p2p.onPtyResize((cliId, cols, rows) => {
-              const found = this.components.cliManager.findAdapter(cliId, { instanceKey: cliId });
+            this.p2p.onPtyResize((sessionId, cols, rows) => {
+              if (!this.isTerminalCliSession(sessionId)) return;
+              const found = this.components.cliManager.findAdapter(sessionId, { instanceKey: sessionId });
               if (found && typeof found.adapter.resize === "function") {
                 found.adapter.resize(cols, rows);
               }
@@ -46056,6 +46248,9 @@ ${err?.stack || ""}`);
             case "get_runtime_snapshot": {
               const sessionId = typeof data.sessionId === "string" ? data.sessionId : "";
               if (!sessionId) return { success: false, error: "sessionId is required" };
+              if (!this.isTerminalCliSession(sessionId)) {
+                return { success: false, error: "CLI session is not in terminal mode", code: "CLI_VIEW_MODE_NOT_TERMINAL" };
+              }
               if (!this.sessionHostEndpoint) return { success: false, error: "Session host unavailable" };
               const client = new SessionHostClient({ endpoint: this.sessionHostEndpoint });
               try {
@@ -46905,7 +47100,6 @@ function registerSetupCommands(program2, providerLoader) {
       console.log(import_chalk4.default.gray(`                 \u2022 ${ext}`));
     });
     console.log(`  ${import_chalk4.default.bold("User:")}         ${config2.userEmail || import_chalk4.default.gray("not logged in")}`);
-    console.log(`  ${import_chalk4.default.bold("Auto-connect:")} ${config2.autoConnect ? import_chalk4.default.green("enabled") : import_chalk4.default.gray("disabled")}`);
     console.log(`  ${import_chalk4.default.bold("Server:")}       ${config2.serverUrl}`);
     console.log(`  ${import_chalk4.default.bold("Setup date:")}   ${config2.setupDate || "unknown"}`);
     console.log();
@@ -47001,7 +47195,6 @@ function registerSetupCommands(program2, providerLoader) {
     } catch {
     }
     const config2 = loadConfig2();
-    config2.apiToken = null;
     config2.machineSecret = void 0;
     config2.userEmail = null;
     config2.userName = null;