adhdev 0.8.7 → 0.8.9

package/dist/cli/index.js

@@ -748,6 +748,12 @@ function getLogLevel() {
 function getDateStr() {
   return (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
 }
+function getDaemonLogDir() {
+  return LOG_DIR;
+}
+function getCurrentDaemonLogPath(date5 = /* @__PURE__ */ new Date()) {
+  return path4.join(LOG_DIR, `daemon-${date5.toISOString().slice(0, 10)}.log`);
+}
 function checkDateRotation() {
   const today = getDateStr();
   if (today !== currentDate) {
@@ -37677,6 +37683,8 @@ __export(src_exports, {
   forwardAgentStreamsToIdeInstance: () => forwardAgentStreamsToIdeInstance,
   getAIExtensions: () => getAIExtensions,
   getAvailableIdeIds: () => getAvailableIdeIds,
+  getCurrentDaemonLogPath: () => getCurrentDaemonLogPath,
+  getDaemonLogDir: () => getDaemonLogDir,
   getHostMemorySnapshot: () => getHostMemorySnapshot,
   getLogLevel: () => getLogLevel,
   getRecentActivity: () => getRecentActivity,
@@ -37763,6 +37771,136 @@ var init_src = __esm({
   }
 });
 
+// src/cli/cdp-utils.ts
+var cdp_utils_exports = {};
+__export(cdp_utils_exports, {
+  directCdpEval: () => directCdpEval,
+  sendDaemonCommand: () => sendDaemonCommand
+});
+async function sendDaemonCommand(cmd, args = {}, port = 19222) {
+  const WebSocket4 = (await import("ws")).default;
+  const { DAEMON_WS_PATH: DAEMON_WS_PATH2 } = await Promise.resolve().then(() => (init_src(), src_exports));
+  return new Promise((resolve13, reject) => {
+    const wsUrl = `ws://127.0.0.1:${port}${DAEMON_WS_PATH2 || "/daemon"}`;
+    const ws = new WebSocket4(wsUrl);
+    const requestId = `cli-${Date.now()}`;
+    let commandSent = false;
+    const timeout = setTimeout(() => {
+      ws.close();
+      reject(new Error("Timeout: no response from daemon after 15s"));
+    }, 15e3);
+    const sendCommand = () => {
+      if (commandSent) return;
+      commandSent = true;
+      ws.send(JSON.stringify({
+        type: "ext:command",
+        payload: { command: cmd, args, requestId }
+      }));
+    };
+    ws.on("open", () => {
+      ws.send(JSON.stringify({
+        type: "ext:register",
+        payload: {
+          ideType: "cli-debug",
+          ideVersion: "1.0.0",
+          extensionVersion: "1.0.0",
+          instanceId: `cli-debug-${Date.now()}`,
+          machineId: "cli",
+          workspaceFolders: []
+        }
+      }));
+      setTimeout(() => sendCommand(), 200);
+    });
+    ws.on("message", (data) => {
+      try {
+        const msg = JSON.parse(data.toString());
+        if (msg.type === "daemon:welcome") {
+          sendCommand();
+          return;
+        }
+        if (msg.type === "ext:command_result" && msg.payload?.requestId === requestId || msg.type === "daemon:command_result" || msg.type === "command_result") {
+          clearTimeout(timeout);
+          ws.close();
+          resolve13(msg.payload?.result || msg.payload || msg);
+        }
+      } catch {
+      }
+    });
+    ws.on("error", (e) => {
+      clearTimeout(timeout);
+      reject(new Error(
+        `Cannot connect to local daemon IPC at port ${port}: ${e.message}
+This command needs a running local daemon with IPC enabled. Start with: adhdev daemon`
+      ));
+    });
+    ws.on("close", () => {
+      clearTimeout(timeout);
+    });
+  });
+}
+async function directCdpEval(expression, port = 9222) {
+  const http3 = await import("http");
+  const targets = await new Promise((resolve13, reject) => {
+    http3.get(`http://127.0.0.1:${port}/json`, (res) => {
+      let data = "";
+      res.on("data", (c) => data += c);
+      res.on("end", () => {
+        try {
+          resolve13(JSON.parse(data));
+        } catch {
+          reject(new Error("Invalid JSON"));
+        }
+      });
+    }).on("error", (e) => reject(new Error(`Cannot reach CDP at port ${port}: ${e.message}`)));
+  });
+  const isNonMain = (title) => !title || /extension-output|ADHDev CDP|Debug Console|Output\s*$|Launchpad/i.test(title);
+  const pages = targets.filter((t) => (t.type === "page" || t.type === "Page") && t.webSocketDebuggerUrl);
+  const mainPages = pages.filter((t) => !isNonMain(t.title || ""));
+  const target = (mainPages.length > 0 ? mainPages[0] : pages[0]) || targets[0];
+  if (!target?.webSocketDebuggerUrl) throw new Error("No CDP target found");
+  const WebSocket4 = (await import("ws")).default;
+  return new Promise((resolve13, reject) => {
+    const ws = new WebSocket4(target.webSocketDebuggerUrl);
+    const timeout = setTimeout(() => {
+      ws.close();
+      reject(new Error("CDP timeout"));
+    }, 15e3);
+    let id = 1;
+    ws.on("open", () => {
+      const stripped = expression.replace(/\/\*[\s\S]*?\*\//g, "").trimStart();
+      const isAsync = stripped.startsWith("(async");
+      ws.send(JSON.stringify({
+        id: id++,
+        method: "Runtime.evaluate",
+        params: { expression, returnByValue: true, awaitPromise: isAsync }
+      }));
+    });
+    ws.on("message", (data) => {
+      const msg = JSON.parse(data.toString());
+      if (msg.id) {
+        clearTimeout(timeout);
+        ws.close();
+        if (msg.result?.result?.value !== void 0) {
+          resolve13(msg.result.result.value);
+        } else if (msg.result?.exceptionDetails) {
+          reject(new Error(msg.result.exceptionDetails.text));
+        } else {
+          resolve13(msg.result);
+        }
+      }
+    });
+    ws.on("error", (e) => {
+      clearTimeout(timeout);
+      reject(new Error(`CDP connection failed: ${e.message}`));
+    });
+  });
+}
+var init_cdp_utils = __esm({
+  "src/cli/cdp-utils.ts"() {
+    "use strict";
+  }
+});
+
 // src/server-connection.ts
 var import_ws2, ServerConnection;
 var init_server_connection = __esm({
@@ -39048,7 +39186,10 @@ var init_screenshot_controller = __esm({
 var session_host_exports = {};
 __export(session_host_exports, {
   ensureSessionHostReady: () => ensureSessionHostReady2,
+  getSessionHostPid: () => getSessionHostPid,
+  getSessionHostStatusPaths: () => getSessionHostStatusPaths,
   listHostedCliRuntimes: () => listHostedCliRuntimes2,
+  probeSessionHostStatus: () => probeSessionHostStatus,
   stopSessionHost: () => stopSessionHost
 });
 function buildSessionHostEnv(baseEnv) {
@@ -39080,6 +39221,22 @@ function resolveSessionHostEntry() {
 function getSessionHostPidFile() {
   return path20.join(os20.homedir(), ".adhdev", `${SESSION_HOST_APP_NAME}-session-host.pid`);
 }
+function getSessionHostStatusPaths() {
+  return {
+    pidFile: getSessionHostPidFile(),
+    endpoint: getDefaultSessionHostEndpoint(SESSION_HOST_APP_NAME)
+  };
+}
+function getSessionHostPid() {
+  try {
+    const pidFile = getSessionHostPidFile();
+    if (!fs16.existsSync(pidFile)) return null;
+    const pid = Number.parseInt(fs16.readFileSync(pidFile, "utf8").trim(), 10);
+    return Number.isFinite(pid) ? pid : null;
+  } catch {
+    return null;
+  }
+}
 function killPid2(pid) {
   try {
     if (process.platform === "win32") {
@@ -39156,6 +39313,33 @@ async function ensureSessionHostReady2() {
 async function listHostedCliRuntimes2(endpoint) {
   return listHostedCliRuntimes(endpoint);
 }
+async function probeSessionHostStatus() {
+  const { pidFile, endpoint } = getSessionHostStatusPaths();
+  const pid = getSessionHostPid();
+  const client = new SessionHostClient({ endpoint });
+  try {
+    await client.connect();
+    await client.close();
+    const runtimes = await listHostedCliRuntimes(endpoint);
+    return {
+      pid,
+      pidFile,
+      endpoint,
+      reachable: true,
+      runtimeCount: runtimes.length
+    };
+  } catch {
+    await client.close().catch(() => {
+    });
+    return {
+      pid,
+      pidFile,
+      endpoint,
+      reachable: false,
+      runtimeCount: 0
+    };
+  }
+}
 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"() {
@@ -39165,6 +39349,7 @@ var init_session_host = __esm({
     os20 = __toESM(require("os"));
     path20 = __toESM(require("path"));
     init_src();
+    init_dist();
     SESSION_HOST_APP_NAME = process.env.ADHDEV_SESSION_HOST_NAME || "adhdev";
     SESSION_HOST_START_TIMEOUT_MS = 15e3;
   }
@@ -39174,6 +39359,7 @@ var init_session_host = __esm({
 var adhdev_daemon_exports = {};
 __export(adhdev_daemon_exports, {
   AdhdevDaemon: () => AdhdevDaemon,
+  getDaemonPid: () => getDaemonPid,
   isDaemonRunning: () => isDaemonRunning,
   stopDaemon: () => stopDaemon
 });
@@ -39203,6 +39389,16 @@ function isDaemonRunning() {
     return false;
   }
 }
+function getDaemonPid() {
+  const pidFile = getDaemonPidFile();
+  try {
+    if (!fs17.existsSync(pidFile)) return null;
+    const pid = parseInt(fs17.readFileSync(pidFile, "utf-8").trim(), 10);
+    return Number.isFinite(pid) ? pid : null;
+  } catch {
+    return null;
+  }
+}
 function stopDaemon() {
   const pidFile = getDaemonPidFile();
   try {
@@ -39216,7 +39412,7 @@ function stopDaemon() {
     return false;
   }
 }
-var os21, fs17, path21, 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";
@@ -39229,8 +39425,10 @@ var init_adhdev_daemon = __esm({
     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"));
-    pkgVersion = "0.8.7";
+    pkgVersion = "0.8.9";
     if (pkgVersion === "unknown") {
       try {
         const possiblePaths = [
@@ -39263,6 +39461,9 @@ var init_adhdev_daemon = __esm({
       /\b:\/\)\s*\{/
     ];
     AdhdevDaemon = class {
+      localHttpServer = null;
+      localWss = null;
+      localClients = /* @__PURE__ */ new Set();
       serverConn = null;
       p2p = null;
       screenshotController = null;
@@ -39290,11 +39491,7 @@ var init_adhdev_daemon = __esm({
         return mode === "chat" || mode === "terminal";
       }
       async start(options = {}) {
-        try {
-          const { installGlobalInterceptor: installGlobalInterceptor2 } = require("./logging/logger");
-          installGlobalInterceptor2();
-        } catch {
-        }
+        installGlobalInterceptor();
         process.on("uncaughtException", (err) => {
           LOG.error("Daemon", `Uncaught exception: ${err?.message}
 ${err?.stack || ""}`);
@@ -39370,6 +39567,7 @@ ${err?.stack || ""}`);
             }
           });
           await this.components.cliManager.restoreHostedSessions();
+          await this.startLocalIpcServer();
           this.components.providerLoader.fetchLatest().then(({ updated }) => {
             if (updated) {
               this.components.providerLoader.reload();
@@ -39526,6 +39724,7 @@ ${err?.stack || ""}`);
         const cdpManagers = this.components?.cdpManagers;
         const cdpStatus = cdpManagers && cdpManagers.size > 0 ? `\u2705 ${[...cdpManagers.entries()].map(([k, m]) => `${k}:${m.getPort()}`).join(", ")}` : "\u274C not connected";
         console.log(`  ${import_chalk2.default.bold("CDP:")}     ${cdpStatus}`);
+        console.log(`  ${import_chalk2.default.bold("IPC:")}     ${import_chalk2.default.cyan(`ws://127.0.0.1:${this.localPort}${DAEMON_WS_PATH}`)}`);
         console.log(`  ${import_chalk2.default.bold("P2P:")}     ${this.p2p?.isAvailable ? "\u2705 available" : "\u274C unavailable"}`);
         const providerCount = this.components?.providerLoader.getAll().length ?? 0;
         console.log(`  ${import_chalk2.default.bold("Providers:")} ${providerCount > 0 ? `\u2705 ${providerCount} loaded` : "\u274C not loaded"}`);
@@ -39642,6 +39841,135 @@ ${err?.stack || ""}`);
           return { success: false, error: e.message };
         }
       }
+      async startLocalIpcServer() {
+        if (this.localHttpServer || this.localWss) return;
+        this.localHttpServer = (0, import_http.createServer)((req, res) => {
+          const url2 = req.url || "/";
+          if (req.method === "GET" && url2 === "/health") {
+            res.writeHead(200, { "Content-Type": "application/json" });
+            res.end(JSON.stringify({
+              ok: true,
+              pid: process.pid,
+              wsPath: DAEMON_WS_PATH,
+              port: this.localPort
+            }));
+            return;
+          }
+          res.writeHead(404, { "Content-Type": "application/json" });
+          res.end(JSON.stringify({ error: "Not found" }));
+        });
+        this.localWss = new import_ws3.WebSocketServer({ noServer: true });
+        this.localWss.on("connection", (ws) => this.handleLocalIpcConnection(ws));
+        this.localHttpServer.on("upgrade", (req, socket, head) => {
+          const wsUrl = new URL(req.url || "/", `http://${req.headers.host || "127.0.0.1"}`);
+          if (wsUrl.pathname !== DAEMON_WS_PATH) {
+            socket.write("HTTP/1.1 404 Not Found\r\n\r\n");
+            socket.destroy();
+            return;
+          }
+          this.localWss.handleUpgrade(req, socket, head, (ws) => {
+            this.localWss.emit("connection", ws, req);
+          });
+        });
+        await new Promise((resolve13, reject) => {
+          const cleanup = () => {
+            this.localHttpServer?.off("error", onError);
+            this.localHttpServer?.off("listening", onListening);
+          };
+          const onError = (error48) => {
+            cleanup();
+            reject(error48);
+          };
+          const onListening = () => {
+            cleanup();
+            resolve13();
+          };
+          this.localHttpServer.once("error", onError);
+          this.localHttpServer.once("listening", onListening);
+          this.localHttpServer.listen(this.localPort, "127.0.0.1");
+        });
+        LOG.info("IPC", `Local IPC listening on ws://127.0.0.1:${this.localPort}${DAEMON_WS_PATH}`);
+      }
+      handleLocalIpcConnection(ws) {
+        this.localClients.add(ws);
+        this.sendLocalIpcWelcome(ws);
+        ws.on("message", (raw) => {
+          void this.handleLocalIpcMessage(ws, raw.toString());
+        });
+        ws.on("close", () => {
+          this.localClients.delete(ws);
+        });
+        ws.on("error", () => {
+          this.localClients.delete(ws);
+        });
+      }
+      sendLocalIpcWelcome(ws) {
+        try {
+          const cliAgents = this.components ? this.components.instanceManager.collectAllStates().filter((state) => state?.category === "cli").map((state) => String(state?.instanceId || "")).filter(Boolean) : [];
+          ws.send(JSON.stringify({
+            type: "daemon:welcome",
+            payload: {
+              daemonVersion: pkgVersion,
+              serverConnected: this.serverConn?.isConnected() ?? false,
+              cdpConnected: (this.components?.cdpManagers.size || 0) > 0,
+              localPort: this.localPort,
+              cliAgents
+            }
+          }));
+        } catch (error48) {
+          LOG.warn("IPC", `Failed to send welcome: ${error48?.message || error48}`);
+        }
+      }
+      async handleLocalIpcMessage(ws, raw) {
+        let msg;
+        try {
+          msg = JSON.parse(raw);
+        } catch {
+          return;
+        }
+        if (!msg || typeof msg !== "object") return;
+        if (msg.type === "ext:register") {
+          this.sendLocalIpcWelcome(ws);
+          return;
+        }
+        if (msg.type !== "ext:command") return;
+        const payload = msg.payload && typeof msg.payload === "object" ? msg.payload : {};
+        const command = typeof payload.command === "string" ? payload.command : "";
+        const args = payload.args && typeof payload.args === "object" ? payload.args : {};
+        const requestId = typeof payload.requestId === "string" ? payload.requestId : typeof payload.messageId === "string" ? payload.messageId : `ipc-${Date.now()}`;
+        if (!command) {
+          ws.send(JSON.stringify({
+            type: "ext:command_result",
+            payload: {
+              requestId,
+              success: false,
+              error: "command required"
+            }
+          }));
+          return;
+        }
+        try {
+          const result = await this.components.router.execute(command, args, "ipc");
+          ws.send(JSON.stringify({
+            type: "ext:command_result",
+            payload: {
+              requestId,
+              success: !!result?.success,
+              result,
+              error: result?.success ? void 0 : result?.error
+            }
+          }));
+        } catch (error48) {
+          ws.send(JSON.stringify({
+            type: "ext:command_result",
+            payload: {
+              requestId,
+              success: false,
+              error: error48?.message || String(error48)
+            }
+          }));
+        }
+      }
       // ─── executeDaemonCommand / stopIde: Removed — now in DaemonCommandRouter ───
       sendResult(msg, success2, extra) {
         if (!msg.id) return;
@@ -39682,6 +40010,23 @@ ${err?.stack || ""}`);
           this.serverConn?.disconnect();
         } catch {
         }
+        try {
+          for (const client of this.localClients) {
+            client.close();
+          }
+          this.localClients.clear();
+          this.localWss?.close();
+          this.localWss = null;
+          await new Promise((resolve13) => {
+            if (!this.localHttpServer) {
+              resolve13();
+              return;
+            }
+            this.localHttpServer.close(() => resolve13());
+            this.localHttpServer = null;
+          });
+        } catch {
+        }
         removeDaemonPid();
         console.log(import_chalk2.default.green("  \u2713 ADHDev Daemon stopped.\n"));
         if (exitProcess) {
@@ -39821,11 +40166,12 @@ async function quickSetup() {
   console.log(`  ${import_chalk3.default.bold("Status:")}  ${loginResult ? import_chalk3.default.green("Ready to connect") : import_chalk3.default.yellow("Login required")}`);
   console.log();
   console.log(import_chalk3.default.gray("  Next steps:"));
-  console.log(import_chalk3.default.gray(`    ${loginResult ? "adhdev daemon              \u2014 Start the main daemon (required for all features)" : "adhdev setup               \u2014 Sign in to finish setup and enable the daemon"}`));
+  console.log(import_chalk3.default.gray(`    ${loginResult ? "adhdev daemon              \u2014 Start the main daemon (IDE / remote features)" : "adhdev setup               \u2014 Sign in to finish setup and enable the daemon"}`));
   console.log(import_chalk3.default.gray("    adhdev launch cursor       \u2014 Launch Cursor IDE with remote control"));
   console.log(import_chalk3.default.gray("    adhdev launch windsurf     \u2014 Launch Windsurf IDE with remote control"));
-  console.log(import_chalk3.default.gray("    adhdev launch gemini       \u2014 Start Gemini CLI agent via daemon"));
-  console.log(import_chalk3.default.gray("    adhdev launch claude       \u2014 Start Claude Code agent via daemon"));
+  console.log(import_chalk3.default.gray("    adhdev daemon              \u2014 Keep the daemon running for CLI agent launch"));
+  console.log(import_chalk3.default.gray("    adhdev launch gemini       \u2014 Start Gemini CLI agent"));
+  console.log(import_chalk3.default.gray("    adhdev launch claude       \u2014 Start Claude Code agent"));
   console.log(import_chalk3.default.gray("    adhdev status              \u2014 Check setup status"));
   console.log();
   console.log(import_chalk3.default.cyan("  Dashboard: https://adhf.dev/dashboard"));
@@ -39956,19 +40302,19 @@ async function startDaemonFlow() {
     const { AdhdevDaemon: AdhdevDaemon2 } = await Promise.resolve().then(() => (init_adhdev_daemon(), adhdev_daemon_exports));
     const daemon = new AdhdevDaemon2();
     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 path23 = await import("path");
-    const logPath = path23.join(os22.homedir(), ".adhdev", "daemon.log");
     const platform11 = os22.platform();
     try {
       if (platform11 === "win32") {
-        execSync7(`start /B adhdev daemon > "${logPath}" 2>&1`, {
+        execSync7("start /B adhdev daemon >NUL 2>&1", {
           timeout: 3e3,
           stdio: "ignore",
           shell: "cmd.exe"
         });
       } else {
-        execSync7(`nohup adhdev daemon > "${logPath}" 2>&1 &`, {
+        execSync7("nohup adhdev daemon >/dev/null 2>&1 &", {
           timeout: 3e3,
           stdio: "ignore"
         });
@@ -40016,7 +40362,7 @@ async function installCliOnly() {
   console.log(import_chalk3.default.gray("  The `adhdev` command lets you:"));
   console.log(import_chalk3.default.gray("  \u2022 Start the main daemon   (adhdev daemon)"));
   console.log(import_chalk3.default.gray("  \u2022 Launch IDE with CDP     (adhdev launch <ide>)"));
-  console.log(import_chalk3.default.gray("  \u2022 Start CLI agents        (adhdev launch <agent>)"));
+  console.log(import_chalk3.default.gray("  \u2022 Start CLI agents        (adhdev daemon && adhdev launch <agent>)"));
   console.log(import_chalk3.default.gray("  \u2022 Check setup status      (adhdev status)"));
   console.log();
   if (currentVersion) {
@@ -40112,124 +40458,6 @@ ${import_chalk3.default.cyan("\u255A\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u
   }
 });
 
-// src/cli/cdp-utils.ts
-var cdp_utils_exports = {};
-__export(cdp_utils_exports, {
-  directCdpEval: () => directCdpEval,
-  sendDaemonCommand: () => sendDaemonCommand
-});
-async function sendDaemonCommand(cmd, args = {}, port = 19222) {
-  const WebSocket3 = (await import("ws")).default;
-  const { DAEMON_WS_PATH: DAEMON_WS_PATH2 } = await Promise.resolve().then(() => (init_src(), src_exports));
-  return new Promise((resolve13, reject) => {
-    const wsUrl = `ws://127.0.0.1:${port}${DAEMON_WS_PATH2 || "/daemon"}`;
-    const ws = new WebSocket3(wsUrl);
-    const timeout = setTimeout(() => {
-      ws.close();
-      reject(new Error("Timeout: no response from daemon after 15s"));
-    }, 15e3);
-    ws.on("open", () => {
-      ws.send(JSON.stringify({
-        type: "ext:register",
-        payload: {
-          ideType: "cli-debug",
-          ideVersion: "1.0.0",
-          extensionVersion: "1.0.0",
-          instanceId: `cli-debug-${Date.now()}`,
-          machineId: "cli"
-        }
-      }));
-      setTimeout(() => {
-        ws.send(JSON.stringify({
-          type: "ext:command",
-          payload: { command: cmd, args, messageId: `cli-${Date.now()}` }
-        }));
-      }, 200);
-    });
-    ws.on("message", (data) => {
-      try {
-        const msg = JSON.parse(data.toString());
-        if (msg.type === "daemon:command_result" || msg.type === "command_result") {
-          clearTimeout(timeout);
-          ws.close();
-          resolve13(msg.payload?.result || msg.payload || msg);
-        }
-      } catch {
-      }
-    });
-    ws.on("error", (e) => {
-      clearTimeout(timeout);
-      reject(new Error(`Cannot connect to daemon at port ${port}: ${e.message}
-Is 'adhdev daemon' running?`));
-    });
-    ws.on("close", () => {
-      clearTimeout(timeout);
-    });
-  });
-}
-async function directCdpEval(expression, port = 9222) {
-  const http3 = await import("http");
-  const targets = await new Promise((resolve13, reject) => {
-    http3.get(`http://127.0.0.1:${port}/json`, (res) => {
-      let data = "";
-      res.on("data", (c) => data += c);
-      res.on("end", () => {
-        try {
-          resolve13(JSON.parse(data));
-        } catch {
-          reject(new Error("Invalid JSON"));
-        }
-      });
-    }).on("error", (e) => reject(new Error(`Cannot reach CDP at port ${port}: ${e.message}`)));
-  });
-  const isNonMain = (title) => !title || /extension-output|ADHDev CDP|Debug Console|Output\s*$|Launchpad/i.test(title);
-  const pages = targets.filter((t) => (t.type === "page" || t.type === "Page") && t.webSocketDebuggerUrl);
-  const mainPages = pages.filter((t) => !isNonMain(t.title || ""));
-  const target = (mainPages.length > 0 ? mainPages[0] : pages[0]) || targets[0];
-  if (!target?.webSocketDebuggerUrl) throw new Error("No CDP target found");
-  const WebSocket3 = (await import("ws")).default;
-  return new Promise((resolve13, reject) => {
-    const ws = new WebSocket3(target.webSocketDebuggerUrl);
-    const timeout = setTimeout(() => {
-      ws.close();
-      reject(new Error("CDP timeout"));
-    }, 15e3);
-    let id = 1;
-    ws.on("open", () => {
-      const stripped = expression.replace(/\/\*[\s\S]*?\*\//g, "").trimStart();
-      const isAsync = stripped.startsWith("(async");
-      ws.send(JSON.stringify({
-        id: id++,
-        method: "Runtime.evaluate",
-        params: { expression, returnByValue: true, awaitPromise: isAsync }
-      }));
-    });
-    ws.on("message", (data) => {
-      const msg = JSON.parse(data.toString());
-      if (msg.id) {
-        clearTimeout(timeout);
-        ws.close();
-        if (msg.result?.result?.value !== void 0) {
-          resolve13(msg.result.result.value);
-        } else if (msg.result?.exceptionDetails) {
-          reject(new Error(msg.result.exceptionDetails.text));
-        } else {
-          resolve13(msg.result);
-        }
-      }
-    });
-    ws.on("error", (e) => {
-      clearTimeout(timeout);
-      reject(new Error(`CDP connection failed: ${e.message}`));
-    });
-  });
-}
-var init_cdp_utils = __esm({
-  "src/cli/cdp-utils.ts"() {
-    "use strict";
-  }
-});
-
 // ../../oss/packages/web-core/src/constants/supported.ts
 var supported_exports = {};
 __export(supported_exports, {
@@ -40281,12 +40509,13 @@ init_src();
 
 // src/cli/setup-commands.ts
 var import_chalk4 = __toESM(require("chalk"));
+init_cdp_utils();
 function registerSetupCommands(program2, providerLoader) {
   program2.command("setup").description("Run the interactive setup wizard (detect IDEs, login)").option("-f, --force", "Force re-run setup even if already configured").action(async (options) => {
     const { runWizard: runWizard2 } = await Promise.resolve().then(() => (init_wizard(), wizard_exports));
     await runWizard2({ force: options.force });
   });
-  program2.command("launch [target]").description("Launch IDE with CDP or start CLI agent (e.g. cursor, gemini, claude)").option("-w, --workspace <path>", "Workspace directory to open").option("-n, --new-window", "Open in a new window").option("-d, --dir <path>", "Working directory for CLI agent", process.cwd()).action(async (targetArg, options) => {
+  program2.command("launch [target]").description("Launch IDE with CDP or start CLI agent").option("-w, --workspace <path>", "Workspace directory to open").option("-n, --new-window", "Open in a new window").option("-d, --dir <path>", "Working directory for CLI agent", process.cwd()).action(async (targetArg, options) => {
     const {
       detectIDEs: detectIDEs2,
       detectCLIs: detectCLIs2,
@@ -40301,35 +40530,7 @@ function registerSetupCommands(program2, providerLoader) {
       const spinner2 = ora3.default(`Launching ${targetArg}...`).start();
       try {
         const { isDaemonRunning: isDaemonRunning2 } = await Promise.resolve().then(() => (init_adhdev_daemon(), adhdev_daemon_exports));
-        if (isDaemonRunning2()) {
-          const devServerPort = 19280;
-          const body = JSON.stringify({
-            type: cliType,
-            workingDir: require("path").resolve(workingDir)
-          });
-          const res = await fetch(`http://127.0.0.1:${devServerPort}/api/cli/launch`, {
-            method: "POST",
-            headers: { "Content-Type": "application/json" },
-            body
-          });
-          const result = await res.json();
-          spinner2.stop();
-          if (!result?.launched) {
-            console.log(import_chalk4.default.red(`
-\u2717 ${result?.error || "Launch failed"}
-`));
-            process.exit(1);
-          }
-          console.log();
-          console.log(import_chalk4.default.bold(`  \u{1F680} CLI Agent Launched
-`));
-          console.log(`  ${import_chalk4.default.bold("Agent:")}  ${targetArg} (${cliType})`);
-          console.log(`  ${import_chalk4.default.bold("Dir:")}    ${workingDir}`);
-          console.log(`  ${import_chalk4.default.bold("Mode:")}   via running daemon`);
-          console.log();
-          console.log(import_chalk4.default.gray("  Open dashboard: https://adhf.dev/dashboard"));
-          console.log();
-        } else {
+        if (!isDaemonRunning2()) {
           spinner2.stop();
           console.log(import_chalk4.default.yellow(`
   \u26A0 Daemon not running. Start with 'adhdev daemon' first.
@@ -40337,14 +40538,35 @@ function registerSetupCommands(program2, providerLoader) {
           console.log(import_chalk4.default.gray("  Then run: adhdev launch " + targetArg));
           process.exit(1);
         }
+        const resolvedDir = require("path").resolve(workingDir);
+        const result = await sendDaemonCommand("launch_cli", {
+          cliType,
+          dir: resolvedDir
+        });
+        spinner2.stop();
+        if (!result?.success) {
+          console.log(import_chalk4.default.red(`
+\u2717 ${result?.error || "Launch failed"}
+`));
+          process.exit(1);
+        }
+        console.log();
+        console.log(import_chalk4.default.bold(`  \u{1F680} CLI Agent Launched
+`));
+        console.log(`  ${import_chalk4.default.bold("Agent:")}  ${targetArg} (${cliType})`);
+        console.log(`  ${import_chalk4.default.bold("Dir:")}    ${result?.dir || resolvedDir}`);
+        console.log(`  ${import_chalk4.default.bold("Mode:")}   via running daemon`);
+        if (result?.sessionId) {
+          console.log(`  ${import_chalk4.default.bold("Session:")} ${result.sessionId}`);
+        }
+        console.log();
+        console.log(import_chalk4.default.gray("  Open dashboard: https://adhf.dev/dashboard"));
+        console.log();
       } catch (e) {
         spinner2.stop();
         console.log(import_chalk4.default.red(`
 \u2717 Launch failed: ${e?.message || e}
 `));
-        if (e?.cause?.code === "ECONNREFUSED") {
-          console.log(import_chalk4.default.gray("  Is the daemon running with --dev? (adhdev daemon --dev)"));
-        }
         process.exit(1);
       }
       return;
@@ -40436,6 +40658,8 @@ function registerSetupCommands(program2, providerLoader) {
   });
   program2.command("status").description("Show current ADHDev setup status").action(async () => {
     const { loadConfig: loadConfig2, detectIDEs: detectIDEs2, detectCLIs: detectCLIs2 } = await Promise.resolve().then(() => (init_src(), src_exports));
+    const { isDaemonRunning: isDaemonRunning2, getDaemonPid: getDaemonPid2 } = await Promise.resolve().then(() => (init_adhdev_daemon(), adhdev_daemon_exports));
+    const { probeSessionHostStatus: probeSessionHostStatus2 } = await Promise.resolve().then(() => (init_session_host(), session_host_exports));
     const config2 = loadConfig2();
     const hasMachineSecret = Boolean(config2.machineSecret && config2.machineSecret.trim());
     console.log(import_chalk4.default.bold("\n\u{1F9A6} ADHDev Status\n"));
@@ -40451,11 +40675,12 @@ function registerSetupCommands(program2, providerLoader) {
       return;
     }
     const ideList = config2.configuredIdes?.length ? config2.configuredIdes : config2.selectedIde ? [config2.selectedIde] : [];
+    const visibleIdeList = ideList.filter((ideId) => ideId !== "daemon");
     console.log(`  ${import_chalk4.default.bold("Status:")}       ${import_chalk4.default.green("\u2713 Configured")}`);
-    if (ideList.length > 0) {
+    if (visibleIdeList.length > 0) {
       const ides = await detectIDEs2();
       console.log(`  ${import_chalk4.default.bold("IDEs:")}`);
-      for (const ideId of ideList) {
+      for (const ideId of visibleIdeList) {
         const ide = ides.find((i) => i.id === ideId);
         if (ide?.installed) {
           const ver = ide.version ? import_chalk4.default.gray(` v${ide.version}`) : "";
@@ -40464,6 +40689,8 @@ function registerSetupCommands(program2, providerLoader) {
           console.log(`    ${import_chalk4.default.yellow("?")} ${ideId}`);
         }
       }
+    } else {
+      console.log(`  ${import_chalk4.default.bold("IDEs:")}         ${import_chalk4.default.gray("auto-detect at runtime")}`);
     }
     const clis = await detectCLIs2(providerLoader);
     const installedClis = clis.filter((c) => c.installed);
@@ -40478,6 +40705,32 @@ function registerSetupCommands(program2, providerLoader) {
     config2.installedExtensions.forEach((ext) => {
       console.log(import_chalk4.default.gray(`                 \u2022 ${ext}`));
     });
+    const daemonRunning = isDaemonRunning2();
+    console.log(`  ${import_chalk4.default.bold("Daemon:")}       ${daemonRunning ? import_chalk4.default.green(`running (PID ${getDaemonPid2() ?? "unknown"})`) : import_chalk4.default.gray("not running")}`);
+    if (daemonRunning) {
+      try {
+        const controller = new AbortController();
+        const timer = setTimeout(() => controller.abort(), 1500);
+        const res = await fetch("http://127.0.0.1:19222/health", { signal: controller.signal });
+        clearTimeout(timer);
+        if (res.ok) {
+          const data = await res.json();
+          console.log(import_chalk4.default.gray(`                 Local IPC ${data.port}${data.wsPath}`));
+        } else {
+          console.log(import_chalk4.default.gray("                 Local IPC unavailable"));
+        }
+      } catch {
+        console.log(import_chalk4.default.gray("                 Local IPC unavailable"));
+      }
+    }
+    try {
+      const sessionHost = await probeSessionHostStatus2();
+      const sessionHostLabel = sessionHost.reachable ? `reachable (${sessionHost.runtimeCount} active runtime${sessionHost.runtimeCount === 1 ? "" : "s"})` : "not reachable";
+      console.log(`  ${import_chalk4.default.bold("Session Host:")} ${sessionHostLabel}`);
+      console.log(import_chalk4.default.gray(`                 PID ${sessionHost.pid ?? "unknown"} \u2022 ${sessionHost.endpoint.path}`));
+    } catch {
+      console.log(`  ${import_chalk4.default.bold("Session Host:")} ${import_chalk4.default.gray("status unavailable")}`);
+    }
     console.log(`  ${import_chalk4.default.bold("User:")}         ${config2.userEmail || import_chalk4.default.gray("not logged in")}`);
     console.log(`  ${import_chalk4.default.bold("Server:")}       ${config2.serverUrl}`);
     console.log(`  ${import_chalk4.default.bold("Setup date:")}   ${config2.setupDate || "unknown"}`);
@@ -40630,11 +40883,56 @@ function registerDaemonCommands(program2, pkgVersion3) {
     });
   });
   hideCommand(program2.command("daemon:status").description("Check ADHDev Daemon status").action(async () => {
-    const { isDaemonRunning: isDaemonRunning2 } = await Promise.resolve().then(() => (init_adhdev_daemon(), adhdev_daemon_exports));
+    const { isDaemonRunning: isDaemonRunning2, getDaemonPid: getDaemonPid2 } = await Promise.resolve().then(() => (init_adhdev_daemon(), adhdev_daemon_exports));
+    const { getCurrentDaemonLogPath: getCurrentDaemonLogPath2 } = await Promise.resolve().then(() => (init_src(), src_exports));
+    const { probeSessionHostStatus: probeSessionHostStatus2 } = await Promise.resolve().then(() => (init_session_host(), session_host_exports));
     if (isDaemonRunning2()) {
       console.log(import_chalk5.default.green(`
   \u2713 ADHDev Daemon is running.
 `));
+      console.log(import_chalk5.default.gray(`  PID:       ${getDaemonPid2() ?? "unknown"}`));
+      console.log(import_chalk5.default.gray(`  Logs:      ${getCurrentDaemonLogPath2()}`));
+      try {
+        const controller = new AbortController();
+        const timer = setTimeout(() => controller.abort(), 1500);
+        const res = await fetch("http://127.0.0.1:19222/health", { signal: controller.signal });
+        clearTimeout(timer);
+        if (res.ok) {
+          const data = await res.json();
+          console.log(import_chalk5.default.gray(`  Local IPC: reachable (ws://127.0.0.1:${data.port}${data.wsPath})`));
+        } else {
+          console.log(import_chalk5.default.gray("  Local IPC: not reachable"));
+        }
+      } catch {
+        console.log(import_chalk5.default.gray("  Local IPC: not reachable"));
+      }
+      try {
+        const sessionHost = await probeSessionHostStatus2();
+        console.log(import_chalk5.default.gray(
+          `  SessionHost: ${sessionHost.reachable ? `reachable (${sessionHost.runtimeCount} active runtime${sessionHost.runtimeCount === 1 ? "" : "s"})` : "not reachable"}`
+        ));
+        console.log(import_chalk5.default.gray(`  Session IPC: ${sessionHost.endpoint.path}`));
+        console.log(import_chalk5.default.gray(`  Session PID: ${sessionHost.pid ?? "unknown"}`));
+      } catch {
+        console.log(import_chalk5.default.gray("  SessionHost: status unavailable"));
+      }
+      try {
+        const controller = new AbortController();
+        const timer = setTimeout(() => controller.abort(), 1500);
+        const res = await fetch("http://127.0.0.1:19280/api/status", { signal: controller.signal });
+        clearTimeout(timer);
+        if (res.ok) {
+          const data = await res.json();
+          const cdpCount = data?.cdp ? Object.keys(data.cdp).length : 0;
+          const providerCount = Array.isArray(data?.providers) ? data.providers.length : 0;
+          console.log(import_chalk5.default.gray(`  DevServer: reachable (${cdpCount} CDP, ${providerCount} providers)`));
+        } else {
+          console.log(import_chalk5.default.gray("  DevServer: not reachable"));
+        }
+      } catch {
+        console.log(import_chalk5.default.gray("  DevServer: not reachable (run `adhdev daemon --dev` for local debug APIs)"));
+      }
+      console.log();
     } else {
       console.log(import_chalk5.default.gray(`
   \u2717 ADHDev Daemon is not running.`));
@@ -40680,7 +40978,8 @@ function registerDaemonCommands(program2, pkgVersion3) {
       console.log(import_chalk5.default.green(`  \u2713 ADHDev Daemon restarted (PID: ${child.pid})
 `));
     } else {
-      console.log(import_chalk5.default.red(`  \u2717 Daemon failed to start. Check logs: ~/.adhdev/daemon.log
+      const { getCurrentDaemonLogPath: getCurrentDaemonLogPath2 } = await Promise.resolve().then(() => (init_src(), src_exports));
+      console.log(import_chalk5.default.red(`  \u2717 Daemon failed to start. Check logs: ${getCurrentDaemonLogPath2()}
 `));
       process.exit(1);
     }
@@ -40945,7 +41244,7 @@ function registerProviderCommands(program2) {
               }
             });
           });
-          req.on("error", () => reject(new Error("Daemon not reachable. Is adhdev daemon running?")));
+          req.on("error", () => reject(new Error("Provider reload failed: neither daemon IPC nor DevServer is reachable. Start with `adhdev daemon` (or `adhdev daemon --dev` for provider dev APIs).")));
           req.write("{}");
           req.end();
         });
@@ -41810,8 +42109,8 @@ function registerCdpCommands(program2) {
       const mainPages = pages.filter((t) => !isNonMain(t.title || ""));
       const target = (mainPages.length > 0 ? mainPages[0] : pages[0]) || targets[0];
       if (!target?.webSocketDebuggerUrl) throw new Error("No CDP target");
-      const WebSocket3 = (await import("ws")).default;
-      const ws = new WebSocket3(target.webSocketDebuggerUrl);
+      const WebSocket4 = (await import("ws")).default;
+      const ws = new WebSocket4(target.webSocketDebuggerUrl);
       await new Promise((resolve13, reject) => {
         ws.on("open", () => {
           ws.send(JSON.stringify({ id: 1, method: "Page.captureScreenshot", params: { format: "jpeg", quality: 50 } }));
@@ -41882,7 +42181,7 @@ void (async () => {
     console.log(import_chalk7.default.gray("    adhdev daemon            \u2014 Start unified daemon (Required)"));
     console.log(import_chalk7.default.gray("    adhdev standalone        \u2014 Start standalone local dashboard & daemon"));
     console.log(import_chalk7.default.gray("    adhdev launch cursor     \u2014 Launch IDE with CDP (e.g. cursor, windsurf)"));
-    console.log(import_chalk7.default.gray("    adhdev launch claude     \u2014 Launch CLI agent (e.g. gemini, claude)"));
+    console.log(import_chalk7.default.gray("    adhdev launch claude     \u2014 Launch CLI agent via the running daemon"));
     console.log(import_chalk7.default.gray("    adhdev status            \u2014 Check current setup"));
     console.log(import_chalk7.default.gray("    adhdev update            \u2014 Upgrade to latest version"));
     console.log();