@adhdev/daemon-core 0.9.82-rc.328 → 0.9.82-rc.329

package/src/providers/read-chat-contract.ts

@@ -10,7 +10,7 @@ import {
   type ReadChatResultV2,
 } from './transcript-v2.js'
 
-const VALID_STATUSES = ['idle', 'generating', 'waiting_approval', 'error', 'panel_hidden', 'starting', 'streaming', 'long_generating'] as const
+const VALID_STATUSES = ['idle', 'generating', 'waiting_approval', 'error', 'panel_hidden', 'starting', 'streaming', 'no_progress', 'long_generating'] as const
 const VALID_ROLES = ['user', 'assistant', 'system', 'human'] as const
 const VALID_BUBBLE_STATES = ['draft', 'streaming', 'final', 'removed'] as const
 const VALID_TURN_STATUSES = ['open', 'waiting_approval', 'complete', 'error'] as const

package/src/providers/status-monitor.d.ts

@@ -3,16 +3,16 @@
  *
  * Common across all Provider categories (IDE/Extension/CLI/ACP).
  * - Approval waiting (waiting_approval) notification
- * - Notification when generating persists for extended duration
+ * - No-progress watchdog: alert when an active turn makes no progress for a while
  * - All config toggleable via Provider Settings
  */
 export interface MonitorConfig {
     /** Enable awaiting-approval notification */
     approvalAlert: boolean;
-    /** Prolonged generating notification enabled */
-    longGeneratingAlert: boolean;
-    /** Prolonged threshold (seconds) */
-    longGeneratingThresholdSec: number;
+    /** No-progress watchdog notification enabled */
+    noProgressAlert: boolean;
+    /** No-progress threshold (seconds) */
+    noProgressThresholdSec: number;
     /** Repeat notification cooldown (seconds) */
     alertCooldownSec: number;
 }
@@ -28,7 +28,7 @@ export declare class StatusMonitor {
     private config;
     private lastAlertTime;
     private generatingStartTimes;
-    private longGeneratingAlerted;
+    private noProgressAlerted;
     private lastProgressFingerprint;
     private lastProgressChangeAt;
     constructor(config?: Partial<MonitorConfig>);
@@ -40,7 +40,7 @@ export declare class StatusMonitor {
      * Check status transition → return notification event array.
      * Called from each onTick() or detectStatusTransition().
      */
-    check(agentKey: string, status: string, now: number, progressFingerprint?: string): MonitorEvent[];
+    check(agentKey: string, status: string, now: number, progressFingerprint?: string, approvalPending?: boolean): MonitorEvent[];
     /** Cooldown check — prevent sending the same notification too frequently */
     private shouldAlert;
     /** Reset (on agent terminate/restart) */

package/src/providers/status-monitor.ts

@@ -3,26 +3,26 @@
  *
  * Common across all Provider categories (IDE/Extension/CLI/ACP).
  * - Approval waiting (waiting_approval) notification
- * - Notification when generating persists for extended duration
+ * - No-progress watchdog: alert when an active turn makes no progress for a while
  * - All config toggleable via Provider Settings
  */
 
 export interface MonitorConfig {
  /** Enable awaiting-approval notification */
     approvalAlert: boolean;
- /** Prolonged generating notification enabled */
-    longGeneratingAlert: boolean;
- /** Prolonged threshold (seconds) */
-    longGeneratingThresholdSec: number;
+ /** No-progress watchdog notification enabled */
+    noProgressAlert: boolean;
+ /** No-progress threshold (seconds) */
+    noProgressThresholdSec: number;
  /** Repeat notification cooldown (seconds) */
     alertCooldownSec: number;
 }
 
 export const DEFAULT_MONITOR_CONFIG: MonitorConfig = {
     approvalAlert: true,
-    longGeneratingAlert: true,
-    longGeneratingThresholdSec: 180,   // 3 minutes
-    alertCooldownSec: 60,              // 1 minute cooldown
+    noProgressAlert: true,
+    noProgressThresholdSec: 180,   // 3 minutes
+    alertCooldownSec: 60,          // 1 minute cooldown
 };
 
 export interface MonitorEvent {
@@ -37,7 +37,7 @@ 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 noProgressAlerted = new Map<string, boolean>();
     private lastProgressFingerprint = new Map<string, string>();
     private lastProgressChangeAt = new Map<string, number>();
 
@@ -59,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, progressFingerprint?: string): MonitorEvent[] {
+    check(agentKey: string, status: string, now: number, progressFingerprint?: string, approvalPending?: boolean): MonitorEvent[] {
         const events: MonitorEvent[] = [];
 
  // 1. Approval waiting notification
@@ -74,11 +74,26 @@ export class StatusMonitor {
             }
         }
 
- // 2. Detect prolonged generating (identical for IDE/Extension/CLI/ACP)
+ // 2. No-progress watchdog (identical for IDE/Extension/CLI/ACP)
         if (status === 'generating' || status === 'streaming') {
+            // While an approval modal is pending we must NOT count the wait as
+            // no-progress. The assistant emits no tokens and the screen is frozen
+            // on the modal, so the progress fingerprint goes static — but this is
+            // a user action wait, not a freeze. Some callers (CLI/IDE auto-approve)
+            // also synthesize the reported status to 'generating' during the wait,
+            // so the plain `waiting_approval` branch below cannot catch it. Hold the
+            // progress anchor at `now` so the elapsed timer restarts the moment the
+            // approval clears and real generating resumes.
+            if (approvalPending) {
+                this.generatingStartTimes.set(agentKey, now);
+                this.lastProgressFingerprint.set(agentKey, progressFingerprint ?? '');
+                this.lastProgressChangeAt.set(agentKey, now);
+                this.noProgressAlerted.set(agentKey, false);
+                return events;
+            }
             if (!this.generatingStartTimes.has(agentKey)) {
                 this.generatingStartTimes.set(agentKey, now);
-                this.longGeneratingAlerted.set(agentKey, false);
+                this.noProgressAlerted.set(agentKey, false);
                 const initialFingerprint = progressFingerprint ?? '';
                 this.lastProgressFingerprint.set(agentKey, initialFingerprint);
                 this.lastProgressChangeAt.set(agentKey, now);
@@ -88,17 +103,17 @@ export class StatusMonitor {
             if (previousFingerprint !== currentFingerprint) {
                 this.lastProgressFingerprint.set(agentKey, currentFingerprint);
                 this.lastProgressChangeAt.set(agentKey, now);
-                this.longGeneratingAlerted.set(agentKey, false);
+                this.noProgressAlerted.set(agentKey, false);
             }
-            if (this.config.longGeneratingAlert) {
+            if (this.config.noProgressAlert) {
                 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);
+                const alreadyAlerted = this.noProgressAlerted.get(agentKey) === true;
+                if (elapsedSec > this.config.noProgressThresholdSec && !alreadyAlerted) {
+                    if (this.shouldAlert(agentKey + ':no_progress', now)) {
+                        this.noProgressAlerted.set(agentKey, true);
                         events.push({
-                            type: 'monitor:long_generating',
+                            type: 'monitor:no_progress',
                             agentKey,
                             elapsedSec,
                             timestamp: now,
@@ -110,7 +125,7 @@ export class StatusMonitor {
         } else {
  // Reset timer when switching to non-generating status
             this.generatingStartTimes.delete(agentKey);
-            this.longGeneratingAlerted.delete(agentKey);
+            this.noProgressAlerted.delete(agentKey);
             this.lastProgressFingerprint.delete(agentKey);
             this.lastProgressChangeAt.delete(agentKey);
         }
@@ -132,7 +147,7 @@ export class StatusMonitor {
     reset(agentKey?: string): void {
         if (agentKey) {
             this.generatingStartTimes.delete(agentKey);
-            this.longGeneratingAlerted.delete(agentKey);
+            this.noProgressAlerted.delete(agentKey);
             this.lastProgressFingerprint.delete(agentKey);
             this.lastProgressChangeAt.delete(agentKey);
  // Delete all cooldowns for this key
@@ -141,7 +156,7 @@ export class StatusMonitor {
             }
         } else {
             this.generatingStartTimes.clear();
-            this.longGeneratingAlerted.clear();
+            this.noProgressAlerted.clear();
             this.lastProgressFingerprint.clear();
             this.lastProgressChangeAt.clear();
             this.lastAlertTime.clear();

package/src/shared-types.ts

@@ -740,6 +740,9 @@ export type DaemonStatusEventName =
     | 'agent:waiting_approval'
     | 'agent:generating_completed'
     | 'agent:stopped'
+    | 'monitor:no_progress'
+    // Legacy alias for 'monitor:no_progress' — kept so older daemons that still
+    // emit it remain type-compatible with consumers during rollout.
     | 'monitor:long_generating';
 
 /** Minimal daemon-originated event payload relayed through the server. */

package/src/status/reporter.ts

@@ -120,7 +120,7 @@ export class DaemonStatusReporter {
             case 'agent:waiting_approval':
             case 'agent:generating_completed':
             case 'agent:stopped':
-            case 'monitor:long_generating':
+            case 'monitor:no_progress':
                 return value;
             default:
                 return null;