@mariozechner/pi-coding-agent 0.27.9 → 0.28.0

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

@@ -7,10 +7,8 @@ import * as os from "node:os";
 import * as path from "node:path";
 import { CombinedAutocompleteProvider, Container, getCapabilities, Input, Loader, Markdown, ProcessTerminal, Spacer, Text, TruncatedText, TUI, visibleWidth, } from "@mariozechner/pi-tui";
 import { exec, spawnSync } from "child_process";
-import { APP_NAME, getDebugLogPath, getOAuthPath } from "../../config.js";
+import { APP_NAME, getAuthPath, getDebugLogPath } from "../../config.js";
 import { isBashExecutionMessage } from "../../core/messages.js";
-import { invalidateOAuthCache } from "../../core/model-config.js";
-import { listOAuthProviders, login, logout } from "../../core/oauth/index.js";
 import { getLatestCompactionEntry, SessionManager, SUMMARY_PREFIX, SUMMARY_SUFFIX, } from "../../core/session-manager.js";
 import { loadSkills } from "../../core/skills.js";
 import { loadProjectContextFiles } from "../../core/system-prompt.js";
@@ -105,7 +103,7 @@ export class InteractiveMode {
         this.editor = new CustomEditor(getEditorTheme());
         this.editorContainer = new Container();
         this.editorContainer.addChild(this.editor);
-        this.footer = new FooterComponent(session.state);
+        this.footer = new FooterComponent(session.state, session.modelRegistry);
         this.footer.setAutoCompactEnabled(session.autoCompactionEnabled);
         // Define slash commands for autocomplete
         const slashCommands = [
@@ -1261,7 +1259,7 @@ export class InteractiveMode {
     }
     showModelSelector() {
         this.showSelector((done) => {
-            const selector = new ModelSelectorComponent(this.ui, this.session.model, this.settingsManager, this.session.scopedModels, async (model) => {
+            const selector = new ModelSelectorComponent(this.ui, this.session.model, this.settingsManager, this.session.modelRegistry, this.session.scopedModels, async (model) => {
                 try {
                     await this.session.setModel(model);
                     this.footer.updateState(this.session.state);
@@ -1344,62 +1342,68 @@ export class InteractiveMode {
     }
     async showOAuthSelector(mode) {
         if (mode === "logout") {
-            const loggedInProviders = listOAuthProviders();
+            const providers = this.session.modelRegistry.authStorage.list();
+            const loggedInProviders = providers.filter((p) => this.session.modelRegistry.authStorage.get(p)?.type === "oauth");
             if (loggedInProviders.length === 0) {
                 this.showStatus("No OAuth providers logged in. Use /login first.");
                 return;
             }
         }
         this.showSelector((done) => {
-            const selector = new OAuthSelectorComponent(mode, async (providerId) => {
+            const selector = new OAuthSelectorComponent(mode, this.session.modelRegistry.authStorage, async (providerId) => {
                 done();
                 if (mode === "login") {
                     this.showStatus(`Logging in to ${providerId}...`);
                     try {
-                        await login(providerId, (info) => {
-                            this.chatContainer.addChild(new Spacer(1));
-                            this.chatContainer.addChild(new Text(theme.fg("accent", "Opening browser to:"), 1, 0));
-                            this.chatContainer.addChild(new Text(theme.fg("accent", info.url), 1, 0));
-                            if (info.instructions) {
+                        await this.session.modelRegistry.authStorage.login(providerId, {
+                            onAuth: (info) => {
                                 this.chatContainer.addChild(new Spacer(1));
-                                this.chatContainer.addChild(new Text(theme.fg("warning", info.instructions), 1, 0));
-                            }
-                            this.ui.requestRender();
-                            const openCmd = process.platform === "darwin"
-                                ? "open"
-                                : process.platform === "win32"
-                                    ? "start"
-                                    : "xdg-open";
-                            exec(`${openCmd} "${info.url}"`);
-                        }, 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.chatContainer.addChild(new Text(theme.fg("accent", "Opening browser to:"), 1, 0));
+                                this.chatContainer.addChild(new Text(theme.fg("accent", info.url), 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();
+                                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(this.editor);
-                                    this.ui.setFocus(this.editor);
-                                    resolve(code);
-                                };
-                                this.editorContainer.clear();
-                                this.editorContainer.addChild(codeInput);
-                                this.ui.setFocus(codeInput);
+                                    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();
-                            });
-                        }, (message) => {
-                            this.chatContainer.addChild(new Text(theme.fg("dim", message), 1, 0));
-                            this.ui.requestRender();
+                            },
                         });
-                        invalidateOAuthCache();
+                        // 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", `Tokens saved to ${getOAuthPath()}`), 1, 0));
+                        this.chatContainer.addChild(new Text(theme.fg("dim", `Credentials saved to ${getAuthPath()}`), 1, 0));
                         this.ui.requestRender();
                     }
                     catch (error) {
@@ -1408,11 +1412,12 @@ export class InteractiveMode {
                 }
                 else {
                     try {
-                        await logout(providerId);
-                        invalidateOAuthCache();
+                        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 ${getOAuthPath()}`), 1, 0));
+                        this.chatContainer.addChild(new Text(theme.fg("dim", `Credentials removed from ${getAuthPath()}`), 1, 0));
                         this.ui.requestRender();
                     }
                     catch (error) {