@qduc/term2 0.11.1 → 0.13.0

package/dist/hooks/use-app-keyboard-shortcuts.js

@@ -1,6 +1,29 @@
-import { useRef } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
 import { useInput } from 'ink';
-export const useAppKeyboardShortcuts = ({ exitWithUsage, pendingSkillRef, waitingForAskUserAnswer, setWaitingForAskUserAnswer, waitingForRejectionReason, setWaitingForRejectionReason, inputMode, isProcessing, waitingForApproval, stopProcessing, handoffState, cancelHandoff, pendingLargeUncachedTurn, liteMode, toggleShellMode, cycleAppModes, replaceInput, onSkillActivationCancelled, }) => {
+/**
+ * How long the "press Escape again to interrupt" confirmation stays armed.
+ * Matches the double-Escape window used to clear the input buffer
+ * (`use-escape-key.ts`) so both gestures feel the same.
+ */
+const INTERRUPT_CONFIRM_TIMEOUT_MS = 2000;
+export const useAppKeyboardShortcuts = ({ exitWithUsage, pendingSkillRef, waitingForAskUserAnswer, setWaitingForAskUserAnswer, waitingForRejectionReason, setWaitingForRejectionReason, inputMode, inputValue, isProcessing, waitingForApproval, stopProcessing, handoffState, cancelHandoff, pendingLargeUncachedTurn, liteMode, toggleShellMode, cycleAppModes, replaceInput, onSkillActivationCancelled, approvalShortcutsEnabled, approvalShortcutApproveAnswer, onApprove, onReject, submitRejectionReason, inputOwner, }) => {
+    // `armedRef` — not the state below — is what the key handler reads. A user can
+    // press Escape twice faster than React commits a render, so the confirmation
+    // must not depend on the re-render landing between the two presses. The state
+    // exists only to show the hint.
+    const armedRef = useRef(false);
+    const [interruptConfirmVisible, setInterruptConfirmVisible] = useState(false);
+    const interruptTimeoutRef = useRef(null);
+    const approvalDecisionConsumedRef = useRef(false);
+    const rejectionReasonBridgeRef = useRef(null);
+    const disarmInterrupt = () => {
+        armedRef.current = false;
+        if (interruptTimeoutRef.current) {
+            clearTimeout(interruptTimeoutRef.current);
+            interruptTimeoutRef.current = null;
+        }
+        setInterruptConfirmVisible(false);
+    };
     const stateRef = useRef({
         pendingSkillRef,
         waitingForAskUserAnswer,
@@ -8,6 +31,7 @@ export const useAppKeyboardShortcuts = ({ exitWithUsage, pendingSkillRef, waitin
         waitingForRejectionReason,
         setWaitingForRejectionReason,
         inputMode,
+        inputValue,
         isProcessing,
         waitingForApproval,
         stopProcessing,
@@ -19,6 +43,12 @@ export const useAppKeyboardShortcuts = ({ exitWithUsage, pendingSkillRef, waitin
         cycleAppModes,
         replaceInput,
         onSkillActivationCancelled,
+        approvalShortcutsEnabled,
+        approvalShortcutApproveAnswer,
+        onApprove,
+        onReject,
+        submitRejectionReason,
+        inputOwner,
         exitWithUsage,
     });
     stateRef.current = {
@@ -28,6 +58,7 @@ export const useAppKeyboardShortcuts = ({ exitWithUsage, pendingSkillRef, waitin
         waitingForRejectionReason,
         setWaitingForRejectionReason,
         inputMode,
+        inputValue,
         isProcessing,
         waitingForApproval,
         stopProcessing,
@@ -39,14 +70,87 @@ export const useAppKeyboardShortcuts = ({ exitWithUsage, pendingSkillRef, waitin
         cycleAppModes,
         replaceInput,
         onSkillActivationCancelled,
+        approvalShortcutsEnabled,
+        approvalShortcutApproveAnswer,
+        onApprove,
+        onReject,
+        submitRejectionReason,
+        inputOwner,
         exitWithUsage,
     };
-    useInput((input, key) => {
+    const markRejectionReasonInputReady = useCallback(() => {
+        // Once the bridge has received text it remains the sole consumer through
+        // submission. Clearing it here would hand a partially buffered key burst
+        // to the editor and could lose or duplicate the remainder of that burst.
+        if (rejectionReasonBridgeRef.current === '')
+            rejectionReasonBridgeRef.current = null;
+    }, []);
+    // `inputOwner` is read here via a ref-like pattern: Ink's `isActive` option
+    // captures the value at render time, and this hook re-runs on every render,
+    // so a fresh `isActive` boolean is passed to `useInput` whenever the owner
+    // changes. The `inputOwner` value held by the closure below is therefore also
+    // current as of this render.
+    // Ctrl+C (emergency exit) remains global: it must work even while a prompt
+    // owns input. All other shortcuts are suppressed via `isActive` when a modal
+    // prompt is up, so they cannot double-fire against the prompt's own handler.
+    const handleGlobalInput = useCallback((input, key) => {
         const current = stateRef.current;
         if (key.ctrl && input === 'c') {
             current.exitWithUsage();
             return;
         }
+        if (rejectionReasonBridgeRef.current !== null) {
+            if (key.escape) {
+                rejectionReasonBridgeRef.current = null;
+                current.setWaitingForRejectionReason(false);
+                current.replaceInput('');
+                return;
+            }
+            if (key.return) {
+                const reason = rejectionReasonBridgeRef.current;
+                rejectionReasonBridgeRef.current = null;
+                current.replaceInput('');
+                void current.submitRejectionReason(reason);
+                return;
+            }
+            if (key.backspace || key.delete) {
+                const next = rejectionReasonBridgeRef.current.slice(0, -1);
+                rejectionReasonBridgeRef.current = next;
+                current.replaceInput(next);
+                return;
+            }
+            if (input && !key.ctrl && !key.meta) {
+                const next = rejectionReasonBridgeRef.current + input;
+                rejectionReasonBridgeRef.current = next;
+                current.replaceInput(next);
+            }
+            return;
+        }
+        if (current.inputOwner.kind === 'approval' &&
+            current.approvalShortcutsEnabled &&
+            !approvalDecisionConsumedRef.current) {
+            const decision = input[0];
+            if (decision === 'y') {
+                approvalDecisionConsumedRef.current = true;
+                current.onApprove(current.approvalShortcutApproveAnswer);
+            }
+            else if (decision === 'n') {
+                approvalDecisionConsumedRef.current = true;
+                const bufferedReason = current.inputValue + input.slice(1);
+                rejectionReasonBridgeRef.current = bufferedReason;
+                if (bufferedReason)
+                    current.replaceInput(bufferedReason);
+                current.onReject();
+            }
+        }
+    }, []);
+    useInput(handleGlobalInput, { isActive: true });
+    // Non-emergency shortcuts. Suppressed entirely while a modal confirmation
+    // prompt owns input (Esc, Shift-Tab, skill/ask-user/rejection-cancel paths).
+    // This closes the Ink fan-out coupling: the prompt's own `useInput` is the
+    // sole handler for its keys while it is mounted.
+    useInput((input, key) => {
+        const current = stateRef.current;
         if (key.escape) {
             if (current.pendingSkillRef.current) {
                 current.pendingSkillRef.current = null;
@@ -63,8 +167,28 @@ export const useAppKeyboardShortcuts = ({ exitWithUsage, pendingSkillRef, waitin
                 current.replaceInput('');
                 return;
             }
-            if (current.inputMode === 'text' && (current.isProcessing || current.waitingForApproval)) {
-                current.stopProcessing();
+            if (current.inputMode === 'text' &&
+                (current.isProcessing || current.waitingForApproval) &&
+                // A non-empty composer means Escape belongs to the clear-buffer
+                // gesture in `use-escape-key.ts`; interrupting only claims Escape once
+                // there is nothing left to clear.
+                current.inputValue.length === 0) {
+                // Interrupting a turn throws away real work, and Escape is easy to hit
+                // by accident (stray key, leftover terminal escape sequence). Require a
+                // second Escape inside a short window to confirm.
+                if (armedRef.current) {
+                    disarmInterrupt();
+                    current.stopProcessing();
+                    return;
+                }
+                armedRef.current = true;
+                setInterruptConfirmVisible(true);
+                if (interruptTimeoutRef.current)
+                    clearTimeout(interruptTimeoutRef.current);
+                interruptTimeoutRef.current = setTimeout(() => {
+                    interruptTimeoutRef.current = null;
+                    disarmInterrupt();
+                }, INTERRUPT_CONFIRM_TIMEOUT_MS);
                 return;
             }
             if (current.handoffState?.stage === 'entering_message') {
@@ -83,6 +207,21 @@ export const useAppKeyboardShortcuts = ({ exitWithUsage, pendingSkillRef, waitin
             return;
         }
         current.cycleAppModes();
-    });
+    }, { isActive: inputOwner.kind === 'input' });
+    // Disarm as soon as the turn ends — or as soon as the user types, since
+    // Escape then means "clear the buffer" — so an armed confirmation can never
+    // be completed by a later, unrelated Escape.
+    useEffect(() => {
+        if (inputOwner.kind !== 'approval')
+            approvalDecisionConsumedRef.current = false;
+        if ((!isProcessing && !waitingForApproval) || inputValue.length > 0) {
+            disarmInterrupt();
+        }
+    }, [inputOwner.kind, isProcessing, waitingForApproval, inputValue]);
+    useEffect(() => () => {
+        if (interruptTimeoutRef.current)
+            clearTimeout(interruptTimeoutRef.current);
+    }, []);
+    return { interruptConfirmVisible, markRejectionReasonInputReady };
 };
 //# sourceMappingURL=use-app-keyboard-shortcuts.js.map

package/dist/hooks/use-app-keyboard-shortcuts.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-app-keyboard-shortcuts.js","sourceRoot":"","sources":["../../source/hooks/use-app-keyboard-shortcuts.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"use-app-keyboard-shortcuts.js","sourceRoot":"","sources":["../../source/hooks/use-app-keyboard-shortcuts.ts"],"names":[],"mappings":"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"}

package/dist/hooks/use-conversation.d.ts

@@ -4,21 +4,30 @@ import type { NormalizedUsage, UsageAccumulator } from '../utils/ai/token-usage.
 import type { SettingsService } from '../services/settings/settings-service.js';
 import type { Message } from '../types/message.js';
 import type { UserTurn } from '../types/user-turn.js';
-import type { BackgroundSubagentTask } from '../services/subagents/subagent-notification-store.js';
+import type { RewindTargetId } from '../services/conversation/conversation-store.js';
+import type { BackgroundTask } from '../services/subagents/subagent-notification-store.js';
+import type { BackgroundTaskControlDetails } from '../services/session/background-task-control.js';
+import type { BackgroundSubagentApprovalSnapshot, BackgroundSubagentApprovalResolutionRequest } from '../services/approval/background-subagent-approval-queue.js';
+import type { SessionCostAccumulator } from '../services/cost/model-cost.js';
+import { type AdmissionOptions } from '../services/conversation/conversation-admission-workflow.js';
+import type { HistoryService } from '../services/history-service.js';
+import type { ConversationLogWriter } from '../services/logging/conversation-log-writer.js';
 export type { BotMessage, CommandMessage, Message, ReasoningMessage, SubagentActivityMessage, SystemMessage, UserMessage, } from '../types/message.js';
 export interface ConversationNotifier {
     approvalNeeded(): void;
     turnComplete(): void;
 }
-export declare const useConversation: ({ conversationService, loggingService, usageAccumulator, subagentUsageAccumulator, initialMessages, sessionId, onClear, settingsService, replaceInput, onRestoreInput, logWriter, notifier, }: {
+export declare const useConversation: ({ conversationService, loggingService, usageAccumulator, subagentUsageAccumulator, costAccumulator, initialMessages, sessionId, onClear, settingsService, historyService, replaceInput, onRestoreInput, logWriter, notifier, }: {
     conversationService: ConversationService;
     loggingService: ILoggingService;
     usageAccumulator?: UsageAccumulator;
     subagentUsageAccumulator?: UsageAccumulator;
+    costAccumulator?: SessionCostAccumulator;
     initialMessages?: Message[];
     sessionId?: string;
     onClear?: () => void | Promise<void>;
     settingsService?: SettingsService;
+    historyService: Pick<HistoryService, 'addMessage'>;
     replaceInput?: (text: string) => void;
     /**
      * Called when a user message could not be sent (e.g. upstream error before any
@@ -27,16 +36,15 @@ export declare const useConversation: ({ conversationService, loggingService, us
      * the original text here so the caller can repopulate the input box.
      */
     onRestoreInput?: (text: string) => void;
-    logWriter?: {
-        append: (event: any) => void;
-    };
+    logWriter?: Pick<ConversationLogWriter, 'append'>;
     /** Optional notifier to fire desktop notifications on approval/completion events. */
     notifier?: ConversationNotifier;
 }) => {
     messages: Message[];
     sessionId: string;
     lastUsage: NormalizedUsage | null;
-    lastCodexRateLimit: import("../services/conversation/conversation-events.js").CodexRateLimitInfo | null;
+    costSummary: import("../services/cost/model-cost.js").SessionCostSummary | null;
+    lastCodexRateLimit: import("../contracts/streamed-model-turn.js").CodexRateLimitInfo | null;
     pendingApproval: import("../contracts/conversation.js").PendingApproval | null;
     waitingForApproval: boolean;
     waitingForRejectionReason: boolean;
@@ -50,18 +58,30 @@ export declare const useConversation: ({ conversationService, loggingService, us
         toolName?: string;
         argumentCharCount: number;
     } | null;
-    backgroundSubagentTasks: readonly BackgroundSubagentTask[];
+    backgroundSubagentTasks: readonly BackgroundTask[];
     backgroundSubagentTasksNow: number;
-    sendUserMessage: (input: string | UserTurn, options?: {
-        bypassInputSurgeGuard?: boolean;
-    }) => Promise<void>;
+    backgroundTaskDetails: readonly BackgroundTaskControlDetails[];
+    backgroundTaskDetailsNow: number;
+    listBackgroundTaskDetails: () => readonly BackgroundTaskControlDetails[];
+    getBackgroundTaskDetails: (target: import('../services/session/background-task-control.js').BackgroundTaskControlTarget) => BackgroundTaskControlDetails | null;
+    stopBackgroundTask: (target: import('../services/session/background-task-control.js').BackgroundTaskControlTarget) => import("../services/session/background-task-control.js").BackgroundTaskStopResult;
+    getForegroundTaskTransferCandidate: () => import("../services/session/background-task-control.js").ForegroundShellTaskControlDetails | null;
+    moveForegroundTaskToBackground: (target: import('../services/session/background-task-control.js').ForegroundTaskControlTarget) => import("../services/session/background-task-control.js").MoveForegroundToBackgroundResult;
+    listForegroundTaskTransferCandidates: () => readonly import("../services/session/background-task-control.js").ForegroundTransferCandidate[];
+    backgroundSubagentApproval: BackgroundSubagentApprovalSnapshot;
+    resolveBackgroundSubagentApproval: (request: BackgroundSubagentApprovalResolutionRequest) => import("../services/approval/background-subagent-approval-queue.js").BackgroundSubagentApprovalResolveResult;
+    sendUserMessage: (input: string | UserTurn) => Promise<void>;
+    admissionConfirmation: import("../services/conversation/conversation-admission-workflow.js").AdmissionConfirmation | null;
+    submitTurnForAdmission: (turn: UserTurn, options?: AdmissionOptions) => import("../services/conversation/conversation-admission-workflow.js").AdmissionSubmitResult;
+    resolveAdmissionConfirmation: (id: string, decision: 'approve' | 'decline') => import("../services/conversation/conversation-admission-workflow.js").AdmissionResolveResult;
     submitConversationTurn: (turn: UserTurn) => Promise<boolean>;
     submitApprovalDecision: (answer?: string) => Promise<void>;
     handleApprovalDecision: (answer: string, rejectionReason?: string, approvalAnswer?: string) => Promise<void>;
     onTypeAnswer: () => void;
     clearConversation: () => Promise<void>;
     stopProcessing: () => void;
-    undoLastUserMessage: () => {
+    cancelAskUser: () => Promise<void>;
+    rewindToTarget: (targetId: RewindTargetId, uiIndex: number) => {
         text: string;
         images?: UserTurn['images'];
     } | null;
@@ -70,13 +90,13 @@ export declare const useConversation: ({ conversationService, loggingService, us
         uiIndex: number;
         text: string;
     }[];
-    undoToUserMessage: (uiIndex: number) => string | null;
     setModel: (model: string) => void;
     setReasoningEffort: (effort: import("../contracts/conversation.js").ReasoningEffortSetting) => void;
     setTemperature: (temperature?: number) => void;
     addSystemMessage: (text: string) => void;
     addShellMessage: (command: string, output: string, exitCode: number | null, timedOut: boolean) => void;
     getSubagentUsage: () => NormalizedUsage | null;
+    getCostSummary: () => import("../services/cost/model-cost.js").SessionCostSummary | null;
     goToPreviousQuestion: () => void;
     goToNextQuestion: () => void;
     queueActive: boolean;
@@ -90,6 +110,7 @@ export declare const useConversation: ({ conversationService, loggingService, us
     }[];
     resumeQueue: () => Promise<void>;
     discardQueue: () => Promise<void>;
-    removeLastQueuedPendingMessage: () => Promise<string | null>;
+    retractPendingSubmission: (id: string) => Promise<import("../services/conversation/conversation-adapter.js").SubmissionMutation>;
+    editPendingSubmission: (id: string, turn: UserTurn) => Promise<import("../services/conversation/conversation-adapter.js").SubmissionMutation>;
 };
 //# sourceMappingURL=use-conversation.d.ts.map

package/dist/hooks/use-conversation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-conversation.d.ts","sourceRoot":"","sources":["../../source/hooks/use-conversation.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kDAAkD,CAAC;AAC5F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAGzE,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAEpF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAMhF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEtD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sDAAsD,CAAC;AAEnG,YAAY,EACV,UAAU,EACV,cAAc,EACd,OAAO,EACP,gBAAgB,EAChB,uBAAuB,EACvB,aAAa,EACb,WAAW,GACZ,MAAM,qBAAqB,CAAC;AAuB7B,MAAM,WAAW,oBAAoB;IACnC,cAAc,IAAI,IAAI,CAAC;IACvB,YAAY,IAAI,IAAI,CAAC;CACtB;AAED,eAAO,MAAM,eAAe,kMAazB;IACD,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,cAAc,EAAE,eAAe,CAAC;IAChC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,wBAAwB,CAAC,EAAE,gBAAgB,CAAC;IAC5C,eAAe,CAAC,EAAE,OAAO,EAAE,CAAC;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC;;;;;OAKG;IACH,cAAc,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,SAAS,CAAC,EAAE;QAAE,MAAM,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAA;KAAE,CAAC;IAC7C,qFAAqF;IACrF,QAAQ,CAAC,EAAE,oBAAoB,CAAC;CACjC;;;;;;;;;;0CA2N0D,OAAO;wCAIT,OAAO;;;;;;;;;6BAhGpD,MAAM,GAAG,QAAQ,YAAY;QAAE,qBAAqB,CAAC,EAAE,OAAO,CAAA;KAAE;mCA0D3D,QAAQ;sCAdL,MAAM;qCAtCb,MAAM,oBAAoB,MAAM,mBAAmB,MAAM;;;;+BActB;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAA;KAAE,GAAG,IAAI;+BAKpD,OAAO,CAAC,OAAO,CAAC;;;;;iCAKd,MAAM;;;;;;;;;;;;;;;;;;;;;CAqHvD,CAAC"}
+{"version":3,"file":"use-conversation.d.ts","sourceRoot":"","sources":["../../source/hooks/use-conversation.ts"],"names":[],"mappings":"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"}

package/dist/hooks/use-conversation.js

@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useReducer, useRef, useState } from 'react';
+import { useCallback, useEffect, useReducer, useRef, useState, useSyncExternalStore } from 'react';
 import { useConversationMessages } from './use-conversation-messages.js';
 import { useConversationSettings } from './use-conversation-settings.js';
 import { useSetting } from './use-setting.js';
@@ -6,6 +6,7 @@ import { ConversationOrchestrator } from '../services/conversation/conversation-
 import { normalizeApprovalDecision, routeConversationTurnSubmission, } from '../services/conversation/conversation-input-routing.js';
 import { isBotMessage } from '../types/message.js';
 import { conversationUIReducer, createInitialUIState, getConversationUIFlags } from './conversation-ui-reducer.js';
+import { ConversationAdmissionWorkflow, } from '../services/conversation/conversation-admission-workflow.js';
 const MAX_MESSAGE_COUNT = 300;
 const getInitialLastUsage = (messages) => {
     for (let i = messages.length - 1; i >= 0; i--) {
@@ -24,7 +25,7 @@ const dummySettingsService = {
     get: () => 'openai',
     onChange: () => () => { },
 };
-export const useConversation = ({ conversationService, loggingService, usageAccumulator, subagentUsageAccumulator, initialMessages = [], sessionId, onClear, settingsService, replaceInput, onRestoreInput, logWriter, notifier, }) => {
+export const useConversation = ({ conversationService, loggingService, usageAccumulator, subagentUsageAccumulator, costAccumulator, initialMessages = [], sessionId, onClear, settingsService, historyService, replaceInput, onRestoreInput, logWriter, notifier, }) => {
     const { messages, setMessages, trimMessages, appendMessages, addSystemMessage, addShellMessage, getUserMessages } = useConversationMessages({
         initialMessages,
         maxMessageCount: MAX_MESSAGE_COUNT,
@@ -33,8 +34,8 @@ export const useConversation = ({ conversationService, loggingService, usageAccu
         conversationService,
     });
     const [uiState, dispatch] = useReducer(conversationUIReducer, initialMessages, (init) => createInitialUIState(getInitialLastUsage(init)));
-    const { thinkingStartedAt, toolCallStreamingInfo, lastUsage, lastCodexRateLimit, pendingQueuedMessages } = uiState;
-    const { isProcessing, waitingForApproval, waitingForRejectionReason, waitingForAskUserAnswer, currentAskUserQuestionIndex, pendingApproval, queueActive, queuePaused, queueLength, queuePauseReason, } = getConversationUIFlags(uiState);
+    const { thinkingStartedAt, toolCallStreamingInfo, lastUsage, lastCodexRateLimit, costSummary, pendingQueuedMessages, } = uiState;
+    const { isProcessing, pendingInteractionId, waitingForApproval, waitingForRejectionReason, waitingForAskUserAnswer, currentAskUserQuestionIndex, pendingApproval, queueActive, queuePaused, queueLength, queuePauseReason, } = getConversationUIFlags(uiState);
     const approvedContextRef = useRef(null);
     const provider = useSetting(settingsService || dummySettingsService, 'agent.provider') ?? 'openai';
     const readBackgroundSubagentTasks = useCallback(() => ({
@@ -42,9 +43,23 @@ export const useConversation = ({ conversationService, loggingService, usageAccu
         now: Date.now(),
     }), [conversationService]);
     const [backgroundSubagentTaskState, setBackgroundSubagentTaskState] = useState(readBackgroundSubagentTasks);
+    const readBackgroundTaskDetails = useCallback(() => ({
+        tasks: conversationService.backgroundTaskControl?.listDetails?.() ?? [],
+        now: Date.now(),
+    }), [conversationService]);
+    const [backgroundTaskDetailsState, setBackgroundTaskDetailsState] = useState(readBackgroundTaskDetails);
+    const readBackgroundApproval = useCallback(() => conversationService.backgroundSubagentApprovals?.getSnapshot?.() ?? { pendingCount: 0, pending: [] }, [conversationService]);
+    const [backgroundSubagentApproval, setBackgroundSubagentApproval] = useState(readBackgroundApproval);
     const refreshBackgroundSubagentTasks = useCallback(() => {
         setBackgroundSubagentTaskState(readBackgroundSubagentTasks());
-    }, [readBackgroundSubagentTasks]);
+        setBackgroundTaskDetailsState(readBackgroundTaskDetails());
+    }, [readBackgroundSubagentTasks, readBackgroundTaskDetails]);
+    const listBackgroundTaskDetails = useCallback(() => conversationService.backgroundTaskControl?.listDetails?.() ?? [], [conversationService]);
+    const getBackgroundTaskDetails = useCallback((target) => conversationService.backgroundTaskControl?.getDetails?.(target) ?? null, [conversationService]);
+    const stopBackgroundTask = useCallback((target) => conversationService.backgroundTaskControl?.requestStop?.(target) ?? false, [conversationService]);
+    const getForegroundTaskTransferCandidate = useCallback(() => conversationService.backgroundTaskControl?.getForegroundTransferCandidate?.() ?? null, [conversationService]);
+    const listForegroundTaskTransferCandidates = useCallback(() => conversationService.backgroundTaskControl?.listForegroundTransferCandidates?.() ?? [], [conversationService]);
+    const moveForegroundTaskToBackground = useCallback((target) => conversationService.backgroundTaskControl?.moveForegroundToBackground?.(target) ?? false, [conversationService]);
     useEffect(() => {
         if (typeof conversationService.setBackgroundSubagentTaskObserver !== 'function')
             return;
@@ -57,6 +72,12 @@ export const useConversation = ({ conversationService, loggingService, usageAccu
         const interval = setInterval(refreshBackgroundSubagentTasks, 1_000);
         return () => clearInterval(interval);
     }, [backgroundSubagentTaskState.tasks.length, refreshBackgroundSubagentTasks]);
+    useEffect(() => {
+        if (typeof conversationService.backgroundSubagentApprovals?.subscribe !== 'function')
+            return;
+        return conversationService.backgroundSubagentApprovals.subscribe(() => setBackgroundSubagentApproval(readBackgroundApproval()));
+    }, [conversationService, readBackgroundApproval]);
+    const resolveBackgroundSubagentApproval = useCallback((request) => conversationService.backgroundSubagentApprovals?.resolve?.(request), [conversationService]);
     useEffect(() => {
         dispatch({ type: 'rate_limit/cleared' });
     }, [provider]);
@@ -86,6 +107,7 @@ export const useConversation = ({ conversationService, loggingService, usageAccu
                 onApprovalRequested: (approval) => dispatch({ type: 'approval/requested', approval }),
                 onApprovalResolved: () => dispatch({ type: 'approval/resolved' }),
                 onUsageUpdate: (usage) => dispatch({ type: 'usage/updated', usage }),
+                onCostUpdate: (summary) => dispatch({ type: 'cost/updated', summary }),
                 onRateLimitUpdate: (rateLimit) => dispatch({ type: 'rate_limit/updated', rateLimit }),
                 onRateLimitClear: () => dispatch({ type: 'rate_limit/cleared' }),
                 onResetTransient: () => dispatch({ type: 'reset_transient' }),
@@ -93,18 +115,19 @@ export const useConversation = ({ conversationService, loggingService, usageAccu
                 onStreamingThinkingStarted: (timestamp) => dispatch({ type: 'streaming/thinking_started', timestamp }),
                 onStreamingThinkingCleared: () => dispatch({ type: 'streaming/thinking_cleared' }),
                 onStreamingToolInfo: (info) => dispatch({ type: 'streaming/tool_info', info }),
-                onAskUserAnswerSubmitted: (answer) => dispatch({ type: 'ask_user/answer_submitted', answer }),
-                onAskUserAdvanceToNext: (nextIndex) => dispatch({ type: 'ask_user/advance_to_next', nextIndex }),
-                onAskUserGoBack: (_currentIndex, _answers) => dispatch({ type: 'ask_user/go_back' }),
+                onAskUserAnswerSubmitted: () => { },
+                onAskUserAdvanceToNext: () => { },
+                onAskUserGoBack: () => { },
                 onQueueStateChange: (snapshot) => dispatch({ type: 'queue/updated', snapshot }),
                 onQueuedMessagePending: (id, text) => dispatch({ type: 'queue/message_pending', id, text, queuedAt: Date.now() }),
                 onQueuedMessageStarted: (id) => dispatch({ type: 'queue/message_started', id }),
                 onQueuedMessageRemoved: (id) => dispatch({ type: 'queue/message_removed', id }),
-                onRemoveLastPendingMessage: () => dispatch({ type: 'queue/remove_last_pending' }),
+                onQueuedMessageEdited: (id, text) => dispatch({ type: 'queue/message_edited', id, text }),
             },
             approvedContext: approvedContextRef,
             usageAccumulator,
             subagentUsageAccumulator,
+            costAccumulator,
             notifier,
             onRestoreInput,
             onClear,
@@ -116,20 +139,57 @@ export const useConversation = ({ conversationService, loggingService, usageAccu
     useEffect(() => {
         orchestrator.updateCallbacks({ onRestoreInput, onClear });
     }, [orchestrator, onRestoreInput, onClear]);
+    useEffect(() => {
+        if (typeof conversationService.setPendingInteractionObserver !== 'function')
+            return;
+        conversationService.setPendingInteractionObserver((snapshot) => {
+            dispatch({ type: 'interaction/snapshot', snapshot });
+        });
+        return () => conversationService.setPendingInteractionObserver(null);
+    }, [conversationService]);
     // ── Public API — all orchestration delegates to the orchestrator ─────────
-    const sendUserMessage = useCallback((input, options) => orchestrator.sendUserMessage(input, options), [orchestrator]);
-    const handleApprovalDecision = useCallback((answer, rejectionReason, approvalAnswer) => orchestrator.handleApprovalDecision(answer, rejectionReason, approvalAnswer), [orchestrator]);
+    const sendThroughOrchestrator = useCallback((input, options) => orchestrator.sendUserMessage(input, options), [orchestrator]);
+    // Direct UI callers can send a turn but cannot manufacture a guard bypass.
+    // Admission is the only public hook API that carries busy-mode policy.
+    const sendUserMessage = useCallback((input) => sendThroughOrchestrator(input), [sendThroughOrchestrator]);
+    const admissionWorkflowRef = useRef(null);
+    if (!admissionWorkflowRef.current) {
+        admissionWorkflowRef.current = new ConversationAdmissionWorkflow({
+            conversation: conversationService,
+            history: historyService,
+            logger: loggingService,
+            send: (turn, options) => sendThroughOrchestrator(turn, options),
+        });
+    }
+    const admissionWorkflow = admissionWorkflowRef.current;
+    const admissionConfirmation = useSyncExternalStore((listener) => admissionWorkflow.subscribe(listener), () => admissionWorkflow.getSnapshot(), () => admissionWorkflow.getSnapshot());
+    const submitTurnForAdmission = useCallback((turn, options) => admissionWorkflow.submit(turn, options), [admissionWorkflow]);
+    const resolveAdmissionConfirmation = useCallback((id, decision) => admissionWorkflow.resolve(id, decision), [admissionWorkflow]);
+    const handleApprovalDecision = useCallback((answer, rejectionReason, approvalAnswer) => {
+        if (pendingInteractionId === null)
+            return Promise.resolve();
+        return orchestrator.handleApprovalDecision(answer, rejectionReason, approvalAnswer, pendingInteractionId);
+    }, [orchestrator, pendingInteractionId]);
     const clearConversation = useCallback(() => orchestrator.clearConversation(), [orchestrator]);
     const stopProcessing = useCallback(() => orchestrator.stopProcessing(), [orchestrator]);
     const stopProcessingWithNotice = useCallback(() => {
         stopProcessing();
         addSystemMessage('Stopped');
     }, [stopProcessing, addSystemMessage]);
-    const undoLastUserMessage = useCallback(() => orchestrator.undoLastUserMessage(), [orchestrator]);
+    // Not `stopProcessing`: aborting a paused turn discards the whole segment,
+    // so the question the model asked would vanish from history. Resolving it
+    // with a "no answer" result ends the turn *and* keeps the record.
+    const cancelAskUser = useCallback(() => {
+        if (pendingInteractionId === null)
+            return Promise.resolve();
+        return orchestrator.cancelAskUser(pendingInteractionId);
+    }, [orchestrator, pendingInteractionId]);
+    const rewindToTarget = useCallback((targetId, uiIndex) => orchestrator.rewindToTarget(targetId, uiIndex), [orchestrator]);
     const retryLastToolOutput = useCallback(() => orchestrator.retryLastToolOutput(), [orchestrator]);
-    const undoToUserMessage = useCallback((uiIndex) => orchestrator.undoToUserMessage(uiIndex), [orchestrator]);
-    const removeLastQueuedPendingMessage = useCallback(() => orchestrator.removeLastQueuedPendingMessage(), [orchestrator]);
+    const retractPendingSubmission = useCallback((id) => orchestrator.retractPendingSubmission(id), [orchestrator]);
+    const editPendingSubmission = useCallback((id, turn) => orchestrator.editPendingSubmission(id, turn), [orchestrator]);
     const getSubagentUsage = useCallback(() => orchestrator.getSubagentUsage(), [orchestrator]);
+    const getCostSummary = useCallback(() => orchestrator.getCostSummary(), [orchestrator]);
     const goToPreviousQuestion = useCallback(() => orchestrator.goToPreviousQuestion(), [orchestrator]);
     const goToNextQuestion = useCallback(() => orchestrator.goToNextQuestion(), [orchestrator]);
     const submitApprovalDecision = useCallback(async (answer) => {
@@ -165,19 +225,20 @@ export const useConversation = ({ conversationService, loggingService, usageAccu
     }, [handleApprovalDecision, replaceInput, waitingForApproval, waitingForAskUserAnswer, waitingForRejectionReason]);
     // ── Compatibility wrappers (pure UI state, no orchestration) ────────────
     const onTypeAnswer = useCallback(() => {
-        dispatch({ type: 'ask_user/set_waiting' });
+        dispatch({ type: 'interaction/composer_entry', mode: 'ask_user_answer' });
     }, []);
     const setWaitingForRejectionReason = useCallback((value) => {
-        dispatch({ type: value ? 'rejection/set_waiting' : 'rejection/cleared' });
+        dispatch({ type: 'interaction/composer_entry', mode: value ? 'rejection_reason' : 'none' });
     }, []);
     const setWaitingForAskUserAnswer = useCallback((value) => {
-        dispatch({ type: value ? 'ask_user/set_waiting' : 'ask_user/clear_waiting' });
+        dispatch({ type: 'interaction/composer_entry', mode: value ? 'ask_user_answer' : 'none' });
     }, []);
     // ── Return object (identical shape to the old monolith) ─────────────────
     return {
         messages,
         sessionId: sessionId ?? conversationService.sessionId,
         lastUsage,
+        costSummary,
         lastCodexRateLimit,
         pendingApproval,
         waitingForApproval,
@@ -191,23 +252,37 @@ export const useConversation = ({ conversationService, loggingService, usageAccu
         toolCallStreamingInfo,
         backgroundSubagentTasks: backgroundSubagentTaskState.tasks,
         backgroundSubagentTasksNow: backgroundSubagentTaskState.now,
+        backgroundTaskDetails: backgroundTaskDetailsState.tasks,
+        backgroundTaskDetailsNow: backgroundTaskDetailsState.now,
+        listBackgroundTaskDetails,
+        getBackgroundTaskDetails,
+        stopBackgroundTask,
+        getForegroundTaskTransferCandidate,
+        moveForegroundTaskToBackground,
+        listForegroundTaskTransferCandidates,
+        backgroundSubagentApproval,
+        resolveBackgroundSubagentApproval,
         sendUserMessage,
+        admissionConfirmation,
+        submitTurnForAdmission,
+        resolveAdmissionConfirmation,
         submitConversationTurn,
         submitApprovalDecision,
         handleApprovalDecision,
         onTypeAnswer,
         clearConversation,
         stopProcessing: stopProcessingWithNotice,
-        undoLastUserMessage,
+        cancelAskUser,
+        rewindToTarget,
         retryLastToolOutput,
         getUserMessages,
-        undoToUserMessage,
         setModel,
         setReasoningEffort,
         setTemperature,
         addSystemMessage,
         addShellMessage,
         getSubagentUsage,
+        getCostSummary,
         goToPreviousQuestion,
         goToNextQuestion,
         // Queue state
@@ -218,7 +293,8 @@ export const useConversation = ({ conversationService, loggingService, usageAccu
         pendingQueuedMessages,
         resumeQueue: () => conversationService.resumeQueue(),
         discardQueue: () => conversationService.discardQueue(),
-        removeLastQueuedPendingMessage,
+        retractPendingSubmission,
+        editPendingSubmission,
     };
 };
 //# sourceMappingURL=use-conversation.js.map