@mariozechner/pi-coding-agent 0.36.0 → 0.37.1

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

@@ -7,8 +7,9 @@ import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
 import Clipboard from "@crosscopy/clipboard";
-import { CombinedAutocompleteProvider, Container, getEditorKeybindings, Input, Loader, Markdown, matchesKey, ProcessTerminal, Spacer, Text, TruncatedText, TUI, visibleWidth, } from "@mariozechner/pi-tui";
-import { exec, spawn, spawnSync } from "child_process";
+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 } from "../../config.js";
 import { KeybindingsManager } from "../../core/keybindings.js";
 import { createCompactionSummaryMessage } from "../../core/messages.js";
@@ -30,6 +31,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 { LoginDialogComponent } from "./components/login-dialog.js";
 import { ModelSelectorComponent } from "./components/model-selector.js";
 import { OAuthSelectorComponent } from "./components/oauth-selector.js";
 import { SessionSelectorComponent } from "./components/session-selector.js";
@@ -86,6 +88,8 @@ export class InteractiveMode {
     // Auto-retry state
     retryLoader = undefined;
     retryEscapeHandler;
+    // Messages queued while compaction is running
+    compactionQueuedMessages = [];
     // Extension UI state
     extensionSelector = undefined;
     extensionInput = undefined;
@@ -361,6 +365,7 @@ export class InteractiveMode {
                 // Clear UI state
                 this.chatContainer.clear();
                 this.pendingMessagesContainer.clear();
+                this.compactionQueuedMessages = [];
                 this.streamingComponent = undefined;
                 this.streamingMessage = undefined;
                 this.pendingTools.clear();
@@ -852,13 +857,7 @@ export class InteractiveMode {
             if (text === "/compact" || text.startsWith("/compact ")) {
                 const customInstructions = text.startsWith("/compact ") ? text.slice(9).trim() : undefined;
                 this.editor.setText("");
-                this.editor.disableSubmit = true;
-                try {
-                    await this.handleCompactCommand(customInstructions);
-                }
-                finally {
-                    this.editor.disableSubmit = false;
-                }
+                await this.handleCompactCommand(customInstructions);
                 return;
             }
             if (text === "/debug") {
@@ -898,8 +897,16 @@ export class InteractiveMode {
                     return;
                 }
             }
-            // Block input during compaction
+            // Queue input during compaction (extension commands execute immediately)
             if (this.session.isCompacting) {
+                if (this.isExtensionCommand(text)) {
+                    this.editor.addToHistory(text);
+                    this.editor.setText("");
+                    await this.session.prompt(text);
+                }
+                else {
+                    this.queueCompactionMessage(text, "steer");
+                }
                 return;
             }
             // If streaming, use prompt() with steer behavior
@@ -1060,8 +1067,7 @@ export class InteractiveMode {
                 this.ui.requestRender();
                 break;
             case "auto_compaction_start": {
-                // Disable submit to preserve editor text during compaction
-                this.editor.disableSubmit = true;
+                // Keep editor active; submissions are queued during compaction.
                 // Set up escape to abort auto-compaction
                 this.autoCompactionEscapeHandler = this.editor.onEscape;
                 this.editor.onEscape = () => {
@@ -1076,8 +1082,6 @@ export class InteractiveMode {
                 break;
             }
             case "auto_compaction_end": {
-                // Re-enable submit
-                this.editor.disableSubmit = false;
                 // Restore escape handler
                 if (this.autoCompactionEscapeHandler) {
                     this.editor.onEscape = this.autoCompactionEscapeHandler;
@@ -1106,6 +1110,7 @@ export class InteractiveMode {
                     });
                     this.footer.invalidate();
                 }
+                void this.flushCompactionQueue({ willRetry: event.willRetry });
                 this.ui.requestRender();
                 break;
             }
@@ -1356,6 +1361,18 @@ export class InteractiveMode {
         const text = this.editor.getText().trim();
         if (!text)
             return;
+        // Queue input during compaction (extension commands execute immediately)
+        if (this.session.isCompacting) {
+            if (this.isExtensionCommand(text)) {
+                this.editor.addToHistory(text);
+                this.editor.setText("");
+                await this.session.prompt(text);
+            }
+            else {
+                this.queueCompactionMessage(text, "followUp");
+            }
+            return;
+        }
         // Alt+Enter queues a follow-up message (waits until agent finishes)
         // This handles extension commands (execute immediately), prompt template expansion, and queueing
         if (this.session.isStreaming) {
@@ -1501,8 +1518,14 @@ export class InteractiveMode {
     }
     updatePendingMessagesDisplay() {
         this.pendingMessagesContainer.clear();
-        const steeringMessages = this.session.getSteeringMessages();
-        const followUpMessages = this.session.getFollowUpMessages();
+        const steeringMessages = [
+            ...this.session.getSteeringMessages(),
+            ...this.compactionQueuedMessages.filter((msg) => msg.mode === "steer").map((msg) => msg.text),
+        ];
+        const followUpMessages = [
+            ...this.session.getFollowUpMessages(),
+            ...this.compactionQueuedMessages.filter((msg) => msg.mode === "followUp").map((msg) => msg.text),
+        ];
         if (steeringMessages.length > 0 || followUpMessages.length > 0) {
             this.pendingMessagesContainer.addChild(new Spacer(1));
             for (const message of steeringMessages) {
@@ -1515,6 +1538,92 @@ export class InteractiveMode {
             }
         }
     }
+    queueCompactionMessage(text, mode) {
+        this.compactionQueuedMessages.push({ text, mode });
+        this.editor.addToHistory(text);
+        this.editor.setText("");
+        this.updatePendingMessagesDisplay();
+        this.showStatus("Queued message for after compaction");
+    }
+    isExtensionCommand(text) {
+        if (!text.startsWith("/"))
+            return false;
+        const extensionRunner = this.session.extensionRunner;
+        if (!extensionRunner)
+            return false;
+        const spaceIndex = text.indexOf(" ");
+        const commandName = spaceIndex === -1 ? text.slice(1) : text.slice(1, spaceIndex);
+        return !!extensionRunner.getCommand(commandName);
+    }
+    async flushCompactionQueue(options) {
+        if (this.compactionQueuedMessages.length === 0) {
+            return;
+        }
+        const queuedMessages = [...this.compactionQueuedMessages];
+        this.compactionQueuedMessages = [];
+        this.updatePendingMessagesDisplay();
+        const restoreQueue = (error) => {
+            this.session.clearQueue();
+            this.compactionQueuedMessages = queuedMessages;
+            this.updatePendingMessagesDisplay();
+            this.showError(`Failed to send queued message${queuedMessages.length > 1 ? "s" : ""}: ${error instanceof Error ? error.message : String(error)}`);
+        };
+        try {
+            if (options?.willRetry) {
+                // When retry is pending, queue messages for the retry turn
+                for (const message of queuedMessages) {
+                    if (this.isExtensionCommand(message.text)) {
+                        await this.session.prompt(message.text);
+                    }
+                    else if (message.mode === "followUp") {
+                        await this.session.followUp(message.text);
+                    }
+                    else {
+                        await this.session.steer(message.text);
+                    }
+                }
+                this.updatePendingMessagesDisplay();
+                return;
+            }
+            // Find first non-extension-command message to use as prompt
+            const firstPromptIndex = queuedMessages.findIndex((message) => !this.isExtensionCommand(message.text));
+            if (firstPromptIndex === -1) {
+                // All extension commands - execute them all
+                for (const message of queuedMessages) {
+                    await this.session.prompt(message.text);
+                }
+                return;
+            }
+            // Execute any extension commands before the first prompt
+            const preCommands = queuedMessages.slice(0, firstPromptIndex);
+            const firstPrompt = queuedMessages[firstPromptIndex];
+            const rest = queuedMessages.slice(firstPromptIndex + 1);
+            for (const message of preCommands) {
+                await this.session.prompt(message.text);
+            }
+            // Send first prompt (starts streaming)
+            const promptPromise = this.session.prompt(firstPrompt.text).catch((error) => {
+                restoreQueue(error);
+            });
+            // Queue remaining messages
+            for (const message of rest) {
+                if (this.isExtensionCommand(message.text)) {
+                    await this.session.prompt(message.text);
+                }
+                else if (message.mode === "followUp") {
+                    await this.session.followUp(message.text);
+                }
+                else {
+                    await this.session.steer(message.text);
+                }
+            }
+            this.updatePendingMessagesDisplay();
+            void promptPromise;
+        }
+        catch (error) {
+            restoreQueue(error);
+        }
+    }
     /** Move pending bash components from pending area to chat */
     flushPendingBashComponents() {
         for (const component of this.pendingBashComponents) {
@@ -1776,6 +1885,7 @@ export class InteractiveMode {
         this.statusContainer.clear();
         // Clear UI state
         this.pendingMessagesContainer.clear();
+        this.compactionQueuedMessages = [];
         this.streamingComponent = undefined;
         this.streamingMessage = undefined;
         this.pendingTools.clear();
@@ -1799,78 +1909,16 @@ export class InteractiveMode {
             const selector = new OAuthSelectorComponent(mode, this.session.modelRegistry.authStorage, async (providerId) => {
                 done();
                 if (mode === "login") {
-                    this.showStatus(`Logging in to ${providerId}...`);
-                    try {
-                        await this.session.modelRegistry.authStorage.login(providerId, {
-                            onAuth: (info) => {
-                                this.chatContainer.addChild(new Spacer(1));
-                                // OSC 8 hyperlink for desktop terminals that support clicking
-                                const hyperlink = `\x1b]8;;${info.url}\x07Click here to login\x1b]8;;\x07`;
-                                this.chatContainer.addChild(new Text(theme.fg("accent", hyperlink), 1, 0));
-                                // OSC 52 to copy URL to clipboard (works over SSH, e.g., Termux)
-                                const urlBase64 = Buffer.from(info.url).toString("base64");
-                                process.stdout.write(`\x1b]52;c;${urlBase64}\x07`);
-                                this.chatContainer.addChild(new Text(theme.fg("dim", "(URL copied to clipboard - paste in browser)"), 1, 0));
-                                if (info.instructions) {
-                                    this.chatContainer.addChild(new Spacer(1));
-                                    this.chatContainer.addChild(new Text(theme.fg("warning", info.instructions), 1, 0));
-                                }
-                                this.ui.requestRender();
-                                // Try to open browser on desktop
-                                const openCmd = process.platform === "darwin"
-                                    ? "open"
-                                    : process.platform === "win32"
-                                        ? "start"
-                                        : "xdg-open";
-                                exec(`${openCmd} "${info.url}"`);
-                            },
-                            onPrompt: async (prompt) => {
-                                this.chatContainer.addChild(new Spacer(1));
-                                this.chatContainer.addChild(new Text(theme.fg("warning", prompt.message), 1, 0));
-                                if (prompt.placeholder) {
-                                    this.chatContainer.addChild(new Text(theme.fg("dim", prompt.placeholder), 1, 0));
-                                }
-                                this.ui.requestRender();
-                                return new Promise((resolve) => {
-                                    const codeInput = new Input();
-                                    codeInput.onSubmit = () => {
-                                        const code = codeInput.getValue();
-                                        this.editorContainer.clear();
-                                        this.editorContainer.addChild(this.editor);
-                                        this.ui.setFocus(this.editor);
-                                        resolve(code);
-                                    };
-                                    this.editorContainer.clear();
-                                    this.editorContainer.addChild(codeInput);
-                                    this.ui.setFocus(codeInput);
-                                    this.ui.requestRender();
-                                });
-                            },
-                            onProgress: (message) => {
-                                this.chatContainer.addChild(new Text(theme.fg("dim", message), 1, 0));
-                                this.ui.requestRender();
-                            },
-                        });
-                        // Refresh models to pick up new baseUrl (e.g., github-copilot)
-                        this.session.modelRegistry.refresh();
-                        this.chatContainer.addChild(new Spacer(1));
-                        this.chatContainer.addChild(new Text(theme.fg("success", `✓ Successfully logged in to ${providerId}`), 1, 0));
-                        this.chatContainer.addChild(new Text(theme.fg("dim", `Credentials saved to ${getAuthPath()}`), 1, 0));
-                        this.ui.requestRender();
-                    }
-                    catch (error) {
-                        this.showError(`Login failed: ${error instanceof Error ? error.message : String(error)}`);
-                    }
+                    await this.showLoginDialog(providerId);
                 }
                 else {
+                    // Logout flow
+                    const providerInfo = getOAuthProviders().find((p) => p.id === providerId);
+                    const providerName = providerInfo?.name || providerId;
                     try {
                         this.session.modelRegistry.authStorage.logout(providerId);
-                        // Refresh models to reset baseUrl
                         this.session.modelRegistry.refresh();
-                        this.chatContainer.addChild(new Spacer(1));
-                        this.chatContainer.addChild(new Text(theme.fg("success", `✓ Successfully logged out of ${providerId}`), 1, 0));
-                        this.chatContainer.addChild(new Text(theme.fg("dim", `Credentials removed from ${getAuthPath()}`), 1, 0));
-                        this.ui.requestRender();
+                        this.showStatus(`Logged out of ${providerName}`);
                     }
                     catch (error) {
                         this.showError(`Logout failed: ${error instanceof Error ? error.message : String(error)}`);
@@ -1883,6 +1931,83 @@ export class InteractiveMode {
             return { component: selector, focus: selector };
         });
     }
+    async showLoginDialog(providerId) {
+        const providerInfo = getOAuthProviders().find((p) => p.id === providerId);
+        const providerName = providerInfo?.name || providerId;
+        // Providers that use callback servers (can paste redirect URL)
+        const usesCallbackServer = providerId === "openai-codex" || providerId === "google-gemini-cli" || providerId === "google-antigravity";
+        // Create login dialog component
+        const dialog = new LoginDialogComponent(this.ui, providerId, (_success, _message) => {
+            // Completion handled below
+        });
+        // Show dialog in editor container
+        this.editorContainer.clear();
+        this.editorContainer.addChild(dialog);
+        this.ui.setFocus(dialog);
+        this.ui.requestRender();
+        // Promise for manual code input (racing with callback server)
+        let manualCodeResolve;
+        let manualCodeReject;
+        const manualCodePromise = new Promise((resolve, reject) => {
+            manualCodeResolve = resolve;
+            manualCodeReject = reject;
+        });
+        // Restore editor helper
+        const restoreEditor = () => {
+            this.editorContainer.clear();
+            this.editorContainer.addChild(this.editor);
+            this.ui.setFocus(this.editor);
+            this.ui.requestRender();
+        };
+        try {
+            await this.session.modelRegistry.authStorage.login(providerId, {
+                onAuth: (info) => {
+                    dialog.showAuth(info.url, info.instructions);
+                    if (usesCallbackServer) {
+                        // Show input for manual paste, racing with callback
+                        dialog
+                            .showManualInput("Paste redirect URL below, or complete login in browser:")
+                            .then((value) => {
+                            if (value && manualCodeResolve) {
+                                manualCodeResolve(value);
+                                manualCodeResolve = undefined;
+                            }
+                        })
+                            .catch(() => {
+                            if (manualCodeReject) {
+                                manualCodeReject(new Error("Login cancelled"));
+                                manualCodeReject = undefined;
+                            }
+                        });
+                    }
+                    else if (providerId === "github-copilot") {
+                        // GitHub Copilot polls after onAuth
+                        dialog.showWaiting("Waiting for browser authentication...");
+                    }
+                    // For Anthropic: onPrompt is called immediately after
+                },
+                onPrompt: async (prompt) => {
+                    return dialog.showPrompt(prompt.message, prompt.placeholder);
+                },
+                onProgress: (message) => {
+                    dialog.showProgress(message);
+                },
+                onManualCodeInput: () => manualCodePromise,
+                signal: dialog.signal,
+            });
+            // Success
+            restoreEditor();
+            this.session.modelRegistry.refresh();
+            this.showStatus(`Logged in to ${providerName}. Credentials saved to ${getAuthPath()}`);
+        }
+        catch (error) {
+            restoreEditor();
+            const errorMsg = error instanceof Error ? error.message : String(error);
+            if (errorMsg !== "Login cancelled") {
+                this.showError(`Failed to login to ${providerName}: ${errorMsg}`);
+            }
+        }
+    }
     // =========================================================================
     // Command handlers
     // =========================================================================
@@ -2107,7 +2232,7 @@ export class InteractiveMode {
 | Key | Action |
 |-----|--------|
 | \`${submit}\` | Send message |
-| \`${newLine}\` | New line |
+| \`${newLine}\` | New line${process.platform === "win32" ? " (Ctrl+Enter on Windows Terminal)" : ""} |
 | \`${deleteWordBackward}\` | Delete word backwards |
 | \`${deleteToLineStart}\` | Delete to start of line |
 | \`${deleteToLineEnd}\` | Delete to end of line |
@@ -2166,6 +2291,7 @@ export class InteractiveMode {
         // Clear UI state
         this.chatContainer.clear();
         this.pendingMessagesContainer.clear();
+        this.compactionQueuedMessages = [];
         this.streamingComponent = undefined;
         this.streamingMessage = undefined;
         this.pendingTools.clear();
@@ -2287,6 +2413,7 @@ export class InteractiveMode {
             this.statusContainer.clear();
             this.editor.onEscape = originalOnEscape;
         }
+        void this.flushCompactionQueue({ willRetry: false });
     }
     stop() {
         if (this.loadingAnimation) {