@adhdev/daemon-core 0.8.25 → 0.8.28

package/dist/index.js

@@ -251,13 +251,13 @@ function getDaemonLogDir() {
   return LOG_DIR;
 }
 function getCurrentDaemonLogPath(date = /* @__PURE__ */ new Date()) {
-  return path4.join(LOG_DIR, `daemon-${date.toISOString().slice(0, 10)}.log`);
+  return path6.join(LOG_DIR, `daemon-${date.toISOString().slice(0, 10)}.log`);
 }
 function checkDateRotation() {
   const today = getDateStr();
   if (today !== currentDate) {
     currentDate = today;
-    currentLogFile = path4.join(LOG_DIR, `daemon-${currentDate}.log`);
+    currentLogFile = path6.join(LOG_DIR, `daemon-${currentDate}.log`);
     cleanOldLogs();
   }
 }
@@ -271,7 +271,7 @@ function cleanOldLogs() {
       const dateMatch = file.match(/daemon-(\d{4}-\d{2}-\d{2})/);
       if (dateMatch && dateMatch[1] < cutoffStr) {
         try {
-          fs2.unlinkSync(path4.join(LOG_DIR, file));
+          fs2.unlinkSync(path6.join(LOG_DIR, file));
         } catch {
         }
       }
@@ -388,17 +388,17 @@ function installGlobalInterceptor() {
   writeToFile(`Log file: ${currentLogFile}`);
   writeToFile(`Log level: ${currentLevel}`);
 }
-var fs2, path4, os4, LEVEL_NUM, LEVEL_LABEL, currentLevel, LOG_DIR, MAX_LOG_SIZE, MAX_LOG_DAYS, currentDate, currentLogFile, writeCount, RING_BUFFER_SIZE, ringBuffer, origConsoleLog, origConsoleError, origConsoleWarn, LOG, interceptorInstalled, LOG_PATH;
+var fs2, path6, os4, LEVEL_NUM, LEVEL_LABEL, currentLevel, LOG_DIR, MAX_LOG_SIZE, MAX_LOG_DAYS, currentDate, currentLogFile, writeCount, RING_BUFFER_SIZE, ringBuffer, origConsoleLog, origConsoleError, origConsoleWarn, LOG, interceptorInstalled, LOG_PATH;
 var init_logger = __esm({
   "src/logging/logger.ts"() {
     "use strict";
     fs2 = __toESM(require("fs"));
-    path4 = __toESM(require("path"));
+    path6 = __toESM(require("path"));
     os4 = __toESM(require("os"));
     LEVEL_NUM = { debug: 0, info: 1, warn: 2, error: 3 };
     LEVEL_LABEL = { debug: "DBG", info: "INF", warn: "WRN", error: "ERR" };
     currentLevel = "info";
-    LOG_DIR = process.platform === "win32" ? path4.join(process.env.LOCALAPPDATA || process.env.APPDATA || path4.join(os4.homedir(), "AppData", "Local"), "adhdev", "logs") : process.platform === "darwin" ? path4.join(os4.homedir(), "Library", "Logs", "adhdev") : path4.join(os4.homedir(), ".local", "share", "adhdev", "logs");
+    LOG_DIR = process.platform === "win32" ? path6.join(process.env.LOCALAPPDATA || process.env.APPDATA || path6.join(os4.homedir(), "AppData", "Local"), "adhdev", "logs") : process.platform === "darwin" ? path6.join(os4.homedir(), "Library", "Logs", "adhdev") : path6.join(os4.homedir(), ".local", "share", "adhdev", "logs");
     MAX_LOG_SIZE = 5 * 1024 * 1024;
     MAX_LOG_DAYS = 7;
     try {
@@ -406,16 +406,16 @@ var init_logger = __esm({
     } catch {
     }
     currentDate = getDateStr();
-    currentLogFile = path4.join(LOG_DIR, `daemon-${currentDate}.log`);
+    currentLogFile = path6.join(LOG_DIR, `daemon-${currentDate}.log`);
     cleanOldLogs();
     try {
-      const oldLog = path4.join(LOG_DIR, "daemon.log");
+      const oldLog = path6.join(LOG_DIR, "daemon.log");
       if (fs2.existsSync(oldLog)) {
         const stat = fs2.statSync(oldLog);
         const oldDate = stat.mtime.toISOString().slice(0, 10);
-        fs2.renameSync(oldLog, path4.join(LOG_DIR, `daemon-${oldDate}.log`));
+        fs2.renameSync(oldLog, path6.join(LOG_DIR, `daemon-${oldDate}.log`));
       }
-      const oldLogBackup = path4.join(LOG_DIR, "daemon.log.old");
+      const oldLogBackup = path6.join(LOG_DIR, "daemon.log.old");
       if (fs2.existsSync(oldLogBackup)) {
         fs2.unlinkSync(oldLogBackup);
       }
@@ -447,7 +447,7 @@ var init_logger = __esm({
       }
     };
     interceptorInstalled = false;
-    LOG_PATH = path4.join(LOG_DIR, `daemon-${getDateStr()}.log`);
+    LOG_PATH = path6.join(LOG_DIR, `daemon-${getDateStr()}.log`);
   }
 });
 
@@ -872,16 +872,22 @@ function computeTerminalQueryTail(buffer) {
   return "";
 }
 function findBinary(name) {
+  const trimmed = String(name || "").trim();
+  if (!trimmed) return trimmed;
+  const expanded = trimmed.startsWith("~") ? path9.join(os8.homedir(), trimmed.slice(1)) : trimmed;
+  if (path9.isAbsolute(expanded) || expanded.includes("/") || expanded.includes("\\")) {
+    return path9.isAbsolute(expanded) ? expanded : path9.resolve(expanded);
+  }
   const isWin = os8.platform() === "win32";
   try {
-    const cmd = isWin ? `where ${name}` : `which ${name}`;
+    const cmd = isWin ? `where ${trimmed}` : `which ${trimmed}`;
     return (0, import_child_process4.execSync)(cmd, { encoding: "utf-8", timeout: 5e3, stdio: ["pipe", "pipe", "pipe"] }).trim().split("\n")[0].trim();
   } catch {
-    return isWin ? `${name}.cmd` : name;
+    return isWin ? `${trimmed}.cmd` : trimmed;
   }
 }
 function isScriptBinary(binaryPath) {
-  if (!path7.isAbsolute(binaryPath)) return false;
+  if (!path9.isAbsolute(binaryPath)) return false;
   try {
     const fs15 = require("fs");
     const resolved = fs15.realpathSync(binaryPath);
@@ -897,7 +903,7 @@ function isScriptBinary(binaryPath) {
   }
 }
 function looksLikeMachOOrElf(filePath) {
-  if (!path7.isAbsolute(filePath)) return false;
+  if (!path9.isAbsolute(filePath)) return false;
   try {
     const fs15 = require("fs");
     const resolved = fs15.realpathSync(filePath);
@@ -1021,12 +1027,12 @@ function normalizeCliProviderForRuntime(raw) {
     }
   };
 }
-var os8, path7, import_child_process4, buildCliSpawnEnv, ProviderCliAdapter;
+var os8, path9, import_child_process4, buildCliSpawnEnv, ProviderCliAdapter;
 var init_provider_cli_adapter = __esm({
   "src/cli-adapters/provider-cli-adapter.ts"() {
     "use strict";
     os8 = __toESM(require("os"));
-    path7 = __toESM(require("path"));
+    path9 = __toESM(require("path"));
     import_child_process4 = require("child_process");
     init_logger();
     init_terminal_screen();
@@ -1381,16 +1387,17 @@ var init_provider_cli_adapter = __esm({
       async spawn() {
         if (this.ptyProcess) return;
         const { spawn: spawnConfig } = this.provider;
-        const binaryPath = findBinary(spawnConfig.command);
+        const configuredCommand = typeof this.runtimeSettings.executablePath === "string" && this.runtimeSettings.executablePath.trim() ? this.runtimeSettings.executablePath.trim() : spawnConfig.command;
+        const binaryPath = findBinary(configuredCommand);
         const isWin = os8.platform() === "win32";
         const allArgs = [...spawnConfig.args, ...this.extraArgs];
         LOG.info("CLI", `[${this.cliType}] Spawning in ${this.workingDir}`);
         this.resetTraceSession();
         let shellCmd;
         let shellArgs;
-        const useShellUnix = !isWin && (!!spawnConfig.shell || !path7.isAbsolute(binaryPath) || isScriptBinary(binaryPath) || !looksLikeMachOOrElf(binaryPath));
+        const useShellUnix = !isWin && (!!spawnConfig.shell || !path9.isAbsolute(binaryPath) || isScriptBinary(binaryPath) || !looksLikeMachOOrElf(binaryPath));
         const isCmdShim = isWin && /\.(cmd|bat)$/i.test(binaryPath);
-        const useShellWin = !!spawnConfig.shell || isCmdShim || !path7.isAbsolute(binaryPath) || isScriptBinary(binaryPath);
+        const useShellWin = !!spawnConfig.shell || isCmdShim || !path9.isAbsolute(binaryPath) || isScriptBinary(binaryPath);
         const useShell = isWin ? useShellWin : useShellUnix;
         if (useShell) {
           if (!spawnConfig.shell && !isWin) {
@@ -1764,7 +1771,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((resolve9) => setTimeout(resolve9, 50));
+          await new Promise((resolve12) => setTimeout(resolve12, 50));
         }
         const finalScreenText = this.terminalScreen.getText() || "";
         LOG.warn(
@@ -2275,7 +2282,7 @@ ${data.message || ""}`.trim();
           const deadline = Date.now() + 1e4;
           while (this.startupParseGate && Date.now() < deadline) {
             this.resolveStartupState("send_wait");
-            await new Promise((resolve9) => setTimeout(resolve9, 50));
+            await new Promise((resolve12) => setTimeout(resolve12, 50));
           }
         }
         await this.waitForInteractivePrompt();
@@ -2500,17 +2507,17 @@ ${data.message || ""}`.trim();
         }
       }
       waitForStopped(timeoutMs) {
-        return new Promise((resolve9) => {
+        return new Promise((resolve12) => {
           const startedAt = Date.now();
           const timer = setInterval(() => {
             if (!this.ptyProcess || this.currentStatus === "stopped") {
               clearInterval(timer);
-              resolve9(true);
+              resolve12(true);
               return;
             }
             if (Date.now() - startedAt >= timeoutMs) {
               clearInterval(timer);
-              resolve9(false);
+              resolve12(false);
             }
           }, 100);
         });
@@ -3209,6 +3216,7 @@ function resetState() {
 var import_child_process = require("child_process");
 var import_fs3 = require("fs");
 var import_os2 = require("os");
+var path4 = __toESM(require("path"));
 var BUILTIN_IDE_DEFINITIONS = [];
 var registeredIDEs = /* @__PURE__ */ new Map();
 function registerIDEDefinition(def) {
@@ -3225,9 +3233,16 @@ function getMergedDefinitions() {
   return [...merged.values()];
 }
 function findCliCommand(command) {
+  const trimmed = String(command || "").trim();
+  if (!trimmed) return null;
+  if (path4.isAbsolute(trimmed) || trimmed.includes("/") || trimmed.includes("\\") || trimmed.startsWith("~")) {
+    const candidate = trimmed.startsWith("~") ? path4.join((0, import_os2.homedir)(), trimmed.slice(1)) : trimmed;
+    const resolved = path4.isAbsolute(candidate) ? candidate : path4.resolve(candidate);
+    return (0, import_fs3.existsSync)(resolved) ? resolved : null;
+  }
   try {
     const result = (0, import_child_process.execSync)(
-      (0, import_os2.platform)() === "win32" ? `where ${command}` : `which ${command}`,
+      (0, import_os2.platform)() === "win32" ? `where ${trimmed}` : `which ${trimmed}`,
       { encoding: "utf-8", timeout: 5e3, stdio: ["pipe", "pipe", "pipe"] }
     ).trim();
     return result.split("\n")[0] || null;
@@ -3250,23 +3265,23 @@ function getIdeVersion(cliCommand) {
 function checkPathExists(paths) {
   const home = (0, import_os2.homedir)();
   for (const p of paths) {
-    if (p.includes("*")) {
+    const normalized = p.startsWith("~") ? path4.join(home, p.slice(1)) : p;
+    if (normalized.includes("*")) {
       const username = home.split(/[\\/]/).pop() || "";
-      const resolved = p.replace("*", username);
+      const resolved = normalized.replace("*", username);
       if ((0, import_fs3.existsSync)(resolved)) return resolved;
     } else {
-      if ((0, import_fs3.existsSync)(p)) return p;
+      if ((0, import_fs3.existsSync)(normalized)) return normalized;
     }
   }
   return null;
 }
-async function detectIDEs() {
+async function detectIDEs(providerLoader) {
   const os18 = (0, import_os2.platform)();
   const results = [];
   for (const def of getMergedDefinitions()) {
-    const cliPath = findCliCommand(def.cli);
-    const appPath = checkPathExists(def.paths[os18] || []);
-    const installed = !!(cliPath || appPath);
+    const cliPath = findCliCommand(providerLoader?.getIdeCliCommand(def.id, def.cli) || def.cli);
+    const appPath = checkPathExists(providerLoader?.getIdePathCandidates(def.id, def.paths[os18] || []) || []);
     let resolvedCli = cliPath;
     if (!resolvedCli && appPath && os18 === "darwin") {
       const bundledCli = `${appPath}/Contents/Resources/app/bin/${def.cli}`;
@@ -3289,6 +3304,7 @@ async function detectIDEs() {
         }
       }
     }
+    const installed = os18 === "darwin" ? !!(resolvedCli || appPath) : !!resolvedCli;
     const version = resolvedCli ? getIdeVersion(resolvedCli) : null;
     results.push({
       id: def.id,
@@ -3307,48 +3323,77 @@ async function detectIDEs() {
 // src/detection/cli-detector.ts
 var import_child_process2 = require("child_process");
 var os2 = __toESM(require("os"));
+var path5 = __toESM(require("path"));
+var import_fs4 = require("fs");
 function parseVersion(raw) {
   const match = raw.match(/v?(\d+\.\d+(?:\.\d+)?(?:-[a-zA-Z0-9.]+)?)/);
   return match ? match[1] : raw.split("\n")[0].slice(0, 100);
 }
+function shellQuote(value) {
+  if (/^[a-zA-Z0-9_./:@%+=,-]+$/.test(value)) return value;
+  return `"${value.replace(/(["\\$`])/g, "\\$1")}"`;
+}
+function expandHome(value) {
+  const trimmed = value.trim();
+  if (!trimmed.startsWith("~")) return trimmed;
+  return path5.join(os2.homedir(), trimmed.slice(1));
+}
+function isExplicitCommandPath(command) {
+  const trimmed = command.trim();
+  return path5.isAbsolute(trimmed) || trimmed.includes("/") || trimmed.includes("\\") || trimmed.startsWith("~");
+}
+function resolveCommandPath(command) {
+  const trimmed = command.trim();
+  if (!trimmed) return null;
+  if (isExplicitCommandPath(trimmed)) {
+    const expanded = expandHome(trimmed);
+    const candidate = path5.isAbsolute(expanded) ? expanded : path5.resolve(expanded);
+    return (0, import_fs4.existsSync)(candidate) ? candidate : null;
+  }
+  return null;
+}
 function execAsync(cmd, timeoutMs = 5e3) {
-  return new Promise((resolve9) => {
+  return new Promise((resolve12) => {
     const child = (0, import_child_process2.exec)(cmd, { encoding: "utf-8", timeout: timeoutMs }, (err, stdout) => {
       if (err || !stdout?.trim()) {
-        resolve9(null);
+        resolve12(null);
       } else {
-        resolve9(stdout.trim());
+        resolve12(stdout.trim());
       }
     });
-    child.on("error", () => resolve9(null));
+    child.on("error", () => resolve12(null));
   });
 }
-async function detectCLIs(providerLoader) {
+async function detectCLIs(providerLoader, options) {
   const platform9 = os2.platform();
   const whichCmd = platform9 === "win32" ? "where" : "which";
+  const includeVersion = options?.includeVersion !== false;
   const cliList = providerLoader ? providerLoader.getCliDetectionList() : [];
   const results = await Promise.all(
     cliList.map(async (cli) => {
       try {
-        const pathResult = await execAsync(`${whichCmd} ${cli.command}`);
+        const explicitPath = resolveCommandPath(cli.command);
+        const pathResult = explicitPath || await execAsync(`${whichCmd} ${shellQuote(cli.command)}`);
         if (!pathResult) return { ...cli, installed: false };
-        const firstPath = pathResult.split("\n")[0];
+        const firstPath = explicitPath || pathResult.split("\n")[0];
         let version;
-        try {
+        if (includeVersion) {
           const versionCommands = [
-            cli.versionCommand,
-            `${cli.command} --version`,
-            `${cli.command} -V`,
-            `${cli.command} -v`
+            `"${firstPath}" --version`,
+            `"${firstPath}" -V`,
+            `"${firstPath}" -v`,
+            cli.versionCommand
           ].filter((v) => !!v);
-          for (const versionCommand of versionCommands) {
-            const versionResult = await execAsync(versionCommand, 3e3);
-            if (versionResult) {
-              version = parseVersion(versionResult);
-              break;
+          try {
+            for (const versionCommand of versionCommands) {
+              const versionResult = await execAsync(versionCommand, 3e3);
+              if (versionResult) {
+                version = parseVersion(versionResult);
+                break;
+              }
             }
+          } catch {
           }
-        } catch {
         }
         return { ...cli, installed: true, version, path: firstPath };
       } catch {
@@ -3358,7 +3403,7 @@ async function detectCLIs(providerLoader) {
   );
   return results;
 }
-async function detectCLI(cliId, providerLoader) {
+async function detectCLI(cliId, providerLoader, options) {
   const resolvedId = providerLoader ? providerLoader.resolveAlias(cliId) : cliId;
   if (providerLoader) {
     const cliList = providerLoader.getCliDetectionList();
@@ -3367,25 +3412,28 @@ async function detectCLI(cliId, providerLoader) {
       const platform9 = os2.platform();
       const whichCmd = platform9 === "win32" ? "where" : "which";
       try {
-        const pathResult = await execAsync(`${whichCmd} ${target.command}`);
+        const explicitPath = resolveCommandPath(target.command);
+        const pathResult = explicitPath || await execAsync(`${whichCmd} ${shellQuote(target.command)}`);
         if (!pathResult) return null;
-        const firstPath = pathResult.split("\n")[0];
+        const firstPath = explicitPath || pathResult.split("\n")[0];
         let version;
-        try {
+        if (options?.includeVersion !== false) {
           const versionCommands = [
-            target.versionCommand,
-            `${target.command} --version`,
-            `${target.command} -V`,
-            `${target.command} -v`
+            `"${firstPath}" --version`,
+            `"${firstPath}" -V`,
+            `"${firstPath}" -v`,
+            target.versionCommand
           ].filter((v) => !!v);
-          for (const versionCommand of versionCommands) {
-            const versionResult = await execAsync(versionCommand, 3e3);
-            if (versionResult) {
-              version = parseVersion(versionResult);
-              break;
+          try {
+            for (const versionCommand of versionCommands) {
+              const versionResult = await execAsync(versionCommand, 3e3);
+              if (versionResult) {
+                version = parseVersion(versionResult);
+                break;
+              }
             }
+          } catch {
           }
-        } catch {
         }
         return { ...target, installed: true, version, path: firstPath };
       } catch {
@@ -3393,7 +3441,7 @@ async function detectCLI(cliId, providerLoader) {
       }
     }
   }
-  const all = await detectCLIs(providerLoader);
+  const all = await detectCLIs(providerLoader, options);
   return all.find((c) => c.id === resolvedId && c.installed) || null;
 }
 
@@ -3520,7 +3568,7 @@ var DaemonCdpManager = class {
   * Returns multiple entries if multiple IDE windows are open on same port
   */
   static listAllTargets(port) {
-    return new Promise((resolve9) => {
+    return new Promise((resolve12) => {
       const req = http.get(`http://127.0.0.1:${port}/json`, (res) => {
         let data = "";
         res.on("data", (chunk) => data += chunk.toString());
@@ -3536,16 +3584,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 || ""));
-            resolve9(mainPages.length > 0 ? mainPages : fallbackPages);
+            resolve12(mainPages.length > 0 ? mainPages : fallbackPages);
           } catch {
-            resolve9([]);
+            resolve12([]);
           }
         });
       });
-      req.on("error", () => resolve9([]));
+      req.on("error", () => resolve12([]));
       req.setTimeout(2e3, () => {
         req.destroy();
-        resolve9([]);
+        resolve12([]);
       });
     });
   }
@@ -3585,7 +3633,7 @@ var DaemonCdpManager = class {
     }
   }
   findTargetOnPort(port) {
-    return new Promise((resolve9) => {
+    return new Promise((resolve12) => {
       const req = http.get(`http://127.0.0.1:${port}/json`, (res) => {
         let data = "";
         res.on("data", (chunk) => data += chunk.toString());
@@ -3596,7 +3644,7 @@ var DaemonCdpManager = class {
               (t) => (t.type === "page" || t.type === "browser" || t.type === "Page") && t.webSocketDebuggerUrl
             );
             if (pages.length === 0) {
-              resolve9(targets.find((t) => t.webSocketDebuggerUrl) || null);
+              resolve12(targets.find((t) => t.webSocketDebuggerUrl) || null);
               return;
             }
             const mainPages = pages.filter((t) => !this.isNonMainTitle(t.title || ""));
@@ -3606,24 +3654,24 @@ var DaemonCdpManager = class {
               const specific = list.find((t) => t.id === this._targetId);
               if (specific) {
                 this._pageTitle = specific.title || "";
-                resolve9(specific);
+                resolve12(specific);
               } else {
                 this.log(`[CDP] Target ${this._targetId} not found in page list`);
-                resolve9(null);
+                resolve12(null);
               }
               return;
             }
             this._pageTitle = list[0]?.title || "";
-            resolve9(list[0]);
+            resolve12(list[0]);
           } catch {
-            resolve9(null);
+            resolve12(null);
           }
         });
       });
-      req.on("error", () => resolve9(null));
+      req.on("error", () => resolve12(null));
       req.setTimeout(2e3, () => {
         req.destroy();
-        resolve9(null);
+        resolve12(null);
       });
     });
   }
@@ -3634,7 +3682,7 @@ var DaemonCdpManager = class {
     this.extensionProviders = providers;
   }
   connectToTarget(wsUrl) {
-    return new Promise((resolve9) => {
+    return new Promise((resolve12) => {
       this.ws = new import_ws.default(wsUrl);
       this.ws.on("open", async () => {
         this._connected = true;
@@ -3644,17 +3692,17 @@ var DaemonCdpManager = class {
         }
         this.connectBrowserWs().catch(() => {
         });
-        resolve9(true);
+        resolve12(true);
       });
       this.ws.on("message", (data) => {
         try {
           const msg = JSON.parse(data.toString());
           if (msg.id && this.pending.has(msg.id)) {
-            const { resolve: resolve10, reject } = this.pending.get(msg.id);
+            const { resolve: resolve13, reject } = this.pending.get(msg.id);
             this.pending.delete(msg.id);
             this.failureCount = 0;
             if (msg.error) reject(new Error(msg.error.message));
-            else resolve10(msg.result);
+            else resolve13(msg.result);
           } else if (msg.method === "Runtime.executionContextCreated") {
             this.contexts.add(msg.params.context.id);
           } else if (msg.method === "Runtime.executionContextDestroyed") {
@@ -3677,7 +3725,7 @@ var DaemonCdpManager = class {
       this.ws.on("error", (err) => {
         this.log(`[CDP] WebSocket error: ${err.message}`);
         this._connected = false;
-        resolve9(false);
+        resolve12(false);
       });
     });
   }
@@ -3691,7 +3739,7 @@ var DaemonCdpManager = class {
         return;
       }
       this.log(`[CDP] Connecting browser WS for target discovery...`);
-      await new Promise((resolve9, reject) => {
+      await new Promise((resolve12, reject) => {
         this.browserWs = new import_ws.default(browserWsUrl);
         this.browserWs.on("open", async () => {
           this._browserConnected = true;
@@ -3701,16 +3749,16 @@ var DaemonCdpManager = class {
           } catch (e) {
             this.log(`[CDP] setDiscoverTargets failed: ${e.message}`);
           }
-          resolve9();
+          resolve12();
         });
         this.browserWs.on("message", (data) => {
           try {
             const msg = JSON.parse(data.toString());
             if (msg.id && this.browserPending.has(msg.id)) {
-              const { resolve: resolve10, reject: reject2 } = this.browserPending.get(msg.id);
+              const { resolve: resolve13, reject: reject2 } = this.browserPending.get(msg.id);
               this.browserPending.delete(msg.id);
               if (msg.error) reject2(new Error(msg.error.message));
-              else resolve10(msg.result);
+              else resolve13(msg.result);
             }
           } catch {
           }
@@ -3730,31 +3778,31 @@ var DaemonCdpManager = class {
     }
   }
   getBrowserWsUrl() {
-    return new Promise((resolve9) => {
+    return new Promise((resolve12) => {
       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);
-            resolve9(info.webSocketDebuggerUrl || null);
+            resolve12(info.webSocketDebuggerUrl || null);
           } catch {
-            resolve9(null);
+            resolve12(null);
           }
         });
       });
-      req.on("error", () => resolve9(null));
+      req.on("error", () => resolve12(null));
       req.setTimeout(3e3, () => {
         req.destroy();
-        resolve9(null);
+        resolve12(null);
       });
     });
   }
   sendBrowser(method, params = {}, timeoutMs = 15e3) {
-    return new Promise((resolve9, reject) => {
+    return new Promise((resolve12, reject) => {
       if (!this.browserWs || !this._browserConnected) return reject(new Error("Browser WS not connected"));
       const id = this.browserMsgId++;
-      this.browserPending.set(id, { resolve: resolve9, reject });
+      this.browserPending.set(id, { resolve: resolve12, reject });
       this.browserWs.send(JSON.stringify({ id, method, params }));
       setTimeout(() => {
         if (this.browserPending.has(id)) {
@@ -3794,11 +3842,11 @@ var DaemonCdpManager = class {
   }
   // ─── CDP Protocol ────────────────────────────────────────
   sendInternal(method, params = {}, timeoutMs = 15e3) {
-    return new Promise((resolve9, reject) => {
+    return new Promise((resolve12, 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: resolve9, reject });
+      this.pending.set(id, { resolve: resolve12, reject });
       this.ws.send(JSON.stringify({ id, method, params }));
       setTimeout(() => {
         if (this.pending.has(id)) {
@@ -4047,7 +4095,7 @@ var DaemonCdpManager = class {
     const browserWs = this.browserWs;
     let msgId = this.browserMsgId;
     const sendWs = (method, params = {}, sessionId) => {
-      return new Promise((resolve9, reject) => {
+      return new Promise((resolve12, reject) => {
         const mid = msgId++;
         this.browserMsgId = msgId;
         const handler = (raw) => {
@@ -4056,7 +4104,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 resolve9(msg.result);
+              else resolve12(msg.result);
             }
           } catch {
           }
@@ -4247,14 +4295,14 @@ var DaemonCdpManager = class {
     if (!ws || ws.readyState !== import_ws.default.OPEN) {
       throw new Error("CDP not connected");
     }
-    return new Promise((resolve9, reject) => {
+    return new Promise((resolve12, reject) => {
       const id = getNextId();
       pendingMap.set(id, {
         resolve: (result) => {
           if (result?.result?.subtype === "error") {
             reject(new Error(result.result.description));
           } else {
-            resolve9(result?.result?.value);
+            resolve12(result?.result?.value);
           }
         },
         reject
@@ -4286,10 +4334,10 @@ var DaemonCdpManager = class {
       throw new Error("CDP not connected");
     }
     const sendViaSession = (method, params = {}) => {
-      return new Promise((resolve9, reject) => {
+      return new Promise((resolve12, reject) => {
         const pendingMap = this._browserConnected ? this.browserPending : this.pending;
         const id = this._browserConnected ? this.browserMsgId++ : this.msgId++;
-        pendingMap.set(id, { resolve: resolve9, reject });
+        pendingMap.set(id, { resolve: resolve12, reject });
         ws.send(JSON.stringify({ id, sessionId, method, params }));
         setTimeout(() => {
           if (pendingMap.has(id)) {
@@ -4917,9 +4965,9 @@ function normalizeControlValue(value) {
 
 // src/config/chat-history.ts
 var fs3 = __toESM(require("fs"));
-var path5 = __toESM(require("path"));
+var path7 = __toESM(require("path"));
 var os5 = __toESM(require("os"));
-var HISTORY_DIR = path5.join(os5.homedir(), ".adhdev", "history");
+var HISTORY_DIR = path7.join(os5.homedir(), ".adhdev", "history");
 var RETAIN_DAYS = 30;
 var ChatHistoryWriter = class {
   /** Last seen message count per agent (deduplication) */
@@ -4964,11 +5012,11 @@ var ChatHistoryWriter = class {
         });
       }
       if (newMessages.length === 0) return;
-      const dir = path5.join(HISTORY_DIR, this.sanitize(agentType));
+      const dir = path7.join(HISTORY_DIR, this.sanitize(agentType));
       fs3.mkdirSync(dir, { recursive: true });
       const date = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
       const filePrefix = effectiveHistoryKey ? `${this.sanitize(effectiveHistoryKey)}_` : "";
-      const filePath = path5.join(dir, `${filePrefix}${date}.jsonl`);
+      const filePath = path7.join(dir, `${filePrefix}${date}.jsonl`);
       const lines = newMessages.map((m) => JSON.stringify(m)).join("\n") + "\n";
       fs3.appendFileSync(filePath, lines, "utf-8");
       const prevCount = this.lastSeenCounts.get(dedupKey) || 0;
@@ -5022,14 +5070,14 @@ var ChatHistoryWriter = class {
         this.lastSeenCounts.set(toDedupKey, Math.max(fromCount, this.lastSeenCounts.get(toDedupKey) || 0));
         this.lastSeenCounts.delete(fromDedupKey);
       }
-      const dir = path5.join(HISTORY_DIR, this.sanitize(agentType));
+      const dir = path7.join(HISTORY_DIR, this.sanitize(agentType));
       if (!fs3.existsSync(dir)) return;
       const fromPrefix = `${this.sanitize(fromId)}_`;
       const toPrefix = `${this.sanitize(toId)}_`;
       const files = fs3.readdirSync(dir).filter((file) => file.startsWith(fromPrefix) && file.endsWith(".jsonl"));
       for (const file of files) {
-        const sourcePath = path5.join(dir, file);
-        const targetPath = path5.join(dir, `${toPrefix}${file.slice(fromPrefix.length)}`);
+        const sourcePath = path7.join(dir, file);
+        const targetPath = path7.join(dir, `${toPrefix}${file.slice(fromPrefix.length)}`);
         const sourceLines = fs3.readFileSync(sourcePath, "utf-8").split("\n").filter(Boolean);
         const rewritten = sourceLines.map((line) => {
           try {
@@ -5070,10 +5118,10 @@ var ChatHistoryWriter = class {
       const cutoff = Date.now() - RETAIN_DAYS * 24 * 60 * 60 * 1e3;
       const agentDirs = fs3.readdirSync(HISTORY_DIR, { withFileTypes: true }).filter((d) => d.isDirectory());
       for (const dir of agentDirs) {
-        const dirPath = path5.join(HISTORY_DIR, dir.name);
+        const dirPath = path7.join(HISTORY_DIR, dir.name);
         const files = fs3.readdirSync(dirPath).filter((f) => f.endsWith(".jsonl") || f.endsWith(".terminal.log"));
         for (const file of files) {
-          const filePath = path5.join(dirPath, file);
+          const filePath = path7.join(dirPath, file);
           const stat = fs3.statSync(filePath);
           if (stat.mtimeMs < cutoff) {
             fs3.unlinkSync(filePath);
@@ -5091,7 +5139,7 @@ var ChatHistoryWriter = class {
 function readChatHistory(agentType, offset = 0, limit = 30, historySessionId) {
   try {
     const sanitized = agentType.replace(/[^a-zA-Z0-9_-]/g, "_");
-    const dir = path5.join(HISTORY_DIR, sanitized);
+    const dir = path7.join(HISTORY_DIR, sanitized);
     if (!fs3.existsSync(dir)) return { messages: [], hasMore: false };
     const sanitizedInstance = historySessionId?.replace(/[^a-zA-Z0-9_-]/g, "_");
     const files = fs3.readdirSync(dir).filter((f) => {
@@ -5105,7 +5153,7 @@ function readChatHistory(agentType, offset = 0, limit = 30, historySessionId) {
     const needed = offset + limit + 1;
     for (const file of files) {
       if (allMessages.length >= needed) break;
-      const filePath = path5.join(dir, file);
+      const filePath = path7.join(dir, file);
       const content = fs3.readFileSync(filePath, "utf-8");
       const lines = content.trim().split("\n").filter(Boolean);
       for (let i = lines.length - 1; i >= 0; i--) {
@@ -5127,7 +5175,7 @@ function readChatHistory(agentType, offset = 0, limit = 30, historySessionId) {
 function listSavedHistorySessions(agentType, options = {}) {
   try {
     const sanitized = agentType.replace(/[^a-zA-Z0-9_-]/g, "_");
-    const dir = path5.join(HISTORY_DIR, sanitized);
+    const dir = path7.join(HISTORY_DIR, sanitized);
     if (!fs3.existsSync(dir)) return { sessions: [], hasMore: false };
     const groupedFiles = /* @__PURE__ */ new Map();
     const filePattern = /^([A-Za-z0-9_-]+)_\d{4}-\d{2}-\d{2}\.jsonl$/;
@@ -5148,7 +5196,7 @@ function listSavedHistorySessions(agentType, options = {}) {
       let sessionTitle = "";
       let preview = "";
       for (const file of files.sort()) {
-        const filePath = path5.join(dir, file);
+        const filePath = path7.join(dir, file);
         const content = fs3.readFileSync(filePath, "utf-8");
         const lines = content.split("\n").filter(Boolean);
         for (const line of lines) {
@@ -5201,6 +5249,7 @@ var ExtensionProviderInstance = class {
   currentStatus = "idle";
   agentStreams = [];
   messages = [];
+  prevMessageHashes = /* @__PURE__ */ new Map();
   activeModal = null;
   currentModel = "";
   currentMode = "";
@@ -5266,7 +5315,7 @@ var ExtensionProviderInstance = class {
   onEvent(event, data) {
     if (event === "stream_update") {
       if (data?.streams) this.agentStreams = data.streams;
-      if (data?.messages) this.messages = data.messages;
+      if (data?.messages) this.messages = this.assignReceivedAt(data.messages);
       if (data?.activeModal !== void 0) this.activeModal = data.activeModal;
       if (data?.model) this.currentModel = data.model;
       if (data?.mode) this.currentMode = data.mode;
@@ -5292,6 +5341,7 @@ var ExtensionProviderInstance = class {
   dispose() {
     this.agentStreams = [];
     this.messages = [];
+    this.prevMessageHashes.clear();
     this.monitor.reset();
     this.appliedEffectKeys.clear();
     this.runtimeMessages = [];
@@ -5447,6 +5497,23 @@ var ExtensionProviderInstance = class {
       this.chatId || this.instanceId
     );
   }
+  /**
+   * Assign stable receivedAt to extension messages.
+   * Same pattern as IdeProviderInstance.readChat() prevByHash —
+   * preserves first-seen timestamp across polling cycles.
+   */
+  assignReceivedAt(messages) {
+    const now = Date.now();
+    const nextHashes = /* @__PURE__ */ new Map();
+    for (const msg of messages) {
+      const hash = `${msg.role}:${(msg.content || "").slice(0, 100)}`;
+      const prevTime = this.prevMessageHashes.get(hash);
+      msg.receivedAt = prevTime || now;
+      nextHashes.set(hash, msg.receivedAt);
+    }
+    this.prevMessageHashes = nextHashes;
+    return messages;
+  }
   mergeConversationMessages(messages) {
     if (this.runtimeMessages.length === 0) return messages;
     return [...messages, ...this.runtimeMessages.map((entry) => entry.message)].map((message, index) => ({ message, index })).sort((a, b) => {
@@ -5503,6 +5570,7 @@ ${effect.notification.body || ""}`.trim();
     }
     this.agentStreams = [];
     this.messages = [];
+    this.prevMessageHashes.clear();
     this.activeModal = null;
     this.currentModel = "";
     this.currentMode = "";
@@ -6488,16 +6556,28 @@ function trimMessageForStatus(message, stringLimit) {
   if (!message || typeof message !== "object") return message;
   return trimStructuredStrings(message, stringLimit);
 }
+function normalizeMessageTime(message) {
+  if (!message || typeof message !== "object") return message;
+  const msg = message;
+  if (msg.receivedAt == null) {
+    const fallback = msg.timestamp ?? msg.createdAt;
+    if (fallback != null) {
+      const ts2 = typeof fallback === "string" ? Date.parse(fallback) : Number(fallback);
+      if (Number.isFinite(ts2) && ts2 > 0) msg.receivedAt = ts2;
+    }
+  }
+  return msg;
+}
 function trimMessagesForStatus(messages) {
   if (!Array.isArray(messages) || messages.length === 0) return [];
   const recent = messages.slice(-STATUS_ACTIVE_CHAT_MESSAGE_LIMIT);
   const kept = [];
   let totalBytes = 0;
   for (let i = recent.length - 1; i >= 0; i -= 1) {
-    let normalized = trimMessageForStatus(recent[i], STATUS_ACTIVE_CHAT_STRING_LIMIT);
+    let normalized = normalizeMessageTime(trimMessageForStatus(recent[i], STATUS_ACTIVE_CHAT_STRING_LIMIT));
     let size = estimateBytes(normalized);
     if (size > STATUS_ACTIVE_CHAT_TOTAL_BYTES_LIMIT) {
-      normalized = trimMessageForStatus(recent[i], STATUS_ACTIVE_CHAT_FALLBACK_STRING_LIMIT);
+      normalized = normalizeMessageTime(trimMessageForStatus(recent[i], STATUS_ACTIVE_CHAT_FALLBACK_STRING_LIMIT));
       size = estimateBytes(normalized);
     }
     if (kept.length > 0 && totalBytes + size > STATUS_ACTIVE_CHAT_TOTAL_BYTES_LIMIT) {
@@ -7120,7 +7200,7 @@ async function handleSendChat(h, args) {
   if (isExtensionTransport(transport)) {
     _log(`Extension: ${provider?.type || "unknown_extension"}`);
     try {
-      const evalResult = await h.evaluateProviderScript("sendMessage", { MESSAGE: text }, 3e4);
+      const evalResult = await h.evaluateProviderScript("sendMessage", { message: text }, 3e4);
       if (evalResult?.result) {
         const parsed = parseMaybeJson(evalResult.result);
         if (didProviderConfirmSend(parsed)) {
@@ -7151,7 +7231,7 @@ async function handleSendChat(h, args) {
     return { success: false, error: `CDP for ${managerKey || "unknown"} not connected` };
   }
   _log(`Targeting IDE: ${getCurrentManagerKey(h)}`);
-  const sendScript = h.getProviderScript("sendMessage", { MESSAGE: text });
+  const sendScript = h.getProviderScript("sendMessage", { message: text });
   if (sendScript) {
     try {
       const result = await targetCdp.evaluate(sendScript, 3e4);
@@ -7291,6 +7371,14 @@ async function handleListChats(h, args) {
         } catch {
         }
       }
+      if (parsed?.sessions && Array.isArray(parsed.sessions)) {
+        LOG.info("Command", `[list_chats] OK: ${parsed.sessions.length} chats`);
+        return { success: true, chats: parsed.sessions };
+      }
+      if (parsed?.chats && Array.isArray(parsed.chats)) {
+        LOG.info("Command", `[list_chats] OK: ${parsed.chats.length} chats`);
+        return { success: true, chats: parsed.chats };
+      }
       if (Array.isArray(parsed)) {
         LOG.info("Command", `[list_chats] OK: ${parsed.length} chats`);
         return { success: true, chats: parsed };
@@ -7360,7 +7448,13 @@ async function handleSwitchChat(h, args) {
   } catch (e) {
     return { success: false, error: `webviewSwitchSession failed: ${e.message}` };
   }
-  const script = h.getProviderScript("switchSession", { SESSION_ID: JSON.stringify(sessionId) }) || h.getProviderScript("switch_session", { SESSION_ID: JSON.stringify(sessionId) });
+  const switchParams = {
+    sessionId,
+    title: sessionId,
+    id: sessionId,
+    SESSION_ID: JSON.stringify(sessionId)
+  };
+  const script = h.getProviderScript("switchSession", switchParams) || h.getProviderScript("switch_session", switchParams);
   if (!script) return { success: false, error: "switch_session script not available" };
   try {
     const raw = await cdp.evaluate(script, 15e3);
@@ -7439,8 +7533,8 @@ async function handleSetMode(h, args) {
     const adapter = getTargetedCliAdapter(h, args, provider?.type);
     if (adapter) {
       const acpInstance = adapter._acpInstance;
-      if (acpInstance && typeof acpInstance.onEvent === "function") {
-        acpInstance.onEvent("set_mode", { mode });
+      if (acpInstance && typeof acpInstance.setMode === "function") {
+        await acpInstance.setMode(mode);
         return { success: true, mode };
       }
     }
@@ -7497,9 +7591,9 @@ async function handleChangeModel(h, args) {
     LOG.info("Command", `[change_model] ACP adapter found: ${!!adapter}, type=${adapter?.cliType}, hasAcpInstance=${!!adapter?._acpInstance}`);
     if (adapter) {
       const acpInstance = adapter._acpInstance;
-      if (acpInstance && typeof acpInstance.onEvent === "function") {
-        acpInstance.onEvent("change_model", { model });
-        LOG.info("Command", `[change_model] Dispatched change_model event to ACP instance`);
+      if (acpInstance && typeof acpInstance.setConfigOption === "function") {
+        await acpInstance.setConfigOption("model", model);
+        LOG.info("Command", `[change_model] Updated ACP model to ${model}`);
         return { success: true, model };
       }
     }
@@ -7619,6 +7713,18 @@ async function handleResolveAction(h, args) {
     const ok = await h.agentStream.resolveSessionAction(h.getCdp(), h.currentSession.sessionId, action);
     return { success: ok };
   }
+  if (transport === "acp") {
+    const adapter = getTargetedCliAdapter(h, args, provider?.type);
+    const acpInstance = adapter?._acpInstance;
+    if (!acpInstance) return { success: false, error: "ACP instance not found" };
+    try {
+      await acpInstance.resolvePermission(action === "approve" || action === "accept" || action === "always");
+      LOG.info("Command", `[resolveAction] ACP \u2192 ${action}`);
+      return { success: true, action };
+    } catch (e) {
+      return { success: false, error: e?.message || "ACP resolve action failed" };
+    }
+  }
   if (provider?.scripts?.webviewResolveAction || provider?.scripts?.webview_resolve_action) {
     const script = h.getProviderScript("webviewResolveAction", { action, button, buttonText: button }) || h.getProviderScript("webview_resolve_action", { action, button, buttonText: button });
     if (script) {
@@ -7697,7 +7803,7 @@ async function handleResolveAction(h, args) {
 
 // src/commands/cdp-commands.ts
 var fs4 = __toESM(require("fs"));
-var path6 = __toESM(require("path"));
+var path8 = __toESM(require("path"));
 var os6 = __toESM(require("os"));
 var KEY_TO_VK = {
   Backspace: 8,
@@ -7949,25 +8055,25 @@ function resolveSafePath(requestedPath) {
   const inputPath = rawPath || ".";
   const home = os6.homedir();
   if (inputPath.startsWith("~")) {
-    return path6.resolve(path6.join(home, inputPath.slice(1)));
+    return path8.resolve(path8.join(home, inputPath.slice(1)));
   }
   if (process.platform === "win32") {
     const normalized = normalizeWindowsRequestedPath(inputPath);
-    if (path6.win32.isAbsolute(normalized)) {
-      return path6.win32.normalize(normalized);
+    if (path8.win32.isAbsolute(normalized)) {
+      return path8.win32.normalize(normalized);
     }
-    return path6.win32.resolve(normalized);
+    return path8.win32.resolve(normalized);
   }
-  if (path6.isAbsolute(inputPath)) {
-    return path6.normalize(inputPath);
+  if (path8.isAbsolute(inputPath)) {
+    return path8.normalize(inputPath);
   }
-  return path6.resolve(inputPath);
+  return path8.resolve(inputPath);
 }
 function listDirectoryEntriesSafe(dirPath) {
   const entries = fs4.readdirSync(dirPath, { withFileTypes: true });
   const files = [];
   for (const entry of entries) {
-    const entryPath = path6.join(dirPath, entry.name);
+    const entryPath = path8.join(dirPath, entry.name);
     try {
       if (entry.isDirectory()) {
         files.push({ name: entry.name, type: "directory" });
@@ -8006,7 +8112,7 @@ async function handleFileRead(h, args) {
 async function handleFileWrite(h, args) {
   try {
     const filePath = resolveSafePath(args?.path);
-    fs4.mkdirSync(path6.dirname(filePath), { recursive: true });
+    fs4.mkdirSync(path8.dirname(filePath), { recursive: true });
     fs4.writeFileSync(filePath, args?.content || "", "utf-8");
     return { success: true, path: filePath };
   } catch (e) {
@@ -8094,7 +8200,7 @@ function handleGetProviderSettings(h, args) {
   }
   return { success: true, settings: allSettings, values: allValues };
 }
-function handleSetProviderSetting(h, args) {
+async function handleSetProviderSetting(h, args) {
   const loader = h.ctx.providerLoader;
   const { providerType, key, value } = args || {};
   if (!providerType || !key || value === void 0) {
@@ -8107,6 +8213,7 @@ function handleSetProviderSetting(h, args) {
       const updated = h.ctx.instanceManager.updateInstanceSettings(providerType, allSettings);
       LOG.info("Command", `[set_provider_setting] ${providerType}.${key}=${JSON.stringify(value)} \u2192 ${updated} instance(s) updated`);
     }
+    await h.ctx.onProviderSettingChanged?.(providerType, key, value);
     return { success: true, providerType, key, value };
   }
   return { success: false, error: `Failed to set ${providerType}.${key} \u2014 invalid key, value, or not a public setting` };
@@ -8144,10 +8251,10 @@ function getCliScriptCommand(payload) {
   }
   const command = payload.command;
   if (!command || typeof command !== "object") return null;
-  if (command.type !== "send_message") return null;
+  if (command.type !== "send_message" && command.type !== "pty_write") return null;
   const text = typeof command.text === "string" ? command.text.trim() : typeof command.message === "string" ? command.message.trim() : "";
   if (!text) return null;
-  return { type: "send_message", text };
+  return { type: command.type, text };
 }
 function applyProviderPatch(h, args, payload) {
   if (!payload || typeof payload !== "object") return;
@@ -8188,6 +8295,8 @@ async function executeProviderScript(h, args, scriptName) {
       const cliCommand = getCliScriptCommand(parsed.payload);
       if (cliCommand?.type === "send_message" && cliCommand.text) {
         await adapter.sendMessage(cliCommand.text);
+      } else if (cliCommand?.type === "pty_write" && cliCommand.text && adapter.writeRaw) {
+        adapter.writeRaw(cliCommand.text + "\r");
       }
       applyProviderPatch(h, args, parsed.payload);
       return { success: true, ...parsed.payload && typeof parsed.payload === "object" ? parsed.payload : { result: parsed.payload } };
@@ -8553,9 +8662,26 @@ var DaemonCommandHandler = class {
     if (provider?.scripts) {
       const fn = provider.scripts[scriptName];
       if (typeof fn === "function") {
-        const firstVal = params ? Object.values(params)[0] : void 0;
-        const script = firstVal ? fn(firstVal) : fn();
-        if (script) return script;
+        if (params && Object.keys(params).length > 0) {
+          const firstVal = Object.values(params)[0];
+          if (scriptName === "sendMessage" && typeof firstVal === "string") {
+            const legacyScript = fn(firstVal);
+            if (legacyScript) return legacyScript;
+          }
+          const script = fn(params);
+          if (script) {
+            const likelyLegacyObjectLeak = typeof script === "string" && script.includes("[object Object]") && typeof firstVal === "string";
+            if (!likelyLegacyObjectLeak) return script;
+          }
+          if (firstVal !== void 0) {
+            const legacyScript = fn(firstVal);
+            if (legacyScript) return legacyScript;
+          }
+          if (script) return script;
+        } else {
+          const script = fn();
+          if (script) return script;
+        }
       }
     }
     return null;
@@ -8849,7 +8975,7 @@ var DaemonCommandHandler = class {
     try {
       const http3 = await import("http");
       const postData = JSON.stringify(body);
-      const result = await new Promise((resolve9, reject) => {
+      const result = await new Promise((resolve12, reject) => {
         const req = http3.request({
           hostname: "127.0.0.1",
           port: 19280,
@@ -8861,9 +8987,9 @@ var DaemonCommandHandler = class {
           res.on("data", (chunk) => data += chunk);
           res.on("end", () => {
             try {
-              resolve9(JSON.parse(data));
+              resolve12(JSON.parse(data));
             } catch {
-              resolve9({ raw: data });
+              resolve12({ raw: data });
             }
           });
         });
@@ -8881,15 +9007,15 @@ var DaemonCommandHandler = class {
     if (!providerType) return { success: false, error: "providerType required" };
     try {
       const http3 = await import("http");
-      const result = await new Promise((resolve9, reject) => {
+      const result = await new Promise((resolve12, 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 {
-              resolve9(JSON.parse(data));
+              resolve12(JSON.parse(data));
             } catch {
-              resolve9({ raw: data });
+              resolve12({ raw: data });
             }
           });
         }).on("error", reject);
@@ -8903,7 +9029,7 @@ var DaemonCommandHandler = class {
     try {
       const http3 = await import("http");
       const postData = JSON.stringify(args || {});
-      const result = await new Promise((resolve9, reject) => {
+      const result = await new Promise((resolve12, reject) => {
         const req = http3.request({
           hostname: "127.0.0.1",
           port: 19280,
@@ -8915,9 +9041,9 @@ var DaemonCommandHandler = class {
           res.on("data", (chunk) => data += chunk);
           res.on("end", () => {
             try {
-              resolve9(JSON.parse(data));
+              resolve12(JSON.parse(data));
             } catch {
-              resolve9({ raw: data });
+              resolve12({ raw: data });
             }
           });
         });
@@ -8934,7 +9060,7 @@ var DaemonCommandHandler = class {
 
 // src/commands/cli-manager.ts
 var os10 = __toESM(require("os"));
-var path9 = __toESM(require("path"));
+var path11 = __toESM(require("path"));
 var crypto4 = __toESM(require("crypto"));
 var import_chalk = __toESM(require("chalk"));
 init_provider_cli_adapter();
@@ -8942,7 +9068,7 @@ init_config();
 
 // src/providers/cli-provider-instance.ts
 var os9 = __toESM(require("os"));
-var path8 = __toESM(require("path"));
+var path10 = __toESM(require("path"));
 var crypto3 = __toESM(require("crypto"));
 var fs5 = __toESM(require("fs"));
 var import_node_module = require("module");
@@ -8951,7 +9077,7 @@ init_logger();
 var CachedDatabaseSync = null;
 function getDatabaseSync() {
   if (CachedDatabaseSync) return CachedDatabaseSync;
-  const requireFn = typeof require === "function" ? require : (0, import_node_module.createRequire)(path8.join(process.cwd(), "__adhdev_sqlite_loader__.js"));
+  const requireFn = typeof require === "function" ? require : (0, import_node_module.createRequire)(path10.join(process.cwd(), "__adhdev_sqlite_loader__.js"));
   const sqliteModule = requireFn(`node:${"sqlite"}`);
   CachedDatabaseSync = sqliteModule.DatabaseSync;
   if (!CachedDatabaseSync) {
@@ -9016,6 +9142,7 @@ var CliProviderInstance = class {
       this.detectStatusTransition();
     });
     await this.adapter.spawn();
+    this.maybeAppendRuntimeRecoveryMessage(this.adapter.getRuntimeMetadata());
     if (this.providerSessionId) {
       const restoredHistory = readChatHistory(this.type, 0, 200, this.providerSessionId);
       if (restoredHistory.messages.length > 0) {
@@ -9110,6 +9237,7 @@ var CliProviderInstance = class {
       this.promoteProviderSessionId(parsedProviderSessionId);
     }
     const runtime = this.adapter.getRuntimeMetadata();
+    this.maybeAppendRuntimeRecoveryMessage(runtime);
     const parsedMessages = Array.isArray(parsedStatus?.messages) ? parsedStatus.messages : [];
     const controlValues = extractProviderControlValues(this.provider.controls, parsedStatus);
     if (controlValues) {
@@ -9436,6 +9564,28 @@ ${effect.notification.body || ""}`.trim();
     const pad = (value) => String(value).padStart(2, "0");
     return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(date.getSeconds())}`;
   }
+  maybeAppendRuntimeRecoveryMessage(runtime) {
+    if (!runtime?.restoredFromStorage || !runtime.runtimeId) return;
+    const recoveryState = String(runtime.recoveryState || "").trim();
+    if (!recoveryState) return;
+    let content = "";
+    if (recoveryState === "auto_resumed") {
+      content = "Session host restored this CLI after restart and reattached it from a saved snapshot.";
+    } else if (recoveryState === "resume_failed") {
+      const errorSuffix = runtime.recoveryError ? ` Resume failed: ${runtime.recoveryError}` : "";
+      content = `Session host found this CLI after restart, but automatic resume failed.${errorSuffix}`;
+    } else if (recoveryState === "host_restart_interrupted") {
+      content = "Session host found this CLI in interrupted state after restart and is attempting to resume it.";
+    } else if (recoveryState === "orphan_snapshot") {
+      content = "Session host restored the last snapshot for this CLI, but the original runtime was not resumed automatically.";
+    } else {
+      content = `Session host restored this CLI after restart (${recoveryState}).`;
+    }
+    this.appendRuntimeSystemMessage(
+      content,
+      `runtime_recovery:${runtime.runtimeId}:${recoveryState}`
+    );
+  }
   appendRuntimeSystemMessage(content, dedupKey, receivedAt = Date.now()) {
     const normalizedContent = String(content || "").trim();
     if (!normalizedContent) return;
@@ -9756,8 +9906,9 @@ var AcpProviderInstance = class {
   async setConfigOption(category, value) {
     const opt = this.configOptions.find((c) => c.category === category);
     if (!opt) {
-      this.log.warn(`[${this.type}] No config option for category: ${category}`);
-      return;
+      const message = `[${this.type}] No config option for category: ${category}`;
+      this.log.warn(message);
+      throw new Error(message);
     }
     if (this.useStaticConfig) {
       opt.currentValue = value;
@@ -9769,8 +9920,9 @@ var AcpProviderInstance = class {
       return;
     }
     if (!this.connection || !this.sessionId) {
-      this.log.warn(`[${this.type}] Cannot set config: no active connection/session`);
-      return;
+      const message = `[${this.type}] Cannot set config: no active connection/session`;
+      this.log.warn(message);
+      throw new Error(message);
     }
     try {
       this.log.info(`[${this.type}] Sending session/set_config_option: configId=${opt.configId} value=${value} sessionId=${this.sessionId}`);
@@ -9784,7 +9936,9 @@ var AcpProviderInstance = class {
       if (result?.configOptions) this.parseConfigOptions(result.configOptions);
       this.log.info(`[${this.type}] Config ${category} set to: ${value} | response: ${JSON.stringify(result)?.slice(0, 300)}`);
     } catch (e) {
-      this.log.warn(`[${this.type}] set_config_option failed: ${e?.message}`);
+      const message = e?.message || "Unknown ACP config error";
+      this.log.warn(`[${this.type}] set_config_option failed: ${message}`);
+      throw new Error(message);
     }
   }
   async setMode(modeId) {
@@ -9800,8 +9954,9 @@ var AcpProviderInstance = class {
       return;
     }
     if (!this.connection || !this.sessionId) {
-      this.log.warn(`[${this.type}] Cannot set mode: no active connection/session`);
-      return;
+      const message = `[${this.type}] Cannot set mode: no active connection/session`;
+      this.log.warn(message);
+      throw new Error(message);
     }
     try {
       await this.connection.setSessionMode({
@@ -9811,7 +9966,9 @@ var AcpProviderInstance = class {
       this.currentMode = modeId;
       this.log.info(`[${this.type}] Mode set to: ${modeId}`);
     } catch (e) {
-      this.log.warn(`[${this.type}] set_mode failed: ${e?.message}`);
+      const message = e?.message || "Unknown ACP mode error";
+      this.log.warn(`[${this.type}] set_mode failed: ${message}`);
+      throw new Error(message);
     }
   }
   /** Static config: kill process and restart with new args */
@@ -9859,7 +10016,7 @@ var AcpProviderInstance = class {
     if (!spawnConfig) {
       throw new Error(`[ACP:${this.type}] No spawn config defined`);
     }
-    const command = spawnConfig.command;
+    const command = typeof this.settings.executablePath === "string" && this.settings.executablePath.trim() ? this.settings.executablePath.trim() : spawnConfig.command;
     let baseArgs = spawnConfig.args || [];
     if (this.provider.spawnArgBuilder && Object.keys(this.selectedConfig).length > 0) {
       baseArgs = this.provider.spawnArgBuilder(this.selectedConfig);
@@ -9975,13 +10132,13 @@ var AcpProviderInstance = class {
         }
         this.currentStatus = "waiting_approval";
         this.detectStatusTransition();
-        const approved = await new Promise((resolve9) => {
-          this.permissionResolvers.push(resolve9);
+        const approved = await new Promise((resolve12) => {
+          this.permissionResolvers.push(resolve12);
           setTimeout(() => {
-            const idx = this.permissionResolvers.indexOf(resolve9);
+            const idx = this.permissionResolvers.indexOf(resolve12);
             if (idx >= 0) {
               this.permissionResolvers.splice(idx, 1);
-              resolve9(false);
+              resolve12(false);
             }
           }, 3e5);
         });
@@ -10688,7 +10845,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(/^~/, os10.homedir()) : path9.resolve(trimmed);
+    const resolvedDir = trimmed.startsWith("~") ? trimmed.replace(/^~/, os10.homedir()) : path11.resolve(trimmed);
     const normalizedType = this.providerLoader.resolveAlias(cliType);
     const provider = this.providerLoader.getByAlias(cliType);
     const key = crypto4.randomUUID();
@@ -10775,10 +10932,10 @@ ${installInfo}`
     if (!cliInfo) {
       const installHint = provider?.install || "";
       const displayName = provider?.displayName || provider?.name || cliType;
-      const spawnCmd = provider?.spawn?.command || cliType;
+      const spawnCmd = this.providerLoader.getSpawnCommand(normalizedType, provider?.spawn?.command || cliType);
       throw new Error(
         `${displayName} is not installed.
-Command '${spawnCmd}' not found on PATH.
+Command '${spawnCmd}' is not available.
 ` + (installHint ? `
 ${installHint}
 ` : "") + `
@@ -11138,16 +11295,17 @@ Run 'adhdev doctor' for detailed diagnostics.`
 var import_child_process6 = require("child_process");
 var net = __toESM(require("net"));
 var os12 = __toESM(require("os"));
-var path11 = __toESM(require("path"));
+var path13 = __toESM(require("path"));
 
 // src/providers/provider-loader.ts
 var fs6 = __toESM(require("fs"));
-var path10 = __toESM(require("path"));
+var path12 = __toESM(require("path"));
 var os11 = __toESM(require("os"));
 var chokidar = __toESM(require("chokidar"));
 init_logger();
 var ProviderLoader = class _ProviderLoader {
   providers = /* @__PURE__ */ new Map();
+  providerAvailability = /* @__PURE__ */ new Map();
   userDir;
   upstreamDir;
   disableUpstream;
@@ -11163,12 +11321,12 @@ var ProviderLoader = class _ProviderLoader {
   static META_FILE = ".meta.json";
   constructor(options) {
     this.logFn = options?.logFn || LOG.forComponent("Provider").asLogFn();
-    const defaultProvidersDir = path10.join(os11.homedir(), ".adhdev", "providers");
+    const defaultProvidersDir = path12.join(os11.homedir(), ".adhdev", "providers");
     if (options?.userDir) {
       this.userDir = options.userDir;
       this.log(`Config 'providerDir' applied: ${this.userDir}`);
     } else {
-      const localRepoPath = path10.resolve(__dirname, "../../../../../adhdev-providers");
+      const localRepoPath = path12.resolve(__dirname, "../../../../../adhdev-providers");
       if (fs6.existsSync(localRepoPath)) {
         this.userDir = localRepoPath;
         this.log(`Auto-detected local public repository: ${this.userDir} (Dev workspace speedup)`);
@@ -11177,7 +11335,7 @@ var ProviderLoader = class _ProviderLoader {
         this.log(`Using default user providers directory: ${this.userDir}`);
       }
     }
-    this.upstreamDir = path10.join(defaultProvidersDir, ".upstream");
+    this.upstreamDir = path12.join(defaultProvidersDir, ".upstream");
     this.disableUpstream = options?.disableUpstream ?? false;
   }
   log(msg) {
@@ -11207,7 +11365,7 @@ var ProviderLoader = class _ProviderLoader {
   * Canonical provider directory shape for a given root.
   */
   getProviderDir(root, category, type) {
-    return path10.join(root, category, type);
+    return path12.join(root, category, type);
   }
   /**
   * Canonical user override directory for a provider.
@@ -11234,7 +11392,7 @@ var ProviderLoader = class _ProviderLoader {
   resolveProviderFile(type, ...segments) {
     const dir = this.findProviderDirInternal(type);
     if (!dir) return null;
-    return path10.join(dir, ...segments);
+    return path12.join(dir, ...segments);
   }
   /**
   * Load all providers (3-tier priority)
@@ -11245,6 +11403,7 @@ var ProviderLoader = class _ProviderLoader {
   */
   loadAll() {
     this.providers.clear();
+    this.providerAvailability.clear();
     let upstreamCount = 0;
     if (!this.disableUpstream && fs6.existsSync(this.upstreamDir)) {
       upstreamCount = this.loadDir(this.upstreamDir);
@@ -11272,7 +11431,7 @@ var ProviderLoader = class _ProviderLoader {
     if (!fs6.existsSync(this.upstreamDir)) return false;
     try {
       return fs6.readdirSync(this.upstreamDir).some(
-        (d) => fs6.statSync(path10.join(this.upstreamDir, d)).isDirectory()
+        (d) => fs6.statSync(path12.join(this.upstreamDir, d)).isDirectory()
       );
     } catch {
       return false;
@@ -11315,11 +11474,12 @@ var ProviderLoader = class _ProviderLoader {
       if ((p.category === "cli" || p.category === "acp") && p.spawn?.command) {
         const verCmdConfig = p.versionCommand;
         const versionCommand = typeof verCmdConfig === "object" && verCmdConfig !== null ? verCmdConfig[process.platform] : verCmdConfig;
+        const command = this.getSpawnCommand(p.type, p.spawn.command);
         result.push({
           id: p.type,
           displayName: p.displayName || p.name,
           icon: p.icon || "\u{1F527}",
-          command: p.spawn.command,
+          command,
           category: p.category,
           ...typeof versionCommand === "string" && versionCommand.trim() ? { versionCommand: versionCommand.trim() } : {}
         });
@@ -11448,6 +11608,71 @@ var ProviderLoader = class _ProviderLoader {
   getAvailableIdeTypes() {
     return [...this.providers.values()].filter((p) => p.category === "ide" && p.cdpPorts).map((p) => p.type);
   }
+  getSpawnCommand(type, fallback) {
+    const override = this.getOptionalStringSetting(type, "executablePath");
+    if (override) return override;
+    return fallback || this.providers.get(type)?.spawn?.command || type;
+  }
+  getIdeCliCommand(type, fallback) {
+    const override = this.getOptionalStringSetting(type, "cliPathOverride");
+    if (override) return override;
+    return fallback || this.providers.get(type)?.cli || null;
+  }
+  getIdePathCandidates(type, fallback) {
+    const override = this.getOptionalStringSetting(type, "appPathOverride");
+    if (override) return [override];
+    if (fallback && fallback.length > 0) return fallback;
+    const osPaths = this.providers.get(type)?.paths?.[process.platform];
+    return Array.isArray(osPaths) ? [...osPaths] : [];
+  }
+  setProviderAvailability(type, state) {
+    this.providerAvailability.set(type, {
+      installed: !!state.installed,
+      detectedPath: state.detectedPath ?? null
+    });
+  }
+  setCliDetectionResults(results, replace = true) {
+    if (replace) {
+      for (const provider of this.providers.values()) {
+        if (provider.category === "cli" || provider.category === "acp") {
+          this.providerAvailability.set(provider.type, { installed: false, detectedPath: null });
+        }
+      }
+    }
+    for (const result of results) {
+      this.setProviderAvailability(result.id, {
+        installed: !!result.installed,
+        detectedPath: result.path || null
+      });
+    }
+  }
+  setIdeDetectionResults(results, replace = true) {
+    if (replace) {
+      for (const provider of this.providers.values()) {
+        if (provider.category === "ide") {
+          this.providerAvailability.set(provider.type, { installed: false, detectedPath: null });
+        }
+      }
+    }
+    for (const result of results) {
+      this.setProviderAvailability(result.id, {
+        installed: !!result.installed,
+        detectedPath: result.cliCommand || result.path || null
+      });
+    }
+  }
+  getAvailableProviderInfos() {
+    return this.getAll().map((provider) => {
+      const availability = this.providerAvailability.get(provider.type);
+      return {
+        ...provider,
+        ...availability ? {
+          installed: availability.installed,
+          detectedPath: availability.detectedPath
+        } : {}
+      };
+    });
+  }
   /**
   * Register IDE providers to core/detector registry
   * → Enables detectIDEs() to detect provider.js-based IDEs
@@ -11522,8 +11747,8 @@ var ProviderLoader = class _ProviderLoader {
               resolved._resolvedScriptDir = entry.scriptDir;
               resolved._resolvedScriptsSource = `compatibility:${entry.ideVersion}`;
               if (providerDir) {
-                const fullDir = path10.join(providerDir, entry.scriptDir);
-                resolved._resolvedScriptsPath = fs6.existsSync(path10.join(fullDir, "scripts.js")) ? path10.join(fullDir, "scripts.js") : fullDir;
+                const fullDir = path12.join(providerDir, entry.scriptDir);
+                resolved._resolvedScriptsPath = fs6.existsSync(path12.join(fullDir, "scripts.js")) ? path12.join(fullDir, "scripts.js") : fullDir;
               }
               matched = true;
             }
@@ -11538,8 +11763,8 @@ var ProviderLoader = class _ProviderLoader {
             resolved._resolvedScriptDir = base.defaultScriptDir;
             resolved._resolvedScriptsSource = "defaultScriptDir:version_miss";
             if (providerDir) {
-              const fullDir = path10.join(providerDir, base.defaultScriptDir);
-              resolved._resolvedScriptsPath = fs6.existsSync(path10.join(fullDir, "scripts.js")) ? path10.join(fullDir, "scripts.js") : fullDir;
+              const fullDir = path12.join(providerDir, base.defaultScriptDir);
+              resolved._resolvedScriptsPath = fs6.existsSync(path12.join(fullDir, "scripts.js")) ? path12.join(fullDir, "scripts.js") : fullDir;
             }
           }
           resolved._versionWarning = `Version ${currentVersion} not in compatibility matrix. Using default scripts.`;
@@ -11556,8 +11781,8 @@ var ProviderLoader = class _ProviderLoader {
               resolved._resolvedScriptDir = dirOverride;
               resolved._resolvedScriptsSource = `versions:${range}`;
               if (providerDir) {
-                const fullDir = path10.join(providerDir, dirOverride);
-                resolved._resolvedScriptsPath = fs6.existsSync(path10.join(fullDir, "scripts.js")) ? path10.join(fullDir, "scripts.js") : fullDir;
+                const fullDir = path12.join(providerDir, dirOverride);
+                resolved._resolvedScriptsPath = fs6.existsSync(path12.join(fullDir, "scripts.js")) ? path12.join(fullDir, "scripts.js") : fullDir;
               }
             }
           } else if (override.scripts) {
@@ -11573,8 +11798,8 @@ var ProviderLoader = class _ProviderLoader {
         resolved._resolvedScriptDir = base.defaultScriptDir;
         resolved._resolvedScriptsSource = "defaultScriptDir:no_version";
         if (providerDir) {
-          const fullDir = path10.join(providerDir, base.defaultScriptDir);
-          resolved._resolvedScriptsPath = fs6.existsSync(path10.join(fullDir, "scripts.js")) ? path10.join(fullDir, "scripts.js") : fullDir;
+          const fullDir = path12.join(providerDir, base.defaultScriptDir);
+          resolved._resolvedScriptsPath = fs6.existsSync(path12.join(fullDir, "scripts.js")) ? path12.join(fullDir, "scripts.js") : fullDir;
         }
       }
     }
@@ -11599,14 +11824,14 @@ var ProviderLoader = class _ProviderLoader {
       this.log(`  [loadScriptsFromDir] ${type}: providerDir not found`);
       return null;
     }
-    const dir = path10.join(providerDir, scriptDir);
+    const dir = path12.join(providerDir, scriptDir);
     if (!fs6.existsSync(dir)) {
       this.log(`  [loadScriptsFromDir] ${type}: dir not found: ${dir}`);
       return null;
     }
     const cached = this.scriptsCache.get(dir);
     if (cached) return cached;
-    const scriptsJs = path10.join(dir, "scripts.js");
+    const scriptsJs = path12.join(dir, "scripts.js");
     if (fs6.existsSync(scriptsJs)) {
       try {
         delete require.cache[require.resolve(scriptsJs)];
@@ -11648,7 +11873,7 @@ var ProviderLoader = class _ProviderLoader {
             return;
           }
           if (filePath.endsWith(".js") || filePath.endsWith(".json")) {
-            this.log(`File changed: ${path10.basename(filePath)}, reloading...`);
+            this.log(`File changed: ${path12.basename(filePath)}, reloading...`);
             this.reload();
           }
         };
@@ -11703,7 +11928,7 @@ var ProviderLoader = class _ProviderLoader {
     }
     const https = require("https");
     const { execSync: execSync7 } = require("child_process");
-    const metaPath = path10.join(this.upstreamDir, _ProviderLoader.META_FILE);
+    const metaPath = path12.join(this.upstreamDir, _ProviderLoader.META_FILE);
     let prevEtag = "";
     let prevTimestamp = 0;
     try {
@@ -11720,7 +11945,7 @@ var ProviderLoader = class _ProviderLoader {
       return { updated: false };
     }
     try {
-      const etag = await new Promise((resolve9, reject) => {
+      const etag = await new Promise((resolve12, reject) => {
         const options = {
           method: "HEAD",
           hostname: "github.com",
@@ -11738,7 +11963,7 @@ var ProviderLoader = class _ProviderLoader {
               headers: { "User-Agent": "adhdev-launcher" },
               timeout: 1e4
             }, (res2) => {
-              resolve9(res2.headers.etag || res2.headers["last-modified"] || "");
+              resolve12(res2.headers.etag || res2.headers["last-modified"] || "");
             });
             req2.on("error", reject);
             req2.on("timeout", () => {
@@ -11747,7 +11972,7 @@ var ProviderLoader = class _ProviderLoader {
             });
             req2.end();
           } else {
-            resolve9(res.headers.etag || res.headers["last-modified"] || "");
+            resolve12(res.headers.etag || res.headers["last-modified"] || "");
           }
         });
         req.on("error", reject);
@@ -11763,17 +11988,17 @@ var ProviderLoader = class _ProviderLoader {
         return { updated: false };
       }
       this.log("Downloading latest providers from GitHub...");
-      const tmpTar = path10.join(os11.tmpdir(), `adhdev-providers-${Date.now()}.tar.gz`);
-      const tmpExtract = path10.join(os11.tmpdir(), `adhdev-providers-extract-${Date.now()}`);
+      const tmpTar = path12.join(os11.tmpdir(), `adhdev-providers-${Date.now()}.tar.gz`);
+      const tmpExtract = path12.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 });
       const extracted = fs6.readdirSync(tmpExtract);
       const rootDir = extracted.find(
-        (d) => fs6.statSync(path10.join(tmpExtract, d)).isDirectory() && d.startsWith("adhdev-providers")
+        (d) => fs6.statSync(path12.join(tmpExtract, d)).isDirectory() && d.startsWith("adhdev-providers")
       );
       if (!rootDir) throw new Error("Unexpected tarball structure");
-      const sourceDir = path10.join(tmpExtract, rootDir);
+      const sourceDir = path12.join(tmpExtract, rootDir);
       const backupDir = this.upstreamDir + ".bak";
       if (fs6.existsSync(this.upstreamDir)) {
         if (fs6.existsSync(backupDir)) fs6.rmSync(backupDir, { recursive: true, force: true });
@@ -11811,7 +12036,7 @@ var ProviderLoader = class _ProviderLoader {
   downloadFile(url, destPath) {
     const https = require("https");
     const http3 = require("http");
-    return new Promise((resolve9, reject) => {
+    return new Promise((resolve12, reject) => {
       const doRequest = (reqUrl, redirectCount = 0) => {
         if (redirectCount > 5) {
           reject(new Error("Too many redirects"));
@@ -11831,7 +12056,7 @@ var ProviderLoader = class _ProviderLoader {
           res.pipe(ws);
           ws.on("finish", () => {
             ws.close();
-            resolve9();
+            resolve12();
           });
           ws.on("error", reject);
         });
@@ -11848,8 +12073,8 @@ var ProviderLoader = class _ProviderLoader {
   copyDirRecursive(src, dest) {
     fs6.mkdirSync(dest, { recursive: true });
     for (const entry of fs6.readdirSync(src, { withFileTypes: true })) {
-      const srcPath = path10.join(src, entry.name);
-      const destPath = path10.join(dest, entry.name);
+      const srcPath = path12.join(src, entry.name);
+      const destPath = path12.join(dest, entry.name);
       if (entry.isDirectory()) {
         this.copyDirRecursive(srcPath, destPath);
       } else {
@@ -11860,7 +12085,7 @@ var ProviderLoader = class _ProviderLoader {
   /** .meta.json save */
   writeMeta(metaPath, etag, timestamp) {
     try {
-      fs6.mkdirSync(path10.dirname(metaPath), { recursive: true });
+      fs6.mkdirSync(path12.dirname(metaPath), { recursive: true });
       fs6.writeFileSync(metaPath, JSON.stringify({
         etag,
         timestamp,
@@ -11877,7 +12102,7 @@ var ProviderLoader = class _ProviderLoader {
     const scan = (d) => {
       try {
         for (const entry of fs6.readdirSync(d, { withFileTypes: true })) {
-          if (entry.isDirectory()) scan(path10.join(d, entry.name));
+          if (entry.isDirectory()) scan(path12.join(d, entry.name));
           else if (entry.name === "provider.json") count++;
         }
       } catch {
@@ -11891,9 +12116,8 @@ var ProviderLoader = class _ProviderLoader {
   * Get public settings schema for a provider (for dashboard UI rendering)
   */
   getPublicSettings(type) {
-    const provider = this.providers.get(type);
-    if (!provider?.settings) return [];
-    return Object.entries(provider.settings).filter(([, def]) => def.public === true).map(([key, def]) => ({ key, ...def }));
+    const settings = this.getSettingsSchema(type);
+    return Object.entries(settings).filter(([, def]) => def.public === true).map(([key, def]) => ({ key, ...def }));
   }
   /**
   * Get public settings schema for all providers
@@ -11910,8 +12134,7 @@ var ProviderLoader = class _ProviderLoader {
   * Resolved setting value for a provider (default + user override)
   */
   getSettingValue(type, key) {
-    const provider = this.providers.get(type);
-    const schemaDef = provider?.settings?.[key];
+    const schemaDef = this.getSettingsSchema(type)[key];
     const defaultVal = schemaDef ? schemaDef.default : void 0;
     try {
       const { loadConfig: loadConfig2 } = (init_config(), __toCommonJS(config_exports));
@@ -11926,10 +12149,9 @@ var ProviderLoader = class _ProviderLoader {
   * All resolved settings for a provider (default + user override)
   */
   getSettings(type) {
-    const provider = this.providers.get(type);
-    if (!provider?.settings) return {};
+    const settings = this.getSettingsSchema(type);
     const result = {};
-    for (const [key, def] of Object.entries(provider.settings)) {
+    for (const [key] of Object.entries(settings)) {
       result[key] = this.getSettingValue(type, key);
     }
     return result;
@@ -11938,11 +12160,11 @@ var ProviderLoader = class _ProviderLoader {
   * Save provider setting value (writes to config.json)
   */
   setSetting(type, key, value) {
-    const provider = this.providers.get(type);
-    const schemaDef = provider?.settings?.[key];
+    const schemaDef = this.getSettingsSchema(type)[key];
     if (!schemaDef) return false;
     if (!schemaDef.public) return false;
     if (schemaDef.type === "boolean" && typeof value !== "boolean") return false;
+    if (schemaDef.type === "string" && typeof value !== "string") return false;
     if (schemaDef.type === "number") {
       if (typeof value !== "number") return false;
       if (schemaDef.min !== void 0 && value < schemaDef.min) return false;
@@ -11963,6 +12185,53 @@ var ProviderLoader = class _ProviderLoader {
       return false;
     }
   }
+  getOptionalStringSetting(type, key) {
+    const value = this.getSettingValue(type, key);
+    if (typeof value !== "string") return null;
+    const trimmed = value.trim();
+    return trimmed ? trimmed : null;
+  }
+  getSettingsSchema(type) {
+    const provider = this.providers.get(type);
+    if (!provider) return {};
+    return {
+      ...this.getSyntheticSettings(type, provider),
+      ...provider.settings || {}
+    };
+  }
+  getSyntheticSettings(type, provider) {
+    const result = {};
+    if ((provider.category === "cli" || provider.category === "acp") && provider.spawn?.command && !provider.settings?.executablePath) {
+      result.executablePath = {
+        type: "string",
+        default: "",
+        public: true,
+        label: "Executable path",
+        description: "Optional absolute path for this provider binary. Leave blank to use the default PATH lookup."
+      };
+    }
+    if (provider.category === "ide") {
+      if (provider.cli && !provider.settings?.cliPathOverride) {
+        result.cliPathOverride = {
+          type: "string",
+          default: "",
+          public: true,
+          label: "CLI path override",
+          description: "Optional absolute path for the IDE CLI launcher. Leave blank to use the detected default."
+        };
+      }
+      if (provider.paths && !provider.settings?.appPathOverride) {
+        result.appPathOverride = {
+          type: "string",
+          default: "",
+          public: true,
+          label: "App path override",
+          description: "Optional absolute path for the IDE app bundle or executable. Leave blank to use the default install locations."
+        };
+      }
+    }
+    return result;
+  }
   // ─── Private ───────────────────────────────────
   /**
    * Find the on-disk directory for a provider by type.
@@ -11976,17 +12245,17 @@ var ProviderLoader = class _ProviderLoader {
     for (const root of searchRoots) {
       if (!fs6.existsSync(root)) continue;
       const candidate = this.getProviderDir(root, cat, type);
-      if (fs6.existsSync(path10.join(candidate, "provider.json"))) return candidate;
-      const catDir = path10.join(root, cat);
+      if (fs6.existsSync(path12.join(candidate, "provider.json"))) return candidate;
+      const catDir = path12.join(root, cat);
       if (fs6.existsSync(catDir)) {
         try {
           for (const entry of fs6.readdirSync(catDir, { withFileTypes: true })) {
             if (!entry.isDirectory()) continue;
-            const jsonPath = path10.join(catDir, entry.name, "provider.json");
+            const jsonPath = path12.join(catDir, entry.name, "provider.json");
             if (fs6.existsSync(jsonPath)) {
               try {
                 const data = JSON.parse(fs6.readFileSync(jsonPath, "utf-8"));
-                if (data.type === type) return path10.join(catDir, entry.name);
+                if (data.type === type) return path12.join(catDir, entry.name);
               } catch {
               }
             }
@@ -12003,7 +12272,7 @@ var ProviderLoader = class _ProviderLoader {
    * (template substitution is NOT applied here — scripts.js handles that)
    */
   buildScriptWrappersFromDir(dir) {
-    const scriptsJs = path10.join(dir, "scripts.js");
+    const scriptsJs = path12.join(dir, "scripts.js");
     if (fs6.existsSync(scriptsJs)) {
       try {
         delete require.cache[require.resolve(scriptsJs)];
@@ -12017,7 +12286,7 @@ var ProviderLoader = class _ProviderLoader {
       for (const file of fs6.readdirSync(dir)) {
         if (!file.endsWith(".js")) continue;
         const scriptName = toCamel(file.replace(".js", ""));
-        const filePath = path10.join(dir, file);
+        const filePath = path12.join(dir, file);
         result[scriptName] = (...args) => {
           try {
             let content = fs6.readFileSync(filePath, "utf-8");
@@ -12077,7 +12346,7 @@ var ProviderLoader = class _ProviderLoader {
       }
       const hasJson = entries.some((e) => e.name === "provider.json");
       if (hasJson) {
-        const jsonPath = path10.join(d, "provider.json");
+        const jsonPath = path12.join(d, "provider.json");
         try {
           const raw = fs6.readFileSync(jsonPath, "utf-8");
           const mod = JSON.parse(raw);
@@ -12090,7 +12359,7 @@ var ProviderLoader = class _ProviderLoader {
               delete mod.extensionIdPattern_flags;
             }
             const hasCompatibility = Array.isArray(mod.compatibility);
-            const scriptsPath = path10.join(d, "scripts.js");
+            const scriptsPath = path12.join(d, "scripts.js");
             if (!hasCompatibility && fs6.existsSync(scriptsPath)) {
               try {
                 delete require.cache[require.resolve(scriptsPath)];
@@ -12116,7 +12385,7 @@ var ProviderLoader = class _ProviderLoader {
           if (!entry.isDirectory()) continue;
           if (entry.name.startsWith("_") || entry.name.startsWith(".")) continue;
           if (excludeDirs && d === dir && excludeDirs.includes(entry.name)) continue;
-          scan(path10.join(d, entry.name));
+          scan(path12.join(d, entry.name));
         }
       }
     };
@@ -12212,17 +12481,17 @@ async function findFreePort(ports) {
   throw new Error("No free port found");
 }
 function checkPortFree(port) {
-  return new Promise((resolve9) => {
+  return new Promise((resolve12) => {
     const server = net.createServer();
     server.unref();
-    server.on("error", () => resolve9(false));
+    server.on("error", () => resolve12(false));
     server.listen(port, "127.0.0.1", () => {
-      server.close(() => resolve9(true));
+      server.close(() => resolve12(true));
     });
   });
 }
 async function isCdpActive(port) {
-  return new Promise((resolve9) => {
+  return new Promise((resolve12) => {
     const req = require("http").get(`http://127.0.0.1:${port}/json/version`, {
       timeout: 2e3
     }, (res) => {
@@ -12231,16 +12500,16 @@ async function isCdpActive(port) {
       res.on("end", () => {
         try {
           const info = JSON.parse(data);
-          resolve9(!!info["WebKit-Version"] || !!info["Browser"]);
+          resolve12(!!info["WebKit-Version"] || !!info["Browser"]);
         } catch {
-          resolve9(false);
+          resolve12(false);
         }
       });
     });
-    req.on("error", () => resolve9(false));
+    req.on("error", () => resolve12(false));
     req.on("timeout", () => {
       req.destroy();
-      resolve9(false);
+      resolve12(false);
     });
   });
 }
@@ -12374,8 +12643,8 @@ function detectCurrentWorkspace(ideId) {
       const appNameMap = getMacAppIdentifiers();
       const appName = appNameMap[ideId];
       if (appName) {
-        const storagePath = path11.join(
-          process.env.APPDATA || path11.join(os12.homedir(), "AppData", "Roaming"),
+        const storagePath = path13.join(
+          process.env.APPDATA || path13.join(os12.homedir(), "AppData", "Roaming"),
           appName,
           "storage.json"
         );
@@ -12399,7 +12668,7 @@ function detectCurrentWorkspace(ideId) {
 async function launchWithCdp(options = {}) {
   const platform9 = os12.platform();
   let targetIde;
-  const ides = await detectIDEs();
+  const ides = await detectIDEs(getProviderLoader());
   if (options.ideId) {
     targetIde = ides.find((i) => i.id === options.ideId && i.installed);
     if (!targetIde) {
@@ -12553,9 +12822,9 @@ init_logger();
 
 // src/logging/command-log.ts
 var fs7 = __toESM(require("fs"));
-var path12 = __toESM(require("path"));
+var path14 = __toESM(require("path"));
 var os13 = __toESM(require("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 LOG_DIR2 = process.platform === "win32" ? path14.join(process.env.LOCALAPPDATA || process.env.APPDATA || path14.join(os13.homedir(), "AppData", "Local"), "adhdev", "logs") : process.platform === "darwin" ? path14.join(os13.homedir(), "Library", "Logs", "adhdev") : path14.join(os13.homedir(), ".local", "share", "adhdev", "logs");
 var MAX_FILE_SIZE = 5 * 1024 * 1024;
 var MAX_DAYS = 7;
 try {
@@ -12593,13 +12862,13 @@ function getDateStr2() {
   return (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
 }
 var currentDate2 = getDateStr2();
-var currentFile = path12.join(LOG_DIR2, `commands-${currentDate2}.jsonl`);
+var currentFile = path14.join(LOG_DIR2, `commands-${currentDate2}.jsonl`);
 var writeCount2 = 0;
 function checkRotation() {
   const today = getDateStr2();
   if (today !== currentDate2) {
     currentDate2 = today;
-    currentFile = path12.join(LOG_DIR2, `commands-${currentDate2}.jsonl`);
+    currentFile = path14.join(LOG_DIR2, `commands-${currentDate2}.jsonl`);
     cleanOldFiles();
   }
 }
@@ -12613,7 +12882,7 @@ function cleanOldFiles() {
       const dateMatch = file.match(/commands-(\d{4}-\d{2}-\d{2})/);
       if (dateMatch && dateMatch[1] < cutoffStr) {
         try {
-          fs7.unlinkSync(path12.join(LOG_DIR2, file));
+          fs7.unlinkSync(path14.join(LOG_DIR2, file));
         } catch {
         }
       }
@@ -12705,12 +12974,15 @@ function buildDetectedIdeInfos(detectedIdes, cdpManagers) {
   }));
 }
 function buildAvailableProviders(providerLoader) {
-  return providerLoader.getAll().map((provider) => ({
+  const providers = providerLoader.getAvailableProviderInfos?.() || providerLoader.getAll();
+  return providers.map((provider) => ({
     type: provider.type,
     name: provider.displayName || provider.type,
     displayName: provider.displayName || provider.type,
     icon: provider.icon || "\u{1F4BB}",
-    category: provider.category
+    category: provider.category,
+    ...provider.installed !== void 0 ? { installed: provider.installed } : {},
+    ...provider.detectedPath !== void 0 ? { detectedPath: provider.detectedPath } : {}
   }));
 }
 function parseMessageTime(value) {
@@ -12724,17 +12996,17 @@ function parseMessageTime(value) {
 function getSessionMessageUpdatedAt(session) {
   const lastMessage = session.activeChat?.messages?.at?.(-1);
   if (!lastMessage) return 0;
-  return parseMessageTime(lastMessage.timestamp) || parseMessageTime(lastMessage.receivedAt) || parseMessageTime(lastMessage.createdAt) || 0;
+  return parseMessageTime(lastMessage.receivedAt) || 0;
 }
 function getSessionCompletionMarker(session) {
   const lastMessage = session.activeChat?.messages?.at?.(-1);
   if (!lastMessage) return "";
   const role = typeof lastMessage.role === "string" ? lastMessage.role : "";
-  if (role === "user" || role === "human") return "";
+  if (role === "user" || role === "human" || role === "system") return "";
   if (typeof lastMessage._turnKey === "string" && lastMessage._turnKey) return `turn:${lastMessage._turnKey}`;
   if (typeof lastMessage.id === "string" && lastMessage.id) return `id:${lastMessage.id}`;
   if (typeof lastMessage.index === "number" && Number.isFinite(lastMessage.index)) return `idx:${lastMessage.index}`;
-  const timestamp = parseMessageTime(lastMessage.timestamp) || parseMessageTime(lastMessage.receivedAt) || parseMessageTime(lastMessage.createdAt);
+  const timestamp = parseMessageTime(lastMessage.receivedAt);
   return timestamp > 0 ? `ts:${timestamp}` : "";
 }
 function getSessionLastUsedAt(session) {
@@ -12751,7 +13023,7 @@ function getUnreadState(hasContentChange, status, lastUsedAt, lastSeenAt, lastRo
   if (status === "generating" || status === "starting") {
     return { unread: false, inboxBucket: "working" };
   }
-  const unread = completionMarker ? completionMarker !== seenCompletionMarker : hasContentChange && lastUsedAt > lastSeenAt && lastRole !== "user" && lastRole !== "human";
+  const unread = completionMarker ? completionMarker !== seenCompletionMarker : hasContentChange && lastUsedAt > lastSeenAt && lastRole !== "user" && lastRole !== "human" && lastRole !== "system";
   return { unread, inboxBucket: unread ? "task_complete" : "idle" };
 }
 function buildRecentLaunches(recentActivity) {
@@ -12838,13 +13110,13 @@ var import_child_process7 = require("child_process");
 var import_child_process8 = require("child_process");
 var fs8 = __toESM(require("fs"));
 var os15 = __toESM(require("os"));
-var path13 = __toESM(require("path"));
+var path15 = __toESM(require("path"));
 var UPGRADE_HELPER_ENV = "ADHDEV_DAEMON_UPGRADE_HELPER";
 function getUpgradeLogPath() {
   const home = os15.homedir();
-  const dir = path13.join(home, ".adhdev");
+  const dir = path15.join(home, ".adhdev");
   fs8.mkdirSync(dir, { recursive: true });
-  return path13.join(dir, "daemon-upgrade.log");
+  return path15.join(dir, "daemon-upgrade.log");
 }
 function appendUpgradeLog(message) {
   const line = `[${(/* @__PURE__ */ new Date()).toISOString()}] ${message}
@@ -12877,14 +13149,14 @@ async function waitForPidExit(pid, timeoutMs) {
   while (Date.now() - start < timeoutMs) {
     try {
       process.kill(pid, 0);
-      await new Promise((resolve9) => setTimeout(resolve9, 250));
+      await new Promise((resolve12) => setTimeout(resolve12, 250));
     } catch {
       return;
     }
   }
 }
 function stopSessionHostProcesses(appName) {
-  const pidFile = path13.join(os15.homedir(), ".adhdev", `${appName}-session-host.pid`);
+  const pidFile = path15.join(os15.homedir(), ".adhdev", `${appName}-session-host.pid`);
   try {
     if (fs8.existsSync(pidFile)) {
       const pid = Number.parseInt(fs8.readFileSync(pidFile, "utf8").trim(), 10);
@@ -12913,7 +13185,7 @@ function stopSessionHostProcesses(appName) {
   }
 }
 function removeDaemonPidFile() {
-  const pidFile = path13.join(os15.homedir(), ".adhdev", "daemon.pid");
+  const pidFile = path15.join(os15.homedir(), ".adhdev", "daemon.pid");
   try {
     fs8.unlinkSync(pidFile);
   } catch {
@@ -12924,7 +13196,7 @@ function cleanupStaleGlobalInstallDirs(pkgName) {
   const npmRoot = (0, import_child_process7.execFileSync)(getNpmExecutable(), ["root", "-g"], { encoding: "utf8", ...npmExecOpts }).trim();
   if (!npmRoot) return;
   const npmPrefix = (0, import_child_process7.execFileSync)(getNpmExecutable(), ["prefix", "-g"], { encoding: "utf8", ...npmExecOpts }).trim();
-  const binDir = process.platform === "win32" ? npmPrefix : path13.join(npmPrefix, "bin");
+  const binDir = process.platform === "win32" ? npmPrefix : path15.join(npmPrefix, "bin");
   const packageBaseName = pkgName.startsWith("@") ? pkgName.split("/")[1] : pkgName;
   const binNames = /* @__PURE__ */ new Set([packageBaseName]);
   if (pkgName === "@adhdev/daemon-standalone") {
@@ -12932,25 +13204,25 @@ function cleanupStaleGlobalInstallDirs(pkgName) {
   }
   if (pkgName.startsWith("@")) {
     const [scope, name] = pkgName.split("/");
-    const scopeDir = path13.join(npmRoot, scope);
+    const scopeDir = path15.join(npmRoot, scope);
     if (!fs8.existsSync(scopeDir)) return;
     for (const entry of fs8.readdirSync(scopeDir)) {
       if (!entry.startsWith(`.${name}-`)) continue;
-      fs8.rmSync(path13.join(scopeDir, entry), { recursive: true, force: true });
-      appendUpgradeLog(`Removed stale scoped staging dir: ${path13.join(scopeDir, entry)}`);
+      fs8.rmSync(path15.join(scopeDir, entry), { recursive: true, force: true });
+      appendUpgradeLog(`Removed stale scoped staging dir: ${path15.join(scopeDir, entry)}`);
     }
   } else {
     for (const entry of fs8.readdirSync(npmRoot)) {
       if (!entry.startsWith(`.${pkgName}-`)) continue;
-      fs8.rmSync(path13.join(npmRoot, entry), { recursive: true, force: true });
-      appendUpgradeLog(`Removed stale staging dir: ${path13.join(npmRoot, entry)}`);
+      fs8.rmSync(path15.join(npmRoot, entry), { recursive: true, force: true });
+      appendUpgradeLog(`Removed stale staging dir: ${path15.join(npmRoot, entry)}`);
     }
   }
   if (fs8.existsSync(binDir)) {
     for (const entry of fs8.readdirSync(binDir)) {
       if (![...binNames].some((name) => entry.startsWith(`.${name}-`))) continue;
-      fs8.rmSync(path13.join(binDir, entry), { recursive: true, force: true });
-      appendUpgradeLog(`Removed stale bin staging entry: ${path13.join(binDir, entry)}`);
+      fs8.rmSync(path15.join(binDir, entry), { recursive: true, force: true });
+      appendUpgradeLog(`Removed stale bin staging entry: ${path15.join(binDir, entry)}`);
     }
   }
 }
@@ -12992,7 +13264,7 @@ async function runDaemonUpgradeHelper(payload) {
     appendUpgradeLog(installOutput.trim());
   }
   if (process.platform === "win32") {
-    await new Promise((resolve9) => setTimeout(resolve9, 500));
+    await new Promise((resolve12) => setTimeout(resolve12, 500));
     cleanupStaleGlobalInstallDirs(payload.packageName);
     appendUpgradeLog("Post-install staging cleanup complete");
   }
@@ -13036,6 +13308,25 @@ var CHAT_COMMANDS = [
   "change_model"
 ];
 var READ_DEBUG_ENABLED2 = process.argv.includes("--dev") || process.env.ADHDEV_READ_DEBUG === "1";
+function toHostedCliRuntimeDescriptor(record) {
+  if (!record || typeof record !== "object") return null;
+  const runtimeId = typeof record.sessionId === "string" ? record.sessionId : "";
+  const cliType = typeof record.providerType === "string" ? record.providerType : "";
+  const workspace = typeof record.workspace === "string" ? record.workspace : "";
+  if (!runtimeId || !cliType || !workspace) return null;
+  return {
+    runtimeId,
+    runtimeKey: typeof record.runtimeKey === "string" ? record.runtimeKey : void 0,
+    displayName: typeof record.displayName === "string" ? record.displayName : void 0,
+    workspaceLabel: typeof record.workspaceLabel === "string" ? record.workspaceLabel : void 0,
+    lifecycle: typeof record.lifecycle === "string" ? record.lifecycle : void 0,
+    recoveryState: typeof record.meta?.runtimeRecoveryState === "string" ? String(record.meta.runtimeRecoveryState) : null,
+    cliType,
+    workspace,
+    cliArgs: Array.isArray(record.meta?.cliArgs) ? record.meta.cliArgs : [],
+    providerSessionId: typeof record.meta?.providerSessionId === "string" ? String(record.meta.providerSessionId) : void 0
+  };
+}
 var DaemonCommandRouter = class {
   deps;
   constructor(deps) {
@@ -13109,6 +13400,90 @@ var DaemonCommandRouter = class {
           return { success: false, error: e.message };
         }
       }
+      case "session_host_get_diagnostics": {
+        if (!this.deps.sessionHostControl) return { success: false, error: "Session host control unavailable" };
+        const diagnostics = await this.deps.sessionHostControl.getDiagnostics({
+          includeSessions: args?.includeSessions !== false,
+          limit: Number(args?.limit) || void 0
+        });
+        return { success: true, diagnostics };
+      }
+      case "session_host_list_sessions": {
+        if (!this.deps.sessionHostControl) return { success: false, error: "Session host control unavailable" };
+        const sessions = await this.deps.sessionHostControl.listSessions();
+        return { success: true, sessions };
+      }
+      case "session_host_stop_session": {
+        if (!this.deps.sessionHostControl) return { success: false, error: "Session host control unavailable" };
+        const sessionId = typeof args?.sessionId === "string" ? args.sessionId : "";
+        if (!sessionId) return { success: false, error: "sessionId required" };
+        const record = await this.deps.sessionHostControl.stopSession(sessionId);
+        return { success: true, record };
+      }
+      case "session_host_resume_session": {
+        if (!this.deps.sessionHostControl) return { success: false, error: "Session host control unavailable" };
+        const sessionId = typeof args?.sessionId === "string" ? args.sessionId : "";
+        if (!sessionId) return { success: false, error: "sessionId required" };
+        const record = await this.deps.sessionHostControl.resumeSession(sessionId);
+        const hosted = toHostedCliRuntimeDescriptor(record);
+        if (hosted) {
+          await this.deps.cliManager.restoreHostedSessions([hosted]);
+        }
+        return { success: true, record };
+      }
+      case "session_host_restart_session": {
+        if (!this.deps.sessionHostControl) return { success: false, error: "Session host control unavailable" };
+        const sessionId = typeof args?.sessionId === "string" ? args.sessionId : "";
+        if (!sessionId) return { success: false, error: "sessionId required" };
+        const record = await this.deps.sessionHostControl.restartSession(sessionId);
+        const hosted = toHostedCliRuntimeDescriptor(record);
+        if (hosted) {
+          await this.deps.cliManager.restoreHostedSessions([hosted]);
+        }
+        return { success: true, record };
+      }
+      case "session_host_send_signal": {
+        if (!this.deps.sessionHostControl) return { success: false, error: "Session host control unavailable" };
+        const sessionId = typeof args?.sessionId === "string" ? args.sessionId : "";
+        const signal = typeof args?.signal === "string" ? args.signal : "";
+        if (!sessionId) return { success: false, error: "sessionId required" };
+        if (!signal) return { success: false, error: "signal required" };
+        const record = await this.deps.sessionHostControl.sendSignal(sessionId, signal);
+        return { success: true, record };
+      }
+      case "session_host_force_detach_client": {
+        if (!this.deps.sessionHostControl) return { success: false, error: "Session host control unavailable" };
+        const sessionId = typeof args?.sessionId === "string" ? args.sessionId : "";
+        const clientId = typeof args?.clientId === "string" ? args.clientId : "";
+        if (!sessionId) return { success: false, error: "sessionId required" };
+        if (!clientId) return { success: false, error: "clientId required" };
+        const record = await this.deps.sessionHostControl.forceDetachClient(sessionId, clientId);
+        return { success: true, record };
+      }
+      case "session_host_acquire_write": {
+        if (!this.deps.sessionHostControl) return { success: false, error: "Session host control unavailable" };
+        const sessionId = typeof args?.sessionId === "string" ? args.sessionId : "";
+        const clientId = typeof args?.clientId === "string" ? args.clientId : "";
+        const ownerType = args?.ownerType === "agent" ? "agent" : "user";
+        if (!sessionId) return { success: false, error: "sessionId required" };
+        if (!clientId) return { success: false, error: "clientId required" };
+        const record = await this.deps.sessionHostControl.acquireWrite({
+          sessionId,
+          clientId,
+          ownerType,
+          force: args?.force !== false
+        });
+        return { success: true, record };
+      }
+      case "session_host_release_write": {
+        if (!this.deps.sessionHostControl) return { success: false, error: "Session host control unavailable" };
+        const sessionId = typeof args?.sessionId === "string" ? args.sessionId : "";
+        const clientId = typeof args?.clientId === "string" ? args.clientId : "";
+        if (!sessionId) return { success: false, error: "sessionId required" };
+        if (!clientId) return { success: false, error: "clientId required" };
+        const record = await this.deps.sessionHostControl.releaseWrite({ sessionId, clientId });
+        return { success: true, record };
+      }
       case "list_saved_sessions": {
         const providerType = typeof args?.providerType === "string" ? args.providerType.trim() : typeof args?.agentType === "string" ? args.agentType.trim() : "";
         const kind = args?.kind === "acp" ? "acp" : "cli";
@@ -13167,6 +13542,12 @@ var DaemonCommandRouter = class {
         if (!ideType) throw new Error("ideType required");
         const killProcess = args?.killProcess !== false;
         await this.stopIde(ideType, killProcess);
+        try {
+          const results = await detectIDEs(this.deps.providerLoader);
+          this.deps.detectedIdes.value = results;
+          this.deps.providerLoader.setIdeDetectionResults(results, true);
+        } catch {
+        }
         return { success: true, ideType, stopped: true, processKilled: killProcess };
       }
       // ─── IDE restart ───
@@ -13209,6 +13590,12 @@ var DaemonCommandRouter = class {
           }
         }
         this.deps.onIdeConnected?.();
+        try {
+          const results = await detectIDEs(this.deps.providerLoader);
+          this.deps.detectedIdes.value = results;
+          this.deps.providerLoader.setIdeDetectionResults(results, true);
+        } catch {
+        }
         if (result.success && resolvedWorkspace) {
           try {
             const next = appendRecentActivity(loadState(), {
@@ -13236,8 +13623,9 @@ var DaemonCommandRouter = class {
       }
       // ─── Detect IDEs ───
       case "detect_ides": {
-        const results = await detectIDEs();
+        const results = await detectIDEs(this.deps.providerLoader);
         this.deps.detectedIdes.value = results;
+        this.deps.providerLoader.setIdeDetectionResults(results, true);
         return { success: true, detectedInfo: results };
       }
       // ─── Set User Name ───
@@ -13637,6 +14025,14 @@ var ProviderStreamAdapter = class {
   hasScript(name) {
     return typeof this.provider.scripts?.[name] === "function";
   }
+  parseMaybeJson(raw) {
+    if (typeof raw !== "string") return raw;
+    try {
+      return JSON.parse(raw);
+    } catch {
+      return raw;
+    }
+  }
   summarizeRaw(raw) {
     try {
       if (typeof raw === "string") return raw.replace(/\s+/g, " ").trim().slice(0, 240);
@@ -13697,12 +14093,30 @@ var ProviderStreamAdapter = class {
     }
   }
   async sendMessage(evaluate, text) {
-    const script = this.callScript("sendMessage", text);
+    const params = { message: text };
+    const script = this.callScript("sendMessage", params) || this.callScript("sendMessage", text);
     if (!script) throw new Error(`[${this.agentName}] sendMessage script not available`);
     const result = await evaluate(script);
     if (result && typeof result === "string" && result.startsWith("error:")) {
       throw new Error(`[${this.agentName}] sendMessage failed: ${result}`);
     }
+    const parsed = this.parseMaybeJson(result);
+    if (parsed === true) return;
+    if (typeof parsed === "string") {
+      const normalized = parsed.trim().toLowerCase();
+      if (normalized === "ok" || normalized === "sent" || normalized === "success" || normalized === "true") {
+        return;
+      }
+    }
+    if (parsed && typeof parsed === "object") {
+      if (parsed.sent === true || parsed.success === true || parsed.ok === true || parsed.submitted === true || parsed.dispatched === true) {
+        return;
+      }
+      if (typeof parsed.error === "string" && parsed.error.trim()) {
+        throw new Error(`[${this.agentName}] sendMessage failed: ${parsed.error}`);
+      }
+    }
+    throw new Error(`[${this.agentName}] sendMessage was not confirmed`);
   }
   async resolveAction(evaluate, action, button) {
     const script = this.callScript("resolveAction", { action, button });
@@ -13725,7 +14139,10 @@ var ProviderStreamAdapter = class {
       const raw = await evaluate(script, 1e4);
       const data = typeof raw === "string" ? JSON.parse(raw) : raw;
       if (data?.error) return [];
-      return Array.isArray(data) ? data : [];
+      if (Array.isArray(data)) return data;
+      if (Array.isArray(data?.sessions)) return data.sessions;
+      if (Array.isArray(data?.chats)) return data.chats;
+      return [];
     } catch {
       return [];
     }
@@ -13733,7 +14150,17 @@ var ProviderStreamAdapter = class {
   async switchSession(evaluate, sessionId) {
     const script = this.callScript("switchSession", sessionId);
     if (!script) return false;
-    return await evaluate(script, 1e4) === true;
+    const raw = await evaluate(script, 1e4);
+    const data = this.parseMaybeJson(raw);
+    if (data === true) return true;
+    if (typeof data === "string") {
+      const normalized = data.trim().toLowerCase();
+      return normalized === "true" || normalized === "ok" || normalized === "switched" || normalized === "success";
+    }
+    if (data && typeof data === "object") {
+      return data.switched === true || data.success === true || data.ok === true;
+    }
+    return false;
   }
   async focusEditor(evaluate) {
     const script = this.callScript("focusEditor");
@@ -14423,11 +14850,11 @@ var ProviderInstanceManager = class {
 
 // src/providers/version-archive.ts
 var fs10 = __toESM(require("fs"));
-var path14 = __toESM(require("path"));
+var path16 = __toESM(require("path"));
 var os16 = __toESM(require("os"));
 var import_child_process9 = require("child_process");
 var import_os3 = require("os");
-var ARCHIVE_PATH = path14.join(os16.homedir(), ".adhdev", "version-history.json");
+var ARCHIVE_PATH = path16.join(os16.homedir(), ".adhdev", "version-history.json");
 var MAX_ENTRIES_PER_PROVIDER = 20;
 var VersionArchive = class {
   history = {};
@@ -14474,7 +14901,7 @@ var VersionArchive = class {
   }
   save() {
     try {
-      fs10.mkdirSync(path14.dirname(ARCHIVE_PATH), { recursive: true });
+      fs10.mkdirSync(path16.dirname(ARCHIVE_PATH), { recursive: true });
       fs10.writeFileSync(ARCHIVE_PATH, JSON.stringify(this.history, null, 2));
     } catch {
     }
@@ -14515,7 +14942,7 @@ function checkPathExists2(paths) {
   for (const p of paths) {
     if (p.includes("*")) {
       const home = os16.homedir();
-      const resolved = p.replace(/\*/g, home.split(path14.sep).pop() || "");
+      const resolved = p.replace(/\*/g, home.split(path16.sep).pop() || "");
       if (fs10.existsSync(resolved)) return resolved;
     } else {
       if (fs10.existsSync(p)) return p;
@@ -14525,7 +14952,7 @@ function checkPathExists2(paths) {
 }
 function getMacAppVersion(appPath) {
   if ((0, import_os3.platform)() !== "darwin" || !appPath.endsWith(".app")) return null;
-  const plistPath = path14.join(appPath, "Contents", "Info.plist");
+  const plistPath = path16.join(appPath, "Contents", "Info.plist");
   if (!fs10.existsSync(plistPath)) return null;
   const raw = runCommand(`/usr/libexec/PlistBuddy -c "Print CFBundleShortVersionString" "${plistPath}"`);
   return raw || null;
@@ -14552,7 +14979,7 @@ async function detectAllVersions(loader, archive) {
       const cliBin = provider.cli ? findBinary2(provider.cli) : null;
       let resolvedBin = cliBin;
       if (!resolvedBin && appPath && currentOs === "darwin") {
-        const bundled = path14.join(appPath, "Contents", "Resources", "app", "bin", provider.cli || "");
+        const bundled = path16.join(appPath, "Contents", "Resources", "app", "bin", provider.cli || "");
         if (provider.cli && fs10.existsSync(bundled)) resolvedBin = bundled;
       }
       info.installed = !!(appPath || resolvedBin);
@@ -14593,7 +15020,7 @@ async function detectAllVersions(loader, archive) {
 // src/daemon/dev-server.ts
 var http2 = __toESM(require("http"));
 var fs14 = __toESM(require("fs"));
-var path18 = __toESM(require("path"));
+var path20 = __toESM(require("path"));
 
 // src/daemon/scaffold-template.ts
 function generateFiles(type, name, category, opts = {}) {
@@ -14929,7 +15356,7 @@ init_logger();
 
 // src/daemon/dev-cdp-handlers.ts
 var fs11 = __toESM(require("fs"));
-var path15 = __toESM(require("path"));
+var path17 = __toESM(require("path"));
 init_logger();
 async function handleCdpEvaluate(ctx, req, res) {
   const body = await ctx.readBody(req);
@@ -15108,17 +15535,17 @@ async function handleScriptHints(ctx, type, _req, res) {
     return;
   }
   let scriptsPath = "";
-  const directScripts = path15.join(dir, "scripts.js");
+  const directScripts = path17.join(dir, "scripts.js");
   if (fs11.existsSync(directScripts)) {
     scriptsPath = directScripts;
   } else {
-    const scriptsDir = path15.join(dir, "scripts");
+    const scriptsDir = path17.join(dir, "scripts");
     if (fs11.existsSync(scriptsDir)) {
       const versions = fs11.readdirSync(scriptsDir).filter((d) => {
-        return fs11.statSync(path15.join(scriptsDir, d)).isDirectory();
+        return fs11.statSync(path17.join(scriptsDir, d)).isDirectory();
       }).sort().reverse();
       for (const ver of versions) {
-        const p = path15.join(scriptsDir, ver, "scripts.js");
+        const p = path17.join(scriptsDir, ver, "scripts.js");
         if (fs11.existsSync(p)) {
           scriptsPath = p;
           break;
@@ -15937,7 +16364,7 @@ async function handleDomContext(ctx, type, req, res) {
 
 // src/daemon/dev-cli-debug.ts
 var fs12 = __toESM(require("fs"));
-var path16 = __toESM(require("path"));
+var path18 = __toESM(require("path"));
 function slugifyFixtureName(value) {
   const normalized = String(value || "").trim().toLowerCase().replace(/[^a-z0-9._-]+/g, "-").replace(/^-+|-+$/g, "");
   return normalized || `fixture-${Date.now()}`;
@@ -15947,11 +16374,11 @@ function getCliFixtureDir(ctx, type) {
   if (!providerDir) {
     throw new Error(`Provider directory not found for '${type}'`);
   }
-  return path16.join(providerDir, "fixtures");
+  return path18.join(providerDir, "fixtures");
 }
 function readCliFixture(ctx, type, name) {
   const fixtureDir = getCliFixtureDir(ctx, type);
-  const filePath = path16.join(fixtureDir, `${name}.json`);
+  const filePath = path18.join(fixtureDir, `${name}.json`);
   if (!fs12.existsSync(filePath)) {
     throw new Error(`Fixture not found: ${filePath}`);
   }
@@ -16111,7 +16538,7 @@ function getCliTargetBundle(ctx, type, instanceId) {
   return { target, instance, adapter };
 }
 function sleep(ms) {
-  return new Promise((resolve9) => setTimeout(resolve9, ms));
+  return new Promise((resolve12) => setTimeout(resolve12, ms));
 }
 async function waitForCliReady(ctx, type, instanceId, timeoutMs) {
   const startedAt = Date.now();
@@ -16710,7 +17137,7 @@ async function handleCliFixtureCapture(ctx, req, res) {
       },
       notes: typeof body?.notes === "string" ? body.notes : void 0
     };
-    const filePath = path16.join(fixtureDir, `${name}.json`);
+    const filePath = path18.join(fixtureDir, `${name}.json`);
     fs12.writeFileSync(filePath, JSON.stringify(fixture, null, 2));
     ctx.json(res, 200, {
       saved: true,
@@ -16734,7 +17161,7 @@ async function handleCliFixtureList(ctx, type, _req, res) {
       return;
     }
     const fixtures = fs12.readdirSync(fixtureDir).filter((file) => file.endsWith(".json")).sort((a, b) => b.localeCompare(a, void 0, { numeric: true, sensitivity: "base" })).map((file) => {
-      const fullPath = path16.join(fixtureDir, file);
+      const fullPath = path18.join(fixtureDir, file);
       try {
         const raw = JSON.parse(fs12.readFileSync(fullPath, "utf-8"));
         return {
@@ -16870,7 +17297,7 @@ async function handleCliRaw(ctx, req, res) {
 
 // src/daemon/dev-auto-implement.ts
 var fs13 = __toESM(require("fs"));
-var path17 = __toESM(require("path"));
+var path19 = __toESM(require("path"));
 var os17 = __toESM(require("os"));
 function getAutoImplPid(ctx) {
   const proc = ctx.autoImplProcess;
@@ -16910,22 +17337,22 @@ function getLatestScriptVersionDir(scriptsDir) {
   if (!fs13.existsSync(scriptsDir)) return null;
   const versions = fs13.readdirSync(scriptsDir).filter((d) => {
     try {
-      return fs13.statSync(path17.join(scriptsDir, d)).isDirectory();
+      return fs13.statSync(path19.join(scriptsDir, d)).isDirectory();
     } catch {
       return false;
     }
   }).sort((a, b) => b.localeCompare(a, void 0, { numeric: true, sensitivity: "base" }));
   if (versions.length === 0) return null;
-  return path17.join(scriptsDir, versions[0]);
+  return path19.join(scriptsDir, versions[0]);
 }
 function resolveAutoImplWritableProviderDir(ctx, category, type, requestedDir) {
-  const canonicalUserDir = path17.resolve(ctx.providerLoader.getUserProviderDir(category, type));
-  const desiredDir = requestedDir ? path17.resolve(requestedDir) : canonicalUserDir;
-  const upstreamRoot = path17.resolve(ctx.providerLoader.getUpstreamDir());
-  if (desiredDir === upstreamRoot || desiredDir.startsWith(`${upstreamRoot}${path17.sep}`)) {
+  const canonicalUserDir = path19.resolve(ctx.providerLoader.getUserProviderDir(category, type));
+  const desiredDir = requestedDir ? path19.resolve(requestedDir) : canonicalUserDir;
+  const upstreamRoot = path19.resolve(ctx.providerLoader.getUpstreamDir());
+  if (desiredDir === upstreamRoot || desiredDir.startsWith(`${upstreamRoot}${path19.sep}`)) {
     return { dir: null, reason: `Refusing to write into upstream provider directory: ${desiredDir}` };
   }
-  if (path17.basename(desiredDir) !== type) {
+  if (path19.basename(desiredDir) !== type) {
     return { dir: null, reason: `Requested writable provider directory must end with '${type}': ${desiredDir}` };
   }
   const sourceDir = ctx.findProviderDir(type);
@@ -16933,11 +17360,11 @@ function resolveAutoImplWritableProviderDir(ctx, category, type, requestedDir) {
     return { dir: null, reason: `Provider source directory not found for '${type}'` };
   }
   if (!fs13.existsSync(desiredDir)) {
-    fs13.mkdirSync(path17.dirname(desiredDir), { recursive: true });
+    fs13.mkdirSync(path19.dirname(desiredDir), { recursive: true });
     fs13.cpSync(sourceDir, desiredDir, { recursive: true });
     ctx.log(`Auto-implement writable copy created: ${desiredDir}`);
   }
-  const providerJson = path17.join(desiredDir, "provider.json");
+  const providerJson = path19.join(desiredDir, "provider.json");
   if (!fs13.existsSync(providerJson)) {
     return { dir: null, reason: `provider.json not found in writable provider directory: ${desiredDir}` };
   }
@@ -16960,13 +17387,13 @@ function loadAutoImplReferenceScripts(ctx, referenceType) {
   const refDir = ctx.findProviderDir(referenceType);
   if (!refDir || !fs13.existsSync(refDir)) return {};
   const referenceScripts = {};
-  const scriptsDir = path17.join(refDir, "scripts");
+  const scriptsDir = path19.join(refDir, "scripts");
   const latestDir = getLatestScriptVersionDir(scriptsDir);
   if (!latestDir) return referenceScripts;
   for (const file of fs13.readdirSync(latestDir)) {
     if (!file.endsWith(".js")) continue;
     try {
-      referenceScripts[file] = fs13.readFileSync(path17.join(latestDir, file), "utf-8");
+      referenceScripts[file] = fs13.readFileSync(path19.join(latestDir, file), "utf-8");
     } catch {
     }
   }
@@ -17074,9 +17501,9 @@ 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(os17.tmpdir(), "adhdev-autoimpl");
+    const tmpDir = path19.join(os17.tmpdir(), "adhdev-autoimpl");
     if (!fs13.existsSync(tmpDir)) fs13.mkdirSync(tmpDir, { recursive: true });
-    const promptFile = path17.join(tmpDir, `prompt-${type}-${Date.now()}.md`);
+    const promptFile = path19.join(tmpDir, `prompt-${type}-${Date.now()}.md`);
     fs13.writeFileSync(promptFile, prompt, "utf-8");
     ctx.log(`Auto-implement prompt written to ${promptFile} (${prompt.length} chars)`);
     const agentProvider = ctx.providerLoader.resolve(agent) || ctx.providerLoader.getMeta(agent);
@@ -17503,7 +17930,7 @@ function buildAutoImplPrompt(ctx, type, provider, providerDir, functions, domCon
     setMode: "set_mode.js"
   };
   const targetFileNames = new Set(functions.map((fn) => funcToFile[fn]).filter(Boolean));
-  const scriptsDir = path17.join(providerDir, "scripts");
+  const scriptsDir = path19.join(providerDir, "scripts");
   const latestScriptsDir = getLatestScriptVersionDir(scriptsDir);
   if (latestScriptsDir) {
     lines.push(`Scripts version directory: \`${latestScriptsDir}\``);
@@ -17514,7 +17941,7 @@ function buildAutoImplPrompt(ctx, type, provider, providerDir, functions, domCon
     for (const file of fs13.readdirSync(latestScriptsDir)) {
       if (file.endsWith(".js") && targetFileNames.has(file)) {
         try {
-          const content = fs13.readFileSync(path17.join(latestScriptsDir, file), "utf-8");
+          const content = fs13.readFileSync(path19.join(latestScriptsDir, file), "utf-8");
           lines.push(`### \`${file}\` \u270F\uFE0F EDIT`);
           lines.push("```javascript");
           lines.push(content);
@@ -17531,7 +17958,7 @@ function buildAutoImplPrompt(ctx, type, provider, providerDir, functions, domCon
       lines.push("");
       for (const file of refFiles) {
         try {
-          const content = fs13.readFileSync(path17.join(latestScriptsDir, file), "utf-8");
+          const content = fs13.readFileSync(path19.join(latestScriptsDir, file), "utf-8");
           lines.push(`### \`${file}\` \u{1F512}`);
           lines.push("```javascript");
           lines.push(content);
@@ -17572,10 +17999,10 @@ function buildAutoImplPrompt(ctx, type, provider, providerDir, functions, domCon
       lines.push("");
     }
   }
-  const docsDir = path17.join(providerDir, "../../docs");
+  const docsDir = path19.join(providerDir, "../../docs");
   const loadGuide = (name) => {
     try {
-      const p = path17.join(docsDir, name);
+      const p = path19.join(docsDir, name);
       if (fs13.existsSync(p)) return fs13.readFileSync(p, "utf-8");
     } catch {
     }
@@ -17810,7 +18237,7 @@ function buildCliAutoImplPrompt(ctx, type, provider, providerDir, functions, ref
     parseApproval: "parse_approval.js"
   };
   const targetFileNames = new Set(functions.map((fn) => funcToFile[fn]).filter(Boolean));
-  const scriptsDir = path17.join(providerDir, "scripts");
+  const scriptsDir = path19.join(providerDir, "scripts");
   const latestScriptsDir = getLatestScriptVersionDir(scriptsDir);
   if (latestScriptsDir) {
     lines.push(`Scripts version directory: \`${latestScriptsDir}\``);
@@ -17822,7 +18249,7 @@ function buildCliAutoImplPrompt(ctx, type, provider, providerDir, functions, ref
       if (!file.endsWith(".js")) continue;
       if (!targetFileNames.has(file)) continue;
       try {
-        const content = fs13.readFileSync(path17.join(latestScriptsDir, file), "utf-8");
+        const content = fs13.readFileSync(path19.join(latestScriptsDir, file), "utf-8");
         lines.push(`### \`${file}\` \u270F\uFE0F EDIT`);
         lines.push("```javascript");
         lines.push(content);
@@ -17838,7 +18265,7 @@ function buildCliAutoImplPrompt(ctx, type, provider, providerDir, functions, ref
       lines.push("");
       for (const file of refFiles) {
         try {
-          const content = fs13.readFileSync(path17.join(latestScriptsDir, file), "utf-8");
+          const content = fs13.readFileSync(path19.join(latestScriptsDir, file), "utf-8");
           lines.push(`### \`${file}\` \u{1F512}`);
           lines.push("```javascript");
           lines.push(content);
@@ -17871,10 +18298,10 @@ function buildCliAutoImplPrompt(ctx, type, provider, providerDir, functions, ref
       lines.push("");
     }
   }
-  const docsDir = path17.join(providerDir, "../../docs");
+  const docsDir = path19.join(providerDir, "../../docs");
   const loadGuide = (name) => {
     try {
-      const p = path17.join(docsDir, name);
+      const p = path19.join(docsDir, name);
       if (fs13.existsSync(p)) return fs13.readFileSync(p, "utf-8");
     } catch {
     }
@@ -18285,8 +18712,8 @@ var DevServer = class _DevServer {
   }
   getEndpointList() {
     return this.routes.map((r) => {
-      const path19 = typeof r.pattern === "string" ? r.pattern : r.pattern.source.replace(/\\\//g, "/").replace(/\(\[.*?\]\+\)/g, ":type").replace(/[\^$]/g, "");
-      return `${r.method.padEnd(5)} ${path19}`;
+      const path21 = typeof r.pattern === "string" ? r.pattern : r.pattern.source.replace(/\\\//g, "/").replace(/\(\[.*?\]\+\)/g, ":type").replace(/[\^$]/g, "");
+      return `${r.method.padEnd(5)} ${path21}`;
     });
   }
   async start(port = DEV_SERVER_PORT) {
@@ -18317,15 +18744,15 @@ var DevServer = class _DevServer {
         this.json(res, 500, { error: e.message });
       }
     });
-    return new Promise((resolve9, reject) => {
+    return new Promise((resolve12, reject) => {
       this.server.listen(port, "127.0.0.1", () => {
         this.log(`Dev server listening on http://127.0.0.1:${port}`);
-        resolve9();
+        resolve12();
       });
       this.server.on("error", (e) => {
         if (e.code === "EADDRINUSE") {
           this.log(`Port ${port} in use, skipping dev server`);
-          resolve9();
+          resolve12();
         } else {
           reject(e);
         }
@@ -18408,20 +18835,20 @@ var DevServer = class _DevServer {
       child.stderr?.on("data", (d) => {
         stderr += d.toString().slice(0, 2e3);
       });
-      await new Promise((resolve9) => {
+      await new Promise((resolve12) => {
         const timer = setTimeout(() => {
           child.kill();
-          resolve9();
+          resolve12();
         }, 3e3);
         child.on("exit", () => {
           clearTimeout(timer);
-          resolve9();
+          resolve12();
         });
         child.stdout?.once("data", () => {
           setTimeout(() => {
             child.kill();
             clearTimeout(timer);
-            resolve9();
+            resolve12();
           }, 500);
         });
       });
@@ -18568,12 +18995,12 @@ var DevServer = class _DevServer {
   // ─── DevConsole SPA ───
   getConsoleDistDir() {
     const candidates = [
-      path18.resolve(__dirname, "../../web-devconsole/dist"),
-      path18.resolve(__dirname, "../../../web-devconsole/dist"),
-      path18.join(process.cwd(), "packages/web-devconsole/dist")
+      path20.resolve(__dirname, "../../web-devconsole/dist"),
+      path20.resolve(__dirname, "../../../web-devconsole/dist"),
+      path20.join(process.cwd(), "packages/web-devconsole/dist")
     ];
     for (const dir of candidates) {
-      if (fs14.existsSync(path18.join(dir, "index.html"))) return dir;
+      if (fs14.existsSync(path20.join(dir, "index.html"))) return dir;
     }
     return null;
   }
@@ -18583,7 +19010,7 @@ var DevServer = class _DevServer {
       this.json(res, 500, { error: "DevConsole not found. Run: npm run build -w packages/web-devconsole" });
       return;
     }
-    const htmlPath = path18.join(distDir, "index.html");
+    const htmlPath = path20.join(distDir, "index.html");
     try {
       const html = fs14.readFileSync(htmlPath, "utf-8");
       res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
@@ -18608,15 +19035,15 @@ var DevServer = class _DevServer {
       this.json(res, 404, { error: "Not found" });
       return;
     }
-    const safePath = path18.normalize(pathname).replace(/^\.\.\//, "");
-    const filePath = path18.join(distDir, safePath);
+    const safePath = path20.normalize(pathname).replace(/^\.\.\//, "");
+    const filePath = path20.join(distDir, safePath);
     if (!filePath.startsWith(distDir)) {
       this.json(res, 403, { error: "Forbidden" });
       return;
     }
     try {
       const content = fs14.readFileSync(filePath);
-      const ext = path18.extname(filePath);
+      const ext = path20.extname(filePath);
       const contentType = _DevServer.MIME_MAP[ext] || "application/octet-stream";
       res.writeHead(200, { "Content-Type": contentType, "Cache-Control": "public, max-age=31536000, immutable" });
       res.end(content);
@@ -18729,9 +19156,9 @@ var DevServer = class _DevServer {
           const rel = prefix ? `${prefix}/${entry.name}` : entry.name;
           if (entry.isDirectory()) {
             files.push({ path: rel, size: 0, type: "dir" });
-            scan(path18.join(d, entry.name), rel);
+            scan(path20.join(d, entry.name), rel);
           } else {
-            const stat = fs14.statSync(path18.join(d, entry.name));
+            const stat = fs14.statSync(path20.join(d, entry.name));
             files.push({ path: rel, size: stat.size, type: "file" });
           }
         }
@@ -18754,7 +19181,7 @@ var DevServer = class _DevServer {
       this.json(res, 404, { error: `Provider directory not found: ${type}` });
       return;
     }
-    const fullPath = path18.resolve(dir, path18.normalize(filePath));
+    const fullPath = path20.resolve(dir, path20.normalize(filePath));
     if (!fullPath.startsWith(dir)) {
       this.json(res, 403, { error: "Forbidden" });
       return;
@@ -18779,14 +19206,14 @@ var DevServer = class _DevServer {
       this.json(res, 404, { error: `Provider directory not found: ${type}` });
       return;
     }
-    const fullPath = path18.resolve(dir, path18.normalize(filePath));
+    const fullPath = path20.resolve(dir, path20.normalize(filePath));
     if (!fullPath.startsWith(dir)) {
       this.json(res, 403, { error: "Forbidden" });
       return;
     }
     try {
       if (fs14.existsSync(fullPath)) fs14.copyFileSync(fullPath, fullPath + ".bak");
-      fs14.mkdirSync(path18.dirname(fullPath), { recursive: true });
+      fs14.mkdirSync(path20.dirname(fullPath), { recursive: true });
       fs14.writeFileSync(fullPath, content, "utf-8");
       this.log(`File saved: ${fullPath} (${content.length} chars)`);
       this.providerLoader.reload();
@@ -18803,7 +19230,7 @@ var DevServer = class _DevServer {
       return;
     }
     for (const name of ["scripts.js", "provider.json"]) {
-      const p = path18.join(dir, name);
+      const p = path20.join(dir, name);
       if (fs14.existsSync(p)) {
         const source = fs14.readFileSync(p, "utf-8");
         this.json(res, 200, { type, path: p, source, lines: source.split("\n").length });
@@ -18824,8 +19251,8 @@ var DevServer = class _DevServer {
       this.json(res, 404, { error: `Provider not found: ${type}` });
       return;
     }
-    const target = fs14.existsSync(path18.join(dir, "scripts.js")) ? "scripts.js" : "provider.json";
-    const targetPath = path18.join(dir, target);
+    const target = fs14.existsSync(path20.join(dir, "scripts.js")) ? "scripts.js" : "provider.json";
+    const targetPath = path20.join(dir, target);
     try {
       if (fs14.existsSync(targetPath)) fs14.copyFileSync(targetPath, targetPath + ".bak");
       fs14.writeFileSync(targetPath, source, "utf-8");
@@ -18930,14 +19357,14 @@ var DevServer = class _DevServer {
       child.stderr?.on("data", (d) => {
         stderr += d.toString();
       });
-      await new Promise((resolve9) => {
+      await new Promise((resolve12) => {
         const timer = setTimeout(() => {
           child.kill();
-          resolve9();
+          resolve12();
         }, timeout);
         child.on("exit", () => {
           clearTimeout(timer);
-          resolve9();
+          resolve12();
         });
       });
       const elapsed = Date.now() - start;
@@ -18985,7 +19412,7 @@ var DevServer = class _DevServer {
     }
     let targetDir;
     targetDir = this.providerLoader.getUserProviderDir(category, type);
-    const jsonPath = path18.join(targetDir, "provider.json");
+    const jsonPath = path20.join(targetDir, "provider.json");
     if (fs14.existsSync(jsonPath)) {
       this.json(res, 409, { error: `Provider already exists at ${targetDir}`, path: targetDir });
       return;
@@ -18997,8 +19424,8 @@ var DevServer = class _DevServer {
       const createdFiles = ["provider.json"];
       if (result.files) {
         for (const [relPath, content] of Object.entries(result.files)) {
-          const fullPath = path18.join(targetDir, relPath);
-          fs14.mkdirSync(path18.dirname(fullPath), { recursive: true });
+          const fullPath = path20.join(targetDir, relPath);
+          fs14.mkdirSync(path20.dirname(fullPath), { recursive: true });
           fs14.writeFileSync(fullPath, content, "utf-8");
           createdFiles.push(relPath);
         }
@@ -19051,22 +19478,22 @@ var DevServer = class _DevServer {
     if (!fs14.existsSync(scriptsDir)) return null;
     const versions = fs14.readdirSync(scriptsDir).filter((d) => {
       try {
-        return fs14.statSync(path18.join(scriptsDir, d)).isDirectory();
+        return fs14.statSync(path20.join(scriptsDir, d)).isDirectory();
       } catch {
         return false;
       }
     }).sort((a, b) => b.localeCompare(a, void 0, { numeric: true, sensitivity: "base" }));
     if (versions.length === 0) return null;
-    return path18.join(scriptsDir, versions[0]);
+    return path20.join(scriptsDir, versions[0]);
   }
   resolveAutoImplWritableProviderDir(category, type, requestedDir) {
-    const canonicalUserDir = path18.resolve(this.providerLoader.getUserProviderDir(category, type));
-    const desiredDir = requestedDir ? path18.resolve(requestedDir) : canonicalUserDir;
-    const upstreamRoot = path18.resolve(this.providerLoader.getUpstreamDir());
-    if (desiredDir === upstreamRoot || desiredDir.startsWith(`${upstreamRoot}${path18.sep}`)) {
+    const canonicalUserDir = path20.resolve(this.providerLoader.getUserProviderDir(category, type));
+    const desiredDir = requestedDir ? path20.resolve(requestedDir) : canonicalUserDir;
+    const upstreamRoot = path20.resolve(this.providerLoader.getUpstreamDir());
+    if (desiredDir === upstreamRoot || desiredDir.startsWith(`${upstreamRoot}${path20.sep}`)) {
       return { dir: null, reason: `Refusing to write into upstream provider directory: ${desiredDir}` };
     }
-    if (path18.basename(desiredDir) !== type) {
+    if (path20.basename(desiredDir) !== type) {
       return { dir: null, reason: `Requested writable provider directory must end with '${type}': ${desiredDir}` };
     }
     const sourceDir = this.findProviderDir(type);
@@ -19074,11 +19501,11 @@ var DevServer = class _DevServer {
       return { dir: null, reason: `Provider source directory not found for '${type}'` };
     }
     if (!fs14.existsSync(desiredDir)) {
-      fs14.mkdirSync(path18.dirname(desiredDir), { recursive: true });
+      fs14.mkdirSync(path20.dirname(desiredDir), { recursive: true });
       fs14.cpSync(sourceDir, desiredDir, { recursive: true });
       this.log(`Auto-implement writable copy created: ${desiredDir}`);
     }
-    const providerJson = path18.join(desiredDir, "provider.json");
+    const providerJson = path20.join(desiredDir, "provider.json");
     if (!fs14.existsSync(providerJson)) {
       return { dir: null, reason: `provider.json not found in writable provider directory: ${desiredDir}` };
     }
@@ -19126,7 +19553,7 @@ var DevServer = class _DevServer {
       setMode: "set_mode.js"
     };
     const targetFileNames = new Set(functions.map((fn) => funcToFile[fn]).filter(Boolean));
-    const scriptsDir = path18.join(providerDir, "scripts");
+    const scriptsDir = path20.join(providerDir, "scripts");
     const latestScriptsDir = this.getLatestScriptVersionDir(scriptsDir);
     if (latestScriptsDir) {
       lines.push(`Scripts version directory: \`${latestScriptsDir}\``);
@@ -19137,7 +19564,7 @@ var DevServer = class _DevServer {
       for (const file of fs14.readdirSync(latestScriptsDir)) {
         if (file.endsWith(".js") && targetFileNames.has(file)) {
           try {
-            const content = fs14.readFileSync(path18.join(latestScriptsDir, file), "utf-8");
+            const content = fs14.readFileSync(path20.join(latestScriptsDir, file), "utf-8");
             lines.push(`### \`${file}\` \u270F\uFE0F EDIT`);
             lines.push("```javascript");
             lines.push(content);
@@ -19154,7 +19581,7 @@ var DevServer = class _DevServer {
         lines.push("");
         for (const file of refFiles) {
           try {
-            const content = fs14.readFileSync(path18.join(latestScriptsDir, file), "utf-8");
+            const content = fs14.readFileSync(path20.join(latestScriptsDir, file), "utf-8");
             lines.push(`### \`${file}\` \u{1F512}`);
             lines.push("```javascript");
             lines.push(content);
@@ -19195,10 +19622,10 @@ var DevServer = class _DevServer {
         lines.push("");
       }
     }
-    const docsDir = path18.join(providerDir, "../../docs");
+    const docsDir = path20.join(providerDir, "../../docs");
     const loadGuide = (name) => {
       try {
-        const p = path18.join(docsDir, name);
+        const p = path20.join(docsDir, name);
         if (fs14.existsSync(p)) return fs14.readFileSync(p, "utf-8");
       } catch {
       }
@@ -19372,7 +19799,7 @@ var DevServer = class _DevServer {
       parseApproval: "parse_approval.js"
     };
     const targetFileNames = new Set(functions.map((fn) => funcToFile[fn]).filter(Boolean));
-    const scriptsDir = path18.join(providerDir, "scripts");
+    const scriptsDir = path20.join(providerDir, "scripts");
     const latestScriptsDir = this.getLatestScriptVersionDir(scriptsDir);
     if (latestScriptsDir) {
       lines.push(`Scripts version directory: \`${latestScriptsDir}\``);
@@ -19384,7 +19811,7 @@ var DevServer = class _DevServer {
         if (!file.endsWith(".js")) continue;
         if (!targetFileNames.has(file)) continue;
         try {
-          const content = fs14.readFileSync(path18.join(latestScriptsDir, file), "utf-8");
+          const content = fs14.readFileSync(path20.join(latestScriptsDir, file), "utf-8");
           lines.push(`### \`${file}\` \u270F\uFE0F EDIT`);
           lines.push("```javascript");
           lines.push(content);
@@ -19400,7 +19827,7 @@ var DevServer = class _DevServer {
         lines.push("");
         for (const file of refFiles) {
           try {
-            const content = fs14.readFileSync(path18.join(latestScriptsDir, file), "utf-8");
+            const content = fs14.readFileSync(path20.join(latestScriptsDir, file), "utf-8");
             lines.push(`### \`${file}\` \u{1F512}`);
             lines.push("```javascript");
             lines.push(content);
@@ -19433,10 +19860,10 @@ var DevServer = class _DevServer {
         lines.push("");
       }
     }
-    const docsDir = path18.join(providerDir, "../../docs");
+    const docsDir = path20.join(providerDir, "../../docs");
     const loadGuide = (name) => {
       try {
-        const p = path18.join(docsDir, name);
+        const p = path20.join(docsDir, name);
         if (fs14.existsSync(p)) return fs14.readFileSync(p, "utf-8");
       } catch {
       }
@@ -19612,14 +20039,14 @@ data: ${JSON.stringify(msg.data)}
     res.end(JSON.stringify(data, null, 2));
   }
   async readBody(req) {
-    return new Promise((resolve9) => {
+    return new Promise((resolve12) => {
       let body = "";
       req.on("data", (chunk) => body += chunk);
       req.on("end", () => {
         try {
-          resolve9(JSON.parse(body));
+          resolve12(JSON.parse(body));
         } catch {
-          resolve9({});
+          resolve12({});
         }
       });
     });
@@ -19953,6 +20380,7 @@ var SessionHostRuntimeTransport = class {
     }
   }
   handleEvent(event) {
+    if (!("sessionId" in event)) return;
     if (event.sessionId !== this.options.runtimeId) return;
     if ((event.type === "session_started" || event.type === "session_resumed") && typeof event.pid === "number") {
       this.currentPid = event.pid;
@@ -20028,7 +20456,10 @@ var SessionHostRuntimeTransport = class {
         clientId: client.clientId,
         type: client.type,
         readOnly: client.readOnly
-      }))
+      })),
+      restoredFromStorage: record.meta?.restoredFromStorage === true,
+      recoveryState: typeof record.meta?.runtimeRecoveryState === "string" ? String(record.meta.runtimeRecoveryState) : null,
+      recoveryError: typeof record.meta?.runtimeRecoveryError === "string" ? String(record.meta.runtimeRecoveryError) : null
     };
   }
   enqueue(action) {
@@ -20083,7 +20514,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((resolve9) => setTimeout(resolve9, STARTUP_POLL_MS));
+    await new Promise((resolve12) => setTimeout(resolve12, STARTUP_POLL_MS));
   }
   throw new Error(`Session host did not become ready within ${timeoutMs}ms`);
 }
@@ -20239,10 +20670,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((resolve9) => {
+        return new Promise((resolve12) => {
           const cmd = `"${ide.cliCommand}" --install-extension "${vsixPath}" --force`;
           (0, import_child_process10.exec)(cmd, { timeout: 6e4 }, (error, _stdout, stderr) => {
-            resolve9({
+            resolve12({
               extensionId: extension.id,
               marketplaceId: extension.marketplaceId,
               success: !error,
@@ -20255,11 +20686,11 @@ async function installExtension(ide, extension) {
     } catch (e) {
     }
   }
-  return new Promise((resolve9) => {
+  return new Promise((resolve12) => {
     const cmd = `"${ide.cliCommand}" --install-extension ${extension.marketplaceId} --force`;
     (0, import_child_process10.exec)(cmd, { timeout: 6e4 }, (error, stdout, stderr) => {
       if (error) {
-        resolve9({
+        resolve12({
           extensionId: extension.id,
           marketplaceId: extension.marketplaceId,
           success: false,
@@ -20267,7 +20698,7 @@ async function installExtension(ide, extension) {
           error: stderr || error.message
         });
       } else {
-        resolve9({
+        resolve12({
           extensionId: extension.id,
           marketplaceId: extension.marketplaceId,
           success: true,
@@ -20403,13 +20834,32 @@ async function initDaemonComponents(config) {
   const detectedIdesRef = { value: [] };
   let agentStreamManager = null;
   let poller = null;
+  const refreshProviderAvailability = async (providerType) => {
+    const targetProvider = providerType ? providerLoader.getMeta(providerLoader.resolveAlias(providerType)) : null;
+    const targetCategory = targetProvider?.category;
+    if (!providerType || targetCategory === "cli" || targetCategory === "acp") {
+      if (providerType && targetProvider) {
+        const detected = await detectCLI(targetProvider.type, providerLoader, { includeVersion: false });
+        providerLoader.setProviderAvailability(targetProvider.type, {
+          installed: !!detected,
+          detectedPath: detected?.path || null
+        });
+      } else {
+        providerLoader.setCliDetectionResults(await detectCLIs(providerLoader, { includeVersion: false }), true);
+      }
+    }
+    if (!providerType || targetCategory === "ide") {
+      detectedIdesRef.value = await detectIDEs(providerLoader);
+      providerLoader.setIdeDetectionResults(detectedIdesRef.value, true);
+    }
+  };
   const cliManager = new DaemonCliManager({
     ...config.cliManagerDeps,
     getInstanceManager: () => instanceManager,
     getSessionRegistry: () => sessionRegistry
   }, providerLoader);
   LOG.info("Init", "Detecting IDEs...");
-  detectedIdesRef.value = await detectIDEs();
+  await refreshProviderAvailability();
   const installed = detectedIdesRef.value.filter((i) => i.installed);
   LOG.info("Init", `Found ${installed.length} IDE(s): ${installed.map((i) => i.id).join(", ") || "none"}`);
   const cdpSetupContext = {
@@ -20449,7 +20899,11 @@ async function initDaemonComponents(config) {
     adapters: cliManager.adapters,
     providerLoader,
     instanceManager,
-    sessionRegistry
+    sessionRegistry,
+    onProviderSettingChanged: async (providerType) => {
+      await refreshProviderAvailability(providerType);
+      config.onStatusChange?.();
+    }
   });
   agentStreamManager = new DaemonAgentStreamManager(
     LOG.forComponent("AgentStream").asLogFn(),
@@ -20472,6 +20926,7 @@ async function initDaemonComponents(config) {
     onIdeConnected: () => poller?.start(),
     onStatusChange: config.onStatusChange,
     onPostChatCommand: config.onPostChatCommand,
+    sessionHostControl: config.sessionHostControl,
     getCdpLogFn: config.getCdpLogFn || ((ideType) => LOG.forComponent(`CDP:${ideType}`).asLogFn())
   });
   poller = new AgentStreamPoller({