@draht/coding-agent 2026.3.14 → 2026.3.25-1

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

@@ -6,20 +6,21 @@ 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 "@draht/tui";
+import { CombinedAutocompleteProvider, Container, fuzzyFilter, Loader, Markdown, matchesKey, ProcessTerminal, Spacer, setKeybindings, Text, TruncatedText, TUI, visibleWidth, } from "@draht/tui";
 import { spawn, spawnSync } from "child_process";
-import { APP_NAME, getAuthPath, getDebugLogPath, getShareViewerUrl, getUpdateInstruction, VERSION, } from "../../config.js";
+import { APP_NAME, getAgentDir, getAuthPath, getDebugLogPath, getShareViewerUrl, getUpdateInstruction, VERSION, } from "../../config.js";
 import { parseSkillBlock } from "../../core/agent-session.js";
 import { FooterDataProvider } from "../../core/footer-data-provider.js";
 import { KeybindingsManager } from "../../core/keybindings.js";
 import { createCompactionSummaryMessage } from "../../core/messages.js";
-import { resolveModelScope } from "../../core/model-resolver.js";
+import { findExactModelReferenceMatch, resolveModelScope } from "../../core/model-resolver.js";
+import { DefaultPackageManager } from "../../core/package-manager.js";
 import { SessionManager } from "../../core/session-manager.js";
 import { BUILTIN_SLASH_COMMANDS } from "../../core/slash-commands.js";
 import { getChangelogPath, getNewEntries, parseChangelog } from "../../utils/changelog.js";
 import { copyToClipboard } from "../../utils/clipboard.js";
 import { extensionForImageMimeType, readClipboardImage } from "../../utils/clipboard-image.js";
-import { sendTerminalNotification } from "../../utils/notify.js";
+import { parseGitUrl } from "../../utils/git.js";
 import { ensureTool } from "../../utils/tools-manager.js";
 import { ArminComponent } from "./components/armin.js";
 import { AssistantMessageComponent } from "./components/assistant-message.js";
@@ -35,7 +36,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";
@@ -65,6 +66,7 @@ export class InteractiveMode {
     editorContainer;
     footer;
     footerDataProvider;
+    // Stored so the same manager can be injected into custom editors, selectors, and extension UI.
     keybindings;
     version;
     isInitialized = false;
@@ -148,6 +150,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, {
@@ -166,6 +169,48 @@ export class InteractiveMode {
         setRegisteredThemes(this.session.resourceLoader.getThemes().themes);
         initTheme(this.settingsManager.getTheme(), true);
     }
+    getAutocompleteSourceTag(sourceInfo) {
+        if (!sourceInfo) {
+            return undefined;
+        }
+        const scopePrefix = sourceInfo.scope === "user" ? "u" : sourceInfo.scope === "project" ? "p" : "t";
+        const source = sourceInfo.source.trim();
+        if (source === "auto" || source === "local" || source === "cli") {
+            return scopePrefix;
+        }
+        if (source.startsWith("npm:")) {
+            return `${scopePrefix}:${source}`;
+        }
+        const gitSource = parseGitUrl(source);
+        if (gitSource) {
+            const ref = gitSource.ref ? `@${gitSource.ref}` : "";
+            return `${scopePrefix}:git:${gitSource.host}/${gitSource.path}${ref}`;
+        }
+        return scopePrefix;
+    }
+    prefixAutocompleteDescription(description, sourceInfo) {
+        const sourceTag = this.getAutocompleteSourceTag(sourceInfo);
+        if (!sourceTag) {
+            return description;
+        }
+        return description ? `[${sourceTag}] ${description}` : `[${sourceTag}]`;
+    }
+    getBuiltInCommandConflictDiagnostics(extensionRunner) {
+        if (!extensionRunner) {
+            return [];
+        }
+        const builtinNames = new Set(BUILTIN_SLASH_COMMANDS.map((command) => command.name));
+        return extensionRunner
+            .getRegisteredCommands()
+            .filter((command) => builtinNames.has(command.name))
+            .map((command) => ({
+            type: "warning",
+            message: command.invocationName === command.name
+                ? `Extension command '/${command.name}' conflicts with built-in interactive command. Skipping in autocomplete.`
+                : `Extension command '/${command.name}' conflicts with built-in interactive command. Available as '/${command.invocationName}'.`,
+            path: command.sourceInfo.path,
+        }));
+    }
     setupAutocomplete(fdPath) {
         // Define commands for autocomplete
         const slashCommands = BUILTIN_SLASH_COMMANDS.map((command) => ({
@@ -201,13 +246,13 @@ export class InteractiveMode {
         // Convert prompt templates to SlashCommand format for autocomplete
         const templateCommands = this.session.promptTemplates.map((cmd) => ({
             name: cmd.name,
-            description: cmd.description,
+            description: this.prefixAutocompleteDescription(cmd.description, cmd.sourceInfo),
         }));
         // Convert extension commands to SlashCommand format
         const builtinCommandNames = new Set(slashCommands.map((c) => c.name));
-        const extensionCommands = (this.session.extensionRunner?.getRegisteredCommands(builtinCommandNames) ?? []).map((cmd) => ({
-            name: cmd.name,
-            description: cmd.description ?? "(extension command)",
+        const extensionCommands = (this.session.extensionRunner?.getRegisteredCommands().filter((cmd) => !builtinCommandNames.has(cmd.name)) ?? []).map((cmd) => ({
+            name: cmd.invocationName,
+            description: this.prefixAutocompleteDescription(cmd.description, cmd.sourceInfo),
             getArgumentCompletions: cmd.getArgumentCompletions,
         }));
         // Build skill commands from session.skills (if enabled)
@@ -217,7 +262,10 @@ export class InteractiveMode {
             for (const skill of this.session.resourceLoader.getSkills().skills) {
                 const commandName = `skill:${skill.name}`;
                 this.skillCommands.set(commandName, skill.filePath);
-                skillCommandList.push({ name: commandName, description: skill.description });
+                skillCommandList.push({
+                    name: commandName,
+                    description: this.prefixAutocompleteDescription(skill.description, skill.sourceInfo),
+                });
             }
         }
         // Setup autocomplete
@@ -242,27 +290,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);
@@ -312,13 +359,13 @@ export class InteractiveMode {
         this.ui.setFocus(this.editor);
         this.setupKeyHandlers();
         this.setupEditorSubmitHandler();
+        // Start the UI before initializing extensions so session_start handlers can use interactive dialogs
+        this.ui.start();
+        this.isInitialized = true;
         // Initialize extensions first so resources are shown before messages
         await this.initExtensions();
         // Render initial messages AFTER showing loaded resources
         this.renderInitialMessages();
-        // Start the UI
-        this.ui.start();
-        this.isInitialized = true;
         // Set terminal title
         this.updateTerminalTitle();
         // Subscribe to agent events
@@ -343,10 +390,10 @@ export class InteractiveMode {
         const cwdBasename = path.basename(process.cwd());
         const sessionName = this.sessionManager.getSessionName();
         if (sessionName) {
-            this.ui.terminal.setTitle(`𝗗 - ${sessionName} - ${cwdBasename}`);
+            this.ui.terminal.setTitle(`D - ${sessionName} - ${cwdBasename}`);
         }
         else {
-            this.ui.terminal.setTitle(`𝗗 - ${cwdBasename}`);
+            this.ui.terminal.setTitle(`D - ${cwdBasename}`);
         }
     }
     /**
@@ -361,6 +408,12 @@ export class InteractiveMode {
                 this.showNewVersionNotification(newVersion);
             }
         });
+        // Start package update check asynchronously
+        this.checkForPackageUpdates().then((updates) => {
+            if (updates.length > 0) {
+                this.showPackageUpdateNotification(updates);
+            }
+        });
         // Check tmux keyboard setup asynchronously
         this.checkTmuxKeyboardSetup().then((warning) => {
             if (warning) {
@@ -416,7 +469,7 @@ export class InteractiveMode {
      * Check npm registry for a newer version.
      */
     async checkForNewVersion() {
-        if (process.env.DRAHT_SKIP_VERSION_CHECK || process.env.DRAHT_OFFLINE)
+        if (process.env.PI_SKIP_VERSION_CHECK || process.env.PI_OFFLINE)
             return undefined;
         try {
             const response = await fetch("https://registry.npmjs.org/@draht/coding-agent/latest", {
@@ -435,6 +488,23 @@ export class InteractiveMode {
             return undefined;
         }
     }
+    async checkForPackageUpdates() {
+        if (process.env.PI_OFFLINE) {
+            return [];
+        }
+        try {
+            const packageManager = new DefaultPackageManager({
+                cwd: process.cwd(),
+                agentDir: getAgentDir(),
+                settingsManager: this.settingsManager,
+            });
+            const updates = await packageManager.checkForAvailableUpdates();
+            return updates.map((update) => update.displayName);
+        }
+        catch {
+            return [];
+        }
+    }
     async checkTmuxKeyboardSetup() {
         if (!process.env.TMUX)
             return undefined;
@@ -465,6 +535,9 @@ export class InteractiveMode {
             runTmuxShow("extended-keys"),
             runTmuxShow("extended-keys-format"),
         ]);
+        // If we couldn't query tmux (timeout, sandbox, etc.), don't warn
+        if (extendedKeys === undefined)
+            return undefined;
         if (extendedKeys !== "on" && extendedKeys !== "always") {
             return "tmux extended-keys is off. Modified Enter keys may not work. Add `set -g extended-keys on` to ~/.tmux.conf and restart tmux.";
         }
@@ -520,21 +593,21 @@ export class InteractiveMode {
     /**
      * Get a short path relative to the package root for display.
      */
-    getShortPath(fullPath, source) {
-        // For npm packages, show path relative to node_modules/pkg/
+    getShortPath(fullPath, sourceInfo) {
+        const source = sourceInfo?.source ?? "";
         const npmMatch = fullPath.match(/node_modules\/(@?[^/]+(?:\/[^/]+)?)\/(.*)/);
         if (npmMatch && source.startsWith("npm:")) {
             return npmMatch[2];
         }
-        // For git packages, show path relative to repo root
         const gitMatch = fullPath.match(/git\/[^/]+\/[^/]+\/(.*)/);
         if (gitMatch && source.startsWith("git:")) {
             return gitMatch[1];
         }
-        // For local/auto, just use formatDisplayPath
         return this.formatDisplayPath(fullPath);
     }
-    getDisplaySourceInfo(source, scope) {
+    getDisplaySourceInfo(sourceInfo) {
+        const source = sourceInfo?.source ?? "local";
+        const scope = sourceInfo?.scope ?? "project";
         if (source === "local") {
             if (scope === "user") {
                 return { label: "user", color: "muted" };
@@ -553,7 +626,9 @@ export class InteractiveMode {
         const scopeLabel = scope === "user" ? "user" : scope === "project" ? "project" : scope === "temporary" ? "temp" : undefined;
         return { label: source, scopeLabel, color: "accent" };
     }
-    getScopeGroup(source, scope) {
+    getScopeGroup(sourceInfo) {
+        const source = sourceInfo?.source ?? "local";
+        const scope = sourceInfo?.scope ?? "project";
         if (source === "cli" || scope === "temporary")
             return "path";
         if (scope === "user")
@@ -562,28 +637,27 @@ export class InteractiveMode {
             return "project";
         return "path";
     }
-    isPackageSource(source) {
+    isPackageSource(sourceInfo) {
+        const source = sourceInfo?.source ?? "";
         return source.startsWith("npm:") || source.startsWith("git:");
     }
-    buildScopeGroups(paths, metadata) {
+    buildScopeGroups(items) {
         const groups = {
             user: { scope: "user", paths: [], packages: new Map() },
             project: { scope: "project", paths: [], packages: new Map() },
             path: { scope: "path", paths: [], packages: new Map() },
         };
-        for (const p of paths) {
-            const meta = this.findMetadata(p, metadata);
-            const source = meta?.source ?? "local";
-            const scope = meta?.scope ?? "project";
-            const groupKey = this.getScopeGroup(source, scope);
+        for (const item of items) {
+            const groupKey = this.getScopeGroup(item.sourceInfo);
             const group = groups[groupKey];
-            if (this.isPackageSource(source)) {
+            const source = item.sourceInfo?.source ?? "local";
+            if (this.isPackageSource(item.sourceInfo)) {
                 const list = group.packages.get(source) ?? [];
-                list.push(p);
+                list.push(item);
                 group.packages.set(source, list);
             }
             else {
-                group.paths.push(p);
+                group.paths.push(item);
             }
         }
         return [groups.project, groups.user, groups.path].filter((group) => group.paths.length > 0 || group.packages.size > 0);
@@ -592,57 +666,44 @@ export class InteractiveMode {
         const lines = [];
         for (const group of groups) {
             lines.push(`  ${theme.fg("accent", group.scope)}`);
-            const sortedPaths = [...group.paths].sort((a, b) => a.localeCompare(b));
-            for (const p of sortedPaths) {
-                lines.push(theme.fg("dim", `    ${options.formatPath(p)}`));
+            const sortedPaths = [...group.paths].sort((a, b) => a.path.localeCompare(b.path));
+            for (const item of sortedPaths) {
+                lines.push(theme.fg("dim", `    ${options.formatPath(item)}`));
             }
             const sortedPackages = Array.from(group.packages.entries()).sort(([a], [b]) => a.localeCompare(b));
-            for (const [source, paths] of sortedPackages) {
+            for (const [source, items] of sortedPackages) {
                 lines.push(`    ${theme.fg("mdLink", source)}`);
-                const sortedPackagePaths = [...paths].sort((a, b) => a.localeCompare(b));
-                for (const p of sortedPackagePaths) {
-                    lines.push(theme.fg("dim", `      ${options.formatPackagePath(p, source)}`));
+                const sortedPackagePaths = [...items].sort((a, b) => a.path.localeCompare(b.path));
+                for (const item of sortedPackagePaths) {
+                    lines.push(theme.fg("dim", `      ${options.formatPackagePath(item, source)}`));
                 }
             }
         }
         return lines.join("\n");
     }
-    /**
-     * Find metadata for a path, checking parent directories if exact match fails.
-     * Package manager stores metadata for directories, but we display file paths.
-     */
-    findMetadata(p, metadata) {
-        // Try exact match first
-        const exact = metadata.get(p);
+    findSourceInfoForPath(p, sourceInfos) {
+        const exact = sourceInfos.get(p);
         if (exact)
             return exact;
-        // Try parent directories (package manager stores directory paths)
         let current = p;
         while (current.includes("/")) {
             current = current.substring(0, current.lastIndexOf("/"));
-            const parent = metadata.get(current);
+            const parent = sourceInfos.get(current);
             if (parent)
                 return parent;
         }
         return undefined;
     }
-    /**
-     * Format a path with its source/scope info from metadata.
-     */
-    formatPathWithSource(p, metadata) {
-        const meta = this.findMetadata(p, metadata);
-        if (meta) {
-            const shortPath = this.getShortPath(p, meta.source);
-            const { label, scopeLabel } = this.getDisplaySourceInfo(meta.source, meta.scope);
+    formatPathWithSource(p, sourceInfo) {
+        if (sourceInfo) {
+            const shortPath = this.getShortPath(p, sourceInfo);
+            const { label, scopeLabel } = this.getDisplaySourceInfo(sourceInfo);
             const labelText = scopeLabel ? `${label} (${scopeLabel})` : label;
             return `${labelText} ${shortPath}`;
         }
         return this.formatDisplayPath(p);
     }
-    /**
-     * Format resource diagnostics with nice collision display using metadata.
-     */
-    formatDiagnostics(diagnostics, metadata) {
+    formatDiagnostics(diagnostics, sourceInfos) {
         const lines = [];
         // Group collision diagnostics by name
         const collisions = new Map();
@@ -663,21 +724,17 @@ export class InteractiveMode {
             if (!first)
                 continue;
             lines.push(theme.fg("warning", `  "${name}" collision:`));
-            // Show winner
-            lines.push(theme.fg("dim", `    ${theme.fg("success", "✓")} ${this.formatPathWithSource(first.winnerPath, metadata)}`));
-            // Show all losers
+            lines.push(theme.fg("dim", `    ${theme.fg("success", "✓")} ${this.formatPathWithSource(first.winnerPath, this.findSourceInfoForPath(first.winnerPath, sourceInfos))}`));
             for (const d of collisionList) {
                 if (d.collision) {
-                    lines.push(theme.fg("dim", `    ${theme.fg("warning", "✗")} ${this.formatPathWithSource(d.collision.loserPath, metadata)} (skipped)`));
+                    lines.push(theme.fg("dim", `    ${theme.fg("warning", "✗")} ${this.formatPathWithSource(d.collision.loserPath, this.findSourceInfoForPath(d.collision.loserPath, sourceInfos))} (skipped)`));
                 }
             }
         }
-        // Format other diagnostics (skill name collisions, parse errors, etc.)
         for (const d of otherDiagnostics) {
             if (d.path) {
-                // Use metadata-aware formatting for paths
-                const sourceInfo = this.formatPathWithSource(d.path, metadata);
-                lines.push(theme.fg(d.type === "error" ? "error" : "warning", `  ${sourceInfo}`));
+                const formattedPath = this.formatPathWithSource(d.path, this.findSourceInfoForPath(d.path, sourceInfos));
+                lines.push(theme.fg(d.type === "error" ? "error" : "warning", `  ${formattedPath}`));
                 lines.push(theme.fg(d.type === "error" ? "error" : "warning", `    ${d.message}`));
             }
             else {
@@ -692,11 +749,36 @@ export class InteractiveMode {
         if (!showListing && !showDiagnostics) {
             return;
         }
-        const metadata = this.session.resourceLoader.getPathMetadata();
         const sectionHeader = (name, color = "mdHeading") => theme.fg(color, `[${name}]`);
         const skillsResult = this.session.resourceLoader.getSkills();
         const promptsResult = this.session.resourceLoader.getPrompts();
         const themesResult = this.session.resourceLoader.getThemes();
+        const extensions = options?.extensions ??
+            this.session.resourceLoader.getExtensions().extensions.map((extension) => ({
+                path: extension.path,
+                sourceInfo: extension.sourceInfo,
+            }));
+        const sourceInfos = new Map();
+        for (const extension of extensions) {
+            if (extension.sourceInfo) {
+                sourceInfos.set(extension.path, extension.sourceInfo);
+            }
+        }
+        for (const skill of skillsResult.skills) {
+            if (skill.sourceInfo) {
+                sourceInfos.set(skill.filePath, skill.sourceInfo);
+            }
+        }
+        for (const prompt of promptsResult.prompts) {
+            if (prompt.sourceInfo) {
+                sourceInfos.set(prompt.filePath, prompt.sourceInfo);
+            }
+        }
+        for (const loadedTheme of themesResult.themes) {
+            if (loadedTheme.sourcePath && loadedTheme.sourceInfo) {
+                sourceInfos.set(loadedTheme.sourcePath, loadedTheme.sourceInfo);
+            }
+        }
         if (showListing) {
             const contextFiles = this.session.resourceLoader.getAgentsFiles().agentsFiles;
             if (contextFiles.length > 0) {
@@ -709,39 +791,36 @@ export class InteractiveMode {
             }
             const skills = skillsResult.skills;
             if (skills.length > 0) {
-                const skillPaths = skills.map((s) => s.filePath);
-                const groups = this.buildScopeGroups(skillPaths, metadata);
+                const groups = this.buildScopeGroups(skills.map((skill) => ({ path: skill.filePath, sourceInfo: skill.sourceInfo })));
                 const skillList = this.formatScopeGroups(groups, {
-                    formatPath: (p) => this.formatDisplayPath(p),
-                    formatPackagePath: (p, source) => this.getShortPath(p, source),
+                    formatPath: (item) => this.formatDisplayPath(item.path),
+                    formatPackagePath: (item) => this.getShortPath(item.path, item.sourceInfo),
                 });
                 this.chatContainer.addChild(new Text(`${sectionHeader("Skills")}\n${skillList}`, 0, 0));
                 this.chatContainer.addChild(new Spacer(1));
             }
             const templates = this.session.promptTemplates;
             if (templates.length > 0) {
-                const templatePaths = templates.map((t) => t.filePath);
-                const groups = this.buildScopeGroups(templatePaths, metadata);
+                const groups = this.buildScopeGroups(templates.map((template) => ({ path: template.filePath, sourceInfo: template.sourceInfo })));
                 const templateByPath = new Map(templates.map((t) => [t.filePath, t]));
                 const templateList = this.formatScopeGroups(groups, {
-                    formatPath: (p) => {
-                        const template = templateByPath.get(p);
-                        return template ? `/${template.name}` : this.formatDisplayPath(p);
+                    formatPath: (item) => {
+                        const template = templateByPath.get(item.path);
+                        return template ? `/${template.name}` : this.formatDisplayPath(item.path);
                     },
-                    formatPackagePath: (p) => {
-                        const template = templateByPath.get(p);
-                        return template ? `/${template.name}` : this.formatDisplayPath(p);
+                    formatPackagePath: (item) => {
+                        const template = templateByPath.get(item.path);
+                        return template ? `/${template.name}` : this.formatDisplayPath(item.path);
                     },
                 });
                 this.chatContainer.addChild(new Text(`${sectionHeader("Prompts")}\n${templateList}`, 0, 0));
                 this.chatContainer.addChild(new Spacer(1));
             }
-            const extensionPaths = options?.extensionPaths ?? [];
-            if (extensionPaths.length > 0) {
-                const groups = this.buildScopeGroups(extensionPaths, metadata);
+            if (extensions.length > 0) {
+                const groups = this.buildScopeGroups(extensions);
                 const extList = this.formatScopeGroups(groups, {
-                    formatPath: (p) => this.formatDisplayPath(p),
-                    formatPackagePath: (p, source) => this.getShortPath(p, source),
+                    formatPath: (item) => this.formatDisplayPath(item.path),
+                    formatPackagePath: (item) => this.getShortPath(item.path, item.sourceInfo),
                 });
                 this.chatContainer.addChild(new Text(`${sectionHeader("Extensions", "mdHeading")}\n${extList}`, 0, 0));
                 this.chatContainer.addChild(new Spacer(1));
@@ -750,11 +829,13 @@ export class InteractiveMode {
             const loadedThemes = themesResult.themes;
             const customThemes = loadedThemes.filter((t) => t.sourcePath);
             if (customThemes.length > 0) {
-                const themePaths = customThemes.map((t) => t.sourcePath);
-                const groups = this.buildScopeGroups(themePaths, metadata);
+                const groups = this.buildScopeGroups(customThemes.map((loadedTheme) => ({
+                    path: loadedTheme.sourcePath,
+                    sourceInfo: loadedTheme.sourceInfo,
+                })));
                 const themeList = this.formatScopeGroups(groups, {
-                    formatPath: (p) => this.formatDisplayPath(p),
-                    formatPackagePath: (p, source) => this.getShortPath(p, source),
+                    formatPath: (item) => this.formatDisplayPath(item.path),
+                    formatPackagePath: (item) => this.getShortPath(item.path, item.sourceInfo),
                 });
                 this.chatContainer.addChild(new Text(`${sectionHeader("Themes")}\n${themeList}`, 0, 0));
                 this.chatContainer.addChild(new Spacer(1));
@@ -763,13 +844,13 @@ export class InteractiveMode {
         if (showDiagnostics) {
             const skillDiagnostics = skillsResult.diagnostics;
             if (skillDiagnostics.length > 0) {
-                const warningLines = this.formatDiagnostics(skillDiagnostics, metadata);
+                const warningLines = this.formatDiagnostics(skillDiagnostics, sourceInfos);
                 this.chatContainer.addChild(new Text(`${theme.fg("warning", "[Skill conflicts]")}\n${warningLines}`, 0, 0));
                 this.chatContainer.addChild(new Spacer(1));
             }
             const promptDiagnostics = promptsResult.diagnostics;
             if (promptDiagnostics.length > 0) {
-                const warningLines = this.formatDiagnostics(promptDiagnostics, metadata);
+                const warningLines = this.formatDiagnostics(promptDiagnostics, sourceInfos);
                 this.chatContainer.addChild(new Text(`${theme.fg("warning", "[Prompt conflicts]")}\n${warningLines}`, 0, 0));
                 this.chatContainer.addChild(new Spacer(1));
             }
@@ -782,16 +863,17 @@ export class InteractiveMode {
             }
             const commandDiagnostics = this.session.extensionRunner?.getCommandDiagnostics() ?? [];
             extensionDiagnostics.push(...commandDiagnostics);
+            extensionDiagnostics.push(...this.getBuiltInCommandConflictDiagnostics(this.session.extensionRunner));
             const shortcutDiagnostics = this.session.extensionRunner?.getShortcutDiagnostics() ?? [];
             extensionDiagnostics.push(...shortcutDiagnostics);
             if (extensionDiagnostics.length > 0) {
-                const warningLines = this.formatDiagnostics(extensionDiagnostics, metadata);
+                const warningLines = this.formatDiagnostics(extensionDiagnostics, sourceInfos);
                 this.chatContainer.addChild(new Text(`${theme.fg("warning", "[Extension issues]")}\n${warningLines}`, 0, 0));
                 this.chatContainer.addChild(new Spacer(1));
             }
             const themeDiagnostics = themesResult.diagnostics;
             if (themeDiagnostics.length > 0) {
-                const warningLines = this.formatDiagnostics(themeDiagnostics, metadata);
+                const warningLines = this.formatDiagnostics(themeDiagnostics, sourceInfos);
                 this.chatContainer.addChild(new Text(`${theme.fg("warning", "[Theme conflicts]")}\n${warningLines}`, 0, 0));
                 this.chatContainer.addChild(new Spacer(1));
             }
@@ -880,19 +962,17 @@ export class InteractiveMode {
         this.setupAutocomplete(this.fdPath);
         const extensionRunner = this.session.extensionRunner;
         if (!extensionRunner) {
-            this.showLoadedResources({ extensionPaths: [], force: false });
+            this.showLoadedResources({ extensions: [], force: false });
             return;
         }
         this.setupExtensionShortcuts(extensionRunner);
-        this.showLoadedResources({ extensionPaths: extensionRunner.getExtensionPaths(), force: false });
+        this.showLoadedResources({ force: false });
     }
     /**
      * Get a registered tool definition by name (for custom rendering).
      */
     getRegisteredToolDefinition(toolName) {
-        const tools = this.session.extensionRunner?.getAllRegisteredTools() ?? [];
-        const registeredTool = tools.find((t) => t.definition.name === toolName);
-        return registeredTool?.definition;
+        return this.session.getToolDefinition(toolName);
     }
     /**
      * Set up keyboard shortcuts registered by extensions.
@@ -1023,7 +1103,7 @@ 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
@@ -1146,7 +1226,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 {
@@ -1161,7 +1241,7 @@ export class InteractiveMode {
             custom: (factory, options) => this.showExtensionCustom(factory, options),
             pasteToEditor: (text) => this.editor.handleInput(`\x1b[200~${text}\x1b[201~`),
             setEditorText: (text) => this.editor.setText(text),
-            getEditorText: () => this.editor.getText(),
+            getEditorText: () => this.editor.getExpandedText?.() ?? this.editor.getText(),
             editor: (title, prefill) => this.showExtensionEditor(title, prefill),
             setEditorComponent: (factory) => this.setCustomEditorComponent(factory),
             get theme() {
@@ -1504,24 +1584,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("!");
@@ -1581,13 +1661,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;
             }
@@ -1777,7 +1862,7 @@ export class InteractiveMode {
                     for (const content of this.streamingMessage.content) {
                         if (content.type === "toolCall") {
                             if (!this.pendingTools.has(content.id)) {
-                                const component = new ToolExecutionComponent(content.name, content.arguments, {
+                                const component = new ToolExecutionComponent(content.name, content.id, content.arguments, {
                                     showImages: this.settingsManager.getShowImages(),
                                 }, this.getRegisteredToolDefinition(content.name), this.ui);
                                 component.setExpanded(this.toolOutputExpanded);
@@ -1835,15 +1920,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.toolCallId, 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": {
@@ -1876,7 +1963,6 @@ export class InteractiveMode {
                 }
                 this.pendingTools.clear();
                 await this.checkShutdownRequested();
-                sendTerminalNotification(APP_NAME, "Ready for input");
                 this.ui.requestRender();
                 break;
             case "auto_compaction_start": {
@@ -1889,7 +1975,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;
@@ -1941,7 +2027,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;
@@ -2092,7 +2178,7 @@ export class InteractiveMode {
                 // Render tool call components
                 for (const content of message.content) {
                     if (content.type === "toolCall") {
-                        const component = new ToolExecutionComponent(content.name, content.arguments, { showImages: this.settingsManager.getShowImages() }, this.getRegisteredToolDefinition(content.name), this.ui);
+                        const component = new ToolExecutionComponent(content.name, content.id, content.arguments, { showImages: this.settingsManager.getShowImages() }, this.getRegisteredToolDefinition(content.name), this.ui);
                         component.setExpanded(this.toolOutputExpanded);
                         this.chatContainer.addChild(component);
                         if (message.stopReason === "aborted" || message.stopReason === "error") {
@@ -2210,20 +2296,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();
@@ -2337,7 +2435,7 @@ export class InteractiveMode {
             return;
         }
         const currentText = this.editor.getExpandedText?.() ?? this.editor.getText();
-        const tmpFile = path.join(os.tmpdir(), `draht-editor-${Date.now()}.draht.md`);
+        const tmpFile = path.join(os.tmpdir(), `pi-editor-${Date.now()}.pi.md`);
         try {
             // Write current content to temp file
             fs.writeFileSync(tmpFile, currentText, "utf-8");
@@ -2399,6 +2497,16 @@ export class InteractiveMode {
         this.chatContainer.addChild(new DynamicBorder((text) => theme.fg("warning", text)));
         this.ui.requestRender();
     }
+    showPackageUpdateNotification(packages) {
+        const action = theme.fg("accent", `${APP_NAME} update`);
+        const updateInstruction = theme.fg("muted", "Package updates are available. Run ") + action;
+        const packageLines = packages.map((pkg) => `- ${pkg}`).join("\n");
+        this.chatContainer.addChild(new Spacer(1));
+        this.chatContainer.addChild(new DynamicBorder((text) => theme.fg("warning", text)));
+        this.chatContainer.addChild(new Text(`${theme.bold(theme.fg("warning", "Package Updates Available"))}\n${updateInstruction}\n${theme.fg("muted", "Packages:")}\n${packageLines}`, 1, 0));
+        this.chatContainer.addChild(new DynamicBorder((text) => theme.fg("warning", text)));
+        this.ui.requestRender();
+    }
     /**
      * Get all queued messages (read-only).
      * Combines session queue and compaction queue.
@@ -2446,7 +2554,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));
         }
@@ -2736,28 +2844,8 @@ export class InteractiveMode {
         this.showModelSelector(searchTerm);
     }
     async findExactModelMatch(searchTerm) {
-        const term = searchTerm.trim();
-        if (!term)
-            return undefined;
-        let targetProvider;
-        let targetModelId = "";
-        if (term.includes("/")) {
-            const parts = term.split("/", 2);
-            targetProvider = parts[0]?.trim().toLowerCase();
-            targetModelId = parts[1]?.trim().toLowerCase() ?? "";
-        }
-        else {
-            targetModelId = term.toLowerCase();
-        }
-        if (!targetModelId)
-            return undefined;
         const models = await this.getModelCandidates();
-        const exactMatches = models.filter((item) => {
-            const idMatch = item.id.toLowerCase() === targetModelId;
-            const providerMatch = !targetProvider || item.provider.toLowerCase() === targetProvider;
-            return idMatch && providerMatch;
-        });
-        return exactMatches.length === 1 ? exactMatches[0] : undefined;
+        return findExactModelReferenceMatch(searchTerm, models);
     }
     async getModelCandidates() {
         if (this.session.scopedModels.length > 0) {
@@ -2988,7 +3076,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();
                 }
@@ -3208,7 +3296,7 @@ export class InteractiveMode {
             return;
         }
         this.resetExtensionUI();
-        const loader = new BorderedLoader(this.ui, theme, "Reloading extensions, skills, prompts, themes...", {
+        const loader = new BorderedLoader(this.ui, theme, "Reloading keybindings, extensions, skills, prompts, themes...", {
             cancellable: false,
         });
         const previousEditor = this.editor;
@@ -3225,6 +3313,7 @@ export class InteractiveMode {
         };
         try {
             await this.session.reload();
+            this.keybindings.reload();
             setRegisteredThemes(this.session.resourceLoader.getThemes().themes);
             this.hideThinkingBlock = this.settingsManager.getHideThinkingBlock();
             const themeName = this.settingsManager.getTheme();
@@ -3250,7 +3339,6 @@ export class InteractiveMode {
             this.rebuildChatFromMessages();
             dismissLoader(this.editor);
             this.showLoadedResources({
-                extensionPaths: runner?.getExtensionPaths() ?? [],
                 force: false,
                 showDiagnosticsWhenQuiet: true,
             });
@@ -3258,7 +3346,7 @@ export class InteractiveMode {
             if (modelsJsonError) {
                 this.showError(`models.json error: ${modelsJsonError}`);
             }
-            this.showStatus("Reloaded extensions, skills, prompts, themes");
+            this.showStatus("Reloaded keybindings, extensions, skills, prompts, themes");
         }
         catch (error) {
             dismissLoader(previousEditor);
@@ -3269,13 +3357,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 {
@@ -3363,14 +3496,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) {
@@ -3463,53 +3596,59 @@ 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 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 followUp = this.getAppKeyDisplay("followUp");
-        const dequeue = this.getAppKeyDisplay("dequeue");
+        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 |
 |-----|--------|
-| \`Arrow keys\` | Move cursor / browse history (Up when empty) |
+| \`${cursorUp}\` / \`${cursorDown}\` / \`${cursorLeft}\` / \`${cursorRight}\` | Move cursor / browse history (Up when empty) |
 | \`${cursorWordLeft}\` / \`${cursorWordRight}\` | Move by word |
 | \`${cursorLineStart}\` | Start of line |
 | \`${cursorLineEnd}\` | End of line |
@@ -3539,14 +3678,14 @@ export class InteractiveMode {
 | \`${exit}\` | Exit (when editor is empty) |
 | \`${suspend}\` | Suspend to background |
 | \`${cycleThinkingLevel}\` | Cycle thinking level |
-| \`${cycleModelForward}\` | Cycle models |
+| \`${cycleModelForward}\` / \`${cycleModelBackward}\` | Cycle models |
 | \`${selectModel}\` | Open model selector |
 | \`${expandTools}\` | Toggle tool output expansion |
 | \`${toggleThinking}\` | Toggle thinking block visibility |
 | \`${externalEditor}\` | Edit message in external editor |
 | \`${followUp}\` | Queue follow-up message |
 | \`${dequeue}\` | Restore queued messages |
-| \`Ctrl+V\` | Paste image from clipboard |
+| \`${pasteImage}\` | Paste image from clipboard |
 | \`/\` | Slash commands |
 | \`!\` | Run bash command |
 | \`!!\` | Run bash command (excluded from context) |
@@ -3729,7 +3868,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);