@adhdev/daemon-core 0.5.24 → 0.5.26

package/dist/index.js

@@ -569,15 +569,15 @@ async function detectIDEs() {
 var import_child_process2 = require("child_process");
 var os2 = __toESM(require("os"));
 function execAsync(cmd, timeoutMs = 5e3) {
-  return new Promise((resolve7) => {
+  return new Promise((resolve8) => {
     const child = (0, import_child_process2.exec)(cmd, { encoding: "utf-8", timeout: timeoutMs }, (err, stdout) => {
       if (err || !stdout?.trim()) {
-        resolve7(null);
+        resolve8(null);
       } else {
-        resolve7(stdout.trim());
+        resolve8(stdout.trim());
       }
     });
-    child.on("error", () => resolve7(null));
+    child.on("error", () => resolve8(null));
   });
 }
 async function detectCLIs(providerLoader) {
@@ -935,7 +935,7 @@ var DaemonCdpManager = class {
   * Returns multiple entries if multiple IDE windows are open on same port
   */
   static listAllTargets(port) {
-    return new Promise((resolve7) => {
+    return new Promise((resolve8) => {
       const req = http.get(`http://127.0.0.1:${port}/json`, (res) => {
         let data = "";
         res.on("data", (chunk) => data += chunk.toString());
@@ -951,16 +951,16 @@ var DaemonCdpManager = class {
               (t) => !isNonMain(t.title || "") && t.url?.includes("workbench.html") && !t.url?.includes("agent")
             );
             const fallbackPages = pages.filter((t) => !isNonMain(t.title || ""));
-            resolve7(mainPages.length > 0 ? mainPages : fallbackPages);
+            resolve8(mainPages.length > 0 ? mainPages : fallbackPages);
           } catch {
-            resolve7([]);
+            resolve8([]);
           }
         });
       });
-      req.on("error", () => resolve7([]));
+      req.on("error", () => resolve8([]));
       req.setTimeout(2e3, () => {
         req.destroy();
-        resolve7([]);
+        resolve8([]);
       });
     });
   }
@@ -1000,7 +1000,7 @@ var DaemonCdpManager = class {
     }
   }
   findTargetOnPort(port) {
-    return new Promise((resolve7) => {
+    return new Promise((resolve8) => {
       const req = http.get(`http://127.0.0.1:${port}/json`, (res) => {
         let data = "";
         res.on("data", (chunk) => data += chunk.toString());
@@ -1011,7 +1011,7 @@ var DaemonCdpManager = class {
               (t) => (t.type === "page" || t.type === "browser" || t.type === "Page") && t.webSocketDebuggerUrl
             );
             if (pages.length === 0) {
-              resolve7(targets.find((t) => t.webSocketDebuggerUrl) || null);
+              resolve8(targets.find((t) => t.webSocketDebuggerUrl) || null);
               return;
             }
             const mainPages = pages.filter((t) => !this.isNonMainTitle(t.title || ""));
@@ -1021,24 +1021,24 @@ var DaemonCdpManager = class {
               const specific = list.find((t) => t.id === this._targetId);
               if (specific) {
                 this._pageTitle = specific.title || "";
-                resolve7(specific);
+                resolve8(specific);
               } else {
                 this.log(`[CDP] Target ${this._targetId} not found in page list`);
-                resolve7(null);
+                resolve8(null);
               }
               return;
             }
             this._pageTitle = list[0]?.title || "";
-            resolve7(list[0]);
+            resolve8(list[0]);
           } catch {
-            resolve7(null);
+            resolve8(null);
           }
         });
       });
-      req.on("error", () => resolve7(null));
+      req.on("error", () => resolve8(null));
       req.setTimeout(2e3, () => {
         req.destroy();
-        resolve7(null);
+        resolve8(null);
       });
     });
   }
@@ -1049,7 +1049,7 @@ var DaemonCdpManager = class {
     this.extensionProviders = providers;
   }
   connectToTarget(wsUrl) {
-    return new Promise((resolve7) => {
+    return new Promise((resolve8) => {
       this.ws = new import_ws.default(wsUrl);
       this.ws.on("open", async () => {
         this._connected = true;
@@ -1059,17 +1059,17 @@ var DaemonCdpManager = class {
         }
         this.connectBrowserWs().catch(() => {
         });
-        resolve7(true);
+        resolve8(true);
       });
       this.ws.on("message", (data) => {
         try {
           const msg = JSON.parse(data.toString());
           if (msg.id && this.pending.has(msg.id)) {
-            const { resolve: resolve8, reject } = this.pending.get(msg.id);
+            const { resolve: resolve9, reject } = this.pending.get(msg.id);
             this.pending.delete(msg.id);
             this.failureCount = 0;
             if (msg.error) reject(new Error(msg.error.message));
-            else resolve8(msg.result);
+            else resolve9(msg.result);
           } else if (msg.method === "Runtime.executionContextCreated") {
             this.contexts.add(msg.params.context.id);
           } else if (msg.method === "Runtime.executionContextDestroyed") {
@@ -1092,7 +1092,7 @@ var DaemonCdpManager = class {
       this.ws.on("error", (err) => {
         this.log(`[CDP] WebSocket error: ${err.message}`);
         this._connected = false;
-        resolve7(false);
+        resolve8(false);
       });
     });
   }
@@ -1106,7 +1106,7 @@ var DaemonCdpManager = class {
         return;
       }
       this.log(`[CDP] Connecting browser WS for target discovery...`);
-      await new Promise((resolve7, reject) => {
+      await new Promise((resolve8, reject) => {
         this.browserWs = new import_ws.default(browserWsUrl);
         this.browserWs.on("open", async () => {
           this._browserConnected = true;
@@ -1116,16 +1116,16 @@ var DaemonCdpManager = class {
           } catch (e) {
             this.log(`[CDP] setDiscoverTargets failed: ${e.message}`);
           }
-          resolve7();
+          resolve8();
         });
         this.browserWs.on("message", (data) => {
           try {
             const msg = JSON.parse(data.toString());
             if (msg.id && this.browserPending.has(msg.id)) {
-              const { resolve: resolve8, reject: reject2 } = this.browserPending.get(msg.id);
+              const { resolve: resolve9, reject: reject2 } = this.browserPending.get(msg.id);
               this.browserPending.delete(msg.id);
               if (msg.error) reject2(new Error(msg.error.message));
-              else resolve8(msg.result);
+              else resolve9(msg.result);
             }
           } catch {
           }
@@ -1145,31 +1145,31 @@ var DaemonCdpManager = class {
     }
   }
   getBrowserWsUrl() {
-    return new Promise((resolve7) => {
+    return new Promise((resolve8) => {
       const req = http.get(`http://127.0.0.1:${this.port}/json/version`, (res) => {
         let data = "";
         res.on("data", (chunk) => data += chunk.toString());
         res.on("end", () => {
           try {
             const info = JSON.parse(data);
-            resolve7(info.webSocketDebuggerUrl || null);
+            resolve8(info.webSocketDebuggerUrl || null);
           } catch {
-            resolve7(null);
+            resolve8(null);
           }
         });
       });
-      req.on("error", () => resolve7(null));
+      req.on("error", () => resolve8(null));
       req.setTimeout(3e3, () => {
         req.destroy();
-        resolve7(null);
+        resolve8(null);
       });
     });
   }
   sendBrowser(method, params = {}, timeoutMs = 15e3) {
-    return new Promise((resolve7, reject) => {
+    return new Promise((resolve8, reject) => {
       if (!this.browserWs || !this._browserConnected) return reject(new Error("Browser WS not connected"));
       const id = this.browserMsgId++;
-      this.browserPending.set(id, { resolve: resolve7, reject });
+      this.browserPending.set(id, { resolve: resolve8, reject });
       this.browserWs.send(JSON.stringify({ id, method, params }));
       setTimeout(() => {
         if (this.browserPending.has(id)) {
@@ -1209,11 +1209,11 @@ var DaemonCdpManager = class {
   }
   // ─── CDP Protocol ────────────────────────────────────────
   sendInternal(method, params = {}, timeoutMs = 15e3) {
-    return new Promise((resolve7, reject) => {
+    return new Promise((resolve8, reject) => {
       if (!this.ws || !this._connected) return reject(new Error("CDP not connected"));
       if (this.ws.readyState !== import_ws.default.OPEN) return reject(new Error("WebSocket not open"));
       const id = this.msgId++;
-      this.pending.set(id, { resolve: resolve7, reject });
+      this.pending.set(id, { resolve: resolve8, reject });
       this.ws.send(JSON.stringify({ id, method, params }));
       setTimeout(() => {
         if (this.pending.has(id)) {
@@ -1422,7 +1422,7 @@ var DaemonCdpManager = class {
     const browserWs = this.browserWs;
     let msgId = this.browserMsgId;
     const sendWs = (method, params = {}, sessionId) => {
-      return new Promise((resolve7, reject) => {
+      return new Promise((resolve8, reject) => {
         const mid = msgId++;
         this.browserMsgId = msgId;
         const handler = (raw) => {
@@ -1431,7 +1431,7 @@ var DaemonCdpManager = class {
             if (msg.id === mid) {
               browserWs.removeListener("message", handler);
               if (msg.error) reject(new Error(msg.error.message || JSON.stringify(msg.error)));
-              else resolve7(msg.result);
+              else resolve8(msg.result);
             }
           } catch {
           }
@@ -1605,14 +1605,14 @@ var DaemonCdpManager = class {
     if (!ws || ws.readyState !== import_ws.default.OPEN) {
       throw new Error("CDP not connected");
     }
-    return new Promise((resolve7, reject) => {
+    return new Promise((resolve8, reject) => {
       const id = getNextId();
       pendingMap.set(id, {
         resolve: (result) => {
           if (result?.result?.subtype === "error") {
             reject(new Error(result.result.description));
           } else {
-            resolve7(result?.result?.value);
+            resolve8(result?.result?.value);
           }
         },
         reject
@@ -1644,10 +1644,10 @@ var DaemonCdpManager = class {
       throw new Error("CDP not connected");
     }
     const sendViaSession = (method, params = {}) => {
-      return new Promise((resolve7, reject) => {
+      return new Promise((resolve8, reject) => {
         const pendingMap = this._browserConnected ? this.browserPending : this.pending;
         const id = this._browserConnected ? this.browserMsgId++ : this.msgId++;
-        pendingMap.set(id, { resolve: resolve7, reject });
+        pendingMap.set(id, { resolve: resolve8, reject });
         ws.send(JSON.stringify({ id, sessionId, method, params }));
         setTimeout(() => {
           if (pendingMap.has(id)) {
@@ -5229,7 +5229,7 @@ var ProviderLoader = class _ProviderLoader {
       return { updated: false };
     }
     try {
-      const etag = await new Promise((resolve7, reject) => {
+      const etag = await new Promise((resolve8, reject) => {
         const options = {
           method: "HEAD",
           hostname: "github.com",
@@ -5247,7 +5247,7 @@ var ProviderLoader = class _ProviderLoader {
               headers: { "User-Agent": "adhdev-launcher" },
               timeout: 1e4
             }, (res2) => {
-              resolve7(res2.headers.etag || res2.headers["last-modified"] || "");
+              resolve8(res2.headers.etag || res2.headers["last-modified"] || "");
             });
             req2.on("error", reject);
             req2.on("timeout", () => {
@@ -5256,7 +5256,7 @@ var ProviderLoader = class _ProviderLoader {
             });
             req2.end();
           } else {
-            resolve7(res.headers.etag || res.headers["last-modified"] || "");
+            resolve8(res.headers.etag || res.headers["last-modified"] || "");
           }
         });
         req.on("error", reject);
@@ -5320,7 +5320,7 @@ var ProviderLoader = class _ProviderLoader {
   downloadFile(url, destPath) {
     const https = require("https");
     const http3 = require("http");
-    return new Promise((resolve7, reject) => {
+    return new Promise((resolve8, reject) => {
       const doRequest = (reqUrl, redirectCount = 0) => {
         if (redirectCount > 5) {
           reject(new Error("Too many redirects"));
@@ -5340,7 +5340,7 @@ var ProviderLoader = class _ProviderLoader {
           res.pipe(ws);
           ws.on("finish", () => {
             ws.close();
-            resolve7();
+            resolve8();
           });
           ws.on("error", reject);
         });
@@ -5677,17 +5677,17 @@ async function findFreePort(ports) {
   throw new Error("No free port found");
 }
 function checkPortFree(port) {
-  return new Promise((resolve7) => {
+  return new Promise((resolve8) => {
     const server = net.createServer();
     server.unref();
-    server.on("error", () => resolve7(false));
+    server.on("error", () => resolve8(false));
     server.listen(port, "127.0.0.1", () => {
-      server.close(() => resolve7(true));
+      server.close(() => resolve8(true));
     });
   });
 }
 async function isCdpActive(port) {
-  return new Promise((resolve7) => {
+  return new Promise((resolve8) => {
     const req = require("http").get(`http://127.0.0.1:${port}/json/version`, {
       timeout: 2e3
     }, (res) => {
@@ -5696,16 +5696,16 @@ async function isCdpActive(port) {
       res.on("end", () => {
         try {
           const info = JSON.parse(data);
-          resolve7(!!info["WebKit-Version"] || !!info["Browser"]);
+          resolve8(!!info["WebKit-Version"] || !!info["Browser"]);
         } catch {
-          resolve7(false);
+          resolve8(false);
         }
       });
     });
-    req.on("error", () => resolve7(false));
+    req.on("error", () => resolve8(false));
     req.on("timeout", () => {
       req.destroy();
-      resolve7(false);
+      resolve8(false);
     });
   });
 }
@@ -6650,7 +6650,7 @@ try {
   if (os11.platform() !== "win32") {
     try {
       const fs10 = require("fs");
-      const ptyDir = path9.dirname(require.resolve("node-pty"));
+      const ptyDir = path9.resolve(path9.dirname(require.resolve("node-pty")), "..");
       const arch3 = os11.arch() === "arm64" ? "darwin-arm64" : "darwin-x64";
       const helper = path9.join(ptyDir, "prebuilds", arch3, "spawn-helper");
       if (fs10.existsSync(helper)) {
@@ -6800,7 +6800,7 @@ var ProviderCliAdapter = class {
     this.timeouts = {
       ptyFlush: t.ptyFlush ?? 50,
       dialogAccept: t.dialogAccept ?? 300,
-      approvalCooldown: t.approvalCooldown ?? 2e3,
+      approvalCooldown: t.approvalCooldown ?? 500,
       generatingIdle: t.generatingIdle ?? 6e3,
       idleFinish: t.idleFinish ?? 5e3,
       maxResponse: t.maxResponse ?? 3e5,
@@ -6977,32 +6977,34 @@ var ProviderCliAdapter = class {
     }
     const hasApproval = patterns.approval.some((p) => p.test(this.recentOutputBuffer));
     if (hasApproval && this.currentStatus !== "waiting_approval") {
-      if (this.lastApprovalResolvedAt && Date.now() - this.lastApprovalResolvedAt < this.timeouts.approvalCooldown) return;
-      const ctxLines = this.recentOutputBuffer.split("\n").map((l) => l.trim()).filter((l) => l && !/^[─═╭╮╰╯│]+$/.test(l));
-      this.isWaitingForResponse = true;
-      this.setStatus("waiting_approval", "approval_pattern");
-      this.recentOutputBuffer = "";
-      this.approvalTransitionBuffer = "";
-      this.activeModal = {
-        message: ctxLines.slice(-5).join(" ").slice(0, 200) || "Approval required",
-        buttons: this.cliType === "claude-cli" ? ["Yes (y)", "Always allow (a)", "Deny (Esc)"] : ["Allow once", "Always allow", "Deny"]
-      };
-      if (this.idleTimeout) clearTimeout(this.idleTimeout);
-      if (this.approvalExitTimeout) clearTimeout(this.approvalExitTimeout);
-      this.approvalExitTimeout = setTimeout(() => {
-        if (this.currentStatus === "waiting_approval") {
-          LOG.warn("CLI", `[${this.cliType}] Approval timeout \u2014 auto-exiting waiting_approval`);
-          this.activeModal = null;
-          this.lastApprovalResolvedAt = Date.now();
-          this.recentOutputBuffer = "";
-          this.approvalTransitionBuffer = "";
-          this.approvalExitTimeout = null;
-          this.setStatus(this.isWaitingForResponse ? "generating" : "idle", "approval_cleared");
-          this.onStatusChange?.();
-        }
-      }, 6e4);
-      this.onStatusChange?.();
-      return;
+      const inCooldown = this.lastApprovalResolvedAt && Date.now() - this.lastApprovalResolvedAt < this.timeouts.approvalCooldown;
+      if (!inCooldown) {
+        const ctxLines = this.recentOutputBuffer.split("\n").map((l) => l.trim()).filter((l) => l && !/^[─═╭╮╰╯│]+$/.test(l));
+        this.isWaitingForResponse = true;
+        this.setStatus("waiting_approval", "approval_pattern");
+        this.recentOutputBuffer = "";
+        this.approvalTransitionBuffer = "";
+        this.activeModal = {
+          message: ctxLines.slice(-5).join(" ").slice(0, 200) || "Approval required",
+          buttons: this.cliType === "claude-cli" ? ["Yes (y)", "Always allow (a)", "Deny (Esc)"] : ["Allow once", "Always allow", "Deny"]
+        };
+        if (this.idleTimeout) clearTimeout(this.idleTimeout);
+        if (this.approvalExitTimeout) clearTimeout(this.approvalExitTimeout);
+        this.approvalExitTimeout = setTimeout(() => {
+          if (this.currentStatus === "waiting_approval") {
+            LOG.warn("CLI", `[${this.cliType}] Approval timeout \u2014 auto-exiting waiting_approval`);
+            this.activeModal = null;
+            this.lastApprovalResolvedAt = Date.now();
+            this.recentOutputBuffer = "";
+            this.approvalTransitionBuffer = "";
+            this.approvalExitTimeout = null;
+            this.setStatus(this.isWaitingForResponse ? "generating" : "idle", "approval_cleared");
+            this.onStatusChange?.();
+          }
+        }, 6e4);
+        this.onStatusChange?.();
+        return;
+      }
     }
     if (this.currentStatus === "waiting_approval") {
       this.approvalTransitionBuffer = (this.approvalTransitionBuffer + cleanData).slice(-500);
@@ -7054,7 +7056,10 @@ var ProviderCliAdapter = class {
       }
       const trailingLines = cleanData.split("\n").slice(-2).join("\n");
       if (patterns.prompt.some((p) => p.test(trailingLines))) {
-        this.finishResponse();
+        const hasApprovalHere = patterns.approval.some((p) => p.test(this.recentOutputBuffer));
+        if (!hasApprovalHere) {
+          this.finishResponse();
+        }
       } else {
         this.idleTimeout = setTimeout(() => {
           if (this.isWaitingForResponse && this.responseBuffer.trim()) {
@@ -7851,13 +7856,13 @@ var AcpProviderInstance = class {
         }
         this.currentStatus = "waiting_approval";
         this.detectStatusTransition();
-        const approved = await new Promise((resolve7) => {
-          this.permissionResolvers.push(resolve7);
+        const approved = await new Promise((resolve8) => {
+          this.permissionResolvers.push(resolve8);
           setTimeout(() => {
-            const idx = this.permissionResolvers.indexOf(resolve7);
+            const idx = this.permissionResolvers.indexOf(resolve8);
             if (idx >= 0) {
               this.permissionResolvers.splice(idx, 1);
-              resolve7(false);
+              resolve8(false);
             }
           }, 3e5);
         });
@@ -9097,6 +9102,18 @@ var AgentStreamPoller = class {
           }
         }
       }
+      if (this._activeIdeType === ideType && agentStreamManager.activeAgentType) {
+        const activeType = agentStreamManager.activeAgentType;
+        const enabledExtTypes = new Set(
+          providerLoader.getEnabledExtensionProviders(ideType).map((p) => p.type)
+        );
+        if (!enabledExtTypes.has(activeType)) {
+          LOG.info("AgentStream", `Active agent ${activeType} was disabled for ${ideType} \u2014 detaching`);
+          await agentStreamManager.switchActiveAgent(cdp, null);
+          this._activeIdeType = null;
+          this.deps.onStreamsUpdated?.(ideType, []);
+        }
+      }
     }
     if (this._activeIdeType) {
       const cdp = cdpManagers.get(this._activeIdeType);
@@ -9907,15 +9924,15 @@ var DevServer = class _DevServer {
         this.json(res, 500, { error: e.message });
       }
     });
-    return new Promise((resolve7, reject) => {
+    return new Promise((resolve8, reject) => {
       this.server.listen(port, "127.0.0.1", () => {
         this.log(`Dev server listening on http://127.0.0.1:${port}`);
-        resolve7();
+        resolve8();
       });
       this.server.on("error", (e) => {
         if (e.code === "EADDRINUSE") {
           this.log(`Port ${port} in use, skipping dev server`);
-          resolve7();
+          resolve8();
         } else {
           reject(e);
         }
@@ -9998,20 +10015,20 @@ var DevServer = class _DevServer {
       child.stderr?.on("data", (d) => {
         stderr += d.toString().slice(0, 2e3);
       });
-      await new Promise((resolve7) => {
+      await new Promise((resolve8) => {
         const timer = setTimeout(() => {
           child.kill();
-          resolve7();
+          resolve8();
         }, 3e3);
         child.on("exit", () => {
           clearTimeout(timer);
-          resolve7();
+          resolve8();
         });
         child.stdout?.once("data", () => {
           setTimeout(() => {
             child.kill();
             clearTimeout(timer);
-            resolve7();
+            resolve8();
           }, 500);
         });
       });
@@ -10696,14 +10713,14 @@ var DevServer = class _DevServer {
       child.stderr?.on("data", (d) => {
         stderr += d.toString();
       });
-      await new Promise((resolve7) => {
+      await new Promise((resolve8) => {
         const timer = setTimeout(() => {
           child.kill();
-          resolve7();
+          resolve8();
         }, timeout);
         child.on("exit", () => {
           clearTimeout(timer);
-          resolve7();
+          resolve8();
         });
       });
       const elapsed = Date.now() - start;
@@ -12105,14 +12122,14 @@ data: ${JSON.stringify(msg.data)}
     res.end(JSON.stringify(data, null, 2));
   }
   async readBody(req) {
-    return new Promise((resolve7) => {
+    return new Promise((resolve8) => {
       let body = "";
       req.on("data", (chunk) => body += chunk);
       req.on("end", () => {
         try {
-          resolve7(JSON.parse(body));
+          resolve8(JSON.parse(body));
         } catch {
-          resolve7({});
+          resolve8({});
         }
       });
     });
@@ -12481,10 +12498,10 @@ async function installExtension(ide, extension) {
         const buffer = Buffer.from(await res.arrayBuffer());
         const fs10 = await import("fs");
         fs10.writeFileSync(vsixPath, buffer);
-        return new Promise((resolve7) => {
+        return new Promise((resolve8) => {
           const cmd = `"${ide.cliCommand}" --install-extension "${vsixPath}" --force`;
           (0, import_child_process8.exec)(cmd, { timeout: 6e4 }, (error, _stdout, stderr) => {
-            resolve7({
+            resolve8({
               extensionId: extension.id,
               marketplaceId: extension.marketplaceId,
               success: !error,
@@ -12497,11 +12514,11 @@ async function installExtension(ide, extension) {
     } catch (e) {
     }
   }
-  return new Promise((resolve7) => {
+  return new Promise((resolve8) => {
     const cmd = `"${ide.cliCommand}" --install-extension ${extension.marketplaceId} --force`;
     (0, import_child_process8.exec)(cmd, { timeout: 6e4 }, (error, stdout, stderr) => {
       if (error) {
-        resolve7({
+        resolve8({
           extensionId: extension.id,
           marketplaceId: extension.marketplaceId,
           success: false,
@@ -12509,7 +12526,7 @@ async function installExtension(ide, extension) {
           error: stderr || error.message
         });
       } else {
-        resolve7({
+        resolve8({
           extensionId: extension.id,
           marketplaceId: extension.marketplaceId,
           success: true,