@adhdev/daemon-core 0.7.42 → 0.7.44

package/dist/index.mjs

@@ -515,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();
       }
@@ -572,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();
       }
@@ -658,6 +668,9 @@ var init_terminal_screen = __esm({
       getText() {
         return this.terminal.getText();
       }
+      getCursorPosition() {
+        return this.terminal.getCursorPosition();
+      }
       dispose() {
         this.terminal.dispose();
       }
@@ -673,7 +686,7 @@ var init_terminal_screen = __esm({
 });
 
 // src/cli-adapters/pty-transport.ts
-import * as os11 from "os";
+import * as os12 from "os";
 var pty, NodePtyRuntimeTransport, NodePtyTransportFactory;
 var init_pty_transport = __esm({
   "src/cli-adapters/pty-transport.ts"() {
@@ -688,6 +701,7 @@ var init_pty_transport = __esm({
         this.handle = handle;
       }
       ready = Promise.resolve();
+      terminalQueriesHandled = false;
       get pid() {
         return this.handle.pid;
       }
@@ -714,7 +728,7 @@ var init_pty_transport = __esm({
       spawn(command, args, options) {
         if (!pty) throw new Error("node-pty is not installed");
         const handle = pty.spawn(command, args, {
-          name: os11.platform() === "win32" ? "xterm-color" : "xterm-256color",
+          name: os12.platform() === "win32" ? "xterm-color" : "xterm-256color",
           cols: options.cols,
           rows: options.rows,
           cwd: options.cwd,
@@ -732,8 +746,8 @@ __export(provider_cli_adapter_exports, {
   ProviderCliAdapter: () => ProviderCliAdapter,
   normalizeCliProviderForRuntime: () => normalizeCliProviderForRuntime
 });
-import * as os12 from "os";
-import * as path9 from "path";
+import * as os13 from "os";
+import * as path10 from "path";
 import { execSync as execSync4 } from "child_process";
 function stripAnsi(str) {
   return str.replace(/\x1B\[\d*[A-HJKSTfG]/g, " ").replace(/\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g, "").replace(/\x1B\][^\x07]*\x07/g, "").replace(/\x1B\][^\x1B]*\x1B\\/g, "").replace(/  +/g, " ");
@@ -744,8 +758,34 @@ 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";
+  const isWin = os13.platform() === "win32";
   try {
     const cmd = isWin ? `where ${name}` : `which ${name}`;
     return execSync4(cmd, { encoding: "utf-8", timeout: 5e3, stdio: ["pipe", "pipe", "pipe"] }).trim().split("\n")[0].trim();
@@ -754,14 +794,14 @@ function findBinary(name) {
   }
 }
 function isScriptBinary(binaryPath) {
-  if (!path9.isAbsolute(binaryPath)) return false;
+  if (!path10.isAbsolute(binaryPath)) return false;
   try {
-    const fs12 = __require("fs");
-    const resolved = fs12.realpathSync(binaryPath);
+    const fs13 = __require("fs");
+    const resolved = fs13.realpathSync(binaryPath);
     const head = Buffer.alloc(8);
-    const fd = fs12.openSync(resolved, "r");
-    fs12.readSync(fd, head, 0, 8, 0);
-    fs12.closeSync(fd);
+    const fd = fs13.openSync(resolved, "r");
+    fs13.readSync(fd, head, 0, 8, 0);
+    fs13.closeSync(fd);
     let i = 0;
     if (head[0] === 239 && head[1] === 187 && head[2] === 191) i = 3;
     return head[i] === 35 && head[i + 1] === 33;
@@ -770,14 +810,14 @@ function isScriptBinary(binaryPath) {
   }
 }
 function looksLikeMachOOrElf(filePath) {
-  if (!path9.isAbsolute(filePath)) return false;
+  if (!path10.isAbsolute(filePath)) return false;
   try {
-    const fs12 = __require("fs");
-    const resolved = fs12.realpathSync(filePath);
+    const fs13 = __require("fs");
+    const resolved = fs13.realpathSync(filePath);
     const buf = Buffer.alloc(8);
-    const fd = fs12.openSync(resolved, "r");
-    fs12.readSync(fd, buf, 0, 8, 0);
-    fs12.closeSync(fd);
+    const fd = fs13.openSync(resolved, "r");
+    fs13.readSync(fd, buf, 0, 8, 0);
+    fs13.closeSync(fd);
     let i = 0;
     if (buf[0] === 239 && buf[1] === 187 && buf[2] === 191) i = 3;
     const b = buf.subarray(i);
@@ -793,7 +833,7 @@ function looksLikeMachOOrElf(filePath) {
 }
 function shSingleQuote(arg) {
   if (/^[a-zA-Z0-9@%_+=:,./-]+$/.test(arg)) return arg;
-  if (os12.platform() === "win32") {
+  if (os13.platform() === "win32") {
     return `"${arg.replace(/"/g, '""')}"`;
   }
   return `'${arg.replace(/'/g, `'\\''`)}'`;
@@ -830,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") {
@@ -893,16 +903,16 @@ var init_provider_cli_adapter = __esm({
     init_pty_transport();
     try {
       pty2 = __require("node-pty");
-      if (os12.platform() !== "win32") {
+      if (os13.platform() !== "win32") {
         try {
-          const fs12 = __require("fs");
-          const ptyDir = path9.resolve(path9.dirname(__require.resolve("node-pty")), "..");
-          const platformArch = `${os12.platform()}-${os12.arch()}`;
-          const helper = path9.join(ptyDir, "prebuilds", platformArch, "spawn-helper");
-          if (fs12.existsSync(helper)) {
-            const stat = fs12.statSync(helper);
+          const fs13 = __require("fs");
+          const ptyDir = path10.resolve(path10.dirname(__require.resolve("node-pty")), "..");
+          const platformArch = `${os13.platform()}-${os13.arch()}`;
+          const helper = path10.join(ptyDir, "prebuilds", platformArch, "spawn-helper");
+          if (fs13.existsSync(helper)) {
+            const stat = fs13.statSync(helper);
             if (!(stat.mode & 73)) {
-              fs12.chmodSync(helper, stat.mode | 493);
+              fs13.chmodSync(helper, stat.mode | 493);
               LOG.info("CLI", "[node-pty] Fixed spawn-helper permissions");
             }
           }
@@ -919,7 +929,7 @@ var init_provider_cli_adapter = __esm({
         this.transportFactory = transportFactory;
         this.cliType = provider.type;
         this.cliName = provider.name;
-        this.workingDir = workingDir.startsWith("~") ? workingDir.replace(/^~/, os12.homedir()) : workingDir;
+        this.workingDir = workingDir.startsWith("~") ? workingDir.replace(/^~/, os13.homedir()) : workingDir;
         const t = provider.timeouts || {};
         this.timeouts = {
           ptyFlush: t.ptyFlush ?? 50,
@@ -971,6 +981,7 @@ var init_provider_cli_adapter = __esm({
       pendingOutputParseTimer = null;
       ptyOutputBuffer = "";
       ptyOutputFlushTimer = null;
+      pendingTerminalQueryTail = "";
       // Server log forwarding
       serverConn = null;
       logBuffer = [];
@@ -1002,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;
@@ -1026,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
         };
@@ -1089,12 +1096,12 @@ var init_provider_cli_adapter = __esm({
         if (this.ptyProcess) return;
         const { spawn: spawnConfig } = this.provider;
         const binaryPath = findBinary(spawnConfig.command);
-        const isWin = os12.platform() === "win32";
+        const isWin = os13.platform() === "win32";
         const allArgs = [...spawnConfig.args, ...this.extraArgs];
         LOG.info("CLI", `[${this.cliType}] Spawning in ${this.workingDir}`);
         let shellCmd;
         let shellArgs;
-        const useShellUnix = !isWin && (!!spawnConfig.shell || !path9.isAbsolute(binaryPath) || isScriptBinary(binaryPath) || !looksLikeMachOOrElf(binaryPath));
+        const useShellUnix = !isWin && (!!spawnConfig.shell || !path10.isAbsolute(binaryPath) || isScriptBinary(binaryPath) || !looksLikeMachOOrElf(binaryPath));
         const useShell = isWin ? !!spawnConfig.shell : useShellUnix;
         if (useShell) {
           if (!spawnConfig.shell && !isWin) {
@@ -1112,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);
@@ -1136,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) {
@@ -1172,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;
@@ -1183,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);
@@ -1459,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
         };
       }
       /**
@@ -1478,7 +1480,6 @@ var init_provider_cli_adapter = __esm({
             id: parsed.id || "cli_session",
             status: parsed.status || this.currentStatus,
             title: parsed.title || this.cliName,
-            terminalHistory: this.terminalHistory,
             messages: parsed.messages,
             activeModal: parsed.activeModal ?? this.activeModal
           };
@@ -1488,7 +1489,6 @@ var init_provider_cli_adapter = __esm({
           id: "cli_session",
           status: this.currentStatus,
           title: this.cliName,
-          terminalHistory: this.terminalHistory,
           messages: messages.slice(-50).map((message, index) => ({
             id: `msg_${index}`,
             role: message.role,
@@ -1556,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);
@@ -1744,6 +1743,7 @@ ${data.message || ""}`.trim();
           this.pendingOutputParseTimer = null;
         }
         this.pendingOutputParseBuffer = "";
+        this.pendingTerminalQueryTail = "";
         if (this.ptyOutputFlushTimer) {
           clearTimeout(this.ptyOutputFlushTimer);
           this.ptyOutputFlushTimer = null;
@@ -1783,6 +1783,7 @@ ${data.message || ""}`.trim();
           this.pendingOutputParseTimer = null;
         }
         this.pendingOutputParseBuffer = "";
+        this.pendingTerminalQueryTail = "";
         if (this.ptyOutputFlushTimer) {
           clearTimeout(this.ptyOutputFlushTimer);
           this.ptyOutputFlushTimer = null;
@@ -1809,7 +1810,6 @@ ${data.message || ""}`.trim();
         this.syncMessageViews();
         this.accumulatedBuffer = "";
         this.accumulatedRawBuffer = "";
-        this.terminalHistory = "";
         this.currentTurnScope = null;
         this.submitRetryUsed = false;
         this.submitRetryPromptSnippet = "";
@@ -1818,6 +1818,7 @@ ${data.message || ""}`.trim();
           this.pendingOutputParseTimer = null;
         }
         this.pendingOutputParseBuffer = "";
+        this.pendingTerminalQueryTail = "";
         if (this.ptyOutputFlushTimer) {
           clearTimeout(this.ptyOutputFlushTimer);
           this.ptyOutputFlushTimer = null;
@@ -1879,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),
@@ -1907,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);
+      }
     };
   }
 });
@@ -2190,18 +2204,18 @@ function checkPathExists(paths) {
   return null;
 }
 async function detectIDEs() {
-  const os16 = platform();
+  const os17 = platform();
   const results = [];
   for (const def of getMergedDefinitions()) {
     const cliPath = findCliCommand(def.cli);
-    const appPath = checkPathExists(def.paths[os16] || []);
+    const appPath = checkPathExists(def.paths[os17] || []);
     const installed = !!(cliPath || appPath);
     let resolvedCli = cliPath;
-    if (!resolvedCli && appPath && os16 === "darwin") {
+    if (!resolvedCli && appPath && os17 === "darwin") {
       const bundledCli = `${appPath}/Contents/Resources/app/bin/${def.cli}`;
       if (existsSync3(bundledCli)) resolvedCli = bundledCli;
     }
-    if (!resolvedCli && appPath && os16 === "win32") {
+    if (!resolvedCli && appPath && os17 === "win32") {
       const { dirname: dirname7 } = await import("path");
       const appDir = dirname7(appPath);
       const candidates = [
@@ -3927,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
@@ -3986,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() {
@@ -4883,7 +4854,6 @@ 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_TERMINAL_HISTORY_LIMIT = 8 * 1024;
 var STATUS_INPUT_CONTENT_LIMIT = 2 * 1024;
 var STATUS_MODAL_MESSAGE_LIMIT = 2 * 1024;
 var STATUS_MODAL_BUTTON_LIMIT = 120;
@@ -4892,11 +4862,6 @@ function truncateString(value, maxChars) {
   if (maxChars <= 12) return value.slice(0, Math.max(0, maxChars));
   return `${value.slice(0, maxChars - 12)}...[truncated]`;
 }
-function truncateStringTail(value, maxChars) {
-  if (value.length <= maxChars) return value;
-  if (maxChars <= 12) return value.slice(value.length - Math.max(0, maxChars));
-  return `...[truncated]${value.slice(value.length - (maxChars - 12))}`;
-}
 function trimStructuredStrings(value, maxChars) {
   if (typeof value === "string") return truncateString(value, maxChars);
   if (Array.isArray(value)) return value.map((item) => trimStructuredStrings(item, maxChars));
@@ -4970,7 +4935,6 @@ function normalizeActiveChatData(activeChat) {
         (button) => truncateString(String(button || ""), STATUS_MODAL_BUTTON_LIMIT)
       )
     } : activeChat.activeModal,
-    terminalHistory: activeChat.terminalHistory ? truncateStringTail(activeChat.terminalHistory, STATUS_TERMINAL_HISTORY_LIMIT) : activeChat.terminalHistory,
     inputContent: activeChat.inputContent ? truncateString(activeChat.inputContent, STATUS_INPUT_CONTENT_LIMIT) : activeChat.inputContent
   };
 }
@@ -8270,7 +8234,7 @@ function detectCurrentWorkspace(ideId) {
     }
   } else if (plat === "win32") {
     try {
-      const fs12 = __require("fs");
+      const fs13 = __require("fs");
       const appNameMap = getMacAppIdentifiers();
       const appName = appNameMap[ideId];
       if (appName) {
@@ -8279,8 +8243,8 @@ function detectCurrentWorkspace(ideId) {
           appName,
           "storage.json"
         );
-        if (fs12.existsSync(storagePath)) {
-          const data = JSON.parse(fs12.readFileSync(storagePath, "utf-8"));
+        if (fs13.existsSync(storagePath)) {
+          const data = JSON.parse(fs13.readFileSync(storagePath, "utf-8"));
           const workspaces = data?.openedPathsList?.workspaces3 || data?.openedPathsList?.entries || [];
           if (workspaces.length > 0) {
             const recent = workspaces[0];
@@ -8725,8 +8689,191 @@ function buildStatusSnapshot(options) {
   };
 }
 
-// src/commands/router.ts
+// src/commands/upgrade-helper.ts
+import { execFileSync } from "child_process";
+import { spawn as spawn2 } from "child_process";
 import * as fs7 from "fs";
+import * as os11 from "os";
+import * as path9 from "path";
+var UPGRADE_HELPER_ENV = "ADHDEV_DAEMON_UPGRADE_HELPER";
+function getUpgradeLogPath() {
+  const home = os11.homedir();
+  const dir = path9.join(home, ".adhdev");
+  fs7.mkdirSync(dir, { recursive: true });
+  return path9.join(dir, "daemon-upgrade.log");
+}
+function appendUpgradeLog(message) {
+  const line = `[${(/* @__PURE__ */ new Date()).toISOString()}] ${message}
+`;
+  try {
+    fs7.appendFileSync(getUpgradeLogPath(), line, "utf8");
+  } catch {
+  }
+}
+function getNpmExecutable() {
+  return process.platform === "win32" ? "npm.cmd" : "npm";
+}
+function killPid(pid) {
+  try {
+    if (process.platform === "win32") {
+      execFileSync("taskkill", ["/PID", String(pid), "/T", "/F"], { stdio: "ignore" });
+    } else {
+      process.kill(pid, "SIGTERM");
+    }
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function waitForPidExit(pid, timeoutMs) {
+  const start = Date.now();
+  while (Date.now() - start < timeoutMs) {
+    try {
+      process.kill(pid, 0);
+      await new Promise((resolve9) => setTimeout(resolve9, 250));
+    } catch {
+      return;
+    }
+  }
+}
+function stopSessionHostProcesses(appName) {
+  const pidFile = path9.join(os11.homedir(), ".adhdev", `${appName}-session-host.pid`);
+  try {
+    if (fs7.existsSync(pidFile)) {
+      const pid = Number.parseInt(fs7.readFileSync(pidFile, "utf8").trim(), 10);
+      if (Number.isFinite(pid)) {
+        killPid(pid);
+      }
+    }
+  } catch {
+  } finally {
+    try {
+      fs7.unlinkSync(pidFile);
+    } catch {
+    }
+  }
+  if (process.platform !== "win32") {
+    try {
+      const raw = execFileSync("pgrep", ["-f", "session-host-daemon"], { encoding: "utf8" }).trim();
+      for (const line of raw.split("\n")) {
+        const pid = Number.parseInt(line.trim(), 10);
+        if (Number.isFinite(pid)) {
+          killPid(pid);
+        }
+      }
+    } catch {
+    }
+  }
+}
+function removeDaemonPidFile() {
+  const pidFile = path9.join(os11.homedir(), ".adhdev", "daemon.pid");
+  try {
+    fs7.unlinkSync(pidFile);
+  } catch {
+  }
+}
+function cleanupStaleGlobalInstallDirs(pkgName) {
+  const npmRoot = execFileSync(getNpmExecutable(), ["root", "-g"], { encoding: "utf8" }).trim();
+  if (!npmRoot) return;
+  const npmPrefix = execFileSync(getNpmExecutable(), ["prefix", "-g"], { encoding: "utf8" }).trim();
+  const binDir = process.platform === "win32" ? npmPrefix : path9.join(npmPrefix, "bin");
+  const packageBaseName = pkgName.startsWith("@") ? pkgName.split("/")[1] : pkgName;
+  const binNames = /* @__PURE__ */ new Set([packageBaseName]);
+  if (pkgName === "@adhdev/daemon-standalone") {
+    binNames.add("adhdev-standalone");
+  }
+  if (pkgName.startsWith("@")) {
+    const [scope, name] = pkgName.split("/");
+    const scopeDir = path9.join(npmRoot, scope);
+    if (!fs7.existsSync(scopeDir)) return;
+    for (const entry of fs7.readdirSync(scopeDir)) {
+      if (!entry.startsWith(`.${name}-`)) continue;
+      fs7.rmSync(path9.join(scopeDir, entry), { recursive: true, force: true });
+      appendUpgradeLog(`Removed stale scoped staging dir: ${path9.join(scopeDir, entry)}`);
+    }
+  } else {
+    for (const entry of fs7.readdirSync(npmRoot)) {
+      if (!entry.startsWith(`.${pkgName}-`)) continue;
+      fs7.rmSync(path9.join(npmRoot, entry), { recursive: true, force: true });
+      appendUpgradeLog(`Removed stale staging dir: ${path9.join(npmRoot, entry)}`);
+    }
+  }
+  if (fs7.existsSync(binDir)) {
+    for (const entry of fs7.readdirSync(binDir)) {
+      if (![...binNames].some((name) => entry.startsWith(`.${name}-`))) continue;
+      fs7.rmSync(path9.join(binDir, entry), { recursive: true, force: true });
+      appendUpgradeLog(`Removed stale bin staging entry: ${path9.join(binDir, entry)}`);
+    }
+  }
+}
+function spawnDetachedDaemonUpgradeHelper(payload) {
+  const env = { ...process.env, [UPGRADE_HELPER_ENV]: JSON.stringify(payload) };
+  const child = spawn2(process.execPath, process.argv.slice(1), {
+    detached: true,
+    stdio: "ignore",
+    windowsHide: true,
+    cwd: payload.cwd || process.cwd(),
+    env
+  });
+  child.unref();
+}
+async function runDaemonUpgradeHelper(payload) {
+  const restartArgv = Array.isArray(payload.restartArgv) ? payload.restartArgv : [];
+  const sessionHostAppName = payload.sessionHostAppName || process.env.ADHDEV_SESSION_HOST_NAME || "adhdev";
+  appendUpgradeLog(`Upgrade helper started for ${payload.packageName}@${payload.targetVersion}`);
+  if (Number.isFinite(payload.parentPid) && payload.parentPid > 0) {
+    appendUpgradeLog(`Waiting for parent pid ${payload.parentPid} to exit`);
+    await waitForPidExit(payload.parentPid, 15e3);
+  }
+  stopSessionHostProcesses(sessionHostAppName);
+  removeDaemonPidFile();
+  cleanupStaleGlobalInstallDirs(payload.packageName);
+  const spec = `${payload.packageName}@${payload.targetVersion || "latest"}`;
+  appendUpgradeLog(`Installing ${spec}`);
+  const installOutput = execFileSync(
+    getNpmExecutable(),
+    ["install", "-g", spec, "--force"],
+    {
+      encoding: "utf8",
+      stdio: "pipe",
+      maxBuffer: 20 * 1024 * 1024
+    }
+  );
+  if (installOutput.trim()) {
+    appendUpgradeLog(installOutput.trim());
+  }
+  if (restartArgv.length > 0) {
+    const env = { ...process.env };
+    delete env[UPGRADE_HELPER_ENV];
+    appendUpgradeLog(`Restarting daemon with args: ${restartArgv.join(" ")}`);
+    const child = spawn2(process.execPath, restartArgv, {
+      detached: true,
+      stdio: "ignore",
+      windowsHide: true,
+      cwd: payload.cwd || process.cwd(),
+      env
+    });
+    child.unref();
+  } else {
+    appendUpgradeLog("No restart argv provided; upgrade completed without restart");
+  }
+}
+async function maybeRunDaemonUpgradeHelperFromEnv() {
+  const raw = process.env[UPGRADE_HELPER_ENV];
+  if (!raw) return false;
+  delete process.env[UPGRADE_HELPER_ENV];
+  try {
+    const payload = JSON.parse(raw);
+    await runDaemonUpgradeHelper(payload);
+    process.exit(0);
+  } catch (error) {
+    appendUpgradeLog(`Upgrade helper failed: ${error?.stack || error?.message || String(error)}`);
+    process.exit(1);
+  }
+}
+
+// src/commands/router.ts
+import * as fs8 from "fs";
 var CHAT_COMMANDS = [
   "send_chat",
   "new_chat",
@@ -8797,8 +8944,8 @@ var DaemonCommandRouter = class {
           if (logs.length > 0) {
             return { success: true, logs, totalBuffered: logs.length };
           }
-          if (fs7.existsSync(LOG_PATH)) {
-            const content = fs7.readFileSync(LOG_PATH, "utf-8");
+          if (fs8.existsSync(LOG_PATH)) {
+            const content = fs8.readFileSync(LOG_PATH, "utf-8");
             const allLines = content.split("\n");
             const recent = allLines.slice(-count).join("\n");
             return { success: true, logs: recent, totalLines: allLines.length };
@@ -8946,31 +9093,35 @@ var DaemonCommandRouter = class {
           const pkgName = isStandalone ? "@adhdev/daemon-standalone" : "adhdev";
           const latest = execSync7(`npm view ${pkgName} version`, { encoding: "utf-8", timeout: 1e4 }).trim();
           LOG.info("Upgrade", `Latest ${pkgName}: v${latest}`);
-          execSync7(`npm install -g ${pkgName}@latest --force`, {
-            encoding: "utf-8",
-            timeout: 12e4,
-            stdio: ["pipe", "pipe", "pipe"]
+          let currentInstalled = null;
+          try {
+            const currentJson = execSync7(`npm ls -g ${pkgName} --depth=0 --json`, {
+              encoding: "utf-8",
+              timeout: 1e4,
+              stdio: ["pipe", "pipe", "pipe"]
+            }).trim();
+            const parsed = JSON.parse(currentJson);
+            currentInstalled = parsed?.dependencies?.[pkgName]?.version || null;
+          } catch {
+          }
+          if (currentInstalled === latest) {
+            LOG.info("Upgrade", `Already on latest version v${latest}; skipping install`);
+            return { success: true, upgraded: false, alreadyLatest: true, version: latest };
+          }
+          spawnDetachedDaemonUpgradeHelper({
+            packageName: pkgName,
+            targetVersion: latest,
+            parentPid: process.pid,
+            restartArgv: process.argv.slice(1),
+            cwd: process.cwd(),
+            sessionHostAppName: process.env.ADHDEV_SESSION_HOST_NAME || "adhdev"
           });
-          LOG.info("Upgrade", `\u2705 Upgraded to v${latest}`);
+          LOG.info("Upgrade", `Scheduled detached upgrade to v${latest}`);
           setTimeout(() => {
-            LOG.info("Upgrade", "Restarting daemon with new version...");
-            try {
-              const path15 = __require("path");
-              const fs12 = __require("fs");
-              const pidFile = path15.join(process.env.HOME || process.env.USERPROFILE || "", ".adhdev", "daemon.pid");
-              if (fs12.existsSync(pidFile)) fs12.unlinkSync(pidFile);
-            } catch {
-            }
-            const { spawn: spawn3 } = __require("child_process");
-            const child = spawn3(process.execPath, process.argv.slice(1), {
-              detached: true,
-              stdio: "ignore",
-              env: { ...process.env }
-            });
-            child.unref();
+            LOG.info("Upgrade", "Exiting daemon so detached upgrader can continue...");
             process.exit(0);
           }, 3e3);
-          return { success: true, upgraded: true, version: latest };
+          return { success: true, upgraded: true, version: latest, restarting: true };
         } catch (e) {
           LOG.error("Upgrade", `Failed: ${e.message}`);
           return { success: false, error: e.message };
@@ -9267,8 +9418,8 @@ init_logger();
 
 // src/commands/cli-manager.ts
 init_provider_cli_adapter();
-import * as os13 from "os";
-import * as path10 from "path";
+import * as os14 from "os";
+import * as path11 from "path";
 import * as crypto4 from "crypto";
 import chalk from "chalk";
 init_config();
@@ -9284,7 +9435,7 @@ var CliProviderInstance = class {
     this.cliArgs = cliArgs;
     this.type = provider.type;
     this.instanceId = instanceId || crypto3.randomUUID();
-    this.presentationMode = "terminal";
+    this.presentationMode = "chat";
     this.adapter = new ProviderCliAdapter(provider, workingDir, cliArgs, transportFactory);
     this.monitor = new StatusMonitor();
     this.historyWriter = new ChatHistoryWriter();
@@ -9331,14 +9482,6 @@ var CliProviderInstance = class {
     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,
@@ -9351,7 +9494,6 @@ var CliProviderInstance = class {
         status: parsedStatus?.status || adapterStatus.status,
         messages: Array.isArray(parsedStatus?.messages) ? parsedStatus.messages : [],
         activeModal: parsedStatus?.activeModal ?? adapterStatus.activeModal,
-        terminalHistory: adapterStatus.terminalHistory,
         inputContent: ""
       },
       workspace: this.workingDir,
@@ -9523,7 +9665,7 @@ var CliProviderInstance = class {
 
 // src/providers/acp-provider-instance.ts
 import { Readable, Writable } from "stream";
-import { spawn as spawn2 } from "child_process";
+import { spawn as spawn3 } from "child_process";
 import {
   ClientSideConnection,
   ndJsonStream,
@@ -9858,7 +10000,7 @@ var AcpProviderInstance = class {
     this.errorMessage = null;
     this.errorReason = null;
     this.stderrBuffer = [];
-    this.process = spawn2(command, args, {
+    this.process = spawn3(command, args, {
       cwd: this.workingDir,
       env,
       stdio: ["pipe", "pipe", "pipe"],
@@ -10541,7 +10683,7 @@ var DaemonCliManager = class {
   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);
+    const resolvedDir = trimmed.startsWith("~") ? trimmed.replace(/^~/, os14.homedir()) : path11.resolve(trimmed);
     const normalizedType = this.providerLoader.resolveAlias(cliType);
     const provider = this.providerLoader.getByAlias(cliType);
     const key = crypto4.randomUUID();
@@ -11738,12 +11880,12 @@ var ProviderInstanceManager = class {
 };
 
 // src/providers/version-archive.ts
-import * as fs8 from "fs";
-import * as path11 from "path";
-import * as os14 from "os";
+import * as fs9 from "fs";
+import * as path12 from "path";
+import * as os15 from "os";
 import { execSync as execSync5 } from "child_process";
 import { platform as platform8 } from "os";
-var ARCHIVE_PATH = path11.join(os14.homedir(), ".adhdev", "version-history.json");
+var ARCHIVE_PATH = path12.join(os15.homedir(), ".adhdev", "version-history.json");
 var MAX_ENTRIES_PER_PROVIDER = 20;
 var VersionArchive = class {
   history = {};
@@ -11752,8 +11894,8 @@ var VersionArchive = class {
   }
   load() {
     try {
-      if (fs8.existsSync(ARCHIVE_PATH)) {
-        this.history = JSON.parse(fs8.readFileSync(ARCHIVE_PATH, "utf-8"));
+      if (fs9.existsSync(ARCHIVE_PATH)) {
+        this.history = JSON.parse(fs9.readFileSync(ARCHIVE_PATH, "utf-8"));
       }
     } catch {
       this.history = {};
@@ -11790,8 +11932,8 @@ var VersionArchive = class {
   }
   save() {
     try {
-      fs8.mkdirSync(path11.dirname(ARCHIVE_PATH), { recursive: true });
-      fs8.writeFileSync(ARCHIVE_PATH, JSON.stringify(this.history, null, 2));
+      fs9.mkdirSync(path12.dirname(ARCHIVE_PATH), { recursive: true });
+      fs9.writeFileSync(ARCHIVE_PATH, JSON.stringify(this.history, null, 2));
     } catch {
     }
   }
@@ -11830,19 +11972,19 @@ function getVersion(binary, versionCommand) {
 function checkPathExists2(paths) {
   for (const p of paths) {
     if (p.includes("*")) {
-      const home = os14.homedir();
-      const resolved = p.replace(/\*/g, home.split(path11.sep).pop() || "");
-      if (fs8.existsSync(resolved)) return resolved;
+      const home = os15.homedir();
+      const resolved = p.replace(/\*/g, home.split(path12.sep).pop() || "");
+      if (fs9.existsSync(resolved)) return resolved;
     } else {
-      if (fs8.existsSync(p)) return p;
+      if (fs9.existsSync(p)) return p;
     }
   }
   return null;
 }
 function getMacAppVersion(appPath) {
   if (platform8() !== "darwin" || !appPath.endsWith(".app")) return null;
-  const plistPath = path11.join(appPath, "Contents", "Info.plist");
-  if (!fs8.existsSync(plistPath)) return null;
+  const plistPath = path12.join(appPath, "Contents", "Info.plist");
+  if (!fs9.existsSync(plistPath)) return null;
   const raw = runCommand(`/usr/libexec/PlistBuddy -c "Print CFBundleShortVersionString" "${plistPath}"`);
   return raw || null;
 }
@@ -11868,8 +12010,8 @@ async function detectAllVersions(loader, archive) {
       const cliBin = provider.cli ? findBinary2(provider.cli) : null;
       let resolvedBin = cliBin;
       if (!resolvedBin && appPath && currentOs === "darwin") {
-        const bundled = path11.join(appPath, "Contents", "Resources", "app", "bin", provider.cli || "");
-        if (provider.cli && fs8.existsSync(bundled)) resolvedBin = bundled;
+        const bundled = path12.join(appPath, "Contents", "Resources", "app", "bin", provider.cli || "");
+        if (provider.cli && fs9.existsSync(bundled)) resolvedBin = bundled;
       }
       info.installed = !!(appPath || resolvedBin);
       info.path = appPath || null;
@@ -11908,8 +12050,8 @@ async function detectAllVersions(loader, archive) {
 
 // src/daemon/dev-server.ts
 import * as http2 from "http";
-import * as fs11 from "fs";
-import * as path14 from "path";
+import * as fs12 from "fs";
+import * as path15 from "path";
 
 // src/daemon/scaffold-template.ts
 function generateFiles(type, name, category, opts = {}) {
@@ -12245,8 +12387,8 @@ init_logger();
 
 // src/daemon/dev-cdp-handlers.ts
 init_logger();
-import * as fs9 from "fs";
-import * as path12 from "path";
+import * as fs10 from "fs";
+import * as path13 from "path";
 async function handleCdpEvaluate(ctx, req, res) {
   const body = await ctx.readBody(req);
   const { expression, timeout, ideType } = body;
@@ -12424,18 +12566,18 @@ async function handleScriptHints(ctx, type, _req, res) {
     return;
   }
   let scriptsPath = "";
-  const directScripts = path12.join(dir, "scripts.js");
-  if (fs9.existsSync(directScripts)) {
+  const directScripts = path13.join(dir, "scripts.js");
+  if (fs10.existsSync(directScripts)) {
     scriptsPath = directScripts;
   } else {
-    const scriptsDir = path12.join(dir, "scripts");
-    if (fs9.existsSync(scriptsDir)) {
-      const versions = fs9.readdirSync(scriptsDir).filter((d) => {
-        return fs9.statSync(path12.join(scriptsDir, d)).isDirectory();
+    const scriptsDir = path13.join(dir, "scripts");
+    if (fs10.existsSync(scriptsDir)) {
+      const versions = fs10.readdirSync(scriptsDir).filter((d) => {
+        return fs10.statSync(path13.join(scriptsDir, d)).isDirectory();
       }).sort().reverse();
       for (const ver of versions) {
-        const p = path12.join(scriptsDir, ver, "scripts.js");
-        if (fs9.existsSync(p)) {
+        const p = path13.join(scriptsDir, ver, "scripts.js");
+        if (fs10.existsSync(p)) {
           scriptsPath = p;
           break;
         }
@@ -12447,7 +12589,7 @@ async function handleScriptHints(ctx, type, _req, res) {
     return;
   }
   try {
-    const source = fs9.readFileSync(scriptsPath, "utf-8");
+    const source = fs10.readFileSync(scriptsPath, "utf-8");
     const hints = {};
     const funcRegex = /module\.exports\.(\w+)\s*=\s*function\s+\w+\s*\(params\)/g;
     let match;
@@ -13488,9 +13630,9 @@ async function handleCliRaw(ctx, req, res) {
 }
 
 // src/daemon/dev-auto-implement.ts
-import * as fs10 from "fs";
-import * as path13 from "path";
-import * as os15 from "os";
+import * as fs11 from "fs";
+import * as path14 from "path";
+import * as os16 from "os";
 function getDefaultAutoImplReference(ctx, category, type) {
   if (category === "cli") {
     return type === "codex-cli" ? "claude-cli" : "codex-cli";
@@ -13506,45 +13648,45 @@ function resolveAutoImplReference(ctx, category, requestedReference, targetType)
   return fallback?.type || null;
 }
 function getLatestScriptVersionDir(scriptsDir) {
-  if (!fs10.existsSync(scriptsDir)) return null;
-  const versions = fs10.readdirSync(scriptsDir).filter((d) => {
+  if (!fs11.existsSync(scriptsDir)) return null;
+  const versions = fs11.readdirSync(scriptsDir).filter((d) => {
     try {
-      return fs10.statSync(path13.join(scriptsDir, d)).isDirectory();
+      return fs11.statSync(path14.join(scriptsDir, d)).isDirectory();
     } catch {
       return false;
     }
   }).sort((a, b) => b.localeCompare(a, void 0, { numeric: true, sensitivity: "base" }));
   if (versions.length === 0) return null;
-  return path13.join(scriptsDir, versions[0]);
+  return path14.join(scriptsDir, versions[0]);
 }
 function resolveAutoImplWritableProviderDir(ctx, category, type, requestedDir) {
-  const canonicalUserDir = path13.resolve(ctx.providerLoader.getUserProviderDir(category, type));
-  const desiredDir = requestedDir ? path13.resolve(requestedDir) : canonicalUserDir;
-  const upstreamRoot = path13.resolve(ctx.providerLoader.getUpstreamDir());
-  if (desiredDir === upstreamRoot || desiredDir.startsWith(`${upstreamRoot}${path13.sep}`)) {
+  const canonicalUserDir = path14.resolve(ctx.providerLoader.getUserProviderDir(category, type));
+  const desiredDir = requestedDir ? path14.resolve(requestedDir) : canonicalUserDir;
+  const upstreamRoot = path14.resolve(ctx.providerLoader.getUpstreamDir());
+  if (desiredDir === upstreamRoot || desiredDir.startsWith(`${upstreamRoot}${path14.sep}`)) {
     return { dir: null, reason: `Refusing to write into upstream provider directory: ${desiredDir}` };
   }
-  if (path13.basename(desiredDir) !== type) {
+  if (path14.basename(desiredDir) !== type) {
     return { dir: null, reason: `Requested writable provider directory must end with '${type}': ${desiredDir}` };
   }
   const sourceDir = ctx.findProviderDir(type);
   if (!sourceDir) {
     return { dir: null, reason: `Provider source directory not found for '${type}'` };
   }
-  if (!fs10.existsSync(desiredDir)) {
-    fs10.mkdirSync(path13.dirname(desiredDir), { recursive: true });
-    fs10.cpSync(sourceDir, desiredDir, { recursive: true });
+  if (!fs11.existsSync(desiredDir)) {
+    fs11.mkdirSync(path14.dirname(desiredDir), { recursive: true });
+    fs11.cpSync(sourceDir, desiredDir, { recursive: true });
     ctx.log(`Auto-implement writable copy created: ${desiredDir}`);
   }
-  const providerJson = path13.join(desiredDir, "provider.json");
-  if (!fs10.existsSync(providerJson)) {
+  const providerJson = path14.join(desiredDir, "provider.json");
+  if (!fs11.existsSync(providerJson)) {
     return { dir: null, reason: `provider.json not found in writable provider directory: ${desiredDir}` };
   }
   try {
-    const providerData = JSON.parse(fs10.readFileSync(providerJson, "utf-8"));
+    const providerData = JSON.parse(fs11.readFileSync(providerJson, "utf-8"));
     if (providerData.disableUpstream !== true) {
       providerData.disableUpstream = true;
-      fs10.writeFileSync(providerJson, JSON.stringify(providerData, null, 2));
+      fs11.writeFileSync(providerJson, JSON.stringify(providerData, null, 2));
     }
   } catch (error) {
     return {
@@ -13557,15 +13699,15 @@ function resolveAutoImplWritableProviderDir(ctx, category, type, requestedDir) {
 function loadAutoImplReferenceScripts(ctx, referenceType) {
   if (!referenceType) return {};
   const refDir = ctx.findProviderDir(referenceType);
-  if (!refDir || !fs10.existsSync(refDir)) return {};
+  if (!refDir || !fs11.existsSync(refDir)) return {};
   const referenceScripts = {};
-  const scriptsDir = path13.join(refDir, "scripts");
+  const scriptsDir = path14.join(refDir, "scripts");
   const latestDir = getLatestScriptVersionDir(scriptsDir);
   if (!latestDir) return referenceScripts;
-  for (const file of fs10.readdirSync(latestDir)) {
+  for (const file of fs11.readdirSync(latestDir)) {
     if (!file.endsWith(".js")) continue;
     try {
-      referenceScripts[file] = fs10.readFileSync(path13.join(latestDir, file), "utf-8");
+      referenceScripts[file] = fs11.readFileSync(path14.join(latestDir, file), "utf-8");
     } catch {
     }
   }
@@ -13616,16 +13758,16 @@ async function handleAutoImplement(ctx, type, req, res) {
     });
     const referenceScripts = loadAutoImplReferenceScripts(ctx, resolvedReference);
     const prompt = buildAutoImplPrompt(ctx, type, provider, providerDir, functions, domContext, referenceScripts, comment, resolvedReference);
-    const tmpDir = path13.join(os15.tmpdir(), "adhdev-autoimpl");
-    if (!fs10.existsSync(tmpDir)) fs10.mkdirSync(tmpDir, { recursive: true });
-    const promptFile = path13.join(tmpDir, `prompt-${type}-${Date.now()}.md`);
-    fs10.writeFileSync(promptFile, prompt, "utf-8");
+    const tmpDir = path14.join(os16.tmpdir(), "adhdev-autoimpl");
+    if (!fs11.existsSync(tmpDir)) fs11.mkdirSync(tmpDir, { recursive: true });
+    const promptFile = path14.join(tmpDir, `prompt-${type}-${Date.now()}.md`);
+    fs11.writeFileSync(promptFile, prompt, "utf-8");
     ctx.log(`Auto-implement prompt written to ${promptFile} (${prompt.length} chars)`);
     const agentProvider = ctx.providerLoader.resolve(agent) || ctx.providerLoader.getMeta(agent);
-    const spawn3 = agentProvider?.spawn;
-    if (!spawn3?.command) {
+    const spawn4 = agentProvider?.spawn;
+    if (!spawn4?.command) {
       try {
-        fs10.unlinkSync(promptFile);
+        fs11.unlinkSync(promptFile);
       } catch {
       }
       ctx.json(res, 400, { error: `Agent '${agent}' has no spawn config. Select a CLI provider with a spawn configuration.` });
@@ -13633,21 +13775,21 @@ async function handleAutoImplement(ctx, type, req, res) {
     }
     const agentCategory = agentProvider?.category;
     if (agentCategory === "acp") {
-      sendAutoImplSSE(ctx, { event: "progress", data: { function: "_init", status: "spawning", message: `Spawning ACP agent: ${spawn3.command} ${(spawn3.args || []).join(" ")}` } });
+      sendAutoImplSSE(ctx, { event: "progress", data: { function: "_init", status: "spawning", message: `Spawning ACP agent: ${spawn4.command} ${(spawn4.args || []).join(" ")}` } });
       ctx.autoImplStatus = { running: true, type, progress: [] };
       const { ClientSideConnection: ClientSideConnection2, ndJsonStream: ndJsonStream2, PROTOCOL_VERSION: PROTOCOL_VERSION2 } = await import("@agentclientprotocol/sdk");
       const { Readable: Readable2, Writable: Writable2 } = await import("stream");
       const { spawn: spawnFn2 } = await import("child_process");
-      const acpArgs = [...spawn3.args || []];
+      const acpArgs = [...spawn4.args || []];
       if (model) {
         acpArgs.push("--model", model);
         ctx.log(`Auto-implement ACP using model: ${model}`);
       }
-      const child2 = spawnFn2(spawn3.command, acpArgs, {
+      const child2 = spawnFn2(spawn4.command, acpArgs, {
         cwd: providerDir,
         stdio: ["pipe", "pipe", "pipe"],
-        shell: spawn3.shell ?? false,
-        env: { ...process.env, ...spawn3.env || {} }
+        shell: spawn4.shell ?? false,
+        env: { ...process.env, ...spawn4.env || {} }
       });
       ctx.autoImplProcess = child2;
       child2.stderr?.on("data", (d) => {
@@ -13726,7 +13868,7 @@ async function handleAutoImplement(ctx, type, req, res) {
         } catch {
         }
         try {
-          fs10.unlinkSync(promptFile);
+          fs11.unlinkSync(promptFile);
         } catch {
         }
         ctx.log(`Auto-implement (ACP) ${success ? "completed" : "failed"}: ${type} (exit: ${code})`);
@@ -13757,7 +13899,7 @@ async function handleAutoImplement(ctx, type, req, res) {
       ctx.json(res, 202, {
         started: true,
         type,
-        agent: spawn3.command,
+        agent: spawn4.command,
         functions,
         providerDir,
         message: "ACP Auto-implement started. Connect to SSE for progress.",
@@ -13765,11 +13907,11 @@ async function handleAutoImplement(ctx, type, req, res) {
       });
       return;
     }
-    const command = spawn3.command;
+    const command = spawn4.command;
     const interactiveFlags = ["--yolo", "--interactive", "-i"];
-    const baseArgs = [...spawn3.args || []].filter((a) => !interactiveFlags.includes(a));
+    const baseArgs = [...spawn4.args || []].filter((a) => !interactiveFlags.includes(a));
     let shellCmd;
-    const isWin = os15.platform() === "win32";
+    const isWin = os16.platform() === "win32";
     const escapeArg = (a) => isWin ? `"${a.replace(/"/g, '""')}"` : `'${a.replace(/'/g, "'\\''")}'`;
     if (command === "claude") {
       const args = [...baseArgs, "--dangerously-skip-permissions"];
@@ -13812,13 +13954,13 @@ async function handleAutoImplement(ctx, type, req, res) {
     try {
       const pty3 = __require("node-pty");
       ctx.log(`Auto-implement spawn (PTY): ${shellCmd}`);
-      const isWin2 = os15.platform() === "win32";
+      const isWin2 = os16.platform() === "win32";
       child = pty3.spawn(isWin2 ? "cmd.exe" : process.env.SHELL || "/bin/zsh", [isWin2 ? "/c" : "-c", shellCmd], {
         name: "xterm-256color",
         cols: 120,
         rows: 40,
         cwd: providerDir,
-        env: { ...process.env, ...spawn3.env || {} }
+        env: { ...process.env, ...spawn4.env || {} }
       });
       isPty = true;
     } catch (err) {
@@ -13830,7 +13972,7 @@ async function handleAutoImplement(ctx, type, req, res) {
         stdio: ["pipe", "pipe", "pipe"],
         env: {
           ...process.env,
-          ...spawn3.env || {},
+          ...spawn4.env || {},
           ...command === "gemini" ? { SANDBOX: "1", GEMINI_CLI_NO_RELAUNCH: "1" } : {}
         }
       });
@@ -13906,7 +14048,7 @@ async function handleAutoImplement(ctx, type, req, res) {
         } catch {
         }
         try {
-          fs10.unlinkSync(promptFile);
+          fs11.unlinkSync(promptFile);
         } catch {
         }
       });
@@ -13942,7 +14084,7 @@ async function handleAutoImplement(ctx, type, req, res) {
         } catch {
         }
         try {
-          fs10.unlinkSync(promptFile);
+          fs11.unlinkSync(promptFile);
         } catch {
         }
         ctx.log(`Auto-implement ${success ? "completed" : "failed"}: ${type} (exit: ${code})`);
@@ -13989,7 +14131,7 @@ function buildAutoImplPrompt(ctx, type, provider, providerDir, functions, domCon
     setMode: "set_mode.js"
   };
   const targetFileNames = new Set(functions.map((fn) => funcToFile[fn]).filter(Boolean));
-  const scriptsDir = path13.join(providerDir, "scripts");
+  const scriptsDir = path14.join(providerDir, "scripts");
   const latestScriptsDir = getLatestScriptVersionDir(scriptsDir);
   if (latestScriptsDir) {
     lines.push(`Scripts version directory: \`${latestScriptsDir}\``);
@@ -13997,10 +14139,10 @@ function buildAutoImplPrompt(ctx, type, provider, providerDir, functions, domCon
     lines.push("## \u270F\uFE0F Target Files (EDIT THESE)");
     lines.push("These are the ONLY files you are allowed to modify. Replace the TODO stubs with working implementations.");
     lines.push("");
-    for (const file of fs10.readdirSync(latestScriptsDir)) {
+    for (const file of fs11.readdirSync(latestScriptsDir)) {
       if (file.endsWith(".js") && targetFileNames.has(file)) {
         try {
-          const content = fs10.readFileSync(path13.join(latestScriptsDir, file), "utf-8");
+          const content = fs11.readFileSync(path14.join(latestScriptsDir, file), "utf-8");
           lines.push(`### \`${file}\` \u270F\uFE0F EDIT`);
           lines.push("```javascript");
           lines.push(content);
@@ -14010,14 +14152,14 @@ function buildAutoImplPrompt(ctx, type, provider, providerDir, functions, domCon
         }
       }
     }
-    const refFiles = fs10.readdirSync(latestScriptsDir).filter((f) => f.endsWith(".js") && !targetFileNames.has(f));
+    const refFiles = fs11.readdirSync(latestScriptsDir).filter((f) => f.endsWith(".js") && !targetFileNames.has(f));
     if (refFiles.length > 0) {
       lines.push("## \u{1F512} Other Scripts (REFERENCE ONLY \u2014 DO NOT EDIT)");
       lines.push("These files are shown for context only. Do NOT modify them under any circumstances.");
       lines.push("");
       for (const file of refFiles) {
         try {
-          const content = fs10.readFileSync(path13.join(latestScriptsDir, file), "utf-8");
+          const content = fs11.readFileSync(path14.join(latestScriptsDir, file), "utf-8");
           lines.push(`### \`${file}\` \u{1F512}`);
           lines.push("```javascript");
           lines.push(content);
@@ -14058,11 +14200,11 @@ function buildAutoImplPrompt(ctx, type, provider, providerDir, functions, domCon
       lines.push("");
     }
   }
-  const docsDir = path13.join(providerDir, "../../docs");
+  const docsDir = path14.join(providerDir, "../../docs");
   const loadGuide = (name) => {
     try {
-      const p = path13.join(docsDir, name);
-      if (fs10.existsSync(p)) return fs10.readFileSync(p, "utf-8");
+      const p = path14.join(docsDir, name);
+      if (fs11.existsSync(p)) return fs11.readFileSync(p, "utf-8");
     } catch {
     }
     return null;
@@ -14235,7 +14377,7 @@ function buildCliAutoImplPrompt(ctx, type, provider, providerDir, functions, ref
     parseApproval: "parse_approval.js"
   };
   const targetFileNames = new Set(functions.map((fn) => funcToFile[fn]).filter(Boolean));
-  const scriptsDir = path13.join(providerDir, "scripts");
+  const scriptsDir = path14.join(providerDir, "scripts");
   const latestScriptsDir = getLatestScriptVersionDir(scriptsDir);
   if (latestScriptsDir) {
     lines.push(`Scripts version directory: \`${latestScriptsDir}\``);
@@ -14243,11 +14385,11 @@ function buildCliAutoImplPrompt(ctx, type, provider, providerDir, functions, ref
     lines.push("## \u270F\uFE0F Target Files (EDIT THESE)");
     lines.push("These are the ONLY files you are allowed to modify. Replace TODO or heuristic-only logic with working PTY-aware implementations.");
     lines.push("");
-    for (const file of fs10.readdirSync(latestScriptsDir)) {
+    for (const file of fs11.readdirSync(latestScriptsDir)) {
       if (!file.endsWith(".js")) continue;
       if (!targetFileNames.has(file)) continue;
       try {
-        const content = fs10.readFileSync(path13.join(latestScriptsDir, file), "utf-8");
+        const content = fs11.readFileSync(path14.join(latestScriptsDir, file), "utf-8");
         lines.push(`### \`${file}\` \u270F\uFE0F EDIT`);
         lines.push("```javascript");
         lines.push(content);
@@ -14256,14 +14398,14 @@ function buildCliAutoImplPrompt(ctx, type, provider, providerDir, functions, ref
       } catch {
       }
     }
-    const refFiles = fs10.readdirSync(latestScriptsDir).filter((f) => f.endsWith(".js") && !targetFileNames.has(f));
+    const refFiles = fs11.readdirSync(latestScriptsDir).filter((f) => f.endsWith(".js") && !targetFileNames.has(f));
     if (refFiles.length > 0) {
       lines.push("## \u{1F512} Other Scripts (REFERENCE ONLY \u2014 DO NOT EDIT)");
       lines.push("These files are shown for context only. Do NOT modify them under any circumstances.");
       lines.push("");
       for (const file of refFiles) {
         try {
-          const content = fs10.readFileSync(path13.join(latestScriptsDir, file), "utf-8");
+          const content = fs11.readFileSync(path14.join(latestScriptsDir, file), "utf-8");
           lines.push(`### \`${file}\` \u{1F512}`);
           lines.push("```javascript");
           lines.push(content);
@@ -14296,11 +14438,11 @@ function buildCliAutoImplPrompt(ctx, type, provider, providerDir, functions, ref
       lines.push("");
     }
   }
-  const docsDir = path13.join(providerDir, "../../docs");
+  const docsDir = path14.join(providerDir, "../../docs");
   const loadGuide = (name) => {
     try {
-      const p = path13.join(docsDir, name);
-      if (fs10.existsSync(p)) return fs10.readFileSync(p, "utf-8");
+      const p = path14.join(docsDir, name);
+      if (fs11.existsSync(p)) return fs11.readFileSync(p, "utf-8");
     } catch {
     }
     return null;
@@ -14557,8 +14699,8 @@ var DevServer = class _DevServer {
   }
   getEndpointList() {
     return this.routes.map((r) => {
-      const path15 = typeof r.pattern === "string" ? r.pattern : r.pattern.source.replace(/\\\//g, "/").replace(/\(\[.*?\]\+\)/g, ":type").replace(/[\^$]/g, "");
-      return `${r.method.padEnd(5)} ${path15}`;
+      const path16 = typeof r.pattern === "string" ? r.pattern : r.pattern.source.replace(/\\\//g, "/").replace(/\(\[.*?\]\+\)/g, ":type").replace(/[\^$]/g, "");
+      return `${r.method.padEnd(5)} ${path16}`;
     });
   }
   async start(port = DEV_SERVER_PORT) {
@@ -14659,16 +14801,16 @@ var DevServer = class _DevServer {
       this.json(res, 404, { error: `Provider not found: ${type}` });
       return;
     }
-    const spawn3 = provider.spawn;
-    if (!spawn3) {
+    const spawn4 = provider.spawn;
+    if (!spawn4) {
       this.json(res, 400, { error: `Provider ${type} has no spawn config` });
       return;
     }
     const { spawn: spawnFn } = await import("child_process");
     const start = Date.now();
     try {
-      const child = spawnFn(spawn3.command, [...spawn3.args || []], {
-        shell: spawn3.shell ?? false,
+      const child = spawnFn(spawn4.command, [...spawn4.args || []], {
+        shell: spawn4.shell ?? false,
         timeout: 5e3,
         stdio: ["pipe", "pipe", "pipe"]
       });
@@ -14700,7 +14842,7 @@ var DevServer = class _DevServer {
       const elapsed = Date.now() - start;
       this.json(res, 200, {
         success: true,
-        command: `${spawn3.command} ${(spawn3.args || []).join(" ")}`,
+        command: `${spawn4.command} ${(spawn4.args || []).join(" ")}`,
         elapsed,
         stdout: stdout.trim(),
         stderr: stderr.trim(),
@@ -14710,7 +14852,7 @@ var DevServer = class _DevServer {
       const elapsed = Date.now() - start;
       this.json(res, 200, {
         success: false,
-        command: `${spawn3.command} ${(spawn3.args || []).join(" ")}`,
+        command: `${spawn4.command} ${(spawn4.args || []).join(" ")}`,
         elapsed,
         error: e.message
       });
@@ -14840,12 +14982,12 @@ var DevServer = class _DevServer {
   // ─── DevConsole SPA ───
   getConsoleDistDir() {
     const candidates = [
-      path14.resolve(__dirname, "../../web-devconsole/dist"),
-      path14.resolve(__dirname, "../../../web-devconsole/dist"),
-      path14.join(process.cwd(), "packages/web-devconsole/dist")
+      path15.resolve(__dirname, "../../web-devconsole/dist"),
+      path15.resolve(__dirname, "../../../web-devconsole/dist"),
+      path15.join(process.cwd(), "packages/web-devconsole/dist")
     ];
     for (const dir of candidates) {
-      if (fs11.existsSync(path14.join(dir, "index.html"))) return dir;
+      if (fs12.existsSync(path15.join(dir, "index.html"))) return dir;
     }
     return null;
   }
@@ -14855,9 +14997,9 @@ var DevServer = class _DevServer {
       this.json(res, 500, { error: "DevConsole not found. Run: npm run build -w packages/web-devconsole" });
       return;
     }
-    const htmlPath = path14.join(distDir, "index.html");
+    const htmlPath = path15.join(distDir, "index.html");
     try {
-      const html = fs11.readFileSync(htmlPath, "utf-8");
+      const html = fs12.readFileSync(htmlPath, "utf-8");
       res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
       res.end(html);
     } catch (e) {
@@ -14880,15 +15022,15 @@ var DevServer = class _DevServer {
       this.json(res, 404, { error: "Not found" });
       return;
     }
-    const safePath = path14.normalize(pathname).replace(/^\.\.\//, "");
-    const filePath = path14.join(distDir, safePath);
+    const safePath = path15.normalize(pathname).replace(/^\.\.\//, "");
+    const filePath = path15.join(distDir, safePath);
     if (!filePath.startsWith(distDir)) {
       this.json(res, 403, { error: "Forbidden" });
       return;
     }
     try {
-      const content = fs11.readFileSync(filePath);
-      const ext = path14.extname(filePath);
+      const content = fs12.readFileSync(filePath);
+      const ext = path15.extname(filePath);
       const contentType = _DevServer.MIME_MAP[ext] || "application/octet-stream";
       res.writeHead(200, { "Content-Type": contentType, "Cache-Control": "public, max-age=31536000, immutable" });
       res.end(content);
@@ -14996,14 +15138,14 @@ var DevServer = class _DevServer {
     const files = [];
     const scan = (d, prefix) => {
       try {
-        for (const entry of fs11.readdirSync(d, { withFileTypes: true })) {
+        for (const entry of fs12.readdirSync(d, { withFileTypes: true })) {
           if (entry.name.startsWith(".") || entry.name.endsWith(".bak")) continue;
           const rel = prefix ? `${prefix}/${entry.name}` : entry.name;
           if (entry.isDirectory()) {
             files.push({ path: rel, size: 0, type: "dir" });
-            scan(path14.join(d, entry.name), rel);
+            scan(path15.join(d, entry.name), rel);
           } else {
-            const stat = fs11.statSync(path14.join(d, entry.name));
+            const stat = fs12.statSync(path15.join(d, entry.name));
             files.push({ path: rel, size: stat.size, type: "file" });
           }
         }
@@ -15026,16 +15168,16 @@ var DevServer = class _DevServer {
       this.json(res, 404, { error: `Provider directory not found: ${type}` });
       return;
     }
-    const fullPath = path14.resolve(dir, path14.normalize(filePath));
+    const fullPath = path15.resolve(dir, path15.normalize(filePath));
     if (!fullPath.startsWith(dir)) {
       this.json(res, 403, { error: "Forbidden" });
       return;
     }
-    if (!fs11.existsSync(fullPath) || fs11.statSync(fullPath).isDirectory()) {
+    if (!fs12.existsSync(fullPath) || fs12.statSync(fullPath).isDirectory()) {
       this.json(res, 404, { error: `File not found: ${filePath}` });
       return;
     }
-    const content = fs11.readFileSync(fullPath, "utf-8");
+    const content = fs12.readFileSync(fullPath, "utf-8");
     this.json(res, 200, { type, path: filePath, content, lines: content.split("\n").length });
   }
   /** POST /api/providers/:type/file — write a file { path, content } */
@@ -15051,15 +15193,15 @@ var DevServer = class _DevServer {
       this.json(res, 404, { error: `Provider directory not found: ${type}` });
       return;
     }
-    const fullPath = path14.resolve(dir, path14.normalize(filePath));
+    const fullPath = path15.resolve(dir, path15.normalize(filePath));
     if (!fullPath.startsWith(dir)) {
       this.json(res, 403, { error: "Forbidden" });
       return;
     }
     try {
-      if (fs11.existsSync(fullPath)) fs11.copyFileSync(fullPath, fullPath + ".bak");
-      fs11.mkdirSync(path14.dirname(fullPath), { recursive: true });
-      fs11.writeFileSync(fullPath, content, "utf-8");
+      if (fs12.existsSync(fullPath)) fs12.copyFileSync(fullPath, fullPath + ".bak");
+      fs12.mkdirSync(path15.dirname(fullPath), { recursive: true });
+      fs12.writeFileSync(fullPath, content, "utf-8");
       this.log(`File saved: ${fullPath} (${content.length} chars)`);
       this.providerLoader.reload();
       this.json(res, 200, { saved: true, path: filePath, chars: content.length });
@@ -15075,9 +15217,9 @@ var DevServer = class _DevServer {
       return;
     }
     for (const name of ["scripts.js", "provider.json"]) {
-      const p = path14.join(dir, name);
-      if (fs11.existsSync(p)) {
-        const source = fs11.readFileSync(p, "utf-8");
+      const p = path15.join(dir, name);
+      if (fs12.existsSync(p)) {
+        const source = fs12.readFileSync(p, "utf-8");
         this.json(res, 200, { type, path: p, source, lines: source.split("\n").length });
         return;
       }
@@ -15096,11 +15238,11 @@ var DevServer = class _DevServer {
       this.json(res, 404, { error: `Provider not found: ${type}` });
       return;
     }
-    const target = fs11.existsSync(path14.join(dir, "scripts.js")) ? "scripts.js" : "provider.json";
-    const targetPath = path14.join(dir, target);
+    const target = fs12.existsSync(path15.join(dir, "scripts.js")) ? "scripts.js" : "provider.json";
+    const targetPath = path15.join(dir, target);
     try {
-      if (fs11.existsSync(targetPath)) fs11.copyFileSync(targetPath, targetPath + ".bak");
-      fs11.writeFileSync(targetPath, source, "utf-8");
+      if (fs12.existsSync(targetPath)) fs12.copyFileSync(targetPath, targetPath + ".bak");
+      fs12.writeFileSync(targetPath, source, "utf-8");
       this.log(`Saved provider: ${targetPath} (${source.length} chars)`);
       this.providerLoader.reload();
       this.json(res, 200, { saved: true, path: targetPath, chars: source.length });
@@ -15179,20 +15321,20 @@ var DevServer = class _DevServer {
       this.json(res, 404, { error: `Provider not found: ${type}` });
       return;
     }
-    const spawn3 = provider.spawn;
-    if (!spawn3) {
+    const spawn4 = provider.spawn;
+    if (!spawn4) {
       this.json(res, 400, { error: `Provider ${type} has no spawn config` });
       return;
     }
     const { spawn: spawnFn } = await import("child_process");
     const start = Date.now();
     try {
-      const args = [...spawn3.args || [], message];
-      const child = spawnFn(spawn3.command, args, {
-        shell: spawn3.shell ?? false,
+      const args = [...spawn4.args || [], message];
+      const child = spawnFn(spawn4.command, args, {
+        shell: spawn4.shell ?? false,
         timeout,
         stdio: ["pipe", "pipe", "pipe"],
-        env: { ...process.env, ...spawn3.env || {} }
+        env: { ...process.env, ...spawn4.env || {} }
       });
       let stdout = "";
       let stderr = "";
@@ -15257,21 +15399,21 @@ var DevServer = class _DevServer {
     }
     let targetDir;
     targetDir = this.providerLoader.getUserProviderDir(category, type);
-    const jsonPath = path14.join(targetDir, "provider.json");
-    if (fs11.existsSync(jsonPath)) {
+    const jsonPath = path15.join(targetDir, "provider.json");
+    if (fs12.existsSync(jsonPath)) {
       this.json(res, 409, { error: `Provider already exists at ${targetDir}`, path: targetDir });
       return;
     }
     try {
       const result = generateFiles(type, name, category, { cdpPorts, cli, processName, installPath, binary, extensionId, version, osPaths, processNames });
-      fs11.mkdirSync(targetDir, { recursive: true });
-      fs11.writeFileSync(jsonPath, result["provider.json"], "utf-8");
+      fs12.mkdirSync(targetDir, { recursive: true });
+      fs12.writeFileSync(jsonPath, result["provider.json"], "utf-8");
       const createdFiles = ["provider.json"];
       if (result.files) {
         for (const [relPath, content] of Object.entries(result.files)) {
-          const fullPath = path14.join(targetDir, relPath);
-          fs11.mkdirSync(path14.dirname(fullPath), { recursive: true });
-          fs11.writeFileSync(fullPath, content, "utf-8");
+          const fullPath = path15.join(targetDir, relPath);
+          fs12.mkdirSync(path15.dirname(fullPath), { recursive: true });
+          fs12.writeFileSync(fullPath, content, "utf-8");
           createdFiles.push(relPath);
         }
       }
@@ -15320,45 +15462,45 @@ var DevServer = class _DevServer {
   }
   // ─── Phase 2: Auto-Implement Backend ───
   getLatestScriptVersionDir(scriptsDir) {
-    if (!fs11.existsSync(scriptsDir)) return null;
-    const versions = fs11.readdirSync(scriptsDir).filter((d) => {
+    if (!fs12.existsSync(scriptsDir)) return null;
+    const versions = fs12.readdirSync(scriptsDir).filter((d) => {
       try {
-        return fs11.statSync(path14.join(scriptsDir, d)).isDirectory();
+        return fs12.statSync(path15.join(scriptsDir, d)).isDirectory();
       } catch {
         return false;
       }
     }).sort((a, b) => b.localeCompare(a, void 0, { numeric: true, sensitivity: "base" }));
     if (versions.length === 0) return null;
-    return path14.join(scriptsDir, versions[0]);
+    return path15.join(scriptsDir, versions[0]);
   }
   resolveAutoImplWritableProviderDir(category, type, requestedDir) {
-    const canonicalUserDir = path14.resolve(this.providerLoader.getUserProviderDir(category, type));
-    const desiredDir = requestedDir ? path14.resolve(requestedDir) : canonicalUserDir;
-    const upstreamRoot = path14.resolve(this.providerLoader.getUpstreamDir());
-    if (desiredDir === upstreamRoot || desiredDir.startsWith(`${upstreamRoot}${path14.sep}`)) {
+    const canonicalUserDir = path15.resolve(this.providerLoader.getUserProviderDir(category, type));
+    const desiredDir = requestedDir ? path15.resolve(requestedDir) : canonicalUserDir;
+    const upstreamRoot = path15.resolve(this.providerLoader.getUpstreamDir());
+    if (desiredDir === upstreamRoot || desiredDir.startsWith(`${upstreamRoot}${path15.sep}`)) {
       return { dir: null, reason: `Refusing to write into upstream provider directory: ${desiredDir}` };
     }
-    if (path14.basename(desiredDir) !== type) {
+    if (path15.basename(desiredDir) !== type) {
       return { dir: null, reason: `Requested writable provider directory must end with '${type}': ${desiredDir}` };
     }
     const sourceDir = this.findProviderDir(type);
     if (!sourceDir) {
       return { dir: null, reason: `Provider source directory not found for '${type}'` };
     }
-    if (!fs11.existsSync(desiredDir)) {
-      fs11.mkdirSync(path14.dirname(desiredDir), { recursive: true });
-      fs11.cpSync(sourceDir, desiredDir, { recursive: true });
+    if (!fs12.existsSync(desiredDir)) {
+      fs12.mkdirSync(path15.dirname(desiredDir), { recursive: true });
+      fs12.cpSync(sourceDir, desiredDir, { recursive: true });
       this.log(`Auto-implement writable copy created: ${desiredDir}`);
     }
-    const providerJson = path14.join(desiredDir, "provider.json");
-    if (!fs11.existsSync(providerJson)) {
+    const providerJson = path15.join(desiredDir, "provider.json");
+    if (!fs12.existsSync(providerJson)) {
       return { dir: null, reason: `provider.json not found in writable provider directory: ${desiredDir}` };
     }
     try {
-      const providerData = JSON.parse(fs11.readFileSync(providerJson, "utf-8"));
+      const providerData = JSON.parse(fs12.readFileSync(providerJson, "utf-8"));
       if (providerData.disableUpstream !== true) {
         providerData.disableUpstream = true;
-        fs11.writeFileSync(providerJson, JSON.stringify(providerData, null, 2));
+        fs12.writeFileSync(providerJson, JSON.stringify(providerData, null, 2));
       }
     } catch (error) {
       return {
@@ -15398,7 +15540,7 @@ var DevServer = class _DevServer {
       setMode: "set_mode.js"
     };
     const targetFileNames = new Set(functions.map((fn) => funcToFile[fn]).filter(Boolean));
-    const scriptsDir = path14.join(providerDir, "scripts");
+    const scriptsDir = path15.join(providerDir, "scripts");
     const latestScriptsDir = this.getLatestScriptVersionDir(scriptsDir);
     if (latestScriptsDir) {
       lines.push(`Scripts version directory: \`${latestScriptsDir}\``);
@@ -15406,10 +15548,10 @@ var DevServer = class _DevServer {
       lines.push("## \u270F\uFE0F Target Files (EDIT THESE)");
       lines.push("These are the ONLY files you are allowed to modify. Replace the TODO stubs with working implementations.");
       lines.push("");
-      for (const file of fs11.readdirSync(latestScriptsDir)) {
+      for (const file of fs12.readdirSync(latestScriptsDir)) {
         if (file.endsWith(".js") && targetFileNames.has(file)) {
           try {
-            const content = fs11.readFileSync(path14.join(latestScriptsDir, file), "utf-8");
+            const content = fs12.readFileSync(path15.join(latestScriptsDir, file), "utf-8");
             lines.push(`### \`${file}\` \u270F\uFE0F EDIT`);
             lines.push("```javascript");
             lines.push(content);
@@ -15419,14 +15561,14 @@ var DevServer = class _DevServer {
           }
         }
       }
-      const refFiles = fs11.readdirSync(latestScriptsDir).filter((f) => f.endsWith(".js") && !targetFileNames.has(f));
+      const refFiles = fs12.readdirSync(latestScriptsDir).filter((f) => f.endsWith(".js") && !targetFileNames.has(f));
       if (refFiles.length > 0) {
         lines.push("## \u{1F512} Other Scripts (REFERENCE ONLY \u2014 DO NOT EDIT)");
         lines.push("These files are shown for context only. Do NOT modify them under any circumstances.");
         lines.push("");
         for (const file of refFiles) {
           try {
-            const content = fs11.readFileSync(path14.join(latestScriptsDir, file), "utf-8");
+            const content = fs12.readFileSync(path15.join(latestScriptsDir, file), "utf-8");
             lines.push(`### \`${file}\` \u{1F512}`);
             lines.push("```javascript");
             lines.push(content);
@@ -15467,11 +15609,11 @@ var DevServer = class _DevServer {
         lines.push("");
       }
     }
-    const docsDir = path14.join(providerDir, "../../docs");
+    const docsDir = path15.join(providerDir, "../../docs");
     const loadGuide = (name) => {
       try {
-        const p = path14.join(docsDir, name);
-        if (fs11.existsSync(p)) return fs11.readFileSync(p, "utf-8");
+        const p = path15.join(docsDir, name);
+        if (fs12.existsSync(p)) return fs12.readFileSync(p, "utf-8");
       } catch {
       }
       return null;
@@ -15644,7 +15786,7 @@ var DevServer = class _DevServer {
       parseApproval: "parse_approval.js"
     };
     const targetFileNames = new Set(functions.map((fn) => funcToFile[fn]).filter(Boolean));
-    const scriptsDir = path14.join(providerDir, "scripts");
+    const scriptsDir = path15.join(providerDir, "scripts");
     const latestScriptsDir = this.getLatestScriptVersionDir(scriptsDir);
     if (latestScriptsDir) {
       lines.push(`Scripts version directory: \`${latestScriptsDir}\``);
@@ -15652,11 +15794,11 @@ var DevServer = class _DevServer {
       lines.push("## \u270F\uFE0F Target Files (EDIT THESE)");
       lines.push("These are the ONLY files you are allowed to modify. Replace TODO or heuristic-only logic with working PTY-aware implementations.");
       lines.push("");
-      for (const file of fs11.readdirSync(latestScriptsDir)) {
+      for (const file of fs12.readdirSync(latestScriptsDir)) {
         if (!file.endsWith(".js")) continue;
         if (!targetFileNames.has(file)) continue;
         try {
-          const content = fs11.readFileSync(path14.join(latestScriptsDir, file), "utf-8");
+          const content = fs12.readFileSync(path15.join(latestScriptsDir, file), "utf-8");
           lines.push(`### \`${file}\` \u270F\uFE0F EDIT`);
           lines.push("```javascript");
           lines.push(content);
@@ -15665,14 +15807,14 @@ var DevServer = class _DevServer {
         } catch {
         }
       }
-      const refFiles = fs11.readdirSync(latestScriptsDir).filter((f) => f.endsWith(".js") && !targetFileNames.has(f));
+      const refFiles = fs12.readdirSync(latestScriptsDir).filter((f) => f.endsWith(".js") && !targetFileNames.has(f));
       if (refFiles.length > 0) {
         lines.push("## \u{1F512} Other Scripts (REFERENCE ONLY \u2014 DO NOT EDIT)");
         lines.push("These files are shown for context only. Do NOT modify them under any circumstances.");
         lines.push("");
         for (const file of refFiles) {
           try {
-            const content = fs11.readFileSync(path14.join(latestScriptsDir, file), "utf-8");
+            const content = fs12.readFileSync(path15.join(latestScriptsDir, file), "utf-8");
             lines.push(`### \`${file}\` \u{1F512}`);
             lines.push("```javascript");
             lines.push(content);
@@ -15705,11 +15847,11 @@ var DevServer = class _DevServer {
         lines.push("");
       }
     }
-    const docsDir = path14.join(providerDir, "../../docs");
+    const docsDir = path15.join(providerDir, "../../docs");
     const loadGuide = (name) => {
       try {
-        const p = path14.join(docsDir, name);
-        if (fs11.existsSync(p)) return fs11.readFileSync(p, "utf-8");
+        const p = path15.join(docsDir, name);
+        if (fs12.existsSync(p)) return fs12.readFileSync(p, "utf-8");
       } catch {
       }
       return null;
@@ -15942,6 +16084,7 @@ var SessionHostRuntimeTransport = class {
     this.ready = this.boot();
   }
   ready;
+  terminalQueriesHandled = true;
   client;
   dataCallbacks = /* @__PURE__ */ new Set();
   exitCallbacks = /* @__PURE__ */ new Set();
@@ -16447,8 +16590,8 @@ async function installExtension(ide, extension) {
       const res = await fetch(extension.vsixUrl);
       if (res.ok) {
         const buffer = Buffer.from(await res.arrayBuffer());
-        const fs12 = await import("fs");
-        fs12.writeFileSync(vsixPath, buffer);
+        const fs13 = await import("fs");
+        fs13.writeFileSync(vsixPath, buffer);
         return new Promise((resolve9) => {
           const cmd = `"${ide.cliCommand}" --install-extension "${vsixPath}" --force`;
           exec2(cmd, { timeout: 6e4 }, (error, _stdout, stderr) => {
@@ -16815,6 +16958,7 @@ export {
   loadConfig,
   logCommand,
   markSetupComplete,
+  maybeRunDaemonUpgradeHelperFromEnv,
   normalizeActiveChatData,
   normalizeManagedStatus,
   probeCdpPort,