@adhdev/daemon-core 0.5.31 → 0.5.33

package/package.json

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

package/src/agent-stream/manager.ts

@@ -47,9 +47,11 @@ export class DaemonAgentStreamManager {
         if (providerLoader) {
             const allExtProviders = providerLoader.getByCategory('extension');
             for (const p of allExtProviders) {
-                const adapter = new ProviderStreamAdapter(p);
+                const resolved = providerLoader.resolve(p.type);
+                if (!resolved) continue;
+                const adapter = new ProviderStreamAdapter(resolved);
                 this.allAdapters.push(adapter);
-                this.logFn(`[AgentStream] Adapter created: ${p.type} (${p.name})`);
+                this.logFn(`[AgentStream] Adapter created: ${p.type} (${p.name}) scripts=${Object.keys(resolved.scripts || {}).join(',') || 'none'}`);
             }
         }
     }
@@ -147,6 +149,7 @@ export class DaemonAgentStreamManager {
                     const evaluate: AgentEvaluateFn = (expr, timeout) =>
                         cdp.evaluateInSessionFrame(agent.sessionId, expr, timeout);
                     const state = await agent.adapter.readChat(evaluate);
+                    this.logFn(`[AgentStream] readChat(${type}) result: status=${state.status} msgs=${state.messages?.length || 0} model=${state.model || ''}${state.status === 'error' ? ' error=' + JSON.stringify((state as any).error || (state as any)._error || 'unknown') : ''}`);
                     agent.lastState = state;
                     agent.lastError = null;
                     if (state.status === 'panel_hidden') {

package/src/agent-stream/provider-adapter.ts

@@ -133,6 +133,7 @@ export class ProviderStreamAdapter implements IAgentStreamAdapter {
             status: 'error',
             messages: [],
             inputContent: '',
-        };
+            _error: message,
+        } as any;
     }
 }

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

@@ -95,9 +95,16 @@ export interface CliProviderModule {
 
 function stripAnsi(str: string): string {
  // eslint-disable-next-line no-control-regex
-    return str.replace(/\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g, '')
+    return str
+        // Cursor movement sequences → space (prevents word concatenation)
+        .replace(/\x1B\[\d*[A-HJKSTfG]/g, ' ')
+        // SGR and other CSI sequences → remove
+        .replace(/\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g, '')
+        // OSC sequences (title bar etc)
         .replace(/\x1B\][^\x07]*\x07/g, '')
-        .replace(/\x1B\][^\x1B]*\x1B\\/g, '');
+        .replace(/\x1B\][^\x1B]*\x1B\\/g, '')
+        // Collapse multiple spaces
+        .replace(/  +/g, ' ');
 }
 
 function findBinary(name: string): string {
@@ -469,6 +476,10 @@ export class ProviderCliAdapter implements CliAdapter {
         }
 
  // ─── Phase 2: Approval detect
+        // DEBUG: log recent output for approval pattern debugging
+        if (cleanData.trim().length > 5) {
+            LOG.debug('CLI', `[${this.cliType}] output chunk (${cleanData.length}): ${cleanData.slice(0, 300).replace(/\n/g, '\\n')}`);
+        }
         const hasApproval = patterns.approval.some(p => p.test(this.recentOutputBuffer));
         if (hasApproval && this.currentStatus !== 'waiting_approval') {
             const inCooldown = this.lastApprovalResolvedAt && (Date.now() - this.lastApprovalResolvedAt) < this.timeouts.approvalCooldown;

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

@@ -28,6 +28,7 @@ export class CliProviderInstance implements ProviderInstance {
     private monitor: StatusMonitor;
     private generatingDebounceTimer: NodeJS.Timeout | null = null;
     private generatingDebouncePending: { chatTitle: string; timestamp: number } | null = null;
+    private lastApprovalEventAt = 0;
     private historyWriter: ChatHistoryWriter;
     readonly instanceId: string;
 
@@ -149,7 +150,8 @@ export class CliProviderInstance implements ProviderInstance {
         this.monitor.reset();
     }
 
- // ─── Status transition detection (moved from daemon-status.ts) ──────
+    private completedDebounceTimer: NodeJS.Timeout | null = null;
+    private completedDebouncePending: { chatTitle: string; duration: number; timestamp: number } | null = null;
 
     private detectStatusTransition(): void {
         const now = Date.now();
@@ -161,7 +163,14 @@ export class CliProviderInstance implements ProviderInstance {
         if (newStatus !== this.lastStatus) {
             LOG.info('CLI', `[${this.type}] status: ${this.lastStatus} → ${newStatus}`);
             if (this.lastStatus === 'idle' && newStatus === 'generating') {
-                this.generatingStartedAt = now;
+                // Cancel any pending completed event (multi-step: idle→generating resume)
+                if (this.completedDebouncePending) {
+                    LOG.info('CLI', `[${this.type}] cancelled pending completed (resumed generating)`);
+                    if (this.completedDebounceTimer) { clearTimeout(this.completedDebounceTimer); this.completedDebounceTimer = null; }
+                    this.completedDebouncePending = null;
+                }
+
+                if (!this.generatingStartedAt) this.generatingStartedAt = now;
                 // Defer the generating_started event — if idle comes back within 1s,
                 // the whole started→completed pair was a false positive from PTY noise
                 if (this.generatingDebounceTimer) clearTimeout(this.generatingDebounceTimer);
@@ -180,14 +189,23 @@ export class CliProviderInstance implements ProviderInstance {
                     this.pushEvent({ event: 'agent:generating_started', ...this.generatingDebouncePending });
                     this.generatingDebouncePending = null;
                 }
+                // Cancel any pending completed
+                if (this.completedDebounceTimer) { clearTimeout(this.completedDebounceTimer); this.completedDebounceTimer = null; }
+                this.completedDebouncePending = null;
+
                 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: modal?.message,
-                    modalButtons: modal?.buttons,
-                });
+                // Only push event if not already in waiting_approval (prevent flood from rapid cycles)
+                const approvalCooldown = 5000;
+                if (this.lastStatus !== 'waiting_approval' && (!this.lastApprovalEventAt || now - this.lastApprovalEventAt > approvalCooldown)) {
+                    this.lastApprovalEventAt = now;
+                    this.pushEvent({
+                        event: 'agent:waiting_approval', chatTitle, timestamp: now,
+                        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;
                 // If debounce still pending (generating lasted < 1s), cancel both events
@@ -195,15 +213,27 @@ export class CliProviderInstance implements ProviderInstance {
                     LOG.info('CLI', `[${this.type}] suppressed short generating (${now - this.generatingStartedAt}ms)`);
                     if (this.generatingDebounceTimer) { clearTimeout(this.generatingDebounceTimer); this.generatingDebounceTimer = null; }
                     this.generatingDebouncePending = null;
+                    this.generatingStartedAt = 0;
                 } else {
-                    LOG.info('CLI', `[${this.type}] completed in ${duration}s`);
-                    this.pushEvent({ event: 'agent:generating_completed', chatTitle, duration, timestamp: now });
+                    // Debounce completed — wait 2s, if still idle then emit
+                    if (this.completedDebounceTimer) clearTimeout(this.completedDebounceTimer);
+                    this.completedDebouncePending = { chatTitle, duration, timestamp: now };
+                    this.completedDebounceTimer = setTimeout(() => {
+                        if (this.completedDebouncePending) {
+                            LOG.info('CLI', `[${this.type}] completed in ${this.completedDebouncePending.duration}s`);
+                            this.pushEvent({ event: 'agent:generating_completed', ...this.completedDebouncePending });
+                            this.completedDebouncePending = null;
+                            this.generatingStartedAt = 0;
+                        }
+                        this.completedDebounceTimer = null;
+                    }, 2000);
                 }
-                this.generatingStartedAt = 0;
             } else if (newStatus === 'stopped') {
                 // Cancel any pending debounce
                 if (this.generatingDebounceTimer) { clearTimeout(this.generatingDebounceTimer); this.generatingDebounceTimer = null; }
                 this.generatingDebouncePending = null;
+                if (this.completedDebounceTimer) { clearTimeout(this.completedDebounceTimer); this.completedDebounceTimer = null; }
+                this.completedDebouncePending = null;
                 this.pushEvent({ event: 'agent:stopped', chatTitle, timestamp: now });
             }
             this.lastStatus = newStatus;