adhdev 0.5.58 → 0.5.61

package/dist/cli/index.js

@@ -19054,11 +19054,35 @@ var require_dist = __commonJS({
         }
         this.autoApproveBusy = true;
         try {
-          const script = scriptFn({ action: "approve", button: "", buttonText: "" });
+          let targetButton = _chatData?.activeModal?.buttons?.[0] || "Run";
+          const buttons = _chatData?.activeModal?.buttons || [];
+          for (const b of buttons) {
+            const lower = String(b).toLowerCase().replace(/[^\w]/g, "");
+            if (/^(run|approve|accept|yes|allow|always|proceed|save)/.test(lower)) {
+              targetButton = b;
+              break;
+            }
+          }
+          const script = scriptFn({ action: "approve", button: targetButton, buttonText: targetButton });
           if (!script) return;
-          LOG5.info("IdeInstance", `[IdeInstance:${this.type}] autoApprove: executing resolveAction`);
-          const result = await cdp.evaluate(script, 1e4);
+          LOG5.info("IdeInstance", `[IdeInstance:${this.type}] autoApprove: executing resolveAction for "${targetButton}"`);
+          let rawResult = await cdp.evaluate(script, 1e4);
+          if (typeof rawResult === "string") {
+            try {
+              rawResult = JSON.parse(rawResult);
+            } catch {
+            }
+          }
+          const result = rawResult;
           LOG5.info("IdeInstance", `[IdeInstance:${this.type}] autoApprove result: ${JSON.stringify(result)?.slice(0, 200)}`);
+          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 });
+            LOG5.info("IdeInstance", `[IdeInstance:${this.type}] autoApprove: dispatched mouse event at ${x},${y}`);
+          }
           this.pushEvent({
             event: "agent:auto_approved",
             chatTitle: _chatData?.title || this.provider.name,
@@ -19070,7 +19094,7 @@ var require_dist = __commonJS({
         } finally {
           setTimeout(() => {
             this.autoApproveBusy = false;
-          }, 500);
+          }, 1e3);
         }
       }
     };
@@ -19650,13 +19674,23 @@ var require_dist = __commonJS({
       if (!text) return { success: false, error: "text required" };
       const _log = (msg) => LOG5.debug("Command", `[send_chat] ${msg}`);
       const provider = h.getProvider();
+      const _logSendSuccess = (method, targetAgent) => {
+        h.historyWriter.appendNewMessages(
+          targetAgent || provider?.type || h.currentIdeType || "unknown_agent",
+          [{ role: "user", content: text, receivedAt: Date.now() }],
+          void 0,
+          // title
+          args?.instanceId
+        );
+        return { success: true, sent: true, method, targetAgent };
+      };
       if (provider?.category === "cli" || provider?.category === "acp") {
         const adapter = h.getCliAdapter(provider.type);
         if (adapter) {
           _log(`${provider.category} adapter: ${adapter.cliType}`);
           try {
             await adapter.sendMessage(text);
-            return { success: true, sent: true, method: `${provider.category}-adapter`, targetAgent: adapter.cliType };
+            return _logSendSuccess(`${provider.category}-adapter`, adapter.cliType);
           } catch (e) {
             return { success: false, error: `${provider.category} send failed: ${e.message}` };
           }
@@ -19676,7 +19710,7 @@ var require_dist = __commonJS({
             }
             if (parsed?.sent) {
               _log(`Extension script sent OK`);
-              return { success: true, sent: true, method: "extension-script" };
+              return _logSendSuccess("extension-script");
             }
             if (parsed?.needsTypeAndSend) {
               _log(`Extension needsTypeAndSend \u2192 AgentStreamManager`);
@@ -19689,7 +19723,7 @@ var require_dist = __commonJS({
           const ok = await h.agentStream.sendToAgent(h.getCdp(), provider.type, text, h.currentIdeType);
           if (ok) {
             _log(`AgentStreamManager sent OK`);
-            return { success: true, sent: true, method: "agent-stream" };
+            return _logSendSuccess("agent-stream");
           }
         }
         return { success: false, error: `Extension '${provider.type}' send failed` };
@@ -19716,7 +19750,7 @@ var require_dist = __commonJS({
             }
             if (wvParsed?.sent) {
               _log(`webviewSendMessage (priority) OK`);
-              return { success: true, sent: true, method: "webview-script-priority" };
+              return _logSendSuccess("webview-script-priority");
             }
             _log(`webviewSendMessage (priority) did not confirm sent, falling through`);
           }
@@ -19729,7 +19763,7 @@ var require_dist = __commonJS({
           const sent = await targetCdp.typeAndSend(provider.inputSelector, text);
           if (sent) {
             _log(`typeAndSend(provider.inputSelector=${provider.inputSelector}) success`);
-            return { success: true, sent: true, method: "typeAndSend-provider" };
+            return _logSendSuccess("typeAndSend-provider");
           }
         } catch (e) {
           _log(`typeAndSend(provider) failed: ${e.message}`);
@@ -19748,14 +19782,14 @@ var require_dist = __commonJS({
           }
           if (parsed?.sent) {
             _log(`sendMessage script OK`);
-            return { success: true, sent: true, method: "script" };
+            return _logSendSuccess("script");
           }
           if (parsed?.needsTypeAndSend && parsed?.selector) {
             try {
               const sent = await targetCdp.typeAndSend(parsed.selector, text);
               if (sent) {
                 _log(`typeAndSend(script.selector=${parsed.selector}) success`);
-                return { success: true, sent: true, method: "typeAndSend-script" };
+                return _logSendSuccess("typeAndSend-script");
               }
             } catch (e) {
               _log(`typeAndSend(script.selector) failed: ${e.message}`);
@@ -19777,7 +19811,7 @@ var require_dist = __commonJS({
                 }
                 if (wvParsed?.sent) {
                   _log(`webviewSendMessage OK`);
-                  return { success: true, sent: true, method: "webview-script" };
+                  return _logSendSuccess("webview-script");
                 }
               }
             } catch (e) {
@@ -19790,7 +19824,7 @@ var require_dist = __commonJS({
               const sent = await targetCdp.typeAndSendAt(x, y, text);
               if (sent) {
                 _log(`typeAndSendAt(${x},${y}) success`);
-                return { success: true, sent: true, method: "typeAndSendAt-script" };
+                return _logSendSuccess("typeAndSendAt-script");
               }
             } catch (e) {
               _log(`typeAndSendAt failed: ${e.message}`);
@@ -21216,6 +21250,8 @@ var require_dist = __commonJS({
       }
       async handleRefreshScripts(_args) {
         if (this._ctx.providerLoader) {
+          await this._ctx.providerLoader.fetchLatest().catch(() => {
+          });
           this._ctx.providerLoader.reload();
           return { success: true };
         }
@@ -23242,13 +23278,12 @@ var require_dist = __commonJS({
       /Always\s*allow/i,
       /\(y\/n\)/i,
       /\[Y\/n\]/i,
-      /Run\s*this\s*command/i,
-      /Allow\s*tool/i,
-      // Claude Code v2 approval
+      /Run\s+\w+\s+command/i,
+      // "Run bash command" etc — requires surrounding words to avoid false matches
       /Yes,?\s*don'?t\s*ask/i,
       // "Yes, don't ask again" (Claude Code)
-      /Deny/i
-      // Deny button presence = approval dialog
+      /\bDeny\b/i
+      // Word-boundary match — avoids "allow & deny" in /permissions menu text
     ];
     function defaultCleanOutput(raw, _lastUserInput) {
       return stripAnsi(raw).trim();
@@ -23277,7 +23312,7 @@ var require_dist = __commonJS({
         this.timeouts = {
           ptyFlush: t.ptyFlush ?? 50,
           dialogAccept: t.dialogAccept ?? 300,
-          approvalCooldown: t.approvalCooldown ?? 500,
+          approvalCooldown: t.approvalCooldown ?? 3e3,
           generatingIdle: t.generatingIdle ?? 6e3,
           idleFinish: t.idleFinish ?? 5e3,
           maxResponse: t.maxResponse ?? 3e5,
@@ -30462,7 +30497,7 @@ var init_adhdev_daemon = __esm({
     fs2 = __toESM(require("fs"));
     path2 = __toESM(require("path"));
     import_chalk = __toESM(require("chalk"));
-    pkgVersion = "0.5.58";
+    pkgVersion = "0.5.61";
     if (pkgVersion === "unknown") {
       try {
         const possiblePaths = [
@@ -31186,6 +31221,124 @@ ${import_chalk2.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 WebSocket2 = (await import("ws")).default;
+  const { DAEMON_WS_PATH } = await Promise.resolve().then(() => __toESM(require_dist()));
+  return new Promise((resolve, reject) => {
+    const wsUrl = `ws://127.0.0.1:${port}${DAEMON_WS_PATH || "/daemon"}`;
+    const ws = new WebSocket2(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();
+          resolve(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 http = await import("http");
+  const targets = await new Promise((resolve, reject) => {
+    http.get(`http://127.0.0.1:${port}/json`, (res) => {
+      let data = "";
+      res.on("data", (c) => data += c);
+      res.on("end", () => {
+        try {
+          resolve(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 WebSocket2 = (await import("ws")).default;
+  return new Promise((resolve, reject) => {
+    const ws = new WebSocket2(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) {
+          resolve(msg.result.result.value);
+        } else if (msg.result?.exceptionDetails) {
+          reject(new Error(msg.result.exceptionDetails.text));
+        } else {
+          resolve(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/cli/index.ts
 var import_commander = require("commander");
 var import_chalk6 = __toESM(require("chalk"));
@@ -31645,116 +31798,7 @@ function registerDaemonCommands(program2, pkgVersion3) {
 
 // src/cli/provider-commands.ts
 var import_chalk5 = __toESM(require("chalk"));
-
-// src/cli/cdp-utils.ts
-async function sendDaemonCommand(cmd, args = {}, port = 19222) {
-  const WebSocket2 = (await import("ws")).default;
-  const { DAEMON_WS_PATH } = await Promise.resolve().then(() => __toESM(require_dist()));
-  return new Promise((resolve, reject) => {
-    const wsUrl = `ws://127.0.0.1:${port}${DAEMON_WS_PATH || "/daemon"}`;
-    const ws = new WebSocket2(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();
-          resolve(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 http = await import("http");
-  const targets = await new Promise((resolve, reject) => {
-    http.get(`http://127.0.0.1:${port}/json`, (res) => {
-      let data = "";
-      res.on("data", (c) => data += c);
-      res.on("end", () => {
-        try {
-          resolve(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 WebSocket2 = (await import("ws")).default;
-  return new Promise((resolve, reject) => {
-    const ws = new WebSocket2(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) {
-          resolve(msg.result.result.value);
-        } else if (msg.result?.exceptionDetails) {
-          reject(new Error(msg.result.exceptionDetails.text));
-        } else {
-          resolve(msg.result);
-        }
-      }
-    });
-    ws.on("error", (e) => {
-      clearTimeout(timeout);
-      reject(new Error(`CDP connection failed: ${e.message}`));
-    });
-  });
-}
-
-// src/cli/provider-commands.ts
+init_cdp_utils();
 function registerProviderCommands(program2) {
   const provider = program2.command("provider").description("\u{1F50C} Provider management \u2014 list, test, reload providers");
   provider.command("list").description("List all loaded providers").option("-j, --json", "Output raw JSON").action(async (options) => {
@@ -31797,49 +31841,63 @@ function registerProviderCommands(program2) {
       process.exit(1);
     }
   });
-  provider.command("reload").description("Hot-reload all providers (requires daemon --dev)").action(async () => {
+  provider.command("reload").description("Hot-reload all providers from upstream and restart daemon provider state").action(async () => {
     try {
-      const http = await import("http");
-      const result = await new Promise((resolve, reject) => {
-        const req = http.request({
-          hostname: "127.0.0.1",
-          port: 19280,
-          path: "/api/providers/reload",
-          method: "POST",
-          headers: { "Content-Type": "application/json", "Content-Length": "2" }
-        }, (res) => {
-          let data = "";
-          res.on("data", (c) => data += c);
-          res.on("end", () => {
-            try {
-              resolve(JSON.parse(data));
-            } catch {
-              resolve({ raw: data });
-            }
-          });
-        });
-        req.on("error", () => reject(new Error("DevServer not reachable. Run: adhdev daemon --dev")));
-        req.write("{}");
-        req.end();
-      });
-      if (result.reloaded) {
-        console.log(import_chalk5.default.green(`
-  \u2713 Providers reloaded: ${result.providers?.length || 0} loaded
+      const { sendDaemonCommand: sendDaemonCommand2 } = await Promise.resolve().then(() => (init_cdp_utils(), cdp_utils_exports));
+      const result = await sendDaemonCommand2("refresh_scripts", {});
+      console.log(import_chalk5.default.green(`
+  \u2713 Providers reloaded
 `));
-        for (const p of result.providers || []) {
+      if (result?.providers?.length) {
+        for (const p of result.providers) {
           console.log(`    ${import_chalk5.default.green("\u2713")} ${p.type} (${p.category}) \u2014 ${p.name}`);
         }
         console.log();
-      } else {
-        console.log(import_chalk5.default.red(`
+      }
+    } catch {
+      try {
+        const http = await import("http");
+        const result = await new Promise((resolve, reject) => {
+          const req = http.request({
+            hostname: "127.0.0.1",
+            port: 19280,
+            path: "/api/providers/reload",
+            method: "POST",
+            headers: { "Content-Type": "application/json", "Content-Length": "2" }
+          }, (res) => {
+            let data = "";
+            res.on("data", (c) => data += c);
+            res.on("end", () => {
+              try {
+                resolve(JSON.parse(data));
+              } catch {
+                resolve({ raw: data });
+              }
+            });
+          });
+          req.on("error", () => reject(new Error("Daemon not reachable. Is adhdev daemon running?")));
+          req.write("{}");
+          req.end();
+        });
+        if (result.reloaded) {
+          console.log(import_chalk5.default.green(`
+  \u2713 Providers reloaded: ${result.providers?.length || 0} loaded
+`));
+          for (const p of result.providers || []) {
+            console.log(`    ${import_chalk5.default.green("\u2713")} ${p.type} (${p.category}) \u2014 ${p.name}`);
+          }
+          console.log();
+        } else {
+          console.log(import_chalk5.default.red(`
   \u2717 Reload failed: ${result.error || "unknown"}
 `));
-      }
-    } catch (e) {
-      console.error(import_chalk5.default.red(`
+        }
+      } catch (e) {
+        console.error(import_chalk5.default.red(`
 \u2717 ${e.message}
 `));
-      process.exit(1);
+        process.exit(1);
+      }
     }
   });
   provider.command("create <type>").description("Scaffold a new provider.js from template").option("-n, --name <name>", "Display name").option("-c, --category <cat>", "Category: ide, extension, cli", "ide").option("--builtin", "Create in builtin directory (default: ~/.adhdev/providers/)").action(async (type, options) => {