@adhdev/daemon-core 0.5.5 → 0.5.6

package/package.json

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

package/src/cli-adapters/provider-cli-adapter.ts

@@ -185,29 +185,30 @@ function coercePatternArray(raw: unknown, fallbacks: RegExp[]): RegExp[] {
 /** Defaults tuned for Claude Code / similar agent CLIs when provider.json patterns are empty. */
 const FALLBACK_PROMPT: RegExp[] = [
     /Type your message/i,
-    />\s*$/,
+    /^>\s*$/m,             // '>' alone on its own line
     /[›➤]\s*$/,
     /for shortcuts/i,
     /\?\s*for help/i,
     /Press enter/i,
-    /^[\s\u2500-\u257f]*>\s*$/m,
+    // NOTE: removed /^[\s\u2500-\u257f]*>\s*$/m — the box-drawing char range is too wide and
+    // can match dialog-clearing ANSI output, causing false prompt detection in approval state.
 ];
 
 const FALLBACK_GENERATING: RegExp[] = [
-    /thinking/i,
-    /writing/i,
-    /Claude is/i,
-    /Opus|Sonnet|Haiku/i,
-    /[\u2800-\u28ff]/, // Braille spinner blocks
+    /[\u2800-\u28ff]/,                             // Braille spinner blocks (universal TUI)
+    /esc to (cancel|interrupt|stop)/i,             // Common TUI generation status line
+    /generating\.\.\./i,
+    /Claude is (?:thinking|processing|working)/i,  // Specific Claude Code status
 ];
 
 const FALLBACK_APPROVAL: RegExp[] = [
-    /approve/i,
-    /Allow( once)?/i,
+    /Allow\s+once/i,
+    /Always\s+allow/i,
     /\(y\/n\)/i,
     /\[Y\/n\]/i,
-    /continue\?/i,
-    /Run this command/i,
+    /Run\s+this\s+command/i,
+    // NOTE: removed /Do you want to (?:run|execute|allow)/i — too broad, matches AI explanation
+    // text like "Do you want to allow this feature?" causing false approval notifications.
 ];
 
 function defaultCleanOutput(raw: string, _lastUserInput?: string): string {
@@ -260,6 +261,13 @@ export class ProviderCliAdapter implements CliAdapter {
  // Approval cooldown
     private lastApprovalResolvedAt: number = 0;
 
+ // Approval state machine
+    private approvalTransitionBuffer: string = '';
+    private approvalExitTimeout: NodeJS.Timeout | null = null;
+
+ // Resize redraw suppression
+    private resizeSuppressUntil: number = 0;
+
  // Resolved timeouts (provider defaults + overrides)
     private readonly timeouts: Required<NonNullable<CliProviderModule['timeouts']>>;
 
@@ -394,6 +402,9 @@ export class ProviderCliAdapter implements CliAdapter {
  // ─── Output state machine ────────────────────────────
 
     private handleOutput(rawData: string): void {
+ // Suppress output processing briefly after resize to avoid false triggers from screen redraws
+        if (Date.now() < this.resizeSuppressUntil) return;
+
         const cleanData = stripAnsi(rawData);
         const { patterns } = this.provider;
 
@@ -439,32 +450,57 @@ export class ProviderCliAdapter implements CliAdapter {
         if (hasApproval && this.currentStatus !== 'waiting_approval') {
             if (this.lastApprovalResolvedAt && (Date.now() - this.lastApprovalResolvedAt) < this.timeouts.approvalCooldown) return;
 
+            // Capture context before clearing (recentOutputBuffer still has content here)
+            const ctxLines = this.recentOutputBuffer.split('\n')
+                .map(l => l.trim())
+                .filter(l => l && !/^[─═╭╮╰╯│]+$/.test(l));
             this.isWaitingForResponse = true;
             this.currentStatus = 'waiting_approval';
             this.recentOutputBuffer = '';
-            const ctxLines = cleanData.split('\n').map(l => l.trim()).filter(l => l && !/^[─═╭╮╰╯│]+$/.test(l));
+            this.approvalTransitionBuffer = '';
             this.activeModal = {
                 message: ctxLines.slice(-5).join(' ').slice(0, 200) || 'Approval required',
                 buttons: ['Allow once', 'Always allow', 'Deny'],
             };
             if (this.idleTimeout) clearTimeout(this.idleTimeout);
+            // Safety timeout — if stuck in waiting_approval, auto-exit after 60s
+            if (this.approvalExitTimeout) clearTimeout(this.approvalExitTimeout);
+            this.approvalExitTimeout = setTimeout(() => {
+                if (this.currentStatus === 'waiting_approval') {
+                    LOG.warn('CLI', `[${this.cliType}] Approval timeout — auto-exiting waiting_approval`);
+                    this.activeModal = null;
+                    this.lastApprovalResolvedAt = Date.now();
+                    this.recentOutputBuffer = '';
+                    this.approvalTransitionBuffer = '';
+                    this.approvalExitTimeout = null;
+                    this.currentStatus = this.isWaitingForResponse ? 'generating' : 'idle';
+                    this.onStatusChange?.();
+                }
+            }, 60000);
             this.onStatusChange?.();
             return;
         }
 
  // ─── Phase 3: Approval release
+ // Accumulate chunks into approvalTransitionBuffer — the approval dialog clears via ANSI
+ // sequences that strip to nothing, so we can't rely on a single cleanData chunk matching.
         if (this.currentStatus === 'waiting_approval') {
-            const genResume = patterns.generating.some(p => p.test(cleanData));
-            const promptResume = patterns.prompt.some(p => p.test(cleanData));
+            this.approvalTransitionBuffer = (this.approvalTransitionBuffer + cleanData).slice(-500);
+            const genResume = patterns.generating.some(p => p.test(this.approvalTransitionBuffer));
+            const promptResume = patterns.prompt.some(p => p.test(this.approvalTransitionBuffer));
             if (genResume) {
+                if (this.approvalExitTimeout) { clearTimeout(this.approvalExitTimeout); this.approvalExitTimeout = null; }
                 this.currentStatus = 'generating';
                 this.activeModal = null;
                 this.recentOutputBuffer = '';
+                this.approvalTransitionBuffer = '';
                 this.lastApprovalResolvedAt = Date.now();
                 this.onStatusChange?.();
             } else if (promptResume) {
+                if (this.approvalExitTimeout) { clearTimeout(this.approvalExitTimeout); this.approvalExitTimeout = null; }
                 this.activeModal = null;
                 this.recentOutputBuffer = '';
+                this.approvalTransitionBuffer = '';
                 this.lastApprovalResolvedAt = Date.now();
                 this.finishResponse();
             }
@@ -497,7 +533,11 @@ export class ProviderCliAdapter implements CliAdapter {
             }
 
  // Prompt → response complete
-            if (patterns.prompt.some(p => p.test(this.responseBuffer))) {
+ // Only check the LAST 2 lines of cleanData — the prompt appears at the very end of the
+ // output stream. Checking the full chunk causes false positives when response content
+ // has '>' in code blocks, shell examples, or mid-response lines.
+            const trailingLines = cleanData.split('\n').slice(-2).join('\n');
+            if (patterns.prompt.some(p => p.test(trailingLines))) {
                 this.finishResponse();
             } else {
                 this.idleTimeout = setTimeout(() => {
@@ -513,6 +553,7 @@ export class ProviderCliAdapter implements CliAdapter {
     private finishResponse(): void {
         if (this.responseTimeout) { clearTimeout(this.responseTimeout); this.responseTimeout = null; }
         if (this.idleTimeout) { clearTimeout(this.idleTimeout); this.idleTimeout = null; }
+        if (this.approvalExitTimeout) { clearTimeout(this.approvalExitTimeout); this.approvalExitTimeout = null; }
 
         const lastUserText = this.messages.filter(m => m.role === 'user').pop()?.content;
         let response = this.provider.cleanOutput(this.responseBuffer, lastUserText);
@@ -576,6 +617,7 @@ export class ProviderCliAdapter implements CliAdapter {
     cancel(): void { this.shutdown(); }
 
     shutdown(): void {
+        if (this.approvalExitTimeout) { clearTimeout(this.approvalExitTimeout); this.approvalExitTimeout = null; }
         if (this.ptyProcess) {
             this.ptyProcess.write('\x03');
             setTimeout(() => {
@@ -600,9 +642,26 @@ export class ProviderCliAdapter implements CliAdapter {
         this.ptyProcess?.write(data);
     }
 
+ /**
+ * Resolve an approval modal by navigating to the button at `buttonIndex` and pressing Enter.
+ * Index 0 = first option (already selected by default — just Enter).
+ * Index N = press Arrow Down N times, then Enter.
+ */
+    resolveModal(buttonIndex: number): void {
+        if (!this.ptyProcess || this.currentStatus !== 'waiting_approval') return;
+        const DOWN = '\x1B[B'; // Arrow Down
+        const keys = DOWN.repeat(Math.max(0, buttonIndex)) + '\r';
+        this.ptyProcess.write(keys);
+    }
+
     resize(cols: number, rows: number): void {
         if (this.ptyProcess) {
-            try { this.ptyProcess.resize(cols, rows); } catch { }
+            try {
+                this.ptyProcess.resize(cols, rows);
+ // Suppress output for 300ms after resize — PTY redraws the screen and
+ // the redrawn content (spinners, status text) would falsely trigger generating detection
+                this.resizeSuppressUntil = Date.now() + 300;
+            } catch { }
         }
     }
 }

package/src/commands/chat-commands.ts

@@ -601,6 +601,42 @@ export async function handleResolveAction(h: CommandHelpers, args: any): Promise
 
     LOG.info('Command', `[resolveAction] action=${action} button="${button}" provider=${provider?.type}`);
 
+    // 0. CLI / ACP category: navigate approval dialog via PTY arrow keys + Enter
+    if (provider?.category === 'cli') {
+        const adapter = h.getCliAdapter(provider.type);
+        if (!adapter) return { success: false, error: 'CLI adapter not running' };
+        const status = (adapter as any).getStatus?.();
+        if (status?.status !== 'waiting_approval') {
+            return { success: false, error: 'Not in approval state' };
+        }
+        const buttons: string[] = status.activeModal?.buttons || ['Allow once', 'Always allow', 'Deny'];
+        // Resolve button index: explicit buttonIndex arg → button text match → action fallback
+        let buttonIndex = typeof args?.buttonIndex === 'number' ? args.buttonIndex : -1;
+        if (buttonIndex < 0) {
+            const btnLower = button.toLowerCase();
+            buttonIndex = buttons.findIndex(b => b.toLowerCase().includes(btnLower));
+        }
+        if (buttonIndex < 0) {
+            if (action === 'reject' || action === 'deny') {
+                buttonIndex = buttons.findIndex(b => /deny|reject|no/i.test(b));
+                if (buttonIndex < 0) buttonIndex = buttons.length - 1;
+            } else if (action === 'always' || /always/i.test(button)) {
+                buttonIndex = buttons.findIndex(b => /always/i.test(b));
+                if (buttonIndex < 0) buttonIndex = 1;
+            } else {
+                buttonIndex = 0; // approve → first option (default selected)
+            }
+        }
+        if (typeof (adapter as any).resolveModal === 'function') {
+            (adapter as any).resolveModal(buttonIndex);
+        } else {
+            const keys = '\x1B[B'.repeat(Math.max(0, buttonIndex)) + '\r';
+            (adapter as any).writeRaw?.(keys);
+        }
+        LOG.info('Command', `[resolveAction] CLI PTY → buttonIndex=${buttonIndex} "${buttons[buttonIndex] ?? '?'}"`);
+        return { success: true, buttonIndex, button: buttons[buttonIndex] ?? button };
+    }
+
     // 1. Extension: via AgentStreamManager
     if (provider?.category === 'extension' && h.agentStream && h.getCdp()) {
         const ok = await h.agentStream.resolveAgentAction(

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

@@ -13,6 +13,7 @@ import { ProviderCliAdapter } from '../cli-adapters/provider-cli-adapter.js';
 import type { CliProviderModule } from '../cli-adapters/provider-cli-adapter.js';
 import { StatusMonitor } from './status-monitor.js';
 import { ChatHistoryWriter } from '../config/chat-history.js';
+import { LOG } from '../logging/logger.js';
 
 export class CliProviderInstance implements ProviderInstance {
     readonly type: string;
@@ -156,18 +157,22 @@ export class CliProviderInstance implements ProviderInstance {
         const chatTitle = `${this.provider.name} · ${dirName}`;
 
         if (newStatus !== this.lastStatus) {
+            LOG.info('CLI', `[${this.type}] status: ${this.lastStatus} → ${newStatus}`);
             if (this.lastStatus === 'idle' && newStatus === 'generating') {
                 this.generatingStartedAt = now;
                 this.pushEvent({ event: 'agent:generating_started', chatTitle, timestamp: now });
             } else if (newStatus === 'waiting_approval') {
                 if (!this.generatingStartedAt) this.generatingStartedAt = now;
+                const modal = adapterStatus.activeModal;
+                LOG.info('CLI', `[${this.type}] approval modal: "${modal?.message?.slice(0, 80) ?? 'none'}"`);
                 this.pushEvent({
                     event: 'agent:waiting_approval', chatTitle, timestamp: now,
-                    modalMessage: adapterStatus.activeModal?.message,
-                    modalButtons: adapterStatus.activeModal?.buttons,
+                    modalMessage: modal?.message,
+                    modalButtons: modal?.buttons,
                 });
             } else if (newStatus === 'idle' && (this.lastStatus === 'generating' || this.lastStatus === 'waiting_approval')) {
                 const duration = this.generatingStartedAt ? Math.round((now - this.generatingStartedAt) / 1000) : 0;
+                LOG.info('CLI', `[${this.type}] completed in ${duration}s`);
                 this.pushEvent({ event: 'agent:generating_completed', chatTitle, duration, timestamp: now });
                 this.generatingStartedAt = 0;
             } else if (newStatus === 'stopped') {