open-multi-agent-kit 0.98.2 → 0.98.4

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

@@ -7,10 +7,13 @@ import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
 import { spawn, spawnSync } from "child_process";
-import { getProviders, } from "omk-ai";
 import { AttachmentStore } from "../../core/attachment-store.js";
 import { describePromptImageAttachment } from "../../core/prompt-attachment.js";
 import { createAttachmentStrip } from "./components/attachment-strip.js";
+export { formatResumeCommand } from "./interactive-resume-command.js";
+import { getApiKeyLoginDisplayName, isApiKeyLoginProvider, resolveLoginProviderArg, } from "./interactive-login-options.js";
+import { disposeComponent, ExpandableText, isExpandable, normalizeToolExecutionResult, } from "./interactive-tool-result.js";
+export { getApiKeyLoginDisplayName, isApiKeyLoginProvider, resolveLoginProviderArg, } from "./interactive-login-options.js";
 import { CombinedAutocompleteProvider, Container, fuzzyFilter, getCapabilities, hyperlink, Loader, Markdown, matchesKey, ProcessTerminal, Spacer, setKeybindings, Text, TruncatedText, TUI, visibleWidth, } from "omk-tui";
 import { APP_NAME, APP_TITLE, getAgentDir, getAuthPath, getDebugLogPath, getDocsPath, getShareViewerUrl, VERSION, } from "../../config.js";
 import { parseSkillBlock } from "../../core/agent-session.js";
@@ -25,7 +28,6 @@ import { KeybindingsManager } from "../../core/keybindings.js";
 import { createCompactionSummaryMessage } from "../../core/messages.js";
 import { defaultModelPerProvider, findExactModelReferenceMatch, resolveModelScope } from "../../core/model-resolver.js";
 import { DefaultPackageManager } from "../../core/package-manager.js";
-import { BUILT_IN_PROVIDER_DISPLAY_NAMES } from "../../core/provider-display-names.js";
 import { decideResourceAdmission } from "../../core/resource-admission.js";
 import { formatResourcePolicyLines, formatResourceProbeLines, formatResourceSummaryLines, resolveResourceGovernorSettings, } from "../../core/resource-governor-settings.js";
 import { formatMissingSessionCwdPrompt, MissingSessionCwdError } from "../../core/session-cwd.js";
@@ -40,6 +42,7 @@ import { parseGitUrl } from "../../utils/git.js";
 import { openBrowser } from "../../utils/open-browser.js";
 import { getCwdRelativePath } from "../../utils/paths.js";
 import { killTrackedDetachedChildren } from "../../utils/shell.js";
+import { terminalMarkdownLinks } from "../../utils/terminal-links.js";
 import { ensureTool } from "../../utils/tools-manager.js";
 import { checkForNewOmkVersion } from "../../utils/version-check.js";
 import { ArminComponent } from "./components/armin.js";
@@ -76,63 +79,6 @@ import { TreeSelectorComponent } from "./components/tree-selector.js";
 import { UserMessageComponent } from "./components/user-message.js";
 import { UserMessageSelectorComponent } from "./components/user-message-selector.js";
 import { getAvailableThemes, getAvailableThemesWithPaths, getEditorTheme, getMarkdownTheme, getThemeByName, initTheme, onThemeChange, setRegisteredThemes, setTheme, setThemeInstance, stopThemeWatcher, Theme, theme, } from "./theme/theme.js";
-function isExpandable(obj) {
-    return typeof obj === "object" && obj !== null && "setExpanded" in obj && typeof obj.setExpanded === "function";
-}
-function disposeComponent(component) {
-    if (typeof component === "object" &&
-        component !== null &&
-        "dispose" in component &&
-        typeof component.dispose === "function") {
-        component.dispose();
-    }
-}
-function isRecord(value) {
-    return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function isToolExecutionContent(value) {
-    if (!isRecord(value))
-        return false;
-    if (value.type === "text")
-        return typeof value.text === "string";
-    return value.type === "image" && typeof value.data === "string" && typeof value.mimeType === "string";
-}
-function isToolExecutionResult(value) {
-    return isRecord(value) && Array.isArray(value.content) && value.content.every(isToolExecutionContent);
-}
-function normalizeToolExecutionResult(result, isError) {
-    try {
-        if (isToolExecutionResult(result)) {
-            return { content: result.content, details: result.details, isError };
-        }
-    }
-    catch {
-        // Treat inaccessible or malformed extension payloads as invalid results.
-    }
-    return {
-        content: [{ type: "text", text: "Tool returned an invalid result." }],
-        isError: true,
-    };
-}
-class ExpandableText extends Text {
-    getCollapsedText;
-    getExpandedText;
-    expanded;
-    constructor(getCollapsedText, getExpandedText, expanded = false, paddingX = 0, paddingY = 0) {
-        super(expanded ? getExpandedText() : getCollapsedText(), paddingX, paddingY);
-        this.getCollapsedText = getCollapsedText;
-        this.getExpandedText = getExpandedText;
-        this.expanded = expanded;
-    }
-    setExpanded(expanded) {
-        this.expanded = expanded;
-        this.setText(expanded ? this.getExpandedText() : this.getCollapsedText());
-    }
-    invalidate() {
-        this.setText(this.expanded ? this.getExpandedText() : this.getCollapsedText());
-        super.invalidate();
-    }
-}
 const DEAD_TERMINAL_ERROR_CODES = new Set(["EIO", "EPIPE", "ENOTCONN"]);
 /**
  * Pseudo-entry for the thinking selector/autocomplete representing auto mode.
@@ -155,41 +101,10 @@ function isAnthropicSubscriptionAuthKey(apiKey) {
 function isUnknownModel(model) {
     return !!model && model.provider === "unknown" && model.id === "unknown" && model.api === "unknown";
 }
-function quoteIfNeeded(value) {
-    if (value.length > 0 && !/[^a-zA-Z0-9_\-./~:@]/.test(value)) {
-        return value;
-    }
-    return `'${value.replace(/'/g, `'\\''`)}'`;
-}
-export function formatResumeCommand(sessionManager) {
-    if (!process.stdout.isTTY)
-        return undefined;
-    if (!sessionManager.isPersisted())
-        return undefined;
-    const sessionFile = sessionManager.getSessionFile();
-    if (!sessionFile || !fs.existsSync(sessionFile))
-        return undefined;
-    const args = [APP_NAME];
-    if (!sessionManager.usesDefaultSessionDir()) {
-        args.push("--session-dir", quoteIfNeeded(sessionManager.getSessionDir()));
-    }
-    args.push("--session", sessionManager.getSessionId());
-    return args.join(" ");
-}
 function hasDefaultModelProvider(providerId) {
     return providerId in defaultModelPerProvider;
 }
 const BEDROCK_PROVIDER_ID = "amazon-bedrock";
-const BUILT_IN_MODEL_PROVIDERS = new Set(getProviders());
-export function isApiKeyLoginProvider(providerId, oauthProviderIds, builtInProviderIds = BUILT_IN_MODEL_PROVIDERS) {
-    if (BUILT_IN_PROVIDER_DISPLAY_NAMES[providerId]) {
-        return true;
-    }
-    if (builtInProviderIds.has(providerId)) {
-        return false;
-    }
-    return !oauthProviderIds.has(providerId);
-}
 /** Placeholder shown in the empty editor to make core affordances discoverable. */
 const EDITOR_PLACEHOLDER = "Ask anything · / for commands · ! for skills/bash";
 /** How long transient info notices stay visible below the editor. */
@@ -434,6 +349,46 @@ export class InteractiveMode {
                 });
             };
         }
+        const loginCommand = slashCommands.find((command) => command.name === "login");
+        if (loginCommand) {
+            loginCommand.argumentHint = "[provider]";
+            loginCommand.getArgumentCompletions = (prefix) => {
+                const options = this.getLoginProviderOptions();
+                // Dedupe ids that appear as both oauth and api_key (e.g.
+                // meta): keep the oauth (subscription) entry.
+                const byId = new Map();
+                for (const option of options) {
+                    const existing = byId.get(option.id);
+                    if (!existing || (existing.authType !== "oauth" && option.authType === "oauth")) {
+                        byId.set(option.id, option);
+                    }
+                }
+                const unique = [...byId.values()];
+                const filtered = fuzzyFilter(unique, prefix.trimStart(), (option) => `${option.id} ${option.name}`);
+                if (filtered.length === 0)
+                    return null;
+                return filtered.map((option) => ({
+                    value: option.id,
+                    label: option.id,
+                    description: option.name,
+                }));
+            };
+        }
+        const logoutCommand = slashCommands.find((command) => command.name === "logout");
+        if (logoutCommand) {
+            logoutCommand.argumentHint = "[provider]";
+            logoutCommand.getArgumentCompletions = (prefix) => {
+                const options = this.getLogoutProviderOptions();
+                const filtered = fuzzyFilter(options, prefix.trimStart(), (option) => `${option.id} ${option.name}`);
+                if (filtered.length === 0)
+                    return null;
+                return filtered.map((option) => ({
+                    value: option.id,
+                    label: option.id,
+                    description: option.name,
+                }));
+            };
+        }
         const modelCommand = slashCommands.find((command) => command.name === "model");
         if (modelCommand) {
             modelCommand.getArgumentCompletions = (prefix) => {
@@ -899,6 +854,7 @@ export class InteractiveMode {
     getMarkdownThemeWithSettings() {
         return {
             ...getMarkdownTheme(),
+            ...terminalMarkdownLinks(this.sessionManager.getCwd()),
             codeBlockIndent: this.settingsManager.getCodeBlockIndent(),
         };
     }
@@ -2217,7 +2173,7 @@ export class InteractiveMode {
                 this.updateEditorBorderColor();
             }
         };
-        // Handle clipboard image paste (triggered on Ctrl+V)
+        // Handle the configured clipboard image shortcut (Ctrl+V or Alt+V).
         this.defaultEditor.onPasteImage = () => {
             this.handleClipboardImagePaste();
         };
@@ -2226,18 +2182,13 @@ export class InteractiveMode {
         try {
             const image = await readClipboardImage();
             if (!image) {
+                this.showStatus("No image in clipboard. Copy a screenshot, then press Alt+V (or Ctrl+V if forwarded by your terminal).");
                 return;
             }
-            let attachment;
-            try {
-                attachment = this.attachmentStore.put(new Uint8Array(image.bytes), "clipboard");
-            }
-            catch (error) {
-                this.showWarning(error instanceof Error ? error.message : String(error));
-                return;
-            }
+            const attachment = this.attachmentStore.put(new Uint8Array(image.bytes), "clipboard");
             this.draftAttachmentIds.push(attachment.id);
             this.refreshAttachmentStrip();
+            this.showStatus("Image attached to the prompt. Submit when ready.");
         }
         catch (error) {
             this.showWarning(`Clipboard paste failed: ${error instanceof Error ? error.message : String(error)}`);
@@ -2433,13 +2384,25 @@ export class InteractiveMode {
                 this.editor.setText("");
                 return;
             }
-            if (text === "/login") {
-                this.showOAuthSelector("login");
+            if (text === "/login" || text.startsWith("/login ")) {
+                const providerArg = text.startsWith("/login ") ? text.slice("/login".length).trim() : undefined;
+                if (providerArg) {
+                    await this.handleLoginProviderArg(providerArg);
+                }
+                else {
+                    this.showOAuthSelector("login");
+                }
                 this.editor.setText("");
                 return;
             }
-            if (text === "/logout") {
-                this.showOAuthSelector("logout");
+            if (text === "/logout" || text.startsWith("/logout ")) {
+                const providerArg = text.startsWith("/logout ") ? text.slice("/logout".length).trim() : undefined;
+                if (providerArg) {
+                    await this.handleLogoutProviderArg(providerArg);
+                }
+                else {
+                    this.showOAuthSelector("logout");
+                }
                 this.editor.setText("");
                 return;
             }
@@ -4342,14 +4305,21 @@ export class InteractiveMode {
             if (!isApiKeyLoginProvider(providerId, oauthProviderIds)) {
                 continue;
             }
+            const displayName = this.session.modelRegistry.getProviderDisplayName(providerId);
             options.push({
                 id: providerId,
-                name: this.session.modelRegistry.getProviderDisplayName(providerId),
+                // The shared "meta" id resolves its display name to the oauth
+                // entry, so label the API-key row distinctly.
+                name: oauthProviderIds.has(providerId) && displayName !== providerId
+                    ? getApiKeyLoginDisplayName(providerId, displayName)
+                    : displayName,
                 authType: "api_key",
             });
         }
         const filteredOptions = authType ? options.filter((option) => option.authType === authType) : options;
-        return filteredOptions.sort((a, b) => a.name.localeCompare(b.name));
+        // Stable order: by name, then oauth before api_key so a shared id
+        // (e.g. meta) lists the subscription entry first.
+        return filteredOptions.sort((a, b) => a.name.localeCompare(b.name) || a.authType.localeCompare(b.authType));
     }
     getLogoutProviderOptions() {
         const authStorage = this.session.modelRegistry.authStorage;
@@ -4367,6 +4337,40 @@ export class InteractiveMode {
         }
         return options.sort((a, b) => a.name.localeCompare(b.name));
     }
+    async handleLogoutProviderArg(providerArg) {
+        const providerOptions = this.getLogoutProviderOptions();
+        const match = resolveLoginProviderArg(providerArg, providerOptions);
+        if (!match) {
+            const hint = providerOptions.length > 0
+                ? "Run /logout and pick from the list of stored credentials."
+                : "No stored credentials to remove.";
+            this.showWarning(`Unknown provider "${providerArg}". ${hint}`);
+            return;
+        }
+        await this.logoutProvider(match);
+    }
+    async logoutProvider(providerOption) {
+        try {
+            const oauthAccountCount = this.session.modelRegistry.authStorage.getOAuthAccountCount(providerOption.id);
+            this.session.modelRegistry.authStorage.logout(providerOption.id);
+            this.session.modelRegistry.refresh();
+            await this.updateAvailableProviderCount();
+            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) {
+            this.showError(`Logout failed: ${error instanceof Error ? error.message : String(error)}`);
+        }
+    }
     showLoginAuthTypeSelector() {
         const subscriptionLabel = "Use a subscription";
         const apiKeyLabel = "Use an API key";
@@ -4382,6 +4386,33 @@ export class InteractiveMode {
             return { component: selector, focus: selector };
         });
     }
+    async handleLoginProviderArg(providerArg) {
+        const providerOptions = this.getLoginProviderOptions();
+        const match = resolveLoginProviderArg(providerArg, providerOptions);
+        if (!match) {
+            this.showWarning(`Unknown provider "${providerArg}". Run /login and pick from the list, or check /model for provider ids.`);
+            return;
+        }
+        await this.startLoginForProvider(match);
+    }
+    async startLoginForProvider(providerOption) {
+        if (providerOption.authType === "oauth") {
+            const authStorage = this.session.modelRegistry.authStorage;
+            const accounts = 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);
+        }
+        else {
+            await this.showApiKeyLoginDialog(providerOption.id, providerOption.name);
+        }
+    }
     showLoginProviderSelector(authType) {
         const providerOptions = this.getLoginProviderOptions(authType);
         if (providerOptions.length === 0) {
@@ -4395,21 +4426,7 @@ export class InteractiveMode {
                 if (!providerOption) {
                     return;
                 }
-                if (providerOption.authType === "oauth") {
-                    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);
-                }
-                else {
-                    await this.showApiKeyLoginDialog(providerOption.id, providerOption.name);
-                }
+                await this.startLoginForProvider(providerOption);
             }, () => {
                 done();
                 this.showLoginAuthTypeSelector();
@@ -4467,26 +4484,7 @@ export class InteractiveMode {
                 if (!providerOption) {
                     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();
-                    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) {
-                    this.showError(`Logout failed: ${error instanceof Error ? error.message : String(error)}`);
-                }
+                await this.logoutProvider(providerOption);
             }, () => {
                 done();
                 this.ui.requestRender();