@adhdev/daemon-core 1.0.28-rc.17 → 1.0.28-rc.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "1.0.28-rc.17",
+  "version": "1.0.28-rc.18",
   "description": "ADHDev daemon core — CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -49,8 +49,8 @@
   "author": "vilmire",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@adhdev/mesh-shared": "1.0.28-rc.17",
-    "@adhdev/session-host-core": "1.0.28-rc.17",
+    "@adhdev/mesh-shared": "1.0.28-rc.18",
+    "@adhdev/session-host-core": "1.0.28-rc.18",
     "@agentclientprotocol/sdk": "^0.16.1",
     "ajv": "^8.20.0",
     "ajv-formats": "^3.0.1",

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

@@ -729,7 +729,25 @@ export class CliStateEngine {
         if (!session) return;
 
         const { status, messages } = session;
-        const modal = (session as any).activeModal ?? session.modal ?? null;
+        // RC17-APPROVAL-NO-MODAL: a provider's own detectStatus/parseSession script can
+        // report status='waiting_approval' with a modal object whose buttons array is
+        // empty (a half-rendered approval frame, or — as observed live on a Claude
+        // session with no actionable modal anywhere in the raw PTY — a bare status flip
+        // with no real prompt at all). Previously this raw modal was latched straight
+        // into this.activeModal and dispatched through applyWaitingApproval's
+        // ALREADY-actionable branch (line ~1042 below), which sets status +
+        // fires agent:waiting_approval unconditionally — the "!modal" hysteresis/warn
+        // path (the one place button-validity was actually enforced) only runs when the
+        // modal is null, not when it merely has no buttons. Treat a buttons-empty modal
+        // as no modal here so it flows into that same proven hysteresis: it warns, waits
+        // out approvalCooldown, and never fires an event unless a LATER settle pass
+        // observes a genuinely actionable modal. Mirrors hasNonEmptyCliModalButtons used
+        // elsewhere (resolveModal, stabilizeFlappingApprovalStatus) — same predicate,
+        // applied at the point the modal first enters the FSM.
+        const rawModal = (session as any).activeModal ?? session.modal ?? null;
+        const modal = rawModal && Array.isArray(rawModal.buttons) && rawModal.buttons.some(
+            (button: unknown) => typeof button === 'string' && button.trim().length > 0,
+        ) ? rawModal : null;
         const parsedStatus = (session as any).parsedStatus ?? null;
         const parsedMessages = normalizeCliParsedMessages(messages, {
             scope: null,

package/src/commands/chat-commands-read.ts

@@ -24,7 +24,7 @@ import {
     type ChatSourceTransitionCause,
 } from '../chat/source-resolver.js';
 import type { ChatMessage } from '../types.js';
-import { filterUserFacingChatMessages, isActivityChatMessage, isUserFacingChatMessage, normalizeChatMessages } from '../providers/chat-message-normalization.js';
+import { filterUserFacingChatMessages, isActivityChatMessage, isUserFacingChatMessage, normalizeChatMessages, hasTrailingToolActivityAfterFinalAssistant } from '../providers/chat-message-normalization.js';
 import {
     READ_CHAT_PROVIDER_EVAL_TIMEOUT_MS,
     type RuntimeChatMessageMerger,
@@ -2480,11 +2480,43 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
                     });
                 }
             }
+            // RC17-NATIVE-FINAL-ASSISTANT-MIDTURN: hasFinalVisibleAssistantMessage only
+            // checks that the LAST visible native-transcript message is a non-empty
+            // assistant/model bubble — it has no notion of whether that bubble is
+            // actually the end of the turn. A live Claude repro showed this reconciling
+            // generating→idle on an INTERIM narration bubble ("Starting the collector
+            // now, before the two-turn protocol.") emitted mid-turn, well before the
+            // real two-turn protocol/tool work ran — exactly the false-completion class
+            // rc.16 (9452bd03/6677a565) closed for the mesh-event ingress via
+            // hasTrailingToolActivityAfterFinalAssistant + hasLiveTurnPendingEvidence.
+            // This read_chat status ingress is a SEPARATE consumer of the same
+            // native-final-assistant signal (it feeds the `status` field returned to
+            // read_chat/dashboard, not the mesh agent:generating_completed event) and
+            // never got the equivalent veto. This reconciliation exists precisely for a
+            // PTY/adapter status detector that never transitions to idle on its own (see
+            // read-chat-completed-session-fallback.test.ts's antigravity stuck-busy
+            // case: isProcessing() stays true forever, empty PTY messages, and native
+            // history is the only signal that ever resolves it) — so gating on the
+            // adapter's own pending-response bit here would neuter this reconciliation
+            // for that exact intended case. Apply only STRUCTURAL, evidence-based vetoes
+            // instead, mirroring rc.16's hasLiveTurnPendingEvidence: trailing tool/
+            // terminal activity after the final-looking assistant bubble, scanned in (a)
+            // the native messages being judged — the transcript's own admission that its
+            // "final" bubble kept going — and (b) the live PTY-parsed tail
+            // (returnedMessages), which carries no native-transcript write-lag and is
+            // exactly how a live Claude repro was caught: the native JSONL's last row was
+            // still the interim narration bubble (no trailing tool row landed there yet),
+            // but the PTY had already rendered the very next "Auto-approved: Yes\nBash
+            // command" tool activity. The antigravity stuck-busy case has an EMPTY PTY
+            // message list, so (b) is a no-op there (the function short-circuits false on
+            // an empty/absent array) and the existing regression is unaffected.
             if (
                 isGeneratingLikeStatus(selectedStatus)
                 && selectedTranscriptAuthority === 'provider'
                 && !hasNonEmptyModalButtons(activeModal)
                 && hasFinalVisibleAssistantMessage(selectedMessages)
+                && !hasTrailingToolActivityAfterFinalAssistant(selectedMessages as any)
+                && !hasTrailingToolActivityAfterFinalAssistant(returnedMessages as any)
             ) {
                 selectedStatus = 'idle';
                 selectedMessages = finalizeStreamingMessagesWhenIdle(selectedMessages, selectedStatus);