@thegitai/cli 1.0.0-preview.12 → 1.0.0-preview.14

package/README.md

@@ -38,6 +38,22 @@ CLI login tokens use a rolling 24-hour inactivity timeout. If one expires during
 any server request, the CLI saves the local session, removes the expired
 credential, and asks you to run `ai login` before resuming.
 
+## Structured questions
+
+The agent can pause its current turn to ask up to four related questions in one
+form. Use **↑ / ↓**, the displayed option number, or **Enter** to choose, and
+**← / →** to move between questions. **Something else / add details** is the
+numbered final option; focus it and type, paste, or press **Enter** to add a
+single-line note. On single-select questions it is mutually exclusive with the
+listed choices, and **↑ / ↓** leaves its editor when the note is empty.
+Multi-select questions toggle choices. The last question has an explicit
+**Submit answers** row. **Esc** closes an open note first and otherwise cancels
+the form; **Ctrl+C** cancels the whole turn.
+
+Answers return to the same turn, and completed question/answer records remain
+readable when the session is resumed. Default, Auto-Accept, and Plan modes all
+support the form; Auto-Accept does not choose answers for you.
+
 ## Visible to-do list
 
 For larger multi-step tasks, the agent keeps a compact to-do list on screen so

package/dist/src/api/chat.js

@@ -2,6 +2,7 @@ import { drainBackgroundJobNotifications } from '../background-jobs.js';
 import { createPromptCheckpoint, sanitizeSessionSafetyForServer, } from '../session-safety.js';
 import { applySessionSnapshot, saveSessionState, snapshotFromSession, } from '../session-store.js';
 import { executeLocalToolCall } from '../tool-executor.js';
+import { isUserInputQuestionArray } from './contracts.js';
 import { createTraceContext, normalizeServerUrl, readErrorResponse, } from './http.js';
 import { collectClientEnvironment } from '../client-environment.js';
 import { collectProjectOrientation } from '../project-orientation.js';
@@ -168,6 +169,8 @@ function publicStatusMessage(data) {
         return `Running ${toolName}...`;
     if (event.phase === 'waiting_for_tool')
         return `Running ${toolName} locally...`;
+    if (event.phase === 'waiting_for_user_input')
+        return 'Waiting for your input...';
     return null;
 }
 function normalizeShellJobToolCall(call) {
@@ -223,6 +226,28 @@ async function postToolResult({ config, turnId, event, result, session, fetchImp
         throw await readErrorResponse(response, trace.traceId);
     }
 }
+async function postUserInputResult({ config, turnId, requestId, result, fetchImpl, traceId, }) {
+    const payload = {
+        requestId,
+        result,
+    };
+    const trace = createTraceContext(traceId);
+    const response = await fetchImpl(`${normalizeServerUrl(config.serverUrl)}/v1/chat/turn/${encodeURIComponent(turnId)}/user-input-result`, {
+        method: 'POST',
+        headers: {
+            authorization: `Bearer ${config.token}`,
+            'content-type': 'application/json',
+            ...trace.headers,
+        },
+        body: JSON.stringify(payload),
+    });
+    if (response.status === 410) {
+        return;
+    }
+    if (!response.ok) {
+        throw await readErrorResponse(response, trace.traceId);
+    }
+}
 const turnIdOverrides = new WeakMap();
 function enterServerTurnId(session, serverSessionTurnId) {
     const active = turnIdOverrides.get(session);
@@ -371,6 +396,33 @@ async function consumeTurnStream({ response, config, projectIndex, session, inpu
             }
             return;
         }
+        if (event.event === 'user-input-request') {
+            await drainParallelTools();
+            const data = event.data;
+            const turnId = String(data?.turnId ?? '').trim();
+            const requestId = String(data?.requestId ?? '').trim();
+            if (!turnId ||
+                !requestId ||
+                !isUserInputQuestionArray(data?.questions)) {
+                throw new Error('Server emitted an invalid user-input request.');
+            }
+            if (!session.requestUserInput) {
+                throw new Error('Interactive user input is unavailable in this client.');
+            }
+            const result = await session.requestUserInput({ questions: data.questions }, signal);
+            if (signal?.aborted) {
+                throw new TurnCancelledError();
+            }
+            await postUserInputResult({
+                config,
+                turnId,
+                requestId,
+                result,
+                fetchImpl,
+                traceId,
+            });
+            return;
+        }
         if (event.event === 'result') {
             await drainParallelTools();
             finalResult.current = event.data;

package/dist/src/api/contracts.js

@@ -1 +1,55 @@
-export {};
+function nonEmptyString(value) {
+    return typeof value === 'string' && value.trim().length > 0;
+}
+const USER_INPUT_ID_PATTERN = /^[a-z][a-z0-9_]*$/;
+export function isUserInputQuestionArray(value) {
+    if (!Array.isArray(value) || value.length < 1 || value.length > 4) {
+        return false;
+    }
+    const questionIds = new Set();
+    return value.every((question) => {
+        if (!question || typeof question !== 'object' || Array.isArray(question)) {
+            return false;
+        }
+        const candidate = question;
+        if (!nonEmptyString(candidate.id) ||
+            !USER_INPUT_ID_PATTERN.test(candidate.id) ||
+            questionIds.has(candidate.id) ||
+            !nonEmptyString(candidate.header) ||
+            Array.from(candidate.header).length > 12 ||
+            !nonEmptyString(candidate.question) ||
+            typeof candidate.multiSelect !== 'boolean' ||
+            !Array.isArray(candidate.options) ||
+            candidate.options.length < 2 ||
+            candidate.options.length > 4) {
+            return false;
+        }
+        questionIds.add(candidate.id);
+        const optionIds = new Set();
+        const optionsValid = candidate.options.every((option) => {
+            if (!option || typeof option !== 'object' || Array.isArray(option)) {
+                return false;
+            }
+            const item = option;
+            if (!nonEmptyString(item.id) ||
+                !USER_INPUT_ID_PATTERN.test(item.id) ||
+                optionIds.has(item.id) ||
+                !nonEmptyString(item.label) ||
+                !nonEmptyString(item.description)) {
+                return false;
+            }
+            optionIds.add(item.id);
+            return true;
+        });
+        if (!optionsValid) {
+            return false;
+        }
+        if (candidate.recommendedOptionId !== undefined &&
+            (!nonEmptyString(candidate.recommendedOptionId) ||
+                candidate.recommendedOptionId !==
+                    candidate.options[0].id)) {
+            return false;
+        }
+        return true;
+    });
+}

package/dist/src/executor.js

@@ -596,7 +596,7 @@ export function commandUsesSudo(command) {
 }
 export function sudoPromptFromTail(text) {
     const tail = text.slice(-1000).replace(/\x1b\[[0-9;?]*[A-Za-z]/g, '');
-    const match = tail.match(/(?:\[sudo\][^\r\n]*password[^\r\n]*: ?|sudo[^\r\n]*password[^\r\n]*: ?|password[^\r\n]*: ?)$/i);
+    const match = tail.match(/(?:\[sudo\][^\r\n]*password[^\r\n]*: ?|\[?sudo[^\r\n]*password[^\r\n]*: ?|password[^\r\n]*: ?)$/i);
     return match?.[0] ?? null;
 }
 function isSudoPromptLine(text) {

package/dist/src/session.js

@@ -31,7 +31,7 @@ function preserveProviderSelection(serverState) {
         : null;
     return providerSelection ? { providerSelection } : {};
 }
-export function createSession({ rootDir, autoYes = false, agentMode, modelId, maxToolSteps = DEFAULT_MAX_TOOL_STEPS, confirmCommand = null, confirmPatch = null, requestSudoPassword = null, onStatus = null, onContextLog = null, onToolEvent = null, env = process.env, sessionId = createSessionId(), sessionName = null, history = [], serverState = null, editJournal = [], stickyFilePaths = [], editCounter = 0, safety = createSessionSafetyState(), }) {
+export function createSession({ rootDir, autoYes = false, agentMode, modelId, maxToolSteps = DEFAULT_MAX_TOOL_STEPS, confirmCommand = null, confirmPatch = null, requestSudoPassword = null, requestUserInput = null, onStatus = null, onContextLog = null, onToolEvent = null, env = process.env, sessionId = createSessionId(), sessionName = null, history = [], serverState = null, editJournal = [], stickyFilePaths = [], editCounter = 0, safety = createSessionSafetyState(), }) {
     const createdAt = new Date().toISOString();
     const initialAgentMode = normalizeAgentMode(agentMode ?? (autoYes ? 'auto-accept' : 'default'));
     return {
@@ -46,6 +46,7 @@ export function createSession({ rootDir, autoYes = false, agentMode, modelId, ma
         confirmCommand,
         confirmPatch,
         requestSudoPassword,
+        requestUserInput,
         history: JSON.parse(JSON.stringify(history)),
         initialized: true,
         sessionId,

package/dist/src/ui/repl.js

@@ -1,5 +1,5 @@
 import { createRatatuiBridge } from './tui/bridge.js';
-import { buildTuiFrame, formatJobElapsed, formatTodoProgress, pickThinkingFallbackPhrase, renderTranscriptEntryLines, THINKING_FALLBACK_PHRASES, } from './tui/build-frame.js';
+import { approvalScrollLimit, buildTuiFrame, formatJobElapsed, formatTodoProgress, pickThinkingFallbackPhrase, renderTranscriptEntryLines, THINKING_FALLBACK_PHRASES, userInputViewportForFrame, } from './tui/build-frame.js';
 import { createTerminalTitleController } from './tui/terminal-title.js';
 import { captureTerminalWrites, releaseTerminalWrites, } from './tui/terminal-writes.js';
 export { getSlashCommandSuggestions } from './tui/build-frame.js';
@@ -13,6 +13,7 @@ import { cancelActiveCommand } from '../executor.js';
 import { isTurnFailureMarker } from '../turn-failure-marker.js';
 import { clearCliAuthConfig } from '../api/auth.js';
 import { authenticationErrorMessage, isAuthenticationError, } from '../api/http.js';
+import { createUserInputPromptState, formatUserInputTranscript, } from './tui/user-input.js';
 import { setCommandOutputHook, withTuiMode } from '../runtime-mode.js';
 import { collectBackgroundJobUiKillMutations, collectBackgroundJobUiOutputMutations, } from '../tool-executor.js';
 import { startNewConversation, } from '../session.js';
@@ -787,10 +788,18 @@ function displayUserTextFromHistoryEntry(entry) {
 export function buildTranscriptFromSessionHistory(history) {
     const entries = [];
     const pendingCalls = new Map();
+    const pendingUserInputRequests = new Map();
     for (const entry of history) {
         if (!entry?.parts?.length)
             continue;
         for (const part of entry.parts) {
+            const userInputRequest = part?.userInputRequest;
+            if (userInputRequest && typeof userInputRequest === 'object') {
+                const requestId = String(userInputRequest.requestId ?? '').trim();
+                if (requestId && Array.isArray(userInputRequest.questions)) {
+                    pendingUserInputRequests.set(requestId, userInputRequest.questions);
+                }
+            }
             const call = part?.functionCall;
             if (!call || typeof call !== 'object')
                 continue;
@@ -800,6 +809,21 @@ export function buildTranscriptFromSessionHistory(history) {
             pendingCalls.set(callId, call);
         }
         for (const part of entry.parts) {
+            const userInputResult = part?.userInputResult;
+            if (userInputResult && typeof userInputResult === 'object') {
+                const requestId = String(userInputResult.requestId ?? '').trim();
+                const questions = pendingUserInputRequests.get(requestId);
+                const result = userInputResult.result;
+                if (questions &&
+                    (result?.status === 'submitted' || result?.status === 'cancelled')) {
+                    pendingUserInputRequests.delete(requestId);
+                    entries.push({
+                        body: formatUserInputTranscript(questions, result),
+                        kind: result.status === 'submitted' ? 'user' : 'system',
+                        title: result.status === 'submitted' ? 'Your answers' : 'Question',
+                    });
+                }
+            }
             const functionResponse = part?.functionResponse;
             if (!functionResponse || typeof functionResponse !== 'object')
                 continue;
@@ -966,9 +990,11 @@ function createInitialShellState(session, serverModels, debugUi) {
         analyzingImages: 0,
         approvalCursor: getDefaultApprovalCursor(),
         approvalPrompt: null,
+        approvalScrollOffset: 0,
         autoYes: session.autoYes,
         backgroundJobs: [],
         busy: false,
+        busyPausedAt: null,
         busySince: null,
         clockNow: Date.now(),
         commandCursor: 0,
@@ -1006,6 +1032,7 @@ function createInitialShellState(session, serverModels, debugUi) {
         tokenUsage: formatClientTokenUsage(null),
         transcript: [],
         turnCounter: Math.max(0, session.history.filter((entry) => entry.role === 'user').length),
+        userInputPrompt: null,
         pastedChunks: [],
         imageAttachments: [],
         workingTools: [],
@@ -1265,6 +1292,30 @@ export function resolveApprovalChoiceFromInput(input) {
         return 'n';
     return null;
 }
+export function pauseBusyClock(state, nowMs) {
+    if (state.busySince === null || state.busyPausedAt !== null)
+        return state;
+    return { ...state, busyPausedAt: nowMs };
+}
+export function resumeBusyClock(state, nowMs) {
+    if (state.busyPausedAt === null)
+        return state;
+    return {
+        ...state,
+        busyPausedAt: null,
+        busySince: state.busySince === null
+            ? null
+            : state.busySince + Math.max(0, nowMs - state.busyPausedAt),
+    };
+}
+export function busyElapsedMs(state, nowMs) {
+    if (state.busySince === null)
+        return null;
+    return Math.max(0, (state.busyPausedAt ?? nowMs) - state.busySince);
+}
+export function busyElapsedSeconds(state, nowMs) {
+    return Math.floor((busyElapsedMs(state, nowMs) ?? 0) / 1000);
+}
 export function buildModelPickerOptions(currentModelId, serverModels) {
     return serverModels.map((model) => ({
         id: model.id,
@@ -1325,6 +1376,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
         let resolveDone = null;
         let resolveApprovalChoice = null;
         let resolveSudoPassword = null;
+        let pendingUserInput = null;
         let cleanupSudoPasswordPrompt = null;
         let sudoPasswordBuffer = '';
         const bridge = createRatatuiBridge();
@@ -1419,9 +1471,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 return;
             const state = store.getState();
             syncTerminalTitle();
-            const elapsedSeconds = state.busySince
-                ? Math.max(0, Math.floor((Date.now() - state.busySince) / 1000))
-                : 0;
+            const elapsedSeconds = busyElapsedSeconds(state, Date.now());
             bridge.render(buildTuiFrame(state, terminalCols, terminalRows, spinnerFrame, elapsedSeconds, Date.now()));
         };
         const remountTui = async () => {
@@ -1553,9 +1603,10 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
             resolveApprovalChoice = null;
             pendingResolve('n');
             store.update((current) => ({
-                ...current,
+                ...resumeBusyClock(current, Date.now()),
                 approvalCursor: getDefaultApprovalCursor(),
                 approvalPrompt: null,
+                approvalScrollOffset: 0,
             }));
         };
         const dismissPendingSudoPassword = () => {
@@ -1568,16 +1619,32 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
             sudoPasswordBuffer = '';
             pendingResolve(null);
             store.update((current) => ({
-                ...current,
+                ...resumeBusyClock(current, Date.now()),
                 sudoPrompt: null,
             }));
         };
+        const dismissPendingUserInput = () => {
+            const pending = pendingUserInput;
+            if (!pending)
+                return;
+            pendingUserInput = null;
+            pending.signal?.removeEventListener('abort', pending.onAbort);
+            const error = new Error('Turn cancelled.');
+            error.name = 'AbortError';
+            pending.reject(error);
+            store.update((current) => ({
+                ...resumeBusyClock(current, Date.now()),
+                status: current.userInputPrompt?.returnStatus ?? current.status,
+                userInputPrompt: null,
+            }));
+        };
         const cancelActiveTurn = () => {
             if (!store.getState().busy || newConversationInFlight)
                 return;
             disarmExitConfirm();
             dismissPendingApproval();
             dismissPendingSudoPassword();
+            dismissPendingUserInput();
             activeTurnGeneration += 1;
             resetThinkingPacer();
             activeTurnAbort?.abort();
@@ -1597,6 +1664,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 activeTurnInput: '',
                 activeTurnInputPreformatted: false,
                 busy: false,
+                busyPausedAt: null,
                 busySince: null,
                 commandLog: [],
                 cursor: queued ? queued.body.length : current.cursor,
@@ -1610,7 +1678,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 thinkingTitle: '',
                 thinkingNotes: [],
                 workingTools: [],
-                tokenUsage: formatClientTokenUsage(current.busySince == null ? null : Date.now() - current.busySince, latestUsageSummary),
+                tokenUsage: formatClientTokenUsage(busyElapsedMs(current, Date.now()), latestUsageSummary),
             }));
             appendStaticEntries(cancelledEntries);
             lastTurnStartedAt = null;
@@ -1696,6 +1764,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
             }
             dismissPendingApproval();
             dismissPendingSudoPassword();
+            dismissPendingUserInput();
             exiting = true;
             killAllBackgroundJobs();
             store.update((current) => ({
@@ -1761,7 +1830,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 cleanupSudoPasswordPrompt = null;
             }
             store.update((current) => ({
-                ...current,
+                ...pauseBusyClock(current, Date.now()),
                 sudoPrompt: {
                     command,
                     passwordLength: 0,
@@ -1781,7 +1850,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 cleanupSudoPasswordPrompt = null;
                 sudoPasswordBuffer = '';
                 store.update((current) => ({
-                    ...current,
+                    ...resumeBusyClock(current, Date.now()),
                     sudoPrompt: null,
                     status: current.sudoPrompt?.returnStatus ?? current.status,
                 }));
@@ -1795,7 +1864,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 cleanupSudoPasswordPrompt = null;
                 sudoPasswordBuffer = '';
                 store.update((current) => ({
-                    ...current,
+                    ...resumeBusyClock(current, Date.now()),
                     sudoPrompt: null,
                     status: current.sudoPrompt?.returnStatus ?? current.status,
                 }));
@@ -1815,6 +1884,49 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                     : null,
             }));
         };
+        const openUserInputPrompt = (questions, signal) => new Promise((resolve, reject) => {
+            if (exiting || signal?.aborted) {
+                const error = new Error('Turn cancelled.');
+                error.name = 'AbortError';
+                reject(error);
+                return;
+            }
+            const onAbort = () => dismissPendingUserInput();
+            pendingUserInput = {
+                questions,
+                resolve,
+                reject,
+                signal,
+                onAbort,
+            };
+            signal?.addEventListener('abort', onAbort, { once: true });
+            store.update((current) => ({
+                ...pauseBusyClock(current, Date.now()),
+                status: 'Waiting for your input',
+                userInputPrompt: createUserInputPromptState(questions, current.status),
+            }));
+            scheduleLiveFrameRemount();
+        });
+        const handleInlineUserInput = async (result) => {
+            const pending = pendingUserInput;
+            const prompt = store.getState().userInputPrompt;
+            if (!pending || !prompt)
+                return;
+            pendingUserInput = null;
+            pending.signal?.removeEventListener('abort', pending.onAbort);
+            store.update((current) => ({
+                ...resumeBusyClock(current, Date.now()),
+                status: prompt.returnStatus,
+                userInputPrompt: null,
+            }));
+            appendTurnAwareEntry({
+                body: formatUserInputTranscript(pending.questions, result),
+                kind: result.status === 'submitted' ? 'user' : 'system',
+                title: result.status === 'submitted' ? 'Your answers' : 'Question',
+            });
+            pending.resolve(result);
+            scheduleLiveFrameRemount();
+        };
         const openApprovalPrompt = (title, body, options = {}) => new Promise((resolve) => {
             if (exiting) {
                 resolve('n');
@@ -1822,8 +1934,9 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
             }
             resolveApprovalChoice = resolve;
             store.update((current) => ({
-                ...current,
+                ...pauseBusyClock(current, Date.now()),
                 approvalCursor: getDefaultApprovalCursor(),
+                approvalScrollOffset: 0,
                 approvalPrompt: {
                     title,
                     body,
@@ -1841,9 +1954,10 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
             const pendingResolve = resolveApprovalChoice;
             resolveApprovalChoice = null;
             store.update((next) => ({
-                ...next,
+                ...resumeBusyClock(next, Date.now()),
                 approvalCursor: getDefaultApprovalCursor(),
                 approvalPrompt: null,
+                approvalScrollOffset: 0,
                 status: current.approvalPrompt?.returnStatus ?? next.status,
             }));
             pendingResolve?.(choice);
@@ -2051,6 +2165,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
             store.update((next) => ({
                 ...next,
                 busy: true,
+                busyPausedAt: null,
                 busySince: resumeStartedAt,
                 clockNow: resumeStartedAt,
                 status: 'Loading session...',
@@ -2067,6 +2182,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 store.update((next) => ({
                     ...next,
                     busy: false,
+                    busyPausedAt: null,
                     busySince: null,
                     resumePickerFilter: '',
                     resumePickerIndex: 0,
@@ -2090,6 +2206,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 store.update((next) => ({
                     ...next,
                     busy: false,
+                    busyPausedAt: null,
                     busySince: null,
                     resumePickerFilter: '',
                     resumePickerIndex: 0,
@@ -2315,6 +2432,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 store.update((current) => ({
                     ...current,
                     busy: true,
+                    busyPausedAt: null,
                     busySince: Date.now(),
                     imageAttachments: [],
                     queuedMessage: null,
@@ -2325,6 +2443,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                     store.update((current) => ({
                         ...current,
                         busy: false,
+                        busyPausedAt: null,
                         busySince: null,
                         status: 'Ready',
                     }));
@@ -2352,6 +2471,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 store.update((current) => ({
                     ...current,
                     busy: false,
+                    busyPausedAt: null,
                     busySince: null,
                     status: 'Ready',
                 }));
@@ -2384,6 +2504,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 activeTurnInputPreformatted: preformatted,
                 analyzingImages: 0,
                 busy: true,
+                busyPausedAt: null,
                 busySince: turnStartedAt,
                 clockNow: turnStartedAt,
                 status: 'Running turn...',
@@ -2445,6 +2566,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 store.update((current) => ({
                     ...current,
                     busy: false,
+                    busyPausedAt: null,
                     busySince: null,
                     status: result.waitingForApproval ? 'Awaiting approval' : 'Ready',
                     tokenUsage: formatClientTokenUsage(Date.now() - turnStartedAt, latestUsageSummary),
@@ -2466,6 +2588,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                     activeTurnInput: '',
                     activeTurnInputPreformatted: false,
                     busy: false,
+                    busyPausedAt: null,
                     busySince: null,
                     commandLog: [],
                     imageAttachments: [],
@@ -2517,7 +2640,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
             store.update((current) => ({
                 ...current,
                 status: message,
-                tokenUsage: formatClientTokenUsage(current.busySince == null ? null : Date.now() - current.busySince, latestUsageSummary),
+                tokenUsage: formatClientTokenUsage(busyElapsedMs(current, Date.now()), latestUsageSummary),
             }));
             queueThinkingUpdate({
                 title: panel ? panel.title : liveStatusPanelTitle(message),
@@ -2528,7 +2651,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
             store.update((current) => ({
                 ...current,
                 contextStatus: message,
-                tokenUsage: formatClientTokenUsage(current.busySince == null ? null : Date.now() - current.busySince, latestUsageSummary),
+                tokenUsage: formatClientTokenUsage(busyElapsedMs(current, Date.now()), latestUsageSummary),
             }));
         };
         session.onToolEvent = (event) => {
@@ -2597,6 +2720,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
         projectIndex.onStatus = session.onStatus;
         projectIndex.onContextLog = session.onContextLog;
         session.requestSudoPassword = async ({ command, prompt, signal }) => openSudoPasswordPrompt(command, prompt, signal);
+        session.requestUserInput = async (request, signal) => openUserInputPrompt(request.questions, signal);
         session.confirmCommand = async (command) => {
             if (exiting)
                 return false;
@@ -2637,11 +2761,20 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
             return choice === 'y';
         };
         const shellInputHandlers = {
+            getApprovalScrollLimit: () => {
+                const contentWidth = Math.max(20, Math.floor(terminalCols * 0.95) - 2);
+                return approvalScrollLimit(store.getState().approvalPrompt, contentWidth, terminalRows);
+            },
             getTranscriptScrollLimit: () => {
                 const contentWidth = Math.max(20, Math.floor(terminalCols * 0.95) - 2);
                 const blocks = store.getState().transcript.map((entry) => renderTranscriptEntryLines(entry, contentWidth));
                 return blocks.reduce((total, block, index) => total + block.length + (index > 0 ? 1 : 0), 0);
             },
+            getUserInputViewport: () => {
+                const nowMs = Date.now();
+                const state = store.getState();
+                return userInputViewportForFrame(state, terminalCols, terminalRows, spinnerFrame, busyElapsedSeconds(state, nowMs), nowMs);
+            },
             onCancelTurn: cancelActiveTurn,
             onCycleAgentMode: cycleAgentMode,
             onCtrlC: handleCtrlC,
@@ -2650,6 +2783,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
             onLiveFrameShapeChange: scheduleLiveFrameRemount,
             onRequestExit: requestExit,
             onResolveApproval: handleInlineApprovalChoice,
+            onResolveUserInput: handleInlineUserInput,
             onResumeSession: handleInlineResumeSelection,
             onSelectionCopy: handleAppSelectionCopy,
             onSelectModel: handleInlineModelSelection,