@cosmicstack/mercury-agent 1.1.2 → 1.1.3

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)
       },
@@ -145,7 +145,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 +191,9 @@ 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;
+  }
   return provider.apiKey.length > 0;
 }
 function getTelegramApprovedUsers(config) {
@@ -330,6 +335,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,7 +1543,7 @@ var OpenAICompatProvider = class extends BaseProvider {
   model;
   client;
   modelInstance;
-  constructor(config) {
+  constructor(config, { useChatApi } = {}) {
     super(config);
     this.name = config.name;
     this.model = config.model;
@@ -1539,7 +1551,7 @@ var OpenAICompatProvider = class extends BaseProvider {
       apiKey: config.apiKey,
       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 +1698,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;
@@ -1748,8 +1760,10 @@ 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 === "mimo" || pc.name === "mimoTokenPlan") {
           provider = new MiMoProvider(pc);
         } else {
@@ -8292,17 +8306,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 +8367,11 @@ 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 === "mimo") {
     return fetchMiMoModels(config);