@cosmicstack/mercury-agent 1.1.3 → 1.1.5

package/README.md

@@ -1,8 +1,8 @@
 <p align="center">
   <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="docs/card-dark.png">
-    <source media="(prefers-color-scheme: light)" srcset="docs/card-light.png">
-    <img alt="Mercury — Soul-Driven AI Agent" src="docs/card-light.png" width="600">
+    <source media="(prefers-color-scheme: dark)" srcset="docs/img/card-dark.png">
+    <source media="(prefers-color-scheme: light)" srcset="docs/img/card-light.png">
+    <img alt="Mercury — Soul-Driven AI Agent" src="docs/img/card-light.png" width="600">
   </picture>
 </p>
 

package/dist/index.js

@@ -88,9 +88,16 @@ function getDefaultConfig() {
         name: "ollamaLocal",
         apiKey: "",
         baseUrl: getEnv("OLLAMA_LOCAL_BASE_URL", "http://127.0.0.1:11434/api"),
-        model: getEnv("OLLAMA_LOCAL_MODEL", "gpt-oss:20b"),
+        model: getEnv("OLLAMA_LOCAL_MODEL", ""),
         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", ""),
@@ -194,6 +201,9 @@ function isProviderConfigured(provider) {
   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) {
@@ -1548,7 +1558,7 @@ var OpenAICompatProvider = class extends BaseProvider {
     this.name = config.name;
     this.model = config.model;
     this.client = createOpenAI({
-      apiKey: config.apiKey,
+      apiKey: config.apiKey || "no-key",
       baseURL: config.baseUrl
     });
     this.modelInstance = useChatApi ? this.client.chat(config.model) : this.client(config.model);
@@ -1749,6 +1759,7 @@ var ProviderRegistry = class {
       config.providers.grok,
       config.providers.ollamaCloud,
       config.providers.ollamaLocal,
+      config.providers.openaiCompat,
       config.providers.mimo,
       config.providers.mimoTokenPlan
     ];
@@ -1764,6 +1775,8 @@ var ProviderRegistry = class {
           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 {
@@ -8159,8 +8172,16 @@ var OLLAMA_CLOUD_PREFERRED_MODELS = [
   "gpt-oss:20b"
 ];
 var OLLAMA_LOCAL_PREFERRED_MODELS = [
-  "gpt-oss:20b",
-  "gpt-oss:120b"
+  "llama3.2",
+  "llama3.1",
+  "llama3",
+  "mistral",
+  "codellama",
+  "gemma2",
+  "phi3",
+  "qwen2",
+  "deepseek-r1",
+  "deepseek-coder-v2"
 ];
 var MIMO_PREFERRED_MODELS = [
   "mimo-v2.5-pro",
@@ -8170,6 +8191,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);
@@ -8225,6 +8247,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
   };
@@ -8251,6 +8274,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
   };
@@ -8262,19 +8286,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);
@@ -8373,6 +8410,9 @@ async function fetchProviderModelCatalog(provider, config) {
   if (provider === "ollamaLocal") {
     return fetchOllamaLocalModels(config);
   }
+  if (provider === "openaiCompat") {
+    return fetchOpenAICompatModels(provider, config);
+  }
   if (provider === "mimo") {
     return fetchMiMoModels(config);
   }
@@ -8437,6 +8477,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)" }
 ];
@@ -8631,35 +8672,106 @@ async function promptApiKeyWithModelSelection(config, provider, providerLabel, p
       );
       return { apiKey: value, model, skipped: false };
     } catch (error) {
-      const message = error instanceof ProviderModelFetchError ? error.message : `Mercury could not fetch models for ${providerLabel}. Please re-enter the key.`;
-      console.log(chalk7.red(`  ${message}`));
+      const message = error instanceof ProviderModelFetchError ? error.message : `Mercury could not fetch models for ${providerLabel}.`;
+      console.log(chalk7.yellow(`  ${message}`));
+      console.log(chalk7.dim("  The API key looks valid but Mercury could not reach the provider."));
+      console.log(chalk7.dim(`  You can enter a model name manually, or skip ${providerLabel} for now.`));
+      const manualModel = await ask(chalk7.white(`  ${providerLabel} model name (Enter to skip ${providerLabel} for now): `));
+      if (!manualModel) {
+        if (isReconfig && existingConfig.apiKey) {
+          return { apiKey: existingConfig.apiKey, model: existingConfig.model, skipped: true };
+        }
+        return { skipped: true };
+      }
+      const modelError = validateModelName(manualModel);
+      if (modelError) {
+        console.log(chalk7.red(`  ${modelError}`));
+        continue;
+      }
+      return { apiKey: value, model: manualModel, skipped: false };
     }
   }
 }
-async function promptOllamaLocalModelSelection(config) {
+async function promptOllamaLocalModelSelection(config, isReconfig) {
   const existingConfig = config.providers.ollamaLocal;
-  while (true) {
-    const baseUrl = await promptValidatedValue(
-      chalk7.white(`  Ollama Local base URL [${existingConfig.baseUrl}]: `),
-      validateBaseUrl,
-      existingConfig.baseUrl
+  const baseUrlPrompt = isReconfig && existingConfig.baseUrl ? chalk7.white(`  Ollama Local base URL [${existingConfig.baseUrl}]: `) : chalk7.white('  Ollama Local base URL (Enter to skip, or "none" to skip): ');
+  const baseUrlInput = await ask(baseUrlPrompt);
+  if (!baseUrlInput || baseUrlInput.toLowerCase() === "none") {
+    if (isReconfig && existingConfig.baseUrl) {
+      return { baseUrl: existingConfig.baseUrl, model: existingConfig.model, skipped: true };
+    }
+    return { skipped: true };
+  }
+  const baseUrlError = validateBaseUrl(baseUrlInput);
+  if (baseUrlError) {
+    console.log(chalk7.red(`  ${baseUrlError}`));
+    if (isReconfig && existingConfig.baseUrl) {
+      return { baseUrl: existingConfig.baseUrl, model: existingConfig.model, skipped: true };
+    }
+    return { skipped: true };
+  }
+  const baseUrl = baseUrlInput;
+  console.log(chalk7.dim("  Fetching Ollama Local models..."));
+  try {
+    const catalog = await fetchProviderModelCatalog("ollamaLocal", {
+      ...existingConfig,
+      baseUrl
+    });
+    const model = await chooseProviderModel(
+      "Ollama Local",
+      catalog.recommendedModel,
+      catalog.models
     );
-    console.log(chalk7.dim("  Fetching Ollama Local models..."));
-    try {
-      const catalog = await fetchProviderModelCatalog("ollamaLocal", {
-        ...existingConfig,
-        baseUrl
-      });
-      const model = await chooseProviderModel(
-        "Ollama Local",
-        catalog.recommendedModel,
-        catalog.models
-      );
-      return { baseUrl, model, skipped: false };
-    } catch (error) {
-      const message = error instanceof ProviderModelFetchError ? error.message : "Mercury could not fetch Ollama Local models. Please check the base URL and try again.";
-      console.log(chalk7.red(`  ${message}`));
+    return { baseUrl, model, skipped: false };
+  } catch (error) {
+    const message = error instanceof ProviderModelFetchError ? error.message : "Mercury could not fetch Ollama Local models.";
+    console.log(chalk7.yellow(`  ${message}`));
+    console.log(chalk7.dim("  Make sure Ollama is running locally, or enter the model name manually."));
+    console.log(chalk7.dim("  You can run `mercury doctor` later to configure Ollama after starting it."));
+    const manualModel = await ask(chalk7.white(`  Ollama Local model name (Enter to skip Ollama Local for now): `));
+    if (!manualModel) {
+      return { skipped: true };
+    }
+    const modelError = validateModelName(manualModel);
+    if (modelError) {
+      console.log(chalk7.red(`  ${modelError}`));
+      return { skipped: true };
     }
+    return { baseUrl, model: manualModel, skipped: false };
+  }
+}
+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) {
@@ -8799,7 +8911,8 @@ async function configure(existingConfig) {
   if (isReconfig) {
     console.log(chalk7.dim("  Choose which providers to configure now. Existing values are shown where available."));
   } else {
-    console.log(chalk7.dim("  Choose one or more providers. Press Enter to configure DeepSeek by default."));
+    console.log(chalk7.dim("  Choose one or more providers. You can skip any provider by pressing Enter."));
+    console.log(chalk7.dim("  Press Enter to configure DeepSeek by default (free at platform.deepseek.com)."));
   }
   console.log("");
   while (true) {
@@ -8887,7 +9000,7 @@ async function configure(existingConfig) {
         continue;
       }
       if (provider === "ollamaLocal") {
-        const result = await promptOllamaLocalModelSelection(config);
+        const result = await promptOllamaLocalModelSelection(config, isReconfig);
         if (!result.skipped && result.baseUrl && result.model) {
           config.providers.ollamaLocal.baseUrl = result.baseUrl;
           config.providers.ollamaLocal.model = result.model;
@@ -8895,6 +9008,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(
@@ -8929,8 +9054,25 @@ async function configure(existingConfig) {
     }
     const configuredProviders = getConfiguredProviderNames(config);
     if (configuredProviders.length === 0) {
-      console.log(chalk7.red("  You need to configure at least one LLM provider to continue."));
-      console.log(chalk7.dim("  Let\u2019s try that step again."));
+      console.log("");
+      console.log(chalk7.yellow("  No LLM providers were configured."));
+      console.log(chalk7.dim("  Mercury needs at least one provider to work."));
+      console.log(chalk7.dim("  DeepSeek offers a free API key at platform.deepseek.com"));
+      console.log("");
+      console.log(chalk7.white("  Options:"));
+      console.log(chalk7.white("    1. Try again \u2014 choose a provider and enter an API key"));
+      console.log(chalk7.white("    2. Skip for now \u2014 you can run `mercury doctor` later"));
+      console.log("");
+      const skipChoice = await ask(chalk7.white('  Press Enter to try again, or type "skip" to exit setup: '));
+      if (skipChoice.toLowerCase() === "skip") {
+        saveConfig(config);
+        const home2 = getMercuryHome();
+        console.log("");
+        console.log(chalk7.green(`  \u2713 Config saved to ${home2}/mercury.yaml`));
+        console.log(chalk7.yellow("  No providers configured yet. Run `mercury doctor` when ready."));
+        console.log("");
+        process.exit(0);
+      }
       console.log("");
       continue;
     }
@@ -9081,16 +9223,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();