adhdev 0.5.24 → 0.5.26

package/dist/cli/index.js

@@ -16904,15 +16904,15 @@ var require_dist = __commonJS({
     var import_child_process2 = require("child_process");
     var os22 = __toESM2(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) {
@@ -17262,7 +17262,7 @@ var require_dist = __commonJS({
       * 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());
@@ -17278,16 +17278,16 @@ var require_dist = __commonJS({
                   (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([]);
           });
         });
       }
@@ -17327,7 +17327,7 @@ var require_dist = __commonJS({
         }
       }
       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());
@@ -17338,7 +17338,7 @@ var require_dist = __commonJS({
                   (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 || ""));
@@ -17348,24 +17348,24 @@ var require_dist = __commonJS({
                   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);
           });
         });
       }
@@ -17376,7 +17376,7 @@ var require_dist = __commonJS({
         this.extensionProviders = providers;
       }
       connectToTarget(wsUrl) {
-        return new Promise((resolve7) => {
+        return new Promise((resolve8) => {
           this.ws = new import_ws2.default(wsUrl);
           this.ws.on("open", async () => {
             this._connected = true;
@@ -17386,17 +17386,17 @@ var require_dist = __commonJS({
             }
             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") {
@@ -17419,7 +17419,7 @@ var require_dist = __commonJS({
           this.ws.on("error", (err) => {
             this.log(`[CDP] WebSocket error: ${err.message}`);
             this._connected = false;
-            resolve7(false);
+            resolve8(false);
           });
         });
       }
@@ -17433,7 +17433,7 @@ var require_dist = __commonJS({
             return;
           }
           this.log(`[CDP] Connecting browser WS for target discovery...`);
-          await new Promise((resolve7, reject) => {
+          await new Promise((resolve8, reject) => {
             this.browserWs = new import_ws2.default(browserWsUrl);
             this.browserWs.on("open", async () => {
               this._browserConnected = true;
@@ -17443,16 +17443,16 @@ var require_dist = __commonJS({
               } 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 {
               }
@@ -17472,31 +17472,31 @@ var require_dist = __commonJS({
         }
       }
       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)) {
@@ -17536,11 +17536,11 @@ var require_dist = __commonJS({
       }
       // ─── 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_ws2.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)) {
@@ -17749,7 +17749,7 @@ var require_dist = __commonJS({
         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) => {
@@ -17758,7 +17758,7 @@ var require_dist = __commonJS({
                 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 {
               }
@@ -17932,14 +17932,14 @@ var require_dist = __commonJS({
         if (!ws || ws.readyState !== import_ws2.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
@@ -17971,10 +17971,10 @@ var require_dist = __commonJS({
           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)) {
@@ -21520,7 +21520,7 @@ var require_dist = __commonJS({
           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",
@@ -21538,7 +21538,7 @@ var require_dist = __commonJS({
                   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", () => {
@@ -21547,7 +21547,7 @@ var require_dist = __commonJS({
                 });
                 req2.end();
               } else {
-                resolve7(res.headers.etag || res.headers["last-modified"] || "");
+                resolve8(res.headers.etag || res.headers["last-modified"] || "");
               }
             });
             req.on("error", reject);
@@ -21611,7 +21611,7 @@ var require_dist = __commonJS({
       downloadFile(url2, 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"));
@@ -21631,7 +21631,7 @@ var require_dist = __commonJS({
               res.pipe(ws);
               ws.on("finish", () => {
                 ws.close();
-                resolve7();
+                resolve8();
               });
               ws.on("error", reject);
             });
@@ -21966,17 +21966,17 @@ var require_dist = __commonJS({
       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) => {
@@ -21985,16 +21985,16 @@ var require_dist = __commonJS({
           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);
         });
       });
     }
@@ -22927,7 +22927,7 @@ var require_dist = __commonJS({
       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)) {
@@ -23077,7 +23077,7 @@ var require_dist = __commonJS({
         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,
@@ -23254,32 +23254,34 @@ var require_dist = __commonJS({
         }
         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") {
-              LOG5.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") {
+                LOG5.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);
@@ -23331,7 +23333,10 @@ var require_dist = __commonJS({
           }
           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()) {
@@ -24118,13 +24123,13 @@ var require_dist = __commonJS({
             }
             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);
             });
@@ -25354,6 +25359,18 @@ ${installInfo}`
               }
             }
           }
+          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)) {
+              LOG5.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);
@@ -26154,15 +26171,15 @@ async (params) => {
             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);
             }
@@ -26245,20 +26262,20 @@ async (params) => {
           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);
             });
           });
@@ -26943,14 +26960,14 @@ async (params) => {
           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;
@@ -28352,14 +28369,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({});
             }
           });
         });
@@ -28726,10 +28743,10 @@ data: ${JSON.stringify(msg.data)}
             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 }, (error48, _stdout, stderr) => {
-                resolve7({
+                resolve8({
                   extensionId: extension.id,
                   marketplaceId: extension.marketplaceId,
                   success: !error48,
@@ -28742,11 +28759,11 @@ data: ${JSON.stringify(msg.data)}
         } 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 }, (error48, stdout, stderr) => {
           if (error48) {
-            resolve7({
+            resolve8({
               extensionId: extension.id,
               marketplaceId: extension.marketplaceId,
               success: false,
@@ -28754,7 +28771,7 @@ data: ${JSON.stringify(msg.data)}
               error: stderr || error48.message
             });
           } else {
-            resolve7({
+            resolve8({
               extensionId: extension.id,
               marketplaceId: extension.marketplaceId,
               success: true,
@@ -30179,7 +30196,7 @@ var init_adhdev_daemon = __esm({
     path2 = __toESM(require("path"));
     crypto2 = __toESM(require("crypto"));
     import_chalk = __toESM(require("chalk"));
-    pkgVersion = "0.5.24";
+    pkgVersion = "0.5.26";
     if (pkgVersion === "unknown") {
       try {
         const possiblePaths = [