apex-code 0.4.0 → 0.5.0

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

@@ -44,10 +44,12 @@ import { ensureTool } from "../../utils/tools-manager.js";
 import { checkForNewApexCodeVersion } from "../../utils/version-check.js";
 import { ArminComponent } from "./components/armin.js";
 import { AssistantMessageComponent } from "./components/assistant-message.js";
+import { describeWithSource } from "./components/autocomplete-source.js";
 import { BashExecutionComponent } from "./components/bash-execution.js";
 import { BorderedLoader } from "./components/bordered-loader.js";
 import { BranchSummaryMessageComponent } from "./components/branch-summary-message.js";
 import { CompactionSummaryMessageComponent } from "./components/compaction-summary-message.js";
+import { ComposerDock } from "./components/composer-dock.js";
 import { CustomEditor } from "./components/custom-editor.js";
 import { CustomEntryComponent } from "./components/custom-entry.js";
 import { CustomMessageComponent } from "./components/custom-message.js";
@@ -59,7 +61,7 @@ import { ExtensionInputComponent } from "./components/extension-input.js";
 import { ExtensionSelectorComponent } from "./components/extension-selector.js";
 import { FirstUseHints } from "./components/first-use-hints.js";
 import { FooterComponent, formatTokens } from "./components/footer.js";
-import { formatKeyText, keyDisplayText, keyHint, keyText, rawKeyHint } from "./components/keybinding-hints.js";
+import { formatKeyText, hintRow, keyDisplayText, keyHint, keyText, rawKeyHint } from "./components/keybinding-hints.js";
 import { LoginDialogComponent } from "./components/login-dialog.js";
 import { createMermaidMarkdownTransformer } from "./components/mermaid.js";
 import { ModelSelectorComponent } from "./components/model-selector.js";
@@ -368,6 +370,13 @@ export class InteractiveMode {
     autoCompactionEscapeHandler;
     // Auto-retry state
     retryEscapeHandler;
+    /**
+     * The failed attempt an auto-retry would supersede. `component` is set while its error is
+     * still on screen, and a retry removes it from the chat.
+     */
+    retriedAttempt;
+    /** Set when the user presses Escape during a retry wait, which is the only way to cancel one. */
+    retryCancelled = false;
     // Messages queued while compaction is running
     compactionQueuedMessages = [];
     // Shutdown state
@@ -472,7 +481,7 @@ export class InteractiveMode {
             autocompleteFooter: () => this.buildAutocompleteFooter(),
         });
         this.editor = this.defaultEditor;
-        this.editorContainer = new Container();
+        this.editorContainer = new ComposerDock(() => this.editor);
         this.editorContainer.addChild(this.editor);
         this.footerDataProvider = new FooterDataProvider(this.sessionManager.getCwd());
         this.footer = new FooterComponent(this.session, this.footerDataProvider, this.settingsManager);
@@ -491,32 +500,6 @@ export class InteractiveMode {
             initialThemeSetting: options.initialThemeSetting,
         });
     }
-    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) {
         const builtinNames = new Set(BUILTIN_SLASH_COMMANDS.map((command) => command.name));
         return extensionRunner
@@ -595,7 +578,7 @@ export class InteractiveMode {
         // Convert prompt templates to SlashCommand format for autocomplete
         const templateCommands = this.session.promptTemplates.map((cmd) => ({
             name: cmd.name,
-            description: this.prefixAutocompleteDescription(cmd.description, cmd.sourceInfo),
+            description: describeWithSource(cmd.description, cmd.sourceInfo),
             ...(cmd.argumentHint && { argumentHint: cmd.argumentHint }),
         }));
         // Convert extension commands to SlashCommand format
@@ -605,7 +588,7 @@ export class InteractiveMode {
             .filter((cmd) => !builtinCommandNames.has(cmd.name))
             .map((cmd) => ({
             name: cmd.invocationName,
-            description: this.prefixAutocompleteDescription(cmd.description, cmd.sourceInfo),
+            description: describeWithSource(cmd.description, cmd.sourceInfo),
             getArgumentCompletions: cmd.getArgumentCompletions,
         }));
         // Build skill commands from session.skills (if enabled)
@@ -617,7 +600,7 @@ export class InteractiveMode {
                 this.skillCommands.set(commandName, skill.filePath);
                 skillCommandList.push({
                     name: commandName,
-                    description: this.prefixAutocompleteDescription(skill.description, skill.sourceInfo),
+                    description: describeWithSource(skill.description, skill.sourceInfo),
                 });
             }
         }
@@ -661,7 +644,7 @@ export class InteractiveMode {
             this.chatContainer.addChild(new Text(condensedText, 1, 0));
         }
         else {
-            this.chatContainer.addChild(new Text(theme.bold(theme.fg("accent", "What's New")), 1, 0));
+            this.chatContainer.addChild(new Text(theme.bold(theme.fg("accent", "What's new")), 1, 0));
             this.chatContainer.addChild(new Spacer(1));
             this.chatContainer.addChild(new Markdown(this.changelogMarkdown.trim(), 1, 0, this.getMarkdownThemeWithSettings()));
             this.chatContainer.addChild(new Spacer(1));
@@ -806,25 +789,25 @@ export class InteractiveMode {
             // The full cheatsheet is verbose-only. The default screen leads with the
             // mark and the runtime facts that actually differ between launches.
             const expandedInstructions = [
-                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("app.message.followUp", "to queue follow-up"),
-                hint("app.message.dequeue", "to edit all queued messages"),
-                hint("app.clipboard.pasteImage", "to paste image (with text fallback)"),
-                rawKeyHint("drop files", "to attach"),
+                hint("app.interrupt", "interrupt"),
+                hint("app.clear", "clear"),
+                rawKeyHint(`${keyText("app.clear")} twice`, "exit"),
+                hint("app.exit", "exit (empty)"),
+                hint("app.suspend", "suspend"),
+                keyHint("tui.editor.deleteToLineEnd", "delete to end"),
+                hint("app.thinking.cycle", "cycle thinking level"),
+                rawKeyHint(`${keyText("app.model.cycleForward")}/${keyText("app.model.cycleBackward")}`, "cycle models"),
+                hint("app.model.select", "select model"),
+                hint("app.tools.expand", "expand tools"),
+                hint("app.thinking.toggle", "expand thinking"),
+                hint("app.editor.external", "external editor"),
+                rawKeyHint("/", "commands"),
+                rawKeyHint("!", "run bash"),
+                rawKeyHint("!!", "run bash (no context)"),
+                hint("app.message.followUp", "queue follow-up"),
+                hint("app.message.dequeue", "edit all queued messages"),
+                hint("app.clipboard.pasteImage", "paste image (with text fallback)"),
+                rawKeyHint("drop files", "attach"),
             ].join("\n");
             this.builtInHeader = new ApexSplashHeader(this.version, () => this.session.state.model?.id, () => this.session.sessionManager.getCwd(), this.options.verbose ? expandedInstructions : undefined, {
                 topPadding: true,
@@ -1553,13 +1536,12 @@ export class InteractiveMode {
      */
     /** Live keybindings under the autocomplete dropdown. */
     buildAutocompleteFooter() {
-        const separator = theme.fg("borderMuted", this.settingsManager.getSymbolPreset() === "ascii" ? " - " : " · ");
-        return [
-            rawKeyHint(`${keyText("tui.select.up")}/${keyText("tui.select.down")}`, "move"),
-            keyHint("tui.select.confirm", "select"),
-            keyHint("tui.input.tab", "complete"),
-            keyHint("tui.select.cancel", "dismiss"),
-        ].join(separator);
+        return hintRow([
+            [["tui.select.up", "tui.select.down"], "move"],
+            ["tui.select.confirm", "select"],
+            ["tui.input.tab", "complete"],
+            ["tui.select.cancel", "dismiss"],
+        ], { ascii: this.settingsManager.getSymbolPreset() === "ascii" });
     }
     buildStartupShortcuts() {
         const entry = (sigil, label) => `${theme.fg("accent", sigil)} ${theme.fg("muted", label)}`;
@@ -2895,6 +2877,7 @@ export class InteractiveMode {
                     this.ui.requestRender();
                 }
                 else if (event.message.role === "assistant") {
+                    this.retriedAttempt = undefined;
                     this.streamingComponent = new AssistantMessageComponent(undefined, this.isThinkingHidden(), this.getMarkdownThemeWithSettings(), this.hiddenThinkingLabel, this.outputPad, this.getMarkdownTransformers());
                     this.streamingMessage = event.message;
                     this.chatContainer.addChild(this.streamingComponent);
@@ -2949,6 +2932,9 @@ export class InteractiveMode {
                         if (!errorMessage) {
                             errorMessage = this.streamingMessage.errorMessage || "Error";
                         }
+                        if (this.streamingMessage.stopReason === "error" && this.pendingTools.size === 0) {
+                            this.retriedAttempt = { error: errorMessage, component: this.streamingComponent };
+                        }
                         for (const [, component] of this.pendingTools.entries()) {
                             component.updateResult({
                                 content: [{ type: "text", text: errorMessage }],
@@ -3084,9 +3070,16 @@ export class InteractiveMode {
                 break;
             }
             case "auto_retry_start": {
+                // The session drops the failed attempt from agent state; the chat drops it too, and
+                // the retry indicator carries the attempt count instead.
+                if (this.retriedAttempt?.component) {
+                    this.chatContainer.removeChild(this.retriedAttempt.component);
+                    this.retriedAttempt = { error: this.retriedAttempt.error };
+                }
                 // Set up escape to abort retry
                 this.retryEscapeHandler = this.defaultEditor.onEscape;
                 this.defaultEditor.onEscape = () => {
+                    this.retryCancelled = true;
                     this.session.abortRetry();
                 };
                 this.showStatusIndicator(new RetryStatusIndicator(this.ui, event.attempt, event.maxAttempts, event.delayMs));
@@ -3102,8 +3095,16 @@ export class InteractiveMode {
                 this.clearStatusIndicator("retry");
                 // Show error only on final failure (success shows normal response)
                 if (!event.success) {
-                    this.showError(`Retry failed after ${event.attempt} attempts: ${event.finalError || "Unknown error"}`);
+                    const lastAttempt = this.retriedAttempt;
+                    if (lastAttempt?.component)
+                        this.chatContainer.removeChild(lastAttempt.component);
+                    const outcome = this.retryCancelled
+                        ? "retry cancelled"
+                        : `gave up after ${event.attempt} ${event.attempt === 1 ? "retry" : "retries"}`;
+                    this.showError(`${lastAttempt?.error ?? event.finalError ?? "Unknown error"} (${outcome})`);
                 }
+                this.retriedAttempt = undefined;
+                this.retryCancelled = false;
                 this.ui.requestRender();
                 break;
             }
@@ -5364,12 +5365,11 @@ export class InteractiveMode {
         }
         this.resetExtensionUI();
         const reloadBox = new Container();
-        const borderColor = (s) => theme.fg("border", s);
-        reloadBox.addChild(new DynamicBorder(borderColor));
+        reloadBox.addChild(new DynamicBorder());
         reloadBox.addChild(new Spacer(1));
-        reloadBox.addChild(new Text(theme.fg("muted", "Reloading keybindings, extensions, skills, prompts, themes, and context files..."), 1, 0));
+        reloadBox.addChild(new Text(theme.fg("muted", "Reloading keybindings, extensions, skills, prompts, themes, and context files..."), 0, 0));
         reloadBox.addChild(new Spacer(1));
-        reloadBox.addChild(new DynamicBorder(borderColor));
+        reloadBox.addChild(new DynamicBorder());
         const previousEditor = this.editor;
         this.editorContainer.clear();
         this.editorContainer.addChild(reloadBox);
@@ -5723,7 +5723,7 @@ export class InteractiveMode {
             : "No changelog entries found.";
         this.chatContainer.addChild(new Spacer(1));
         this.chatContainer.addChild(new DynamicBorder());
-        this.chatContainer.addChild(new Text(theme.bold(theme.fg("accent", "What's New")), 1, 0));
+        this.chatContainer.addChild(new Text(theme.bold(theme.fg("accent", "What's new")), 1, 0));
         this.chatContainer.addChild(new Spacer(1));
         this.chatContainer.addChild(new Markdown(changelogMarkdown, 1, 1, this.getMarkdownThemeWithSettings()));
         this.chatContainer.addChild(new DynamicBorder());