adhdev 0.8.12 → 0.8.13

package/dist/cli/index.js

@@ -9,7 +9,7 @@ var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __esm = (fn, res) => function __init() {
   return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
 };
-var __commonJS = (cb, mod) => function __require() {
+var __commonJS = (cb, mod) => function __require2() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
 var __export = (target, all) => {
@@ -572,18 +572,18 @@ function checkPathExists(paths) {
   return null;
 }
 async function detectIDEs() {
-  const os22 = (0, import_os2.platform)();
+  const os24 = (0, import_os2.platform)();
   const results = [];
   for (const def of getMergedDefinitions()) {
     const cliPath = findCliCommand(def.cli);
-    const appPath = checkPathExists(def.paths[os22] || []);
+    const appPath = checkPathExists(def.paths[os24] || []);
     const installed = !!(cliPath || appPath);
     let resolvedCli = cliPath;
-    if (!resolvedCli && appPath && os22 === "darwin") {
+    if (!resolvedCli && appPath && os24 === "darwin") {
       const bundledCli = `${appPath}/Contents/Resources/app/bin/${def.cli}`;
       if ((0, import_fs2.existsSync)(bundledCli)) resolvedCli = bundledCli;
     }
-    if (!resolvedCli && appPath && os22 === "win32") {
+    if (!resolvedCli && appPath && os24 === "win32") {
       const { dirname: dirname9 } = await import("path");
       const appDir = dirname9(appPath);
       const candidates = [
@@ -644,8 +644,8 @@ function execAsync(cmd, timeoutMs = 5e3) {
   });
 }
 async function detectCLIs(providerLoader) {
-  const platform10 = os2.platform();
-  const whichCmd = platform10 === "win32" ? "where" : "which";
+  const platform11 = os2.platform();
+  const whichCmd = platform11 === "win32" ? "where" : "which";
   const cliList = providerLoader ? providerLoader.getCliDetectionList() : [];
   const results = await Promise.all(
     cliList.map(async (cli) => {
@@ -680,6 +680,39 @@ async function detectCLIs(providerLoader) {
 }
 async function detectCLI(cliId, providerLoader) {
   const resolvedId = providerLoader ? providerLoader.resolveAlias(cliId) : cliId;
+  if (providerLoader) {
+    const cliList = providerLoader.getCliDetectionList();
+    const target = cliList.find((c) => c.id === resolvedId);
+    if (target) {
+      const platform11 = os2.platform();
+      const whichCmd = platform11 === "win32" ? "where" : "which";
+      try {
+        const pathResult = await execAsync(`${whichCmd} ${target.command}`);
+        if (!pathResult) return null;
+        const firstPath = pathResult.split("\n")[0];
+        let version2;
+        try {
+          const versionCommands = [
+            target.versionCommand,
+            `${target.command} --version`,
+            `${target.command} -V`,
+            `${target.command} -v`
+          ].filter((v) => !!v);
+          for (const versionCommand of versionCommands) {
+            const versionResult = await execAsync(versionCommand, 3e3);
+            if (versionResult) {
+              version2 = parseVersion(versionResult);
+              break;
+            }
+          }
+        } catch {
+        }
+        return { ...target, installed: true, version: version2, path: firstPath };
+      } catch {
+        return null;
+      }
+    }
+  }
   const all = await detectCLIs(providerLoader);
   return all.find((c) => c.id === resolvedId && c.installed) || null;
 }
@@ -6196,6 +6229,13 @@ function logTerminalBackendSelection(preference, ghosttyAvailable, backendKind)
   const key = `${preference}:${ghosttyAvailable}:${backendKind}`;
   if (loggedTerminalBackends.has(key)) return;
   loggedTerminalBackends.add(key);
+  if (backendKind === "xterm" && preference !== "xterm" && !ghosttyAvailable) {
+    LOG.warn(
+      "Terminal",
+      `[terminal-screen] ghostty-vt unavailable; using xterm fallback (preference=${preference})`
+    );
+    return;
+  }
   LOG.info(
     "Terminal",
     `[terminal-screen] backend=${backendKind} preference=${preference} ghosttyAvailable=${ghosttyAvailable}`
@@ -6258,10 +6298,11 @@ var init_terminal_screen = __esm({
 });
 
 // ../../oss/packages/daemon-core/src/cli-adapters/pty-transport.ts
-var pty, NodePtyRuntimeTransport, NodePtyTransportFactory;
+var os7, pty, NodePtyRuntimeTransport, NodePtyTransportFactory;
 var init_pty_transport = __esm({
   "../../oss/packages/daemon-core/src/cli-adapters/pty-transport.ts"() {
     "use strict";
+    os7 = __toESM(require("os"));
     try {
       pty = require("node-pty");
     } catch {
@@ -6298,11 +6339,21 @@ var init_pty_transport = __esm({
     NodePtyTransportFactory = class {
       spawn(command, args, options) {
         if (!pty) throw new Error("node-pty is not installed");
+        let cwd = options.cwd;
+        if (cwd) {
+          try {
+            const fs19 = require("fs");
+            const stat4 = fs19.statSync(cwd);
+            if (!stat4.isDirectory()) cwd = os7.homedir();
+          } catch {
+            cwd = os7.homedir();
+          }
+        }
         const handle = pty.spawn(command, args, {
           name: "xterm-256color",
           cols: options.cols,
           rows: options.rows,
-          cwd: options.cwd,
+          cwd,
           env: options.env
         });
         return new NodePtyRuntimeTransport(handle);
@@ -6311,33 +6362,39 @@ var init_pty_transport = __esm({
   }
 });
 
-// ../../oss/packages/daemon-core/src/cli-adapters/provider-cli-adapter.ts
-var provider_cli_adapter_exports = {};
-__export(provider_cli_adapter_exports, {
-  ProviderCliAdapter: () => ProviderCliAdapter,
-  normalizeCliProviderForRuntime: () => normalizeCliProviderForRuntime
-});
-function stripAnsi(str) {
-  return str.replace(/\x1B\][^\x07]*\x07/g, "").replace(/\x1B\][\s\S]*?\x1B\\/g, "").replace(/\x1B[P^_X][\s\S]*?(?:\x07|\x1B\\)/g, "").replace(/\x1B\[\d*[A-HJKSTfG]/g, " ").replace(/\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g, "").replace(/  +/g, " ");
-}
-function stripTerminalNoise(str) {
-  return String(str || "").replace(/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F-\x9F]/g, "").replace(/(^|[\s([])(?:\??\d{1,4}(?:;\d{1,4})*[A-Za-z])(?=$|[\s)\]])/g, "$1").replace(/(^|[\s([])(?:\[\??\d{1,4}(?:;\d{1,4})*[A-Za-z])(?=$|[\s)\]])/g, "$1").replace(/(^|[\s([])(?:\d{1,4};\?)(?=$|[\s)\]])/g, "$1").replace(/(^|[\s([])(?:\d+\$r[0-9;\" ]*[A-Za-z]?)(?=$|[\s)\]])/g, "$1").replace(/(^|[\s([])(?:>\|[A-Za-z0-9_.:-]+(?:\([^)]*\))?)(?=$|[\s)\]])/g, "$1").replace(/(^|[\s([])(?:[A-Z]\d(?:\s+[A-Z]\d)+)(?=$|[\s)\]])/g, "$1").replace(/(^|[\s([])(?:\d+;[^\s)\]]+)(?=$|[\s)\]])/g, "$1").replace(/\r+/g, "\n").replace(/[ \t]+\n/g, "\n").replace(/\n{3,}/g, "\n\n").replace(/ {2,}/g, " ");
-}
-function sanitizeTerminalText(str) {
-  return stripTerminalNoise(stripAnsi(str));
-}
-function applyPreferredTerminalColorEnv(env) {
-  if (env.NO_COLOR) return;
-  if (!env.TERM || env.TERM === "xterm-color") {
-    env.TERM = "xterm-256color";
-  }
-  if (!env.COLORTERM) env.COLORTERM = "truecolor";
+// ../../oss/packages/session-host-core/dist/index.mjs
+function getDefaultSessionHostEndpoint(appName = "adhdev") {
   if (process.platform === "win32") {
-    if (!env.FORCE_COLOR) env.FORCE_COLOR = "1";
-    if (!env.CLICOLOR) env.CLICOLOR = "1";
+    return {
+      kind: "pipe",
+      path: `\\\\.\\pipe\\${appName}-session-host`
+    };
   }
+  return {
+    kind: "unix",
+    path: path22.join(os8.tmpdir(), `${appName}-session-host.sock`)
+  };
+}
+function serializeEnvelope(envelope) {
+  return `${JSON.stringify(envelope)}
+`;
+}
+function createLineParser(onEnvelope) {
+  let buffer = "";
+  return (chunk) => {
+    buffer += chunk.toString();
+    let newlineIndex = buffer.indexOf("\n");
+    while (newlineIndex >= 0) {
+      const rawLine = buffer.slice(0, newlineIndex).trim();
+      buffer = buffer.slice(newlineIndex + 1);
+      if (rawLine) {
+        onEnvelope(JSON.parse(rawLine));
+      }
+      newlineIndex = buffer.indexOf("\n");
+    }
+  };
 }
-function buildCliSpawnEnv(baseEnv, overrides) {
+function sanitizeSpawnEnv(baseEnv, overrides) {
   const env = {};
   const source = { ...baseEnv, ...overrides || {} };
   for (const [key, value] of Object.entries(source)) {
@@ -6349,9 +6406,185 @@ function buildCliSpawnEnv(baseEnv, overrides) {
       delete env[key];
     }
   }
-  applyPreferredTerminalColorEnv(env);
+  applyTerminalColorEnv(env);
   return env;
 }
+function applyTerminalColorEnv(env) {
+  if (env.NO_COLOR) return;
+  if (!env.TERM || env.TERM === "xterm-color") {
+    env.TERM = "xterm-256color";
+  }
+  if (!env.COLORTERM) env.COLORTERM = "truecolor";
+  if (process.platform === "win32") {
+    if (!env.FORCE_COLOR) env.FORCE_COLOR = "1";
+    if (!env.CLICOLOR) env.CLICOLOR = "1";
+  }
+}
+function ensureNodePtySpawnHelperPermissions(logFn) {
+  if (os22.platform() === "win32") return;
+  try {
+    const fs19 = __require("fs");
+    const ptyDir = path32.resolve(path32.dirname(__require.resolve("node-pty")), "..");
+    const platformArch = `${os22.platform()}-${os22.arch()}`;
+    const helper = path32.join(ptyDir, "prebuilds", platformArch, "spawn-helper");
+    if (fs19.existsSync(helper)) {
+      const stat4 = fs19.statSync(helper);
+      if (!(stat4.mode & 73)) {
+        fs19.chmodSync(helper, stat4.mode | 493);
+        logFn?.(`Fixed spawn-helper permissions: ${helper}`);
+      }
+    }
+  } catch {
+  }
+}
+var os8, path22, net, import_crypto3, os22, path32, __require, SessionHostClient;
+var init_dist = __esm({
+  "../../oss/packages/session-host-core/dist/index.mjs"() {
+    "use strict";
+    os8 = __toESM(require("os"), 1);
+    path22 = __toESM(require("path"), 1);
+    net = __toESM(require("net"), 1);
+    import_crypto3 = require("crypto");
+    os22 = __toESM(require("os"), 1);
+    path32 = __toESM(require("path"), 1);
+    __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+      get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+    }) : x)(function(x) {
+      if (typeof require !== "undefined") return require.apply(this, arguments);
+      throw Error('Dynamic require of "' + x + '" is not supported');
+    });
+    SessionHostClient = class {
+      endpoint;
+      socket = null;
+      requestWaiters = /* @__PURE__ */ new Map();
+      eventListeners = /* @__PURE__ */ new Set();
+      constructor(options = {}) {
+        this.endpoint = options.endpoint || getDefaultSessionHostEndpoint(options.appName || "adhdev");
+      }
+      async connect() {
+        if (this.socket && !this.socket.destroyed) return;
+        if (this.socket) {
+          try {
+            this.socket.destroy();
+          } catch {
+          }
+          this.socket = null;
+        }
+        const socket = net.createConnection(this.endpoint.path);
+        this.socket = socket;
+        socket.on("data", createLineParser((envelope) => {
+          if (envelope.kind === "response") {
+            const waiter = this.requestWaiters.get(envelope.requestId);
+            if (waiter) {
+              this.requestWaiters.delete(envelope.requestId);
+              waiter.resolve(envelope.response);
+            }
+            return;
+          }
+          if (envelope.kind === "event") {
+            for (const listener of this.eventListeners) listener(envelope.event);
+          }
+        }));
+        socket.on("error", (error48) => {
+          for (const waiter of this.requestWaiters.values()) {
+            waiter.reject(error48);
+          }
+          this.requestWaiters.clear();
+          if (this.socket === socket) {
+            this.socket = null;
+          }
+          try {
+            socket.destroy();
+          } catch {
+          }
+        });
+        await new Promise((resolve22, reject) => {
+          socket.once("connect", () => resolve22());
+          socket.once("error", reject);
+        });
+      }
+      onEvent(listener) {
+        this.eventListeners.add(listener);
+        return () => {
+          this.eventListeners.delete(listener);
+        };
+      }
+      async request(request) {
+        await this.connect();
+        if (!this.socket) throw new Error("Session host socket unavailable");
+        const requestId = (0, import_crypto3.randomUUID)();
+        const envelope = {
+          kind: "request",
+          requestId,
+          request
+        };
+        const response = await new Promise((resolve22, reject) => {
+          const timeout = setTimeout(() => {
+            this.requestWaiters.delete(requestId);
+            reject(new Error(`Session host request timed out after 30s (${request.type})`));
+          }, 3e4);
+          this.requestWaiters.set(requestId, {
+            resolve: (value) => {
+              clearTimeout(timeout);
+              resolve22(value);
+            },
+            reject: (error48) => {
+              clearTimeout(timeout);
+              reject(error48);
+            }
+          });
+          this.socket?.write(serializeEnvelope(envelope));
+        });
+        return response;
+      }
+      async close() {
+        if (!this.socket) return;
+        const socket = this.socket;
+        this.socket = null;
+        for (const waiter of this.requestWaiters.values()) {
+          waiter.reject(new Error("Session host client closed"));
+        }
+        this.requestWaiters.clear();
+        await new Promise((resolve22) => {
+          let settled = false;
+          const done = () => {
+            if (settled) return;
+            settled = true;
+            resolve22();
+          };
+          socket.once("close", done);
+          socket.end();
+          socket.destroy();
+          setTimeout(done, 50);
+        });
+      }
+    };
+  }
+});
+
+// ../../oss/packages/daemon-core/src/cli-adapters/spawn-env.ts
+var init_spawn_env = __esm({
+  "../../oss/packages/daemon-core/src/cli-adapters/spawn-env.ts"() {
+    "use strict";
+    init_dist();
+  }
+});
+
+// ../../oss/packages/daemon-core/src/cli-adapters/provider-cli-adapter.ts
+var provider_cli_adapter_exports = {};
+__export(provider_cli_adapter_exports, {
+  ProviderCliAdapter: () => ProviderCliAdapter,
+  normalizeCliProviderForRuntime: () => normalizeCliProviderForRuntime
+});
+function stripAnsi(str) {
+  return str.replace(/\x1B\][^\x07]*\x07/g, "").replace(/\x1B\][\s\S]*?\x1B\\/g, "").replace(/\x1B[P^_X][\s\S]*?(?:\x07|\x1B\\)/g, "").replace(/\x1B\[\d*[A-HJKSTfG]/g, " ").replace(/\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g, "").replace(/  +/g, " ");
+}
+function stripTerminalNoise(str) {
+  return String(str || "").replace(/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F-\x9F]/g, "").replace(/(^|[\s([])(?:\??\d{1,4}(?:;\d{1,4})*[A-Za-z])(?=$|[\s)\]])/g, "$1").replace(/(^|[\s([])(?:\[\??\d{1,4}(?:;\d{1,4})*[A-Za-z])(?=$|[\s)\]])/g, "$1").replace(/(^|[\s([])(?:\d{1,4};\?)(?=$|[\s)\]])/g, "$1").replace(/(^|[\s([])(?:\d+\$r[0-9;\" ]*[A-Za-z]?)(?=$|[\s)\]])/g, "$1").replace(/(^|[\s([])(?:>\|[A-Za-z0-9_.:-]+(?:\([^)]*\))?)(?=$|[\s)\]])/g, "$1").replace(/(^|[\s([])(?:[A-Z]\d(?:\s+[A-Z]\d)+)(?=$|[\s)\]])/g, "$1").replace(/(^|[\s([])(?:\d+;[^\s)\]]+)(?=$|[\s)\]])/g, "$1").replace(/\r+/g, "\n").replace(/[ \t]+\n/g, "\n").replace(/\n{3,}/g, "\n\n").replace(/ {2,}/g, " ");
+}
+function sanitizeTerminalText(str) {
+  return stripTerminalNoise(stripAnsi(str));
+}
 function computeTerminalQueryTail(buffer) {
   const prefixes = ["\x1B[6n", "\x1B[?6n"];
   const maxLength = prefixes.reduce((n, value) => Math.max(n, value.length), 0) - 1;
@@ -6365,7 +6598,7 @@ function computeTerminalQueryTail(buffer) {
   return "";
 }
 function findBinary(name) {
-  const isWin = os7.platform() === "win32";
+  const isWin = os9.platform() === "win32";
   try {
     const cmd = isWin ? `where ${name}` : `which ${name}`;
     return (0, import_child_process4.execSync)(cmd, { encoding: "utf-8", timeout: 5e3, stdio: ["pipe", "pipe", "pipe"] }).trim().split("\n")[0].trim();
@@ -6413,7 +6646,7 @@ function looksLikeMachOOrElf(filePath) {
 }
 function shSingleQuote(arg) {
   if (/^[a-zA-Z0-9@%_+=:,./-]+$/.test(arg)) return arg;
-  if (os7.platform() === "win32") {
+  if (os9.platform() === "win32") {
     return `"${arg.replace(/"/g, '""')}"`;
   }
   return `'${arg.replace(/'/g, `'\\''`)}'`;
@@ -6480,37 +6713,24 @@ function normalizeCliProviderForRuntime(raw) {
     }
   };
 }
-var os7, path7, import_child_process4, pty2, ProviderCliAdapter;
+var os9, path7, import_child_process4, pty2, buildCliSpawnEnv, ProviderCliAdapter;
 var init_provider_cli_adapter = __esm({
   "../../oss/packages/daemon-core/src/cli-adapters/provider-cli-adapter.ts"() {
     "use strict";
-    os7 = __toESM(require("os"));
+    os9 = __toESM(require("os"));
     path7 = __toESM(require("path"));
     import_child_process4 = require("child_process");
     init_logger();
     init_terminal_screen();
     init_pty_transport();
+    init_spawn_env();
     try {
       pty2 = require("node-pty");
-      if (os7.platform() !== "win32") {
-        try {
-          const fs19 = require("fs");
-          const ptyDir = path7.resolve(path7.dirname(require.resolve("node-pty")), "..");
-          const platformArch = `${os7.platform()}-${os7.arch()}`;
-          const helper = path7.join(ptyDir, "prebuilds", platformArch, "spawn-helper");
-          if (fs19.existsSync(helper)) {
-            const stat4 = fs19.statSync(helper);
-            if (!(stat4.mode & 73)) {
-              fs19.chmodSync(helper, stat4.mode | 493);
-              LOG.info("CLI", "[node-pty] Fixed spawn-helper permissions");
-            }
-          }
-        } catch {
-        }
-      }
+      ensureNodePtySpawnHelperPermissions((msg) => LOG.info("CLI", msg));
     } catch {
       LOG.error("CLI", "[ProviderCliAdapter] node-pty not found. Terminal features disabled.");
     }
+    buildCliSpawnEnv = sanitizeSpawnEnv;
     ProviderCliAdapter = class _ProviderCliAdapter {
       constructor(provider, workingDir, extraArgs = [], transportFactory = new NodePtyTransportFactory()) {
         this.extraArgs = extraArgs;
@@ -6518,7 +6738,7 @@ var init_provider_cli_adapter = __esm({
         this.transportFactory = transportFactory;
         this.cliType = provider.type;
         this.cliName = provider.name;
-        this.workingDir = workingDir.startsWith("~") ? workingDir.replace(/^~/, os7.homedir()) : workingDir;
+        this.workingDir = workingDir.startsWith("~") ? workingDir.replace(/^~/, os9.homedir()) : workingDir;
         const t = provider.timeouts || {};
         this.timeouts = {
           ptyFlush: t.ptyFlush ?? 50,
@@ -6825,7 +7045,7 @@ var init_provider_cli_adapter = __esm({
         if (this.ptyProcess) return;
         const { spawn: spawnConfig } = this.provider;
         const binaryPath = findBinary(spawnConfig.command);
-        const isWin = os7.platform() === "win32";
+        const isWin = os9.platform() === "win32";
         const allArgs = [...spawnConfig.args, ...this.extraArgs];
         LOG.info("CLI", `[${this.cliType}] Spawning in ${this.workingDir}`);
         this.resetTraceSession();
@@ -6877,6 +7097,12 @@ var init_provider_cli_adapter = __esm({
             shellArgs = ["-l", "-c", fullCmd];
             this.ptyProcess = this.transportFactory.spawn(shellCmd, shellArgs, ptyOpts);
           } else {
+            if (isWin) {
+              const hint = /error code 267|ERROR_DIRECTORY/i.test(msg) ? " (working directory does not exist or is not a directory)" : /error code 740|elevation/i.test(msg) ? " (requires administrator privileges)" : /error code 2|ENOENT|not found/i.test(msg) ? ` (executable not found: ${shellCmd})` : "";
+              if (hint) {
+                throw new Error(`Failed to spawn CLI${hint}: ${msg}`);
+              }
+            }
             throw err;
           }
         }
@@ -7629,7 +7855,8 @@ ${data.message || ""}`.trim();
               const payload = stopCommand.endsWith("\r") || stopCommand.endsWith("\n") ? stopCommand : `${stopCommand}${this.sendKey}`;
               this.ptyProcess.write(payload);
             };
-            if (wasProcessing) setTimeout(writeCommand, 250);
+            const interruptGraceMs = typeof resume.interruptGraceMs === "number" ? Math.max(100, resume.interruptGraceMs) : 500;
+            if (wasProcessing) setTimeout(writeCommand, interruptGraceMs);
             else writeCommand();
           } else {
             this.ptyProcess.write("");
@@ -7674,6 +7901,18 @@ ${data.message || ""}`.trim();
           clearTimeout(this.submitRetryTimer);
           this.submitRetryTimer = null;
         }
+        if (this.responseTimeout) {
+          clearTimeout(this.responseTimeout);
+          this.responseTimeout = null;
+        }
+        if (this.idleTimeout) {
+          clearTimeout(this.idleTimeout);
+          this.idleTimeout = null;
+        }
+        if (this.pendingScriptStatusTimer) {
+          clearTimeout(this.pendingScriptStatusTimer);
+          this.pendingScriptStatusTimer = null;
+        }
         if (this.pendingOutputParseTimer) {
           clearTimeout(this.pendingOutputParseTimer);
           this.pendingOutputParseTimer = null;
@@ -7715,6 +7954,18 @@ ${data.message || ""}`.trim();
           clearTimeout(this.submitRetryTimer);
           this.submitRetryTimer = null;
         }
+        if (this.responseTimeout) {
+          clearTimeout(this.responseTimeout);
+          this.responseTimeout = null;
+        }
+        if (this.idleTimeout) {
+          clearTimeout(this.idleTimeout);
+          this.idleTimeout = null;
+        }
+        if (this.pendingScriptStatusTimer) {
+          clearTimeout(this.pendingScriptStatusTimer);
+          this.pendingScriptStatusTimer = null;
+        }
         if (this.pendingOutputParseTimer) {
           clearTimeout(this.pendingOutputParseTimer);
           this.pendingOutputParseTimer = null;
@@ -7909,11 +8160,11 @@ function getDatabaseSync() {
   }
   return CachedDatabaseSync;
 }
-var os8, path8, crypto3, fs5, import_node_module, CachedDatabaseSync, CliProviderInstance;
+var os10, path8, crypto3, fs5, import_node_module, CachedDatabaseSync, CliProviderInstance;
 var init_cli_provider_instance = __esm({
   "../../oss/packages/daemon-core/src/providers/cli-provider-instance.ts"() {
     "use strict";
-    os8 = __toESM(require("os"));
+    os10 = __toESM(require("os"));
     path8 = __toESM(require("path"));
     crypto3 = __toESM(require("crypto"));
     fs5 = __toESM(require("fs"));
@@ -7994,17 +8245,60 @@ var init_cli_provider_instance = __esm({
       async onTick() {
         if (this.providerSessionId) return;
         let probedSessionId = null;
-        if (this.type === "opencode-cli") {
-          probedSessionId = this.probeOpenCodeSessionId();
-        } else if (this.type === "codex-cli") {
-          probedSessionId = this.probeCodexSessionId();
-        } else if (this.type === "goose-cli") {
-          probedSessionId = this.probeGooseSessionId();
+        const probeConfig = this.provider.sessionProbe;
+        if (probeConfig) {
+          probedSessionId = this.probeSessionIdFromConfig(probeConfig);
+        } else {
+          if (this.type === "opencode-cli") {
+            probedSessionId = this.probeSessionIdFromConfig({
+              dbPath: "~/.local/share/opencode/opencode.db",
+              query: "select id from session where directory in ({dirs}) and time_created >= ? and time_archived is null order by time_updated desc limit 1",
+              timestampFormat: "unix_ms"
+            });
+          } else if (this.type === "codex-cli") {
+            probedSessionId = this.probeSessionIdFromConfig({
+              dbPath: "~/.codex/state_5.sqlite",
+              query: "select id from threads where cwd in ({dirs}) and created_at >= ? and archived = 0 order by created_at desc limit 1",
+              timestampFormat: "unix_s"
+            });
+          } else if (this.type === "goose-cli") {
+            probedSessionId = this.probeSessionIdFromConfig({
+              dbPath: "~/.local/share/goose/sessions/sessions.db",
+              query: "select id from sessions where working_dir in ({dirs}) and created_at >= ? order by updated_at desc limit 1",
+              timestampFormat: "iso"
+            });
+          }
         }
         if (probedSessionId) {
           this.promoteProviderSessionId(probedSessionId);
         }
       }
+      /**
+       * Generic session ID probe using declarative ProviderSessionProbe config.
+       * Replaces the previously duplicated probeOpenCode/Codex/Goose functions.
+       */
+      probeSessionIdFromConfig(probe) {
+        const resolvedDbPath = probe.dbPath.replace(/^~/, os10.homedir());
+        if (!fs5.existsSync(resolvedDbPath)) return null;
+        const directories = this.getProbeDirectories();
+        const minCreatedAt = Math.max(0, this.startedAt - 6e4);
+        const tsFormat = probe.timestampFormat || "unix_ms";
+        let timestampParam;
+        if (tsFormat === "unix_s") {
+          timestampParam = Math.floor(minCreatedAt / 1e3);
+        } else if (tsFormat === "iso") {
+          timestampParam = new Date(minCreatedAt).toISOString().slice(0, 19).replace("T", " ");
+        } else {
+          timestampParam = minCreatedAt;
+        }
+        const placeholders = this.buildSqlPlaceholderList(directories.length);
+        const query = probe.query.replace("{dirs}", placeholders);
+        try {
+          return this.querySqliteText(resolvedDbPath, query, [...directories, timestampParam]);
+        } catch {
+          return null;
+        }
+      }
       getState() {
         const adapterStatus = this.adapter.getStatus();
         const parsedStatus = this.adapter.getScriptParsedStatus?.() || null;
@@ -8302,34 +8596,6 @@ var init_cli_provider_instance = __esm({
         });
         LOG.info("CLI", `[${this.type}] discovered provider session id: ${nextSessionId}`);
       }
-      probeOpenCodeSessionId() {
-        const dbPath = path8.join(os8.homedir(), ".local", "share", "opencode", "opencode.db");
-        if (!fs5.existsSync(dbPath)) return null;
-        const minCreatedAt = Math.max(0, this.startedAt - 6e4);
-        const directories = this.getProbeDirectories();
-        const query = `select id from session where directory in (${this.buildSqlPlaceholderList(directories.length)}) and time_created >= ? and time_archived is null order by time_updated desc limit 1;`;
-        return this.querySqliteText(dbPath, query, [...directories, minCreatedAt]);
-      }
-      probeCodexSessionId() {
-        const dbPath = path8.join(os8.homedir(), ".codex", "state_5.sqlite");
-        if (!fs5.existsSync(dbPath)) return null;
-        const minCreatedAt = Math.max(0, Math.floor((this.startedAt - 6e4) / 1e3));
-        const directories = this.getProbeDirectories();
-        const query = `select id from threads where cwd in (${this.buildSqlPlaceholderList(directories.length)}) and created_at >= ? and archived = 0 order by created_at desc limit 1;`;
-        return this.querySqliteText(dbPath, query, [...directories, minCreatedAt]);
-      }
-      probeGooseSessionId() {
-        const dbPath = path8.join(os8.homedir(), ".local", "share", "goose", "sessions", "sessions.db");
-        if (!fs5.existsSync(dbPath)) return null;
-        const minCreatedAtIso = new Date(Math.max(0, this.startedAt - 6e4)).toISOString().slice(0, 19).replace("T", " ");
-        const directories = this.getProbeDirectories();
-        const query = `select id from sessions where working_dir in (${this.buildSqlPlaceholderList(directories.length)}) and created_at >= ? order by updated_at desc limit 1;`;
-        try {
-          return this.querySqliteText(dbPath, query, [...directories, minCreatedAtIso]);
-        } catch {
-          return null;
-        }
-      }
       getProbeDirectories() {
         const dirs = /* @__PURE__ */ new Set();
         const addDir = (value) => {
@@ -25688,11 +25954,11 @@ function resolveCliSessionBinding(provider, normalizedType, cliArgs, requestedRe
     launchMode: "new"
   };
 }
-var os9, path9, crypto4, import_chalk, chalkApi, DaemonCliManager;
+var os11, path9, crypto4, import_chalk, chalkApi, DaemonCliManager;
 var init_cli_manager = __esm({
   "../../oss/packages/daemon-core/src/commands/cli-manager.ts"() {
     "use strict";
-    os9 = __toESM(require("os"));
+    os11 = __toESM(require("os"));
     path9 = __toESM(require("path"));
     crypto4 = __toESM(require("crypto"));
     import_chalk = __toESM(require("chalk"));
@@ -25844,7 +26110,7 @@ var init_cli_manager = __esm({
       async startSession(cliType, workingDir, cliArgs, initialModel, options) {
         const trimmed = (workingDir || "").trim();
         if (!trimmed) throw new Error("working directory required");
-        const resolvedDir = trimmed.startsWith("~") ? trimmed.replace(/^~/, os9.homedir()) : path9.resolve(trimmed);
+        const resolvedDir = trimmed.startsWith("~") ? trimmed.replace(/^~/, os11.homedir()) : path9.resolve(trimmed);
         const normalizedType = this.providerLoader.resolveAlias(cliType);
         const provider = this.providerLoader.getByAlias(cliType);
         const key = crypto4.randomUUID();
@@ -25928,7 +26194,19 @@ ${installInfo}`
           return { runtimeSessionId: sessionId };
         }
         const cliInfo = await detectCLI(cliType, this.providerLoader);
-        if (!cliInfo) throw new Error(`${cliType} not found`);
+        if (!cliInfo) {
+          const installHint = provider?.install || "";
+          const displayName = provider?.displayName || provider?.name || cliType;
+          const spawnCmd = provider?.spawn?.command || cliType;
+          throw new Error(
+            `${displayName} is not installed.
+Command '${spawnCmd}' not found on PATH.
+` + (installHint ? `
+${installHint}
+` : "") + `
+Run 'adhdev doctor' for detailed diagnostics.`
+          );
+        }
         console.log(colorize("yellow", `  \u26A1 Starting CLI ${cliType} in ${resolvedDir}...`));
         if (provider) {
           console.log(colorize("cyan", `  \u{1F4E6} Using provider: ${provider.name} (${provider.type})`));
@@ -26244,8 +26522,9 @@ ${installInfo}`
             const dir = rdir.path;
             if (!cliType) throw new Error("cliType required");
             const found = this.findAdapter(cliType, { instanceKey: args?.targetSessionId, dir });
+            const prevCliArgs = found ? found.adapter.extraArgs : void 0;
             if (found) await this.stopSession(found.key);
-            await this.startSession(cliType, dir);
+            await this.startSession(cliType, dir, args?.cliArgs || prevCliArgs, args?.initialModel);
             return { success: true, restarted: true };
           }
           case "agent_command": {
@@ -28029,13 +28308,13 @@ var init_chokidar = __esm({
 });
 
 // ../../oss/packages/daemon-core/src/providers/provider-loader.ts
-var fs6, path10, os10, ProviderLoader;
+var fs6, path10, os12, ProviderLoader;
 var init_provider_loader = __esm({
   "../../oss/packages/daemon-core/src/providers/provider-loader.ts"() {
     "use strict";
     fs6 = __toESM(require("fs"));
     path10 = __toESM(require("path"));
-    os10 = __toESM(require("os"));
+    os12 = __toESM(require("os"));
     init_chokidar();
     init_ide_detector();
     init_logger();
@@ -28056,7 +28335,7 @@ var init_provider_loader = __esm({
       static META_FILE = ".meta.json";
       constructor(options) {
         this.logFn = options?.logFn || LOG.forComponent("Provider").asLogFn();
-        const defaultProvidersDir = path10.join(os10.homedir(), ".adhdev", "providers");
+        const defaultProvidersDir = path10.join(os12.homedir(), ".adhdev", "providers");
         if (options?.userDir) {
           this.userDir = options.userDir;
           this.log(`Config 'providerDir' applied: ${this.userDir}`);
@@ -28656,8 +28935,8 @@ var init_provider_loader = __esm({
             return { updated: false };
           }
           this.log("Downloading latest providers from GitHub...");
-          const tmpTar = path10.join(os10.tmpdir(), `adhdev-providers-${Date.now()}.tar.gz`);
-          const tmpExtract = path10.join(os10.tmpdir(), `adhdev-providers-extract-${Date.now()}`);
+          const tmpTar = path10.join(os12.tmpdir(), `adhdev-providers-${Date.now()}.tar.gz`);
+          const tmpExtract = path10.join(os12.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 });
@@ -29091,7 +29370,7 @@ async function findFreePort(ports) {
 }
 function checkPortFree(port) {
   return new Promise((resolve14) => {
-    const server = net.createServer();
+    const server = net2.createServer();
     server.unref();
     server.on("error", () => resolve14(false));
     server.listen(port, "127.0.0.1", () => {
@@ -29123,7 +29402,7 @@ async function isCdpActive(port) {
   });
 }
 async function killIdeProcess(ideId) {
-  const plat = os11.platform();
+  const plat = os13.platform();
   const appName = getMacAppIdentifiers()[ideId];
   const winProcesses = getWinProcessNames()[ideId];
   try {
@@ -29182,7 +29461,7 @@ async function killIdeProcess(ideId) {
   }
 }
 function isIdeRunning(ideId) {
-  const plat = os11.platform();
+  const plat = os13.platform();
   try {
     if (plat === "darwin") {
       const appName = getMacAppIdentifiers()[ideId];
@@ -29218,7 +29497,7 @@ function isIdeRunning(ideId) {
   }
 }
 function detectCurrentWorkspace(ideId) {
-  const plat = os11.platform();
+  const plat = os13.platform();
   if (plat === "darwin") {
     try {
       const appName = getMacAppIdentifiers()[ideId];
@@ -29238,7 +29517,7 @@ function detectCurrentWorkspace(ideId) {
       const appName = appNameMap[ideId];
       if (appName) {
         const storagePath = path11.join(
-          process.env.APPDATA || path11.join(os11.homedir(), "AppData", "Roaming"),
+          process.env.APPDATA || path11.join(os13.homedir(), "AppData", "Roaming"),
           appName,
           "storage.json"
         );
@@ -29260,7 +29539,7 @@ function detectCurrentWorkspace(ideId) {
   return void 0;
 }
 async function launchWithCdp(options = {}) {
-  const platform10 = os11.platform();
+  const platform11 = os13.platform();
   let targetIde;
   const ides = await detectIDEs();
   if (options.ideId) {
@@ -29329,9 +29608,9 @@ async function launchWithCdp(options = {}) {
   }
   const port = await findFreePort(portPair);
   try {
-    if (platform10 === "darwin") {
+    if (platform11 === "darwin") {
       await launchMacOS(targetIde, port, workspace, options.newWindow);
-    } else if (platform10 === "win32") {
+    } else if (platform11 === "win32") {
       await launchWindows(targetIde, port, workspace, options.newWindow);
     } else {
       await launchLinux(targetIde, port, workspace, options.newWindow);
@@ -29404,13 +29683,13 @@ async function launchLinux(ide, port, workspace, newWindow) {
 function getAvailableIdeIds() {
   return getProviderLoader().getAvailableIdeTypes();
 }
-var import_child_process6, net, os11, path11, _providerLoader;
+var import_child_process6, net2, os13, path11, _providerLoader;
 var init_launch = __esm({
   "../../oss/packages/daemon-core/src/launch.ts"() {
     "use strict";
     import_child_process6 = require("child_process");
-    net = __toESM(require("net"));
-    os11 = __toESM(require("os"));
+    net2 = __toESM(require("net"));
+    os13 = __toESM(require("os"));
     path11 = __toESM(require("path"));
     init_ide_detector();
     init_provider_loader();
@@ -29523,14 +29802,14 @@ function getRecentCommands(count = 50) {
     return [];
   }
 }
-var fs7, path12, os12, LOG_DIR2, MAX_FILE_SIZE, MAX_DAYS, SENSITIVE_KEYS, currentDate2, currentFile, writeCount2, SKIP_COMMANDS;
+var fs7, path12, os14, LOG_DIR2, MAX_FILE_SIZE, MAX_DAYS, SENSITIVE_KEYS, currentDate2, currentFile, writeCount2, SKIP_COMMANDS;
 var init_command_log = __esm({
   "../../oss/packages/daemon-core/src/logging/command-log.ts"() {
     "use strict";
     fs7 = __toESM(require("fs"));
     path12 = __toESM(require("path"));
-    os12 = __toESM(require("os"));
-    LOG_DIR2 = process.platform === "win32" ? path12.join(process.env.LOCALAPPDATA || process.env.APPDATA || path12.join(os12.homedir(), "AppData", "Local"), "adhdev", "logs") : process.platform === "darwin" ? path12.join(os12.homedir(), "Library", "Logs", "adhdev") : path12.join(os12.homedir(), ".local", "share", "adhdev", "logs");
+    os14 = __toESM(require("os"));
+    LOG_DIR2 = process.platform === "win32" ? path12.join(process.env.LOCALAPPDATA || process.env.APPDATA || path12.join(os14.homedir(), "AppData", "Local"), "adhdev", "logs") : process.platform === "darwin" ? path12.join(os14.homedir(), "Library", "Logs", "adhdev") : path12.join(os14.homedir(), ".local", "share", "adhdev", "logs");
     MAX_FILE_SIZE = 5 * 1024 * 1024;
     MAX_DAYS = 7;
     try {
@@ -29671,16 +29950,16 @@ function buildStatusSnapshot(options) {
     version: options.version,
     daemonMode: options.daemonMode,
     machine: {
-      hostname: os13.hostname(),
-      platform: os13.platform(),
-      arch: os13.arch(),
-      cpus: os13.cpus().length,
+      hostname: os15.hostname(),
+      platform: os15.platform(),
+      arch: os15.arch(),
+      cpus: os15.cpus().length,
       totalMem: memSnap.totalMem,
       freeMem: memSnap.freeMem,
       availableMem: memSnap.availableMem,
-      loadavg: os13.loadavg(),
-      uptime: os13.uptime(),
-      release: os13.release()
+      loadavg: os15.loadavg(),
+      uptime: os15.uptime(),
+      release: os15.release()
     },
     machineNickname: options.machineNickname ?? cfg.machineNickname ?? null,
     timestamp: options.timestamp ?? Date.now(),
@@ -29695,11 +29974,11 @@ function buildStatusSnapshot(options) {
     availableProviders: buildAvailableProviders(options.providerLoader)
   };
 }
-var os13, READ_DEBUG_ENABLED;
+var os15, READ_DEBUG_ENABLED;
 var init_snapshot = __esm({
   "../../oss/packages/daemon-core/src/status/snapshot.ts"() {
     "use strict";
-    os13 = __toESM(require("os"));
+    os15 = __toESM(require("os"));
     init_config();
     init_recent_activity();
     init_workspaces();
@@ -29713,7 +29992,7 @@ var init_snapshot = __esm({
 
 // ../../oss/packages/daemon-core/src/commands/upgrade-helper.ts
 function getUpgradeLogPath() {
-  const home = os14.homedir();
+  const home = os16.homedir();
   const dir = path13.join(home, ".adhdev");
   fs8.mkdirSync(dir, { recursive: true });
   return path13.join(dir, "daemon-upgrade.log");
@@ -29753,7 +30032,7 @@ async function waitForPidExit(pid, timeoutMs) {
   }
 }
 function stopSessionHostProcesses(appName) {
-  const pidFile = path13.join(os14.homedir(), ".adhdev", `${appName}-session-host.pid`);
+  const pidFile = path13.join(os16.homedir(), ".adhdev", `${appName}-session-host.pid`);
   try {
     if (fs8.existsSync(pidFile)) {
       const pid = Number.parseInt(fs8.readFileSync(pidFile, "utf8").trim(), 10);
@@ -29782,7 +30061,7 @@ function stopSessionHostProcesses(appName) {
   }
 }
 function removeDaemonPidFile() {
-  const pidFile = path13.join(os14.homedir(), ".adhdev", "daemon.pid");
+  const pidFile = path13.join(os16.homedir(), ".adhdev", "daemon.pid");
   try {
     fs8.unlinkSync(pidFile);
   } catch {
@@ -29887,14 +30166,14 @@ async function maybeRunDaemonUpgradeHelperFromEnv() {
     process.exit(1);
   }
 }
-var import_child_process7, import_child_process8, fs8, os14, path13, UPGRADE_HELPER_ENV;
+var import_child_process7, import_child_process8, fs8, os16, path13, UPGRADE_HELPER_ENV;
 var init_upgrade_helper = __esm({
   "../../oss/packages/daemon-core/src/commands/upgrade-helper.ts"() {
     "use strict";
     import_child_process7 = require("child_process");
     import_child_process8 = require("child_process");
     fs8 = __toESM(require("fs"));
-    os14 = __toESM(require("os"));
+    os16 = __toESM(require("os"));
     path13 = __toESM(require("path"));
     UPGRADE_HELPER_ENV = "ADHDEV_DAEMON_UPGRADE_HELPER";
   }
@@ -31418,7 +31697,7 @@ function getVersion(binary, versionCommand) {
 function checkPathExists2(paths) {
   for (const p of paths) {
     if (p.includes("*")) {
-      const home = os15.homedir();
+      const home = os17.homedir();
       const resolved = p.replace(/\*/g, home.split(path14.sep).pop() || "");
       if (fs10.existsSync(resolved)) return resolved;
     } else {
@@ -31493,16 +31772,16 @@ async function detectAllVersions(loader, archive) {
   }
   return results;
 }
-var fs10, path14, os15, import_child_process9, import_os3, ARCHIVE_PATH, MAX_ENTRIES_PER_PROVIDER, VersionArchive;
+var fs10, path14, os17, import_child_process9, import_os3, ARCHIVE_PATH, MAX_ENTRIES_PER_PROVIDER, VersionArchive;
 var init_version_archive = __esm({
   "../../oss/packages/daemon-core/src/providers/version-archive.ts"() {
     "use strict";
     fs10 = __toESM(require("fs"));
     path14 = __toESM(require("path"));
-    os15 = __toESM(require("os"));
+    os17 = __toESM(require("os"));
     import_child_process9 = require("child_process");
     import_os3 = require("os");
-    ARCHIVE_PATH = path14.join(os15.homedir(), ".adhdev", "version-history.json");
+    ARCHIVE_PATH = path14.join(os17.homedir(), ".adhdev", "version-history.json");
     MAX_ENTRIES_PER_PROVIDER = 20;
     VersionArchive = class {
       history = {};
@@ -34019,7 +34298,7 @@ async function handleAutoImplement(ctx, type, req, res) {
     });
     const referenceScripts = loadAutoImplReferenceScripts(ctx, resolvedReference);
     const prompt = buildAutoImplPrompt(ctx, type, provider, providerDir, functions, domContext, referenceScripts, comment, resolvedReference, verification);
-    const tmpDir = path17.join(os16.tmpdir(), "adhdev-autoimpl");
+    const tmpDir = path17.join(os18.tmpdir(), "adhdev-autoimpl");
     if (!fs13.existsSync(tmpDir)) fs13.mkdirSync(tmpDir, { recursive: true });
     const promptFile = path17.join(tmpDir, `prompt-${type}-${Date.now()}.md`);
     fs13.writeFileSync(promptFile, prompt, "utf-8");
@@ -34173,7 +34452,7 @@ async function handleAutoImplement(ctx, type, req, res) {
     const interactiveFlags = ["--yolo", "--interactive", "-i"];
     const baseArgs = [...spawn5.args || []].filter((a) => !interactiveFlags.includes(a));
     let shellCmd;
-    const isWin = os16.platform() === "win32";
+    const isWin = os18.platform() === "win32";
     const escapeArg = (a) => isWin ? `"${a.replace(/"/g, '""')}"` : `'${a.replace(/'/g, "'\\''")}'`;
     if (command === "claude") {
       const args = [...baseArgs, "--dangerously-skip-permissions"];
@@ -34217,7 +34496,7 @@ async function handleAutoImplement(ctx, type, req, res) {
     try {
       const pty3 = require("node-pty");
       ctx.log(`Auto-implement spawn (PTY): ${shellCmd}`);
-      const isWin2 = os16.platform() === "win32";
+      const isWin2 = os18.platform() === "win32";
       child = pty3.spawn(isWin2 ? "cmd.exe" : process.env.SHELL || "/bin/zsh", [isWin2 ? "/c" : "-c", shellCmd], {
         name: "xterm-256color",
         cols: 120,
@@ -35124,13 +35403,13 @@ data: ${JSON.stringify(msg.data)}
     }
   }
 }
-var fs13, path17, os16;
+var fs13, path17, os18;
 var init_dev_auto_implement = __esm({
   "../../oss/packages/daemon-core/src/daemon/dev-auto-implement.ts"() {
     "use strict";
     fs13 = __toESM(require("fs"));
     path17 = __toESM(require("path"));
-    os16 = __toESM(require("os"));
+    os18 = __toESM(require("os"));
     init_dev_server();
     init_dev_cli_debug();
   }
@@ -36651,141 +36930,6 @@ data: ${JSON.stringify(msg.data)}
   }
 });
 
-// ../../oss/packages/session-host-core/dist/index.mjs
-function getDefaultSessionHostEndpoint(appName = "adhdev") {
-  if (process.platform === "win32") {
-    return {
-      kind: "pipe",
-      path: `\\\\.\\pipe\\${appName}-session-host`
-    };
-  }
-  return {
-    kind: "unix",
-    path: path22.join(os17.tmpdir(), `${appName}-session-host.sock`)
-  };
-}
-function serializeEnvelope(envelope) {
-  return `${JSON.stringify(envelope)}
-`;
-}
-function createLineParser(onEnvelope) {
-  let buffer = "";
-  return (chunk) => {
-    buffer += chunk.toString();
-    let newlineIndex = buffer.indexOf("\n");
-    while (newlineIndex >= 0) {
-      const rawLine = buffer.slice(0, newlineIndex).trim();
-      buffer = buffer.slice(newlineIndex + 1);
-      if (rawLine) {
-        onEnvelope(JSON.parse(rawLine));
-      }
-      newlineIndex = buffer.indexOf("\n");
-    }
-  };
-}
-var os17, path22, net2, import_crypto3, SessionHostClient;
-var init_dist = __esm({
-  "../../oss/packages/session-host-core/dist/index.mjs"() {
-    "use strict";
-    os17 = __toESM(require("os"), 1);
-    path22 = __toESM(require("path"), 1);
-    net2 = __toESM(require("net"), 1);
-    import_crypto3 = require("crypto");
-    SessionHostClient = class {
-      endpoint;
-      socket = null;
-      requestWaiters = /* @__PURE__ */ new Map();
-      eventListeners = /* @__PURE__ */ new Set();
-      constructor(options = {}) {
-        this.endpoint = options.endpoint || getDefaultSessionHostEndpoint(options.appName || "adhdev");
-      }
-      async connect() {
-        if (this.socket && !this.socket.destroyed) return;
-        const socket = net2.createConnection(this.endpoint.path);
-        this.socket = socket;
-        socket.on("data", createLineParser((envelope) => {
-          if (envelope.kind === "response") {
-            const waiter = this.requestWaiters.get(envelope.requestId);
-            if (waiter) {
-              this.requestWaiters.delete(envelope.requestId);
-              waiter.resolve(envelope.response);
-            }
-            return;
-          }
-          if (envelope.kind === "event") {
-            for (const listener of this.eventListeners) listener(envelope.event);
-          }
-        }));
-        socket.on("error", (error48) => {
-          for (const waiter of this.requestWaiters.values()) {
-            waiter.reject(error48);
-          }
-          this.requestWaiters.clear();
-        });
-        await new Promise((resolve14, reject) => {
-          socket.once("connect", () => resolve14());
-          socket.once("error", reject);
-        });
-      }
-      onEvent(listener) {
-        this.eventListeners.add(listener);
-        return () => {
-          this.eventListeners.delete(listener);
-        };
-      }
-      async request(request) {
-        await this.connect();
-        if (!this.socket) throw new Error("Session host socket unavailable");
-        const requestId = (0, import_crypto3.randomUUID)();
-        const envelope = {
-          kind: "request",
-          requestId,
-          request
-        };
-        const response = await new Promise((resolve14, reject) => {
-          const timeout = setTimeout(() => {
-            this.requestWaiters.delete(requestId);
-            reject(new Error(`Session host request timed out after 30s (${request.type})`));
-          }, 3e4);
-          this.requestWaiters.set(requestId, {
-            resolve: (value) => {
-              clearTimeout(timeout);
-              resolve14(value);
-            },
-            reject: (error48) => {
-              clearTimeout(timeout);
-              reject(error48);
-            }
-          });
-          this.socket?.write(serializeEnvelope(envelope));
-        });
-        return response;
-      }
-      async close() {
-        if (!this.socket) return;
-        const socket = this.socket;
-        this.socket = null;
-        for (const waiter of this.requestWaiters.values()) {
-          waiter.reject(new Error("Session host client closed"));
-        }
-        this.requestWaiters.clear();
-        await new Promise((resolve14) => {
-          let settled = false;
-          const done = () => {
-            if (settled) return;
-            settled = true;
-            resolve14();
-          };
-          socket.once("close", done);
-          socket.end();
-          socket.destroy();
-          setTimeout(done, 50);
-        });
-      }
-    };
-  }
-});
-
 // ../../oss/packages/daemon-core/src/cli-adapters/session-host-transport.ts
 var SessionHostRuntimeTransport, SessionHostPtyTransportFactory;
 var init_session_host_transport = __esm({
@@ -38242,17 +38386,17 @@ function canPeerUsePrivilegedShareCommand(commandType, permission) {
       return false;
   }
 }
-var fs15, path19, os18, import_node_module2, esmRequire, logFile, log, logDebug, DaemonP2PSender;
+var fs15, path19, os19, import_node_module2, esmRequire, logFile, log, logDebug, DaemonP2PSender;
 var init_daemon_p2p = __esm({
   "src/daemon-p2p.ts"() {
     "use strict";
     fs15 = __toESM(require("fs"));
     init_src();
     path19 = __toESM(require("path"));
-    os18 = __toESM(require("os"));
+    os19 = __toESM(require("os"));
     import_node_module2 = require("module");
     esmRequire = (0, import_node_module2.createRequire)(__filename);
-    logFile = path19.join(os18.tmpdir(), "adhdev_daemon_p2p.log");
+    logFile = path19.join(os19.tmpdir(), "adhdev_daemon_p2p.log");
     log = (msg) => {
       LOG.info("P2P", `[${(/* @__PURE__ */ new Date()).toISOString()}] [P2P] ${msg}`);
     };
@@ -38315,9 +38459,9 @@ var init_daemon_p2p = __esm({
           log(`node-datachannel not found: ${e?.message}
 ${e?.stack || ""}`);
         }
-        const platform10 = process.platform;
+        const platform11 = process.platform;
         const arch3 = process.arch;
-        const prebuildKey = `${platform10}-${arch3}`;
+        const prebuildKey = `${platform11}-${arch3}`;
         try {
           const candidates = [
             path19.join(__dirname, "node_modules", "node-datachannel"),
@@ -41040,7 +41184,7 @@ var require_sharp = __commonJS({
     if (sharp) {
       module2.exports = sharp;
     } else {
-      const [isLinux2, isMacOs, isWindows2] = ["linux", "darwin", "win32"].map((os22) => runtimePlatform.startsWith(os22));
+      const [isLinux2, isMacOs, isWindows2] = ["linux", "darwin", "win32"].map((os24) => runtimePlatform.startsWith(os24));
       const help = [`Could not load the "sharp" module using the ${runtimePlatform} runtime`];
       errors.forEach((err) => {
         if (err.code !== "MODULE_NOT_FOUND") {
@@ -41057,15 +41201,15 @@ var require_sharp = __commonJS({
           `    Requires ${expected}`
         );
       } else if (prebuiltPlatforms.includes(runtimePlatform)) {
-        const [os22, cpu] = runtimePlatform.split("-");
-        const libc = os22.endsWith("musl") ? " --libc=musl" : "";
+        const [os24, cpu] = runtimePlatform.split("-");
+        const libc = os24.endsWith("musl") ? " --libc=musl" : "";
         help.push(
           "- Ensure optional dependencies can be installed:",
           "    npm install --include=optional sharp",
           "- Ensure your package manager supports multi-platform installation:",
           "    See https://sharp.pixelplumbing.com/install#cross-platform",
           "- Add platform-specific dependencies:",
-          `    npm install --os=${os22.replace("musl", "")}${libc} --cpu=${cpu} sharp`
+          `    npm install --os=${os24.replace("musl", "")}${libc} --cpu=${cpu} sharp`
         );
       } else {
         help.push(
@@ -45806,24 +45950,7 @@ __export(session_host_exports, {
   stopSessionHost: () => stopSessionHost
 });
 function buildSessionHostEnv(baseEnv) {
-  const env = {};
-  for (const [key, value] of Object.entries(baseEnv)) {
-    if (typeof value !== "string") continue;
-    env[key] = value;
-  }
-  for (const key of Object.keys(env)) {
-    if (key === "INIT_CWD" || key === "npm_command" || key === "npm_execpath" || key === "npm_node_execpath" || key.startsWith("npm_") || key.startsWith("npm_config_") || key.startsWith("npm_package_") || key.startsWith("npm_lifecycle_") || key.startsWith("PNPM_") || key.startsWith("YARN_") || key.startsWith("BUN_")) {
-      delete env[key];
-    }
-  }
-  if (!env.NO_COLOR) {
-    if (!env.TERM || env.TERM === "xterm-color") env.TERM = "xterm-256color";
-    if (!env.COLORTERM) env.COLORTERM = "truecolor";
-    if (process.platform === "win32") {
-      if (!env.FORCE_COLOR) env.FORCE_COLOR = "1";
-      if (!env.CLICOLOR) env.CLICOLOR = "1";
-    }
-  }
+  const env = sanitizeSpawnEnv(baseEnv);
   env.ADHDEV_SESSION_HOST_NAME = SESSION_HOST_APP_NAME;
   return env;
 }
@@ -45840,7 +45967,7 @@ function resolveSessionHostEntry() {
   return require.resolve("@adhdev/session-host-daemon");
 }
 function getSessionHostPidFile() {
-  return path20.join(os19.homedir(), ".adhdev", `${SESSION_HOST_APP_NAME}-session-host.pid`);
+  return path20.join(os20.homedir(), ".adhdev", `${SESSION_HOST_APP_NAME}-session-host.pid`);
 }
 function getSessionHostStatusPaths() {
   return {
@@ -45870,6 +45997,35 @@ function killPid2(pid) {
     return false;
   }
 }
+function getWindowsProcessCommandLine(pid) {
+  const pidFilter = `ProcessId=${pid}`;
+  try {
+    const wmicOut = (0, import_child_process11.execFileSync)("wmic", [
+      "process",
+      "where",
+      pidFilter,
+      "get",
+      "CommandLine"
+    ], { encoding: "utf8", timeout: 3e3, stdio: ["ignore", "pipe", "ignore"] });
+    const text = wmicOut.trim();
+    if (text) return text;
+  } catch {
+  }
+  try {
+    const psOut = (0, import_child_process11.execFileSync)("powershell.exe", [
+      "-NoProfile",
+      "-NonInteractive",
+      "-ExecutionPolicy",
+      "Bypass",
+      "-Command",
+      `(Get-CimInstance Win32_Process -Filter "${pidFilter}").CommandLine`
+    ], { encoding: "utf8", timeout: 5e3, stdio: ["ignore", "pipe", "ignore"] });
+    const text = psOut.trim();
+    if (text) return text;
+  } catch {
+  }
+  return null;
+}
 function stopSessionHost() {
   let stopped = false;
   const pidFile = getSessionHostPidFile();
@@ -45887,7 +46043,26 @@ function stopSessionHost() {
     } catch {
     }
   }
-  if (process.platform !== "win32") {
+  if (process.platform === "win32") {
+    try {
+      const raw = (0, import_child_process11.execFileSync)("tasklist", ["/FO", "CSV", "/NH", "/FI", "IMAGENAME eq node.exe"], {
+        encoding: "utf8",
+        timeout: 5e3,
+        stdio: ["ignore", "pipe", "ignore"]
+      }).trim();
+      for (const line of raw.split(/\r?\n/)) {
+        const match = line.match(/^"node\.exe","(\d+)"/i);
+        if (!match) continue;
+        const candidatePid = Number.parseInt(match[1], 10);
+        if (!Number.isFinite(candidatePid) || candidatePid === process.pid) continue;
+        const commandLine = getWindowsProcessCommandLine(candidatePid);
+        if (commandLine?.includes("session-host-daemon")) {
+          stopped = killPid2(candidatePid) || stopped;
+        }
+      }
+    } catch {
+    }
+  } else {
     try {
       const raw = (0, import_child_process11.execFileSync)("pgrep", ["-f", "session-host-daemon"], { encoding: "utf8" }).trim();
       for (const line of raw.split("\n")) {
@@ -45904,13 +46079,20 @@ function stopSessionHost() {
 async function ensureSessionHostReady2() {
   const spawnHost = () => {
     const entry = resolveSessionHostEntry();
+    const logDir = path20.join(os20.homedir(), ".adhdev", "logs");
+    fs16.mkdirSync(logDir, { recursive: true });
+    const logFd = fs16.openSync(path20.join(logDir, "session-host.log"), "a");
     const child = (0, import_child_process11.spawn)(process.execPath, [entry], {
       detached: true,
-      stdio: "ignore",
+      stdio: ["ignore", logFd, logFd],
       windowsHide: true,
       env: buildSessionHostEnv(process.env)
     });
     child.unref();
+    try {
+      fs16.closeSync(logFd);
+    } catch {
+    }
   };
   try {
     return await ensureSessionHostReady({
@@ -45961,13 +46143,13 @@ async function probeSessionHostStatus() {
     };
   }
 }
-var import_child_process11, fs16, os19, path20, SESSION_HOST_APP_NAME, SESSION_HOST_START_TIMEOUT_MS;
+var import_child_process11, fs16, os20, path20, SESSION_HOST_APP_NAME, SESSION_HOST_START_TIMEOUT_MS;
 var init_session_host = __esm({
   "src/session-host.ts"() {
     "use strict";
     import_child_process11 = require("child_process");
     fs16 = __toESM(require("fs"));
-    os19 = __toESM(require("os"));
+    os20 = __toESM(require("os"));
     path20 = __toESM(require("path"));
     init_src();
     init_dist();
@@ -46012,7 +46194,7 @@ __export(adhdev_daemon_exports, {
   stopDaemon: () => stopDaemon
 });
 function getDaemonPidFile() {
-  const dir = path21.join(os20.homedir(), ".adhdev");
+  const dir = path21.join(os21.homedir(), ".adhdev");
   if (!fs17.existsSync(dir)) fs17.mkdirSync(dir, { recursive: true });
   return path21.join(dir, "daemon.pid");
 }
@@ -46060,7 +46242,7 @@ function stopDaemon() {
     return false;
   }
 }
-var os20, fs17, path21, import_http, import_ws3, import_chalk2, pkgVersion, DANGEROUS_PATTERNS, AdhdevDaemon;
+var os21, fs17, path21, import_http, import_ws3, import_chalk2, pkgVersion, DANGEROUS_PATTERNS, AdhdevDaemon;
 var init_adhdev_daemon = __esm({
   "src/adhdev-daemon.ts"() {
     "use strict";
@@ -46070,14 +46252,14 @@ var init_adhdev_daemon = __esm({
     init_screenshot_controller();
     init_session_host();
     init_dist();
-    os20 = __toESM(require("os"));
+    os21 = __toESM(require("os"));
     fs17 = __toESM(require("fs"));
     path21 = __toESM(require("path"));
     import_http = require("http");
     import_ws3 = require("ws");
     import_chalk2 = __toESM(require("chalk"));
     init_version();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.12" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.13" });
     DANGEROUS_PATTERNS = [
       /\brm\s+(-[a-z]*f|-[a-z]*r|--force|--recursive)/i,
       /\bsudo\b/i,
@@ -46214,8 +46396,8 @@ ${err?.stack || ""}`);
             cliInfo: {
               type: "adhdev-daemon",
               version: pkgVersion,
-              platform: os20.platform(),
-              hostname: os20.hostname(),
+              platform: os21.platform(),
+              hostname: os21.hostname(),
               machineId: config2.machineId,
               instanceId
             }
@@ -46824,16 +47006,16 @@ async function loginFlow() {
   let verificationUrl;
   try {
     const config2 = loadConfig();
-    const os22 = await import("os");
+    const os24 = await import("os");
     const res = await fetch(`${SERVER_URL}/auth/cli/init`, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify({
         clientMachineId: config2.machineId,
         registeredMachineId: config2.registeredMachineId,
-        hostname: os22.hostname(),
-        platform: os22.platform(),
-        arch: os22.arch()
+        hostname: os24.hostname(),
+        platform: os24.platform(),
+        arch: os24.arch()
       })
     });
     if (!res.ok) {
@@ -46934,10 +47116,10 @@ async function startDaemonFlow() {
     const { execSync: execSync7 } = await import("child_process");
     const { getCurrentDaemonLogPath: getCurrentDaemonLogPath2 } = await Promise.resolve().then(() => (init_src(), src_exports));
     const logPath = getCurrentDaemonLogPath2();
-    const os22 = await import("os");
-    const platform10 = os22.platform();
+    const os24 = await import("os");
+    const platform11 = os24.platform();
     try {
-      if (platform10 === "win32") {
+      if (platform11 === "win32") {
         execSync7("start /B adhdev daemon >NUL 2>&1", {
           timeout: 3e3,
           stdio: "ignore",
@@ -47703,9 +47885,10 @@ function registerDaemonCommands(program2, pkgVersion3) {
 var import_chalk6 = __toESM(require("chalk"));
 var import_child_process12 = require("child_process");
 var fs18 = __toESM(require("fs"));
-var os21 = __toESM(require("os"));
+var os23 = __toESM(require("os"));
 var path23 = __toESM(require("path"));
 init_src();
+init_session_host();
 function resolvePackageRoot() {
   return path23.resolve(__dirname, "..", "..");
 }
@@ -47754,8 +47937,8 @@ function readLogHints(logPath) {
 function buildBrowseProbeChecks() {
   const probes = process.platform === "win32" ? [
     process.env.SystemDrive ? `${process.env.SystemDrive.replace(/[\\/]+$/, "")}\\` : "C:\\",
-    os21.homedir()
-  ] : ["/", os21.homedir()];
+    os23.homedir()
+  ] : ["/", os23.homedir()];
   return probes.map((probePath, index) => {
     try {
       const entries = fs18.readdirSync(probePath, { withFileTypes: true });
@@ -47810,25 +47993,71 @@ function registerDoctorCommands(program2, pkgVersion3) {
         label: "sharp",
         ok: Boolean(resolveModuleFromPackage("sharp", packageRoot)),
         detail: resolveModuleFromPackage("sharp", packageRoot) || "module not found",
-        fatal: process.platform === "win32"
+        fatal: false
       },
       {
         label: nativeSharpPackage,
         ok: Boolean(resolveModuleFromPackage(nativeSharpPackage, packageRoot)),
         detail: resolveModuleFromPackage(nativeSharpPackage, packageRoot) || "module not found",
-        fatal: process.platform === "win32"
+        fatal: false
       },
       ...buildBrowseProbeChecks()
     ];
+    try {
+      const sessionHostPid = getSessionHostPid();
+      const probe = await probeSessionHostStatus();
+      checks.push({
+        label: "Session host PID",
+        ok: !!sessionHostPid,
+        detail: sessionHostPid ? `PID ${sessionHostPid} (${probe.pidFile})` : `no PID file (${probe.pidFile})`
+      });
+      checks.push({
+        label: "Session host IPC",
+        ok: probe.reachable,
+        detail: probe.reachable ? `reachable (${probe.runtimeCount} runtime(s), ${probe.endpoint.kind}:${probe.endpoint.path})` : `unreachable (${probe.endpoint.kind}:${probe.endpoint.path})`
+      });
+    } catch (e) {
+      checks.push({
+        label: "Session host",
+        ok: false,
+        detail: `probe failed: ${e?.message || String(e)}`
+      });
+    }
+    try {
+      const termScreenMod = require("@adhdev/daemon-core/cli-adapters/terminal-screen.js");
+      if (typeof termScreenMod?.getTerminalBackendRuntimeStatus === "function") {
+        const backendStatus = termScreenMod.getTerminalBackendRuntimeStatus();
+        checks.push({
+          label: "Terminal backend",
+          ok: true,
+          detail: `${backendStatus.backend} (preference=${backendStatus.preference}, ghostty=${backendStatus.ghosttyAvailable})`
+        });
+      }
+    } catch {
+    }
+    try {
+      const providerLoader = new ProviderLoader();
+      const cliResults = await detectCLIs(providerLoader);
+      for (const cli of cliResults) {
+        checks.push({
+          label: `CLI: ${cli.displayName}`,
+          ok: cli.installed,
+          detail: cli.installed ? `${cli.path || cli.command} (v${cli.version || "unknown"})` : `not found (command: ${cli.command})`
+        });
+      }
+    } catch {
+    }
     const failures = checks.filter((check2) => !check2.ok && check2.fatal);
     const warnings = checks.filter((check2) => !check2.ok && !check2.fatal);
     const logHints = readLogHints(logPath);
+    const sessionHostLogPath = path23.join(os23.homedir(), ".adhdev", "logs", "session-host.log");
     console.log(import_chalk6.default.bold("\n\u{1FA7A} ADHDev Doctor\n"));
     console.log(import_chalk6.default.gray(`  Version:   ${pkgVersion3}`));
     console.log(import_chalk6.default.gray(`  Platform:  ${process.platform} ${process.arch}`));
     console.log(import_chalk6.default.gray(`  Node:      ${process.version}`));
-    console.log(import_chalk6.default.gray(`  Home:      ${os21.homedir()}`));
+    console.log(import_chalk6.default.gray(`  Home:      ${os23.homedir()}`));
     console.log(import_chalk6.default.gray(`  Log file:  ${logPath}`));
+    console.log(import_chalk6.default.gray(`  SH log:    ${sessionHostLogPath}`));
     console.log();
     for (const check2 of checks) {
       console.log(formatCheck(check2));
@@ -48085,8 +48314,8 @@ function registerProviderCommands(program2) {
       if (category === "ide") {
         const fs19 = await import("fs");
         const path24 = await import("path");
-        const os22 = await import("os");
-        if (os22.platform() === "darwin") {
+        const os24 = await import("os");
+        if (os24.platform() === "darwin") {
           while (true) {
             const p = (await rl.question(`macOS Application Path (e.g. /Applications/${defaultName}.app): `)).trim() || `/Applications/${defaultName}.app`;
             if (p === "skip") break;
@@ -48100,7 +48329,7 @@ function registerProviderCommands(program2) {
             processNames["darwin"] = path24.basename(p, ".app");
             break;
           }
-        } else if (os22.platform() === "win32") {
+        } else if (os24.platform() === "win32") {
           while (true) {
             const p = (await rl.question(`Windows Executable Path (e.g. C:\\Program Files\\${defaultName}\\${defaultName}.exe): `)).trim();
             if (!p || p === "skip") break;