@adhdev/daemon-core 0.9.82-rc.204 → 0.9.82-rc.205

package/dist/providers/spec/driver.d.ts

@@ -135,6 +135,8 @@ export declare class SpecDriver {
      *  explicit wake-up there's nothing to trigger the busy → idle
      *  downshift. */
     private busyExpiryTimer;
+    /** Set true while reevaluate() is invoked from busyExpiryTimer callback. */
+    private busyExpiryFired;
     /** Pending idle-commit timer. Armed when the evaluator first returns idle;
      *  fires after idle_hold_ms if no non-idle reading has cancelled it. */
     private idleHoldTimer;
@@ -162,6 +164,12 @@ export declare class SpecDriver {
         label: string;
         at: number;
         durationMs: number;
+        reason: string;
+        matchedStateId?: string;
+        matchedRules?: string[];
+        debounceKind?: string;
+        idleHoldMs?: number;
+        busyHoldMs?: number;
     }>;
     getLastBusyAt(): number;
     hasIdleHoldPending(): boolean;

package/package.json

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

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

@@ -1568,8 +1568,6 @@ export class CliProviderInstance implements ProviderInstance {
                     const shortDurationMs = this.generatingStartedAt ? now - this.generatingStartedAt : 0;
                     LOG.info('CLI', `[${this.type}] suppressed short generating (${shortDurationMs}ms)`);
                     if (this.generatingDebounceTimer) { clearTimeout(this.generatingDebounceTimer); this.generatingDebounceTimer = null; }
-                    this.generatingDebouncePending = null;
-                    this.generatingStartedAt = 0;
                     // Emit completion for mesh task association even though the UI generating
                     // started/completed pair is suppressed (too short for visible UI update).
                     let shortFinalSummary: string | undefined;
@@ -1580,22 +1578,30 @@ export class CliProviderInstance implements ProviderInstance {
                         shortEvidenceSource = evidence.source;
                         shortFinalSummary = extractFinalSummaryFromMessages(evidence.messages as any);
                     } catch { /* best-effort */ }
-                    if (((this.provider as any).requiresFinalAssistantBeforeIdle === true || shortEvidenceSource === 'external-native') && !shortFinalSummary) {
-                        LOG.info('CLI', `[${this.type}] suppressed short completion without final assistant evidence`);
-                    } else {
-                        this.pushEvent({
-                            event: 'agent:generating_completed',
-                            chatTitle,
-                            duration: 0,
-                            timestamp: now,
-                            finalSummary: shortFinalSummary,
-                            completionDiagnostic: {
-                                reason: 'short_generating_suppressed',
-                                shortDurationMs,
-                                finalAssistantEvidenceSource: shortEvidenceSource,
-                            },
-                        });
+                    // If a real response is confirmed, retroactively emit started so the chat
+                    // bubble appears even though the debounce suppressed the original event.
+                    if (shortFinalSummary) {
+                        this.pushEvent({ event: 'agent:generating_started', chatTitle, timestamp: now - shortDurationMs });
+                    }
+                    this.generatingDebouncePending = null;
+                    this.generatingStartedAt = 0;
+                    const missingEvidence = ((this.provider as any).requiresFinalAssistantBeforeIdle === true || shortEvidenceSource === 'external-native') && !shortFinalSummary;
+                    if (missingEvidence) {
+                        LOG.warn('CLI', `[${this.type}] short completion missing final assistant evidence (source=${shortEvidenceSource})`);
                     }
+                    this.pushEvent({
+                        event: 'agent:generating_completed',
+                        chatTitle,
+                        duration: 0,
+                        timestamp: now,
+                        finalSummary: shortFinalSummary,
+                        completionDiagnostic: {
+                            reason: 'short_generating_suppressed',
+                            shortDurationMs,
+                            finalAssistantEvidenceSource: shortEvidenceSource,
+                            ...(missingEvidence ? { blockReason: 'missing_final_assistant' } : {}),
+                        },
+                    });
                 } else {
                     // Debounce completed, then require the rich transcript path that read_chat
                     // uses to show an idle turn whose last user-facing message is assistant.

package/src/providers/spec/driver.ts

@@ -218,6 +218,8 @@ export class SpecDriver {
      *  explicit wake-up there's nothing to trigger the busy → idle
      *  downshift. */
     private busyExpiryTimer: ReturnType<typeof setTimeout> | null = null;
+    /** Set true while reevaluate() is invoked from busyExpiryTimer callback. */
+    private busyExpiryFired = false;
     /** Pending idle-commit timer. Armed when the evaluator first returns idle;
      *  fires after idle_hold_ms if no non-idle reading has cancelled it. */
     private idleHoldTimer: ReturnType<typeof setTimeout> | null = null;
@@ -225,7 +227,18 @@ export class SpecDriver {
     private pendingIdleState: SpecEvaluation['state'] | null = null;
     private specWatcher: fs.FSWatcher | null = null;
     /** Ring buffer of committed state transitions (max 50). */
-    private stateHistory: Array<{ stateId: string; label: string; at: number; durationMs: number }> = [];
+    private stateHistory: Array<{
+        stateId: string;
+        label: string;
+        at: number;
+        durationMs: number;
+        reason: string;
+        matchedStateId?: string;
+        matchedRules?: string[];
+        debounceKind?: string;
+        idleHoldMs?: number;
+        busyHoldMs?: number;
+    }> = [];
     private prevStateAt = 0;
 
     constructor(private readonly opts: SpecDriverOpts) {
@@ -296,15 +309,44 @@ export class SpecDriver {
         this.pendingIdleState = null;
     }
 
-    private pushHistory(stateId: string, label: string): void {
+    private pushHistory(stateId: string, label: string, meta?: {
+        reason?: string;
+        matchedStateId?: string;
+        matchedRules?: string[];
+        debounceKind?: string;
+        idleHoldMs?: number;
+        busyHoldMs?: number;
+    }): void {
         const now = Date.now();
         const durationMs = this.prevStateAt > 0 ? now - this.prevStateAt : 0;
         this.prevStateAt = now;
-        this.stateHistory.push({ stateId, label, at: now, durationMs });
+        this.stateHistory.push({
+            stateId,
+            label,
+            at: now,
+            durationMs,
+            reason: meta?.reason ?? 'eval_match',
+            ...(meta?.matchedStateId !== undefined ? { matchedStateId: meta.matchedStateId } : {}),
+            ...(meta?.matchedRules !== undefined ? { matchedRules: meta.matchedRules } : {}),
+            ...(meta?.debounceKind !== undefined ? { debounceKind: meta.debounceKind } : {}),
+            ...(meta?.idleHoldMs !== undefined ? { idleHoldMs: meta.idleHoldMs } : {}),
+            ...(meta?.busyHoldMs !== undefined ? { busyHoldMs: meta.busyHoldMs } : {}),
+        });
         if (this.stateHistory.length > 50) this.stateHistory.shift();
     }
 
-    getStateHistory(): ReadonlyArray<{ stateId: string; label: string; at: number; durationMs: number }> {
+    getStateHistory(): ReadonlyArray<{
+        stateId: string;
+        label: string;
+        at: number;
+        durationMs: number;
+        reason: string;
+        matchedStateId?: string;
+        matchedRules?: string[];
+        debounceKind?: string;
+        idleHoldMs?: number;
+        busyHoldMs?: number;
+    }> {
         return this.stateHistory;
     }
 
@@ -381,7 +423,9 @@ export class SpecDriver {
         this.busyExpiryTimer = setTimeout(() => {
             this.busyExpiryTimer = null;
             LOG.debug('SpecDriver', `[${this.opts.specPath.split('/').slice(-3).join('/')}] busyExpiry fired holdMs=${holdMs}`);
+            this.busyExpiryFired = true;
             this.reevaluate();
+            this.busyExpiryFired = false;
         }, Math.max(holdMs + 50, 100));
     }
 
@@ -477,6 +521,8 @@ export class SpecDriver {
         if (isIdleState && idleHoldMs > 0 && this.currentStateId !== evState.id) {
             if (!this.idleHoldTimer) {
                 this.pendingIdleState = evState;
+                const capturedEv = ev;
+                const capturedMatchedRules = extractMatchedRules(ev);
                 this.idleHoldTimer = setTimeout(() => {
                     this.idleHoldTimer = null;
                     const committed = this.pendingIdleState;
@@ -484,16 +530,22 @@ export class SpecDriver {
                     if (!committed) return;
                     LOG.debug('SpecDriver', `[${this.opts.specPath.split('/').slice(-3).join('/')}] idleHold committed after ${idleHoldMs}ms`);
                     this.currentStateId = committed.id;
-                    this.currentEval = ev;
-                    this.pushHistory(committed.id, committed.label);
+                    this.currentEval = capturedEv;
+                    this.pushHistory(committed.id, committed.label, {
+                        reason: 'idle_hold_committed',
+                        matchedStateId: capturedEv.state.id,
+                        matchedRules: capturedMatchedRules,
+                        debounceKind: 'idle_hold',
+                        idleHoldMs,
+                    });
                     this.emit({
                         kind: 'state_changed',
                         state: committed,
                         modal: null,
-                        controls: ev.controls.map(c => ({ id: c.id, label: c.label, action_type: c.actionType })),
+                        controls: capturedEv.controls.map(c => ({ id: c.id, label: c.label, action_type: c.actionType })),
                     });
                     this.armOrCancelDelegateTimers(committed.id);
-                    if (this.opts.emitTrace) this.emit({ kind: 'spec_trace', entries: ev.trace });
+                    if (this.opts.emitTrace) this.emit({ kind: 'spec_trace', entries: capturedEv.trace });
                 }, idleHoldMs);
             }
             // Don't fall through to the normal changed/emit path for idle.
@@ -538,7 +590,34 @@ export class SpecDriver {
         }
         if (changed) {
             this.currentStateId = evState.id;
-            this.pushHistory(evState.id, evState.label);
+            const matchedRules = extractMatchedRules(ev);
+            // Determine reason and debounce kind for this transition
+            let transitionReason: string;
+            let debounceKind: string;
+            let transitionBusyHoldMs: number | undefined;
+            if (forceEmit) {
+                transitionReason = 'forceEmit';
+                debounceKind = 'none';
+            } else if (evState.id !== ev.state.id) {
+                // evState was overridden — completion_idle_after forced idle
+                transitionReason = 'completion_idle_after';
+                debounceKind = 'completion_idle_after';
+            } else if (this.busyExpiryFired) {
+                // busyExpiryTimer woke us up and hold has now expired
+                transitionReason = 'busy_hold_expired';
+                debounceKind = 'busy_hold';
+                transitionBusyHoldMs = busyHoldMs;
+            } else {
+                transitionReason = 'eval_match';
+                debounceKind = 'none';
+            }
+            this.pushHistory(evState.id, evState.label, {
+                reason: transitionReason,
+                matchedStateId: ev.state.id,
+                matchedRules,
+                debounceKind,
+                ...(transitionBusyHoldMs !== undefined ? { busyHoldMs: transitionBusyHoldMs } : {}),
+            });
             this.emit({
                 kind: 'state_changed',
                 state: evState,
@@ -731,3 +810,11 @@ function guessExt(mime: string): string {
     if (/webp/i.test(mime)) return '.webp';
     return '.bin';
 }
+
+function extractMatchedRules(ev: SpecEvaluation): string[] {
+    if (!Array.isArray(ev.trace)) return [];
+    return (ev.trace as any[])
+        .filter(t => t.matched === true || t.kind === 'state_match')
+        .map(t => t.rule ?? t.stateId ?? t.id ?? String(t))
+        .filter(Boolean);
+}