praxis-agent 0.35.0 → 0.37.0

package/dist/cli/interactive.js

@@ -12,13 +12,16 @@ import { resolveDataPlane, resolveDataPlaneRoot, } from '../persistence/data-pla
 import { AgentRunCancelledError } from '../core/runtime.js';
 import { claudePermissionActionKey, claudePermissionRuleMatches, } from '../permissions/claude-permission-resolver.js';
 import { redactSensitiveText, sensitiveEnvironmentValues, } from '../platform/sensitive-data.js';
-import { CommandPalette, BtwPanel, Composer, DiffDashboard, DialogFrame, ExternalEditorWait, HelpMenu, HookDashboard, ListDashboard, MemoryDashboard, MentionPicker, ModelMenu, PermissionDashboard, SelectionMenu, SessionPicker, ThemePicker, CustomThemeEditor, SessionIdentity, Transcript, WelcomePanel, useTerminalRows, useTerminalWidth, } from './tui/claude-style.js';
+import { CommandPalette, BtwPanel, Composer, DiffDashboard, DialogFrame, ExternalEditorWait, HelpMenu, HookDashboard, ListDashboard, MemoryDashboard, MentionPicker, ModelMenu, SelectionMenu, SessionPicker, ThemePicker, CustomThemeEditor, SessionIdentity, Transcript, WelcomePanel, } from './tui/claude-style.js';
 import { loadTuiMemoryFiles, openTuiMemoryFolder, } from './tui/memory-files.js';
 import { loadClaudeReleaseNotes } from './tui/release-notes.js';
-import { fullscreenInkRenderOptions } from './tui/fullscreen-renderer.js';
+import { tuiInkRenderOptions, useTuiPresentationEnvironment, } from './tui/presentation-environment.js';
 import { StreamingFrameBuffer } from './tui/streaming-frame-buffer.js';
 import { createClaudeStatusLineInput, StatusLine } from './tui/status-line.js';
-import { projectTuiView, resolveTuiRenderer } from './tui/tui-view-model.js';
+import { createTuiAppendHistoryChange } from './tui/transcript-window-model.js';
+import { createTuiHistoryChange, resolveTuiRenderer, } from './tui/tui-view-model.js';
+import { projectTuiScreen, } from './tui/tui-screen-model.js';
+import { projectTuiHelpSurface, } from './tui/help-surface-model.js';
 import { loadGitDiff, visiblePatchLines, } from './tui/git-diff.js';
 import { addTuiPermissionRule, loadTuiPermissionRules, removeTuiPermissionRule, } from './tui/permission-settings.js';
 import { createRecentlyDeniedStore, } from './tui/recently-denied.js';
@@ -26,23 +29,28 @@ import { agentColorMessage, parseAgentColorInput, } from '../compatibility/claud
 import { filterTuiSlashCommands, mergeTuiSlashCommands, slashCommandQuery, } from './tui/slash-commands.js';
 import { runDoctor, } from '../maintenance/doctor.js';
 import { canonicalClaudeCostModelName, formatCostSummary, } from './tui/cost-summary.js';
-import { createComposerEditor, deleteComposerBackward, deleteComposerForward, deleteComposerToEnd, deleteComposerToStart, deleteComposerWordBackward, insertComposerText, moveComposerCursor, moveComposerCursorByWord, } from './tui/composer-editor.js';
+import { createComposerEditor, deleteComposerBackward, deleteComposerForward, insertComposerText, moveComposerCursor, } from './tui/composer-editor.js';
 import { routeComposerKey, } from './tui/composer-key-router.js';
+import { routeTuiInteraction, } from './tui/tui-interaction-router.js';
 import { applyMentionReference, fileReferenceAtCursor, filterTuiMentionEntries, loadTuiFileEntries, } from './tui/file-picker.js';
 import { editTuiPrompt, openTuiEditorFile, } from './tui/external-editor.js';
 import { suspendTuiProcess } from './tui/terminal-suspend.js';
 import { readTuiClipboard, writeTuiClipboard, writeTuiOsc52Clipboard, } from './tui/clipboard.js';
-import { composerImageIds, deleteComposerImageBackward, deleteComposerImageForward, insertComposerImageMarker, moveComposerCursorAcrossImages, } from './tui/composer-images.js';
+import { composerImageIds, insertComposerImageMarker, } from './tui/composer-images.js';
 import { defaultTuiKeybindings, ensureTuiKeybindingsFile, hasTuiKeybindingPrefix, loadTuiKeybindings, resolveTuiKeybinding, tuiKeyChord, } from './tui/keybindings.js';
 import { completeTuiWorkspaceDirectory, resolveTuiWorkspaceDirectory, } from './tui/workspace-directories.js';
 import { conversationExportPath, conversationExportText, defaultConversationExportFilename, writeConversationExport, } from './tui/conversation-export.js';
 import { loadTuiThemeSettings, saveTuiThemeSettings, themeSettingsWithCustomTheme, } from './tui/theme-settings.js';
-import { DEFAULT_TUI_THEME_SETTINGS, TUI_THEMES, TuiThemeProvider, tuiPalette, } from './tui/theme.js';
+import { DEFAULT_TUI_THEME_SETTINGS, TUI_THEMES, TuiThemeProvider, useTuiTheme, } from './tui/theme.js';
 import { CUSTOM_THEME_TOKENS, createTuiCustomTheme, deleteTuiCustomTheme, loadTuiCustomThemes, updateTuiCustomTheme, } from './tui/custom-themes.js';
 import { setupTuiTerminal, terminalSetupTuiSlashCommand, } from './tui/terminal-setup.js';
 import { commitElicitationText, createTuiElicitationForm, elicitationFormIsValid, elicitationTextValue, expandElicitationOptions, focusedElicitationField, McpElicitationForm, McpElicitationUrl, moveElicitationFocus, moveElicitationOption, selectElicitationOption, toggleElicitationBoolean, typeaheadElicitationOption, unsetElicitationField, validateTuiElicitationForm, } from './tui/mcp-elicitation.js';
 import { openTuiUrl } from './tui/open-url.js';
-import { projectTuiToolPermission, ToolPermissionDialog, } from './tui/tool-permission.js';
+import { projectTuiToolPermission } from './tui/tool-permission.js';
+import { projectTuiPermissionSurface, } from './tui/permission-surface-model.js';
+import { PermissionSurface } from './tui/permission-surface.js';
+import { projectTuiDecisionSurface, } from './tui/decision-surface-model.js';
+import { DecisionSurface } from './tui/decision-surface.js';
 import { ConfigDashboard, projectConfigRows } from './tui/config-dashboard.js';
 import { DoctorDashboard } from './tui/doctor-dashboard.js';
 import { SandboxDashboard, tuiSandboxTabs } from './tui/sandbox-dashboard.js';
@@ -111,11 +119,6 @@ const ZERO_COST_SUMMARY = {
     hasUnknownModelCost: false,
     modelUsage: [],
 };
-function selectionPrefix(selected, screenReader) {
-    if (selected)
-        return screenReader ? 'Selected: ' : '❯ ';
-    return screenReader ? '' : '  ';
-}
 function rewindActions(point) {
     const shared = [
         { action: 'summarize-from', label: 'Summarize from here' },
@@ -187,20 +190,6 @@ function questionAnswer(question, input) {
     })
         .join(', ');
 }
-function permissionDeleteTitle(behavior) {
-    return `Delete ${behavior === 'allow' ? 'allowed' : behavior === 'deny' ? 'denied' : 'ask'} tool?`;
-}
-function permissionScopeLabel(scope) {
-    return scope === 'local'
-        ? 'From project local settings'
-        : scope === 'project'
-            ? 'From project settings'
-            : 'From user settings';
-}
-function permissionRuleDescription(rule) {
-    const bashPrefix = /^Bash\((.*?)(?::\*| \*)\)$/u.exec(rule)?.[1]?.trim();
-    return bashPrefix ? `Any Bash command starting with ${bashPrefix}` : undefined;
-}
 function describeTool(call, sensitiveValues) {
     const name = redactSensitiveText(call.name, sensitiveValues);
     return `${name} ${describeToolInput(call, sensitiveValues)}`;
@@ -266,10 +255,41 @@ const HIDDEN_TUI_SLASH_COMMANDS = new Set([
     'update',
     'usage',
 ]);
+function RewindWarning() {
+    const theme = useTuiTheme();
+    return (_jsx(Text, { ...theme.text.warning, children: "\u26A0 Rewinding does not affect files edited manually or via bash." }));
+}
+function ExitWarning() {
+    const theme = useTuiTheme();
+    return _jsx(Text, { ...theme.text.warning, children: "Press Ctrl-C again to exit" });
+}
+function DecisionOption({ selected, screenReader, children, selectedPrefix = '❯ ', unselectedPrefix = '  ', }) {
+    const theme = useTuiTheme();
+    const accessible = screenReader || theme.noColor;
+    return (_jsxs(Text, { ...(selected ? theme.text.selectedRow : {}), children: [selected
+                ? accessible
+                    ? 'Selected: '
+                    : selectedPrefix
+                : accessible
+                    ? ''
+                    : unselectedPrefix, children] }));
+}
+/** Advances the React-owned transcript plus its exact local mutation fact. */
+export function advanceInteractiveHistoryState(current, items, changedFrom) {
+    if (!Number.isInteger(changedFrom) ||
+        changedFrom < 0 ||
+        changedFrom > items.length)
+        throw new RangeError('changedFrom must be a valid next-history index');
+    const revision = current.change.revision + 1;
+    return {
+        items,
+        change: changedFrom === current.items.length && items.length > changedFrom
+            ? createTuiAppendHistoryChange(revision, current.items, items)
+            : createTuiHistoryChange(revision, changedFrom, items, current.items),
+    };
+}
 export function InteractiveApp({ dataPlane = resolveDataPlane(), configRoot: suppliedConfigRoot, statePath: suppliedStatePath, factory, initialSessions, initialPrompt, initialHistory = [], initialSessionColor, signal, onCancel, onTurnChange, onCleanup, onRendererChange, onBackground, axScreenReader = false, allowNewSession = true, resume, display = { version: 'dev', cwd: process.cwd() }, terminalWidth, slashCommands = EMPTY_SLASH_COMMANDS, agents = EMPTY_AGENTS, allowDangerouslySkipPermissions = false, additionalDirectories = [], diffLoader, doctorLoader, fileLoader, externalEditor = editTuiPrompt, keybindingsConfigRoot, keybindingsFile = ensureTuiKeybindingsFile, keybindingsLoader = loadTuiKeybindings, keybindingsEditor = openTuiEditorFile, memoryFilesLoader, memoryEditor = openTuiEditorFile, memoryFolderOpener = openTuiMemoryFolder, suspendProcess = suspendTuiProcess, clipboardReader = readTuiClipboard, clipboardWriter = writeTuiClipboard, sideQuestionClipboardWriter = writeTuiOsc52Clipboard, exportWriter = writeConversationExport, permissionRuleStore, sandboxStore: suppliedSandboxStore, recentlyDeniedStore: suppliedRecentlyDeniedStore, terminalSetup: terminalSetupOverride, themeStore, initialThemeSettings, initialThemeLoadError, workspaceDirectoryResolver = resolveTuiWorkspaceDirectory, workspaceDirectoryCompleter = completeTuiWorkspaceDirectory, runtimeSettings: suppliedRuntimeSettings, runtimeSettingsTarget, notificationWriter, notificationDelayMs = 6_000, elicitationUrlOpener = openTuiUrl, releaseNotesLoader = (configRoot) => loadClaudeReleaseNotes({ configRoot }), settingSources, }) {
     const { exit, suspendTerminal, waitUntilRenderFlush } = useApp();
-    const width = useTerminalWidth(terminalWidth);
-    const rows = useTerminalRows();
     const settingsDirectory = dataPlane === 'native' ? '.praxis' : '.claude';
     const keybindingsRoot = useMemo(() => resolve(suppliedConfigRoot ??
         keybindingsConfigRoot ??
@@ -340,14 +360,20 @@ export function InteractiveApp({ dataPlane = resolveDataPlane(), configRoot: sup
     const [themeSettings, setThemeSettings] = useState(initialThemeSettings ?? DEFAULT_TUI_THEME_SETTINGS);
     const [runtimeSettings, setRuntimeSettings] = useState(suppliedRuntimeSettings ??
         projectRuntimeSettings({ settings: {}, state: {} }));
-    const fixedViewport = runtimeSettings.tui === 'fullscreen' && rows !== undefined;
+    const presentation = useTuiPresentationEnvironment({
+        renderer: runtimeSettings.tui,
+        screenReader: axScreenReader,
+        ...(terminalWidth === undefined
+            ? {}
+            : { viewportOverride: { columns: terminalWidth } }),
+    });
+    const width = presentation.viewport.columns;
+    const rows = presentation.viewport.rows;
+    const fixedViewport = presentation.fixedViewport;
     const runtimeSettingsRef = useRef(runtimeSettings);
     runtimeSettingsRef.current = runtimeSettings;
     runtimeGitignoreRef.current = runtimeSettings.gitignore;
     const [vimInsertMode, setVimInsertMode] = useState(true);
-    const activePalette = tuiPalette(TUI_THEMES.includes(themeSettings.theme)
-        ? themeSettings.theme
-        : 'dark', themeSettings.syntaxHighlightingDisabled, process.env, themeSettings.customTheme);
     const choices = useMemo(() => allowNewSession ? [null, ...initialSessions] : initialSessions, [allowNewSession, initialSessions]);
     const [pickerIncludesNewSession, setPickerIncludesNewSession] = useState(allowNewSession);
     const pickerIncludesNewSessionRef = useRef(allowNewSession);
@@ -447,46 +473,36 @@ export function InteractiveApp({ dataPlane = resolveDataPlane(), configRoot: sup
     const [usage, setUsage] = useState();
     const [costUsd, setCostUsd] = useState();
     const [contextWindowTokens, setContextWindowTokens] = useState(display.contextWindowTokens);
-    const [history, setHistory] = useState([...initialHistory]);
+    const [historyState, setHistoryState] = useState(() => {
+        const items = [...initialHistory];
+        return {
+            items,
+            change: createTuiHistoryChange(0, 0, items),
+        };
+    });
+    const history = historyState.items;
+    const setHistory = (update, knownChangedFrom) => {
+        setHistoryState((current) => {
+            const next = typeof update === 'function' ? update(current.items) : update;
+            let changedFrom = typeof knownChangedFrom === 'function'
+                ? knownChangedFrom(current.items, next)
+                : (knownChangedFrom ?? 0);
+            if (knownChangedFrom === undefined) {
+                const limit = Math.min(next.length, current.items.length);
+                while (changedFrom < limit &&
+                    next[changedFrom] === current.items[changedFrom])
+                    changedFrom += 1;
+            }
+            return advanceInteractiveHistoryState(current, next, changedFrom);
+        });
+    };
     const activeAttemptThinkingItemsRef = useRef([]);
-    const [transcriptScrollOffset, setTranscriptScrollOffset] = useState(0);
-    // The pure TUI view model classifies the session identity (fresh/resumed/
-    // started) and projects the rendered transcript. Startup diagnostics are
-    // useful before the first prompt, but they are not conversation history and
-    // must not suppress the new-session welcome panel. Only real user/assistant
-    // transcript entries start a conversation; every other kind (thinking,
-    // context, tool, shell, notices, results, and so on) is operational
-    // bookkeeping that must not hide the fresh-session welcome. The original
-    // loaded transcript decides whether the session was resumed, separately from
-    // the live history that grows while the session runs. A session is resumed
-    // only when it was opened through `resume` and the original transcript
-    // already contained real conversation content. Fullscreen projects only the
-    // newest transcript tail that fits the fixed viewport, leaving the
-    // composer/status chrome intact and keeping the active stream visible.
-    // Classic and screen-reader modes always render the full history exactly as
-    // before.
-    const { transcriptEntries, transcriptPageRows, maxTranscriptScrollOffset, resumed, freshSession, hasConversationHistory, } = useMemo(() => projectTuiView({
-        initialHistory,
-        history,
-        resume: resume !== undefined,
-        fixedViewport,
-        screenReader: axScreenReader,
-        rows,
-        width,
-        scrollOffset: transcriptScrollOffset,
-        detailedTranscript: thinkingExpanded || runtimeSettings.verbose,
-    }), [
-        initialHistory,
-        history,
-        resume,
-        fixedViewport,
-        axScreenReader,
-        rows,
-        width,
-        transcriptScrollOffset,
-        thinkingExpanded,
-        runtimeSettings.verbose,
-    ]);
+    const [transcriptScrollOffset, setTranscriptScrollOffsetState] = useState(0);
+    const transcriptScrollOffsetRef = useRef(0);
+    const setTranscriptScrollOffset = (offset) => {
+        transcriptScrollOffsetRef.current = offset;
+        setTranscriptScrollOffsetState(offset);
+    };
     const sessionLoadRef = useRef(0);
     const [turnDiffs, setTurnDiffs] = useState([]);
     const turnNumberRef = useRef(0);
@@ -521,6 +537,7 @@ export function InteractiveApp({ dataPlane = resolveDataPlane(), configRoot: sup
     const runtimePreferencesRef = useRef(runtimePreferences);
     const [permission, setPermission] = useState(null);
     const permissionRef = useRef(null);
+    const permissionQueueRef = useRef([]);
     const [permissionSelection, setPermissionSelection] = useState(0);
     const [permissionFeedbackMode, setPermissionFeedbackMode] = useState(false);
     const [permissionRuleEditor, setPermissionRuleEditor] = useState(null);
@@ -528,6 +545,59 @@ export function InteractiveApp({ dataPlane = resolveDataPlane(), configRoot: sup
     const toolPermissionModel = useMemo(() => permission?.kind === 'tool'
         ? projectTuiToolPermission(permission.call, runtimeCwd, sensitiveValues, permission.decision, dataPlane)
         : null, [dataPlane, permission, runtimeCwd, sensitiveValues]);
+    const activatePermission = (pending) => {
+        const projected = pending.kind === 'tool'
+            ? projectTuiToolPermission(pending.call, runtimeCwdRef.current, sensitiveValues, pending.decision, dataPlane)
+            : null;
+        const editableRule = projected?.options.find((option) => option.editableRule)?.editableRule;
+        clearComposerInput();
+        setPermissionSelection(0);
+        setPermissionFeedbackMode(false);
+        setPermissionRuleEditor(editableRule ? createComposerEditor(editableRule.initialValue) : null);
+        permissionRef.current = pending;
+        setPermission(pending);
+        pending.notificationTimer = setTimeout(() => {
+            if (pending.settled)
+                return;
+            serviceRef.current?.notify?.(sessionIdRef.current ?? undefined, `Approval required for ${pending.call.name}`, 'permission_prompt', 'Praxis');
+        }, notificationDelayMs);
+    };
+    const resolvePermission = (pending, approval) => {
+        if (pending.settled)
+            return;
+        pending.settled = true;
+        if (pending.notificationTimer) {
+            clearTimeout(pending.notificationTimer);
+            pending.notificationTimer = null;
+        }
+        const queue = permissionQueueRef.current;
+        const index = queue.indexOf(pending);
+        if (index >= 0)
+            queue.splice(index, 1);
+        if (permissionRef.current === pending) {
+            permissionRef.current = null;
+            setPermission((current) => (current === pending ? null : current));
+        }
+        pending.settle(approval);
+        const next = queue[0];
+        if (next)
+            activatePermission(next);
+    };
+    const drainPermissionQueue = () => {
+        const queued = permissionQueueRef.current.splice(0);
+        permissionRef.current = null;
+        setPermission(null);
+        for (const pending of queued) {
+            if (pending.settled)
+                continue;
+            pending.settled = true;
+            if (pending.notificationTimer) {
+                clearTimeout(pending.notificationTimer);
+                pending.notificationTimer = null;
+            }
+            pending.settle(false);
+        }
+    };
     const [elicitation, setElicitation] = useState(null);
     const elicitationRef = useRef(null);
     const [elicitationForm, setElicitationForm] = useState(null);
@@ -617,6 +687,245 @@ export function InteractiveApp({ dataPlane = resolveDataPlane(), configRoot: sup
         permissionMode: runtimePreferences.permissionMode,
         ...(contextWindowTokens === undefined ? {} : { contextWindowTokens }),
     };
+    const workspaceDirectories = useMemo(() => [
+        runtimeCwd,
+        ...runtimePreferences.additionalDirectories.filter((path) => path !== runtimeCwd),
+    ].map((path) => ({ path, original: path === runtimeCwd })), [runtimeCwd, runtimePreferences.additionalDirectories]);
+    const permissionPrioritySurface = useMemo(() => {
+        if (!permission)
+            return null;
+        if (permission.kind === 'tool' && toolPermissionModel) {
+            return projectTuiPermissionSurface({
+                kind: 'tool-request',
+                model: toolPermissionModel,
+                selection: permissionSelection,
+                feedbackMode: permissionFeedbackMode,
+                feedback: input,
+                ruleEditor: permissionRuleEditor,
+            });
+        }
+        return projectTuiPermissionSurface({
+            kind: 'recovery-request',
+            heading: `Retry interrupted ${permission.call.name}?`,
+            display: describeTool(permission.call, sensitiveValues),
+            selection: permissionSelection,
+            feedbackMode: permissionFeedbackMode,
+            feedback: input,
+        });
+    }, [
+        input,
+        permission,
+        permissionFeedbackMode,
+        permissionRuleEditor,
+        permissionSelection,
+        sensitiveValues,
+        toolPermissionModel,
+    ]);
+    const permissionManagementSurface = useMemo(() => {
+        if (!menu)
+            return null;
+        switch (menu.kind) {
+            case 'permission-dashboard':
+                return projectTuiPermissionSurface({
+                    kind: menu.kind,
+                    tabIndex: menu.tabIndex,
+                    selectedIndex: menu.selectedIndex,
+                    query: menu.query,
+                    rules: menu.rules,
+                    recentDenied,
+                    retryingDeniedId,
+                    workspaceDirectories,
+                });
+            case 'permission-rule-input':
+                return projectTuiPermissionSurface({
+                    kind: menu.kind,
+                    behavior: menu.behavior,
+                    value: input,
+                });
+            case 'permission-scope':
+                return projectTuiPermissionSurface({
+                    kind: menu.kind,
+                    behavior: menu.behavior,
+                    rule: menu.rule,
+                    selectedIndex: menu.selectedIndex,
+                    settingsDirectory,
+                });
+            case 'permission-delete':
+                return projectTuiPermissionSurface({
+                    kind: menu.kind,
+                    rule: menu.rule,
+                    selectedIndex: menu.selectedIndex,
+                });
+            case 'workspace-directory-input':
+                return projectTuiPermissionSurface({
+                    kind: menu.kind,
+                    value: input,
+                });
+            case 'workspace-directory-delete':
+                return projectTuiPermissionSurface({
+                    kind: menu.kind,
+                    path: menu.path,
+                    selectedIndex: menu.selectedIndex,
+                });
+            default:
+                return null;
+        }
+    }, [
+        input,
+        menu,
+        recentDenied,
+        retryingDeniedId,
+        settingsDirectory,
+        workspaceDirectories,
+    ]);
+    const legacySecondarySurface = useMemo(() => ({ kind: 'legacy-secondary' }), []);
+    const helpMenu = menu?.kind === 'help' ? menu : null;
+    const helpSurface = useMemo(() => helpMenu === null
+        ? null
+        : projectTuiHelpSurface({
+            invocation: helpMenu.invocation,
+            tabIndex: helpMenu.tabIndex,
+            selectedIndex: helpMenu.selectedIndex,
+            builtinCommands: builtinSlashCommands,
+            customCommands: customSlashCommands,
+        }), [helpMenu, builtinSlashCommands, customSlashCommands]);
+    const shortcutHelpSurface = useMemo(() => projectTuiHelpSurface({
+        invocation: '?',
+        tabIndex: 0,
+        selectedIndex: 0,
+        builtinCommands: builtinSlashCommands,
+        customCommands: customSlashCommands,
+    }), [builtinSlashCommands, customSlashCommands]);
+    const decisionElevatedMode = runtimeSettings.useAutoModeDuringPlan
+        ? 'auto'
+        : allowDangerouslySkipPermissions
+            ? 'bypassPermissions'
+            : 'acceptEdits';
+    const planDecisionSurface = useMemo(() => planApproval
+        ? projectTuiDecisionSurface({
+            kind: 'plan-approval',
+            request: planApproval.request,
+            selectedIndex: planApprovalSelection,
+            feedbackMode: planApprovalFeedbackMode,
+            feedback: input,
+            elevatedMode: decisionElevatedMode,
+        })
+        : null, [
+        planApproval,
+        planApprovalFeedbackMode,
+        planApprovalSelection,
+        input,
+        decisionElevatedMode,
+    ]);
+    const questionDecisionSurface = useMemo(() => question
+        ? projectTuiDecisionSurface({
+            kind: 'question',
+            questions: question.questions,
+            questionIndex: question.index,
+            answer: input,
+        })
+        : null, [question, input]);
+    const secondarySurface = menu === null
+        ? undefined
+        : menu.kind === 'help'
+            ? (helpSurface ?? undefined)
+            : (permissionManagementSurface ?? legacySecondarySurface);
+    const screenSurfaces = useMemo(() => ({
+        ...(selectingSession
+            ? { sessionPicker: { kind: 'session-picker' } }
+            : {}),
+        ...(externalEditorRequest !== null ||
+            keybindingsEditing ||
+            memoryEditorRequest !== null
+            ? { priority: { kind: 'editor-wait' } }
+            : permission !== null && permissionPrioritySurface !== null
+                ? {
+                    priority: {
+                        kind: 'permission',
+                        surface: permissionPrioritySurface,
+                    },
+                }
+                : planApproval !== null && planDecisionSurface !== null
+                    ? { priority: planDecisionSurface }
+                    : question !== null && questionDecisionSurface !== null
+                        ? { priority: questionDecisionSurface }
+                        : elicitation !== null
+                            ? { priority: { kind: 'elicitation' } }
+                            : {}),
+        ...(secondarySurface === undefined
+            ? {}
+            : { secondary: secondarySurface }),
+        overlays: [
+            ...(commandPaletteVisible
+                ? [{ kind: 'command-palette' }]
+                : []),
+            ...(filePickerVisible ? [{ kind: 'file-picker' }] : []),
+            ...(exitConfirmation ? [{ kind: 'exit-confirmation' }] : []),
+        ],
+    }), [
+        selectingSession,
+        externalEditorRequest,
+        keybindingsEditing,
+        memoryEditorRequest,
+        permission,
+        permissionPrioritySurface,
+        planApproval,
+        question,
+        planDecisionSurface,
+        questionDecisionSurface,
+        elicitation,
+        secondarySurface,
+        commandPaletteVisible,
+        filePickerVisible,
+        exitConfirmation,
+    ]);
+    const previousTuiScreenRef = useRef(undefined);
+    const screen = useMemo(() => projectTuiScreen({
+        presentation,
+        conversation: {
+            initialHistory,
+            history,
+            resumeRequested: resume !== undefined,
+            scrollOffset: transcriptScrollOffset,
+            detailed: thinkingExpanded || runtimeSettings.verbose,
+            activeText,
+            activeThinking,
+            historyChange: historyState.change,
+        },
+        sessionId,
+        surfaces: screenSurfaces,
+    }, previousTuiScreenRef.current), [
+        presentation,
+        initialHistory,
+        history,
+        resume,
+        transcriptScrollOffset,
+        thinkingExpanded,
+        runtimeSettings.verbose,
+        activeText,
+        activeThinking,
+        historyState.change,
+        sessionId,
+        screenSurfaces,
+    ]);
+    useEffect(() => {
+        previousTuiScreenRef.current = screen;
+    }, [screen]);
+    const conversationScreen = screen.body.kind === 'conversation' ? screen.body : undefined;
+    const selectedPriority = conversationScreen?.foreground.kind === 'priority'
+        ? conversationScreen.foreground.surface
+        : undefined;
+    const selectedSecondarySurface = conversationScreen?.foreground.kind === 'secondary'
+        ? (conversationScreen.foreground.surface ?? null)
+        : null;
+    const selectedOverlays = conversationScreen?.foreground.kind === 'compose'
+        ? conversationScreen.foreground.overlays
+        : [];
+    const selectedCommandPalette = selectedOverlays.find((overlay) => overlay.kind === 'command-palette');
+    const selectedFilePicker = selectedOverlays.find((overlay) => overlay.kind === 'file-picker');
+    const selectedExitConfirmation = selectedOverlays.find((overlay) => overlay.kind === 'exit-confirmation');
+    const transcriptPageRows = conversationScreen?.transcript.pageRows ?? 2;
+    const maxTranscriptScrollOffset = conversationScreen?.transcript.maxScrollOffset ?? 0;
     const statusAuthSource = process.env.PRAXIS_API_KEY
         ? 'PRAXIS_API_KEY'
         : process.env.ANTHROPIC_API_KEY
@@ -631,10 +940,6 @@ export function InteractiveApp({ dataPlane = resolveDataPlane(), configRoot: sup
         const projectSettings = existsSync(join(runtimeCwd, dataPlane === 'native' ? '.praxis' : '.claude', 'settings.json')) || existsSync(join(runtimeCwd, 'settings.json'));
         return projectSettings ? 'User settings, Project settings' : 'User settings';
     })();
-    const workspaceDirectories = [
-        runtimeCwd,
-        ...runtimePreferences.additionalDirectories.filter((path) => path !== runtimeCwd),
-    ].map((path) => ({ path, original: path === runtimeCwd }));
     const permissionOptions = useMemo(() => [
         ...PERMISSION_OPTIONS,
         ...(allowDangerouslySkipPermissions
@@ -722,7 +1027,7 @@ export function InteractiveApp({ dataPlane = resolveDataPlane(), configRoot: sup
         if (!signal)
             return;
         const cancel = () => {
-            permissionRef.current?.resolve(false);
+            drainPermissionQueue();
             elicitationRef.current?.resolve({ action: 'cancel' });
             questionRef.current?.resolve(null);
             planApprovalRef.current?.resolve({ behavior: 'deny' });
@@ -737,7 +1042,7 @@ export function InteractiveApp({ dataPlane = resolveDataPlane(), configRoot: sup
     useEffect(() => () => {
         componentMountedRef.current = false;
         streamingFrameRef.current?.dispose();
-        permissionRef.current?.resolve(false);
+        drainPermissionQueue();
         elicitationRef.current?.resolve({ action: 'cancel' });
         questionRef.current?.resolve(null);
         planApprovalRef.current?.resolve({ behavior: 'deny' });
@@ -760,7 +1065,10 @@ export function InteractiveApp({ dataPlane = resolveDataPlane(), configRoot: sup
         // thinking, or completion entry that it textually precedes.
         streamingFrameRef.current?.flush();
         setTranscriptScrollOffset(0);
-        setHistory((current) => [...current, line]);
+        setHistoryState((current) => {
+            const items = [...current.items, line];
+            return advanceInteractiveHistoryState(current, items, current.items.length);
+        });
     };
     useEffect(() => {
         if (initialThemeSettings !== undefined) {
@@ -1152,25 +1460,6 @@ export function InteractiveApp({ dataPlane = resolveDataPlane(), configRoot: sup
         exitConfirmationTimerRef.current = null;
         setExitConfirmation(false);
     };
-    const armExitConfirmation = () => {
-        if (exitConfirmation) {
-            permissionRef.current?.resolve(false);
-            elicitationRef.current?.resolve({ action: 'cancel' });
-            questionRef.current?.resolve(null);
-            planApprovalRef.current?.resolve({ behavior: 'deny' });
-            onCancel?.();
-            exit();
-            return;
-        }
-        clearComposerInput();
-        setExitConfirmation(true);
-        if (exitConfirmationTimerRef.current)
-            clearTimeout(exitConfirmationTimerRef.current);
-        exitConfirmationTimerRef.current = setTimeout(() => {
-            exitConfirmationTimerRef.current = null;
-            setExitConfirmation(false);
-        }, 1_500);
-    };
     useEffect(() => {
         setCommandSelection((current) => Math.min(current, Math.max(0, matchingSlashCommands.length - 1)));
     }, [matchingSlashCommands.length]);
@@ -1371,37 +1660,18 @@ export function InteractiveApp({ dataPlane = resolveDataPlane(), configRoot: sup
         }
     };
     const requestApproval = (call, kind, decision) => new Promise((resolveApproval) => {
-        const projected = kind === 'tool'
-            ? projectTuiToolPermission(call, runtimeCwdRef.current, sensitiveValues, decision, dataPlane)
-            : null;
-        const editableRule = projected?.options.find((option) => option.editableRule)?.editableRule;
-        let settled = false;
-        const notificationTimer = setTimeout(() => {
-            if (settled)
-                return;
-            serviceRef.current?.notify?.(sessionIdRef.current ?? undefined, `Approval required for ${call.name}`, 'permission_prompt', 'Praxis');
-        }, notificationDelayMs);
         const pending = {
             kind,
             call,
             ...(decision ? { decision } : {}),
-            resolve: (approved) => {
-                if (settled)
-                    return;
-                settled = true;
-                clearTimeout(notificationTimer);
-                if (permissionRef.current === pending)
-                    permissionRef.current = null;
-                setPermission((current) => (current === pending ? null : current));
-                resolveApproval(approved);
-            },
+            notificationTimer: null,
+            settled: false,
+            settle: resolveApproval,
+            resolve: (approved) => resolvePermission(pending, approved),
         };
-        clearComposerInput();
-        setPermissionSelection(0);
-        setPermissionFeedbackMode(false);
-        setPermissionRuleEditor(editableRule ? createComposerEditor(editableRule.initialValue) : null);
-        permissionRef.current = pending;
-        setPermission(pending);
+        permissionQueueRef.current.push(pending);
+        if (permissionQueueRef.current.length === 1)
+            activatePermission(pending);
     });
     const approveTool = (call, _originalCall, decision) => requestApproval(call, 'tool', decision);
     const requestElicitation = (request) => new Promise((resolveResult) => {
@@ -1514,6 +1784,7 @@ export function InteractiveApp({ dataPlane = resolveDataPlane(), configRoot: sup
     const retireService = () => {
         serviceEpochRef.current += 1;
         scheduledWaitRef.current?.abort();
+        drainPermissionQueue();
         const current = serviceRef.current;
         serviceRef.current = null;
         if (!current?.close)
@@ -2872,74 +3143,150 @@ export function InteractiveApp({ dataPlane = resolveDataPlane(), configRoot: sup
             const codePoint = character.codePointAt(0) ?? 0;
             return codePoint >= 32 && codePoint !== 127;
         });
+        const composerKey = {
+            value,
+            left: key.leftArrow,
+            right: key.rightArrow,
+            backspace: key.backspace,
+            delete: key.delete,
+            ctrl: key.ctrl,
+            meta: key.meta,
+            escape: key.escape || value === '\u001B',
+        };
         const editor = () => createComposerEditor(inputRef.current, inputCursorRef.current);
         const editComposer = () => {
-            if (key.leftArrow) {
-                updateComposerEditor(key.meta
-                    ? moveComposerCursorByWord(editor(), 'backward')
-                    : moveComposerCursorAcrossImages(editor(), -1));
+            const transition = routeComposerKey(editor(), composerKey);
+            if (transition.kind === 'edit') {
+                updateComposerEditor(transition.editor);
                 return true;
             }
-            if (key.rightArrow) {
-                updateComposerEditor(key.meta
-                    ? moveComposerCursorByWord(editor(), 'forward')
-                    : moveComposerCursorAcrossImages(editor(), 1));
-                return true;
-            }
-            if (controlKey('a')) {
-                updateComposerEditor(createComposerEditor(inputRef.current, 0));
-                return true;
-            }
-            if (controlKey('e')) {
-                updateComposerEditor(createComposerEditor(inputRef.current));
-                return true;
-            }
-            if (controlKey('b')) {
-                updateComposerEditor(moveComposerCursorAcrossImages(editor(), -1));
-                return true;
-            }
-            if (controlKey('f')) {
-                updateComposerEditor(moveComposerCursorAcrossImages(editor(), 1));
-                return true;
-            }
-            if (controlKey('w')) {
-                updateComposerEditor(deleteComposerWordBackward(editor()));
-                return true;
-            }
-            if (controlKey('u')) {
-                updateComposerEditor(deleteComposerToStart(editor()));
-                return true;
-            }
-            if (controlKey('k')) {
-                updateComposerEditor(deleteComposerToEnd(editor()));
-                return true;
-            }
-            if (key.backspace) {
-                updateComposerEditor(deleteComposerImageBackward(editor()));
-                return true;
-            }
-            if (key.delete) {
-                updateComposerEditor(deleteComposerImageForward(editor()));
-                return true;
-            }
-            if (!key.ctrl && !key.meta && value && printable) {
-                updateComposerEditor(insertComposerText(editor(), value));
-                return true;
-            }
-            return false;
+            if (transition.kind === 'cancel')
+                clearComposerInput();
+            return transition.kind === 'cancel';
         };
-        if (controlKey('c')) {
-            armExitConfirmation();
-            return;
-        }
-        if (controlKey('z')) {
-            if (!processSuspendRequestedRef.current) {
-                processSuspendRequestedRef.current = true;
-                setProcessSuspendRequested(true);
+        const interactionComposer = () => ({
+            mode: runtimeSettingsRef.current.editor === 'vim'
+                ? vimInsertMode
+                    ? 'vim-insert'
+                    : 'vim-normal'
+                : 'readline',
+            editor: editor(),
+            lastCancelAtMs: lastEscapeAtRef.current,
+        });
+        const applyInteractionEffects = (effects) => {
+            for (const effect of effects) {
+                if (effect.kind === 'request-process-suspension') {
+                    processSuspendRequestedRef.current = true;
+                    setProcessSuspendRequested(true);
+                }
+                else if (effect.kind === 'set-transcript-scroll-offset') {
+                    setTranscriptScrollOffset(effect.offset);
+                }
+                else if (effect.kind === 'interrupt-turn') {
+                    turnControllerRef.current?.abort();
+                }
+                else if (effect.kind === 'arm-exit-confirmation') {
+                    setExitConfirmation(true);
+                    if (exitConfirmationTimerRef.current)
+                        clearTimeout(exitConfirmationTimerRef.current);
+                    exitConfirmationTimerRef.current = setTimeout(() => {
+                        exitConfirmationTimerRef.current = null;
+                        setExitConfirmation(false);
+                    }, 1_500);
+                }
+                else if (effect.kind === 'dismiss-exit-confirmation') {
+                    dismissExitConfirmation();
+                }
+                else if (effect.kind === 'exit-application') {
+                    drainPermissionQueue();
+                    elicitationRef.current?.resolve({ action: 'cancel' });
+                    questionRef.current?.resolve(null);
+                    planApprovalRef.current?.resolve({ behavior: 'deny' });
+                    onCancel?.();
+                    exit();
+                }
+                else if (effect.kind === 'set-vim-insert-mode') {
+                    setVimInsertMode(effect.insert);
+                }
+                else if (effect.kind === 'set-composer-editor') {
+                    updateComposerEditor(effect.editor);
+                }
+                else if (effect.kind === 'clear-composer') {
+                    clearComposerInput();
+                }
+                else if (effect.kind === 'record-composer-cancel') {
+                    lastEscapeAtRef.current = effect.timestamp;
+                }
+                else if (effect.kind === 'cancel-tui-layer') {
+                    switch (effect.target) {
+                        case 'permission':
+                            permissionRef.current?.resolve(false);
+                            break;
+                        case 'plan-approval':
+                            planApprovalRef.current?.resolve({ behavior: 'deny' });
+                            break;
+                        case 'question':
+                            questionRef.current?.resolve(null);
+                            break;
+                        case 'elicitation-url-waiting':
+                            if (elicitationUrlWaitingRef.current) {
+                                elicitationUrlWaitingRef.current = null;
+                                setElicitationUrlWaiting(false);
+                                setElicitation(null);
+                                setElicitationForm(null);
+                                clearComposerInput();
+                            }
+                            break;
+                        case 'elicitation-options':
+                            setElicitationForm((current) => current?.expandedField
+                                ? { ...current, expandedField: undefined }
+                                : current);
+                            break;
+                        case 'elicitation':
+                            elicitationRef.current?.resolve({ action: 'cancel' });
+                            break;
+                        case 'file-picker':
+                            setFilePickerOpen(false);
+                            break;
+                        case 'command-palette':
+                            setCommandPaletteOpen(false);
+                            break;
+                        default: {
+                            const unhandledTarget = effect.target;
+                            return unhandledTarget;
+                        }
+                    }
+                }
+                else {
+                    const unhandledEffect = effect;
+                    return unhandledEffect;
+                }
             }
+        };
+        if (controlKey('c') || controlKey('z')) {
+            const globalInteraction = routeTuiInteraction({
+                suspensionPending: processSuspendRequestedRef.current,
+                exitConfirmationArmed: exitConfirmation,
+                layer: { kind: 'none' },
+                busy,
+                viewport: {
+                    enabled: false,
+                    offset: 0,
+                    maxOffset: 0,
+                    pageRows: 0,
+                },
+                composer: interactionComposer(),
+            }, {
+                globalIntent: controlKey('c') ? 'exit' : 'suspend',
+                scrollIntent: 'none',
+                action: undefined,
+                composerKey,
+                timestamp: Date.now(),
+                callerIntent: 'none',
+            });
+            applyInteractionEffects(globalInteraction.effects);
             return;
         }
-        dismissExitConfirmation();
         const keybindingContexts = menuRef.current
             ? menuRef.current.kind === 'diff'
                 ? ['DiffDialog']
@@ -2976,57 +3323,90 @@ export function InteractiveApp({ dataPlane = resolveDataPlane(), configRoot: sup
         if (!keybindingAction) {
             keybindingAction = resolveTuiKeybinding(keybindings, keybindingContexts, inputChord);
         }
-        if (!keybindingAction &&
-            inputChord &&
-            hasTuiKeybindingPrefix(keybindings, keybindingContexts, inputChord)) {
+        const scrollIntent = key.pageUp
+            ? 'page-older'
+            : key.pageDown
+                ? 'page-newer'
+                : controlKey('u') || controlKey('b')
+                    ? 'half-page-older'
+                    : controlKey('f') || controlKey('n')
+                        ? 'half-page-newer'
+                        : inputRef.current.length === 0 && key.upArrow
+                            ? 'line-older'
+                            : inputRef.current.length === 0 && key.downArrow
+                                ? 'line-newer'
+                                : 'none';
+        const hasPendingPrefix = !keybindingAction &&
+            inputChord !== null &&
+            hasTuiKeybindingPrefix(keybindings, keybindingContexts, inputChord);
+        if (hasPendingPrefix) {
             keySequenceRef.current = { chord: inputChord, at: Date.now() };
+        }
+        const layer = hasPendingPrefix
+            ? { kind: 'pending-prefix' }
+            : permission
+                ? { kind: 'cancelable', target: 'permission' }
+                : planApproval
+                    ? { kind: 'cancelable', target: 'plan-approval' }
+                    : question
+                        ? { kind: 'cancelable', target: 'question' }
+                        : elicitation
+                            ? {
+                                kind: 'cancelable',
+                                target: elicitationUrlWaiting
+                                    ? 'elicitation-url-waiting'
+                                    : elicitationForm?.expandedField
+                                        ? 'elicitation-options'
+                                        : 'elicitation',
+                            }
+                            : selectingSession
+                                ? { kind: 'delegated', target: 'session-picker' }
+                                : menuRef.current
+                                    ? { kind: 'delegated', target: 'menu' }
+                                    : filePickerVisible
+                                        ? { kind: 'cancelable', target: 'file-picker' }
+                                        : commandPaletteVisible
+                                            ? { kind: 'cancelable', target: 'command-palette' }
+                                            : { kind: 'none' };
+        const callerIntent = !busy && value === '?' && inputRef.current.length === 0
+            ? 'toggle-shortcuts'
+            : runtimeSettingsRef.current.leftArrowOpensAgents &&
+                key.leftArrow &&
+                inputRef.current.length === 0 &&
+                availableAgents.length > 0
+                ? 'open-agents'
+                : key.return &&
+                    (key.shift || key.meta) &&
+                    keybindingAction === undefined
+                    ? 'implicit-newline'
+                    : 'none';
+        const interaction = routeTuiInteraction({
+            suspensionPending: processSuspendRequestedRef.current,
+            exitConfirmationArmed: exitConfirmation,
+            layer,
+            busy,
+            viewport: {
+                enabled: fixedViewport,
+                offset: transcriptScrollOffsetRef.current,
+                maxOffset: maxTranscriptScrollOffset,
+                pageRows: transcriptPageRows,
+            },
+            composer: interactionComposer(),
+        }, {
+            globalIntent: 'none',
+            scrollIntent,
+            action: keybindingAction,
+            composerKey,
+            timestamp: Date.now(),
+            callerIntent,
+        });
+        applyInteractionEffects(interaction.effects);
+        if (interaction.disposition === 'handled') {
             return;
         }
         const isKeybinding = (action) => keybindingAction === action;
-        if (fixedViewport &&
-            menuRef.current === null &&
-            !permission &&
-            !planApproval &&
-            !question &&
-            !elicitation &&
-            !selectingSession) {
-            const page = transcriptPageRows;
-            const scrollDelta = key.pageUp
-                ? page
-                : key.pageDown
-                    ? -page
-                    : controlKey('u') || controlKey('b')
-                        ? page / 2
-                        : controlKey('f') || controlKey('n')
-                            ? -page / 2
-                            : inputRef.current.length === 0 && key.upArrow
-                                ? 1
-                                : inputRef.current.length === 0 && key.downArrow
-                                    ? -1
-                                    : 0;
-            if (scrollDelta !== 0) {
-                setTranscriptScrollOffset((current) => Math.min(Math.max(0, maxTranscriptScrollOffset), Math.max(0, current + Math.trunc(scrollDelta))));
-                return;
-            }
-        }
-        if (runtimeSettingsRef.current.editor === 'vim' &&
-            !permission &&
-            !planApproval &&
-            !question &&
-            !elicitation &&
-            menuRef.current === null) {
-            if (!vimInsertMode) {
-                if (value === 'i' || value === 'a')
-                    setVimInsertMode(true);
-                else if (key.leftArrow || key.rightArrow)
-                    editComposer();
-                return;
-            }
-            if (key.escape || value === '\u001B') {
-                setVimInsertMode(false);
-                return;
-            }
-        }
+        if (hasPendingPrefix)
+            return;
         if (permission) {
             const options = permission.kind === 'tool' && toolPermissionModel
                 ? toolPermissionModel.options
@@ -3172,10 +3552,7 @@ export function InteractiveApp({ dataPlane = resolveDataPlane(), configRoot: sup
                 }
                 permission.resolve(feedback ? { behavior: 'deny', message: feedback } : false);
             };
-            if (key.escape) {
-                permission.resolve(false);
-            }
-            else if (permissionFeedbackMode) {
+            if (permissionFeedbackMode) {
                 if (key.tab) {
                     clearComposerInput();
                     setPermissionFeedbackMode(false);
@@ -3256,10 +3633,7 @@ export function InteractiveApp({ dataPlane = resolveDataPlane(), configRoot: sup
                     ...(feedback ? { feedback } : {}),
                 });
             };
-            if (key.escape) {
-                planApproval.resolve({ behavior: 'deny' });
-            }
-            else if (planApprovalFeedbackMode) {
+            if (planApprovalFeedbackMode) {
                 if (key.tab) {
                     clearComposerInput();
                     setPlanApprovalFeedbackMode(false);
@@ -3296,10 +3670,7 @@ export function InteractiveApp({ dataPlane = resolveDataPlane(), configRoot: sup
             return;
         }
         if (question) {
-            if (key.escape) {
-                question.resolve(null);
-            }
-            else if (key.return) {
+            if (key.return) {
                 try {
                     const current = question.questions[question.index];
                     if (!current)
@@ -3353,13 +3724,7 @@ export function InteractiveApp({ dataPlane = resolveDataPlane(), configRoot: sup
                     setElicitationForm(null);
                     clearComposerInput();
                 };
-                if (key.escape) {
-                    if (elicitationUrlWaiting)
-                        dismissUrlDialog();
-                    else
-                        elicitation.resolve({ action: 'cancel' });
-                }
-                else if (key.leftArrow || key.rightArrow) {
+                if (key.leftArrow || key.rightArrow) {
                     setElicitationForm({
                         ...form,
                         focusIndex: form.focusIndex === 0 ? 1 : 0,
@@ -3385,7 +3750,7 @@ export function InteractiveApp({ dataPlane = resolveDataPlane(), configRoot: sup
                 return;
             }
             if (form.expandedField && currentField) {
-                if (key.escape || key.leftArrow) {
+                if (key.leftArrow) {
                     setElicitationForm({ ...form, expandedField: undefined });
                 }
                 else if (key.upArrow) {
@@ -3404,9 +3769,6 @@ export function InteractiveApp({ dataPlane = resolveDataPlane(), configRoot: sup
                     setElicitationForm(typeaheadElicitationOption(form, value));
                 }
             }
-            else if (key.escape) {
-                elicitation.resolve({ action: 'cancel' });
-            }
             else if (key.upArrow) {
                 move(-1);
             }
@@ -3973,13 +4335,14 @@ export function InteractiveApp({ dataPlane = resolveDataPlane(), configRoot: sup
                 return;
             }
             if (activeMenu.kind === 'help') {
-                if (key.escape) {
+                if (key.escape || value === '\u001B') {
                     updateMenu(null);
                     return;
                 }
                 if (key.leftArrow || key.rightArrow) {
                     updateMenu({
                         kind: 'help',
+                        invocation: activeMenu.invocation,
                         tabIndex: Math.max(0, Math.min(2, activeMenu.tabIndex + (key.leftArrow ? -1 : 1))),
                         selectedIndex: 0,
                     });
@@ -5175,8 +5538,6 @@ export function InteractiveApp({ dataPlane = resolveDataPlane(), configRoot: sup
                 void backgrounding;
                 return;
             }
-            if (isKeybinding('chat:cancel'))
-                turnControllerRef.current?.abort();
             return;
         }
         if (isKeybinding('chat:imagePaste')) {
@@ -5192,10 +5553,6 @@ export function InteractiveApp({ dataPlane = resolveDataPlane(), configRoot: sup
             return;
         }
         if (filePickerVisible) {
-            if (key.escape || value === '\u001B') {
-                setFilePickerOpen(false);
-                return;
-            }
             if (key.upArrow) {
                 setFileSelection((current) => Math.max(0, current - 1));
                 return;
@@ -5220,13 +5577,6 @@ export function InteractiveApp({ dataPlane = resolveDataPlane(), configRoot: sup
             updateMenu({ kind: 'agents', agents: availableAgents, selectedIndex: 0 });
             return;
         }
-        if (isKeybinding('chat:cancel')) {
-            const now = Date.now();
-            if (now - lastEscapeAtRef.current <= 500)
-                clearComposerInput();
-            lastEscapeAtRef.current = now;
-            return;
-        }
         if (isKeybinding('chat:cycleMode')) {
             const currentIndex = permissionOptions.findIndex((option) => option.mode === runtimePreferences.permissionMode);
             const next = permissionOptions[(currentIndex + 1) % permissionOptions.length];
@@ -5235,10 +5585,6 @@ export function InteractiveApp({ dataPlane = resolveDataPlane(), configRoot: sup
             return;
         }
         if (commandPaletteVisible) {
-            if (key.escape) {
-                setCommandPaletteOpen(false);
-                return;
-            }
             if (key.upArrow) {
                 if (matchingSlashCommands.length > 0) {
                     setCommandSelection((current) => Math.max(0, current - 1));
@@ -5300,7 +5646,12 @@ export function InteractiveApp({ dataPlane = resolveDataPlane(), configRoot: sup
                 exit();
             }
             else if (prompt === '/help' || prompt === '?') {
-                updateMenu({ kind: 'help', tabIndex: 0, selectedIndex: 0 });
+                updateMenu({
+                    kind: 'help',
+                    invocation: prompt,
+                    tabIndex: 0,
+                    selectedIndex: 0,
+                });
             }
             else if (prompt === '/new') {
                 const previousSessionId = sessionIdRef.current;
@@ -5678,7 +6029,7 @@ export function InteractiveApp({ dataPlane = resolveDataPlane(), configRoot: sup
                     ...current,
                     { kind: 'user', text: '/context' },
                     contextEntry,
-                ]);
+                ], (current) => current.length);
                 const loading = (async () => {
                     try {
                         const files = await loadMemoryFiles(keybindingsRoot, runtimeCwdRef.current);
@@ -5695,7 +6046,7 @@ export function InteractiveApp({ dataPlane = resolveDataPlane(), configRoot: sup
                                 next[next.length - 1] = { ...last, memoryFiles };
                             }
                             return next;
-                        });
+                        }, (_current, next) => Math.max(0, next.length - 1));
                     }
                     catch {
                         // Leave the Memory files section empty if files cannot be read.
@@ -5842,50 +6193,20 @@ export function InteractiveApp({ dataPlane = resolveDataPlane(), configRoot: sup
             clearComposerInput();
             return;
         }
-        const transition = routeComposerKey(editor(), {
-            value,
-            left: key.leftArrow,
-            right: key.rightArrow,
-            backspace: key.backspace,
-            delete: key.delete,
-            ctrl: key.ctrl,
-            meta: key.meta,
-            escape: key.escape || value === '\u001B',
-        });
-        if (transition.kind === 'cancel') {
-            clearComposerInput();
-        }
-        else if (transition.kind === 'edit') {
-            updateComposerEditor(transition.editor);
+        if (filePickerVisible || commandPaletteVisible) {
+            editComposer();
+            return;
         }
     });
-    return (_jsx(TuiThemeProvider, { settings: themeSettings, children: _jsx(Box, { flexDirection: "column", ...(!fixedViewport
+    return (_jsx(TuiThemeProvider, { settings: themeSettings, screenReader: axScreenReader, children: _jsx(Box, { flexDirection: "column", ...(!fixedViewport
                 ? {}
-                : { height: rows, overflowY: 'hidden' }), children: selectingSession ? (_jsx(SessionPicker, { sessions: filteredPickerChoices, selectedIndex: selectedIndex, screenReader: axScreenReader, query: sessionSearch })) : (_jsxs(_Fragment, { children: [!axScreenReader && freshSession ? (_jsx(WelcomePanel, { display: runtimeDisplay, width: width, showTips: runtimeSettings.tips, dataPlane: dataPlane })) : null, sessionId ? (_jsxs(Text, { dimColor: true, children: ["Session ", sessionId.slice(0, 8)] })) : null, !axScreenReader && !resumed && hasConversationHistory ? (_jsx(SessionIdentity, { display: runtimeDisplay, width: width })) : null, _jsx(Box, { ...(fixedViewport
+                : { height: rows, overflowY: 'hidden' }), children: screen.body.kind === 'session-picker' ? (_jsx(SessionPicker, { sessions: filteredPickerChoices, selectedIndex: selectedIndex, screenReader: axScreenReader, query: sessionSearch })) : (_jsxs(_Fragment, { children: [screen.body.intro === 'welcome' ? (_jsx(WelcomePanel, { display: runtimeDisplay, width: width, showTips: runtimeSettings.tips, dataPlane: dataPlane })) : null, screen.body.sessionLabel ? (_jsxs(Text, { dimColor: true, children: ["Session ", screen.body.sessionLabel] })) : null, screen.body.intro === 'identity' ? (_jsx(SessionIdentity, { display: runtimeDisplay, width: width })) : null, _jsx(Box, { ...(fixedViewport
                             ? {
                                 flexShrink: 1,
                                 minHeight: 0,
                                 overflowY: 'hidden',
                             }
-                            : {}), children: _jsx(Transcript, { entries: transcriptEntries, activeText: activeText, activeThinking: activeThinking, activeStreamVisible: transcriptScrollOffset === 0, thinkingExpanded: thinkingExpanded, detailedTranscript: thinkingExpanded || runtimeSettings.verbose, screenReader: axScreenReader }) }), externalEditorRequest !== null ||
-                        keybindingsEditing ||
-                        memoryEditorRequest !== null ? (_jsx(ExternalEditorWait, { screenReader: axScreenReader })) : permission ? (permission.kind === 'tool' && toolPermissionModel ? (_jsx(ToolPermissionDialog, { model: toolPermissionModel, selection: permissionSelection, feedbackMode: permissionFeedbackMode, feedback: input, ruleEditor: permissionRuleEditor, screenReader: axScreenReader })) : (_jsxs(DialogFrame, { title: `Retry interrupted ${permission.call.name}?`, screenReader: axScreenReader, children: [_jsx(Box, { flexDirection: "column", paddingX: 1, paddingY: 1, children: _jsx(Text, { bold: true, children: describeTool(permission.call, sensitiveValues) }) }), _jsx(Text, { children: "Do you want to proceed?" }), _jsxs(Text, { inverse: !axScreenReader && permissionSelection === 0, children: [selectionPrefix(permissionSelection === 0, axScreenReader), "1. Yes"] }), _jsxs(Text, { inverse: !axScreenReader && permissionSelection === 1, children: [selectionPrefix(permissionSelection === 1, axScreenReader), "2. No"] }), permissionFeedbackMode ? (_jsxs(Text, { children: ["\u203A", ' ', input ||
-                                        (permissionSelection === 0
-                                            ? 'tell Praxis what to do next'
-                                            : 'tell Praxis what to do differently')] })) : null, _jsx(Text, { dimColor: true, children: permissionFeedbackMode
-                                    ? 'Enter to submit · Tab to collapse · Esc to cancel'
-                                    : 'Enter to confirm · Tab to add feedback · Esc to cancel' })] }))) : planApproval ? (_jsxs(DialogFrame, { title: "Ready to code?", screenReader: axScreenReader, children: [_jsx(Text, { children: "Here is Praxis's plan:" }), planApproval.request.plan ? (_jsx(Box, { borderStyle: axScreenReader ? undefined : 'classic', borderLeft: false, borderRight: false, paddingX: axScreenReader ? 0 : 1, marginY: 1, children: _jsx(Text, { children: planApproval.request.plan }) })) : null, _jsx(Text, { dimColor: true, children: "Praxis has written up a plan and is ready to execute. Would you like to proceed?" }), _jsxs(Text, { inverse: !axScreenReader && planApprovalSelection === 0, children: [selectionPrefix(planApprovalSelection === 0, axScreenReader), "1.", ' ', runtimeSettings.useAutoModeDuringPlan
-                                        ? 'Yes, and use auto mode'
-                                        : allowDangerouslySkipPermissions
-                                            ? 'Yes, and bypass permissions'
-                                            : 'Yes, auto-accept edits'] }), _jsxs(Text, { inverse: !axScreenReader && planApprovalSelection === 1, children: [selectionPrefix(planApprovalSelection === 1, axScreenReader), "2. Yes, manually approve edits"] }), _jsxs(Text, { inverse: !axScreenReader && planApprovalSelection === 2, children: [selectionPrefix(planApprovalSelection === 2, axScreenReader), "3. No, keep planning"] }), planApprovalFeedbackMode ? (_jsxs(Text, { children: ["\u203A", ' ', input ||
-                                        (planApprovalSelection === 2
-                                            ? 'Tell Praxis what to change'
-                                            : 'Add feedback for implementation')] })) : null, _jsx(Text, { dimColor: true, children: planApproval.request.planPath }), _jsx(Text, { dimColor: true, children: planApprovalFeedbackMode
-                                    ? 'Enter to submit · Tab to collapse · Esc to cancel'
-                                    : 'Enter to confirm · Tab to add feedback · Esc to cancel' })] })) : question ? (_jsxs(DialogFrame, { title: `${question.questions[question.index]?.header}: ${question.questions[question.index]?.question}`, screenReader: axScreenReader, children: [question.questions[question.index]?.options.map((option, index) => (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { children: [index + 1, ". ", option.label, " \u2014 ", option.description] }), option.preview ? (_jsx(Text, { dimColor: true, children: option.preview })) : null] }, `${index}-${option.label}`))), _jsxs(Text, { children: [axScreenReader ? 'Current answer: ' : '› ', input || (axScreenReader ? '(empty)' : '')] }), _jsx(Text, { dimColor: true, children: question.questions[question.index]?.multiSelect
-                                    ? 'Enter comma-separated option numbers or custom text · Esc cancels'
-                                    : 'Enter one option number or custom text · Esc cancels' })] })) : elicitation ? (elicitation.request.mode === 'url' ? (_jsx(McpElicitationUrl, { serverName: elicitation.request.serverName, message: elicitation.request.message, url: elicitation.request.url ?? '', waiting: elicitationUrlWaiting, actionLabel: elicitation.request.elicitationId
+                            : {}), children: _jsx(Transcript, { entries: screen.body.transcript.entries, activeText: screen.body.transcript.active.text, activeThinking: screen.body.transcript.active.thinking, activeStreamVisible: screen.body.transcript.active.visible, thinkingExpanded: thinkingExpanded, detailedTranscript: screen.body.transcript.readingMode !== 'normal', screenReader: axScreenReader }) }), selectedPriority?.kind === 'editor-wait' ? (_jsx(ExternalEditorWait, { screenReader: axScreenReader })) : selectedPriority?.kind === 'permission' ? (_jsx(PermissionSurface, { model: selectedPriority.surface, width: width, screenReader: axScreenReader })) : selectedPriority?.kind === 'plan-approval' ? (_jsx(DecisionSurface, { model: selectedPriority, width: width, screenReader: axScreenReader })) : selectedPriority?.kind === 'question' ? (_jsx(DecisionSurface, { model: selectedPriority, width: width, screenReader: axScreenReader })) : selectedPriority?.kind === 'elicitation' && elicitation ? (elicitation.request.mode === 'url' ? (_jsx(McpElicitationUrl, { serverName: elicitation.request.serverName, message: elicitation.request.message, url: elicitation.request.url ?? '', waiting: elicitationUrlWaiting, actionLabel: elicitation.request.elicitationId
                             ? 'Skip confirmation'
                             : 'Continue without waiting', selection: elicitationForm?.focusIndex ?? 0, screenReader: axScreenReader })) : (_jsx(McpElicitationForm, { serverName: elicitation.request.serverName, message: elicitation.request.message, state: elicitationForm ??
                             createTuiElicitationForm(elicitation.request.requestedSchema), input: input, screenReader: axScreenReader }))) : menu?.kind === 'model-input' ? (_jsxs(DialogFrame, { title: "Enter model ID", screenReader: axScreenReader, children: [_jsx(Text, { dimColor: true, children: "Enter a model ID supported by the configured provider." }), _jsxs(Text, { children: ["\u203A ", input] }), _jsx(Text, { dimColor: true, children: "Enter confirms \u00B7 Esc cancels" })] })) : menu?.kind === 'export-filename' ? (_jsxs(DialogFrame, { title: "Enter filename:", screenReader: axScreenReader, children: [_jsxs(Text, { children: ["> ", input] }), _jsx(Text, { dimColor: true, children: "Enter to save \u00B7 Esc to go back" })] })) : menu?.kind === 'compact-progress' ? (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: "\u273B Compacting conversation\u2026" }), _jsxs(Text, { children: ['▰'.repeat(Math.floor(compactProgress / 2)), '▱'.repeat(50 - Math.floor(compactProgress / 2)), ' ', compactProgress, "%"] })] })) : menu?.kind === 'btw' ? (_jsx(BtwPanel, { entries: btwHistory, selectedIndex: menu.selectedIndex, scrollOffset: menu.scrollOffset, copied: btwCopied, width: width, screenReader: axScreenReader })) : menu?.kind === 'rewind' ? (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { bold: true, children: " Rewind" }), _jsx(Text, { children: " " }), _jsxs(Text, { children: [' ', "Restore the code and/or conversation to the point before\u2026"] }), _jsx(Text, { children: " " }), (() => {
@@ -5894,9 +6215,9 @@ export function InteractiveApp({ dataPlane = resolveDataPlane(), configRoot: sup
                                             .slice(window.start, window.end)
                                             .map((point, offset) => {
                                             const index = window.start + offset;
-                                            return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsxs(Text, { inverse: menu.selectedIndex === index, children: [menu.selectedIndex === index ? ' ❯ ' : '   ', point.prompt
-                                                                .replace(/\s+/gu, ' ')
-                                                                .slice(0, 72)] }), _jsxs(Text, { dimColor: true, children: ['     ', point.fileChanges.length > 0
+                                            return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsx(DecisionOption, { selected: menu.selectedIndex === index, screenReader: axScreenReader, selectedPrefix: " \u276F ", unselectedPrefix: "   ", children: point.prompt
+                                                            .replace(/\s+/gu, ' ')
+                                                            .slice(0, 72) }), _jsxs(Text, { dimColor: true, children: ['     ', point.fileChanges.length > 0
                                                                 ? point.fileChanges
                                                                     .map((path) => path.startsWith(`${runtimeCwd}/`)
                                                                     ? path.slice(runtimeCwd.length + 1)
@@ -5906,26 +6227,16 @@ export function InteractiveApp({ dataPlane = resolveDataPlane(), configRoot: sup
                                                                     ? 'No code changes'
                                                                     : '⚠ No code restore'] })] }, point.messageId));
                                         }), window.end < menu.points.length ? (_jsxs(Text, { dimColor: true, children: [' ', "\u2193 ", menu.points.length - window.end, " more below"] })) : null] }));
-                            })(), _jsxs(Text, { inverse: menu.selectedIndex === menu.points.length, children: [menu.selectedIndex === menu.points.length ? ' ❯ ' : '   ', "(current)"] }), _jsx(Text, { children: " " }), _jsx(Text, { dimColor: true, children: " Enter to continue \u00B7 Esc to cancel" })] })) : menu?.kind === 'rewind-confirm' ? (_jsxs(DialogFrame, { title: "Confirm restore point", screenReader: axScreenReader, children: [_jsxs(Text, { children: ["\u2502 ", menu.point.prompt] }), _jsx(Text, { children: " " }), _jsx(Text, { children: "The conversation will be forked." }), _jsxs(Text, { children: ["The code will", ' ', menu.point.fileChanges.length > 0
+                            })(), _jsx(DecisionOption, { selected: menu.selectedIndex === menu.points.length, screenReader: axScreenReader, selectedPrefix: " \u276F ", unselectedPrefix: "   ", children: "(current)" }), _jsx(Text, { children: " " }), _jsx(Text, { dimColor: true, children: " Enter to continue \u00B7 Esc to cancel" })] })) : menu?.kind === 'rewind-confirm' ? (_jsxs(DialogFrame, { title: "Confirm restore point", screenReader: axScreenReader, children: [_jsxs(Text, { children: ["\u2502 ", menu.point.prompt] }), _jsx(Text, { children: " " }), _jsx(Text, { children: "The conversation will be forked." }), _jsxs(Text, { children: ["The code will", ' ', menu.point.fileChanges.length > 0
                                         ? `restore ${menu.point.fileChanges.join(', ')}.`
-                                        : 'be unchanged.'] }), _jsx(Text, { children: " " }), rewindActions(menu.point).map((option, index) => (_jsxs(Text, { inverse: menu.selectedIndex === index, children: [menu.selectedIndex === index ? '❯ ' : '  ', index + 1, ". ", option.label] }, option.action))), _jsx(Text, { children: " " }), _jsx(Text, { color: activePalette.warning, children: "\u26A0 Rewinding does not affect files edited manually or via bash." })] })) : menu?.kind === 'rewind-context' ? (_jsxs(DialogFrame, { title: `Summarize ${menu.direction === 'from' ? 'from' : 'up to'} here`, screenReader: axScreenReader, children: [_jsx(Text, { children: menu.direction === 'from'
+                                        : 'be unchanged.'] }), _jsx(Text, { children: " " }), rewindActions(menu.point).map((option, index) => (_jsxs(DecisionOption, { selected: menu.selectedIndex === index, screenReader: axScreenReader, children: [index + 1, ". ", option.label] }, option.action))), _jsx(Text, { children: " " }), _jsx(RewindWarning, {})] })) : menu?.kind === 'rewind-context' ? (_jsxs(DialogFrame, { title: `Summarize ${menu.direction === 'from' ? 'from' : 'up to'} here`, screenReader: axScreenReader, children: [_jsx(Text, { children: menu.direction === 'from'
                                     ? 'Messages after this point will be summarized.'
-                                    : 'Messages up to this point will be summarized.' }), _jsx(Text, { children: " " }), _jsxs(Text, { children: ["add context (optional): ", input] }), _jsx(Text, { dimColor: true, children: "Enter to summarize \u00B7 Esc to go back" })] })) : menu?.kind === 'permission-rule-input' ? (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { bold: true, children: ["Add ", menu.behavior, " permission rule"] }), _jsx(Text, { children: "Permission rules are a tool name, optionally followed by a specifier in parentheses." }), _jsx(Text, { children: "e.g., WebFetch or Bash(ls *)" }), _jsx(Text, { children: " " }), _jsx(Box, { borderStyle: axScreenReader ? undefined : 'round', paddingX: axScreenReader ? 0 : 1, children: _jsx(Text, { ...(input ? {} : { dimColor: true }), children: input || 'Enter permission rule…' }) }), _jsx(Text, { dimColor: true, children: "Enter to submit \u00B7 Esc to cancel" })] })) : menu?.kind === 'workspace-directory-input' ? (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { bold: true, children: "Add directory to workspace" }), _jsx(Text, { children: "Praxis Code will be able to read files in this directory and make edits when auto-accept edits is on." }), _jsx(Text, { children: " " }), _jsx(Text, { children: "Enter the path to the directory:" }), _jsx(Box, { borderStyle: axScreenReader ? undefined : 'round', paddingX: axScreenReader ? 0 : 1, children: _jsx(Text, { ...(input ? {} : { dimColor: true }), children: input || 'Directory path…' }) }), _jsx(Text, { dimColor: true, children: "Tab to complete \u00B7 Enter to add \u00B7 Esc to cancel" })] })) : menu?.kind === 'permission-delete' ? (_jsxs(DialogFrame, { title: permissionDeleteTitle(menu.rule.behavior), screenReader: axScreenReader, children: [_jsx(Text, { children: menu.rule.rule }), permissionRuleDescription(menu.rule.rule) ? (_jsx(Text, { dimColor: true, children: permissionRuleDescription(menu.rule.rule) })) : null, _jsx(Text, { dimColor: true, children: permissionScopeLabel(menu.rule.scope) }), _jsx(Text, { children: " " }), _jsx(Text, { children: "Are you sure you want to delete this permission rule?" }), _jsx(Text, { children: " " }), _jsxs(Text, { inverse: !axScreenReader && menu.selectedIndex === 0, children: [selectionPrefix(menu.selectedIndex === 0, axScreenReader), "1. Yes"] }), _jsxs(Text, { inverse: !axScreenReader && menu.selectedIndex === 1, children: [selectionPrefix(menu.selectedIndex === 1, axScreenReader), "2. No"] }), _jsx(Text, { dimColor: true, children: "Esc to cancel" })] })) : menu?.kind === 'workspace-directory-delete' ? (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { bold: true, children: "Remove directory from workspace?" }), _jsxs(Text, { children: [" ", menu.path] }), _jsx(Text, { children: " " }), _jsx(Text, { children: "Praxis Code will no longer have access to files in this directory." }), _jsx(Text, { children: " " }), _jsxs(Text, { inverse: !axScreenReader && menu.selectedIndex === 0, children: [selectionPrefix(menu.selectedIndex === 0, axScreenReader), "1. Yes"] }), _jsxs(Text, { inverse: !axScreenReader && menu.selectedIndex === 1, children: [selectionPrefix(menu.selectedIndex === 1, axScreenReader), "2. No"] }), _jsx(Text, { dimColor: true, children: "Enter to confirm \u00B7 Esc to cancel" })] })) : menu ? (menu.kind === 'help' ? (_jsx(HelpMenu, { tabIndex: menu.tabIndex, selectedIndex: menu.selectedIndex, builtinCommands: builtinSlashCommands, customCommands: customSlashCommands, width: width, screenReader: axScreenReader })) : menu.kind === 'diff' ? (_jsx(DiffDashboard, { snapshots: menu.snapshots, sourceIndex: menu.sourceIndex, selectedIndex: menu.selectedIndex, viewingFile: menu.viewingFile, scrollOffset: menu.scrollOffset, width: width, screenReader: axScreenReader })) : menu.kind === 'permission-dashboard' ? (_jsx(PermissionDashboard, { tabIndex: menu.tabIndex, selectedIndex: menu.selectedIndex, query: menu.query, rules: menu.rules, recentDenied: recentDenied, retryingDeniedId: retryingDeniedId, workspaceDirectories: workspaceDirectories, width: width, screenReader: axScreenReader })) : menu.kind === 'sandbox' ? (_jsx(SandboxDashboard, { snapshot: menu.snapshot, tab: menu.tab, selectedIndex: menu.selectedIndex, width: width, screenReader: axScreenReader })) : menu.kind === 'permission-scope' ? (_jsx(SelectionMenu, { title: "Where should this rule be saved?", description: `${menu.rule}${permissionRuleDescription(menu.rule)
-                            ? ` · ${permissionRuleDescription(menu.rule)}`
-                            : ''}`, options: [
-                            {
-                                label: 'Project settings (local)',
-                                description: `Saved in ${settingsDirectory}/settings.local.json`,
-                            },
-                            {
-                                label: 'Project settings',
-                                description: `Checked in at ${settingsDirectory}/settings.json`,
-                            },
-                            {
-                                label: 'User settings',
-                                description: `Saved in ~/${settingsDirectory}/settings.json`,
-                            },
-                        ], selectedIndex: menu.selectedIndex, footer: "Enter to confirm \u00B7 Esc to cancel", width: width, screenReader: axScreenReader })) : menu.kind === 'agents' ? (_jsx(ListDashboard, { title: "Agents", rows: menu.agents.map((agent) => ({
+                                    : 'Messages up to this point will be summarized.' }), _jsx(Text, { children: " " }), _jsxs(Text, { children: ["add context (optional): ", input] }), _jsx(Text, { dimColor: true, children: "Enter to summarize \u00B7 Esc to go back" })] })) : selectedSecondarySurface !== null && menu !== null ? (selectedSecondarySurface.kind === 'permission-dashboard' ||
+                        selectedSecondarySurface.kind === 'permission-rule-input' ||
+                        selectedSecondarySurface.kind === 'permission-scope' ||
+                        selectedSecondarySurface.kind === 'permission-delete' ||
+                        selectedSecondarySurface.kind === 'workspace-directory-input' ||
+                        selectedSecondarySurface.kind === 'workspace-directory-delete' ? (_jsx(PermissionSurface, { model: selectedSecondarySurface, width: width, screenReader: axScreenReader })) : selectedSecondarySurface.kind === 'help' ? (_jsx(HelpMenu, { model: selectedSecondarySurface, width: width, screenReader: axScreenReader })) : menu.kind === 'diff' ? (_jsx(DiffDashboard, { snapshots: menu.snapshots, sourceIndex: menu.sourceIndex, selectedIndex: menu.selectedIndex, viewingFile: menu.viewingFile, scrollOffset: menu.scrollOffset, width: width, screenReader: axScreenReader })) : menu.kind === 'sandbox' ? (_jsx(SandboxDashboard, { snapshot: menu.snapshot, tab: menu.tab, selectedIndex: menu.selectedIndex, width: width, screenReader: axScreenReader })) : menu.kind === 'agents' ? (_jsx(ListDashboard, { title: "Agents", rows: menu.agents.map((agent) => ({
                             label: agent.name,
                             description: agent.description,
                         })), emptyText: "No agents configured", selectedIndex: menu.selectedIndex, width: width, screenReader: axScreenReader })) : menu.kind === 'config' ? (_jsx(ConfigDashboard, { tab: menu.tab, snapshot: menu.snapshot, query: menu.query, selectedIndex: menu.selectedIndex, searchFocused: menu.searchFocused, status: {
@@ -5957,7 +6268,7 @@ export function InteractiveApp({ dataPlane = resolveDataPlane(), configRoot: sup
                                 label: 'Save to file',
                                 description: 'Save the conversation to a file in the current directory',
                             },
-                        ], selectedIndex: menu.selectedIndex, footer: "Esc to cancel", width: width, screenReader: axScreenReader })) : menu.kind === 'copy' ? (_jsx(SelectionMenu, { title: "Copy", description: "Select content to copy:", options: menu.candidates, selectedIndex: menu.selectedIndex, footer: "Enter to copy \u00B7 w to write to /tmp/claude \u00B7 Esc to cancel", width: width, screenReader: axScreenReader })) : null) : (_jsxs(_Fragment, { children: [commandPaletteVisible ? (_jsx(CommandPalette, { commands: matchingSlashCommands, selectedIndex: selectedSlashCommandIndex, width: width, screenReader: axScreenReader })) : null, filePickerVisible ? (_jsx(MentionPicker, { entries: matchingMentionEntries, selectedIndex: selectedFileIndex, width: width, screenReader: axScreenReader })) : null, exitConfirmation ? (_jsx(Text, { color: activePalette.warning, children: "Press Ctrl-C again to exit" })) : null, fixedViewport ? _jsx(Box, { flexGrow: 1 }) : null, _jsx(Composer, { input: shellMode ? input.slice(1) : input, cursor: shellMode ? Math.max(0, inputCursor - 1) : inputCursor, shellMode: shellMode, ...(sessionColor === undefined ? {} : { sessionColor }), ...(commandArgumentHint === undefined
+                        ], selectedIndex: menu.selectedIndex, footer: "Esc to cancel", width: width, screenReader: axScreenReader })) : menu.kind === 'copy' ? (_jsx(SelectionMenu, { title: "Copy", description: "Select content to copy:", options: menu.candidates, selectedIndex: menu.selectedIndex, footer: "Enter to copy \u00B7 w to write to /tmp/claude \u00B7 Esc to cancel", width: width, screenReader: axScreenReader })) : null) : (_jsxs(_Fragment, { children: [selectedCommandPalette !== undefined ? (_jsx(CommandPalette, { commands: matchingSlashCommands, selectedIndex: selectedSlashCommandIndex, width: width, screenReader: axScreenReader })) : null, selectedFilePicker !== undefined ? (_jsx(MentionPicker, { entries: matchingMentionEntries, selectedIndex: selectedFileIndex, width: width, screenReader: axScreenReader })) : null, selectedExitConfirmation !== undefined ? (_jsx(ExitWarning, {})) : null, fixedViewport ? _jsx(Box, { flexGrow: 1 }) : null, _jsx(Composer, { input: shellMode ? input.slice(1) : input, cursor: shellMode ? Math.max(0, inputCursor - 1) : inputCursor, shellMode: shellMode, ...(sessionColor === undefined ? {} : { sessionColor }), ...(commandArgumentHint === undefined
                                     ? {}
                                     : { commandArgumentHint }), busy: busy, clipboardBusy: clipboardBusy, status: status, display: runtimeDisplay, ...(usage === undefined ? {} : { usage }), ...(costUsd === undefined ? {} : { costUsd }), width: width, screenReader: axScreenReader, hasThinking: hasDetailedTranscript, thinkingExpanded: thinkingExpanded, reduceMotion: runtimeSettings.reduceMotion, progressBar: runtimeSettings.progressBar, ...(runtimeSettings.turnDuration
                                     ? (() => {
@@ -5969,7 +6280,7 @@ export function InteractiveApp({ dataPlane = resolveDataPlane(), configRoot: sup
                                     : {}), editorMode: runtimeSettings.editor, ...(runtimeSettings.prStatus &&
                                     activeSessionSummary?.prNumber
                                     ? { prStatus: `PR #${activeSessionSummary.prNumber}` }
-                                    : {}), shortcutsVisible: shortcutsVisible, ...(editorFooterMessage === undefined
+                                    : {}), shortcutsVisible: shortcutsVisible, shortcutHelp: shortcutHelpSurface, ...(editorFooterMessage === undefined
                                     ? {}
                                     : { footerMessage: editorFooterMessage }) }), _jsx(StatusLine, { configRoot: keybindingsRoot, cwd: runtimeCwd, dataPlane: dataPlane, input: createClaudeStatusLineInput({
                                     configRoot: keybindingsRoot,
@@ -6176,7 +6487,7 @@ export async function runInteractive(options) {
                 ? { allowDangerouslySkipPermissions: true }
                 : {}) }), {
             exitOnCtrlC: false,
-            ...fullscreenInkRenderOptions(currentRenderer, options.axScreenReader),
+            ...tuiInkRenderOptions(currentRenderer, options.axScreenReader === true),
             interactive: true,
         });
         await instance.waitUntilExit();