@adhdev/daemon-core 0.9.82-rc.174 → 0.9.82-rc.176

package/dist/providers/cli-provider-instance.d.ts

@@ -104,6 +104,9 @@ export declare class CliProviderInstance implements ProviderInstance {
     private completedDebouncePending;
     private enforceFreshSessionLaunchIfNeeded;
     private completionHasFinalAssistantMessage;
+    private readExternalCompletionMessages;
+    private completionFinalAssistantEvidence;
+    private completionFinalSummary;
     private buildCompletedFinalizationDiagnostic;
     private hasAdapterPendingResponse;
     private shouldSuppressStaleParsedBusyStatus;

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

@@ -86,6 +86,16 @@ export interface SpecDriverOpts {
      */
     extraCliArgs?: string[];
 }
+/**
+ * Pick the effective delay (ms) to wait between writing the prompt body and
+ * writing the submit_key. Exported for tests; production callers go through
+ * actuallySendMessage. Floors to SUBMIT_DELAY_FLOOR_MS so specs that omit
+ * delay_ms_before_submit (e.g. claude, antigravity) still get baseline
+ * protection against the paste→submit race. Adds line-count bonus so
+ * multi-line prompts get more settling time on TUIs that re-render per
+ * embedded `\n`.
+ */
+export declare function resolveSubmitDelayMs(specBeforeSubmit: number | undefined, text: string): number;
 export declare class SpecDriver {
     private readonly opts;
     private spec;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.9.82-rc.174",
+  "version": "0.9.82-rc.176",
   "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

@@ -64,6 +64,12 @@ type CompletedFinalizationBlock = {
     terminal?: boolean;
 };
 
+type CompletionFinalAssistantEvidence = {
+    present: boolean;
+    messages: unknown[];
+    source: 'parsed' | 'external-native' | 'unavailable';
+};
+
 const COMPLETED_FINALIZATION_RETRY_MS = 1000;
 const COMPLETED_FINALIZATION_MAX_WAIT_MS = 30_000;
 
@@ -890,6 +896,56 @@ export class CliProviderInstance implements ProviderInstance {
         return true;
     }
 
+    private readExternalCompletionMessages(): unknown[] | null {
+        const adapterOwnsMessagesElsewhere = (this.adapter as any)?.chatMessagesOwnedExternally === true;
+        if (!adapterOwnsMessagesElsewhere) return null;
+        if (!this.providerSessionId) return null;
+        if (!isNativeSourceCanonicalHistory(this.provider.nativeHistory)) return null;
+
+        const restoredHistory = readProviderChatHistory(this.type, {
+            canonicalHistory: this.provider.nativeHistory,
+            historySessionId: this.providerSessionId,
+            workspace: this.workingDir,
+            offset: 0,
+            limit: Number.MAX_SAFE_INTEGER,
+            historyBehavior: this.provider.historyBehavior,
+            scripts: this.provider.scripts as any,
+            sessionStartedAtMs: this.startedAt,
+        });
+        if (restoredHistory.source !== 'provider-native') return null;
+        return restoredHistory.messages;
+    }
+
+    private completionFinalAssistantEvidence(parsedMessages: unknown): CompletionFinalAssistantEvidence {
+        if (this.completionHasFinalAssistantMessage(parsedMessages)) {
+            return {
+                present: true,
+                messages: Array.isArray(parsedMessages) ? parsedMessages : [],
+                source: 'parsed',
+            };
+        }
+
+        const externalMessages = this.readExternalCompletionMessages();
+        if (externalMessages) {
+            return {
+                present: this.completionHasFinalAssistantMessage(externalMessages),
+                messages: externalMessages,
+                source: 'external-native',
+            };
+        }
+
+        return {
+            present: false,
+            messages: Array.isArray(parsedMessages) ? parsedMessages : [],
+            source: 'unavailable',
+        };
+    }
+
+    private completionFinalSummary(parsedMessages: unknown): string | undefined {
+        const evidence = this.completionFinalAssistantEvidence(parsedMessages);
+        return extractFinalSummaryFromMessages(evidence.messages as any);
+    }
+
     private buildCompletedFinalizationDiagnostic(args: {
         blockReason: string;
         latestStatus?: any;
@@ -906,7 +962,8 @@ export class CliProviderInstance implements ProviderInstance {
             parseError = error?.message || String(error);
         }
 
-        const visibleMessages = (Array.isArray(parsed?.messages) ? parsed.messages : [])
+        const evidence = this.completionFinalAssistantEvidence(parsed?.messages);
+        const visibleMessages = (Array.isArray(evidence.messages) ? evidence.messages : [])
             .filter((message: any) => isUserFacingChatMessage(message as ChatMessage));
         const lastVisible = visibleMessages[visibleMessages.length - 1] as ChatMessage | undefined;
         const lastVisibleRole = typeof lastVisible?.role === 'string' ? lastVisible.role.trim().toLowerCase() : null;
@@ -926,7 +983,8 @@ export class CliProviderInstance implements ProviderInstance {
             latestVisibleStatus: args.latestVisibleStatus,
             parsedStatus: typeof parsed?.status === 'string' ? parsed.status : (parseError ? 'parse_error' : 'unknown'),
             parseError: parseError || undefined,
-            finalAssistantPresent: this.completionHasFinalAssistantMessage(parsed?.messages),
+            finalAssistantPresent: evidence.present,
+            finalAssistantEvidenceSource: evidence.source,
             visibleMessageCount: visibleMessages.length,
             lastVisibleRole,
             lastVisibleKind,
@@ -1003,14 +1061,26 @@ export class CliProviderInstance implements ProviderInstance {
             return { reason: `parsed_status:${parsedStatus}`, terminal: isCliGeneratingLikeStatus(parsedStatus) };
         }
         if (parsed?.activeModal || parsed?.modal) return { reason: 'parsed_modal_active', terminal: true };
-        // SpecCliAdapter never populates parsed.messages — chat history flows
-        // through the daemon's native-history pipeline, not the status hook.
-        // Skipping the final-assistant gate avoids a 30s stall on every turn
-        // for spec-routed providers (agy / codex / claude / hermes).
         const adapterOwnsMessagesElsewhere = (this.adapter as any)?.chatMessagesOwnedExternally === true;
-        if (!adapterOwnsMessagesElsewhere
-            && !this.completionHasFinalAssistantMessage(parsed?.messages)) {
-            return { reason: 'missing_final_assistant' };
+        const finalAssistantEvidence = this.completionFinalAssistantEvidence(parsed?.messages);
+        if (!finalAssistantEvidence.present) {
+            if (adapterOwnsMessagesElsewhere) {
+                if (finalAssistantEvidence.source === 'external-native') {
+                    return { reason: 'missing_final_assistant', terminal: true };
+                }
+                // SpecCliAdapter never populates parsed.messages — chat history flows
+                // through the daemon's native-history pipeline, not the status hook.
+                // If that pipeline is unavailable, keep the old skip behavior for
+                // providers that have not opted into strict final-assistant evidence.
+                if ((this.provider as any).requiresFinalAssistantBeforeIdle === true) {
+                    return { reason: 'missing_final_assistant', terminal: true };
+                }
+            } else {
+                return {
+                    reason: 'missing_final_assistant',
+                    terminal: (this.provider as any).requiresFinalAssistantBeforeIdle === true,
+                };
+            }
         }
 
         // Guard: if the screen still shows an approval/choice prompt as the last visible text,
@@ -1082,7 +1152,7 @@ export class CliProviderInstance implements ProviderInstance {
                 timestamp: pending.timestamp,
                 finalSummary: blockReason.startsWith('parsed_status:')
                     ? ''
-                    : extractFinalSummaryFromMessages(this.adapter?.getScriptParsedStatus()?.messages),
+                    : this.completionFinalSummary(this.adapter?.getScriptParsedStatus()?.messages),
                 completionDiagnostic,
             });
             this.completedDebouncePending = null;
@@ -1098,7 +1168,7 @@ export class CliProviderInstance implements ProviderInstance {
             chatTitle: pending.chatTitle,
             duration: pending.duration,
             timestamp: pending.timestamp,
-            finalSummary: extractFinalSummaryFromMessages(this.adapter?.getScriptParsedStatus()?.messages),
+            finalSummary: this.completionFinalSummary(this.adapter?.getScriptParsedStatus()?.messages),
         });
         this.completedDebouncePending = null;
         this.completedDebounceTimer = null;
@@ -1255,8 +1325,14 @@ export class CliProviderInstance implements ProviderInstance {
                     // 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;
-                    try { shortFinalSummary = extractFinalSummaryFromMessages(this.adapter?.getScriptParsedStatus()?.messages); } catch { /* best-effort */ }
-                    if ((this.provider as any).requiresFinalAssistantBeforeIdle === true && !shortFinalSummary) {
+                    let shortEvidenceSource: CompletionFinalAssistantEvidence['source'] = 'unavailable';
+                    try {
+                        const parsedMessages = this.adapter?.getScriptParsedStatus()?.messages;
+                        const evidence = this.completionFinalAssistantEvidence(parsedMessages);
+                        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({
@@ -1268,6 +1344,7 @@ export class CliProviderInstance implements ProviderInstance {
                             completionDiagnostic: {
                                 reason: 'short_generating_suppressed',
                                 shortDurationMs,
+                                finalAssistantEvidenceSource: shortEvidenceSource,
                             },
                         });
                     }

package/src/providers/spec/driver.ts

@@ -102,6 +102,36 @@ const STARTUP_GRACE_MS = 2500;
  *  the post-turn idle indication noticeably. */
 const BUSY_HOLD_MS = 6000;
 
+/** Minimum delay between the prompt body and the submit_key in send_message.
+ *  Claude / antigravity specs ship without an explicit delay_ms_before_submit
+ *  and their TUIs sometimes drop the `\r` event when it arrives in the same
+ *  PTY chunk as the text body — the prompt sits visible in the input field
+ *  but is never submitted until the user hits Enter manually. 200ms matches
+ *  codex's explicit setting and is barely perceptible to a human caller. */
+const SUBMIT_DELAY_FLOOR_MS = 200;
+
+function countNewlines(s: string): number {
+    let n = 0;
+    for (let i = 0; i < s.length; i += 1) if (s.charCodeAt(i) === 10) n += 1;
+    return n;
+}
+
+/**
+ * Pick the effective delay (ms) to wait between writing the prompt body and
+ * writing the submit_key. Exported for tests; production callers go through
+ * actuallySendMessage. Floors to SUBMIT_DELAY_FLOOR_MS so specs that omit
+ * delay_ms_before_submit (e.g. claude, antigravity) still get baseline
+ * protection against the paste→submit race. Adds line-count bonus so
+ * multi-line prompts get more settling time on TUIs that re-render per
+ * embedded `\n`.
+ */
+export function resolveSubmitDelayMs(specBeforeSubmit: number | undefined, text: string): number {
+    const lines = countNewlines(text);
+    const linesBonus = Math.min(800, lines * 80);
+    const spec = typeof specBeforeSubmit === 'number' && specBeforeSubmit > 0 ? specBeforeSubmit : 0;
+    return Math.max(spec, SUBMIT_DELAY_FLOOR_MS + linesBonus);
+}
+
 export class SpecDriver {
     private spec!: CliSpec;
     private adapter!: TerminalAdapter;
@@ -371,7 +401,15 @@ export class SpecDriver {
     private actuallySendMessage(text: string): void {
         const sm = this.spec.send_message;
         const perChar = sm.delay_ms_per_char ?? 0;
-        const beforeSubmit = sm.delay_ms_before_submit ?? 0;
+        // Floor the gap between text and submit_key. Without this, claude /
+        // antigravity specs (which leave delay_ms_before_submit unset)
+        // race: text bytes and `\r` arrive back-to-back, the TUI processes
+        // the `\r` while still digesting the text input, and the prompt
+        // sits visible in the input field but never submits — the user has
+        // to press Enter manually. Scale with line count so multi-line
+        // pastes (which take longer for the TUI to render) get more
+        // settling time.
+        const beforeSubmit = resolveSubmitDelayMs(sm.delay_ms_before_submit, text);
         if (perChar === 0) {
             this.adapter.send_keys(text);
             if (beforeSubmit > 0) setTimeout(() => this.adapter.send_keys(sm.submit_key), beforeSubmit);