apex-code 0.0.1-alpha.10 → 0.0.1-alpha.11

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

@@ -317,6 +317,11 @@ export class InteractiveMode {
     firstUseHints;
     // Track current bash execution component
     bashComponent = undefined;
+    // Reentrancy guard: session.isBashRunning only turns true inside
+    // executeBash, so a second `!cmd` submitted during the extension
+    // emitUserBash await would otherwise overwrite the in-flight component
+    // and orphan the first command's output callback.
+    isHandlingBashCommand = false;
     // Track pending bash components (shown in pending area, moved to chat on submit)
     pendingBashComponents = [];
     // Auto-compaction state
@@ -479,8 +484,21 @@ export class InteractiveMode {
             path: command.sourceInfo.path,
         }));
     }
-    createBaseAutocompleteProvider() {
-        // Define commands for autocomplete
+    /**
+     * Every *registered* command: builtin, prompt template, extension, and skill.
+     *
+     * One function rather than two because `/help` renders this list and autocomplete
+     * completes it. Built in two places they would disagree the first time either grew a
+     * source, and the disagreement would show up as a command a user can complete but not
+     * find, or find but not run.
+     *
+     * A few commands are dispatched without being registered -- `/debug`, and the
+     * `/arminsayshi` and `/dementedelves` easter eggs. They are absent here on purpose,
+     * which is also why autocomplete has never offered them. "Registered" is the boundary
+     * both surfaces share; listing them in `/help` would advertise what completion cannot
+     * complete.
+     */
+    collectSessionCommands() {
         const slashCommands = BUILTIN_SLASH_COMMANDS.map((command) => ({
             name: command.name,
             description: command.description,
@@ -557,7 +575,10 @@ export class InteractiveMode {
                 });
             }
         }
-        return new CombinedAutocompleteProvider([...slashCommands, ...templateCommands, ...extensionCommands, ...skillCommandList], this.sessionManager.getCwd(), this.fdPath);
+        return [...slashCommands, ...templateCommands, ...extensionCommands, ...skillCommandList];
+    }
+    createBaseAutocompleteProvider() {
+        return new CombinedAutocompleteProvider(this.collectSessionCommands(), this.sessionManager.getCwd(), this.fdPath);
     }
     setupAutocompleteProvider() {
         let provider = this.createBaseAutocompleteProvider();
@@ -1666,6 +1687,15 @@ export class InteractiveMode {
         this.compactionQueuedMessages = [];
         this.streamingComponent = undefined;
         this.streamingMessage = undefined;
+        // The clears above detach children without stopping their animation
+        // timers. Bash components embed an animated loader; dispose them
+        // explicitly so an in-flight `!cmd` cannot keep rendering (or get
+        // flushed back into a fresh session by flushPendingBashComponents).
+        for (const component of this.pendingBashComponents)
+            component.dispose();
+        this.pendingBashComponents = [];
+        this.bashComponent?.dispose();
+        this.bashComponent = undefined;
         this.clearPendingTools();
         this.renderInitialMessages();
     }
@@ -2129,10 +2159,24 @@ export class InteractiveMode {
                 this.showTrustSelector();
                 break;
             case "Resources, extensions, and MCP adapters":
-                this.showStatus("Run apex-code config to manage resources, extensions, and MCP adapters.");
+                this.showStatus(this.describeMcpServers());
                 break;
         }
     }
+    /**
+     * Report configured MCP servers and their live connection state. Replaces a string
+     * that offered MCP management from `apex-code config`, which manages package
+     * resources and has never been able to configure a server.
+     */
+    describeMcpServers() {
+        const runtime = this.session.mcpRuntime;
+        const servers = runtime ? [...runtime.servers.keys()] : [];
+        if (servers.length === 0) {
+            return "Run apex-code config to manage resources and extensions. No MCP server is configured; add one to .mcp.json.";
+        }
+        const states = servers.map((name) => `${name} (${runtime?.manager.state(name).kind ?? "disconnected"})`);
+        return `Run apex-code config to manage resources and extensions. MCP servers: ${states.join(", ")}.`;
+    }
     /**
      * Show a confirmation dialog for extensions.
      */
@@ -2583,6 +2627,11 @@ export class InteractiveMode {
                 this.editor.setText("");
                 return;
             }
+            if (text === "/help") {
+                this.handleHelpCommand();
+                this.editor.setText("");
+                return;
+            }
             if (text === "/fork") {
                 this.showUserMessageSelector();
                 this.editor.setText("");
@@ -5667,6 +5716,28 @@ export class InteractiveMode {
         this.chatContainer.addChild(new DynamicBorder());
         this.ui.requestRender();
     }
+    /**
+     * Renders what `collectSessionCommands` returns, so the list a user reads and the list
+     * autocomplete offers are the same list rather than two that agree today. Unregistered
+     * dispatch-only commands are outside that boundary; see the note there.
+     */
+    handleHelpCommand() {
+        const commands = this.collectSessionCommands();
+        const rows = commands
+            .map((command) => {
+            const invocation = command.argumentHint ? `/${command.name} ${command.argumentHint}` : `/${command.name}`;
+            return `| \`${invocation}\` | ${command.description ?? ""} |`;
+        })
+            .join("\n");
+        const help = `| Command | Description |\n|---------|-------------|\n${rows}\n\nType \`/\` to filter these, or \`/hotkeys\` for keyboard shortcuts.`;
+        this.chatContainer.addChild(new Spacer(1));
+        this.chatContainer.addChild(new DynamicBorder());
+        this.chatContainer.addChild(new Text(theme.bold(theme.fg("accent", "Commands")), 1, 0));
+        this.chatContainer.addChild(new Spacer(1));
+        this.chatContainer.addChild(new Markdown(help, 1, 1, this.getMarkdownThemeWithSettings()));
+        this.chatContainer.addChild(new DynamicBorder());
+        this.ui.requestRender();
+    }
     async handleClearCommand() {
         this.clearStatusIndicator();
         try {
@@ -5730,6 +5801,19 @@ export class InteractiveMode {
         }
     }
     async handleBashCommand(command, excludeFromContext = false) {
+        if (this.isHandlingBashCommand) {
+            this.showWarning("A bash command is already running; wait for it to finish");
+            return;
+        }
+        this.isHandlingBashCommand = true;
+        try {
+            await this.runBashCommand(command, excludeFromContext);
+        }
+        finally {
+            this.isHandlingBashCommand = false;
+        }
+    }
+    async runBashCommand(command, excludeFromContext = false) {
         const extensionRunner = this.session.extensionRunner;
         // Emit user_bash event to let extensions intercept
         const eventResult = await extensionRunner.emitUserBash({