@adhdev/daemon-core 0.5.57 → 0.5.60

package/dist/index.js

@@ -2739,11 +2739,35 @@ var IdeProviderInstance = class {
     }
     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;
-      LOG.info("IdeInstance", `[IdeInstance:${this.type}] autoApprove: executing resolveAction`);
-      const result = await cdp.evaluate(script, 1e4);
+      LOG.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;
       LOG.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 });
+        LOG.info("IdeInstance", `[IdeInstance:${this.type}] autoApprove: dispatched mouse event at ${x},${y}`);
+      }
       this.pushEvent({
         event: "agent:auto_approved",
         chatTitle: _chatData?.title || this.provider.name,
@@ -2755,7 +2779,7 @@ var IdeProviderInstance = class {
     } finally {
       setTimeout(() => {
         this.autoApproveBusy = false;
-      }, 500);
+      }, 1e3);
     }
   }
 };
@@ -3347,13 +3371,23 @@ async function handleSendChat(h, args) {
   if (!text) return { success: false, error: "text required" };
   const _log = (msg) => LOG.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}` };
       }
@@ -3373,7 +3407,7 @@ async function handleSendChat(h, args) {
         }
         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`);
@@ -3386,7 +3420,7 @@ async function handleSendChat(h, args) {
       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` };
@@ -3413,7 +3447,7 @@ async function handleSendChat(h, args) {
         }
         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`);
       }
@@ -3426,7 +3460,7 @@ async function handleSendChat(h, args) {
       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}`);
@@ -3445,14 +3479,14 @@ async function handleSendChat(h, args) {
       }
       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}`);
@@ -3474,7 +3508,7 @@ async function handleSendChat(h, args) {
             }
             if (wvParsed?.sent) {
               _log(`webviewSendMessage OK`);
-              return { success: true, sent: true, method: "webview-script" };
+              return _logSendSuccess("webview-script");
             }
           }
         } catch (e) {
@@ -3487,7 +3521,7 @@ async function handleSendChat(h, args) {
           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}`);