@adhdev/daemon-core 0.9.82-rc.192 → 0.9.82-rc.194

package/dist/mesh/mesh-events.d.ts

@@ -84,6 +84,7 @@ export declare function handleMeshForwardEvent(components: DaemonComponents, pay
     duplicateRefineTerminalEvent?: undefined;
     duplicateApproval?: undefined;
     duplicateCompletion?: undefined;
+    duplicateStopped?: undefined;
     error?: undefined;
     bufferedForGeneratingCoordinator?: undefined;
 } | {
@@ -96,6 +97,7 @@ export declare function handleMeshForwardEvent(components: DaemonComponents, pay
     duplicateRefineTerminalEvent?: undefined;
     duplicateApproval?: undefined;
     duplicateCompletion?: undefined;
+    duplicateStopped?: undefined;
     error?: undefined;
     bufferedForGeneratingCoordinator?: undefined;
 } | {
@@ -108,6 +110,7 @@ export declare function handleMeshForwardEvent(components: DaemonComponents, pay
     terminalLedgerKind?: undefined;
     duplicateApproval?: undefined;
     duplicateCompletion?: undefined;
+    duplicateStopped?: undefined;
     error?: undefined;
     bufferedForGeneratingCoordinator?: undefined;
 } | {
@@ -120,6 +123,7 @@ export declare function handleMeshForwardEvent(components: DaemonComponents, pay
     terminalLedgerKind?: undefined;
     duplicateRefineTerminalEvent?: undefined;
     duplicateCompletion?: undefined;
+    duplicateStopped?: undefined;
     error?: undefined;
     bufferedForGeneratingCoordinator?: undefined;
 } | {
@@ -132,6 +136,7 @@ export declare function handleMeshForwardEvent(components: DaemonComponents, pay
     terminalLedgerKind?: undefined;
     duplicateRefineTerminalEvent?: undefined;
     duplicateApproval?: undefined;
+    duplicateStopped?: undefined;
     error?: undefined;
     bufferedForGeneratingCoordinator?: undefined;
 } | {
@@ -144,6 +149,20 @@ export declare function handleMeshForwardEvent(components: DaemonComponents, pay
     terminalLedgerKind?: undefined;
     duplicateRefineTerminalEvent?: undefined;
     duplicateApproval?: undefined;
+    duplicateStopped?: undefined;
+    error?: undefined;
+    bufferedForGeneratingCoordinator?: undefined;
+} | {
+    success: boolean;
+    forwarded: number;
+    suppressed: boolean;
+    duplicateStopped: boolean;
+    intentionalCleanupStop?: undefined;
+    terminalLedgerEvidence?: undefined;
+    terminalLedgerKind?: undefined;
+    duplicateRefineTerminalEvent?: undefined;
+    duplicateApproval?: undefined;
+    duplicateCompletion?: undefined;
     error?: undefined;
     bufferedForGeneratingCoordinator?: undefined;
 } | {
@@ -156,6 +175,7 @@ export declare function handleMeshForwardEvent(components: DaemonComponents, pay
     duplicateRefineTerminalEvent?: undefined;
     duplicateApproval?: undefined;
     duplicateCompletion?: undefined;
+    duplicateStopped?: undefined;
     error?: undefined;
     bufferedForGeneratingCoordinator?: undefined;
 } | {
@@ -169,6 +189,7 @@ export declare function handleMeshForwardEvent(components: DaemonComponents, pay
     duplicateRefineTerminalEvent?: undefined;
     duplicateApproval?: undefined;
     duplicateCompletion?: undefined;
+    duplicateStopped?: undefined;
     error?: undefined;
 } | {
     success: boolean;

package/package.json

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

package/src/cli-adapters/cli-state-engine.ts

@@ -534,7 +534,7 @@ export class CliStateEngine {
         const recentInteractiveActivity = this.hasRecentInteractiveActivity(snap, now);
         LOG.debug(
             'CLI',
-            `[${this.provider.type}] settled diagnostics prompt=${JSON.stringify(this.currentTurnScope?.prompt || '').slice(0, 140)} status=${String(status || '')} parsedStatus=${String(parsedStatus || '')} parsedMsgCount=${parsedMessages.length} lastParsedAssistant=${JSON.stringify((lastParsedAssistant?.content || '').slice(0, 120)).slice(0, 160)} responseBuffer=${JSON.stringify((snap.responseBuffer || '').slice(0, 160)).slice(0, 220)}`
+            `[${this.provider.type}] settled diagnostics prompt=${JSON.stringify(this.currentTurnScope?.prompt || '').slice(0, 140)} status=${String(status || '')} parsedStatus=${String(parsedStatus || '')} parsedMsgCount=${parsedMessages.length} lastParsedAssistant=${JSON.stringify((lastParsedAssistant?.content || '').slice(0, 120)).slice(0, 160)} responseBuffer=${JSON.stringify((snap.responseBuffer || '').slice(0, 160)).slice(0, 220)} recentActivity=${recentInteractiveActivity}`
         );
 
         // recent_activity_hold protects an in-flight user turn from a false
@@ -544,11 +544,21 @@ export class CliStateEngine {
         // produced the startup status flip the user reported
         // (generating → idle → generating → idle within the first few seconds
         // of claude-cli launch).
+        //
+        // When isWaitingForResponse=true and a currentTurnScope is alive, a
+        // PTY quiet period (>statusActivityHold ms without output) does NOT
+        // mean the response is done — claude-cli regularly pauses 2s+ between
+        // chunks during parsing/generation. recentInteractiveActivity going
+        // false during such a pause was the root cause of false-idle
+        // regressions. We hold generating whenever an active response turn is
+        // in flight (unconditionally, not just when there was recent output).
+        // The real completion gate is applyIdle's idleFinishCandidate +
+        // idleFinish timeout, which requires stable quiet AND a parsed
+        // assistant message.
         const shouldHoldGenerating = status === 'idle'
             && this.isWaitingForResponse
             && !!this.currentTurnScope
             && !modal
-            && recentInteractiveActivity
             && !(parsedStatus === 'idle' && !!lastParsedAssistant);
 
         if (shouldHoldGenerating) { this.applyHoldGenerating(ctx); return; }

package/src/mesh/mesh-events.ts

@@ -1631,6 +1631,22 @@ function injectMeshSystemMessage(components: DaemonComponents, args: {
             return { success: true, forwarded: 0, suppressed: true, duplicateCompletion: true };
         }
     }
+    if (args.event === 'agent:stopped' && eventSessionId) {
+        const duplicateStopped = isDuplicateMeshCompletionEvent({
+            meshId: args.meshId,
+            event: args.event,
+            sessionId: eventSessionId,
+            providerType: readNonEmptyString(args.metadataEvent.providerType) || undefined,
+            providerSessionId: readNonEmptyString(args.metadataEvent.providerSessionId) || undefined,
+            timestamp: eventTimestamp,
+            finalSummary: readNonEmptyString(args.metadataEvent.finalSummary) || undefined,
+            coordinatorDaemonId: workerCoordinatorDaemonId || undefined,
+        });
+        if (duplicateStopped) {
+            LOG.info('MeshEvents', `Suppressed duplicate stopped event for mesh ${args.meshId} session ${eventSessionId}`);
+            return { success: true, forwarded: 0, suppressed: true, duplicateStopped: true };
+        }
+    }
 
     // ── Task Queue & Ledger ──
     // Helpers that keep queue and direct-dispatch status transitions symmetric.

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

@@ -602,6 +602,16 @@ export class CliProviderInstance implements ProviderInstance {
         if (externalNativeFinal && isCliGeneratingLikeStatus(visibleStatus)) {
             visibleStatus = 'idle';
         }
+        // Adapter raw status can lag behind parsed/native evidence: if the spec driver
+        // has not yet emitted a state_changed(idle) event but the parsed transcript
+        // already shows a final assistant turn, treat the session as idle so that
+        // getState() agrees with what detectStatusTransition already recorded via
+        // lastStatus. Without this guard, getState() returns 'generating' even after
+        // the instance's lastStatus has flipped to 'idle', causing the dashboard to
+        // show a perpetual generating spinner.
+        if (isCliGeneratingLikeStatus(visibleStatus) && this.lastStatus === 'idle') {
+            visibleStatus = 'idle';
+        }
         const runtime = this.adapter.getRuntimeMetadata();
         this.maybeAppendRuntimeRecoveryMessage(runtime);
         let parsedMessages = Array.isArray(parsedStatus?.messages)
@@ -1263,6 +1273,9 @@ export class CliProviderInstance implements ProviderInstance {
                         LOG.info('CLI', `[${this.type}] external transcript probe: msgCount=${probe.msgCount} lastRole=${probe.lastRole || 'none'} lastKind=${probe.lastKind || 'none'} contentLen=${probe.contentLen} sourceMtime=${probe.sourceMtimeMs ?? 'unknown'} mtimeAge=${probe.mtimeAgeMs ?? 'unknown'}ms`);
                         pending.loggedTranscriptProbe = true;
                     }
+                    if (this.type === 'antigravity-cli') {
+                        return null;
+                    }
                     return { reason: 'missing_final_assistant', terminal: true, allowTimeout: allowMissingAssistantTimeout };
                 }
                 // SpecCliAdapter never populates parsed.messages — chat history flows
@@ -1637,6 +1650,9 @@ export class CliProviderInstance implements ProviderInstance {
                     },
                 });
                 this.generatingStartedAt = 0;
+                // Cancel any pending debounce flush — monitor already fired completion.
+                if (this.completedDebounceTimer) { clearTimeout(this.completedDebounceTimer); this.completedDebounceTimer = null; }
+                this.completedDebouncePending = null;
                 continue;
             }
             this.pushEvent({ event: me.type, agentKey: me.agentKey, message: me.message, elapsedSec: me.elapsedSec, timestamp: me.timestamp });

package/src/providers/types/interactive-prompt.ts

@@ -353,7 +353,10 @@ export function buildClaudeInteractiveTuiAnswerSteps(
     if (answer.selectedLabels.length !== 1) throw new Error(`Expected one selected label for ${question.questionId}`);
     const selectedIndex = question.options.findIndex(option => option.label === answer.selectedLabels[0]);
     if (selectedIndex < 0) throw new Error(`Unknown option for ${question.questionId}: ${answer.selectedLabels[0]}`);
-    steps.push(`${'\x1b[B'.repeat(selectedIndex)}\r`);
+    for (let i = 0; i < selectedIndex; i += 1) {
+      steps.push('\x1b[B');
+    }
+    steps.push('\r');
   }
   steps.push('\r');
   return steps;