@cosmicstack/mercury-agent 1.1.2 → 1.1.4

package/dist/index.js

@@ -80,7 +80,7 @@ function getDefaultConfig() {
       ollamaCloud: {
         name: "ollamaCloud",
         apiKey: getEnv("OLLAMA_CLOUD_API_KEY", ""),
-        baseUrl: getEnv("OLLAMA_CLOUD_BASE_URL", "https://ollama.com/api"),
+        baseUrl: getEnv("OLLAMA_CLOUD_BASE_URL", "https://ollama.com/v1"),
         model: getEnv("OLLAMA_CLOUD_MODEL", "gpt-oss:120b"),
         enabled: getEnvBool("OLLAMA_CLOUD_ENABLED", true)
       },
@@ -91,6 +91,13 @@ function getDefaultConfig() {
         model: getEnv("OLLAMA_LOCAL_MODEL", "gpt-oss:20b"),
         enabled: getEnvBool("OLLAMA_LOCAL_ENABLED", false)
       },
+      openaiCompat: {
+        name: "openaiCompat",
+        apiKey: getEnv("OPENAI_COMPAT_API_KEY", ""),
+        baseUrl: getEnv("OPENAI_COMPAT_BASE_URL", ""),
+        model: getEnv("OPENAI_COMPAT_MODEL", ""),
+        enabled: getEnvBool("OPENAI_COMPAT_ENABLED", false)
+      },
       mimo: {
         name: "mimo",
         apiKey: getEnv("MIMO_API_KEY", ""),
@@ -145,7 +152,9 @@ function loadConfig() {
     const raw = readFileSync(CONFIG_PATH, "utf-8");
     const fileConfig = parseYaml(raw);
     const defaults = getDefaultConfig();
-    return migrateLegacyTelegramAccess(deepMerge(defaults, fileConfig));
+    return migrateLegacyOllamaCloudBaseUrl(
+      migrateLegacyTelegramAccess(deepMerge(defaults, fileConfig))
+    );
   }
   return migrateLegacyTelegramAccess(getDefaultConfig());
 }
@@ -189,6 +198,12 @@ function isProviderConfigured(provider) {
   if (provider.name === "ollamaLocal") {
     return provider.baseUrl.length > 0 && provider.model.length > 0;
   }
+  if (provider.name === "ollamaCloud") {
+    return provider.apiKey.length > 0 && provider.baseUrl.length > 0;
+  }
+  if (provider.name === "openaiCompat") {
+    return provider.baseUrl.length > 0 && provider.model.length > 0;
+  }
   return provider.apiKey.length > 0;
 }
 function getTelegramApprovedUsers(config) {
@@ -330,6 +345,13 @@ function migrateLegacyTelegramAccess(config) {
   delete telegram.pairedUsername;
   return config;
 }
+function migrateLegacyOllamaCloudBaseUrl(config) {
+  if (config.providers.ollamaCloud.baseUrl === "https://ollama.com/api") {
+    config.providers.ollamaCloud.baseUrl = "https://ollama.com/v1";
+    saveConfig(config);
+  }
+  return config;
+}
 
 // src/utils/logger.ts
 import pino from "pino";
@@ -1531,15 +1553,15 @@ var OpenAICompatProvider = class extends BaseProvider {
   model;
   client;
   modelInstance;
-  constructor(config) {
+  constructor(config, { useChatApi } = {}) {
     super(config);
     this.name = config.name;
     this.model = config.model;
     this.client = createOpenAI({
-      apiKey: config.apiKey,
+      apiKey: config.apiKey || "no-key",
       baseURL: config.baseUrl
     });
-    this.modelInstance = this.client(config.model);
+    this.modelInstance = useChatApi ? this.client.chat(config.model) : this.client(config.model);
   }
   async generateText(prompt, systemPrompt) {
     const result = await generateText({
@@ -1686,7 +1708,7 @@ var OllamaProvider = class extends BaseProvider {
     if (this.name === "ollamaLocal") {
       return this.config.baseUrl.length > 0 && this.config.model.length > 0;
     }
-    return this.config.apiKey.length > 0;
+    return this.config.apiKey.length > 0 && this.config.baseUrl.length > 0;
   }
   getModelInstance() {
     return this.modelInstance;
@@ -1737,6 +1759,7 @@ var ProviderRegistry = class {
       config.providers.grok,
       config.providers.ollamaCloud,
       config.providers.ollamaLocal,
+      config.providers.openaiCompat,
       config.providers.mimo,
       config.providers.mimoTokenPlan
     ];
@@ -1748,8 +1771,12 @@ var ProviderRegistry = class {
           provider = new AnthropicProvider(pc);
         } else if (pc.name === "deepseek") {
           provider = new DeepSeekProvider(pc);
-        } else if (pc.name === "ollamaCloud" || pc.name === "ollamaLocal") {
+        } else if (pc.name === "ollamaLocal") {
           provider = new OllamaProvider(pc);
+        } else if (pc.name === "ollamaCloud") {
+          provider = new OpenAICompatProvider(pc, { useChatApi: true });
+        } else if (pc.name === "openaiCompat") {
+          provider = new OpenAICompatProvider(pc, { useChatApi: true });
         } else if (pc.name === "mimo" || pc.name === "mimoTokenPlan") {
           provider = new MiMoProvider(pc);
         } else {
@@ -8156,6 +8183,7 @@ var MIMO_PREFERRED_MODELS = [
   "mimo-v2-flash"
 ];
 var MIMO_TOKEN_PLAN_PREFERRED_MODELS = MIMO_PREFERRED_MODELS;
+var OPENAI_COMPAT_PREFERRED_MODELS = [];
 var ProviderModelFetchError = class extends Error {
   constructor(message) {
     super(message);
@@ -8211,6 +8239,7 @@ function chooseRecommendedModel(provider, models, currentModel) {
     grok: GROK_PREFERRED_MODELS,
     ollamaCloud: OLLAMA_CLOUD_PREFERRED_MODELS,
     ollamaLocal: OLLAMA_LOCAL_PREFERRED_MODELS,
+    openaiCompat: OPENAI_COMPAT_PREFERRED_MODELS,
     mimo: MIMO_PREFERRED_MODELS,
     mimoTokenPlan: MIMO_TOKEN_PLAN_PREFERRED_MODELS
   };
@@ -8237,6 +8266,7 @@ function buildModelCatalog(provider, models, currentModel) {
     grok: GROK_PREFERRED_MODELS,
     ollamaCloud: OLLAMA_CLOUD_PREFERRED_MODELS,
     ollamaLocal: OLLAMA_LOCAL_PREFERRED_MODELS,
+    openaiCompat: OPENAI_COMPAT_PREFERRED_MODELS,
     mimo: MIMO_PREFERRED_MODELS,
     mimoTokenPlan: MIMO_TOKEN_PLAN_PREFERRED_MODELS
   };
@@ -8248,19 +8278,32 @@ function buildModelCatalog(provider, models, currentModel) {
   };
 }
 async function fetchOpenAICompatModels(provider, config) {
+  const headers = {};
+  if (config.apiKey) {
+    headers["Authorization"] = `Bearer ${config.apiKey}`;
+  }
+  let errorMessage;
+  if (provider === "grok") {
+    errorMessage = "Mercury could not fetch models for this Grok key. Please re-enter it.";
+  } else if (provider === "deepseek") {
+    errorMessage = "Mercury could not fetch models for this DeepSeek key. Please re-enter it.";
+  } else if (provider === "openaiCompat") {
+    errorMessage = "Mercury could not fetch models from this server. Please check the base URL and try again.";
+  } else {
+    errorMessage = "Mercury could not fetch models for this OpenAI key. Please re-enter it.";
+  }
   const data = await fetchJson(
     `${trimTrailingSlash(config.baseUrl)}/models`,
-    {
-      headers: {
-        Authorization: `Bearer ${config.apiKey}`
-      }
-    },
-    `Mercury could not fetch models for this ${provider === "grok" ? "Grok" : provider === "deepseek" ? "DeepSeek" : "OpenAI"} key. Please re-enter it.`
+    { headers },
+    errorMessage
   );
   const ids = (data.data ?? []).map((model) => model.id?.trim() ?? "").filter((id) => {
     if (provider === "deepseek") {
       return id.startsWith("deepseek-");
     }
+    if (provider === "openaiCompat") {
+      return id.length > 0;
+    }
     return isOpenAIChatModel(id);
   });
   return buildModelCatalog(provider, ids, config.model);
@@ -8292,17 +8335,27 @@ async function fetchGrokModels(config) {
   const ids = (data.data ?? []).filter((model) => model.output_modalities?.includes("text") || model.output_modalities == null).map((model) => model.id?.trim() ?? "").filter((id) => id.startsWith("grok-"));
   return buildModelCatalog("grok", ids, config.model);
 }
-async function fetchOllamaModels(provider, config) {
-  const headers = config.apiKey ? { Authorization: `Bearer ${config.apiKey}` } : void 0;
+async function fetchOllamaCloudModels(config) {
   const data = await fetchJson(
-    `${trimTrailingSlash(config.baseUrl)}/tags`,
+    `${trimTrailingSlash(config.baseUrl)}/models`,
     {
-      headers
+      headers: {
+        Authorization: `Bearer ${config.apiKey}`
+      }
     },
-    provider === "ollamaCloud" ? "Mercury could not fetch models for this Ollama Cloud key. Please re-enter it." : "Mercury could not fetch models from this Ollama Local server. Please check the base URL and try again."
+    "Mercury could not fetch models for this Ollama Cloud key. Please re-enter it."
+  );
+  const ids = (data.data ?? []).map((model) => model.id?.trim() ?? "").filter(Boolean);
+  return buildModelCatalog("ollamaCloud", ids, config.model);
+}
+async function fetchOllamaLocalModels(config) {
+  const data = await fetchJson(
+    `${trimTrailingSlash(config.baseUrl)}/tags`,
+    {},
+    "Mercury could not fetch models from this Ollama Local server. Please check the base URL and try again."
   );
   const ids = (data.models ?? []).map((model) => model.model?.trim() || model.name?.trim() || "").filter(Boolean);
-  return buildModelCatalog(provider, ids, config.model);
+  return buildModelCatalog("ollamaLocal", ids, config.model);
 }
 async function fetchMiMoModels(config) {
   const data = await fetchJson(
@@ -8343,8 +8396,14 @@ async function fetchProviderModelCatalog(provider, config) {
   if (provider === "grok") {
     return fetchGrokModels(config);
   }
-  if (provider === "ollamaCloud" || provider === "ollamaLocal") {
-    return fetchOllamaModels(provider, config);
+  if (provider === "ollamaCloud") {
+    return fetchOllamaCloudModels(config);
+  }
+  if (provider === "ollamaLocal") {
+    return fetchOllamaLocalModels(config);
+  }
+  if (provider === "openaiCompat") {
+    return fetchOpenAICompatModels(provider, config);
   }
   if (provider === "mimo") {
     return fetchMiMoModels(config);
@@ -8410,6 +8469,7 @@ var PROVIDER_OPTIONS = [
   { key: "grok", label: "Grok (xAI)" },
   { key: "ollamaCloud", label: "Ollama Cloud" },
   { key: "ollamaLocal", label: "Ollama Local" },
+  { key: "openaiCompat", label: "OpenAI Compilations" },
   { key: "mimo", label: "MiMo (Xiaomi)" },
   { key: "mimoTokenPlan", label: "MiMo Token Plan (Xiaomi)" }
 ];
@@ -8635,6 +8695,40 @@ async function promptOllamaLocalModelSelection(config) {
     }
   }
 }
+async function promptOpenAICompatSetup(config, isReconfig) {
+  const existingConfig = config.providers.openaiCompat;
+  const baseUrl = await promptValidatedValue(
+    chalk7.white(`  Server base URL${isReconfig && existingConfig.baseUrl ? ` [${existingConfig.baseUrl}]` : ""}: `),
+    validateBaseUrl,
+    existingConfig.baseUrl
+  );
+  if (!baseUrl) return { skipped: true };
+  const apiKeyPrompt = isReconfig && existingConfig.apiKey ? chalk7.white(`  API key (optional, press Enter to keep current) [${maskKey(existingConfig.apiKey)}]: `) : chalk7.white("  API key (optional, press Enter to skip): ");
+  const apiKey = await ask(apiKeyPrompt);
+  const resolvedApiKey = apiKey || existingConfig.apiKey || "";
+  console.log(chalk7.dim("  Fetching models from server..."));
+  try {
+    const catalog = await fetchProviderModelCatalog("openaiCompat", {
+      ...existingConfig,
+      baseUrl,
+      apiKey: resolvedApiKey
+    });
+    const model = await chooseProviderModel(
+      "OpenAI Compilations",
+      catalog.recommendedModel,
+      catalog.models
+    );
+    return { baseUrl, apiKey: resolvedApiKey, model, skipped: false };
+  } catch {
+    console.log(chalk7.yellow("  Could not fetch models from this server. You can enter the model name manually."));
+    const model = await promptValidatedValue(
+      chalk7.white("  Model name: "),
+      validateModelName
+    );
+    if (!model) return { baseUrl, apiKey: resolvedApiKey, model: existingConfig.model, skipped: false };
+    return { baseUrl, apiKey: resolvedApiKey, model, skipped: false };
+  }
+}
 async function promptValidatedValue(prompt, validator, existingValue, options) {
   while (true) {
     const value = await ask(prompt);
@@ -8868,6 +8962,18 @@ async function configure(existingConfig) {
         }
         continue;
       }
+      if (provider === "openaiCompat") {
+        const result = await promptOpenAICompatSetup(config, isReconfig);
+        if (!result.skipped && result.baseUrl && result.model) {
+          config.providers.openaiCompat.baseUrl = result.baseUrl;
+          config.providers.openaiCompat.model = result.model;
+          config.providers.openaiCompat.enabled = true;
+          if (result.apiKey) {
+            config.providers.openaiCompat.apiKey = result.apiKey;
+          }
+        }
+        continue;
+      }
       if (provider === "mimo") {
         const mask = isReconfig && config.providers.mimo.apiKey ? ` [${maskKey(config.providers.mimo.apiKey)}]` : "";
         const result = await promptApiKeyWithModelSelection(
@@ -9054,16 +9160,21 @@ async function runAgent(isDaemon = false) {
     process.exit(1);
   }
   const available = providers.listAvailable();
-  const providerLabels = available.map((provider) => getProviderLabel(provider));
-  const providerModels = available.map((provider) => {
-    const key = provider;
-    return `${getProviderLabel(key)}: ${config.providers[key].model}`;
-  });
+  const defaultProvider = config.providers.default;
+  const defaultModel = config.providers[defaultProvider]?.model ?? "unknown";
   if (!isDaemon) {
-    console.log(chalk7.dim(`  Providers: ${providerLabels.join(", ")}`));
-    console.log(chalk7.dim(`  Models: ${providerModels.join(" | ")}`));
+    const providerSummary = available.map((provider) => {
+      const key = provider;
+      const label = getProviderLabel(key);
+      const model = config.providers[key]?.model ?? "?";
+      const marker = key === defaultProvider ? " \u2190 default" : "";
+      return `${label}: ${model}${marker}`;
+    });
+    console.log("");
+    console.log(chalk7.bgMagenta.black.bold(` \u26A1 ${getProviderLabel(defaultProvider)} \xB7 ${defaultModel} `));
+    console.log(chalk7.dim(`  Providers: ${providerSummary.join("  \xB7  ")}`));
   } else {
-    logger.info({ providers: available }, "Providers loaded");
+    logger.info({ providers: available, default: defaultProvider }, "Providers loaded");
   }
   const skillLoader = new SkillLoader();
   const skills = skillLoader.discover();