@adhdev/daemon-core 0.9.82-rc.169 → 0.9.82-rc.170

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

@@ -36,6 +36,7 @@ export declare function handleMeshForwardEvent(components: DaemonComponents, pay
     terminalLedgerEvidence?: undefined;
     terminalLedgerKind?: undefined;
     duplicateRefineTerminalEvent?: undefined;
+    duplicateApproval?: undefined;
     duplicateCompletion?: undefined;
     error?: undefined;
     bufferedForGeneratingCoordinator?: undefined;
@@ -47,6 +48,7 @@ export declare function handleMeshForwardEvent(components: DaemonComponents, pay
     terminalLedgerKind: unknown;
     intentionalCleanupStop?: undefined;
     duplicateRefineTerminalEvent?: undefined;
+    duplicateApproval?: undefined;
     duplicateCompletion?: undefined;
     error?: undefined;
     bufferedForGeneratingCoordinator?: undefined;
@@ -58,6 +60,19 @@ export declare function handleMeshForwardEvent(components: DaemonComponents, pay
     intentionalCleanupStop?: undefined;
     terminalLedgerEvidence?: undefined;
     terminalLedgerKind?: undefined;
+    duplicateApproval?: undefined;
+    duplicateCompletion?: undefined;
+    error?: undefined;
+    bufferedForGeneratingCoordinator?: undefined;
+} | {
+    success: boolean;
+    forwarded: number;
+    suppressed: boolean;
+    duplicateApproval: boolean;
+    intentionalCleanupStop?: undefined;
+    terminalLedgerEvidence?: undefined;
+    terminalLedgerKind?: undefined;
+    duplicateRefineTerminalEvent?: undefined;
     duplicateCompletion?: undefined;
     error?: undefined;
     bufferedForGeneratingCoordinator?: undefined;
@@ -70,6 +85,7 @@ export declare function handleMeshForwardEvent(components: DaemonComponents, pay
     intentionalCleanupStop?: undefined;
     terminalLedgerKind?: undefined;
     duplicateRefineTerminalEvent?: undefined;
+    duplicateApproval?: undefined;
     error?: undefined;
     bufferedForGeneratingCoordinator?: undefined;
 } | {
@@ -81,6 +97,7 @@ export declare function handleMeshForwardEvent(components: DaemonComponents, pay
     terminalLedgerEvidence?: undefined;
     terminalLedgerKind?: undefined;
     duplicateRefineTerminalEvent?: undefined;
+    duplicateApproval?: undefined;
     error?: undefined;
     bufferedForGeneratingCoordinator?: undefined;
 } | {
@@ -91,6 +108,7 @@ export declare function handleMeshForwardEvent(components: DaemonComponents, pay
     terminalLedgerEvidence?: undefined;
     terminalLedgerKind?: undefined;
     duplicateRefineTerminalEvent?: undefined;
+    duplicateApproval?: undefined;
     duplicateCompletion?: undefined;
     error?: undefined;
     bufferedForGeneratingCoordinator?: undefined;
@@ -103,6 +121,7 @@ export declare function handleMeshForwardEvent(components: DaemonComponents, pay
     terminalLedgerEvidence?: undefined;
     terminalLedgerKind?: undefined;
     duplicateRefineTerminalEvent?: undefined;
+    duplicateApproval?: undefined;
     duplicateCompletion?: undefined;
     error?: undefined;
 } | {

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

@@ -45,7 +45,7 @@ export declare class CliProviderInstance implements ProviderInstance {
     private monitor;
     private generatingDebounceTimer;
     private generatingDebouncePending;
-    private lastApprovalEventAt;
+    private lastApprovalEventFingerprint;
     private autoApproveBusy;
     private autoApproveBusyTimer;
     private lastAutoApprovalSignature;
@@ -64,6 +64,7 @@ export declare class CliProviderInstance implements ProviderInstance {
     private suppressIdleHistoryReplay;
     private errorMessage;
     private errorReason;
+    private activeInteractivePrompt;
     private presentationMode;
     private providerSessionId?;
     private launchMode;

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

@@ -11,6 +11,7 @@ import type { ProviderModule, ProviderResumeCapability } from './contracts.js';
 import type { AcpConfigOption, AcpMode, ProviderControlSchema, ProviderSummaryMetadata, SessionCapability } from '../shared-types.js';
 import type { MessageInputSupport } from './provider-input-support.js';
 import type { ChatMessage } from '../types.js';
+import type { InteractivePrompt } from './types/interactive-prompt.js';
 export type ProviderStatus = 'idle' | 'generating' | 'waiting_approval' | 'error' | 'stopped' | 'starting';
 export interface ProviderRuntimeWriteOwner {
     clientId: string;
@@ -42,6 +43,7 @@ export interface ActiveChatData {
         message: string;
         buttons: string[];
     } | null;
+    activeInteractivePrompt?: InteractivePrompt | null;
     inputContent?: string;
 }
 /** Standardized error reasons across all provider categories */
@@ -56,6 +58,7 @@ interface ProviderStateBase {
     status: ProviderStatus;
     /** chat data */
     activeChat: ActiveChatData | null;
+    activeInteractivePrompt?: InteractivePrompt | null;
     /** Workspace — project path or name (all categories) */
     workspace?: string | null;
     /** Runtime info (real-time detection) */

package/dist/providers/spec/cli-adapter.d.ts

@@ -1,5 +1,6 @@
 import type { CliAdapter, CliAdapterStatus } from '../../cli-adapter-types.js';
 import type { PtyTransportFactory } from '../../cli-adapters/pty-transport.js';
+import { type InteractivePromptResponse } from '../types/interactive-prompt.js';
 export declare class SpecCliAdapter implements CliAdapter {
     readonly cliType: string;
     readonly cliName: string;
@@ -21,6 +22,10 @@ export declare class SpecCliAdapter implements CliAdapter {
     private statusCallback;
     private ptyDataCallback;
     private partialResponse;
+    private activeInteractivePrompt;
+    private interactivePromptTransport;
+    private claudeTuiPromptCaptureInFlight;
+    private jsonLineTail;
     private exited;
     private spawned;
     private providerSessionId;
@@ -56,6 +61,7 @@ export declare class SpecCliAdapter implements CliAdapter {
     resize(cols: number, rows: number): void;
     resolveModal(buttonIndex: number): void;
     resolveAction(data: unknown): Promise<void>;
+    setInteractivePromptResponse(response: InteractivePromptResponse): Promise<void>;
     isApprovalRecentlyResolved(): boolean;
     clearHistory(): void;
     updateRuntimeSettings(): void;
@@ -82,4 +88,8 @@ export declare class SpecCliAdapter implements CliAdapter {
     updateRuntimeMeta(meta?: Record<string, unknown>): void;
     refreshProviderDefinition(): void;
     private handleEvent;
+    private detectInteractivePromptFromPtyChunk;
+    private maybeCaptureClaudeTuiPrompt;
+    private readClaudeTuiHeaders;
+    private captureClaudeTuiPrompt;
 }

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

@@ -123,6 +123,7 @@ export declare class SpecDriver {
     subscribe(listener: (ev: DashboardEvent) => void): () => void;
     start(): void;
     dispatch(cmd: DashboardCommand): void;
+    snapshot(): string;
     shutdown(): void;
     private loadSpecOrThrow;
     private buildAdapterOpts;

package/dist/providers/types/interactive-prompt.d.ts

@@ -0,0 +1,48 @@
+export interface InteractivePrompt {
+    promptId: string;
+    origin: 'cli' | 'mcp' | 'agent';
+    providerType: string;
+    createdAt: number;
+    questions: InteractiveQuestion[];
+}
+export interface InteractiveQuestion {
+    questionId: string;
+    question: string;
+    header?: string;
+    multiSelect: boolean;
+    options: InteractiveOption[];
+    allowFreeform?: boolean;
+}
+export interface InteractiveOption {
+    label: string;
+    description?: string;
+    preview?: string;
+}
+export interface InteractivePromptResponse {
+    promptId: string;
+    answers: Record<string, InteractiveAnswer>;
+}
+export interface InteractiveAnswer {
+    selectedLabels: string[];
+    freeformText?: string;
+}
+export declare function normalizeInteractivePrompt(raw: unknown): InteractivePrompt | null;
+export declare function normalizeInteractivePromptResponse(raw: unknown): InteractivePromptResponse;
+export declare function buildClaudeInteractiveToolResult(response: InteractivePromptResponse): string;
+export interface ClaudeInteractiveTuiPage {
+    screenText: string;
+    header?: string;
+}
+export declare function detectClaudeAskUserQuestionPromptFromTuiPages(pages: ClaudeInteractiveTuiPage[], options: {
+    promptId: string;
+    providerType?: string;
+    createdAt?: number;
+}): InteractivePrompt | null;
+export declare function buildClaudeInteractiveTuiAnswerSteps(prompt: InteractivePrompt, response: InteractivePromptResponse): string[];
+export declare function interactivePromptFromClaudeAskUserQuestion(input: unknown, options: {
+    promptId: string;
+    providerType: string;
+    createdAt?: number;
+    origin?: InteractivePrompt['origin'];
+}): InteractivePrompt | null;
+export declare function detectClaudeAskUserQuestionPromptFromJson(value: unknown, providerType?: string): InteractivePrompt | null;

package/dist/shared-types.d.ts

@@ -14,6 +14,7 @@ import type { ActiveChatData as _ActiveChatData, ProviderErrorReason as _Provide
 import type { WorkspaceEntry } from './config/workspaces.js';
 import type { ProviderMeshCoordinatorConfig, ProviderResumeCapability } from './providers/contracts.js';
 import type { GitCompactSummary, GitWorkspaceUpdate, WorkspaceGitSubscriptionParams } from './git/git-types.js';
+import type { InteractivePrompt } from './providers/types/interactive-prompt.js';
 export type { GitCommandName, GitCompactSummary, GitDiffSummary, GitFailureReason, GitFileChange, GitFileChangeStatus, GitRepoIdentity, GitRepoStatus, GitSnapshot, GitSnapshotCompareSummary, GitSnapshotReason, GitWorkspaceUpdate, WorkspaceGitSubscriptionParams, } from './git/git-types.js';
 export interface SessionActiveChatData extends Omit<_ActiveChatData, 'messages'> {
     messages?: _ActiveChatData['messages'];
@@ -49,6 +50,7 @@ export interface ReadChatSyncResult {
         message: string;
         buttons: string[];
     } | null;
+    activeInteractivePrompt?: InteractivePrompt | null;
     /**
      * Chat source provenance from ChatSourceMachine (A2). Carries the
      * selected source, transition cause, lock state, and legacy
@@ -275,6 +277,7 @@ export interface SessionEntry {
     runtimeRecoveryState?: string | null;
     resume?: ProviderResumeCapability;
     activeChat: SessionActiveChatData | null;
+    activeInteractivePrompt?: InteractivePrompt | null;
     capabilities?: SessionCapability[];
     /** Effective message input/media support for this session. Defaults fail-closed to text-only. */
     messageInput?: MessageInputSupport;

package/package.json

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

package/src/cli-adapter-types.ts

@@ -5,6 +5,7 @@
  */
 
 import type { ChatMessage } from './types.js';
+import type { InteractivePrompt, InteractivePromptResponse } from './providers/types/interactive-prompt.js';
 
 export interface CliAdapterStatus {
     status?: string;
@@ -13,6 +14,7 @@ export interface CliAdapterStatus {
         message: string;
         buttons: string[];
     } | null;
+    activeInteractivePrompt?: InteractivePrompt | null;
     providerSessionId?: string;
     errorMessage?: string;
     errorReason?: string;
@@ -60,6 +62,7 @@ export interface CliAdapter {
     setServerConn?(serverConn: unknown): void;
     clearHistory?(): void;
     resolveAction?(data: unknown): Promise<void>;
+    setInteractivePromptResponse?(response: InteractivePromptResponse): Promise<void>;
     resolveModal?(buttonIndex: number): void;
     isApprovalRecentlyResolved?(): boolean;
  // Raw PTY I/O (for terminal view)

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

@@ -16,6 +16,7 @@
 
 import * as os from 'os';
 import type { CliAdapter } from '../cli-adapter-types.js';
+import type { InteractivePromptResponse } from '../providers/types/interactive-prompt.js';
 import { LOG } from '../logging/logger.js';
 import { getDebugRuntimeConfig } from '../logging/debug-config.js';
 import { TerminalScreen } from './terminal-screen.js';
@@ -1076,6 +1077,11 @@ export class ProviderCliAdapter implements CliAdapter {
         await this.sendMessage(promptText);
     }
 
+    async setInteractivePromptResponse(_response: InteractivePromptResponse): Promise<void> {
+        // Legacy TUI providers do not currently expose an interactive prompt
+        // protocol. Spec-backed claude-cli implements the first real wiring.
+    }
+
     private isSubmitStuck(normalizedPromptSnippet: string): boolean {
         if (!this.ptyProcess || !this.engine.isWaitingForResponse || this.engine.submitRetryUsed) return false;
         if (this.engine.hasActionableApproval()) return false;

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

@@ -4,6 +4,7 @@ import { execSync } from 'child_process';
 import type { ProviderResumeCapability } from '../providers/contracts.js';
 import type { ChatMessageKind } from '../providers/chat-message-normalization.js';
 import type { ChatBubbleState } from '../types.js';
+import type { InteractivePrompt } from '../providers/types/interactive-prompt.js';
 import { sanitizeSpawnEnv } from './spawn-env.js';
 
 export interface CliChatMessage {
@@ -28,6 +29,7 @@ export interface CliSessionStatus {
     messages: CliChatMessage[];
     workingDir: string;
     activeModal: { message: string; buttons: string[] } | null;
+    activeInteractivePrompt?: InteractivePrompt | null;
     pendingOutboundCount?: number;
     pendingOutboundMessages?: Array<{
         id: string;

package/src/index.ts

@@ -85,6 +85,21 @@ export type {
   InputMediaType,
 } from './shared-types.js';
 
+export type {
+  InteractivePrompt,
+  InteractiveQuestion,
+  InteractiveOption,
+  InteractivePromptResponse,
+  InteractiveAnswer,
+} from './providers/types/interactive-prompt.js';
+export {
+  normalizeInteractivePrompt,
+  normalizeInteractivePromptResponse,
+  buildClaudeInteractiveToolResult,
+  interactivePromptFromClaudeAskUserQuestion,
+  detectClaudeAskUserQuestionPromptFromJson,
+} from './providers/types/interactive-prompt.js';
+
 // ── Repo Mesh Types (cross-package) ──
 export type {
   RepoMesh,

package/src/mesh/mesh-events.ts

@@ -508,6 +508,33 @@ function isDuplicateMeshCompletionEvent(args: {
     return false;
 }
 
+function isDuplicateMeshApprovalEvent(args: {
+    meshId: string;
+    sessionId: string;
+    providerType?: string;
+    timestamp?: number | null;
+    modalMessage?: string;
+    modalButtons?: unknown;
+}): boolean {
+    const modalButtons = Array.isArray(args.modalButtons)
+        ? args.modalButtons.map(button => String(button).trim()).filter(Boolean)
+        : [];
+    const approvalIdentity = Number.isFinite(args.timestamp)
+        ? String(args.timestamp)
+        : JSON.stringify({ message: args.modalMessage || '', buttons: modalButtons });
+    if (!approvalIdentity || approvalIdentity === '{"message":"","buttons":[]}') return false;
+    const fingerprint = [
+        args.meshId,
+        'agent:waiting_approval',
+        args.sessionId,
+        args.providerType || '',
+        approvalIdentity,
+    ].join('::');
+    if (hasFingerprintSeen(fingerprint)) return true;
+    recordFingerprintSeen(fingerprint);
+    return false;
+}
+
 function isDuplicateRefineTerminalEvent(meshId: string, eventName: string, metadataEvent: Record<string, unknown>): boolean {
     const fingerprint = buildRefineTerminalEventFingerprint(meshId, eventName, metadataEvent);
     if (!fingerprint) return false;
@@ -1214,6 +1241,20 @@ function injectMeshSystemMessage(components: DaemonComponents, args: {
     }
 
     const eventTimestamp = readEventTimestamp(args.metadataEvent.timestamp);
+    if (args.event === 'agent:waiting_approval' && eventSessionId) {
+        const duplicateApproval = isDuplicateMeshApprovalEvent({
+            meshId: args.meshId,
+            sessionId: eventSessionId,
+            providerType: readNonEmptyString(args.metadataEvent.providerType) || undefined,
+            timestamp: eventTimestamp,
+            modalMessage: readNonEmptyString(args.metadataEvent.modalMessage) || undefined,
+            modalButtons: args.metadataEvent.modalButtons,
+        });
+        if (duplicateApproval) {
+            LOG.info('MeshEvents', `Suppressed duplicate approval event for mesh ${args.meshId} session ${eventSessionId}`);
+            return { success: true, forwarded: 0, suppressed: true, duplicateApproval: true };
+        }
+    }
     if (args.event === 'agent:generating_completed' && eventSessionId) {
         const terminal = findRecentTerminalLedgerEvidence({
             meshId: args.meshId,

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

@@ -13,6 +13,7 @@ import { createRequire } from 'node:module';
 import { normalizeInputEnvelope, type ProviderModule, flattenContent, type InputEnvelope, type InputPart } from './contracts.js';
 import { assertProviderSupportsDeclaredInput, getEffectiveMessageInputSupport } from './provider-input-support.js';
 import type { ProviderInstance, ProviderState, ProviderEvent, InstanceContext, ProviderErrorReason, HotChatSessionState, SessionModalState } from './provider-instance.js';
+import { normalizeInteractivePrompt, normalizeInteractivePromptResponse, type InteractivePrompt } from './types/interactive-prompt.js';
 import { ProviderCliAdapter } from '../cli-adapters/provider-cli-adapter.js';
 import type { CliProviderModule } from '../cli-adapters/provider-cli-adapter.js';
 import { createCliAdapter } from './spec/route.js';
@@ -41,6 +42,7 @@ type CompletedDebouncePending = {
     duration: number;
     timestamp: number;
     firstObservedAt: number;
+    previousStatus: string;
     loggedBlockReason?: string;
 };
 
@@ -328,7 +330,7 @@ export class CliProviderInstance implements ProviderInstance {
     private monitor: StatusMonitor;
     private generatingDebounceTimer: NodeJS.Timeout | null = null;
     private generatingDebouncePending: { chatTitle: string; timestamp: number } | null = null;
-    private lastApprovalEventAt = 0;
+    private lastApprovalEventFingerprint = '';
     private autoApproveBusy = false;
     private autoApproveBusyTimer: NodeJS.Timeout | null = null;
     private lastAutoApprovalSignature = '';
@@ -350,6 +352,7 @@ export class CliProviderInstance implements ProviderInstance {
     private suppressIdleHistoryReplay = false;
     private errorMessage: string | undefined = undefined;
     private errorReason: ProviderErrorReason | undefined = undefined;
+    private activeInteractivePrompt: InteractivePrompt | null = null;
 
     private presentationMode: 'terminal' | 'chat';
     private providerSessionId?: string;
@@ -525,6 +528,9 @@ export class CliProviderInstance implements ProviderInstance {
         // parseSession), with provider-loader.ts updated to store script source strings
         // alongside the loaded function references for extended-legacy providers.
         const adapterStatus = this.adapter.getStatus();
+        if (Object.prototype.hasOwnProperty.call(adapterStatus, 'activeInteractivePrompt')) {
+            this.activeInteractivePrompt = adapterStatus.activeInteractivePrompt ?? null;
+        }
         let parsedStatus: any = null;
         let parseErrorMessage: string | undefined;
         if (typeof this.adapter.getScriptParsedStatus === 'function') {
@@ -674,8 +680,10 @@ export class CliProviderInstance implements ProviderInstance {
                 status: activeChatStatus,
                 messages: statusMessages,
                 activeModal: autoApproveActive ? null : (parsedStatus?.activeModal ?? adapterStatus.activeModal),
+                activeInteractivePrompt: this.activeInteractivePrompt,
                 inputContent: '',
             },
+            activeInteractivePrompt: this.activeInteractivePrompt,
             workspace: this.workingDir,
             instanceId: this.instanceId,
             providerSessionId: this.providerSessionId,
@@ -771,6 +779,32 @@ export class CliProviderInstance implements ProviderInstance {
             void this.adapter.resolveAction(data).catch((e: any) => {
                 LOG.warn('CLI', `[${this.type}] resolve_action failed: ${e?.message || e}`);
             });
+        } else if (event === 'interactive_prompt' && data) {
+            const prompt = normalizeInteractivePrompt(data);
+            if (prompt) {
+                this.activeInteractivePrompt = prompt;
+                this.events.push({
+                    event: 'interactive_prompt',
+                    timestamp: Date.now(),
+                    promptId: prompt.promptId,
+                });
+            }
+        } else if (event === 'interactive_prompt_response' && data) {
+            try {
+                const response = normalizeInteractivePromptResponse(data);
+                if (this.activeInteractivePrompt?.promptId === response.promptId) {
+                    this.activeInteractivePrompt = null;
+                }
+                if (typeof this.adapter.setInteractivePromptResponse !== 'function') {
+                    LOG.warn('CLI', `[${this.type}] interactive_prompt_response ignored: adapter does not support interactive prompts`);
+                    return;
+                }
+                void this.adapter.setInteractivePromptResponse(response).catch((e: any) => {
+                    LOG.warn('CLI', `[${this.type}] interactive_prompt_response failed: ${e?.message || e}`);
+                });
+            } catch (e: any) {
+                LOG.warn('CLI', `[${this.type}] invalid interactive_prompt_response: ${e?.message || e}`);
+            }
         } else if (event === 'provider_state_patch' && data && typeof data === 'object') {
             this.applyProviderResponse(data, { phase: 'immediate' });
         }
@@ -939,13 +973,16 @@ export class CliProviderInstance implements ProviderInstance {
         return true;
     }
 
-    private getCompletedFinalizationBlock(latestVisibleStatus: string): CompletedFinalizationBlock | null {
+    private getCompletedFinalizationBlock(latestVisibleStatus: string, pending: CompletedDebouncePending): CompletedFinalizationBlock | null {
         if (latestVisibleStatus !== 'idle') return { reason: `status:${latestVisibleStatus}`, terminal: true };
 
         const adapterAny = this.adapter as any;
-        if (adapterAny?.isWaitingForResponse === true) return { reason: 'adapter_waiting_for_response', terminal: true };
-        if (adapterAny?.currentTurnScope) return { reason: 'adapter_turn_scope_active', terminal: true };
-        if (this.hasAdapterPendingResponse()) return { reason: 'adapter_pending_response', terminal: true };
+        const approvalResolvedIdle = pending.previousStatus === 'waiting_approval';
+        if (!approvalResolvedIdle) {
+            if (adapterAny?.isWaitingForResponse === true) return { reason: 'adapter_waiting_for_response', terminal: true };
+            if (adapterAny?.currentTurnScope) return { reason: 'adapter_turn_scope_active', terminal: true };
+            if (this.hasAdapterPendingResponse()) return { reason: 'adapter_pending_response', terminal: true };
+        }
 
         const partial = typeof this.adapter.getPartialResponse === 'function'
             ? this.adapter.getPartialResponse()
@@ -987,7 +1024,7 @@ export class CliProviderInstance implements ProviderInstance {
             if (screenText) {
                 const tailLines = screenText.split(/\r?\n/).slice(-16).join('\n');
                 if (looksLikeActiveApprovalPromptText(tailLines)) {
-                    return { reason: 'screen_shows_approval_prompt', terminal: false };
+                    return { reason: 'screen_shows_approval_prompt', terminal: approvalResolvedIdle };
                 }
             }
         } catch { /* defensive: screen text read is best-effort */ }
@@ -1017,7 +1054,7 @@ export class CliProviderInstance implements ProviderInstance {
             return;
         }
 
-        const block = this.getCompletedFinalizationBlock(latestVisibleStatus);
+        const block = this.getCompletedFinalizationBlock(latestVisibleStatus, pending);
         if (block) {
             const blockReason = block.reason;
             const waitedMs = Date.now() - pending.firstObservedAt;
@@ -1051,6 +1088,7 @@ export class CliProviderInstance implements ProviderInstance {
             this.completedDebouncePending = null;
             this.completedDebounceTimer = null;
             this.generatingStartedAt = 0;
+            this.lastApprovalEventFingerprint = '';
             return;
         }
 
@@ -1065,6 +1103,7 @@ export class CliProviderInstance implements ProviderInstance {
         this.completedDebouncePending = null;
         this.completedDebounceTimer = null;
         this.generatingStartedAt = 0;
+        this.lastApprovalEventFingerprint = '';
     }
 
     private maybeAutoApproveStatus(adapterStatus: any, now = Date.now()): boolean {
@@ -1183,10 +1222,14 @@ export class CliProviderInstance implements ProviderInstance {
                 if (!this.generatingStartedAt) this.generatingStartedAt = now;
                 const modal = adapterStatus.activeModal;
                 LOG.info('CLI', `[${this.type}] approval modal: "${modal?.message?.slice(0, 80) ?? 'none'}"`);
-                // Only push event if not already in waiting_approval (prevent flood from rapid cycles)
-                const approvalCooldown = 5000;
-                if (this.lastStatus !== 'waiting_approval' && (!this.lastApprovalEventAt || now - this.lastApprovalEventAt > approvalCooldown)) {
-                    this.lastApprovalEventAt = now;
+                const approvalFingerprint = JSON.stringify({
+                    message: typeof modal?.message === 'string' ? modal.message.trim() : '',
+                    buttons: Array.isArray(modal?.buttons) ? modal.buttons.map((button: unknown) => String(button).trim()) : [],
+                });
+                // PTY redraws can briefly leave waiting_approval and then re-enter it.
+                // Keep one coordinator event per logical modal until the turn completes.
+                if (this.lastStatus !== 'waiting_approval' && approvalFingerprint !== this.lastApprovalEventFingerprint) {
+                    this.lastApprovalEventFingerprint = approvalFingerprint;
                     this.appendRuntimeSystemMessage(
                         this.formatApprovalRequestMessage(modal?.message, modal?.buttons),
                         `approval_request:${now}`,
@@ -1227,7 +1270,13 @@ export class CliProviderInstance implements ProviderInstance {
                 } 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.
-                    this.completedDebouncePending = { chatTitle, duration, timestamp: now, firstObservedAt: now };
+                    this.completedDebouncePending = {
+                        chatTitle,
+                        duration,
+                        timestamp: now,
+                        firstObservedAt: now,
+                        previousStatus: this.lastStatus,
+                    };
                     this.scheduleCompletedDebounceFlush(3000);
                 }
             } else if (newStatus === 'idle' && this.lastStatus === 'starting') {

package/src/providers/provider-instance.ts

@@ -12,6 +12,7 @@ import type { ProviderModule, ProviderSettingDef, ProviderResumeCapability } fro
 import type { AcpConfigOption, AcpMode, ProviderControlSchema, ProviderSummaryMetadata, SessionCapability } from '../shared-types.js';
 import type { MessageInputSupport } from './provider-input-support.js';
 import type { ChatMessage } from '../types.js';
+import type { InteractivePrompt } from './types/interactive-prompt.js';
 
 // ─── ProviderState — Discriminated union by category ─────────────
 
@@ -47,6 +48,7 @@ export interface ActiveChatData {
     status: string;
     messages: ChatMessage[];
     activeModal: { message: string; buttons: string[] } | null;
+    activeInteractivePrompt?: InteractivePrompt | null;
     inputContent?: string;
 }
 
@@ -72,6 +74,7 @@ interface ProviderStateBase {
     status: ProviderStatus;
  /** chat data */
     activeChat: ActiveChatData | null;
+    activeInteractivePrompt?: InteractivePrompt | null;
  /** Workspace — project path or name (all categories) */
     workspace?: string | null;
     /** Runtime info (real-time detection) */