@codex-infinity/pi-infinity 0.60.1 → 0.61.1

package/dist/modes/interactive/interactive-mode.js

@@ -6,7 +6,7 @@ import * as crypto from "node:crypto";
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
-import { CombinedAutocompleteProvider, Container, fuzzyFilter, Loader, Markdown, matchesKey, ProcessTerminal, Spacer, Text, TruncatedText, TUI, visibleWidth, } from "@mariozechner/pi-tui";
+import { CombinedAutocompleteProvider, Container, fuzzyFilter, Loader, Markdown, matchesKey, ProcessTerminal, Spacer, setKeybindings, Text, TruncatedText, TUI, visibleWidth, } from "@mariozechner/pi-tui";
 import { spawn, spawnSync } from "child_process";
 import { APP_NAME, getAgentDir, getAuthPath, getDebugLogPath, getShareViewerUrl, getUpdateInstruction, VERSION, } from "../../config.js";
 import { parseSkillBlock } from "../../core/agent-session.js";
@@ -35,7 +35,7 @@ import { ExtensionEditorComponent } from "./components/extension-editor.js";
 import { ExtensionInputComponent } from "./components/extension-input.js";
 import { ExtensionSelectorComponent } from "./components/extension-selector.js";
 import { FooterComponent } from "./components/footer.js";
-import { appKey, appKeyHint, editorKey, keyHint, rawKeyHint } from "./components/keybinding-hints.js";
+import { keyHint, keyText, rawKeyHint } from "./components/keybinding-hints.js";
 import { LoginDialogComponent } from "./components/login-dialog.js";
 import { ModelSelectorComponent } from "./components/model-selector.js";
 import { OAuthSelectorComponent } from "./components/oauth-selector.js";
@@ -52,79 +52,6 @@ function isExpandable(obj) {
     return typeof obj === "object" && obj !== null && "setExpanded" in obj && typeof obj.setExpanded === "function";
 }
 export class InteractiveMode {
-    options;
-    session;
-    ui;
-    chatContainer;
-    pendingMessagesContainer;
-    statusContainer;
-    defaultEditor;
-    editor;
-    autocompleteProvider;
-    fdPath;
-    editorContainer;
-    footer;
-    footerDataProvider;
-    keybindings;
-    version;
-    isInitialized = false;
-    onInputCallback;
-    loadingAnimation = undefined;
-    pendingWorkingMessage = undefined;
-    defaultWorkingMessage = "Working...";
-    lastSigintTime = 0;
-    lastEscapeTime = 0;
-    changelogMarkdown = undefined;
-    // Status line tracking (for mutating immediately-sequential status updates)
-    lastStatusSpacer = undefined;
-    lastStatusText = undefined;
-    // Streaming message tracking
-    streamingComponent = undefined;
-    streamingMessage = undefined;
-    // Tool execution tracking: toolCallId -> component
-    pendingTools = new Map();
-    // Tool output expansion state
-    toolOutputExpanded = false;
-    // Thinking block visibility state
-    hideThinkingBlock = false;
-    // Skill commands: command name -> skill file path
-    skillCommands = new Map();
-    // Agent subscription unsubscribe function
-    unsubscribe;
-    // Track if editor is in bash mode (text starts with !)
-    isBashMode = false;
-    // Track current bash execution component
-    bashComponent = undefined;
-    // Track pending bash components (shown in pending area, moved to chat on submit)
-    pendingBashComponents = [];
-    // Auto-compaction state
-    autoCompactionLoader = undefined;
-    autoCompactionEscapeHandler;
-    // Auto-retry state
-    retryLoader = undefined;
-    retryEscapeHandler;
-    // Messages queued while compaction is running
-    compactionQueuedMessages = [];
-    // Shutdown state
-    shutdownRequested = false;
-    // Extension UI state
-    extensionSelector = undefined;
-    extensionInput = undefined;
-    extensionEditor = undefined;
-    extensionTerminalInputUnsubscribers = new Set();
-    // Extension widgets (components rendered above/below the editor)
-    extensionWidgetsAbove = new Map();
-    extensionWidgetsBelow = new Map();
-    widgetContainerAbove;
-    widgetContainerBelow;
-    // Custom footer from extension (undefined = use built-in footer)
-    customFooter = undefined;
-    // Header container that holds the built-in or custom header
-    headerContainer;
-    // Built-in header (logo + keybinding hints + changelog)
-    builtInHeader = undefined;
-    // Custom header from extension (undefined = use built-in header)
-    customHeader = undefined;
     // Convenience accessors
     get agent() {
         return this.session.agent;
@@ -137,6 +64,60 @@ export class InteractiveMode {
     }
     constructor(session, options = {}) {
         this.options = options;
+        this.isInitialized = false;
+        this.loadingAnimation = undefined;
+        this.pendingWorkingMessage = undefined;
+        this.defaultWorkingMessage = "Working...";
+        this.lastSigintTime = 0;
+        this.lastEscapeTime = 0;
+        this.changelogMarkdown = undefined;
+        // Status line tracking (for mutating immediately-sequential status updates)
+        this.lastStatusSpacer = undefined;
+        this.lastStatusText = undefined;
+        // Streaming message tracking
+        this.streamingComponent = undefined;
+        this.streamingMessage = undefined;
+        // Tool execution tracking: toolCallId -> component
+        this.pendingTools = new Map();
+        // Tool output expansion state
+        this.toolOutputExpanded = false;
+        // Thinking block visibility state
+        this.hideThinkingBlock = false;
+        // Skill commands: command name -> skill file path
+        this.skillCommands = new Map();
+        // Track if editor is in bash mode (text starts with !)
+        this.isBashMode = false;
+        // Track current bash execution component
+        this.bashComponent = undefined;
+        // Track pending bash components (shown in pending area, moved to chat on submit)
+        this.pendingBashComponents = [];
+        // Auto-compaction state
+        this.autoCompactionLoader = undefined;
+        // Auto-retry state
+        this.retryLoader = undefined;
+        // Messages queued while compaction is running
+        this.compactionQueuedMessages = [];
+        // Shutdown state
+        this.shutdownRequested = false;
+        // Extension UI state
+        this.extensionSelector = undefined;
+        this.extensionInput = undefined;
+        this.extensionEditor = undefined;
+        this.extensionTerminalInputUnsubscribers = new Set();
+        // Extension widgets (components rendered above/below the editor)
+        this.extensionWidgetsAbove = new Map();
+        this.extensionWidgetsBelow = new Map();
+        // Custom footer from extension (undefined = use built-in footer)
+        this.customFooter = undefined;
+        // Built-in header (logo + keybinding hints + changelog)
+        this.builtInHeader = undefined;
+        // Custom header from extension (undefined = use built-in header)
+        this.customHeader = undefined;
+        /**
+         * Gracefully shutdown the agent.
+         * Emits shutdown event to extensions, then exits.
+         */
+        this.isShuttingDown = false;
         this.session = session;
         this.version = VERSION;
         this.ui = new TUI(new ProcessTerminal(), this.settingsManager.getShowHardwareCursor());
@@ -148,6 +129,7 @@ export class InteractiveMode {
         this.widgetContainerAbove = new Container();
         this.widgetContainerBelow = new Container();
         this.keybindings = KeybindingsManager.create();
+        setKeybindings(this.keybindings);
         const editorPaddingX = this.settingsManager.getEditorPaddingX();
         const autocompleteMaxVisible = this.settingsManager.getAutocompleteMaxVisible();
         this.defaultEditor = new CustomEditor(this.ui, getEditorTheme(), this.keybindings, {
@@ -242,27 +224,26 @@ export class InteractiveMode {
         if (this.options.verbose || !this.settingsManager.getQuietStartup()) {
             const logo = theme.bold(theme.fg("accent", APP_NAME)) + theme.fg("dim", ` v${this.version}`);
             // Build startup instructions using keybinding hint helpers
-            const kb = this.keybindings;
-            const hint = (action, desc) => appKeyHint(kb, action, desc);
+            const hint = (keybinding, description) => keyHint(keybinding, description);
             const instructions = [
-                hint("interrupt", "to interrupt"),
-                hint("clear", "to clear"),
-                rawKeyHint(`${appKey(kb, "clear")} twice`, "to exit"),
-                hint("exit", "to exit (empty)"),
-                hint("suspend", "to suspend"),
-                keyHint("deleteToLineEnd", "to delete to end"),
-                hint("cycleThinkingLevel", "to cycle thinking level"),
-                rawKeyHint(`${appKey(kb, "cycleModelForward")}/${appKey(kb, "cycleModelBackward")}`, "to cycle models"),
-                hint("selectModel", "to select model"),
-                hint("expandTools", "to expand tools"),
-                hint("toggleThinking", "to expand thinking"),
-                hint("externalEditor", "for external editor"),
+                hint("app.interrupt", "to interrupt"),
+                hint("app.clear", "to clear"),
+                rawKeyHint(`${keyText("app.clear")} twice`, "to exit"),
+                hint("app.exit", "to exit (empty)"),
+                hint("app.suspend", "to suspend"),
+                keyHint("tui.editor.deleteToLineEnd", "to delete to end"),
+                hint("app.thinking.cycle", "to cycle thinking level"),
+                rawKeyHint(`${keyText("app.model.cycleForward")}/${keyText("app.model.cycleBackward")}`, "to cycle models"),
+                hint("app.model.select", "to select model"),
+                hint("app.tools.expand", "to expand tools"),
+                hint("app.thinking.toggle", "to expand thinking"),
+                hint("app.editor.external", "for external editor"),
                 rawKeyHint("/", "for commands"),
                 rawKeyHint("!", "to run bash"),
                 rawKeyHint("!!", "to run bash (no context)"),
-                hint("followUp", "to queue follow-up"),
-                hint("dequeue", "to edit all queued messages"),
-                hint("pasteImage", "to paste image"),
+                hint("app.message.followUp", "to queue follow-up"),
+                hint("app.message.dequeue", "to edit all queued messages"),
+                hint("app.clipboard.pasteImage", "to paste image"),
                 rawKeyHint("drop files", "to attach"),
             ].join("\n");
             this.builtInHeader = new Text(`${logo}\n${instructions}`, 1, 0);
@@ -1049,11 +1030,11 @@ export class InteractiveMode {
         this.defaultEditor.onExtensionShortcut = undefined;
         this.updateTerminalTitle();
         if (this.loadingAnimation) {
-            this.loadingAnimation.setMessage(`${this.defaultWorkingMessage} (${appKey(this.keybindings, "interrupt")} to interrupt)`);
+            this.loadingAnimation.setMessage(`${this.defaultWorkingMessage} (${keyText("app.interrupt")} to interrupt)`);
         }
     }
     // Maximum total widget lines to prevent viewport overflow
-    static MAX_WIDGET_LINES = 10;
+    static { this.MAX_WIDGET_LINES = 10; }
     /**
      * Render all extension widgets to the widget container.
      */
@@ -1172,7 +1153,7 @@ export class InteractiveMode {
                         this.loadingAnimation.setMessage(message);
                     }
                     else {
-                        this.loadingAnimation.setMessage(`${this.defaultWorkingMessage} (${appKey(this.keybindings, "interrupt")} to interrupt)`);
+                        this.loadingAnimation.setMessage(`${this.defaultWorkingMessage} (${keyText("app.interrupt")} to interrupt)`);
                     }
                 }
                 else {
@@ -1530,24 +1511,24 @@ export class InteractiveMode {
             }
         };
         // Register app action handlers
-        this.defaultEditor.onAction("clear", () => this.handleCtrlC());
+        this.defaultEditor.onAction("app.clear", () => this.handleCtrlC());
         this.defaultEditor.onCtrlD = () => this.handleCtrlD();
-        this.defaultEditor.onAction("suspend", () => this.handleCtrlZ());
-        this.defaultEditor.onAction("cycleThinkingLevel", () => this.cycleThinkingLevel());
-        this.defaultEditor.onAction("cycleModelForward", () => this.cycleModel("forward"));
-        this.defaultEditor.onAction("cycleModelBackward", () => this.cycleModel("backward"));
+        this.defaultEditor.onAction("app.suspend", () => this.handleCtrlZ());
+        this.defaultEditor.onAction("app.thinking.cycle", () => this.cycleThinkingLevel());
+        this.defaultEditor.onAction("app.model.cycleForward", () => this.cycleModel("forward"));
+        this.defaultEditor.onAction("app.model.cycleBackward", () => this.cycleModel("backward"));
         // Global debug handler on TUI (works regardless of focus)
         this.ui.onDebug = () => this.handleDebugCommand();
-        this.defaultEditor.onAction("selectModel", () => this.showModelSelector());
-        this.defaultEditor.onAction("expandTools", () => this.toggleToolOutputExpansion());
-        this.defaultEditor.onAction("toggleThinking", () => this.toggleThinkingBlockVisibility());
-        this.defaultEditor.onAction("externalEditor", () => this.openExternalEditor());
-        this.defaultEditor.onAction("followUp", () => this.handleFollowUp());
-        this.defaultEditor.onAction("dequeue", () => this.handleDequeue());
-        this.defaultEditor.onAction("newSession", () => this.handleClearCommand());
-        this.defaultEditor.onAction("tree", () => this.showTreeSelector());
-        this.defaultEditor.onAction("fork", () => this.showUserMessageSelector());
-        this.defaultEditor.onAction("resume", () => this.showSessionSelector());
+        this.defaultEditor.onAction("app.model.select", () => this.showModelSelector());
+        this.defaultEditor.onAction("app.tools.expand", () => this.toggleToolOutputExpansion());
+        this.defaultEditor.onAction("app.thinking.toggle", () => this.toggleThinkingBlockVisibility());
+        this.defaultEditor.onAction("app.editor.external", () => this.openExternalEditor());
+        this.defaultEditor.onAction("app.message.followUp", () => this.handleFollowUp());
+        this.defaultEditor.onAction("app.message.dequeue", () => this.handleDequeue());
+        this.defaultEditor.onAction("app.session.new", () => this.handleClearCommand());
+        this.defaultEditor.onAction("app.session.tree", () => this.showTreeSelector());
+        this.defaultEditor.onAction("app.session.fork", () => this.showUserMessageSelector());
+        this.defaultEditor.onAction("app.session.resume", () => this.showSessionSelector());
         this.defaultEditor.onChange = (text) => {
             const wasBashMode = this.isBashMode;
             this.isBashMode = text.trimStart().startsWith("!");
@@ -1607,13 +1588,18 @@ export class InteractiveMode {
                 this.editor.setText("");
                 return;
             }
+            if (text.startsWith("/import")) {
+                await this.handleImportCommand(text);
+                this.editor.setText("");
+                return;
+            }
             if (text === "/share") {
                 await this.handleShareCommand();
                 this.editor.setText("");
                 return;
             }
             if (text === "/copy") {
-                this.handleCopyCommand();
+                await this.handleCopyCommand();
                 this.editor.setText("");
                 return;
             }
@@ -1861,15 +1847,17 @@ export class InteractiveMode {
                 this.ui.requestRender();
                 break;
             case "tool_execution_start": {
-                if (!this.pendingTools.has(event.toolCallId)) {
-                    const component = new ToolExecutionComponent(event.toolName, event.args, {
+                let component = this.pendingTools.get(event.toolCallId);
+                if (!component) {
+                    component = new ToolExecutionComponent(event.toolName, event.args, {
                         showImages: this.settingsManager.getShowImages(),
                     }, this.getRegisteredToolDefinition(event.toolName), this.ui);
                     component.setExpanded(this.toolOutputExpanded);
                     this.chatContainer.addChild(component);
                     this.pendingTools.set(event.toolCallId, component);
-                    this.ui.requestRender();
                 }
+                component.markExecutionStarted();
+                this.ui.requestRender();
                 break;
             }
             case "tool_execution_update": {
@@ -1914,7 +1902,7 @@ export class InteractiveMode {
                 // Show compacting indicator with reason
                 this.statusContainer.clear();
                 const reasonText = event.reason === "overflow" ? "Context overflow detected, " : "";
-                this.autoCompactionLoader = new Loader(this.ui, (spinner) => theme.fg("accent", spinner), (text) => theme.fg("muted", text), `${reasonText}Auto-compacting... (${appKey(this.keybindings, "interrupt")} to cancel)`);
+                this.autoCompactionLoader = new Loader(this.ui, (spinner) => theme.fg("accent", spinner), (text) => theme.fg("muted", text), `${reasonText}Auto-compacting... (${keyText("app.interrupt")} to cancel)`);
                 this.statusContainer.addChild(this.autoCompactionLoader);
                 this.ui.requestRender();
                 break;
@@ -1966,7 +1954,7 @@ export class InteractiveMode {
                 // Show retry indicator
                 this.statusContainer.clear();
                 const delaySeconds = Math.round(event.delayMs / 1000);
-                this.retryLoader = new Loader(this.ui, (spinner) => theme.fg("warning", spinner), (text) => theme.fg("muted", text), `Retrying (${event.attempt}/${event.maxAttempts}) in ${delaySeconds}s... (${appKey(this.keybindings, "interrupt")} to cancel)`);
+                this.retryLoader = new Loader(this.ui, (spinner) => theme.fg("warning", spinner), (text) => theme.fg("muted", text), `Retrying (${event.attempt}/${event.maxAttempts}) in ${delaySeconds}s... (${keyText("app.interrupt")} to cancel)`);
                 this.statusContainer.addChild(this.retryLoader);
                 this.ui.requestRender();
                 break;
@@ -2201,11 +2189,6 @@ export class InteractiveMode {
         // Only called when editor is empty (enforced by CustomEditor)
         void this.shutdown();
     }
-    /**
-     * Gracefully shutdown the agent.
-     * Emits shutdown event to extensions, then exits.
-     */
-    isShuttingDown = false;
     async shutdown() {
         if (this.isShuttingDown)
             return;
@@ -2235,20 +2218,32 @@ export class InteractiveMode {
         await this.shutdown();
     }
     handleCtrlZ() {
+        // Keep the event loop alive while suspended. Without this, stopping the TUI
+        // can leave Node with no ref'ed handles, causing the process to exit on fg
+        // before the SIGCONT handler gets a chance to restore the terminal.
+        const suspendKeepAlive = setInterval(() => { }, 2 ** 30);
         // Ignore SIGINT while suspended so Ctrl+C in the terminal does not
         // kill the backgrounded process. The handler is removed on resume.
         const ignoreSigint = () => { };
         process.on("SIGINT", ignoreSigint);
         // Set up handler to restore TUI when resumed
         process.once("SIGCONT", () => {
+            clearInterval(suspendKeepAlive);
             process.removeListener("SIGINT", ignoreSigint);
             this.ui.start();
             this.ui.requestRender(true);
         });
-        // Stop the TUI (restore terminal to normal mode)
-        this.ui.stop();
-        // Send SIGTSTP to process group (pid=0 means all processes in group)
-        process.kill(0, "SIGTSTP");
+        try {
+            // Stop the TUI (restore terminal to normal mode)
+            this.ui.stop();
+            // Send SIGTSTP to process group (pid=0 means all processes in group)
+            process.kill(0, "SIGTSTP");
+        }
+        catch (error) {
+            clearInterval(suspendKeepAlive);
+            process.removeListener("SIGINT", ignoreSigint);
+            throw error;
+        }
     }
     async handleFollowUp() {
         const text = (this.editor.getExpandedText?.() ?? this.editor.getText()).trim();
@@ -2481,7 +2476,7 @@ export class InteractiveMode {
                 const text = theme.fg("dim", `Follow-up: ${message}`);
                 this.pendingMessagesContainer.addChild(new TruncatedText(text, 1, 0));
             }
-            const dequeueHint = this.getAppKeyDisplay("dequeue");
+            const dequeueHint = this.getAppKeyDisplay("app.message.dequeue");
             const hintText = theme.fg("dim", `↳ ${dequeueHint} to edit all queued messages`);
             this.pendingMessagesContainer.addChild(new TruncatedText(hintText, 1, 0));
         }
@@ -3003,7 +2998,7 @@ export class InteractiveMode {
                         this.session.abortBranchSummary();
                     };
                     this.chatContainer.addChild(new Spacer(1));
-                    summaryLoader = new Loader(this.ui, (spinner) => theme.fg("accent", spinner), (text) => theme.fg("muted", text), `Summarizing branch... (${appKey(this.keybindings, "interrupt")} to cancel)`);
+                    summaryLoader = new Loader(this.ui, (spinner) => theme.fg("accent", spinner), (text) => theme.fg("muted", text), `Summarizing branch... (${keyText("app.interrupt")} to cancel)`);
                     this.statusContainer.addChild(summaryLoader);
                     this.ui.requestRender();
                 }
@@ -3285,13 +3280,58 @@ export class InteractiveMode {
         const parts = text.split(/\s+/);
         const outputPath = parts.length > 1 ? parts[1] : undefined;
         try {
-            const filePath = await this.session.exportToHtml(outputPath);
-            this.showStatus(`Session exported to: ${filePath}`);
+            if (outputPath?.endsWith(".jsonl")) {
+                const filePath = this.session.exportToJsonl(outputPath);
+                this.showStatus(`Session exported to: ${filePath}`);
+            }
+            else {
+                const filePath = await this.session.exportToHtml(outputPath);
+                this.showStatus(`Session exported to: ${filePath}`);
+            }
         }
         catch (error) {
             this.showError(`Failed to export session: ${error instanceof Error ? error.message : "Unknown error"}`);
         }
     }
+    async handleImportCommand(text) {
+        const parts = text.split(/\s+/);
+        if (parts.length < 2 || !parts[1]) {
+            this.showError("Usage: /import <path.jsonl>");
+            return;
+        }
+        const inputPath = parts[1];
+        const confirmed = await this.showExtensionConfirm("Import session", `Replace current session with ${inputPath}?`);
+        if (!confirmed) {
+            this.showStatus("Import cancelled");
+            return;
+        }
+        try {
+            // Stop loading animation
+            if (this.loadingAnimation) {
+                this.loadingAnimation.stop();
+                this.loadingAnimation = undefined;
+            }
+            this.statusContainer.clear();
+            // Clear UI state
+            this.pendingMessagesContainer.clear();
+            this.compactionQueuedMessages = [];
+            this.streamingComponent = undefined;
+            this.streamingMessage = undefined;
+            this.pendingTools.clear();
+            const success = await this.session.importFromJsonl(inputPath);
+            if (!success) {
+                this.showWarning("Import cancelled");
+                return;
+            }
+            // Clear and re-render the chat
+            this.chatContainer.clear();
+            this.renderInitialMessages();
+            this.showStatus(`Session imported from: ${inputPath}`);
+        }
+        catch (error) {
+            this.showError(`Failed to import session: ${error instanceof Error ? error.message : "Unknown error"}`);
+        }
+    }
     async handleShareCommand() {
         // Check if gh is available and logged in
         try {
@@ -3379,14 +3419,14 @@ export class InteractiveMode {
             }
         }
     }
-    handleCopyCommand() {
+    async handleCopyCommand() {
         const text = this.session.getLastAssistantText();
         if (!text) {
             this.showError("No agent messages to copy yet.");
             return;
         }
         try {
-            copyToClipboard(text);
+            await copyToClipboard(text);
             this.showStatus("Copied last agent message to clipboard");
         }
         catch (error) {
@@ -3479,54 +3519,54 @@ export class InteractiveMode {
      * Get capitalized display string for an app keybinding action.
      */
     getAppKeyDisplay(action) {
-        return this.capitalizeKey(appKey(this.keybindings, action));
+        return this.capitalizeKey(keyText(action));
     }
     /**
      * Get capitalized display string for an editor keybinding action.
      */
     getEditorKeyDisplay(action) {
-        return this.capitalizeKey(editorKey(action));
+        return this.capitalizeKey(keyText(action));
     }
     handleHotkeysCommand() {
         // Navigation keybindings
-        const cursorUp = this.getEditorKeyDisplay("cursorUp");
-        const cursorDown = this.getEditorKeyDisplay("cursorDown");
-        const cursorLeft = this.getEditorKeyDisplay("cursorLeft");
-        const cursorRight = this.getEditorKeyDisplay("cursorRight");
-        const cursorWordLeft = this.getEditorKeyDisplay("cursorWordLeft");
-        const cursorWordRight = this.getEditorKeyDisplay("cursorWordRight");
-        const cursorLineStart = this.getEditorKeyDisplay("cursorLineStart");
-        const cursorLineEnd = this.getEditorKeyDisplay("cursorLineEnd");
-        const jumpForward = this.getEditorKeyDisplay("jumpForward");
-        const jumpBackward = this.getEditorKeyDisplay("jumpBackward");
-        const pageUp = this.getEditorKeyDisplay("pageUp");
-        const pageDown = this.getEditorKeyDisplay("pageDown");
+        const cursorUp = this.getEditorKeyDisplay("tui.editor.cursorUp");
+        const cursorDown = this.getEditorKeyDisplay("tui.editor.cursorDown");
+        const cursorLeft = this.getEditorKeyDisplay("tui.editor.cursorLeft");
+        const cursorRight = this.getEditorKeyDisplay("tui.editor.cursorRight");
+        const cursorWordLeft = this.getEditorKeyDisplay("tui.editor.cursorWordLeft");
+        const cursorWordRight = this.getEditorKeyDisplay("tui.editor.cursorWordRight");
+        const cursorLineStart = this.getEditorKeyDisplay("tui.editor.cursorLineStart");
+        const cursorLineEnd = this.getEditorKeyDisplay("tui.editor.cursorLineEnd");
+        const jumpForward = this.getEditorKeyDisplay("tui.editor.jumpForward");
+        const jumpBackward = this.getEditorKeyDisplay("tui.editor.jumpBackward");
+        const pageUp = this.getEditorKeyDisplay("tui.editor.pageUp");
+        const pageDown = this.getEditorKeyDisplay("tui.editor.pageDown");
         // Editing keybindings
-        const submit = this.getEditorKeyDisplay("submit");
-        const newLine = this.getEditorKeyDisplay("newLine");
-        const deleteWordBackward = this.getEditorKeyDisplay("deleteWordBackward");
-        const deleteWordForward = this.getEditorKeyDisplay("deleteWordForward");
-        const deleteToLineStart = this.getEditorKeyDisplay("deleteToLineStart");
-        const deleteToLineEnd = this.getEditorKeyDisplay("deleteToLineEnd");
-        const yank = this.getEditorKeyDisplay("yank");
-        const yankPop = this.getEditorKeyDisplay("yankPop");
-        const undo = this.getEditorKeyDisplay("undo");
-        const tab = this.getEditorKeyDisplay("tab");
+        const submit = this.getEditorKeyDisplay("tui.input.submit");
+        const newLine = this.getEditorKeyDisplay("tui.input.newLine");
+        const deleteWordBackward = this.getEditorKeyDisplay("tui.editor.deleteWordBackward");
+        const deleteWordForward = this.getEditorKeyDisplay("tui.editor.deleteWordForward");
+        const deleteToLineStart = this.getEditorKeyDisplay("tui.editor.deleteToLineStart");
+        const deleteToLineEnd = this.getEditorKeyDisplay("tui.editor.deleteToLineEnd");
+        const yank = this.getEditorKeyDisplay("tui.editor.yank");
+        const yankPop = this.getEditorKeyDisplay("tui.editor.yankPop");
+        const undo = this.getEditorKeyDisplay("tui.editor.undo");
+        const tab = this.getEditorKeyDisplay("tui.input.tab");
         // App keybindings
-        const interrupt = this.getAppKeyDisplay("interrupt");
-        const clear = this.getAppKeyDisplay("clear");
-        const exit = this.getAppKeyDisplay("exit");
-        const suspend = this.getAppKeyDisplay("suspend");
-        const cycleThinkingLevel = this.getAppKeyDisplay("cycleThinkingLevel");
-        const cycleModelForward = this.getAppKeyDisplay("cycleModelForward");
-        const selectModel = this.getAppKeyDisplay("selectModel");
-        const expandTools = this.getAppKeyDisplay("expandTools");
-        const toggleThinking = this.getAppKeyDisplay("toggleThinking");
-        const externalEditor = this.getAppKeyDisplay("externalEditor");
-        const cycleModelBackward = this.getAppKeyDisplay("cycleModelBackward");
-        const followUp = this.getAppKeyDisplay("followUp");
-        const dequeue = this.getAppKeyDisplay("dequeue");
-        const pasteImage = this.getAppKeyDisplay("pasteImage");
+        const interrupt = this.getAppKeyDisplay("app.interrupt");
+        const clear = this.getAppKeyDisplay("app.clear");
+        const exit = this.getAppKeyDisplay("app.exit");
+        const suspend = this.getAppKeyDisplay("app.suspend");
+        const cycleThinkingLevel = this.getAppKeyDisplay("app.thinking.cycle");
+        const cycleModelForward = this.getAppKeyDisplay("app.model.cycleForward");
+        const selectModel = this.getAppKeyDisplay("app.model.select");
+        const expandTools = this.getAppKeyDisplay("app.tools.expand");
+        const toggleThinking = this.getAppKeyDisplay("app.thinking.toggle");
+        const externalEditor = this.getAppKeyDisplay("app.editor.external");
+        const cycleModelBackward = this.getAppKeyDisplay("app.model.cycleBackward");
+        const followUp = this.getAppKeyDisplay("app.message.followUp");
+        const dequeue = this.getAppKeyDisplay("app.message.dequeue");
+        const pasteImage = this.getAppKeyDisplay("app.clipboard.pasteImage");
         let hotkeys = `
 **Navigation**
 | Key | Action |
@@ -3751,7 +3791,7 @@ export class InteractiveMode {
         };
         // Show compacting status
         this.chatContainer.addChild(new Spacer(1));
-        const cancelHint = `(${appKey(this.keybindings, "interrupt")} to cancel)`;
+        const cancelHint = `(${keyText("app.interrupt")} to cancel)`;
         const label = isAuto ? `Auto-compacting context... ${cancelHint}` : `Compacting context... ${cancelHint}`;
         const compactingLoader = new Loader(this.ui, (spinner) => theme.fg("accent", spinner), (text) => theme.fg("muted", text), label);
         this.statusContainer.addChild(compactingLoader);