@adhdev/daemon-core 0.8.12 → 0.8.14

package/dist/index.mjs

@@ -632,6 +632,13 @@ function logTerminalBackendSelection(preference, ghosttyAvailable, backendKind)
   const key = `${preference}:${ghosttyAvailable}:${backendKind}`;
   if (loggedTerminalBackends.has(key)) return;
   loggedTerminalBackends.add(key);
+  if (backendKind === "xterm" && preference !== "xterm" && !ghosttyAvailable) {
+    LOG.warn(
+      "Terminal",
+      `[terminal-screen] ghostty-vt unavailable; using xterm fallback (preference=${preference})`
+    );
+    return;
+  }
   LOG.info(
     "Terminal",
     `[terminal-screen] backend=${backendKind} preference=${preference} ghosttyAvailable=${ghosttyAvailable}`
@@ -694,6 +701,7 @@ var init_terminal_screen = __esm({
 });
 
 // src/cli-adapters/pty-transport.ts
+import * as os7 from "os";
 var pty, NodePtyRuntimeTransport, NodePtyTransportFactory;
 var init_pty_transport = __esm({
   "src/cli-adapters/pty-transport.ts"() {
@@ -734,11 +742,21 @@ var init_pty_transport = __esm({
     NodePtyTransportFactory = class {
       spawn(command, args, options) {
         if (!pty) throw new Error("node-pty is not installed");
+        let cwd = options.cwd;
+        if (cwd) {
+          try {
+            const fs15 = __require("fs");
+            const stat = fs15.statSync(cwd);
+            if (!stat.isDirectory()) cwd = os7.homedir();
+          } catch {
+            cwd = os7.homedir();
+          }
+        }
         const handle = pty.spawn(command, args, {
           name: "xterm-256color",
           cols: options.cols,
           rows: options.rows,
-          cwd: options.cwd,
+          cwd,
           env: options.env
         });
         return new NodePtyRuntimeTransport(handle);
@@ -747,13 +765,25 @@ var init_pty_transport = __esm({
   }
 });
 
+// src/cli-adapters/spawn-env.ts
+import {
+  sanitizeSpawnEnv,
+  applyTerminalColorEnv,
+  ensureNodePtySpawnHelperPermissions
+} from "@adhdev/session-host-core";
+var init_spawn_env = __esm({
+  "src/cli-adapters/spawn-env.ts"() {
+    "use strict";
+  }
+});
+
 // src/cli-adapters/provider-cli-adapter.ts
 var provider_cli_adapter_exports = {};
 __export(provider_cli_adapter_exports, {
   ProviderCliAdapter: () => ProviderCliAdapter,
   normalizeCliProviderForRuntime: () => normalizeCliProviderForRuntime
 });
-import * as os7 from "os";
+import * as os8 from "os";
 import * as path7 from "path";
 import { execSync as execSync3 } from "child_process";
 function stripAnsi(str) {
@@ -765,32 +795,6 @@ function stripTerminalNoise(str) {
 function sanitizeTerminalText(str) {
   return stripTerminalNoise(stripAnsi(str));
 }
-function applyPreferredTerminalColorEnv(env) {
-  if (env.NO_COLOR) return;
-  if (!env.TERM || env.TERM === "xterm-color") {
-    env.TERM = "xterm-256color";
-  }
-  if (!env.COLORTERM) env.COLORTERM = "truecolor";
-  if (process.platform === "win32") {
-    if (!env.FORCE_COLOR) env.FORCE_COLOR = "1";
-    if (!env.CLICOLOR) env.CLICOLOR = "1";
-  }
-}
-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 === "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];
-    }
-  }
-  applyPreferredTerminalColorEnv(env);
-  return env;
-}
 function computeTerminalQueryTail(buffer) {
   const prefixes = ["\x1B[6n", "\x1B[?6n"];
   const maxLength = prefixes.reduce((n, value) => Math.max(n, value.length), 0) - 1;
@@ -804,7 +808,7 @@ function computeTerminalQueryTail(buffer) {
   return "";
 }
 function findBinary(name) {
-  const isWin = os7.platform() === "win32";
+  const isWin = os8.platform() === "win32";
   try {
     const cmd = isWin ? `where ${name}` : `which ${name}`;
     return execSync3(cmd, { encoding: "utf-8", timeout: 5e3, stdio: ["pipe", "pipe", "pipe"] }).trim().split("\n")[0].trim();
@@ -852,7 +856,7 @@ function looksLikeMachOOrElf(filePath) {
 }
 function shSingleQuote(arg) {
   if (/^[a-zA-Z0-9@%_+=:,./-]+$/.test(arg)) return arg;
-  if (os7.platform() === "win32") {
+  if (os8.platform() === "win32") {
     return `"${arg.replace(/"/g, '""')}"`;
   }
   return `'${arg.replace(/'/g, `'\\''`)}'`;
@@ -919,34 +923,21 @@ function normalizeCliProviderForRuntime(raw) {
     }
   };
 }
-var pty2, ProviderCliAdapter;
+var pty2, buildCliSpawnEnv, ProviderCliAdapter;
 var init_provider_cli_adapter = __esm({
   "src/cli-adapters/provider-cli-adapter.ts"() {
     "use strict";
     init_logger();
     init_terminal_screen();
     init_pty_transport();
+    init_spawn_env();
     try {
       pty2 = __require("node-pty");
-      if (os7.platform() !== "win32") {
-        try {
-          const fs15 = __require("fs");
-          const ptyDir = path7.resolve(path7.dirname(__require.resolve("node-pty")), "..");
-          const platformArch = `${os7.platform()}-${os7.arch()}`;
-          const helper = path7.join(ptyDir, "prebuilds", platformArch, "spawn-helper");
-          if (fs15.existsSync(helper)) {
-            const stat = fs15.statSync(helper);
-            if (!(stat.mode & 73)) {
-              fs15.chmodSync(helper, stat.mode | 493);
-              LOG.info("CLI", "[node-pty] Fixed spawn-helper permissions");
-            }
-          }
-        } catch {
-        }
-      }
+      ensureNodePtySpawnHelperPermissions((msg) => LOG.info("CLI", msg));
     } catch {
       LOG.error("CLI", "[ProviderCliAdapter] node-pty not found. Terminal features disabled.");
     }
+    buildCliSpawnEnv = sanitizeSpawnEnv;
     ProviderCliAdapter = class _ProviderCliAdapter {
       constructor(provider, workingDir, extraArgs = [], transportFactory = new NodePtyTransportFactory()) {
         this.extraArgs = extraArgs;
@@ -954,7 +945,7 @@ var init_provider_cli_adapter = __esm({
         this.transportFactory = transportFactory;
         this.cliType = provider.type;
         this.cliName = provider.name;
-        this.workingDir = workingDir.startsWith("~") ? workingDir.replace(/^~/, os7.homedir()) : workingDir;
+        this.workingDir = workingDir.startsWith("~") ? workingDir.replace(/^~/, os8.homedir()) : workingDir;
         const t = provider.timeouts || {};
         this.timeouts = {
           ptyFlush: t.ptyFlush ?? 50,
@@ -1261,7 +1252,7 @@ var init_provider_cli_adapter = __esm({
         if (this.ptyProcess) return;
         const { spawn: spawnConfig } = this.provider;
         const binaryPath = findBinary(spawnConfig.command);
-        const isWin = os7.platform() === "win32";
+        const isWin = os8.platform() === "win32";
         const allArgs = [...spawnConfig.args, ...this.extraArgs];
         LOG.info("CLI", `[${this.cliType}] Spawning in ${this.workingDir}`);
         this.resetTraceSession();
@@ -1269,13 +1260,16 @@ var init_provider_cli_adapter = __esm({
         let shellArgs;
         const useShellUnix = !isWin && (!!spawnConfig.shell || !path7.isAbsolute(binaryPath) || isScriptBinary(binaryPath) || !looksLikeMachOOrElf(binaryPath));
         const isCmdShim = isWin && /\.(cmd|bat)$/i.test(binaryPath);
-        const useShell = isWin ? !!spawnConfig.shell || isCmdShim : useShellUnix;
+        const useShellWin = isCmdShim || !path7.isAbsolute(binaryPath) || isScriptBinary(binaryPath);
+        const useShell = isWin ? useShellWin : useShellUnix;
         if (useShell) {
           if (!spawnConfig.shell && !isWin) {
             LOG.info("CLI", `[${this.cliType}] Using login shell (script shim or non-native binary)`);
           }
           if (isCmdShim) {
             LOG.info("CLI", `[${this.cliType}] Using cmd.exe shell for .cmd/.bat shim: ${binaryPath}`);
+          } else if (isWin) {
+            LOG.info("CLI", `[${this.cliType}] Using cmd.exe shell on Windows: ${binaryPath}`);
           }
           shellCmd = isWin ? "cmd.exe" : process.env.SHELL || "/bin/zsh";
           if (isWin) {
@@ -1285,6 +1279,9 @@ var init_provider_cli_adapter = __esm({
             shellArgs = ["-l", "-c", fullCmd];
           }
         } else {
+          if (isWin && spawnConfig.shell) {
+            LOG.info("CLI", `[${this.cliType}] Spawning Windows binary directly without cmd.exe: ${binaryPath}`);
+          }
           shellCmd = binaryPath;
           shellArgs = allArgs;
         }
@@ -1313,6 +1310,12 @@ var init_provider_cli_adapter = __esm({
             shellArgs = ["-l", "-c", fullCmd];
             this.ptyProcess = this.transportFactory.spawn(shellCmd, shellArgs, ptyOpts);
           } else {
+            if (isWin) {
+              const hint = /error code 267|ERROR_DIRECTORY/i.test(msg) ? " (working directory does not exist or is not a directory)" : /error code 740|elevation/i.test(msg) ? " (requires administrator privileges)" : /error code 2|ENOENT|not found/i.test(msg) ? ` (executable not found: ${shellCmd})` : "";
+              if (hint) {
+                throw new Error(`Failed to spawn CLI${hint}: ${msg}`);
+              }
+            }
             throw err;
           }
         }
@@ -1487,7 +1490,7 @@ var init_provider_cli_adapter = __esm({
               `[${this.cliType}] Waiting for interactive prompt: hasPrompt=${hasPrompt} stableMs=${stableMs} recentOutputMs=${recentlyOutput} status=${status} startup=${startupLikelyActive} screen=${JSON.stringify(this.summarizeTraceText(screenText, 220)).slice(0, 260)}`
             );
           }
-          await new Promise((resolve10) => setTimeout(resolve10, 50));
+          await new Promise((resolve9) => setTimeout(resolve9, 50));
         }
         const finalScreenText = this.terminalScreen.getText() || "";
         LOG.warn(
@@ -1874,7 +1877,7 @@ ${data.message || ""}`.trim();
         if (this.startupParseGate) {
           const deadline = Date.now() + 1e4;
           while (this.startupParseGate && Date.now() < deadline) {
-            await new Promise((resolve10) => setTimeout(resolve10, 50));
+            await new Promise((resolve9) => setTimeout(resolve9, 50));
           }
         }
         if (!this.ready) throw new Error(`${this.cliName} not ready (status: ${this.currentStatus})`);
@@ -2065,7 +2068,8 @@ ${data.message || ""}`.trim();
               const payload = stopCommand.endsWith("\r") || stopCommand.endsWith("\n") ? stopCommand : `${stopCommand}${this.sendKey}`;
               this.ptyProcess.write(payload);
             };
-            if (wasProcessing) setTimeout(writeCommand, 250);
+            const interruptGraceMs = typeof resume.interruptGraceMs === "number" ? Math.max(100, resume.interruptGraceMs) : 500;
+            if (wasProcessing) setTimeout(writeCommand, interruptGraceMs);
             else writeCommand();
           } else {
             this.ptyProcess.write("");
@@ -2081,17 +2085,17 @@ ${data.message || ""}`.trim();
         }
       }
       waitForStopped(timeoutMs) {
-        return new Promise((resolve10) => {
+        return new Promise((resolve9) => {
           const startedAt = Date.now();
           const timer = setInterval(() => {
             if (!this.ptyProcess || this.currentStatus === "stopped") {
               clearInterval(timer);
-              resolve10(true);
+              resolve9(true);
               return;
             }
             if (Date.now() - startedAt >= timeoutMs) {
               clearInterval(timer);
-              resolve10(false);
+              resolve9(false);
             }
           }, 100);
         });
@@ -2110,6 +2114,18 @@ ${data.message || ""}`.trim();
           clearTimeout(this.submitRetryTimer);
           this.submitRetryTimer = null;
         }
+        if (this.responseTimeout) {
+          clearTimeout(this.responseTimeout);
+          this.responseTimeout = null;
+        }
+        if (this.idleTimeout) {
+          clearTimeout(this.idleTimeout);
+          this.idleTimeout = null;
+        }
+        if (this.pendingScriptStatusTimer) {
+          clearTimeout(this.pendingScriptStatusTimer);
+          this.pendingScriptStatusTimer = null;
+        }
         if (this.pendingOutputParseTimer) {
           clearTimeout(this.pendingOutputParseTimer);
           this.pendingOutputParseTimer = null;
@@ -2151,6 +2167,18 @@ ${data.message || ""}`.trim();
           clearTimeout(this.submitRetryTimer);
           this.submitRetryTimer = null;
         }
+        if (this.responseTimeout) {
+          clearTimeout(this.responseTimeout);
+          this.responseTimeout = null;
+        }
+        if (this.idleTimeout) {
+          clearTimeout(this.idleTimeout);
+          this.idleTimeout = null;
+        }
+        if (this.pendingScriptStatusTimer) {
+          clearTimeout(this.pendingScriptStatusTimer);
+          this.pendingScriptStatusTimer = null;
+        }
         if (this.pendingOutputParseTimer) {
           clearTimeout(this.pendingOutputParseTimer);
           this.pendingOutputParseTimer = null;
@@ -2665,20 +2693,20 @@ function checkPathExists(paths) {
   return null;
 }
 async function detectIDEs() {
-  const os17 = platform();
+  const os18 = platform();
   const results = [];
   for (const def of getMergedDefinitions()) {
     const cliPath = findCliCommand(def.cli);
-    const appPath = checkPathExists(def.paths[os17] || []);
+    const appPath = checkPathExists(def.paths[os18] || []);
     const installed = !!(cliPath || appPath);
     let resolvedCli = cliPath;
-    if (!resolvedCli && appPath && os17 === "darwin") {
+    if (!resolvedCli && appPath && os18 === "darwin") {
       const bundledCli = `${appPath}/Contents/Resources/app/bin/${def.cli}`;
       if (existsSync3(bundledCli)) resolvedCli = bundledCli;
     }
-    if (!resolvedCli && appPath && os17 === "win32") {
-      const { dirname: dirname7 } = await import("path");
-      const appDir = dirname7(appPath);
+    if (!resolvedCli && appPath && os18 === "win32") {
+      const { dirname: dirname6 } = await import("path");
+      const appDir = dirname6(appPath);
       const candidates = [
         `${appDir}\\\\bin\\\\${def.cli}.cmd`,
         `${appDir}\\\\bin\\\\${def.cli}`,
@@ -2716,15 +2744,15 @@ function parseVersion(raw) {
   return match ? match[1] : raw.split("\n")[0].slice(0, 100);
 }
 function execAsync(cmd, timeoutMs = 5e3) {
-  return new Promise((resolve10) => {
+  return new Promise((resolve9) => {
     const child = exec(cmd, { encoding: "utf-8", timeout: timeoutMs }, (err, stdout) => {
       if (err || !stdout?.trim()) {
-        resolve10(null);
+        resolve9(null);
       } else {
-        resolve10(stdout.trim());
+        resolve9(stdout.trim());
       }
     });
-    child.on("error", () => resolve10(null));
+    child.on("error", () => resolve9(null));
   });
 }
 async function detectCLIs(providerLoader) {
@@ -2764,6 +2792,39 @@ async function detectCLIs(providerLoader) {
 }
 async function detectCLI(cliId, providerLoader) {
   const resolvedId = providerLoader ? providerLoader.resolveAlias(cliId) : cliId;
+  if (providerLoader) {
+    const cliList = providerLoader.getCliDetectionList();
+    const target = cliList.find((c) => c.id === resolvedId);
+    if (target) {
+      const platform9 = os2.platform();
+      const whichCmd = platform9 === "win32" ? "where" : "which";
+      try {
+        const pathResult = await execAsync(`${whichCmd} ${target.command}`);
+        if (!pathResult) return null;
+        const firstPath = pathResult.split("\n")[0];
+        let version;
+        try {
+          const versionCommands = [
+            target.versionCommand,
+            `${target.command} --version`,
+            `${target.command} -V`,
+            `${target.command} -v`
+          ].filter((v) => !!v);
+          for (const versionCommand of versionCommands) {
+            const versionResult = await execAsync(versionCommand, 3e3);
+            if (versionResult) {
+              version = parseVersion(versionResult);
+              break;
+            }
+          }
+        } catch {
+        }
+        return { ...target, installed: true, version, path: firstPath };
+      } catch {
+        return null;
+      }
+    }
+  }
   const all = await detectCLIs(providerLoader);
   return all.find((c) => c.id === resolvedId && c.installed) || null;
 }
@@ -2891,7 +2952,7 @@ var DaemonCdpManager = class {
   * Returns multiple entries if multiple IDE windows are open on same port
   */
   static listAllTargets(port) {
-    return new Promise((resolve10) => {
+    return new Promise((resolve9) => {
       const req = http.get(`http://127.0.0.1:${port}/json`, (res) => {
         let data = "";
         res.on("data", (chunk) => data += chunk.toString());
@@ -2907,16 +2968,16 @@ var DaemonCdpManager = class {
               (t) => !isNonMain(t.title || "") && t.url?.includes("workbench.html") && !t.url?.includes("agent")
             );
             const fallbackPages = pages.filter((t) => !isNonMain(t.title || ""));
-            resolve10(mainPages.length > 0 ? mainPages : fallbackPages);
+            resolve9(mainPages.length > 0 ? mainPages : fallbackPages);
           } catch {
-            resolve10([]);
+            resolve9([]);
           }
         });
       });
-      req.on("error", () => resolve10([]));
+      req.on("error", () => resolve9([]));
       req.setTimeout(2e3, () => {
         req.destroy();
-        resolve10([]);
+        resolve9([]);
       });
     });
   }
@@ -2956,7 +3017,7 @@ var DaemonCdpManager = class {
     }
   }
   findTargetOnPort(port) {
-    return new Promise((resolve10) => {
+    return new Promise((resolve9) => {
       const req = http.get(`http://127.0.0.1:${port}/json`, (res) => {
         let data = "";
         res.on("data", (chunk) => data += chunk.toString());
@@ -2967,7 +3028,7 @@ var DaemonCdpManager = class {
               (t) => (t.type === "page" || t.type === "browser" || t.type === "Page") && t.webSocketDebuggerUrl
             );
             if (pages.length === 0) {
-              resolve10(targets.find((t) => t.webSocketDebuggerUrl) || null);
+              resolve9(targets.find((t) => t.webSocketDebuggerUrl) || null);
               return;
             }
             const mainPages = pages.filter((t) => !this.isNonMainTitle(t.title || ""));
@@ -2977,24 +3038,24 @@ var DaemonCdpManager = class {
               const specific = list.find((t) => t.id === this._targetId);
               if (specific) {
                 this._pageTitle = specific.title || "";
-                resolve10(specific);
+                resolve9(specific);
               } else {
                 this.log(`[CDP] Target ${this._targetId} not found in page list`);
-                resolve10(null);
+                resolve9(null);
               }
               return;
             }
             this._pageTitle = list[0]?.title || "";
-            resolve10(list[0]);
+            resolve9(list[0]);
           } catch {
-            resolve10(null);
+            resolve9(null);
           }
         });
       });
-      req.on("error", () => resolve10(null));
+      req.on("error", () => resolve9(null));
       req.setTimeout(2e3, () => {
         req.destroy();
-        resolve10(null);
+        resolve9(null);
       });
     });
   }
@@ -3005,7 +3066,7 @@ var DaemonCdpManager = class {
     this.extensionProviders = providers;
   }
   connectToTarget(wsUrl) {
-    return new Promise((resolve10) => {
+    return new Promise((resolve9) => {
       this.ws = new WebSocket(wsUrl);
       this.ws.on("open", async () => {
         this._connected = true;
@@ -3015,17 +3076,17 @@ var DaemonCdpManager = class {
         }
         this.connectBrowserWs().catch(() => {
         });
-        resolve10(true);
+        resolve9(true);
       });
       this.ws.on("message", (data) => {
         try {
           const msg = JSON.parse(data.toString());
           if (msg.id && this.pending.has(msg.id)) {
-            const { resolve: resolve11, reject } = this.pending.get(msg.id);
+            const { resolve: resolve10, reject } = this.pending.get(msg.id);
             this.pending.delete(msg.id);
             this.failureCount = 0;
             if (msg.error) reject(new Error(msg.error.message));
-            else resolve11(msg.result);
+            else resolve10(msg.result);
           } else if (msg.method === "Runtime.executionContextCreated") {
             this.contexts.add(msg.params.context.id);
           } else if (msg.method === "Runtime.executionContextDestroyed") {
@@ -3048,7 +3109,7 @@ var DaemonCdpManager = class {
       this.ws.on("error", (err) => {
         this.log(`[CDP] WebSocket error: ${err.message}`);
         this._connected = false;
-        resolve10(false);
+        resolve9(false);
       });
     });
   }
@@ -3062,7 +3123,7 @@ var DaemonCdpManager = class {
         return;
       }
       this.log(`[CDP] Connecting browser WS for target discovery...`);
-      await new Promise((resolve10, reject) => {
+      await new Promise((resolve9, reject) => {
         this.browserWs = new WebSocket(browserWsUrl);
         this.browserWs.on("open", async () => {
           this._browserConnected = true;
@@ -3072,16 +3133,16 @@ var DaemonCdpManager = class {
           } catch (e) {
             this.log(`[CDP] setDiscoverTargets failed: ${e.message}`);
           }
-          resolve10();
+          resolve9();
         });
         this.browserWs.on("message", (data) => {
           try {
             const msg = JSON.parse(data.toString());
             if (msg.id && this.browserPending.has(msg.id)) {
-              const { resolve: resolve11, reject: reject2 } = this.browserPending.get(msg.id);
+              const { resolve: resolve10, reject: reject2 } = this.browserPending.get(msg.id);
               this.browserPending.delete(msg.id);
               if (msg.error) reject2(new Error(msg.error.message));
-              else resolve11(msg.result);
+              else resolve10(msg.result);
             }
           } catch {
           }
@@ -3101,31 +3162,31 @@ var DaemonCdpManager = class {
     }
   }
   getBrowserWsUrl() {
-    return new Promise((resolve10) => {
+    return new Promise((resolve9) => {
       const req = http.get(`http://127.0.0.1:${this.port}/json/version`, (res) => {
         let data = "";
         res.on("data", (chunk) => data += chunk.toString());
         res.on("end", () => {
           try {
             const info = JSON.parse(data);
-            resolve10(info.webSocketDebuggerUrl || null);
+            resolve9(info.webSocketDebuggerUrl || null);
           } catch {
-            resolve10(null);
+            resolve9(null);
           }
         });
       });
-      req.on("error", () => resolve10(null));
+      req.on("error", () => resolve9(null));
       req.setTimeout(3e3, () => {
         req.destroy();
-        resolve10(null);
+        resolve9(null);
       });
     });
   }
   sendBrowser(method, params = {}, timeoutMs = 15e3) {
-    return new Promise((resolve10, reject) => {
+    return new Promise((resolve9, reject) => {
       if (!this.browserWs || !this._browserConnected) return reject(new Error("Browser WS not connected"));
       const id = this.browserMsgId++;
-      this.browserPending.set(id, { resolve: resolve10, reject });
+      this.browserPending.set(id, { resolve: resolve9, reject });
       this.browserWs.send(JSON.stringify({ id, method, params }));
       setTimeout(() => {
         if (this.browserPending.has(id)) {
@@ -3165,11 +3226,11 @@ var DaemonCdpManager = class {
   }
   // ─── CDP Protocol ────────────────────────────────────────
   sendInternal(method, params = {}, timeoutMs = 15e3) {
-    return new Promise((resolve10, reject) => {
+    return new Promise((resolve9, reject) => {
       if (!this.ws || !this._connected) return reject(new Error("CDP not connected"));
       if (this.ws.readyState !== WebSocket.OPEN) return reject(new Error("WebSocket not open"));
       const id = this.msgId++;
-      this.pending.set(id, { resolve: resolve10, reject });
+      this.pending.set(id, { resolve: resolve9, reject });
       this.ws.send(JSON.stringify({ id, method, params }));
       setTimeout(() => {
         if (this.pending.has(id)) {
@@ -3418,7 +3479,7 @@ var DaemonCdpManager = class {
     const browserWs = this.browserWs;
     let msgId = this.browserMsgId;
     const sendWs = (method, params = {}, sessionId) => {
-      return new Promise((resolve10, reject) => {
+      return new Promise((resolve9, reject) => {
         const mid = msgId++;
         this.browserMsgId = msgId;
         const handler = (raw) => {
@@ -3427,7 +3488,7 @@ var DaemonCdpManager = class {
             if (msg.id === mid) {
               browserWs.removeListener("message", handler);
               if (msg.error) reject(new Error(msg.error.message || JSON.stringify(msg.error)));
-              else resolve10(msg.result);
+              else resolve9(msg.result);
             }
           } catch {
           }
@@ -3618,14 +3679,14 @@ var DaemonCdpManager = class {
     if (!ws || ws.readyState !== WebSocket.OPEN) {
       throw new Error("CDP not connected");
     }
-    return new Promise((resolve10, reject) => {
+    return new Promise((resolve9, reject) => {
       const id = getNextId();
       pendingMap.set(id, {
         resolve: (result) => {
           if (result?.result?.subtype === "error") {
             reject(new Error(result.result.description));
           } else {
-            resolve10(result?.result?.value);
+            resolve9(result?.result?.value);
           }
         },
         reject
@@ -3657,10 +3718,10 @@ var DaemonCdpManager = class {
       throw new Error("CDP not connected");
     }
     const sendViaSession = (method, params = {}) => {
-      return new Promise((resolve10, reject) => {
+      return new Promise((resolve9, reject) => {
         const pendingMap = this._browserConnected ? this.browserPending : this.pending;
         const id = this._browserConnected ? this.browserMsgId++ : this.msgId++;
-        pendingMap.set(id, { resolve: resolve10, reject });
+        pendingMap.set(id, { resolve: resolve9, reject });
         ws.send(JSON.stringify({ id, sessionId, method, params }));
         setTimeout(() => {
           if (pendingMap.has(id)) {
@@ -7192,8 +7253,24 @@ function handleSetIdeExtension(h, args) {
 
 // src/commands/workspace-commands.ts
 init_config();
+function loadWorkspaceConfig() {
+  try {
+    return loadConfig();
+  } catch (e) {
+    return { error: `Could not load config: ${e?.message || "unknown error"}` };
+  }
+}
+function persistWorkspaceConfig(config) {
+  try {
+    saveConfig(config);
+    return { ok: true };
+  } catch (e) {
+    return { error: `Could not save config: ${e?.message || "unknown error"}` };
+  }
+}
 function handleWorkspaceList() {
-  const config = loadConfig();
+  const config = loadWorkspaceConfig();
+  if ("error" in config) return { success: false, error: config.error };
   const state = getWorkspaceState(config);
   return {
     success: true,
@@ -7207,31 +7284,37 @@ function handleWorkspaceAdd(args) {
   const label = (args?.label || "").trim() || void 0;
   const createIfMissing = args?.createIfMissing === true;
   if (!rawPath) return { success: false, error: "path required" };
-  const config = loadConfig();
+  const config = loadWorkspaceConfig();
+  if ("error" in config) return { success: false, error: config.error };
   const result = addWorkspaceEntry(config, rawPath, label, { createIfMissing });
   if ("error" in result) return { success: false, error: result.error };
-  saveConfig(result.config);
+  const saveResult = persistWorkspaceConfig(result.config);
+  if ("error" in saveResult) return { success: false, error: saveResult.error };
   const state = getWorkspaceState(result.config);
   return { success: true, entry: result.entry, ...state };
 }
 function handleWorkspaceRemove(args) {
   const id = (args?.id || "").trim();
   if (!id) return { success: false, error: "id required" };
-  const config = loadConfig();
+  const config = loadWorkspaceConfig();
+  if ("error" in config) return { success: false, error: config.error };
   const removed = (config.workspaces || []).find((w) => w.id === id);
   const result = removeWorkspaceEntry(config, id);
   if ("error" in result) return { success: false, error: result.error };
-  saveConfig(result.config);
+  const saveResult = persistWorkspaceConfig(result.config);
+  if ("error" in saveResult) return { success: false, error: saveResult.error };
   const state = getWorkspaceState(result.config);
   return { success: true, removedId: id, ...state };
 }
 function handleWorkspaceSetDefault(args) {
   const clear = args?.clear === true || args?.id === null || args?.id === "";
   if (clear) {
-    const config2 = loadConfig();
+    const config2 = loadWorkspaceConfig();
+    if ("error" in config2) return { success: false, error: config2.error };
     const result2 = setDefaultWorkspaceId(config2, null);
     if ("error" in result2) return { success: false, error: result2.error };
-    saveConfig(result2.config);
+    const saveResult2 = persistWorkspaceConfig(result2.config);
+    if ("error" in saveResult2) return { success: false, error: saveResult2.error };
     const state2 = getWorkspaceState(result2.config);
     return {
       success: true,
@@ -7243,7 +7326,9 @@ function handleWorkspaceSetDefault(args) {
   if (!pathArg && !idArg) {
     return { success: false, error: "id or path required (or clear: true)" };
   }
-  let config = loadConfig();
+  const configResult = loadWorkspaceConfig();
+  if ("error" in configResult) return { success: false, error: configResult.error };
+  let config = configResult;
   let nextId;
   if (pathArg) {
     let w = findWorkspaceByPath(config, pathArg);
@@ -7259,7 +7344,8 @@ function handleWorkspaceSetDefault(args) {
   }
   const result = setDefaultWorkspaceId(config, nextId);
   if ("error" in result) return { success: false, error: result.error };
-  saveConfig(result.config);
+  const saveResult = persistWorkspaceConfig(result.config);
+  if ("error" in saveResult) return { success: false, error: saveResult.error };
   const state = getWorkspaceState(result.config);
   return { success: true, ...state };
 }
@@ -7661,7 +7747,7 @@ var DaemonCommandHandler = class {
     try {
       const http3 = await import("http");
       const postData = JSON.stringify(body);
-      const result = await new Promise((resolve10, reject) => {
+      const result = await new Promise((resolve9, reject) => {
         const req = http3.request({
           hostname: "127.0.0.1",
           port: 19280,
@@ -7673,9 +7759,9 @@ var DaemonCommandHandler = class {
           res.on("data", (chunk) => data += chunk);
           res.on("end", () => {
             try {
-              resolve10(JSON.parse(data));
+              resolve9(JSON.parse(data));
             } catch {
-              resolve10({ raw: data });
+              resolve9({ raw: data });
             }
           });
         });
@@ -7693,15 +7779,15 @@ var DaemonCommandHandler = class {
     if (!providerType) return { success: false, error: "providerType required" };
     try {
       const http3 = await import("http");
-      const result = await new Promise((resolve10, reject) => {
+      const result = await new Promise((resolve9, reject) => {
         http3.get(`http://127.0.0.1:19280/api/providers/${providerType}/${endpoint}`, (res) => {
           let data = "";
           res.on("data", (chunk) => data += chunk);
           res.on("end", () => {
             try {
-              resolve10(JSON.parse(data));
+              resolve9(JSON.parse(data));
             } catch {
-              resolve10({ raw: data });
+              resolve9({ raw: data });
             }
           });
         }).on("error", reject);
@@ -7715,7 +7801,7 @@ var DaemonCommandHandler = class {
     try {
       const http3 = await import("http");
       const postData = JSON.stringify(args || {});
-      const result = await new Promise((resolve10, reject) => {
+      const result = await new Promise((resolve9, reject) => {
         const req = http3.request({
           hostname: "127.0.0.1",
           port: 19280,
@@ -7727,9 +7813,9 @@ var DaemonCommandHandler = class {
           res.on("data", (chunk) => data += chunk);
           res.on("end", () => {
             try {
-              resolve10(JSON.parse(data));
+              resolve9(JSON.parse(data));
             } catch {
-              resolve10({ raw: data });
+              resolve9({ raw: data });
             }
           });
         });
@@ -7746,7 +7832,7 @@ var DaemonCommandHandler = class {
 
 // src/commands/cli-manager.ts
 init_provider_cli_adapter();
-import * as os9 from "os";
+import * as os10 from "os";
 import * as path9 from "path";
 import * as crypto4 from "crypto";
 import chalk from "chalk";
@@ -7754,7 +7840,7 @@ init_config();
 
 // src/providers/cli-provider-instance.ts
 init_provider_cli_adapter();
-import * as os8 from "os";
+import * as os9 from "os";
 import * as path8 from "path";
 import * as crypto3 from "crypto";
 import * as fs5 from "fs";
@@ -7842,17 +7928,60 @@ var CliProviderInstance = class {
   async onTick() {
     if (this.providerSessionId) return;
     let probedSessionId = null;
-    if (this.type === "opencode-cli") {
-      probedSessionId = this.probeOpenCodeSessionId();
-    } else if (this.type === "codex-cli") {
-      probedSessionId = this.probeCodexSessionId();
-    } else if (this.type === "goose-cli") {
-      probedSessionId = this.probeGooseSessionId();
+    const probeConfig = this.provider.sessionProbe;
+    if (probeConfig) {
+      probedSessionId = this.probeSessionIdFromConfig(probeConfig);
+    } else {
+      if (this.type === "opencode-cli") {
+        probedSessionId = this.probeSessionIdFromConfig({
+          dbPath: "~/.local/share/opencode/opencode.db",
+          query: "select id from session where directory in ({dirs}) and time_created >= ? and time_archived is null order by time_updated desc limit 1",
+          timestampFormat: "unix_ms"
+        });
+      } else if (this.type === "codex-cli") {
+        probedSessionId = this.probeSessionIdFromConfig({
+          dbPath: "~/.codex/state_5.sqlite",
+          query: "select id from threads where cwd in ({dirs}) and created_at >= ? and archived = 0 order by created_at desc limit 1",
+          timestampFormat: "unix_s"
+        });
+      } else if (this.type === "goose-cli") {
+        probedSessionId = this.probeSessionIdFromConfig({
+          dbPath: "~/.local/share/goose/sessions/sessions.db",
+          query: "select id from sessions where working_dir in ({dirs}) and created_at >= ? order by updated_at desc limit 1",
+          timestampFormat: "iso"
+        });
+      }
     }
     if (probedSessionId) {
       this.promoteProviderSessionId(probedSessionId);
     }
   }
+  /**
+   * Generic session ID probe using declarative ProviderSessionProbe config.
+   * Replaces the previously duplicated probeOpenCode/Codex/Goose functions.
+   */
+  probeSessionIdFromConfig(probe) {
+    const resolvedDbPath = probe.dbPath.replace(/^~/, os9.homedir());
+    if (!fs5.existsSync(resolvedDbPath)) return null;
+    const directories = this.getProbeDirectories();
+    const minCreatedAt = Math.max(0, this.startedAt - 6e4);
+    const tsFormat = probe.timestampFormat || "unix_ms";
+    let timestampParam;
+    if (tsFormat === "unix_s") {
+      timestampParam = Math.floor(minCreatedAt / 1e3);
+    } else if (tsFormat === "iso") {
+      timestampParam = new Date(minCreatedAt).toISOString().slice(0, 19).replace("T", " ");
+    } else {
+      timestampParam = minCreatedAt;
+    }
+    const placeholders = this.buildSqlPlaceholderList(directories.length);
+    const query = probe.query.replace("{dirs}", placeholders);
+    try {
+      return this.querySqliteText(resolvedDbPath, query, [...directories, timestampParam]);
+    } catch {
+      return null;
+    }
+  }
   getState() {
     const adapterStatus = this.adapter.getStatus();
     const parsedStatus = this.adapter.getScriptParsedStatus?.() || null;
@@ -8150,34 +8279,6 @@ var CliProviderInstance = class {
     });
     LOG.info("CLI", `[${this.type}] discovered provider session id: ${nextSessionId}`);
   }
-  probeOpenCodeSessionId() {
-    const dbPath = path8.join(os8.homedir(), ".local", "share", "opencode", "opencode.db");
-    if (!fs5.existsSync(dbPath)) return null;
-    const minCreatedAt = Math.max(0, this.startedAt - 6e4);
-    const directories = this.getProbeDirectories();
-    const query = `select id from session where directory in (${this.buildSqlPlaceholderList(directories.length)}) and time_created >= ? and time_archived is null order by time_updated desc limit 1;`;
-    return this.querySqliteText(dbPath, query, [...directories, minCreatedAt]);
-  }
-  probeCodexSessionId() {
-    const dbPath = path8.join(os8.homedir(), ".codex", "state_5.sqlite");
-    if (!fs5.existsSync(dbPath)) return null;
-    const minCreatedAt = Math.max(0, Math.floor((this.startedAt - 6e4) / 1e3));
-    const directories = this.getProbeDirectories();
-    const query = `select id from threads where cwd in (${this.buildSqlPlaceholderList(directories.length)}) and created_at >= ? and archived = 0 order by created_at desc limit 1;`;
-    return this.querySqliteText(dbPath, query, [...directories, minCreatedAt]);
-  }
-  probeGooseSessionId() {
-    const dbPath = path8.join(os8.homedir(), ".local", "share", "goose", "sessions", "sessions.db");
-    if (!fs5.existsSync(dbPath)) return null;
-    const minCreatedAtIso = new Date(Math.max(0, this.startedAt - 6e4)).toISOString().slice(0, 19).replace("T", " ");
-    const directories = this.getProbeDirectories();
-    const query = `select id from sessions where working_dir in (${this.buildSqlPlaceholderList(directories.length)}) and created_at >= ? order by updated_at desc limit 1;`;
-    try {
-      return this.querySqliteText(dbPath, query, [...directories, minCreatedAtIso]);
-    } catch {
-      return null;
-    }
-  }
   getProbeDirectories() {
     const dirs = /* @__PURE__ */ new Set();
     const addDir = (value) => {
@@ -8654,13 +8755,13 @@ var AcpProviderInstance = class {
         }
         this.currentStatus = "waiting_approval";
         this.detectStatusTransition();
-        const approved = await new Promise((resolve10) => {
-          this.permissionResolvers.push(resolve10);
+        const approved = await new Promise((resolve9) => {
+          this.permissionResolvers.push(resolve9);
           setTimeout(() => {
-            const idx = this.permissionResolvers.indexOf(resolve10);
+            const idx = this.permissionResolvers.indexOf(resolve9);
             if (idx >= 0) {
               this.permissionResolvers.splice(idx, 1);
-              resolve10(false);
+              resolve9(false);
             }
           }, 3e5);
         });
@@ -9367,7 +9468,7 @@ var DaemonCliManager = class {
   async startSession(cliType, workingDir, cliArgs, initialModel, options) {
     const trimmed = (workingDir || "").trim();
     if (!trimmed) throw new Error("working directory required");
-    const resolvedDir = trimmed.startsWith("~") ? trimmed.replace(/^~/, os9.homedir()) : path9.resolve(trimmed);
+    const resolvedDir = trimmed.startsWith("~") ? trimmed.replace(/^~/, os10.homedir()) : path9.resolve(trimmed);
     const normalizedType = this.providerLoader.resolveAlias(cliType);
     const provider = this.providerLoader.getByAlias(cliType);
     const key = crypto4.randomUUID();
@@ -9451,7 +9552,19 @@ ${installInfo}`
       return { runtimeSessionId: sessionId };
     }
     const cliInfo = await detectCLI(cliType, this.providerLoader);
-    if (!cliInfo) throw new Error(`${cliType} not found`);
+    if (!cliInfo) {
+      const installHint = provider?.install || "";
+      const displayName = provider?.displayName || provider?.name || cliType;
+      const spawnCmd = provider?.spawn?.command || cliType;
+      throw new Error(
+        `${displayName} is not installed.
+Command '${spawnCmd}' not found on PATH.
+` + (installHint ? `
+${installHint}
+` : "") + `
+Run 'adhdev doctor' for detailed diagnostics.`
+      );
+    }
     console.log(colorize("yellow", `  \u26A1 Starting CLI ${cliType} in ${resolvedDir}...`));
     if (provider) {
       console.log(colorize("cyan", `  \u{1F4E6} Using provider: ${provider.name} (${provider.type})`));
@@ -9767,8 +9880,9 @@ ${installInfo}`
         const dir = rdir.path;
         if (!cliType) throw new Error("cliType required");
         const found = this.findAdapter(cliType, { instanceKey: args?.targetSessionId, dir });
+        const prevCliArgs = found ? found.adapter.extraArgs : void 0;
         if (found) await this.stopSession(found.key);
-        await this.startSession(cliType, dir);
+        await this.startSession(cliType, dir, args?.cliArgs || prevCliArgs, args?.initialModel);
         return { success: true, restarted: true };
       }
       case "agent_command": {
@@ -9803,13 +9917,13 @@ ${installInfo}`
 // src/launch.ts
 import { execSync as execSync4, spawn as spawn2 } from "child_process";
 import * as net from "net";
-import * as os11 from "os";
+import * as os12 from "os";
 import * as path11 from "path";
 
 // src/providers/provider-loader.ts
 import * as fs6 from "fs";
 import * as path10 from "path";
-import * as os10 from "os";
+import * as os11 from "os";
 import * as chokidar from "chokidar";
 init_logger();
 var ProviderLoader = class _ProviderLoader {
@@ -9829,7 +9943,7 @@ var ProviderLoader = class _ProviderLoader {
   static META_FILE = ".meta.json";
   constructor(options) {
     this.logFn = options?.logFn || LOG.forComponent("Provider").asLogFn();
-    const defaultProvidersDir = path10.join(os10.homedir(), ".adhdev", "providers");
+    const defaultProvidersDir = path10.join(os11.homedir(), ".adhdev", "providers");
     if (options?.userDir) {
       this.userDir = options.userDir;
       this.log(`Config 'providerDir' applied: ${this.userDir}`);
@@ -10386,7 +10500,7 @@ var ProviderLoader = class _ProviderLoader {
       return { updated: false };
     }
     try {
-      const etag = await new Promise((resolve10, reject) => {
+      const etag = await new Promise((resolve9, reject) => {
         const options = {
           method: "HEAD",
           hostname: "github.com",
@@ -10404,7 +10518,7 @@ var ProviderLoader = class _ProviderLoader {
               headers: { "User-Agent": "adhdev-launcher" },
               timeout: 1e4
             }, (res2) => {
-              resolve10(res2.headers.etag || res2.headers["last-modified"] || "");
+              resolve9(res2.headers.etag || res2.headers["last-modified"] || "");
             });
             req2.on("error", reject);
             req2.on("timeout", () => {
@@ -10413,7 +10527,7 @@ var ProviderLoader = class _ProviderLoader {
             });
             req2.end();
           } else {
-            resolve10(res.headers.etag || res.headers["last-modified"] || "");
+            resolve9(res.headers.etag || res.headers["last-modified"] || "");
           }
         });
         req.on("error", reject);
@@ -10429,8 +10543,8 @@ var ProviderLoader = class _ProviderLoader {
         return { updated: false };
       }
       this.log("Downloading latest providers from GitHub...");
-      const tmpTar = path10.join(os10.tmpdir(), `adhdev-providers-${Date.now()}.tar.gz`);
-      const tmpExtract = path10.join(os10.tmpdir(), `adhdev-providers-extract-${Date.now()}`);
+      const tmpTar = path10.join(os11.tmpdir(), `adhdev-providers-${Date.now()}.tar.gz`);
+      const tmpExtract = path10.join(os11.tmpdir(), `adhdev-providers-extract-${Date.now()}`);
       await this.downloadFile(_ProviderLoader.GITHUB_TARBALL_URL, tmpTar);
       fs6.mkdirSync(tmpExtract, { recursive: true });
       execSync7(`tar -xzf "${tmpTar}" -C "${tmpExtract}"`, { timeout: 3e4 });
@@ -10477,7 +10591,7 @@ var ProviderLoader = class _ProviderLoader {
   downloadFile(url, destPath) {
     const https = __require("https");
     const http3 = __require("http");
-    return new Promise((resolve10, reject) => {
+    return new Promise((resolve9, reject) => {
       const doRequest = (reqUrl, redirectCount = 0) => {
         if (redirectCount > 5) {
           reject(new Error("Too many redirects"));
@@ -10497,7 +10611,7 @@ var ProviderLoader = class _ProviderLoader {
           res.pipe(ws);
           ws.on("finish", () => {
             ws.close();
-            resolve10();
+            resolve9();
           });
           ws.on("error", reject);
         });
@@ -10862,17 +10976,17 @@ async function findFreePort(ports) {
   throw new Error("No free port found");
 }
 function checkPortFree(port) {
-  return new Promise((resolve10) => {
+  return new Promise((resolve9) => {
     const server = net.createServer();
     server.unref();
-    server.on("error", () => resolve10(false));
+    server.on("error", () => resolve9(false));
     server.listen(port, "127.0.0.1", () => {
-      server.close(() => resolve10(true));
+      server.close(() => resolve9(true));
     });
   });
 }
 async function isCdpActive(port) {
-  return new Promise((resolve10) => {
+  return new Promise((resolve9) => {
     const req = __require("http").get(`http://127.0.0.1:${port}/json/version`, {
       timeout: 2e3
     }, (res) => {
@@ -10881,21 +10995,21 @@ async function isCdpActive(port) {
       res.on("end", () => {
         try {
           const info = JSON.parse(data);
-          resolve10(!!info["WebKit-Version"] || !!info["Browser"]);
+          resolve9(!!info["WebKit-Version"] || !!info["Browser"]);
         } catch {
-          resolve10(false);
+          resolve9(false);
         }
       });
     });
-    req.on("error", () => resolve10(false));
+    req.on("error", () => resolve9(false));
     req.on("timeout", () => {
       req.destroy();
-      resolve10(false);
+      resolve9(false);
     });
   });
 }
 async function killIdeProcess(ideId) {
-  const plat = os11.platform();
+  const plat = os12.platform();
   const appName = getMacAppIdentifiers()[ideId];
   const winProcesses = getWinProcessNames()[ideId];
   try {
@@ -10954,7 +11068,7 @@ async function killIdeProcess(ideId) {
   }
 }
 function isIdeRunning(ideId) {
-  const plat = os11.platform();
+  const plat = os12.platform();
   try {
     if (plat === "darwin") {
       const appName = getMacAppIdentifiers()[ideId];
@@ -10990,7 +11104,7 @@ function isIdeRunning(ideId) {
   }
 }
 function detectCurrentWorkspace(ideId) {
-  const plat = os11.platform();
+  const plat = os12.platform();
   if (plat === "darwin") {
     try {
       const appName = getMacAppIdentifiers()[ideId];
@@ -11010,7 +11124,7 @@ function detectCurrentWorkspace(ideId) {
       const appName = appNameMap[ideId];
       if (appName) {
         const storagePath = path11.join(
-          process.env.APPDATA || path11.join(os11.homedir(), "AppData", "Roaming"),
+          process.env.APPDATA || path11.join(os12.homedir(), "AppData", "Roaming"),
           appName,
           "storage.json"
         );
@@ -11032,7 +11146,7 @@ function detectCurrentWorkspace(ideId) {
   return void 0;
 }
 async function launchWithCdp(options = {}) {
-  const platform9 = os11.platform();
+  const platform9 = os12.platform();
   let targetIde;
   const ides = await detectIDEs();
   if (options.ideId) {
@@ -11184,8 +11298,8 @@ init_logger();
 // src/logging/command-log.ts
 import * as fs7 from "fs";
 import * as path12 from "path";
-import * as os12 from "os";
-var LOG_DIR2 = process.platform === "win32" ? path12.join(process.env.LOCALAPPDATA || process.env.APPDATA || path12.join(os12.homedir(), "AppData", "Local"), "adhdev", "logs") : process.platform === "darwin" ? path12.join(os12.homedir(), "Library", "Logs", "adhdev") : path12.join(os12.homedir(), ".local", "share", "adhdev", "logs");
+import * as os13 from "os";
+var LOG_DIR2 = process.platform === "win32" ? path12.join(process.env.LOCALAPPDATA || process.env.APPDATA || path12.join(os13.homedir(), "AppData", "Local"), "adhdev", "logs") : process.platform === "darwin" ? path12.join(os13.homedir(), "Library", "Logs", "adhdev") : path12.join(os13.homedir(), ".local", "share", "adhdev", "logs");
 var MAX_FILE_SIZE = 5 * 1024 * 1024;
 var MAX_DAYS = 7;
 try {
@@ -11321,7 +11435,7 @@ init_logger();
 
 // src/status/snapshot.ts
 init_config();
-import * as os13 from "os";
+import * as os14 from "os";
 init_terminal_screen();
 init_logger();
 var READ_DEBUG_ENABLED = process.argv.includes("--dev") || process.env.ADHDEV_READ_DEBUG === "1";
@@ -11436,16 +11550,16 @@ function buildStatusSnapshot(options) {
     version: options.version,
     daemonMode: options.daemonMode,
     machine: {
-      hostname: os13.hostname(),
-      platform: os13.platform(),
-      arch: os13.arch(),
-      cpus: os13.cpus().length,
+      hostname: os14.hostname(),
+      platform: os14.platform(),
+      arch: os14.arch(),
+      cpus: os14.cpus().length,
       totalMem: memSnap.totalMem,
       freeMem: memSnap.freeMem,
       availableMem: memSnap.availableMem,
-      loadavg: os13.loadavg(),
-      uptime: os13.uptime(),
-      release: os13.release()
+      loadavg: os14.loadavg(),
+      uptime: os14.uptime(),
+      release: os14.release()
     },
     machineNickname: options.machineNickname ?? cfg.machineNickname ?? null,
     timestamp: options.timestamp ?? Date.now(),
@@ -11465,11 +11579,11 @@ function buildStatusSnapshot(options) {
 import { execFileSync } from "child_process";
 import { spawn as spawn3 } from "child_process";
 import * as fs8 from "fs";
-import * as os14 from "os";
+import * as os15 from "os";
 import * as path13 from "path";
 var UPGRADE_HELPER_ENV = "ADHDEV_DAEMON_UPGRADE_HELPER";
 function getUpgradeLogPath() {
-  const home = os14.homedir();
+  const home = os15.homedir();
   const dir = path13.join(home, ".adhdev");
   fs8.mkdirSync(dir, { recursive: true });
   return path13.join(dir, "daemon-upgrade.log");
@@ -11502,14 +11616,14 @@ async function waitForPidExit(pid, timeoutMs) {
   while (Date.now() - start < timeoutMs) {
     try {
       process.kill(pid, 0);
-      await new Promise((resolve10) => setTimeout(resolve10, 250));
+      await new Promise((resolve9) => setTimeout(resolve9, 250));
     } catch {
       return;
     }
   }
 }
 function stopSessionHostProcesses(appName) {
-  const pidFile = path13.join(os14.homedir(), ".adhdev", `${appName}-session-host.pid`);
+  const pidFile = path13.join(os15.homedir(), ".adhdev", `${appName}-session-host.pid`);
   try {
     if (fs8.existsSync(pidFile)) {
       const pid = Number.parseInt(fs8.readFileSync(pidFile, "utf8").trim(), 10);
@@ -11538,7 +11652,7 @@ function stopSessionHostProcesses(appName) {
   }
 }
 function removeDaemonPidFile() {
-  const pidFile = path13.join(os14.homedir(), ".adhdev", "daemon.pid");
+  const pidFile = path13.join(os15.homedir(), ".adhdev", "daemon.pid");
   try {
     fs8.unlinkSync(pidFile);
   } catch {
@@ -13048,10 +13162,10 @@ var ProviderInstanceManager = class {
 // src/providers/version-archive.ts
 import * as fs10 from "fs";
 import * as path14 from "path";
-import * as os15 from "os";
+import * as os16 from "os";
 import { execSync as execSync5 } from "child_process";
 import { platform as platform7 } from "os";
-var ARCHIVE_PATH = path14.join(os15.homedir(), ".adhdev", "version-history.json");
+var ARCHIVE_PATH = path14.join(os16.homedir(), ".adhdev", "version-history.json");
 var MAX_ENTRIES_PER_PROVIDER = 20;
 var VersionArchive = class {
   history = {};
@@ -13138,7 +13252,7 @@ function getVersion(binary, versionCommand) {
 function checkPathExists2(paths) {
   for (const p of paths) {
     if (p.includes("*")) {
-      const home = os15.homedir();
+      const home = os16.homedir();
       const resolved = p.replace(/\*/g, home.split(path14.sep).pop() || "");
       if (fs10.existsSync(resolved)) return resolved;
     } else {
@@ -14735,7 +14849,7 @@ function getCliTargetBundle(ctx, type, instanceId) {
   return { target, instance, adapter };
 }
 function sleep(ms) {
-  return new Promise((resolve10) => setTimeout(resolve10, ms));
+  return new Promise((resolve9) => setTimeout(resolve9, ms));
 }
 async function waitForCliReady(ctx, type, instanceId, timeoutMs) {
   const startedAt = Date.now();
@@ -15466,7 +15580,7 @@ async function handleCliRaw(ctx, req, res) {
 // src/daemon/dev-auto-implement.ts
 import * as fs13 from "fs";
 import * as path17 from "path";
-import * as os16 from "os";
+import * as os17 from "os";
 function getAutoImplPid(ctx) {
   const proc = ctx.autoImplProcess;
   return proc && typeof proc.pid === "number" && proc.pid > 0 ? proc.pid : null;
@@ -15669,7 +15783,7 @@ async function handleAutoImplement(ctx, type, req, res) {
     });
     const referenceScripts = loadAutoImplReferenceScripts(ctx, resolvedReference);
     const prompt = buildAutoImplPrompt(ctx, type, provider, providerDir, functions, domContext, referenceScripts, comment, resolvedReference, verification);
-    const tmpDir = path17.join(os16.tmpdir(), "adhdev-autoimpl");
+    const tmpDir = path17.join(os17.tmpdir(), "adhdev-autoimpl");
     if (!fs13.existsSync(tmpDir)) fs13.mkdirSync(tmpDir, { recursive: true });
     const promptFile = path17.join(tmpDir, `prompt-${type}-${Date.now()}.md`);
     fs13.writeFileSync(promptFile, prompt, "utf-8");
@@ -15823,7 +15937,7 @@ async function handleAutoImplement(ctx, type, req, res) {
     const interactiveFlags = ["--yolo", "--interactive", "-i"];
     const baseArgs = [...spawn4.args || []].filter((a) => !interactiveFlags.includes(a));
     let shellCmd;
-    const isWin = os16.platform() === "win32";
+    const isWin = os17.platform() === "win32";
     const escapeArg = (a) => isWin ? `"${a.replace(/"/g, '""')}"` : `'${a.replace(/'/g, "'\\''")}'`;
     if (command === "claude") {
       const args = [...baseArgs, "--dangerously-skip-permissions"];
@@ -15867,7 +15981,7 @@ async function handleAutoImplement(ctx, type, req, res) {
     try {
       const pty3 = __require("node-pty");
       ctx.log(`Auto-implement spawn (PTY): ${shellCmd}`);
-      const isWin2 = os16.platform() === "win32";
+      const isWin2 = os17.platform() === "win32";
       child = pty3.spawn(isWin2 ? "cmd.exe" : process.env.SHELL || "/bin/zsh", [isWin2 ? "/c" : "-c", shellCmd], {
         name: "xterm-256color",
         cols: 120,
@@ -16905,15 +17019,15 @@ var DevServer = class _DevServer {
         this.json(res, 500, { error: e.message });
       }
     });
-    return new Promise((resolve10, reject) => {
+    return new Promise((resolve9, reject) => {
       this.server.listen(port, "127.0.0.1", () => {
         this.log(`Dev server listening on http://127.0.0.1:${port}`);
-        resolve10();
+        resolve9();
       });
       this.server.on("error", (e) => {
         if (e.code === "EADDRINUSE") {
           this.log(`Port ${port} in use, skipping dev server`);
-          resolve10();
+          resolve9();
         } else {
           reject(e);
         }
@@ -16996,20 +17110,20 @@ var DevServer = class _DevServer {
       child.stderr?.on("data", (d) => {
         stderr += d.toString().slice(0, 2e3);
       });
-      await new Promise((resolve10) => {
+      await new Promise((resolve9) => {
         const timer = setTimeout(() => {
           child.kill();
-          resolve10();
+          resolve9();
         }, 3e3);
         child.on("exit", () => {
           clearTimeout(timer);
-          resolve10();
+          resolve9();
         });
         child.stdout?.once("data", () => {
           setTimeout(() => {
             child.kill();
             clearTimeout(timer);
-            resolve10();
+            resolve9();
           }, 500);
         });
       });
@@ -17518,14 +17632,14 @@ var DevServer = class _DevServer {
       child.stderr?.on("data", (d) => {
         stderr += d.toString();
       });
-      await new Promise((resolve10) => {
+      await new Promise((resolve9) => {
         const timer = setTimeout(() => {
           child.kill();
-          resolve10();
+          resolve9();
         }, timeout);
         child.on("exit", () => {
           clearTimeout(timer);
-          resolve10();
+          resolve9();
         });
       });
       const elapsed = Date.now() - start;
@@ -18200,14 +18314,14 @@ data: ${JSON.stringify(msg.data)}
     res.end(JSON.stringify(data, null, 2));
   }
   async readBody(req) {
-    return new Promise((resolve10) => {
+    return new Promise((resolve9) => {
       let body = "";
       req.on("data", (chunk) => body += chunk);
       req.on("end", () => {
         try {
-          resolve10(JSON.parse(body));
+          resolve9(JSON.parse(body));
         } catch {
-          resolve10({});
+          resolve9({});
         }
       });
     });
@@ -18676,7 +18790,7 @@ async function waitForReady(endpoint, timeoutMs = STARTUP_TIMEOUT_MS) {
   const deadline = Date.now() + timeoutMs;
   while (Date.now() < deadline) {
     if (await canConnect(endpoint)) return;
-    await new Promise((resolve10) => setTimeout(resolve10, STARTUP_POLL_MS));
+    await new Promise((resolve9) => setTimeout(resolve9, STARTUP_POLL_MS));
   }
   throw new Error(`Session host did not become ready within ${timeoutMs}ms`);
 }
@@ -18832,10 +18946,10 @@ async function installExtension(ide, extension) {
         const buffer = Buffer.from(await res.arrayBuffer());
         const fs15 = await import("fs");
         fs15.writeFileSync(vsixPath, buffer);
-        return new Promise((resolve10) => {
+        return new Promise((resolve9) => {
           const cmd = `"${ide.cliCommand}" --install-extension "${vsixPath}" --force`;
           exec2(cmd, { timeout: 6e4 }, (error, _stdout, stderr) => {
-            resolve10({
+            resolve9({
               extensionId: extension.id,
               marketplaceId: extension.marketplaceId,
               success: !error,
@@ -18848,11 +18962,11 @@ async function installExtension(ide, extension) {
     } catch (e) {
     }
   }
-  return new Promise((resolve10) => {
+  return new Promise((resolve9) => {
     const cmd = `"${ide.cliCommand}" --install-extension ${extension.marketplaceId} --force`;
     exec2(cmd, { timeout: 6e4 }, (error, stdout, stderr) => {
       if (error) {
-        resolve10({
+        resolve9({
           extensionId: extension.id,
           marketplaceId: extension.marketplaceId,
           success: false,
@@ -18860,7 +18974,7 @@ async function installExtension(ide, extension) {
           error: stderr || error.message
         });
       } else {
-        resolve10({
+        resolve9({
           extensionId: extension.id,
           marketplaceId: extension.marketplaceId,
           success: true,