@cosmicstack/mercury-agent 1.1.0 → 1.1.2

package/dist/index.js

@@ -90,6 +90,20 @@ function getDefaultConfig() {
         baseUrl: getEnv("OLLAMA_LOCAL_BASE_URL", "http://127.0.0.1:11434/api"),
         model: getEnv("OLLAMA_LOCAL_MODEL", "gpt-oss:20b"),
         enabled: getEnvBool("OLLAMA_LOCAL_ENABLED", false)
+      },
+      mimo: {
+        name: "mimo",
+        apiKey: getEnv("MIMO_API_KEY", ""),
+        baseUrl: getEnv("MIMO_BASE_URL", "https://api.xiaomimimo.com/v1"),
+        model: getEnv("MIMO_MODEL", "mimo-v2.5-pro"),
+        enabled: getEnvBool("MIMO_ENABLED", true)
+      },
+      mimoTokenPlan: {
+        name: "mimoTokenPlan",
+        apiKey: getEnv("MIMO_TOKEN_PLAN_API_KEY", ""),
+        baseUrl: getEnv("MIMO_TOKEN_PLAN_BASE_URL", "https://token-plan-cn.xiaomimimo.com/v1"),
+        model: getEnv("MIMO_TOKEN_PLAN_MODEL", "mimo-v2.5-pro"),
+        enabled: getEnvBool("MIMO_TOKEN_PLAN_ENABLED", false)
       }
     },
     channels: {
@@ -1679,6 +1693,36 @@ var OllamaProvider = class extends BaseProvider {
   }
 };
 
+// src/providers/mimo.ts
+import { createOpenAI as createOpenAI2 } from "@ai-sdk/openai";
+var MiMoProvider = class extends BaseProvider {
+  name;
+  model;
+  modelInstance;
+  constructor(config) {
+    super(config);
+    this.name = config.name;
+    this.model = config.model;
+    const client = createOpenAI2({
+      apiKey: config.apiKey,
+      baseURL: config.baseUrl
+    });
+    this.modelInstance = client.chat(config.model);
+  }
+  async generateText(_prompt, _systemPrompt) {
+    throw new Error("Use getModelInstance() with the AI SDK agent loop");
+  }
+  async *streamText(_prompt, _systemPrompt) {
+    throw new Error("Use getModelInstance() with the AI SDK agent loop");
+  }
+  isAvailable() {
+    return this.config.apiKey.length > 0;
+  }
+  getModelInstance() {
+    return this.modelInstance;
+  }
+};
+
 // src/providers/registry.ts
 var ProviderRegistry = class {
   providers = /* @__PURE__ */ new Map();
@@ -1692,7 +1736,9 @@ var ProviderRegistry = class {
       config.providers.anthropic,
       config.providers.grok,
       config.providers.ollamaCloud,
-      config.providers.ollamaLocal
+      config.providers.ollamaLocal,
+      config.providers.mimo,
+      config.providers.mimoTokenPlan
     ];
     for (const pc of entries) {
       if (!isProviderConfigured(pc)) continue;
@@ -1704,6 +1750,8 @@ var ProviderRegistry = class {
           provider = new DeepSeekProvider(pc);
         } else if (pc.name === "ollamaCloud" || pc.name === "ollamaLocal") {
           provider = new OllamaProvider(pc);
+        } else if (pc.name === "mimo" || pc.name === "mimoTokenPlan") {
+          provider = new MiMoProvider(pc);
         } else {
           provider = new OpenAICompatProvider(pc);
         }
@@ -4581,6 +4629,22 @@ Or use /budget override, /budget reset, /budget set <number> anytime.`,
       this.shutdown();
       return true;
     }
+    if (cmd === "/permissions") {
+      if (channelType === "cli" && channel instanceof CLIChannel) {
+        const mode = await channel.askPermissionMode?.();
+        if (mode === "allow-all") {
+          this.capabilities.permissions.setAutoApproveAll(true);
+          this.capabilities.permissions.addTempScope("/", true, true);
+          await channel.send("Allow All mode active for this session. All scopes, commands, and loops auto-approved. Resets on restart.", channelId);
+        } else {
+          this.capabilities.permissions.setAutoApproveAll(false);
+          await channel.send("Ask Me mode active. Risky actions will prompt for confirmation.", channelId);
+        }
+        return true;
+      }
+      await channel.send("Use /permissions in CLI to switch permission mode. On Telegram, use the /permissions button or command.", channelId);
+      return true;
+    }
     if (cmd === "/status") {
       const config = ctx.config();
       const budget = ctx.tokenBudget();
@@ -4833,9 +4897,11 @@ Or use /budget override, /budget reset, /budget set <number> anytime.`,
     await channel.withMenu(async (select) => {
       while (true) {
         const streamLabel = this.telegramStreaming ? "Disable Telegram Streaming" : "Enable Telegram Streaming";
+        const permLabel = this.capabilities.permissions.isAutoApproveAll() ? "Switch to Ask Me" : "Switch to Allow All";
         const action = await select("Mercury Commands", [
           { value: "status", label: "Status" },
           { value: "memory", label: "Memory" },
+          { value: "permissions", label: permLabel },
           { value: "telegram", label: "Telegram" },
           { value: "tools", label: "Tools" },
           { value: "skills", label: "Skills" },
@@ -4858,6 +4924,10 @@ Or use /budget override, /budget reset, /budget set <number> anytime.`,
           }
           continue;
         }
+        if (action === "permissions") {
+          await this.handleChatCommand("/permissions", "cli", channelId);
+          continue;
+        }
         if (action === "telegram") {
           await this.openCliTelegramMenu(channel, channelId, select);
           continue;
@@ -5365,6 +5435,11 @@ var ChannelRegistry = class {
 import { existsSync as existsSync6, readFileSync as readFileSync5, writeFileSync as writeFileSync5 } from "fs";
 import { join as join7 } from "path";
 var TOKEN_FILE = "token-usage.json";
+function safeNumber(value) {
+  if (value === null || value === void 0) return 0;
+  const n = Number(value);
+  return isNaN(n) ? 0 : n;
+}
 var TokenBudget = class {
   constructor(config) {
     this.config = config;
@@ -5380,7 +5455,7 @@ var TokenBudget = class {
   forceNext = false;
   canAfford(estimatedTokens) {
     this.resetIfNewDay();
-    return this.dailyUsed + estimatedTokens <= this.dailyBudget;
+    return safeNumber(this.dailyUsed) + estimatedTokens <= safeNumber(this.dailyBudget);
   }
   isOverBudget() {
     this.resetIfNewDay();
@@ -5388,7 +5463,7 @@ var TokenBudget = class {
       this.forceNext = false;
       return false;
     }
-    return this.dailyUsed >= this.dailyBudget;
+    return safeNumber(this.dailyUsed) >= safeNumber(this.dailyBudget);
   }
   forceAllowNext() {
     this.forceNext = true;
@@ -5416,18 +5491,24 @@ var TokenBudget = class {
   }
   recordUsage(entry) {
     this.resetIfNewDay();
-    const logEntry = { ...entry, timestamp: Date.now() };
-    this.dailyUsed += entry.totalTokens;
+    const inputTokens = safeNumber(entry.inputTokens);
+    const outputTokens = safeNumber(entry.outputTokens);
+    const totalTokens = safeNumber(entry.totalTokens) || inputTokens + outputTokens;
+    const safeEntry = { ...entry, inputTokens, outputTokens, totalTokens };
+    const logEntry = { ...safeEntry, timestamp: Date.now() };
+    this.dailyUsed += totalTokens;
     this.requestLog.push(logEntry);
     this.persist();
   }
   getRemaining() {
     this.resetIfNewDay();
-    return Math.max(0, this.dailyBudget - this.dailyUsed);
+    return Math.max(0, safeNumber(this.dailyBudget) - safeNumber(this.dailyUsed));
   }
   getUsagePercentage() {
     this.resetIfNewDay();
-    return this.dailyBudget > 0 ? this.dailyUsed / this.dailyBudget * 100 : 0;
+    const budget = safeNumber(this.dailyBudget);
+    const used = safeNumber(this.dailyUsed);
+    return budget > 0 ? used / budget * 100 : 0;
   }
   getStatusText() {
     const pct = Math.round(this.getUsagePercentage());
@@ -5466,8 +5547,16 @@ var TokenBudget = class {
       const data = JSON.parse(raw);
       const today = (/* @__PURE__ */ new Date()).toISOString().split("T")[0];
       if (data.lastResetDate === today) {
-        this.dailyUsed = data.dailyUsed ?? 0;
-        this.requestLog = data.requestLog ?? [];
+        const restored = safeNumber(data.dailyUsed);
+        if (!isNaN(restored)) {
+          this.dailyUsed = restored;
+        }
+        this.requestLog = (data.requestLog ?? []).map((entry) => ({
+          ...entry,
+          inputTokens: safeNumber(entry.inputTokens),
+          outputTokens: safeNumber(entry.outputTokens),
+          totalTokens: safeNumber(entry.totalTokens)
+        }));
       }
       this.lastResetDate = data.lastResetDate ?? today;
     } catch (err) {
@@ -5592,7 +5681,6 @@ var PermissionManager = class {
   askHandler;
   autoApproveAll = false;
   elevatedCommands = /* @__PURE__ */ new Set();
-  pendingApprovals = /* @__PURE__ */ new Set();
   currentChannelType = "cli";
   tempScopes = [];
   constructor() {
@@ -5635,12 +5723,6 @@ var PermissionManager = class {
   isShellElevated() {
     return this.elevatedCommands.has("run_command");
   }
-  addPendingApproval(baseCommand) {
-    this.pendingApprovals.add(baseCommand);
-  }
-  clearPendingApprovals() {
-    this.pendingApprovals.clear();
-  }
   load() {
     if (existsSync7(PERMISSIONS_FILE)) {
       try {
@@ -5699,6 +5781,9 @@ var PermissionManager = class {
       if (mode === "write" && tempScope.write) return { allowed: true };
       return { allowed: false, reason: `Permission denied: ${mode} access to ${path3}` };
     }
+    if (!this.autoApproveAll && this.askHandler && this.currentChannelType !== "internal") {
+      return this.requestScopeExternal(path3, mode);
+    }
     return { allowed: false, reason: `Permission denied for ${mode} access to ${path3}` };
   }
   async checkShellCommand(command) {
@@ -5716,10 +5801,6 @@ var PermissionManager = class {
     }
     const trimmed = command.trim();
     const baseCmd = trimmed.split(/\s+/)[0];
-    if (this.pendingApprovals.has(baseCmd)) {
-      logger.info({ cmd: trimmed }, "Shell command auto-approved (pending approval)");
-      return { allowed: true, needsApproval: false };
-    }
     for (const pattern of shell.blocked) {
       if (this.matchPattern(trimmed, pattern)) {
         return { allowed: false, reason: `Blocked command: matches "${pattern}"`, needsApproval: false };
@@ -5742,7 +5823,7 @@ var PermissionManager = class {
     }
     for (const pattern of shell.needsApproval) {
       if (this.matchPattern(trimmed, pattern)) {
-        if (this.currentChannelType === "telegram" && this.askHandler) {
+        if (this.askHandler && this.currentChannelType !== "internal") {
           const result = await this.askHandler(`Run command: ${trimmed}`);
           if (result === "yes") {
             return { allowed: true, needsApproval: false };
@@ -5756,7 +5837,7 @@ var PermissionManager = class {
         return { allowed: false, reason: `Command requires approval: matches "${pattern}"`, needsApproval: true };
       }
     }
-    if (this.currentChannelType === "telegram" && this.askHandler) {
+    if (this.askHandler && this.currentChannelType !== "internal") {
       const result = await this.askHandler(`Run command: ${trimmed}`);
       if (result === "yes") {
         return { allowed: true, needsApproval: false };
@@ -5862,6 +5943,11 @@ Allow access?`;
     return null;
   }
   mergeDefaults(parsed) {
+    const mergeArray = (existing, defaults) => {
+      if (!existing) return [...defaults];
+      const combined = /* @__PURE__ */ new Set([...defaults, ...existing]);
+      return [...combined];
+    };
     return {
       capabilities: {
         filesystem: {
@@ -5870,9 +5956,9 @@ Allow access?`;
         },
         shell: {
           enabled: parsed.capabilities?.shell?.enabled ?? DEFAULT_MANIFEST.capabilities.shell.enabled,
-          blocked: parsed.capabilities?.shell?.blocked ?? DEFAULT_MANIFEST.capabilities.shell.blocked,
-          autoApproved: parsed.capabilities?.shell?.autoApproved ?? DEFAULT_MANIFEST.capabilities.shell.autoApproved,
-          needsApproval: parsed.capabilities?.shell?.needsApproval ?? DEFAULT_MANIFEST.capabilities.shell.needsApproval,
+          blocked: mergeArray(parsed.capabilities?.shell?.blocked, DEFAULT_MANIFEST.capabilities.shell.blocked),
+          autoApproved: mergeArray(parsed.capabilities?.shell?.autoApproved, DEFAULT_MANIFEST.capabilities.shell.autoApproved),
+          needsApproval: mergeArray(parsed.capabilities?.shell?.needsApproval, DEFAULT_MANIFEST.capabilities.shell.needsApproval),
           cwdOnly: parsed.capabilities?.shell?.cwdOnly ?? DEFAULT_MANIFEST.capabilities.shell.cwdOnly
         },
         git: {
@@ -6222,20 +6308,13 @@ function createRunCommandTool(permissions, getCwd, setCwd) {
     description: `Run a shell command in the current working directory. Use the cd tool to change directories first \u2014 cd commands within this tool only affect chained commands (e.g., "cd /path && ls"), not subsequent calls.
 Blocked commands (sudo, rm -rf /, etc.) are never executed.
 Auto-approved commands (ls, cat, git status, curl, etc.) run without asking.
-Other commands require user approval.`,
+Other commands prompt the user for approval before execution.`,
     inputSchema: zodSchema10(z10.object({
       command: z10.string().describe("The shell command to execute")
     })),
     execute: async ({ command }) => {
       const check = await permissions.checkShellCommand(command);
       if (!check.allowed) {
-        if (check.needsApproval) {
-          const baseCmd = command.trim().split(/\s+/)[0];
-          permissions.addPendingApproval(baseCmd);
-          return `\u26A0 Command requires approval: ${command}
-
-Tell the user what this command does and ask for permission. If they approve, try running it again. If they say "always", use the approve_command tool to permanently approve this command type.`;
-        }
         return `Error: ${check.reason}`;
       }
       const cwd = getCwd();
@@ -6711,12 +6790,6 @@ function createGitPushTool(permissions, getCwd) {
     execute: async ({ remote, branch }) => {
       const cmd = `git push ${remote || "origin"} ${branch || ""}`.trim();
       const check = await permissions.checkShellCommand(cmd);
-      if (!check.allowed && check.needsApproval) {
-        const baseCmd = "git";
-        permissions.addPendingApproval(baseCmd);
-        return `\u26A0 This command pushes to a remote: ${cmd}
-Ask the user for permission. If they approve, try again. If they say "always", use the approve_command tool.`;
-      }
       if (!check.allowed) {
         return `Error: ${check.reason}`;
       }
@@ -8075,6 +8148,14 @@ var OLLAMA_LOCAL_PREFERRED_MODELS = [
   "gpt-oss:20b",
   "gpt-oss:120b"
 ];
+var MIMO_PREFERRED_MODELS = [
+  "mimo-v2.5-pro",
+  "mimo-v2.5",
+  "mimo-v2-pro",
+  "mimo-v2-omni",
+  "mimo-v2-flash"
+];
+var MIMO_TOKEN_PLAN_PREFERRED_MODELS = MIMO_PREFERRED_MODELS;
 var ProviderModelFetchError = class extends Error {
   constructor(message) {
     super(message);
@@ -8129,7 +8210,9 @@ function chooseRecommendedModel(provider, models, currentModel) {
     anthropic: ANTHROPIC_PREFERRED_MODELS,
     grok: GROK_PREFERRED_MODELS,
     ollamaCloud: OLLAMA_CLOUD_PREFERRED_MODELS,
-    ollamaLocal: OLLAMA_LOCAL_PREFERRED_MODELS
+    ollamaLocal: OLLAMA_LOCAL_PREFERRED_MODELS,
+    mimo: MIMO_PREFERRED_MODELS,
+    mimoTokenPlan: MIMO_TOKEN_PLAN_PREFERRED_MODELS
   };
   for (const candidate of preferredByProvider[provider]) {
     if (models.includes(candidate)) {
@@ -8153,7 +8236,9 @@ function buildModelCatalog(provider, models, currentModel) {
     anthropic: ANTHROPIC_PREFERRED_MODELS,
     grok: GROK_PREFERRED_MODELS,
     ollamaCloud: OLLAMA_CLOUD_PREFERRED_MODELS,
-    ollamaLocal: OLLAMA_LOCAL_PREFERRED_MODELS
+    ollamaLocal: OLLAMA_LOCAL_PREFERRED_MODELS,
+    mimo: MIMO_PREFERRED_MODELS,
+    mimoTokenPlan: MIMO_TOKEN_PLAN_PREFERRED_MODELS
   };
   const withoutRecommended = filtered.filter((model) => model !== recommendedModel);
   const prioritized = prioritizeModels(withoutRecommended, preferredByProvider[provider]);
@@ -8219,6 +8304,38 @@ async function fetchOllamaModels(provider, config) {
   const ids = (data.models ?? []).map((model) => model.model?.trim() || model.name?.trim() || "").filter(Boolean);
   return buildModelCatalog(provider, ids, config.model);
 }
+async function fetchMiMoModels(config) {
+  const data = await fetchJson(
+    `${trimTrailingSlash(config.baseUrl)}/models`,
+    {
+      headers: {
+        Authorization: `Bearer ${config.apiKey}`
+      }
+    },
+    "Mercury could not fetch models for this MiMo key. Please re-enter it."
+  );
+  const ids = (data.data ?? []).map((model) => model.id?.trim() ?? "").filter((id) => {
+    const lower = id.toLowerCase();
+    return lower.startsWith("mimo-") && !lower.includes("tts");
+  });
+  return buildModelCatalog("mimo", ids, config.model);
+}
+async function fetchMiMoTokenPlanModels(config) {
+  const data = await fetchJson(
+    `${trimTrailingSlash(config.baseUrl)}/models`,
+    {
+      headers: {
+        Authorization: `Bearer ${config.apiKey}`
+      }
+    },
+    "Mercury could not fetch models for this MiMo Token Plan key. Please re-enter it."
+  );
+  const ids = (data.data ?? []).map((model) => model.id?.trim() ?? "").filter((id) => {
+    const lower = id.toLowerCase();
+    return lower.startsWith("mimo-") && !lower.includes("tts");
+  });
+  return buildModelCatalog("mimoTokenPlan", ids, config.model);
+}
 async function fetchProviderModelCatalog(provider, config) {
   if (provider === "anthropic") {
     return fetchAnthropicModels(config);
@@ -8229,6 +8346,12 @@ async function fetchProviderModelCatalog(provider, config) {
   if (provider === "ollamaCloud" || provider === "ollamaLocal") {
     return fetchOllamaModels(provider, config);
   }
+  if (provider === "mimo") {
+    return fetchMiMoModels(config);
+  }
+  if (provider === "mimoTokenPlan") {
+    return fetchMiMoTokenPlanModels(config);
+  }
   return fetchOpenAICompatModels(provider, config);
 }
 
@@ -8286,7 +8409,9 @@ var PROVIDER_OPTIONS = [
   { key: "anthropic", label: "Anthropic" },
   { key: "grok", label: "Grok (xAI)" },
   { key: "ollamaCloud", label: "Ollama Cloud" },
-  { key: "ollamaLocal", label: "Ollama Local" }
+  { key: "ollamaLocal", label: "Ollama Local" },
+  { key: "mimo", label: "MiMo (Xiaomi)" },
+  { key: "mimoTokenPlan", label: "MiMo Token Plan (Xiaomi)" }
 ];
 function getConfiguredProviderNames(config) {
   return PROVIDER_OPTIONS.map((option) => option.key).filter((key) => isProviderConfigured(config.providers[key]));
@@ -8387,6 +8512,12 @@ function validateApiKey(provider, value) {
   if (provider === "ollamaCloud") {
     return looksLikeToken(value) ? null : "Ollama Cloud keys must look like a real API token: long, no spaces, and not plain text.";
   }
+  if (provider === "mimo") {
+    return /^sk-[A-Za-z0-9_-]{16,}$/i.test(value) ? null : "MiMo keys must start with `sk-`.";
+  }
+  if (provider === "mimoTokenPlan") {
+    return /^tp-[A-Za-z0-9_-]{16,}$/i.test(value) ? null : "MiMo Token Plan keys must start with `tp-`.";
+  }
   return null;
 }
 function validateBaseUrl(value) {
@@ -8735,6 +8866,38 @@ async function configure(existingConfig) {
           config.providers.ollamaLocal.model = result.model;
           config.providers.ollamaLocal.enabled = true;
         }
+        continue;
+      }
+      if (provider === "mimo") {
+        const mask = isReconfig && config.providers.mimo.apiKey ? ` [${maskKey(config.providers.mimo.apiKey)}]` : "";
+        const result = await promptApiKeyWithModelSelection(
+          config,
+          "mimo",
+          "MiMo",
+          chalk7.white(`  MiMo API key${mask}${isReconfig ? "" : " (Enter to skip)"}: `),
+          isReconfig
+        );
+        if (!result.skipped && result.apiKey && result.model) {
+          config.providers.mimo.apiKey = result.apiKey;
+          config.providers.mimo.model = result.model;
+          config.providers.mimo.enabled = true;
+        }
+        continue;
+      }
+      if (provider === "mimoTokenPlan") {
+        const mask = isReconfig && config.providers.mimoTokenPlan.apiKey ? ` [${maskKey(config.providers.mimoTokenPlan.apiKey)}]` : "";
+        const result = await promptApiKeyWithModelSelection(
+          config,
+          "mimoTokenPlan",
+          "MiMo Token Plan",
+          chalk7.white(`  MiMo Token Plan API key${mask}${isReconfig ? "" : " (Enter to skip)"}: `),
+          isReconfig
+        );
+        if (!result.skipped && result.apiKey && result.model) {
+          config.providers.mimoTokenPlan.apiKey = result.apiKey;
+          config.providers.mimoTokenPlan.model = result.model;
+          config.providers.mimoTokenPlan.enabled = true;
+        }
       }
     }
     const configuredProviders = getConfiguredProviderNames(config);