adhdev 0.7.31 → 0.7.35

package/dist/index.js

@@ -583,16 +583,16 @@ async function detectCLIs(providerLoader) {
   const results = await Promise.all(
     cliList.map(async (cli) => {
       try {
-        const pathResult = await execAsync(`${whichCmd} ${cli.command} 2>/dev/null`);
+        const pathResult = await execAsync(`${whichCmd} ${cli.command}`);
         if (!pathResult) return { ...cli, installed: false };
         const firstPath = pathResult.split("\n")[0];
         let version2;
         try {
           const versionCommands = [
             cli.versionCommand,
-            `${cli.command} --version 2>/dev/null`,
-            `${cli.command} -V 2>/dev/null`,
-            `${cli.command} -v 2>/dev/null`
+            `${cli.command} --version`,
+            `${cli.command} -V`,
+            `${cli.command} -v`
           ].filter((v2) => !!v2);
           for (const versionCommand of versionCommands) {
             const versionResult = await execAsync(versionCommand, 3e3);
@@ -2991,10 +2991,13 @@ var init_ide_provider_instance = __esm({
           if (result?.found && result.x != null && result.y != null) {
             const x = result.x;
             const y = result.y;
-            const anyCdp = cdp;
-            await anyCdp.send("Input.dispatchMouseEvent", { type: "mousePressed", x, y, button: "left", clickCount: 1 });
-            await anyCdp.send("Input.dispatchMouseEvent", { type: "mouseReleased", x, y, button: "left", clickCount: 1 });
-            LOG.info("IdeInstance", `[IdeInstance:${this.type}] autoApprove: dispatched mouse event at ${x},${y}`);
+            if (cdp.send) {
+              await cdp.send("Input.dispatchMouseEvent", { type: "mousePressed", x, y, button: "left", clickCount: 1 });
+              await cdp.send("Input.dispatchMouseEvent", { type: "mouseReleased", x, y, button: "left", clickCount: 1 });
+              LOG.info("IdeInstance", `[IdeInstance:${this.type}] autoApprove: dispatched mouse event at ${x},${y}`);
+            } else {
+              LOG.warn("IdeInstance", `[IdeInstance:${this.type}] autoApprove: cdp.send() not available for coordinate click`);
+            }
           }
           this.pushEvent({
             event: "agent:auto_approved",
@@ -7308,14 +7311,6 @@ var init_provider_loader = __esm({
       }
       /**
       * Get raw provider metadata by type (NO scripts loaded).
-      * Use resolve() when you need scripts (readChat, listModels, etc).
-      * @deprecated Use getMeta() for metadata or resolve() for scripts.
-      */
-      get(type) {
-        return this.providers.get(type);
-      }
-      /**
-      * Get raw provider metadata by type (NO scripts loaded).
       * Safe for: category checks, icon, displayName, targetFilter, cdpPorts.
       * NOT safe for: script execution (readChat, listModels, sendMessage).
       * Use resolve() when scripts are needed.
@@ -8338,7 +8333,7 @@ function detectCurrentWorkspace(ideId) {
     }
   } else if (plat === "win32") {
     try {
-      const fs15 = require("fs");
+      const fs16 = require("fs");
       const appNameMap = getMacAppIdentifiers();
       const appName = appNameMap[ideId];
       if (appName) {
@@ -8347,8 +8342,8 @@ function detectCurrentWorkspace(ideId) {
           appName,
           "storage.json"
         );
-        if (fs15.existsSync(storagePath)) {
-          const data = JSON.parse(fs15.readFileSync(storagePath, "utf-8"));
+        if (fs16.existsSync(storagePath)) {
+          const data = JSON.parse(fs16.readFileSync(storagePath, "utf-8"));
           const workspaces = data?.openedPathsList?.workspaces3 || data?.openedPathsList?.entries || [];
           if (workspaces.length > 0) {
             const recent = workspaces[0];
@@ -8847,9 +8842,9 @@ var init_router = __esm({
                 LOG.info("Upgrade", "Restarting daemon with new version...");
                 try {
                   const path18 = require("path");
-                  const fs15 = require("fs");
+                  const fs16 = require("fs");
                   const pidFile = path18.join(process.env.HOME || process.env.USERPROFILE || "", ".adhdev", "daemon.pid");
-                  if (fs15.existsSync(pidFile)) fs15.unlinkSync(pidFile);
+                  if (fs16.existsSync(pidFile)) fs16.unlinkSync(pidFile);
                 } catch {
                 }
                 const { spawn: spawn4 } = require("child_process");
@@ -8901,7 +8896,7 @@ var init_router = __esm({
           }
         }
         const keysToRemove = [];
-        for (const key of this.deps.instanceManager.instances?.keys?.() || []) {
+        for (const key of this.deps.instanceManager.listInstanceIds()) {
           if (key === `ide:${ideType}` || typeof key === "string" && key.startsWith(`ide:${ideType}_`)) {
             keysToRemove.push(key);
           }
@@ -18614,12 +18609,12 @@ function findBinary(name) {
 function isScriptBinary(binaryPath) {
   if (!path9.isAbsolute(binaryPath)) return false;
   try {
-    const fs15 = require("fs");
-    const resolved = fs15.realpathSync(binaryPath);
+    const fs16 = require("fs");
+    const resolved = fs16.realpathSync(binaryPath);
     const head = Buffer.alloc(8);
-    const fd = fs15.openSync(resolved, "r");
-    fs15.readSync(fd, head, 0, 8, 0);
-    fs15.closeSync(fd);
+    const fd = fs16.openSync(resolved, "r");
+    fs16.readSync(fd, head, 0, 8, 0);
+    fs16.closeSync(fd);
     let i = 0;
     if (head[0] === 239 && head[1] === 187 && head[2] === 191) i = 3;
     return head[i] === 35 && head[i + 1] === 33;
@@ -18630,12 +18625,12 @@ function isScriptBinary(binaryPath) {
 function looksLikeMachOOrElf(filePath) {
   if (!path9.isAbsolute(filePath)) return false;
   try {
-    const fs15 = require("fs");
-    const resolved = fs15.realpathSync(filePath);
+    const fs16 = require("fs");
+    const resolved = fs16.realpathSync(filePath);
     const buf = Buffer.alloc(8);
-    const fd = fs15.openSync(resolved, "r");
-    fs15.readSync(fd, buf, 0, 8, 0);
-    fs15.closeSync(fd);
+    const fd = fs16.openSync(resolved, "r");
+    fs16.readSync(fd, buf, 0, 8, 0);
+    fs16.closeSync(fd);
     let i = 0;
     if (buf[0] === 239 && buf[1] === 187 && buf[2] === 191) i = 3;
     const b2 = buf.subarray(i);
@@ -18756,14 +18751,14 @@ var init_provider_cli_adapter = __esm({
       pty2 = require("node-pty");
       if (os13.platform() !== "win32") {
         try {
-          const fs15 = require("fs");
+          const fs16 = require("fs");
           const ptyDir = path9.resolve(path9.dirname(require.resolve("node-pty")), "..");
           const platformArch = `${os13.platform()}-${os13.arch()}`;
           const helper = path9.join(ptyDir, "prebuilds", platformArch, "spawn-helper");
-          if (fs15.existsSync(helper)) {
-            const stat4 = fs15.statSync(helper);
+          if (fs16.existsSync(helper)) {
+            const stat4 = fs16.statSync(helper);
             if (!(stat4.mode & 73)) {
-              fs15.chmodSync(helper, stat4.mode | 493);
+              fs16.chmodSync(helper, stat4.mode | 493);
               LOG.info("CLI", "[node-pty] Fixed spawn-helper permissions");
             }
           }
@@ -18955,8 +18950,12 @@ var init_provider_cli_adapter = __esm({
             LOG.info("CLI", `[${this.cliType}] Using login shell (script shim or non-native binary)`);
           }
           shellCmd = isWin ? "cmd.exe" : process.env.SHELL || "/bin/zsh";
-          const fullCmd = [binaryPath, ...allArgs].map(shSingleQuote).join(" ");
-          shellArgs = isWin ? ["/c", fullCmd] : ["-l", "-c", fullCmd];
+          if (isWin) {
+            shellArgs = ["/c", binaryPath, ...allArgs];
+          } else {
+            const fullCmd = [binaryPath, ...allArgs].map(shSingleQuote).join(" ");
+            shellArgs = ["-l", "-c", fullCmd];
+          }
         } else {
           shellCmd = binaryPath;
           shellArgs = allArgs;
@@ -38348,6 +38347,12 @@ var init_provider_instance_manager = __esm({
       get size() {
         return this.instances.size;
       }
+      /**
+      * All Instance IDs (for iteration without exposing the private Map)
+      */
+      listInstanceIds() {
+        return [...this.instances.keys()];
+      }
       // ─── State collect ────────────────────────────────
       /**
       * all Instance's current status collect
@@ -42789,7 +42794,20 @@ var init_dist = __esm({
           request
         };
         const response = await new Promise((resolve12, reject) => {
-          this.requestWaiters.set(requestId, { resolve: resolve12, 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);
+              resolve12(value);
+            },
+            reject: (error48) => {
+              clearTimeout(timeout);
+              reject(error48);
+            }
+          });
           this.socket?.write(serializeEnvelope(envelope));
         });
         return response;
@@ -43735,10 +43753,10 @@ var init_server_connection = __esm({
           this.setState("disconnected");
           try {
             const path18 = require("path");
-            const fs15 = require("fs");
+            const fs16 = require("fs");
             const configPath = path18.join(process.env.HOME || process.env.USERPROFILE || "", ".adhdev", "config.json");
-            if (fs15.existsSync(configPath)) {
-              fs15.unlinkSync(configPath);
+            if (fs16.existsSync(configPath)) {
+              fs16.unlinkSync(configPath);
               LOG.info("Server", `[ServerConn] Config file removed. Re-run 'adhdev setup'.`);
             }
           } catch {
@@ -44829,13 +44847,12 @@ var init_screenshot_controller = __esm({
 
 // src/session-host.ts
 function resolveSessionHostEntry() {
-  const localCandidates = [
+  const packagedCandidates = [
     path16.resolve(__dirname, "../vendor/session-host-daemon/index.js"),
-    path16.resolve(__dirname, "../../vendor/session-host-daemon/index.js"),
-    path16.resolve(__dirname, "../../../oss/packages/session-host-daemon/dist/index.js")
+    path16.resolve(__dirname, "../../vendor/session-host-daemon/index.js")
   ];
-  for (const candidate of localCandidates) {
-    if (require("fs").existsSync(candidate)) {
+  for (const candidate of packagedCandidates) {
+    if (fs14.existsSync(candidate)) {
       return candidate;
     }
   }
@@ -44862,11 +44879,12 @@ async function ensureSessionHostReady2() {
 async function listHostedCliRuntimes2(endpoint) {
   return listHostedCliRuntimes(endpoint);
 }
-var import_child_process8, path16, SESSION_HOST_APP_NAME;
+var import_child_process8, fs14, path16, SESSION_HOST_APP_NAME;
 var init_session_host = __esm({
   "src/session-host.ts"() {
     "use strict";
     import_child_process8 = require("child_process");
+    fs14 = __toESM(require("fs"));
     path16 = __toESM(require("path"));
     init_src();
     SESSION_HOST_APP_NAME = process.env.ADHDEV_SESSION_HOST_NAME || "adhdev";
@@ -44882,23 +44900,23 @@ __export(adhdev_daemon_exports, {
 });
 function getDaemonPidFile() {
   const dir = path17.join(os19.homedir(), ".adhdev");
-  if (!fs14.existsSync(dir)) fs14.mkdirSync(dir, { recursive: true });
+  if (!fs15.existsSync(dir)) fs15.mkdirSync(dir, { recursive: true });
   return path17.join(dir, "daemon.pid");
 }
 function writeDaemonPid(pid) {
-  fs14.writeFileSync(getDaemonPidFile(), String(pid), "utf-8");
+  fs15.writeFileSync(getDaemonPidFile(), String(pid), "utf-8");
 }
 function removeDaemonPid() {
   try {
-    fs14.unlinkSync(getDaemonPidFile());
+    fs15.unlinkSync(getDaemonPidFile());
   } catch (e) {
   }
 }
 function isDaemonRunning() {
   const pidFile = getDaemonPidFile();
   try {
-    if (!fs14.existsSync(pidFile)) return false;
-    const pid = parseInt(fs14.readFileSync(pidFile, "utf-8").trim());
+    if (!fs15.existsSync(pidFile)) return false;
+    const pid = parseInt(fs15.readFileSync(pidFile, "utf-8").trim());
     process.kill(pid, 0);
     return true;
   } catch {
@@ -44909,8 +44927,8 @@ function isDaemonRunning() {
 function stopDaemon() {
   const pidFile = getDaemonPidFile();
   try {
-    if (!fs14.existsSync(pidFile)) return false;
-    const pid = parseInt(fs14.readFileSync(pidFile, "utf-8").trim());
+    if (!fs15.existsSync(pidFile)) return false;
+    const pid = parseInt(fs15.readFileSync(pidFile, "utf-8").trim());
     process.kill(pid, "SIGTERM");
     removeDaemonPid();
     return true;
@@ -44919,7 +44937,7 @@ function stopDaemon() {
     return false;
   }
 }
-var os19, fs14, path17, import_chalk2, pkgVersion, DANGEROUS_PATTERNS, AdhdevDaemon;
+var os19, fs15, path17, import_chalk2, pkgVersion, DANGEROUS_PATTERNS, AdhdevDaemon;
 var init_adhdev_daemon = __esm({
   "src/adhdev-daemon.ts"() {
     "use strict";
@@ -44930,10 +44948,10 @@ var init_adhdev_daemon = __esm({
     init_session_host();
     init_dist();
     os19 = __toESM(require("os"));
-    fs14 = __toESM(require("fs"));
+    fs15 = __toESM(require("fs"));
     path17 = __toESM(require("path"));
     import_chalk2 = __toESM(require("chalk"));
-    pkgVersion = "0.7.31";
+    pkgVersion = "0.7.35";
     if (pkgVersion === "unknown") {
       try {
         const possiblePaths = [
@@ -44942,7 +44960,7 @@ var init_adhdev_daemon = __esm({
         ];
         for (const p of possiblePaths) {
           try {
-            const data = JSON.parse(fs14.readFileSync(p, "utf-8"));
+            const data = JSON.parse(fs15.readFileSync(p, "utf-8"));
             if (data.version) {
               pkgVersion = data.version;
               break;