@blockrun/mcp 0.16.0 → 0.17.0

package/dist/index.js

@@ -15,6 +15,7 @@ import {
   PriceClient,
   SolanaLLMClient,
   getOrCreateWallet,
+  getOrCreateSolanaWallet,
   loadSolanaWallet,
   getPaymentLinks,
   formatWalletCreatedMessage,
@@ -53,6 +54,30 @@ function getChain() {
   }
   return "base";
 }
+var CHAIN_FILE = path.join(BLOCKRUN_DIR, ".chain");
+function resetChainCaches() {
+  _evmClient = null;
+  _solanaClient = null;
+  _imageClient = null;
+  _priceClient = null;
+  _freePriceClient = null;
+}
+function setChain(chain) {
+  fs.mkdirSync(BLOCKRUN_DIR, { recursive: true });
+  fs.writeFileSync(CHAIN_FILE, chain, { mode: 384 });
+  resetChainCaches();
+}
+async function ensureBothWallets() {
+  const evm = ensureEvmWallet();
+  const sol = await getOrCreateSolanaWallet();
+  if (sol.isNew) {
+    console.error(formatWalletCreatedMessage(sol.address));
+  }
+  return {
+    base: { address: evm.address, isNew: evm.isNew },
+    solana: { address: sol.address, isNew: sol.isNew }
+  };
+}
 function ensureEvmWallet() {
   if (!_evmWalletInfo) {
     _evmWalletInfo = getOrCreateWallet();
@@ -66,11 +91,14 @@ function getOrCreateWalletKey() {
   const info = ensureEvmWallet();
   return info.privateKey;
 }
+function buildSolanaClient() {
+  const privateKey = process.env.SOLANA_WALLET_KEY || loadSolanaWallet() || void 0;
+  return new SolanaLLMClient(privateKey ? { privateKey } : void 0);
+}
 function getClient() {
   if (getChain() === "solana") {
     if (!_solanaClient) {
-      const privateKey = process.env.SOLANA_WALLET_KEY || loadSolanaWallet() || void 0;
-      _solanaClient = new SolanaLLMClient(privateKey ? { privateKey } : void 0);
+      _solanaClient = buildSolanaClient();
     }
     return _solanaClient;
   }
@@ -126,15 +154,14 @@ async function getWalletInfo() {
     fundingUrl: links.blockrun
   };
 }
-async function getUsdcBalance(address) {
-  if (getChain() === "solana") {
-    try {
-      const client = getClient();
-      return await client.getBalance();
-    } catch {
-      return null;
-    }
+async function getSolanaUsdcBalance() {
+  try {
+    return await buildSolanaClient().getBalance();
+  } catch {
+    return null;
   }
+}
+async function getBaseUsdcBalance(address) {
   const USDC_ADDRESS2 = "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913";
   const BASE_RPC_URLS = [
     "https://mainnet.base.org",
@@ -162,6 +189,9 @@ async function getUsdcBalance(address) {
   }
   return null;
 }
+async function getChainBalance(chain, address) {
+  return chain === "solana" ? getSolanaUsdcBalance() : getBaseUsdcBalance(address);
+}
 
 // src/tools/wallet.ts
 import { z } from "zod";
@@ -182,13 +212,13 @@ var QR_FILE = path2.join(WALLET_DIR, "qr.png");
 var USDC_ADDRESS = "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913";
 var BASE_CHAIN_ID = "8453";
 var MODEL_TIERS = {
-  fast: ["google/gemini-2.5-flash", "google/gemini-3.1-flash-lite", "openai/gpt-5-mini", "deepseek/deepseek-chat", "google/gemini-3-flash-preview"],
+  fast: ["google/gemini-3.5-flash", "google/gemini-2.5-flash", "google/gemini-3.1-flash-lite", "openai/gpt-5-mini", "deepseek/deepseek-chat", "google/gemini-3-flash-preview"],
   balanced: ["openai/gpt-5.4", "anthropic/claude-sonnet-4.6", "google/gemini-2.5-pro", "moonshot/kimi-k2.6", "openai/gpt-5.3", "google/gemini-3.1-pro"],
-  powerful: ["openai/gpt-5.4-pro", "anthropic/claude-opus-4.7", "anthropic/claude-opus-4.6", "openai/o3", "openai/gpt-5.4"],
+  powerful: ["anthropic/claude-opus-4.8", "openai/gpt-5.4-pro", "anthropic/claude-opus-4.7", "anthropic/claude-opus-4.6", "openai/o3", "openai/gpt-5.4"],
   cheap: ["zai/glm-5", "zai/glm-5-turbo", "nvidia/gpt-oss-120b", "nvidia/deepseek-v3.2", "google/gemini-2.5-flash", "deepseek/deepseek-chat", "openai/gpt-5.4-nano"],
-  reasoning: ["openai/o3", "openai/o1", "openai/o3-mini", "deepseek/deepseek-reasoner", "moonshot/kimi-k2.6", "openai/gpt-5.3-codex"],
+  reasoning: ["anthropic/claude-opus-4.8", "openai/o3", "openai/o1", "openai/o3-mini", "deepseek/deepseek-reasoner", "moonshot/kimi-k2.6", "openai/gpt-5.3-codex"],
   free: ["nvidia/qwen3-next-80b-a3b-thinking", "nvidia/mistral-small-4-119b", "nvidia/gpt-oss-120b", "nvidia/deepseek-v3.2", "nvidia/qwen3-coder-480b", "nvidia/llama-4-maverick", "nvidia/gpt-oss-20b", "nvidia/glm-4.7"],
-  coding: ["zai/glm-5", "openai/gpt-5.3-codex", "moonshot/kimi-k2.6", "nvidia/qwen3-coder-480b", "anthropic/claude-sonnet-4.6", "openai/gpt-5.4"],
+  coding: ["anthropic/claude-opus-4.8", "zai/glm-5", "openai/gpt-5.3-codex", "moonshot/kimi-k2.6", "nvidia/qwen3-coder-480b", "anthropic/claude-sonnet-4.6", "openai/gpt-5.4"],
   glm: ["zai/glm-5", "zai/glm-5-turbo", "nvidia/glm-4.7"]
 };
 
@@ -324,10 +354,14 @@ Call this FIRST if any other blockrun_* tool returns a payment/balance error.
 Call this to check your current USDC balance before expensive operations.
 Call this to set spending limits before spawning child agents.
 
+The server holds TWO wallets \u2014 one on Base, one on Solana \u2014 but pays on ONE
+active chain at a time. status shows both addresses/balances and which is active.
+
 Actions:
-- status (default): Current wallet address, USDC balance, total session spending
-- setup: Get funding instructions + QR code (call this when balance is 0)
-- qr: Open QR code in system viewer
+- status (default): Both wallet addresses + USDC balances, active chain, session spending
+- setup: Get funding instructions + QR code for the ACTIVE chain (call this when balance is 0)
+- qr: Open QR code (active chain) in system viewer
+- chain + chain:"base"|"solana": Switch the active payment chain (omit chain: to just see the current one)
 
 Budget controls:
 - budget + budget_action:"set" + budget_amount:1.00 \u2192 Set global spend cap
@@ -345,14 +379,15 @@ Usage pattern for multi-agent systems:
 
 Do NOT call this for actual AI queries \u2014 use blockrun_chat for that.`,
       inputSchema: {
-        action: z.enum(["status", "setup", "qr", "budget", "delegate", "revoke", "report"]).optional().default("status").describe("What to do"),
+        action: z.enum(["status", "setup", "qr", "chain", "budget", "delegate", "revoke", "report"]).optional().default("status").describe("What to do"),
+        chain: z.enum(["base", "solana"]).optional().describe("Target chain for action='chain'. Omit to view the current active chain."),
         budget_action: z.enum(["set", "check", "clear"]).optional().describe("Budget action (for action='budget')"),
         budget_amount: z.number().optional().describe("Budget limit in USD (for budget_action='set')"),
         agent_id: z.string().optional().describe("Agent identifier for delegate/revoke/report actions"),
         agent_limit: z.number().optional().describe("Budget limit in USD for this agent (required for delegate action)")
       }
     },
-    async ({ action, budget_action, budget_amount, agent_id, agent_limit }) => {
+    async ({ action, chain: targetChain, budget_action, budget_amount, agent_id, agent_limit }) => {
       if (action === "budget") {
         const budgetAct = budget_action || "check";
         if (budgetAct === "set") {
@@ -428,6 +463,35 @@ Pass agent_id: "${agent_id}" in any blockrun_* tool call to track and enforce th
           structuredContent: { global: { limit: budget.limit, spent: budget.spent, calls: budget.calls }, agents: agentRows }
         };
       }
+      if (action === "chain") {
+        const both2 = await ensureBothWallets();
+        if (targetChain && targetChain !== getChain()) {
+          setChain(targetChain);
+        }
+        const active = getChain();
+        const activeWallet = active === "solana" ? both2.solana : both2.base;
+        const activeBalance2 = await getChainBalance(active, activeWallet.address);
+        const balStr = activeBalance2 !== null ? `$${activeBalance2.toFixed(6)} USDC` : "balance unavailable";
+        const switched = targetChain ? `Switched active chain \u2192 ${active.toUpperCase()}.` : `Active chain: ${active.toUpperCase()}.`;
+        const text2 = `${switched}
+
+  Active (${active}): ${activeWallet.address}
+    Balance: ${balStr}${activeBalance2 !== null && activeBalance2 < 1 ? "  (low \u2014 fund this address)" : ""}
+  Base:   ${both2.base.address}
+  Solana: ${both2.solana.address}
+
+All blockrun_* calls now pay on ${active}. Note: image generation, price, video,
+music and RealFace are Base-only \u2014 switch back with chain:"base" for those.`;
+        return {
+          content: [{ type: "text", text: text2 }],
+          structuredContent: {
+            activeChain: active,
+            base: both2.base.address,
+            solana: both2.solana.address,
+            activeBalance: activeBalance2
+          }
+        };
+      }
       const info = await getWalletInfo();
       const address = info.address;
       const chain = getChain();
@@ -525,24 +589,38 @@ SECURITY: Private key stored at ~/.blockrun/.session (never leaves your machine)
 ================================================================================`;
         return { content: [{ type: "text", text: text2 }] };
       }
-      const balance = await getUsdcBalance(address);
-      const balanceStr = balance !== null ? `$${balance.toFixed(6)} USDC` : "Unable to fetch";
-      const lowBalance = balance !== null && balance < 1;
+      const both = await ensureBothWallets();
+      const [baseBal, solBal] = await Promise.all([
+        getChainBalance("base", both.base.address),
+        getChainBalance("solana", both.solana.address)
+      ]);
+      const activeBalance = chain === "solana" ? solBal : baseBal;
+      const fmt = (b) => b !== null ? `$${b.toFixed(6)} USDC` : "unavailable";
       const explorerLabel = chain === "solana" ? "Solscan" : "Basescan";
-      const text = `Wallet: ${address}
-Balance: ${balanceStr}${lowBalance ? " (low - add funds)" : ""}
-Network: ${info.network} | View: ${info.explorerUrl}
-${info.isNew ? "\nNEW WALLET - Run with action: 'setup' for funding instructions" : ""}`;
+      const mark = (c) => c === chain ? "\u2192" : " ";
+      const text = `Active chain: ${chain.toUpperCase()}   (switch with action:"chain" chain:"base"|"solana")
+
+${mark("base")} Base:   ${both.base.address}
+            ${fmt(baseBal)}${baseBal !== null && baseBal < 1 ? "  (low)" : ""}
+${mark("solana")} Solana: ${both.solana.address}
+            ${fmt(solBal)}${solBal !== null && solBal < 1 ? "  (low)" : ""}
+
+Paying on ${chain} | View active: ${info.explorerUrl}${info.isNew ? "\nNEW WALLET on active chain \u2014 run action:'setup' for funding instructions" : ""}`;
       return {
         content: [{ type: "text", text }],
         structuredContent: {
+          activeChain: chain,
           address: info.address,
-          balance,
+          balance: activeBalance,
           network: info.network,
           chainId: info.chainId,
           isNew: info.isNew,
           explorerUrl: info.explorerUrl,
-          explorerLabel
+          explorerLabel,
+          wallets: {
+            base: { address: both.base.address, balance: baseBal },
+            solana: { address: both.solana.address, balance: solBal }
+          }
         }
       };
     }
@@ -636,6 +714,8 @@ Run blockrun_models to see all 41+ models with pricing.`,
         system: z2.string().optional().describe("Optional system prompt"),
         max_tokens: z2.number().optional().default(1024).describe("Max tokens in response"),
         temperature: z2.number().optional().default(1).describe("Creativity 0-2"),
+        response_format: z2.enum(["text", "json_object"]).optional().describe("Set to 'json_object' to force valid JSON output (no markdown fences). Works across all providers."),
+        stop: z2.array(z2.string()).max(4).optional().describe("Up to 4 stop sequences; generation halts when any is produced"),
         agent_id: z2.string().optional().describe("Agent identifier. If a budget was delegated for this agent_id via blockrun_wallet action:'delegate', spending is tracked and enforced. The agent is hard-stopped when its budget is exhausted."),
         messages: z2.array(z2.object({
           role: z2.enum(["user", "assistant", "system"]),
@@ -643,8 +723,9 @@ Run blockrun_models to see all 41+ models with pricing.`,
         })).optional().describe("Conversation history for multi-turn context. When provided, 'message' is appended as the final user turn. Use with explicit 'model' param (defaults to 'openai/gpt-5.4' if not specified). Note: if you include a role:'system' entry in messages[], do not also pass the system param to avoid duplicate system messages.")
       }
     },
-    async ({ message, model, mode, routing, routing_profile, system, max_tokens, temperature, agent_id, messages }) => {
+    async ({ message, model, mode, routing, routing_profile, system, max_tokens, temperature, response_format, stop, agent_id, messages }) => {
       const llm = getClient();
+      const responseFormat = response_format ? { type: response_format } : void 0;
       const estimatedCost = estimateChatCost(mode, model, routing, routing_profile);
       const budgetCheck = checkBudget(budget, agent_id, estimatedCost);
       if (!budgetCheck.allowed) {
@@ -666,7 +747,12 @@ Run blockrun_models to see all 41+ models with pricing.`,
             maxTokens: max_tokens,
             maxOutputTokens: max_tokens,
             temperature,
-            routingProfile: routing_profile
+            // @blockrun/llm 2.x dropped the "free" routing profile; the gateway
+            // already routes to the most cost-effective model by default, so we
+            // omit it and let ClawRouter pick (matches the SDK upgrade path).
+            routingProfile: routing_profile === "free" ? void 0 : routing_profile,
+            responseFormat,
+            stop
           });
           recordSpending(budget, result.routing.costEstimate || 1e-3, agent_id);
           return {
@@ -694,7 +780,9 @@ ${result.response}` }],
         try {
           const result = await llm.chatCompletion(targetModel, fullMessages, {
             maxTokens: max_tokens,
-            temperature
+            temperature,
+            responseFormat,
+            stop
           });
           const reply = result.choices?.[0]?.message?.content || "";
           recordSpending(budget, estimatedCost, agent_id);
@@ -714,7 +802,9 @@ ${reply}` }],
           const response = await llm.chat(model, message, {
             system,
             maxTokens: max_tokens,
-            temperature
+            temperature,
+            responseFormat,
+            stop
           });
           recordSpending(budget, estimatedCost, agent_id);
           return { content: [{ type: "text", text: response }] };
@@ -734,7 +824,9 @@ ${reply}` }],
           const response = await llm.chat(m, message, {
             system,
             maxTokens: max_tokens,
-            temperature
+            temperature,
+            responseFormat,
+            stop
           });
           recordSpending(budget, estimatedCost, agent_id);
           return {
@@ -865,7 +957,7 @@ Edit models: openai/gpt-image-1, openai/gpt-image-2 (default for edits)`,
       try {
         if (getChain() !== "base") {
           return {
-            content: [{ type: "text", text: formatError("blockrun_image currently settles on Base only. Switch BlockRun to Base (for example: write 'base' to ~/.blockrun/.chain) and fund the Base wallet with USDC.") }],
+            content: [{ type: "text", text: formatError("blockrun_image currently settles on Base only. Switch BlockRun to Base (for example: run blockrun_wallet with action:chain chain:base) and fund the Base wallet with USDC.") }],
             isError: true
           };
         }
@@ -979,7 +1071,7 @@ Returns a time-limited CDN URL \u2014 download immediately if you need to keep t
       try {
         if (getChain() !== "base") {
           return {
-            content: [{ type: "text", text: formatError("blockrun_music currently settles on Base only. Switch BlockRun to Base (for example: write 'base' to ~/.blockrun/.chain) and fund the Base wallet with USDC.") }],
+            content: [{ type: "text", text: formatError("blockrun_music currently settles on Base only. Switch BlockRun to Base (for example: run blockrun_wallet with action:chain chain:base) and fund the Base wallet with USDC.") }],
             isError: true
           };
         }
@@ -1166,7 +1258,7 @@ Returns a permanent blockrun-hosted MP4 URL (the gateway mirrors the asset to GC
       try {
         if (getChain() !== "base") {
           return {
-            content: [{ type: "text", text: formatError("blockrun_video currently settles on Base only. Switch BlockRun to Base (for example: write 'base' to ~/.blockrun/.chain) and fund the Base wallet with USDC.") }],
+            content: [{ type: "text", text: formatError("blockrun_video currently settles on Base only. Switch BlockRun to Base (for example: run blockrun_wallet with action:chain chain:base) and fund the Base wallet with USDC.") }],
             isError: true
           };
         }
@@ -1507,7 +1599,7 @@ Enroll one: blockrun_realface action:"init" name:"\u2026".` }],
         }
         if (action === "enroll") {
           if (getChain() !== "base") {
-            return { content: [{ type: "text", text: formatError("blockrun_realface enroll settles on Base only. Switch BlockRun to Base (write 'base' to ~/.blockrun/.chain) and fund the Base wallet with USDC.") }], isError: true };
+            return { content: [{ type: "text", text: formatError("blockrun_realface enroll settles on Base only. Switch BlockRun to Base (run blockrun_wallet with action:chain chain:base) and fund the Base wallet with USDC.") }], isError: true };
           }
           if (!name || !image_url || !group_id) {
             return { content: [{ type: "text", text: formatError("enroll requires name, image_url, and group_id (from init, after the group is active).") }], isError: true };
@@ -1901,7 +1993,7 @@ Examples:
         const paid = isPaidPriceCall(action, category);
         if (paid && getChain() !== "base") {
           return {
-            content: [{ type: "text", text: formatError("Paid stock price/history calls currently settle on Base only. Switch BlockRun to Base (for example: write 'base' to ~/.blockrun/.chain) and fund the Base wallet with USDC.") }],
+            content: [{ type: "text", text: formatError("Paid stock price/history calls currently settle on Base only. Switch BlockRun to Base (for example: run blockrun_wallet with action:chain chain:base) and fund the Base wallet with USDC.") }],
             isError: true
           };
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blockrun/mcp",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "mcpName": "io.github.BlockRunAI/blockrun-mcp",
   "description": "BlockRun MCP Server - Give your AI agent web search, deep research, prediction markets, crypto data, X/Twitter intelligence. Paid via x402 micropayments.",
   "type": "module",
@@ -44,7 +44,7 @@
     "url": "https://github.com/blockrunai/blockrun-mcp/issues"
   },
   "dependencies": {
-    "@blockrun/llm": "^1.12.0",
+    "@blockrun/llm": "^2.11.0",
     "@modelcontextprotocol/sdk": "^1.0.0",
     "open": "^11.0.0",
     "qrcode": "^1.5.4",