@eminent337/aery 0.1.110 → 0.1.112

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

@@ -11,9 +11,10 @@ import { CombinedAutocompleteProvider, Container, fuzzyFilter, Loader, Markdown,
 import { spawn, spawnSync } from "child_process";
 import { collectCapabilitiesReport, formatCapabilitiesReport } from "../../cli/capabilities.js";
 import { formatCurrentCoreExtensionsReport } from "../../cli/doctor.js";
-import { APP_NAME, getAgentDir, getAuthPath, getDebugLogPath, getShareViewerUrl, getUpdateInstruction, VERSION, } from "../../config.js";
+import { APP_NAME, getAgentDir, getAuthPath, getDebugLogPath, getModelsPath, getShareViewerUrl, getUpdateInstruction, VERSION, } from "../../config.js";
 import { parseSkillBlock } from "../../core/agent-session.js";
 import { SessionImportFileNotFoundError } from "../../core/agent-session-runtime.js";
+import { CUSTOM_OPENAI_COMPATIBLE_PROVIDER_ID, saveCustomOpenAICompatibleProvider, } from "../../core/custom-openai-compatible.js";
 import { FooterDataProvider } from "../../core/footer-data-provider.js";
 import { KeybindingsManager } from "../../core/keybindings.js";
 import { createCompactionSummaryMessage } from "../../core/messages.js";
@@ -117,6 +118,7 @@ const API_KEY_PROVIDER_NAMES = {
     zai: "ZAI",
 };
 const API_KEY_LOGIN_PROVIDER_BLOCKLIST = new Set(["amazon-bedrock", "llama.cpp", "lmstudio", "ollama"]);
+const CUSTOM_OPENAI_COMPATIBLE_PROVIDER_LABEL = "Custom OpenAI-compatible";
 export function isApiKeyLoginProvider(providerId, oauthProviderIds, builtInProviderIds = new Set(getProviders())) {
     if (API_KEY_PROVIDER_NAMES[providerId])
         return true;
@@ -3687,6 +3689,13 @@ export class InteractiveMode {
                 authType: "api_key",
             });
         }
+        if (!authType || authType === "api_key") {
+            options.push({
+                id: CUSTOM_OPENAI_COMPATIBLE_PROVIDER_ID,
+                name: CUSTOM_OPENAI_COMPATIBLE_PROVIDER_LABEL,
+                authType: "api_key",
+            });
+        }
         const filteredOptions = authType ? options.filter((option) => option.authType === authType) : options;
         return filteredOptions.sort((a, b) => a.name.localeCompare(b.name));
     }
@@ -3737,7 +3746,10 @@ export class InteractiveMode {
                 if (!providerOption) {
                     return;
                 }
-                if (providerOption.authType === "oauth") {
+                if (providerOption.id === CUSTOM_OPENAI_COMPATIBLE_PROVIDER_ID) {
+                    await this.showCustomOpenAICompatibleLoginDialog();
+                }
+                else if (providerOption.authType === "oauth") {
                     await this.showLoginDialog(providerOption.id, providerOption.name);
                 }
                 else {
@@ -3889,6 +3901,72 @@ export class InteractiveMode {
             }
         }
     }
+    async showCustomOpenAICompatibleLoginDialog() {
+        const previousModel = this.session.model;
+        const dialog = new LoginDialogComponent(this.ui, CUSTOM_OPENAI_COMPATIBLE_PROVIDER_ID, (_success, _message) => { }, `Configure ${CUSTOM_OPENAI_COMPATIBLE_PROVIDER_LABEL}`);
+        this.editorContainer.clear();
+        this.editorContainer.addChild(dialog);
+        this.ui.setFocus(dialog);
+        this.ui.requestRender();
+        const restoreEditor = () => {
+            this.editorContainer.clear();
+            this.editorContainer.addChild(this.editor);
+            this.ui.setFocus(this.editor);
+            this.ui.requestRender();
+        };
+        try {
+            const baseUrl = (await dialog.showPrompt("Enter base URL:", "https://api.example.com/v1")).trim();
+            if (!baseUrl) {
+                throw new Error("Base URL cannot be empty.");
+            }
+            const modelId = (await dialog.showPrompt("Enter model ID:", "gpt-4o-mini")).trim();
+            if (!modelId) {
+                throw new Error("Model ID cannot be empty.");
+            }
+            const apiKey = (await dialog.showPrompt("Enter API key:", "sk-...")).trim();
+            if (!apiKey) {
+                throw new Error("API key cannot be empty.");
+            }
+            const saved = saveCustomOpenAICompatibleProvider({
+                modelsPath: getModelsPath(),
+                baseUrl,
+                modelId,
+            });
+            this.session.modelRegistry.authStorage.set(saved.providerId, { type: "api_key", key: apiKey });
+            this.session.modelRegistry.refresh();
+            restoreEditor();
+            await this.updateAvailableProviderCount();
+            this.footer.invalidate();
+            this.updateEditorBorderColor();
+            const model = this.session.modelRegistry.find(saved.providerId, saved.modelId);
+            let selectedModel = false;
+            if (model) {
+                try {
+                    await this.session.setModel(model);
+                    selectedModel = true;
+                }
+                catch (error) {
+                    this.showError(`Saved ${saved.providerId}/${saved.modelId}, but selecting it failed: ${error instanceof Error ? error.message : String(error)}. Use /model to select it manually.`);
+                }
+            }
+            if (selectedModel) {
+                this.showStatus(`Configured ${saved.providerId}/${saved.modelId}. Provider saved to ${saved.modelsPath}; API key saved to ${getAuthPath()}.`);
+            }
+            else {
+                this.showStatus(`Configured ${saved.providerId}/${saved.modelId}. Provider saved to ${saved.modelsPath}; API key saved to ${getAuthPath()}. Use /model to select it.`);
+            }
+            if (isUnknownModel(previousModel) && !selectedModel) {
+                this.showWarning(`Custom provider ${saved.providerId} is available, but no model was selected automatically.`);
+            }
+        }
+        catch (error) {
+            restoreEditor();
+            const errorMsg = error instanceof Error ? error.message : String(error);
+            if (errorMsg !== "Login cancelled") {
+                this.showError(`Failed to configure ${CUSTOM_OPENAI_COMPATIBLE_PROVIDER_LABEL}: ${errorMsg}`);
+            }
+        }
+    }
     async showLoginDialog(providerId, providerName) {
         const providerInfo = this.session.modelRegistry.authStorage
             .getOAuthProviders()