@mariozechner/pi-coding-agent 0.42.1 → 0.42.2

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

@@ -10,6 +10,7 @@ import { getOAuthProviders, } from "@mariozechner/pi-ai";
 import { CombinedAutocompleteProvider, Container, getEditorKeybindings, Loader, Markdown, matchesKey, ProcessTerminal, Spacer, Text, TruncatedText, TUI, visibleWidth, } from "@mariozechner/pi-tui";
 import { spawn, spawnSync } from "child_process";
 import { APP_NAME, getAuthPath, getDebugLogPath, isBunBinary, VERSION } from "../../config.js";
+import { FooterDataProvider } from "../../core/footer-data-provider.js";
 import { KeybindingsManager } from "../../core/keybindings.js";
 import { createCompactionSummaryMessage } from "../../core/messages.js";
 import { SessionManager } from "../../core/session-manager.js";
@@ -57,6 +58,7 @@ export class InteractiveMode {
     autocompleteProvider;
     editorContainer;
     footer;
+    footerDataProvider;
     keybindings;
     version;
     isInitialized = false;
@@ -132,7 +134,8 @@ export class InteractiveMode {
         this.editor = this.defaultEditor;
         this.editorContainer = new Container();
         this.editorContainer.addChild(this.editor);
-        this.footer = new FooterComponent(session);
+        this.footerDataProvider = new FooterDataProvider();
+        this.footer = new FooterComponent(session, this.footerDataProvider);
         this.footer.setAutoCompactEnabled(session.autoCompactionEnabled);
         // Load hide thinking block setting
         this.hideThinkingBlock = this.settingsManager.getHideThinkingBlock();
@@ -201,6 +204,7 @@ export class InteractiveMode {
         const toggleThinking = formatStartupKey(kb.getKeys("toggleThinking"));
         const externalEditor = formatStartupKey(kb.getKeys("externalEditor"));
         const followUp = formatStartupKey(kb.getKeys("followUp"));
+        const dequeue = formatStartupKey(kb.getKeys("dequeue"));
         const instructions = theme.fg("dim", interrupt) +
             theme.fg("muted", " to interrupt") +
             "\n" +
@@ -249,6 +253,9 @@ export class InteractiveMode {
             theme.fg("dim", followUp) +
             theme.fg("muted", " to queue follow-up") +
             "\n" +
+            theme.fg("dim", dequeue) +
+            theme.fg("muted", " to restore queued messages") +
+            "\n" +
             theme.fg("dim", "ctrl+v") +
             theme.fg("muted", " to paste image") +
             "\n" +
@@ -280,7 +287,6 @@ export class InteractiveMode {
         this.ui.addChild(this.pendingMessagesContainer);
         this.ui.addChild(this.statusContainer);
         this.ui.addChild(this.widgetContainer);
-        this.ui.addChild(new Spacer(1));
         this.ui.addChild(this.editorContainer);
         this.ui.addChild(this.footer);
         this.ui.setFocus(this.editor);
@@ -302,8 +308,8 @@ export class InteractiveMode {
             this.updateEditorBorderColor();
             this.ui.requestRender();
         });
-        // Set up git branch watcher
-        this.footer.watchBranch(() => {
+        // Set up git branch watcher (uses provider instead of footer)
+        this.footerDataProvider.onBranchChange(() => {
             this.ui.requestRender();
         });
     }
@@ -621,7 +627,7 @@ export class InteractiveMode {
      * Set extension status text in the footer.
      */
     setExtensionStatus(key, text) {
-        this.footer.setExtensionStatus(key, text);
+        this.footerDataProvider.setExtensionStatus(key, text);
         this.ui.requestRender();
     }
     /**
@@ -663,9 +669,11 @@ export class InteractiveMode {
             return;
         this.widgetContainer.clear();
         if (this.extensionWidgets.size === 0) {
+            this.widgetContainer.addChild(new Spacer(1));
             this.ui.requestRender();
             return;
         }
+        this.widgetContainer.addChild(new Spacer(1));
         for (const [_key, component] of this.extensionWidgets) {
             this.widgetContainer.addChild(component);
         }
@@ -687,8 +695,8 @@ export class InteractiveMode {
             this.ui.removeChild(this.footer);
         }
         if (factory) {
-            // Create and add custom footer
-            this.customFooter = factory(this.ui, theme);
+            // Create and add custom footer, passing the data provider
+            this.customFooter = factory(this.ui, theme, this.footerDataProvider);
             this.ui.addChild(this.customFooter);
         }
         else {
@@ -1028,15 +1036,7 @@ export class InteractiveMode {
         // so they work correctly regardless of which editor is active
         this.defaultEditor.onEscape = () => {
             if (this.loadingAnimation) {
-                // Abort and restore queued messages to editor
-                const { steering, followUp } = this.session.clearQueue();
-                const allQueued = [...steering, ...followUp];
-                const queuedText = allQueued.join("\n\n");
-                const currentText = this.editor.getText();
-                const combinedText = [queuedText, currentText].filter((t) => t.trim()).join("\n\n");
-                this.editor.setText(combinedText);
-                this.updatePendingMessagesDisplay();
-                this.agent.abort();
+                this.restoreQueuedMessagesToEditor({ abort: true });
             }
             else if (this.session.isBashRunning) {
                 this.session.abortBash();
@@ -1077,6 +1077,7 @@ export class InteractiveMode {
         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.onChange = (text) => {
             const wasBashMode = this.isBashMode;
             this.isBashMode = text.trimStart().startsWith("!");
@@ -1120,9 +1121,10 @@ export class InteractiveMode {
                 this.editor.setText("");
                 return;
             }
-            if (text === "/model") {
-                this.showModelSelector();
+            if (text === "/model" || text.startsWith("/model ")) {
+                const searchTerm = text.startsWith("/model ") ? text.slice(7).trim() : undefined;
                 this.editor.setText("");
+                await this.handleModelCommand(searchTerm);
                 return;
             }
             if (text.startsWith("/export")) {
@@ -1754,6 +1756,15 @@ export class InteractiveMode {
             this.editor.onSubmit(text);
         }
     }
+    handleDequeue() {
+        const restored = this.restoreQueuedMessagesToEditor();
+        if (restored === 0) {
+            this.showStatus("No queued messages to restore");
+        }
+        else {
+            this.showStatus(`Restored ${restored} queued message${restored > 1 ? "s" : ""} to editor`);
+        }
+    }
     updateEditorBorderColor() {
         if (this.isBashMode) {
             this.editor.borderColor = theme.getBashModeBorderColor();
@@ -1907,6 +1918,26 @@ export class InteractiveMode {
             }
         }
     }
+    restoreQueuedMessagesToEditor(options) {
+        const { steering, followUp } = this.session.clearQueue();
+        const allQueued = [...steering, ...followUp];
+        if (allQueued.length === 0) {
+            this.updatePendingMessagesDisplay();
+            if (options?.abort) {
+                this.agent.abort();
+            }
+            return 0;
+        }
+        const queuedText = allQueued.join("\n\n");
+        const currentText = options?.currentText ?? this.editor.getText();
+        const combinedText = [queuedText, currentText].filter((t) => t.trim()).join("\n\n");
+        this.editor.setText(combinedText);
+        this.updatePendingMessagesDisplay();
+        if (options?.abort) {
+            this.agent.abort();
+        }
+        return allQueued.length;
+    }
     queueCompactionMessage(text, mode) {
         this.compactionQueuedMessages.push({ text, mode });
         this.editor.addToHistory?.(text);
@@ -2106,7 +2137,63 @@ export class InteractiveMode {
             return { component: selector, focus: selector.getSettingsList() };
         });
     }
-    showModelSelector() {
+    async handleModelCommand(searchTerm) {
+        if (!searchTerm) {
+            this.showModelSelector();
+            return;
+        }
+        const model = await this.findExactModelMatch(searchTerm);
+        if (model) {
+            try {
+                await this.session.setModel(model);
+                this.footer.invalidate();
+                this.updateEditorBorderColor();
+                this.showStatus(`Model: ${model.id}`);
+            }
+            catch (error) {
+                this.showError(error instanceof Error ? error.message : String(error));
+            }
+            return;
+        }
+        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;
+    }
+    async getModelCandidates() {
+        if (this.session.scopedModels.length > 0) {
+            return this.session.scopedModels.map((scoped) => scoped.model);
+        }
+        this.session.modelRegistry.refresh();
+        try {
+            return await this.session.modelRegistry.getAvailable();
+        }
+        catch {
+            return [];
+        }
+    }
+    showModelSelector(initialSearchInput) {
         this.showSelector((done) => {
             const selector = new ModelSelectorComponent(this.ui, this.session.model, this.settingsManager, this.session.modelRegistry, this.session.scopedModels, async (model) => {
                 try {
@@ -2123,7 +2210,7 @@ export class InteractiveMode {
             }, () => {
                 done();
                 this.ui.requestRender();
-            });
+            }, initialSearchInput);
             return { component: selector, focus: selector };
         });
     }
@@ -2592,6 +2679,7 @@ export class InteractiveMode {
         const toggleThinking = this.getAppKeyDisplay("toggleThinking");
         const externalEditor = this.getAppKeyDisplay("externalEditor");
         const followUp = this.getAppKeyDisplay("followUp");
+        const dequeue = this.getAppKeyDisplay("dequeue");
         let hotkeys = `
 **Navigation**
 | Key | Action |
@@ -2624,6 +2712,7 @@ export class InteractiveMode {
 | \`${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 |
 | \`/\` | Slash commands |
 | \`!\` | Run bash command |
@@ -2829,6 +2918,7 @@ export class InteractiveMode {
             this.loadingAnimation = undefined;
         }
         this.footer.dispose();
+        this.footerDataProvider.dispose();
         if (this.unsubscribe) {
             this.unsubscribe();
         }