@adhdev/daemon-core 0.5.30 → 0.5.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.5.30",
+  "version": "0.5.32",
   "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

@@ -24,15 +24,13 @@ import { LOG } from '../logging/logger.js';
 let pty: any;
 try {
     pty = require('node-pty');
-    // node-pty@1.1.0 ships spawn-helper without +x on macOS — fix it
+    // node-pty ships spawn-helper without +x on macOS (npm umask issue) — fix it
     if (os.platform() !== 'win32') {
         try {
             const fs = require('fs');
-            // require.resolve('node-pty') → .../node-pty/lib/index.js
-            // prebuilds/ is at .../node-pty/prebuilds/, not .../node-pty/lib/prebuilds/
             const ptyDir = path.resolve(path.dirname(require.resolve('node-pty')), '..');
-            const arch = os.arch() === 'arm64' ? 'darwin-arm64' : 'darwin-x64';
-            const helper = path.join(ptyDir, 'prebuilds', arch, 'spawn-helper');
+            const platformArch = `${os.platform()}-${os.arch()}`;
+            const helper = path.join(ptyDir, 'prebuilds', platformArch, 'spawn-helper');
             if (fs.existsSync(helper)) {
                 const stat = fs.statSync(helper);
                 if (!(stat.mode & 0o111)) {
@@ -43,7 +41,7 @@ try {
         } catch { /* best-effort */ }
     }
 } catch {
-    LOG.error('CLI', '[ProviderCliAdapter] node-pty not found. Install: npm install node-pty@1.0.0');
+    LOG.error('CLI', '[ProviderCliAdapter] node-pty not found. Terminal features disabled.');
 }
 
 export interface CliChatMessage {
@@ -97,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 {
@@ -471,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

@@ -149,7 +149,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 +162,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,6 +188,10 @@ 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'}"`);
@@ -195,15 +207,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;