open-multi-agent-kit 0.94.1 → 0.95.0

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

@@ -16,7 +16,7 @@ import { parseSkillBlock } from "../../core/agent-session.js";
 import { SessionImportFileNotFoundError } from "../../core/agent-session-runtime.js";
 import { parseBangInvocation } from "../../core/bang-skill-invocation.js";
 import { FooterDataProvider } from "../../core/footer-data-provider.js";
-import { githubStarNudgeBody, githubStarNudgeTitle, OMK_GITHUB_STAR_URL, shouldShowGithubStarNudge, } from "../../core/github-star-nudge.js";
+import { OMK_GITHUB_REPOSITORY_URL } from "../../core/github-repository.js";
 import { configureHttpDispatcher, formatHttpIdleTimeoutMs } from "../../core/http-dispatcher.js";
 import { KeybindingsManager } from "../../core/keybindings.js";
 import { createCompactionSummaryMessage } from "../../core/messages.js";
@@ -59,6 +59,7 @@ import { FooterComponent } from "./components/footer.js";
 import { formatKeyText, keyDisplayText, keyHint, keyText, rawKeyHint } from "./components/keybinding-hints.js";
 import { LoginDialogComponent } from "./components/login-dialog.js";
 import { ModelSelectorComponent } from "./components/model-selector.js";
+import { OAuthAccountSelectorComponent } from "./components/oauth-account-selector.js";
 import { OAuthSelectorComponent } from "./components/oauth-selector.js";
 import { ScopedModelsSelectorComponent } from "./components/scoped-models-selector.js";
 import { SessionSelectorComponent } from "./components/session-selector.js";
@@ -507,28 +508,6 @@ export class InteractiveMode {
             this.editor.setAutocompleteProvider?.(provider);
         }
     }
-    showGithubStarNudgeIfNeeded() {
-        if (!shouldShowGithubStarNudge({ githubStarred: this.settingsManager.getGithubStarred() })) {
-            return;
-        }
-        const starUrl = OMK_GITHUB_STAR_URL;
-        const starLink = getCapabilities().hyperlinks
-            ? hyperlink(theme.fg("accent", "open repo & star"), starUrl)
-            : theme.fg("accent", starUrl);
-        const actionLine = theme.fg("muted", "Star it, then run ") +
-            theme.bold(theme.fg("accent", "/star")) +
-            theme.fg("muted", " so this stops. Link: ") +
-            starLink;
-        if (this.chatContainer.children.length > 0) {
-            this.chatContainer.addChild(new Spacer(1));
-        }
-        this.chatContainer.addChild(new DynamicBorder((text) => theme.fg("accent", text)));
-        this.chatContainer.addChild(new Text(`${theme.bold(theme.fg("accent", githubStarNudgeTitle()))}\n${githubStarNudgeBody()}`, 1, 0));
-        this.chatContainer.addChild(new Spacer(1));
-        this.chatContainer.addChild(new Text(actionLine, 1, 0));
-        this.chatContainer.addChild(new DynamicBorder((text) => theme.fg("accent", text)));
-        this.ui.requestRender();
-    }
     showStartupNoticesIfNeeded() {
         if (this.startupNoticesShown) {
             return;
@@ -666,7 +645,7 @@ export class InteractiveMode {
         // rail is actually visible, so the same data is never rendered twice.
         this.statusSidebarPinned = this.settingsManager.getPinStatusSidebar();
         this.ui.addChild(this.footerSlot);
-        this.statusSidebar = new StatusSidebarComponent(() => this.session, this.footerDataProvider, () => this.session.autoCompactionEnabled, () => this.ui.terminal.rows);
+        this.statusSidebar = new StatusSidebarComponent(() => this.session, this.footerDataProvider, () => this.session.autoCompactionEnabled, () => this.ui.terminal.rows, { requestRender: () => this.ui.requestRender() });
         this.ui.showOverlay(this.statusSidebar, {
             anchor: "top-right",
             // Responsive: ~26% of the terminal, clamped — grows on fullscreen.
@@ -1445,7 +1424,6 @@ export class InteractiveMode {
         this.setupExtensionShortcuts(extensionRunner);
         this.showLoadedResources({ force: false, showDiagnosticsWhenQuiet: true });
         this.showStartupNoticesIfNeeded();
-        this.showGithubStarNudgeIfNeeded();
     }
     applyRuntimeSettings() {
         configureHttpDispatcher(this.settingsManager.getHttpIdleTimeoutMs());
@@ -2292,8 +2270,8 @@ export class InteractiveMode {
                 this.editor.setText("");
                 return;
             }
-            if (text === "/star" || text.startsWith("/star ")) {
-                this.handleStarCommand(text);
+            if (text === "/star") {
+                this.handleStarCommand();
                 return true;
             }
             if (text === "/changelog") {
@@ -2651,12 +2629,7 @@ export class InteractiveMode {
                     this.statusContainer.clear();
                 }
                 if (event.aborted) {
-                    if (event.reason === "manual") {
-                        this.showError("Compaction cancelled");
-                    }
-                    else {
-                        this.showStatus("Auto-compaction cancelled");
-                    }
+                    this.showStatus(event.reason === "manual" ? "Compaction cancelled" : "Auto-compaction cancelled");
                 }
                 else if (event.result) {
                     this.chatContainer.clear();
@@ -2769,6 +2742,9 @@ export class InteractiveMode {
         if (termination.kind === "completed" || this.lastRenderedTermination === termination)
             return;
         this.lastRenderedTermination = termination;
+        // compaction_end owns the concise cancellation status; rendering this too duplicates it as a scary error.
+        if (termination.causeCode === "compaction.aborted")
+            return;
         this.showError(formatSessionTermination(termination));
     }
     showPromptError(error, previousTermination) {
@@ -3056,15 +3032,21 @@ export class InteractiveMode {
         try {
             this.unregisterSignalHandlers();
         }
-        catch { }
+        catch (cleanupError) {
+            void cleanupError;
+        }
         try {
             killTrackedDetachedChildren();
         }
-        catch { }
+        catch (cleanupError) {
+            void cleanupError;
+        }
         try {
             this.ui.stop();
         }
-        catch { }
+        catch (cleanupError) {
+            void cleanupError;
+        }
         console.error("OMK exiting due to uncaughtException:");
         console.error(error);
         process.exit(1);
@@ -4215,7 +4197,13 @@ export class InteractiveMode {
                     return;
                 }
                 if (providerOption.authType === "oauth") {
-                    await this.showLoginDialog(providerOption.id, providerOption.name);
+                    const accounts = this.session.modelRegistry.authStorage.listOAuthAccounts(providerOption.id);
+                    if (accounts.length > 0) {
+                        this.showOAuthAccountSelector(providerOption);
+                    }
+                    else {
+                        await this.showLoginDialog(providerOption.id, providerOption.name);
+                    }
                 }
                 else if (providerOption.id === BEDROCK_PROVIDER_ID) {
                     this.showBedrockSetupDialog(providerOption.id, providerOption.name);
@@ -4230,6 +4218,39 @@ export class InteractiveMode {
             return { component: selector, focus: selector };
         });
     }
+    showOAuthAccountSelector(provider) {
+        const authStorage = this.session.modelRegistry.authStorage;
+        const accounts = authStorage.listOAuthAccounts(provider.id);
+        if (accounts.length === 0) {
+            void this.showLoginDialog(provider.id, provider.name);
+            return;
+        }
+        this.showSelector((done) => {
+            const selector = new OAuthAccountSelectorComponent(provider.name, accounts, async (selection) => {
+                done();
+                if (selection.kind === "add") {
+                    await this.showLoginDialog(provider.id, provider.name);
+                    return;
+                }
+                try {
+                    authStorage.selectOAuthAccount(provider.id, selection.index);
+                    this.session.modelRegistry.refresh();
+                    await this.updateAvailableProviderCount();
+                    this.footer.invalidate();
+                    this.updateEditorBorderColor();
+                    const label = authStorage.getOAuthAccountLabel(provider.id) ?? `Account ${selection.index + 1}`;
+                    this.showStatus(`Active ${provider.name} account: ${label}.`);
+                }
+                catch (error) {
+                    this.showError(`Account selection failed: ${error instanceof Error ? error.message : String(error)}`);
+                }
+            }, () => {
+                done();
+                this.showLoginProviderSelector("oauth");
+            });
+            return { component: selector, focus: selector };
+        });
+    }
     async showOAuthSelector(mode) {
         if (mode === "login") {
             this.showLoginAuthTypeSelector();
@@ -4248,12 +4269,20 @@ export class InteractiveMode {
                     return;
                 }
                 try {
+                    const oauthAccountCount = this.session.modelRegistry.authStorage.getOAuthAccountCount(providerOption.id);
                     this.session.modelRegistry.authStorage.logout(providerOption.id);
                     this.session.modelRegistry.refresh();
                     await this.updateAvailableProviderCount();
-                    const message = providerOption.authType === "oauth"
-                        ? `Logged out of ${providerOption.name}`
-                        : `Removed stored API key for ${providerOption.name}. Environment variables and models.json config are unchanged.`;
+                    let message;
+                    if (providerOption.authType === "oauth") {
+                        message =
+                            oauthAccountCount > 1
+                                ? `Logged out of ${providerOption.name}. Removed ${oauthAccountCount} subscription accounts.`
+                                : `Logged out of ${providerOption.name}`;
+                    }
+                    else {
+                        message = `Removed stored API key for ${providerOption.name}. Environment variables and models.json config are unchanged.`;
+                    }
                     this.showStatus(message);
                 }
                 catch (error) {
@@ -4268,7 +4297,18 @@ export class InteractiveMode {
     }
     async completeProviderAuthentication(providerId, providerName, authType, previousModel) {
         this.session.modelRegistry.refresh();
-        const actionLabel = authType === "oauth" ? `Logged in to ${providerName}` : `Saved API key for ${providerName}`;
+        const oauthAccountCount = this.session.modelRegistry.authStorage.getOAuthAccountCount(providerId);
+        const oauthAccountLabel = this.session.modelRegistry.authStorage.getOAuthAccountLabel(providerId);
+        let actionLabel;
+        if (authType === "oauth") {
+            actionLabel = `Logged in to ${providerName}${oauthAccountLabel ? ` as ${oauthAccountLabel}` : ""}`;
+            if (oauthAccountCount > 1) {
+                actionLabel += ` (${oauthAccountCount} subscription accounts; use /login to switch)`;
+            }
+        }
+        else {
+            actionLabel = `Saved API key for ${providerName}`;
+        }
         let selectedModel;
         let selectionError;
         if (isUnknownModel(previousModel)) {
@@ -4787,28 +4827,17 @@ export class InteractiveMode {
         this.chatContainer.addChild(new Text(info, 1, 0));
         this.ui.requestRender();
     }
-    handleStarCommand(text) {
-        const arg = text === "/star" ? "" : text.slice("/star".length).trim().toLowerCase();
-        const reset = arg === "reset" || arg === "again" || arg === "clear";
-        if (reset) {
-            this.settingsManager.setGithubStarred(false);
-            this.chatContainer.addChild(new Spacer(1));
-            this.chatContainer.addChild(new Text(theme.fg("warning", "Star nudge reset. It will show again on the next interactive launch until you /star."), 1, 0));
-            this.ui.requestRender();
-            return;
-        }
-        openBrowser(OMK_GITHUB_STAR_URL);
-        this.settingsManager.setGithubStarred(true);
-        const starLink = getCapabilities().hyperlinks
-            ? hyperlink(theme.fg("accent", OMK_GITHUB_STAR_URL), OMK_GITHUB_STAR_URL)
-            : theme.fg("accent", OMK_GITHUB_STAR_URL);
+    handleStarCommand() {
+        openBrowser(OMK_GITHUB_REPOSITORY_URL);
+        const repositoryLink = getCapabilities().hyperlinks
+            ? hyperlink(theme.fg("accent", OMK_GITHUB_REPOSITORY_URL), OMK_GITHUB_REPOSITORY_URL)
+            : theme.fg("accent", OMK_GITHUB_REPOSITORY_URL);
         this.chatContainer.addChild(new Spacer(1));
         this.chatContainer.addChild(new DynamicBorder((text) => theme.fg("accent", text)));
         this.chatContainer.addChild(new Text([
-            theme.bold(theme.fg("accent", "Thanks — star nudge off")),
-            theme.fg("muted", "Opened the repo (if a browser is available). Hit the star if you have not yet."),
-            `${theme.fg("muted", "Repo: ")}${starLink}`,
-            theme.fg("dim", "Forgot already? /star reset brings the nag back."),
+            theme.bold(theme.fg("accent", "OMK on GitHub")),
+            theme.fg("muted", "Opened the OMK repository in your browser."),
+            `${theme.fg("muted", "Repository: ")}${repositoryLink}`,
         ].join("\n"), 1, 0));
         this.chatContainer.addChild(new DynamicBorder((text) => theme.fg("accent", text)));
         this.ui.requestRender();