@adhdev/daemon-core 0.5.58 → 0.5.60

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.5.58",
+  "version": "0.5.60",
   "description": "ADHDev daemon core — CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/commands/chat-commands.ts

@@ -21,6 +21,7 @@ export async function handleChatHistory(h: CommandHelpers, args: any): Promise<C
 
 export async function handleReadChat(h: CommandHelpers, args: any): Promise<CommandResult> {
     const provider = h.getProvider();
+
     const _log = (msg: string) => LOG.debug('Command', `[read_chat] ${msg}`);
 
     // CLI / ACP category: read from adapter
@@ -141,6 +142,16 @@ export async function handleSendChat(h: CommandHelpers, args: any): Promise<Comm
     const _log = (msg: string) => LOG.debug('Command', `[send_chat] ${msg}`);
     const provider = h.getProvider();
 
+    const _logSendSuccess = (method: string, targetAgent?: string) => {
+        h.historyWriter.appendNewMessages(
+            targetAgent || provider?.type || h.currentIdeType || 'unknown_agent',
+            [{ role: 'user', content: text, receivedAt: Date.now() }],
+            undefined, // title
+            args?.instanceId
+        );
+        return { success: true, sent: true, method, targetAgent };
+    };
+
     // CLI / ACP category: transmit via adapter
     if (provider?.category === 'cli' || provider?.category === 'acp') {
         const adapter = h.getCliAdapter(provider.type);
@@ -148,7 +159,7 @@ export async function handleSendChat(h: CommandHelpers, args: any): Promise<Comm
             _log(`${provider.category} adapter: ${(adapter as any).cliType}`);
             try {
                 await adapter.sendMessage(text);
-                return { success: true, sent: true, method: `${provider.category}-adapter`, targetAgent: (adapter as any).cliType };
+                return _logSendSuccess(`${provider.category}-adapter`, (adapter as any).cliType);
             } catch (e: any) {
                 return { success: false, error: `${provider.category} send failed: ${e.message}` };
             }
@@ -166,7 +177,7 @@ export async function handleSendChat(h: CommandHelpers, args: any): Promise<Comm
                 if (typeof parsed === 'string') { try { parsed = JSON.parse(parsed); } catch { } }
                 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 → AgentStreamManager`);
@@ -180,7 +191,7 @@ export async function handleSendChat(h: CommandHelpers, args: any): Promise<Comm
             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` };
@@ -207,7 +218,7 @@ export async function handleSendChat(h: CommandHelpers, args: any): Promise<Comm
                 if (typeof wvResult === 'string') { try { wvParsed = JSON.parse(wvResult); } catch { } }
                 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`);
             }
@@ -222,7 +233,7 @@ export async function handleSendChat(h: CommandHelpers, args: any): Promise<Comm
             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: any) {
             _log(`typeAndSend(provider) failed: ${e.message}`);
@@ -238,7 +249,7 @@ export async function handleSendChat(h: CommandHelpers, args: any): Promise<Comm
             if (typeof result === 'string') { try { parsed = JSON.parse(result); } catch { } }
             if (parsed?.sent) {
                 _log(`sendMessage script OK`);
-                return { success: true, sent: true, method: 'script' };
+                return _logSendSuccess('script');
             }
             // needsTypeAndSend response: typeAndSend using script-specified selector
             if (parsed?.needsTypeAndSend && parsed?.selector) {
@@ -246,7 +257,7 @@ export async function handleSendChat(h: CommandHelpers, args: any): Promise<Comm
                     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: any) {
                     _log(`typeAndSend(script.selector) failed: ${e.message}`);
@@ -264,7 +275,7 @@ export async function handleSendChat(h: CommandHelpers, args: any): Promise<Comm
                         if (typeof wvResult === 'string') { try { wvParsed = JSON.parse(wvResult); } catch { } }
                         if (wvParsed?.sent) {
                             _log(`webviewSendMessage OK`);
-                            return { success: true, sent: true, method: 'webview-script' };
+                            return _logSendSuccess('webview-script');
                         }
                     }
                 } catch (e: any) {
@@ -278,7 +289,7 @@ export async function handleSendChat(h: CommandHelpers, args: any): Promise<Comm
                     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: any) {
                     _log(`typeAndSendAt failed: ${e.message}`);

package/src/providers/ide-provider-instance.ts

@@ -406,13 +406,40 @@ export class IdeProviderInstance implements ProviderInstance {
 
         this.autoApproveBusy = true;
         try {
-            const script = scriptFn({ action: 'approve', button: '', buttonText: '' });
+            let targetButton = _chatData?.activeModal?.buttons?.[0] || 'Run';
+            const buttons = _chatData?.activeModal?.buttons || [];
+            
+            // Prefer buttons like 'Run', 'Approve', 'Yes'
+            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, 10000);
+            LOG.info('IdeInstance', `[IdeInstance:${this.type}] autoApprove: executing resolveAction for "${targetButton}"`);
+            let rawResult = await cdp.evaluate(script, 10000);
+            if (typeof rawResult === 'string') {
+                try { rawResult = JSON.parse(rawResult); } catch { }
+            }
+            
+            const result: any = rawResult;
             LOG.info('IdeInstance', `[IdeInstance:${this.type}] autoApprove result: ${JSON.stringify(result)?.slice(0, 200)}`);
 
+            if (result?.found && result.x != null && result.y != null) {
+                // Coordinate-based click (fallback when script cannot .click() directly)
+                const x = result.x;
+                const y = result.y;
+                const anyCdp = cdp as any;
+                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,
@@ -422,8 +449,8 @@ export class IdeProviderInstance implements ProviderInstance {
         } catch (e: any) {
             LOG.warn('IdeInstance', `[IdeInstance:${this.type}] autoApprove error: ${e?.message}`);
         } finally {
-            // Debounce: prevent rapid re-approval for at least 500ms
-            setTimeout(() => { this.autoApproveBusy = false; }, 500);
+            // Debounce: prevent rapid re-approval
+            setTimeout(() => { this.autoApproveBusy = false; }, 1000);
         }
     }
 }