@adhdev/daemon-core 0.6.46 → 0.6.48

package/package.json

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

@@ -194,12 +194,11 @@ 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*$/m,             // '>' alone on its own line
-    /[›❯]\s*[\r\n]/,       // prompt char followed by line ending (ANSI-stripped may not have $ at end)
-    /[›❯]\s*$/m,           // prompt char at end of line (multiline)
-    /for\s*shortcuts/i,    // Claude Code prompt (ANSI strip may remove spaces → 'forshortcuts')
-    /\?\s*for\s*help/i,
+    /for\s*shortcuts/i,    // Claude Code prompt
+    /\?\s*for\s*help/i,    // Claude Code help prompt
     /Press enter/i,
+    /^[>›❯]\s*$/i,         // Prompt char as the complete evaluated string
+    /[>›❯]\s*$/,           // Prompt char at the very end of evaluated string
 ];
 
 const FALLBACK_GENERATING: RegExp[] = [
@@ -214,9 +213,7 @@ const FALLBACK_APPROVAL: RegExp[] = [
     /Always\s*allow/i,
     /\(y\/n\)/i,
     /\[Y\/n\]/i,
-    /Run\s+\w+\s+command/i,  // "Run bash command" etc — requires surrounding words to avoid false matches
     /Yes,?\s*don'?t\s*ask/i, // "Yes, don't ask again" (Claude Code)
-    /\bDeny\b/i,             // Word-boundary match — avoids "allow & deny" in /permissions menu text
 ];
 
 function defaultCleanOutput(raw: string, _lastUserInput?: string): string {

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

@@ -1088,6 +1088,9 @@ export class AcpProviderInstance implements ProviderInstance {
         const newStatus = this.currentStatus;
         const dirName = this.workingDir.split('/').filter(Boolean).pop() || 'session';
         const chatTitle = `${this.provider.name} · ${dirName}`;
+        const progressFingerprint = newStatus === 'generating'
+            ? `${this.partialContent}::${JSON.stringify(this.partialBlocks)}::${JSON.stringify(this.activeToolCalls.map(t => ({ name: t.name, status: t.status })))}`.slice(-2000)
+            : undefined;
 
         if (newStatus !== this.lastStatus) {
             if (this.lastStatus === 'idle' && newStatus === 'generating') {
@@ -1111,7 +1114,7 @@ export class AcpProviderInstance implements ProviderInstance {
 
  // Monitor check
         const agentKey = `${this.type}:acp`;
-        const monitorEvents = this.monitor.check(agentKey, newStatus, now);
+        const monitorEvents = this.monitor.check(agentKey, newStatus, now, progressFingerprint);
         for (const me of monitorEvents) {
             this.pushEvent({ event: me.type, agentKey: me.agentKey, message: me.message, elapsedSec: me.elapsedSec, timestamp: me.timestamp });
         }

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

@@ -159,6 +159,10 @@ export class CliProviderInstance implements ProviderInstance {
         const newStatus = adapterStatus.status;
         const dirName = this.workingDir.split('/').filter(Boolean).pop() || 'session';
         const chatTitle = `${this.provider.name} · ${dirName}`;
+        const partial = this.adapter.getPartialResponse();
+        const progressFingerprint = newStatus === 'generating'
+            ? `${partial || ''}::${adapterStatus.messages.at(-1)?.content || ''}`.slice(-2000)
+            : undefined;
 
         if (newStatus !== this.lastStatus) {
             LOG.info('CLI', `[${this.type}] status: ${this.lastStatus} → ${newStatus}`);
@@ -241,7 +245,7 @@ export class CliProviderInstance implements ProviderInstance {
 
  // Monitor check (cooldown based notification, IDE/CLI common)
         const agentKey = `${this.type}:cli`;
-        const monitorEvents = this.monitor.check(agentKey, newStatus, now);
+        const monitorEvents = this.monitor.check(agentKey, newStatus, now, progressFingerprint);
         for (const me of monitorEvents) {
             this.pushEvent({ event: me.type, agentKey: me.agentKey, message: me.message, elapsedSec: me.elapsedSec, timestamp: me.timestamp });
         }

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

@@ -123,11 +123,17 @@ export class ExtensionProviderInstance implements ProviderInstance {
     // via its own detectAgentTransitions(). Emitting here would cause
     // duplicate toasts with slightly different content.
 
-    private detectTransition(newStatus: string, _data: any): void {
+    private detectTransition(newStatus: string, data: any): void {
         const now = Date.now();
         const agentStatus = (newStatus === 'streaming' || newStatus === 'generating') ? 'generating'
             : newStatus === 'waiting_approval' ? 'waiting_approval'
             : 'idle';
+        const lastMsg = Array.isArray(data?.messages) && data.messages.length > 0
+            ? data.messages[data.messages.length - 1]
+            : null;
+        const progressFingerprint = agentStatus === 'generating'
+            ? `${lastMsg?.role || ''}:${typeof lastMsg?.content === 'string' ? lastMsg.content : JSON.stringify(lastMsg?.content || '')}`.slice(-2000)
+            : undefined;
 
         if (agentStatus !== this.lastAgentStatus) {
             // Track generating start time (for monitor elapsed calculation)
@@ -142,7 +148,7 @@ export class ExtensionProviderInstance implements ProviderInstance {
 
  // Monitor check (cooldown based notification) — keep monitor events (long_generating etc)
         const agentKey = `${this.type}:ext`;
-        const monitorEvents = this.monitor.check(agentKey, agentStatus, now);
+        const monitorEvents = this.monitor.check(agentKey, agentStatus, now, progressFingerprint);
         for (const me of monitorEvents) {
             this.pushEvent({ event: me.type, agentKey: me.agentKey, message: me.message, elapsedSec: me.elapsedSec, timestamp: me.timestamp });
         }

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

@@ -334,6 +334,12 @@ export class IdeProviderInstance implements ProviderInstance {
         const agentStatus = (chatStatus === 'streaming' || chatStatus === 'generating') ? 'generating'
             : chatStatus === 'waiting_approval' ? 'waiting_approval'
             : 'idle';
+        const lastMsg = Array.isArray(chatData?.messages) && chatData.messages.length > 0
+            ? chatData.messages[chatData.messages.length - 1]
+            : null;
+        const progressFingerprint = agentStatus === 'generating'
+            ? `${lastMsg?.role || ''}:${typeof lastMsg?.content === 'string' ? lastMsg.content : JSON.stringify(lastMsg?.content || '')}`.slice(-2000)
+            : undefined;
 
         this.currentStatus = agentStatus;
         const lastStatus = this.lastAgentStatuses.get(agentKey) || 'idle';
@@ -368,7 +374,7 @@ export class IdeProviderInstance implements ProviderInstance {
         }
 
  // Monitor check (cooldown based notification)
-        const monitorEvents = this.monitor.check(agentKey, agentStatus, now);
+        const monitorEvents = this.monitor.check(agentKey, agentStatus, now, progressFingerprint);
         for (const me of monitorEvents) {
             this.pushEvent({ event: me.type, agentKey: me.agentKey, message: me.message, elapsedSec: me.elapsedSec, timestamp: me.timestamp });
         }

package/src/providers/status-monitor.ts

@@ -37,6 +37,9 @@ export class StatusMonitor {
     private config: MonitorConfig;
     private lastAlertTime = new Map<string, number>();
     private generatingStartTimes = new Map<string, number>();
+    private longGeneratingAlerted = new Map<string, boolean>();
+    private lastProgressFingerprint = new Map<string, string>();
+    private lastProgressChangeAt = new Map<string, number>();
 
     constructor(config?: Partial<MonitorConfig>) {
         this.config = { ...DEFAULT_MONITOR_CONFIG, ...config };
@@ -56,7 +59,7 @@ export class StatusMonitor {
   * Check status transition → return notification event array.
   * Called from each onTick() or detectStatusTransition().
   */
-    check(agentKey: string, status: string, now: number): MonitorEvent[] {
+    check(agentKey: string, status: string, now: number, progressFingerprint?: string): MonitorEvent[] {
         const events: MonitorEvent[] = [];
 
  // 1. Approval waiting notification
@@ -75,18 +78,31 @@ export class StatusMonitor {
         if (status === 'generating' || status === 'streaming') {
             if (!this.generatingStartTimes.has(agentKey)) {
                 this.generatingStartTimes.set(agentKey, now);
+                this.longGeneratingAlerted.set(agentKey, false);
+                const initialFingerprint = progressFingerprint ?? '';
+                this.lastProgressFingerprint.set(agentKey, initialFingerprint);
+                this.lastProgressChangeAt.set(agentKey, now);
+            }
+            const currentFingerprint = progressFingerprint ?? '';
+            const previousFingerprint = this.lastProgressFingerprint.get(agentKey);
+            if (previousFingerprint !== currentFingerprint) {
+                this.lastProgressFingerprint.set(agentKey, currentFingerprint);
+                this.lastProgressChangeAt.set(agentKey, now);
+                this.longGeneratingAlerted.set(agentKey, false);
             }
             if (this.config.longGeneratingAlert) {
-                const startedAt = this.generatingStartTimes.get(agentKey)!;
-                const elapsedSec = Math.round((now - startedAt) / 1000);
-                if (elapsedSec > this.config.longGeneratingThresholdSec) {
+                const progressChangedAt = this.lastProgressChangeAt.get(agentKey) || this.generatingStartTimes.get(agentKey)!;
+                const elapsedSec = Math.round((now - progressChangedAt) / 1000);
+                const alreadyAlerted = this.longGeneratingAlerted.get(agentKey) === true;
+                if (elapsedSec > this.config.longGeneratingThresholdSec && !alreadyAlerted) {
                     if (this.shouldAlert(agentKey + ':long_gen', now)) {
+                        this.longGeneratingAlerted.set(agentKey, true);
                         events.push({
                             type: 'monitor:long_generating',
                             agentKey,
                             elapsedSec,
                             timestamp: now,
-                            message: `${agentKey} has been generating for ${Math.round(elapsedSec / 60)}min`,
+                            message: `${agentKey} output appears stuck for ${Math.round(elapsedSec / 60)}min`,
                         });
                     }
                 }
@@ -94,6 +110,9 @@ export class StatusMonitor {
         } else {
  // Reset timer when switching to non-generating status
             this.generatingStartTimes.delete(agentKey);
+            this.longGeneratingAlerted.delete(agentKey);
+            this.lastProgressFingerprint.delete(agentKey);
+            this.lastProgressChangeAt.delete(agentKey);
         }
 
         return events;
@@ -113,12 +132,18 @@ export class StatusMonitor {
     reset(agentKey?: string): void {
         if (agentKey) {
             this.generatingStartTimes.delete(agentKey);
+            this.longGeneratingAlerted.delete(agentKey);
+            this.lastProgressFingerprint.delete(agentKey);
+            this.lastProgressChangeAt.delete(agentKey);
  // Delete all cooldowns for this key
             for (const k of this.lastAlertTime.keys()) {
                 if (k.startsWith(agentKey)) this.lastAlertTime.delete(k);
             }
         } else {
             this.generatingStartTimes.clear();
+            this.longGeneratingAlerted.clear();
+            this.lastProgressFingerprint.clear();
+            this.lastProgressChangeAt.clear();
             this.lastAlertTime.clear();
         }
     }