@adhdev/daemon-core 0.9.82-rc.134 → 0.9.82-rc.136

package/dist/providers/approval-utils.d.ts

@@ -5,3 +5,12 @@ export declare function pickApprovalButton(buttons: string[] | null | undefined,
     label: string;
 };
 export declare function formatAutoApprovalMessage(modalMessage?: string, buttonLabel?: string): string;
+/**
+ * Returns true when the given text (e.g. last assistant message content, or
+ * the tail of the PTY screen) looks like an active approval/input prompt
+ * rather than a completed assistant response. Used to prevent false
+ * idle/completion events when Claude Code surfaces a "Do you want to proceed?"
+ * style prompt that the PTY parser captures as an assistant turn while the
+ * session is still awaiting user input.
+ */
+export declare function looksLikeActiveApprovalPromptText(content: string): boolean;

package/package.json

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

package/src/cli-adapter-types.d.ts

@@ -53,6 +53,7 @@ export interface CliAdapter {
     clearHistory?(): void;
     resolveAction?(data: unknown): Promise<void>;
     resolveModal?(buttonIndex: number): void;
+    isApprovalRecentlyResolved?(): boolean;
     setOnPtyData?(callback: (data: string) => void): void;
     writeRaw?(data: string): void;
     resize?(cols: number, rows: number): void;

package/src/cli-adapter-types.ts

@@ -58,6 +58,7 @@ export interface CliAdapter {
     clearHistory?(): void;
     resolveAction?(data: unknown): Promise<void>;
     resolveModal?(buttonIndex: number): void;
+    isApprovalRecentlyResolved?(): boolean;
  // Raw PTY I/O (for terminal view)
     setOnPtyData?(callback: (data: string) => void): void;
     writeRaw?(data: string): void;

package/src/cli-adapters/provider-cli-adapter.d.ts

@@ -164,6 +164,7 @@ export declare class ProviderCliAdapter implements CliAdapter {
     isReady(): boolean;
     writeRaw(data: string): Promise<void>;
     resolveModal(buttonIndex: number): void;
+    isApprovalRecentlyResolved(): boolean;
     resize(cols: number, rows: number): void;
     getDebugState(): Record<string, any>;
     getTraceState(limit?: number): Record<string, any>;

package/src/cli-adapters/provider-cli-adapter.ts

@@ -1669,6 +1669,8 @@ export class ProviderCliAdapter implements CliAdapter {
                 recentOutputBuffer: this.recentOutputBuffer,
                 terminalScreenText: parseScreenText,
                 workingDir: this.workingDir,
+                providerSessionId: this.providerSessionId || undefined,
+                historySessionId: this.providerSessionId || undefined,
                 baseMessages: [],
                 partialResponse: this.responseBuffer,
                 isWaitingForResponse: this.isWaitingForResponse,
@@ -1951,6 +1953,8 @@ export class ProviderCliAdapter implements CliAdapter {
             recentOutputBuffer: this.recentOutputBuffer,
             terminalScreenText: this.getParseScreenText(this.terminalScreen.getText()),
             workingDir: this.workingDir,
+            providerSessionId: this.providerSessionId || undefined,
+            historySessionId: this.providerSessionId || undefined,
             baseMessages: [],
             partialResponse: this.responseBuffer,
             isWaitingForResponse: this.isWaitingForResponse,
@@ -2572,6 +2576,12 @@ export class ProviderCliAdapter implements CliAdapter {
     }
 
     updateRuntimeMeta(meta: Record<string, unknown>, replace = false): void {
+        const nextProviderSessionId = typeof meta?.providerSessionId === 'string'
+            ? meta.providerSessionId.trim()
+            : '';
+        if (nextProviderSessionId) {
+            this.providerSessionId = nextProviderSessionId;
+        }
         if (!this.ptyProcess || typeof this.ptyProcess.updateMeta !== 'function') return;
         this.ptyProcess.updateMeta(meta, replace);
     }
@@ -2727,6 +2737,13 @@ export class ProviderCliAdapter implements CliAdapter {
     }
 
     resolveModal(buttonIndex: number): void {
+        // Idempotency guard: if we already resolved an approval within the cooldown
+        // window, do not write another key to the PTY. This prevents double-writes when
+        // auto-approve fires and then the status poller re-enters before the PTY absorbs
+        // the first keystroke, or when an external mesh_approve command races with auto-approve.
+        if (this.lastApprovalResolvedAt && (Date.now() - this.lastApprovalResolvedAt) < this.timeouts.approvalCooldown) {
+            return;
+        }
         let modal = this.activeModal || this.runParseApproval(this.recentOutputBuffer);
         if (!modal && typeof this.cliScripts?.parseSession === 'function') {
             try {
@@ -2775,6 +2792,11 @@ export class ProviderCliAdapter implements CliAdapter {
         }
     }
 
+    /** Returns true if an approval was resolved within the adapter's cooldown window. */
+    isApprovalRecentlyResolved(): boolean {
+        return !!(this.lastApprovalResolvedAt && (Date.now() - this.lastApprovalResolvedAt) < this.timeouts.approvalCooldown);
+    }
+
     resize(cols: number, rows: number): void {
         if (this.ptyProcess) {
             try {

package/src/cli-adapters/provider-cli-parse.ts

@@ -36,6 +36,8 @@ export function buildCliParseInput(options: {
     recentOutputBuffer: string;
     terminalScreenText: string;
     workingDir?: string;
+    providerSessionId?: string;
+    historySessionId?: string;
     baseMessages: CliChatMessage[];
     partialResponse: string;
     isWaitingForResponse?: boolean;
@@ -48,6 +50,8 @@ export function buildCliParseInput(options: {
         recentOutputBuffer,
         terminalScreenText,
         workingDir,
+        providerSessionId,
+        historySessionId,
         baseMessages,
         partialResponse,
         isWaitingForResponse,
@@ -70,6 +74,8 @@ export function buildCliParseInput(options: {
         screenText,
         workspace: workingDir,
         workingDir,
+        providerSessionId,
+        historySessionId,
         screen: buildCliScreenSnapshot(screenText),
         bufferScreen: buildCliScreenSnapshot(buffer),
         recentScreen: buildCliScreenSnapshot(recentBuffer),

package/src/cli-adapters/provider-cli-shared.ts

@@ -108,6 +108,8 @@ export interface CliScriptInput {
     screenText: string;
     workspace?: string;
     workingDir?: string;
+    providerSessionId?: string;
+    historySessionId?: string;
     screen: CliScreenSnapshot;
     bufferScreen: CliScreenSnapshot;
     recentScreen: CliScreenSnapshot;

package/src/commands/chat-commands.ts

@@ -2770,6 +2770,12 @@ export async function handleResolveAction(h: CommandHelpers, args: any): Promise
         if (buttonIndex < 0) {
             return { success: false, error: 'Approval action did not match any visible button' };
         }
+        // Idempotency: if the adapter already resolved this approval within cooldown, report
+        // stale_prompt rather than writing a second key to the PTY.
+        if (typeof adapter.isApprovalRecentlyResolved === 'function' && adapter.isApprovalRecentlyResolved()) {
+            LOG.info('Command', `[resolveAction] CLI PTY → stale_prompt (already resolved within cooldown)`);
+            return { success: true, stalePrompt: true, buttonIndex, button: buttons[buttonIndex] ?? button };
+        }
         if (typeof adapter.resolveModal === 'function') {
             adapter.resolveModal(buttonIndex);
         } else {

package/src/commands/cli-manager.ts

@@ -553,7 +553,9 @@ export class DaemonCliManager {
                 providerSessionId,
                 attachExisting,
             );
-            return new ProviderCliAdapter(resolvedProvider as CliProviderModule, workingDir, cliArgs, extraEnv || {}, transportFactory);
+            const adapter = new ProviderCliAdapter(resolvedProvider as CliProviderModule, workingDir, cliArgs, extraEnv || {}, transportFactory);
+            if (providerSessionId) adapter.updateRuntimeMeta({ providerSessionId });
+            return adapter;
         }
 
         throw new Error(`No CLI provider found for '${cliType}'. Create a provider.js in providers/cli/${cliType}/`);

package/src/providers/approval-utils.ts

@@ -72,3 +72,30 @@ export function formatAutoApprovalMessage(modalMessage?: string, buttonLabel?: s
     if (cleanMessage) lines.push(cleanMessage);
     return lines.join('\n');
 }
+
+/**
+ * Returns true when the given text (e.g. last assistant message content, or
+ * the tail of the PTY screen) looks like an active approval/input prompt
+ * rather than a completed assistant response. Used to prevent false
+ * idle/completion events when Claude Code surfaces a "Do you want to proceed?"
+ * style prompt that the PTY parser captures as an assistant turn while the
+ * session is still awaiting user input.
+ */
+export function looksLikeActiveApprovalPromptText(content: string): boolean {
+    const text = content.trim();
+    if (!text || text.length > 2000) return false;
+    const hasApprovalQuestion = /do you want to (?:proceed|allow|run|make this edit|create)/i.test(text)
+        || /this command requires approval/i.test(text)
+        || /quick safety check/i.test(text)
+        || /is this a project you trust/i.test(text);
+    const hasNumberedChoices = /^\s*[❯›>]?\s*1[.)]\s+(?:yes|allow|proceed|run)/im.test(text)
+        || /^\s*1[.)]\s+yes\b/im.test(text);
+    if (hasApprovalQuestion && hasNumberedChoices) return true;
+    const lastLines = text.split(/\r?\n/).slice(-12).join('\n');
+    const hasDontAskAgain = /yes.*don'?t ask again/i.test(lastLines)
+        || /yes.*always allow/i.test(lastLines);
+    const hasNoOption = /^\s*[❯›>]?\s*\d+[.)]\s+no\b/im.test(lastLines);
+    if (hasDontAskAgain && hasNoOption) return true;
+    if (/what do you want to do\?/i.test(text) && /^\s*\d+[.)]\s+\S/m.test(text)) return true;
+    return false;
+}

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

@@ -21,7 +21,7 @@ import { ChatHistoryWriter, isNativeSourceCanonicalHistory, materializeProviderN
 import { LOG } from '../logging/logger.js';
 import type { ChatMessage } from '../types.js';
 import { buildPersistedProviderEffectMessage, normalizeProviderEffects } from './control-effects.js';
-import { formatAutoApprovalMessage, pickApprovalButton } from './approval-utils.js';
+import { formatAutoApprovalMessage, pickApprovalButton, looksLikeActiveApprovalPromptText } from './approval-utils.js';
 import { getCliScriptCommand, parseCliScriptResult } from './cli-script-results.js';
 import { mergeProviderPatchState, resolveProviderStateSurface } from './provider-patch-state.js';
 import { normalizeProviderSessionId } from './provider-session-id.js';
@@ -48,6 +48,7 @@ function isIdleStatus(value: unknown): boolean {
     return !status || status === 'idle' || status === 'ready';
 }
 
+
 function getMessageTime(message: unknown): number {
     if (!message || typeof message !== 'object') return 0;
     const record = message as { receivedAt?: unknown; timestamp?: unknown };
@@ -389,6 +390,9 @@ export class CliProviderInstance implements ProviderInstance {
         this.launchMode = options?.launchMode || 'new';
         this.onProviderSessionResolved = options?.onProviderSessionResolved;
         this.adapter = new ProviderCliAdapter(provider as CliProviderModule, workingDir, cliArgs, options?.extraEnv || {}, transportFactory);
+        if (this.providerSessionId) {
+            this.adapter.updateRuntimeMeta({ providerSessionId: this.providerSessionId });
+        }
         this.monitor = new StatusMonitor();
         this.historyWriter = new ChatHistoryWriter();
     }
@@ -825,7 +829,11 @@ export class CliProviderInstance implements ProviderInstance {
         const lastVisible = visibleMessages[visibleMessages.length - 1] as ChatMessage | undefined;
         const role = typeof lastVisible?.role === 'string' ? lastVisible.role.trim().toLowerCase() : '';
         const content = lastVisible ? flattenContent(lastVisible.content).trim() : '';
-        return role === 'assistant' && !!content;
+        if (role !== 'assistant' || !content) return false;
+        // Guard: if the last assistant message looks like an active approval/input prompt,
+        // it is not a real completion — the session is still awaiting user input.
+        if (looksLikeActiveApprovalPromptText(content)) return false;
+        return true;
     }
 
     private buildCompletedFinalizationDiagnostic(args: {
@@ -940,6 +948,22 @@ export class CliProviderInstance implements ProviderInstance {
         if (parsed?.activeModal || parsed?.modal) return { reason: 'parsed_modal_active', terminal: true };
         if (!this.completionHasFinalAssistantMessage(parsed?.messages)) return { reason: 'missing_final_assistant' };
 
+        // Guard: if the screen still shows an approval/choice prompt as the last visible text,
+        // the turn is not complete even if the parsed status says idle and there is an assistant
+        // message. This catches the case where waiting_approval→idle transitions occur before
+        // the modal has been resolved (e.g. the PTY rendered the prompt but no button press fired).
+        try {
+            const screenText = typeof (this.adapter as any).getScreenText === 'function'
+                ? String((this.adapter as any).getScreenText() || '')
+                : '';
+            if (screenText) {
+                const tailLines = screenText.split(/\r?\n/).slice(-16).join('\n');
+                if (looksLikeActiveApprovalPromptText(tailLines)) {
+                    return { reason: 'screen_shows_approval_prompt', terminal: false };
+                }
+            }
+        } catch { /* defensive: screen text read is best-effort */ }
+
         return null;
     }