adhdev 0.5.58 → 0.5.61

package/dist/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 = [