@adhdev/daemon-core 0.8.11 → 0.8.13

package/dist/index.js

@@ -637,6 +637,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}`
@@ -740,11 +747,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: os7.platform() === "win32" ? "xterm-color" : "xterm-256color",
+          name: "xterm-256color",
           cols: options.cols,
           rows: options.rows,
-          cwd: options.cwd,
+          cwd,
           env: options.env
         });
         return new NodePtyRuntimeTransport(handle);
@@ -753,6 +770,15 @@ var init_pty_transport = __esm({
   }
 });
 
+// src/cli-adapters/spawn-env.ts
+var import_session_host_core;
+var init_spawn_env = __esm({
+  "src/cli-adapters/spawn-env.ts"() {
+    "use strict";
+    import_session_host_core = require("@adhdev/session-host-core");
+  }
+});
+
 // src/cli-adapters/provider-cli-adapter.ts
 var provider_cli_adapter_exports = {};
 __export(provider_cli_adapter_exports, {
@@ -768,20 +794,6 @@ 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;
@@ -910,7 +922,7 @@ function normalizeCliProviderForRuntime(raw) {
     }
   };
 }
-var os8, path7, import_child_process4, pty2, ProviderCliAdapter;
+var os8, path7, import_child_process4, pty2, buildCliSpawnEnv, ProviderCliAdapter;
 var init_provider_cli_adapter = __esm({
   "src/cli-adapters/provider-cli-adapter.ts"() {
     "use strict";
@@ -920,27 +932,14 @@ var init_provider_cli_adapter = __esm({
     init_logger();
     init_terminal_screen();
     init_pty_transport();
+    init_spawn_env();
     try {
       pty2 = require("node-pty");
-      if (os8.platform() !== "win32") {
-        try {
-          const fs15 = require("fs");
-          const ptyDir = path7.resolve(path7.dirname(require.resolve("node-pty")), "..");
-          const platformArch = `${os8.platform()}-${os8.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 {
-        }
-      }
+      (0, import_session_host_core.ensureNodePtySpawnHelperPermissions)((msg) => LOG.info("CLI", msg));
     } catch {
       LOG.error("CLI", "[ProviderCliAdapter] node-pty not found. Terminal features disabled.");
     }
+    buildCliSpawnEnv = import_session_host_core.sanitizeSpawnEnv;
     ProviderCliAdapter = class _ProviderCliAdapter {
       constructor(provider, workingDir, extraArgs = [], transportFactory = new NodePtyTransportFactory()) {
         this.extraArgs = extraArgs;
@@ -1307,6 +1306,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;
           }
         }
@@ -1481,7 +1486,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(
@@ -1868,7 +1873,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})`);
@@ -2059,7 +2064,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("");
@@ -2075,17 +2081,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);
         });
@@ -2104,6 +2110,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;
@@ -2145,6 +2163,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;
@@ -2750,8 +2780,8 @@ async function detectIDEs() {
       if ((0, import_fs2.existsSync)(bundledCli)) resolvedCli = bundledCli;
     }
     if (!resolvedCli && appPath && os18 === "win32") {
-      const { dirname: dirname7 } = await import("path");
-      const appDir = dirname7(appPath);
+      const { dirname: dirname6 } = await import("path");
+      const appDir = dirname6(appPath);
       const candidates = [
         `${appDir}\\\\bin\\\\${def.cli}.cmd`,
         `${appDir}\\\\bin\\\\${def.cli}`,
@@ -2789,20 +2819,20 @@ 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 = (0, import_child_process2.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) {
-  const platform10 = os2.platform();
-  const whichCmd = platform10 === "win32" ? "where" : "which";
+  const platform9 = os2.platform();
+  const whichCmd = platform9 === "win32" ? "where" : "which";
   const cliList = providerLoader ? providerLoader.getCliDetectionList() : [];
   const results = await Promise.all(
     cliList.map(async (cli) => {
@@ -2837,6 +2867,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;
 }
@@ -2964,7 +3027,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());
@@ -2980,16 +3043,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([]);
       });
     });
   }
@@ -3029,7 +3092,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());
@@ -3040,7 +3103,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 || ""));
@@ -3050,24 +3113,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);
       });
     });
   }
@@ -3078,7 +3141,7 @@ var DaemonCdpManager = class {
     this.extensionProviders = providers;
   }
   connectToTarget(wsUrl) {
-    return new Promise((resolve10) => {
+    return new Promise((resolve9) => {
       this.ws = new import_ws.default(wsUrl);
       this.ws.on("open", async () => {
         this._connected = true;
@@ -3088,17 +3151,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") {
@@ -3121,7 +3184,7 @@ var DaemonCdpManager = class {
       this.ws.on("error", (err) => {
         this.log(`[CDP] WebSocket error: ${err.message}`);
         this._connected = false;
-        resolve10(false);
+        resolve9(false);
       });
     });
   }
@@ -3135,7 +3198,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 import_ws.default(browserWsUrl);
         this.browserWs.on("open", async () => {
           this._browserConnected = true;
@@ -3145,16 +3208,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 {
           }
@@ -3174,31 +3237,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)) {
@@ -3238,11 +3301,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 !== import_ws.default.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)) {
@@ -3491,7 +3554,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) => {
@@ -3500,7 +3563,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 {
           }
@@ -3691,14 +3754,14 @@ var DaemonCdpManager = class {
     if (!ws || ws.readyState !== import_ws.default.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
@@ -3730,10 +3793,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)) {
@@ -6951,17 +7014,44 @@ async function handleDiscoverAgents(h, args) {
   const agents = await h.getCdp().discoverAgentWebviews();
   return { success: true, agents };
 }
+function normalizeWindowsRequestedPath(requestedPath) {
+  const trimmed = requestedPath.trim();
+  if (!trimmed) return ".";
+  const slashDriveMatch = trimmed.match(/^[/\\]([A-Za-z])(?:[/\\](.*))?$/);
+  if (slashDriveMatch) {
+    const drive = slashDriveMatch[1].toUpperCase();
+    const rest = (slashDriveMatch[2] || "").replace(/[/\\]+/g, "\\");
+    return rest ? `${drive}:\\${rest}` : `${drive}:\\`;
+  }
+  if (/^[A-Za-z]:$/.test(trimmed)) {
+    return `${trimmed[0].toUpperCase()}:\\`;
+  }
+  if (/^[A-Za-z]:[^/\\].*$/.test(trimmed)) {
+    return `${trimmed[0].toUpperCase()}:\\${trimmed.slice(2).replace(/[/\\]+/g, "\\")}`;
+  }
+  if (/^[A-Za-z]:[/\\]/.test(trimmed)) {
+    return `${trimmed[0].toUpperCase()}:${trimmed.slice(2)}`;
+  }
+  return trimmed;
+}
 function resolveSafePath(requestedPath) {
+  const rawPath = typeof requestedPath === "string" ? requestedPath.trim() : "";
+  const inputPath = rawPath || ".";
   const home = os6.homedir();
-  let resolved;
-  if (requestedPath.startsWith("~")) {
-    resolved = path6.join(home, requestedPath.slice(1));
-  } else if (path6.isAbsolute(requestedPath)) {
-    resolved = requestedPath;
-  } else {
-    resolved = path6.resolve(requestedPath);
+  if (inputPath.startsWith("~")) {
+    return path6.resolve(path6.join(home, inputPath.slice(1)));
+  }
+  if (process.platform === "win32") {
+    const normalized = normalizeWindowsRequestedPath(inputPath);
+    if (path6.win32.isAbsolute(normalized)) {
+      return path6.win32.normalize(normalized);
+    }
+    return path6.win32.resolve(normalized);
   }
-  return resolved;
+  if (path6.isAbsolute(inputPath)) {
+    return path6.normalize(inputPath);
+  }
+  return path6.resolve(inputPath);
 }
 function listDirectoryEntriesSafe(dirPath) {
   const entries = fs4.readdirSync(dirPath, { withFileTypes: true });
@@ -7707,7 +7797,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,
@@ -7719,9 +7809,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 });
             }
           });
         });
@@ -7739,15 +7829,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);
@@ -7761,7 +7851,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,
@@ -7773,9 +7863,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 });
             }
           });
         });
@@ -7888,17 +7978,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;
@@ -8196,34 +8329,6 @@ var CliProviderInstance = class {
     });
     LOG.info("CLI", `[${this.type}] discovered provider session id: ${nextSessionId}`);
   }
-  probeOpenCodeSessionId() {
-    const dbPath = path8.join(os9.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(os9.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(os9.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) => {
@@ -8695,13 +8800,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);
         });
@@ -9492,7 +9597,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})`));
@@ -9808,8 +9925,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": {
@@ -10427,7 +10545,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",
@@ -10445,7 +10563,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", () => {
@@ -10454,7 +10572,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);
@@ -10518,7 +10636,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"));
@@ -10538,7 +10656,7 @@ var ProviderLoader = class _ProviderLoader {
           res.pipe(ws);
           ws.on("finish", () => {
             ws.close();
-            resolve10();
+            resolve9();
           });
           ws.on("error", reject);
         });
@@ -10858,9 +10976,9 @@ var ProviderLoader = class _ProviderLoader {
     }
   }
   compareVersions(a, b) {
-    const normalize2 = (v) => v.split(/[-_+]/)[0].split(".").map((x) => parseInt(x, 10) || 0);
-    const pa = normalize2(a);
-    const pb = normalize2(b);
+    const normalize3 = (v) => v.split(/[-_+]/)[0].split(".").map((x) => parseInt(x, 10) || 0);
+    const pa = normalize3(a);
+    const pb = normalize3(b);
     for (let i = 0; i < Math.max(pa.length, pb.length); i++) {
       const va = pa[i] || 0;
       const vb = pb[i] || 0;
@@ -10903,17 +11021,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) => {
@@ -10922,16 +11040,16 @@ 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);
     });
   });
 }
@@ -11073,7 +11191,7 @@ function detectCurrentWorkspace(ideId) {
   return void 0;
 }
 async function launchWithCdp(options = {}) {
-  const platform10 = os12.platform();
+  const platform9 = os12.platform();
   let targetIde;
   const ides = await detectIDEs();
   if (options.ideId) {
@@ -11142,9 +11260,9 @@ async function launchWithCdp(options = {}) {
   }
   const port = await findFreePort(portPair);
   try {
-    if (platform10 === "darwin") {
+    if (platform9 === "darwin") {
       await launchMacOS(targetIde, port, workspace, options.newWindow);
-    } else if (platform10 === "win32") {
+    } else if (platform9 === "win32") {
       await launchWindows(targetIde, port, workspace, options.newWindow);
     } else {
       await launchLinux(targetIde, port, workspace, options.newWindow);
@@ -11543,7 +11661,7 @@ 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;
     }
@@ -14776,7 +14894,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();
@@ -16946,15 +17064,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);
         }
@@ -17037,20 +17155,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);
         });
       });
@@ -17559,14 +17677,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;
@@ -18241,14 +18359,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({});
         }
       });
     });
@@ -18321,12 +18439,12 @@ init_provider_cli_adapter();
 init_pty_transport();
 
 // src/cli-adapters/session-host-transport.ts
-var import_session_host_core = require("@adhdev/session-host-core");
+var import_session_host_core2 = require("@adhdev/session-host-core");
 init_logger();
 var SessionHostRuntimeTransport = class {
   constructor(options) {
     this.options = options;
-    this.client = new import_session_host_core.SessionHostClient({
+    this.client = new import_session_host_core2.SessionHostClient({
       endpoint: options.endpoint,
       appName: options.appName
     });
@@ -18695,11 +18813,11 @@ var SessionHostPtyTransportFactory = class {
 };
 
 // src/session-host/runtime-support.ts
-var import_session_host_core2 = require("@adhdev/session-host-core");
+var import_session_host_core3 = require("@adhdev/session-host-core");
 var STARTUP_TIMEOUT_MS = 8e3;
 var STARTUP_POLL_MS = 200;
 async function canConnect(endpoint) {
-  const client = new import_session_host_core2.SessionHostClient({ endpoint });
+  const client = new import_session_host_core3.SessionHostClient({ endpoint });
   try {
     await client.connect();
     await client.close();
@@ -18712,19 +18830,19 @@ 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`);
 }
 async function ensureSessionHostReady(options) {
-  const endpoint = (0, import_session_host_core2.getDefaultSessionHostEndpoint)(options.appName || "adhdev");
+  const endpoint = (0, import_session_host_core3.getDefaultSessionHostEndpoint)(options.appName || "adhdev");
   if (await canConnect(endpoint)) return endpoint;
   options.spawnHost();
   await waitForReady(endpoint, options.timeoutMs);
   return endpoint;
 }
 async function listHostedCliRuntimes(endpoint) {
-  const client = new import_session_host_core2.SessionHostClient({ endpoint });
+  const client = new import_session_host_core3.SessionHostClient({ endpoint });
   try {
     const response = await client.request({
       type: "list_sessions",
@@ -18868,10 +18986,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`;
           (0, import_child_process10.exec)(cmd, { timeout: 6e4 }, (error, _stdout, stderr) => {
-            resolve10({
+            resolve9({
               extensionId: extension.id,
               marketplaceId: extension.marketplaceId,
               success: !error,
@@ -18884,11 +19002,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`;
     (0, import_child_process10.exec)(cmd, { timeout: 6e4 }, (error, stdout, stderr) => {
       if (error) {
-        resolve10({
+        resolve9({
           extensionId: extension.id,
           marketplaceId: extension.marketplaceId,
           success: false,
@@ -18896,7 +19014,7 @@ async function installExtension(ide, extension) {
           error: stderr || error.message
         });
       } else {
-        resolve10({
+        resolve9({
           extensionId: extension.id,
           marketplaceId: extension.marketplaceId,
           success: true,