@blockrun/mcp 0.22.3 → 0.23.1

package/dist/index.js

@@ -100,9 +100,10 @@ function getOrCreateWalletKey() {
   const info = ensureEvmWallet();
   return info.privateKey;
 }
-function buildSolanaClient() {
+function buildSolanaClient(timeout) {
   const privateKey = process.env.SOLANA_WALLET_KEY || loadSolanaWallet() || void 0;
-  return new SolanaLLMClient(privateKey ? { privateKey } : void 0);
+  const opts = { ...privateKey ? { privateKey } : {}, ...timeout ? { timeout } : {} };
+  return new SolanaLLMClient(Object.keys(opts).length ? opts : void 0);
 }
 function getClient() {
   if (getChain() === "solana") {
@@ -117,6 +118,13 @@ function getClient() {
   }
   return _evmClient;
 }
+function buildClientWithTimeout(timeoutMs) {
+  if (getChain() === "solana") {
+    return buildSolanaClient(timeoutMs);
+  }
+  const privateKey = getOrCreateWalletKey();
+  return new LLMClient({ privateKey, timeout: timeoutMs });
+}
 function getAnthropicClient() {
   if (!_anthropicClient) {
     const privateKey = getOrCreateWalletKey();
@@ -221,6 +229,58 @@ async function loadModels(llm, cache) {
   return cache.models;
 }
 
+// src/utils/budget.ts
+var EPSILON = 1e-9;
+function formatUsd(amount) {
+  return `$${amount.toFixed(amount >= 1 ? 2 : 4)}`;
+}
+function checkBudget(budget, agentId, estimatedCost = 1e-3) {
+  const cost = Math.max(0, estimatedCost);
+  if (cost > 0 && budget.limit !== null && budget.spent + cost > budget.limit + EPSILON) {
+    const remaining = Math.max(0, budget.limit - budget.spent);
+    return {
+      allowed: false,
+      reason: `Global budget limit ${formatUsd(budget.limit)} would be exceeded (${formatUsd(budget.spent)} spent, ${formatUsd(remaining)} remaining, next call estimated ${formatUsd(cost)})`
+    };
+  }
+  if (agentId) {
+    const agentBudget = budget.agents.get(agentId);
+    if (cost > 0 && agentBudget && agentBudget.spent + cost > agentBudget.limit + EPSILON) {
+      const remaining = Math.max(0, agentBudget.limit - agentBudget.spent);
+      return {
+        allowed: false,
+        reason: `Agent "${agentId}" budget ${formatUsd(agentBudget.limit)} would be exceeded (${formatUsd(agentBudget.spent)} spent, ${formatUsd(remaining)} remaining, next call estimated ${formatUsd(cost)})`
+      };
+    }
+  }
+  return { allowed: true };
+}
+function recordSpending(budget, cost, agentId) {
+  budget.spent += cost;
+  budget.calls += 1;
+  if (agentId) {
+    const agentBudget = budget.agents.get(agentId);
+    if (agentBudget) {
+      agentBudget.spent += cost;
+      agentBudget.calls += 1;
+    }
+  }
+}
+function amountToUsd(amount) {
+  const n = typeof amount === "string" ? Number(amount) : typeof amount === "number" ? amount : NaN;
+  if (!Number.isFinite(n) || n <= 0) return null;
+  return n / 1e6;
+}
+function recordActualSpend(budget, actualUsd, estimate, agentId) {
+  const cost = typeof actualUsd === "number" && Number.isFinite(actualUsd) && actualUsd > 0 ? actualUsd : Math.max(0, estimate);
+  recordSpending(budget, cost, agentId);
+}
+function parseBudgetLimitEnv(raw) {
+  if (!raw) return null;
+  const n = Number(raw.trim().replace(/^\$/, ""));
+  return Number.isFinite(n) && n > 0 ? n : null;
+}
+
 // src/tools/wallet.ts
 import { z } from "zod";
 
@@ -229,7 +289,6 @@ import QRCode from "qrcode";
 import open from "open";
 import * as fs2 from "fs";
 import * as path3 from "path";
-import sharp from "sharp";
 
 // src/utils/constants.ts
 import * as path2 from "path";
@@ -255,6 +314,17 @@ var MODEL_TIERS = {
 
 // src/utils/qr.ts
 var SOLANA_USDC_MINT = "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v";
+var sharpModule;
+async function loadSharp() {
+  if (sharpModule !== void 0) return sharpModule;
+  try {
+    const mod = await import("sharp");
+    sharpModule = mod.default;
+  } catch {
+    sharpModule = null;
+  }
+  return sharpModule;
+}
 function getEip681Uri(address, amountUsdc = 1) {
   const amountWei = Math.floor(amountUsdc * 1e6);
   return `ethereum:${USDC_ADDRESS}@${BASE_CHAIN_ID}/transfer?address=${address}&uint256=${amountWei}`;
@@ -279,6 +349,8 @@ function buildSolanaLogoSvg(size) {
 }
 async function overlayLogo(qrBuf, chain, qrSize) {
   if (chain !== "solana") return qrBuf;
+  const sharp = await loadSharp();
+  if (!sharp) return qrBuf;
   const logoSize = Math.round(qrSize * 0.18);
   const pad = Math.round(logoSize * 0.08);
   const logoBuf = await sharp(Buffer.from(buildSolanaLogoSvg(logoSize))).resize(logoSize, logoSize).extend({ top: pad, bottom: pad, left: pad, right: pad, background: { r: 255, g: 255, b: 255, alpha: 1 } }).toBuffer();
@@ -394,8 +466,9 @@ To pay on Solana (no env vars, no file editing, no restart):
   1. action:"chain" chain:"solana"   \u2192 provisions + activates the Solana wallet
   2. action:"setup"                   \u2192 Solana address + funding QR (send USDC SPL on Solana)
 Switch back with action:"chain" chain:"base". Base-only \u2014 these ignore Solana and
-need Base: blockrun_image, blockrun_music, blockrun_speech, blockrun_video, paid
-blockrun_price, blockrun_chat routing:"smart", and native Anthropic (claude-*).
+need Base: blockrun_image, blockrun_music, blockrun_speech, blockrun_video,
+blockrun_realface, paid blockrun_price, blockrun_chat routing:"smart", and native
+Anthropic (claude-*).
 
 Actions:
 - status (default): Both wallet addresses + USDC balances, active chain, session spending
@@ -671,45 +744,24 @@ Paying on ${chain} | View active: ${info.explorerUrl}${info.isNew ? "\nNEW WALLE
 import { z as z2 } from "zod";
 import { LLMClient as LLMClient2 } from "@blockrun/llm";
 
-// src/utils/budget.ts
-var EPSILON = 1e-9;
-function formatUsd(amount) {
-  return `$${amount.toFixed(amount >= 1 ? 2 : 4)}`;
-}
-function checkBudget(budget, agentId, estimatedCost = 1e-3) {
-  const cost = Math.max(0, estimatedCost);
-  if (cost > 0 && budget.limit !== null && budget.spent + cost > budget.limit + EPSILON) {
-    const remaining = Math.max(0, budget.limit - budget.spent);
-    return {
-      allowed: false,
-      reason: `Global budget limit ${formatUsd(budget.limit)} would be exceeded (${formatUsd(budget.spent)} spent, ${formatUsd(remaining)} remaining, next call estimated ${formatUsd(cost)})`
-    };
-  }
-  if (agentId) {
-    const agentBudget = budget.agents.get(agentId);
-    if (cost > 0 && agentBudget && agentBudget.spent + cost > agentBudget.limit + EPSILON) {
-      const remaining = Math.max(0, agentBudget.limit - agentBudget.spent);
-      return {
-        allowed: false,
-        reason: `Agent "${agentId}" budget ${formatUsd(agentBudget.limit)} would be exceeded (${formatUsd(agentBudget.spent)} spent, ${formatUsd(remaining)} remaining, next call estimated ${formatUsd(cost)})`
-      };
-    }
-  }
-  return { allowed: true };
-}
-function recordSpending(budget, cost, agentId) {
-  budget.spent += cost;
-  budget.calls += 1;
-  if (agentId) {
-    const agentBudget = budget.agents.get(agentId);
-    if (agentBudget) {
-      agentBudget.spent += cost;
-      agentBudget.calls += 1;
-    }
+// src/tools/chat-anthropic.ts
+function anthropicCallCost(model, usage) {
+  if (!usage) return null;
+  const id = model.toLowerCase();
+  let inRate = 5, outRate = 25;
+  if (id.includes("opus")) {
+    inRate = 15;
+    outRate = 75;
+  } else if (id.includes("haiku")) {
+    inRate = 1;
+    outRate = 5;
+  } else if (id.includes("sonnet")) {
+    inRate = 3;
+    outRate = 15;
   }
+  const cost = (usage.input_tokens ?? 0) / 1e6 * inRate + (usage.output_tokens ?? 0) / 1e6 * outRate;
+  return cost > 0 ? cost : null;
 }
-
-// src/tools/chat-anthropic.ts
 function isAnthropicModel(model) {
   const id = model.trim();
   return /^anthropic\//i.test(id) || /^claude-/i.test(id);
@@ -797,10 +849,9 @@ async function handleAnthropicNative(args) {
   try {
     native = await client.messages.create(params);
   } catch (error) {
-    const errorMessage = error instanceof Error ? error.message : String(error);
-    return { content: [{ type: "text", text: formatError(errorMessage) }], isError: true };
+    return { content: [{ type: "text", text: formatError(extractErrorMessage(error)) }], isError: true };
   }
-  recordSpending(budget, estimatedCost, agentId);
+  recordActualSpend(budget, anthropicCallCost(native.model, native.usage), estimatedCost, agentId);
   const thinkingBlocks = native.content.filter(isThinkingBlock);
   const textBlocks = native.content.filter(isTextBlock);
   const answerText = textBlocks.map((b) => b.text).join("\n");
@@ -838,23 +889,32 @@ ${thinkingText}` });
 }
 
 // src/tools/chat.ts
-function estimateChatCost(mode, model, routing, routingProfile) {
+function estimateChatCost(maxTokens, mode, model, routing, routingProfile) {
   if (mode === "free") return 0;
   if (model?.startsWith("nvidia/")) return 0;
   if (routing === "smart" && routingProfile === "free") return 0;
+  const out = Math.max(maxTokens ?? 1024, 256);
+  const frontierReserve = Math.max(0.01, out / 1e6 * 20);
   if (routing === "smart") {
     switch (routingProfile) {
       case "eco":
-        return 2e-3;
+        return 0.01;
       case "premium":
-        return 0.05;
+        return frontierReserve;
       case "auto":
       default:
-        return 0.01;
+        return Math.max(0.01, frontierReserve * 0.5);
     }
   }
-  if (mode === "reasoning" || mode === "powerful") return 0.01;
-  return 1e-3;
+  if (mode === "reasoning" || mode === "powerful") return frontierReserve;
+  if (model) return frontierReserve;
+  return Math.max(2e-3, out / 1e6 * 3);
+}
+async function withSettledCost(client, run) {
+  const before = client.getSpending().totalUsd;
+  const result = await run();
+  const settledUsd = client.getSpending().totalUsd - before;
+  return { result, settledUsd };
 }
 function registerChatTool(server, budget) {
   server.registerTool(
@@ -866,13 +926,13 @@ Notable modes:
 - mode:"glm" \u2192 Zhipu GLM-5 / GLM-5-Turbo ($0.001/call, excellent for coding tasks, pays via USDC on BlockRun)
 - mode:"coding" \u2192 GLM-5 first, then code-specialized models
 - mode:"cheap" \u2192 GLM-5, NVIDIA free, DeepSeek
-- mode:"reasoning" \u2192 o3, o1, DeepSeek-R1
+- mode:"reasoning" \u2192 Claude Opus, o3, o1, deepseek-reasoner
 - mode:"free" \u2192 NVIDIA models (no cost)
 - routing:"smart" \u2192 auto-select via ClawRouter
 
 Pick directly: model:"zai/glm-5", model:"openai/o3", model:"nvidia/deepseek-v4-flash" (free).
 
-Run blockrun_models to see all 41+ models with pricing.`,
+Run blockrun_models to see all available models with pricing.`,
       inputSchema: {
         message: z2.string().describe("Your message to the AI"),
         model: z2.string().optional().describe("Specific model ID (e.g., 'zai/glm-5', 'openai/o3')"),
@@ -904,7 +964,7 @@ Run blockrun_models to see all 41+ models with pricing.`,
     async ({ message, model, mode, routing, routing_profile, system, max_tokens, temperature, response_format, stop, thinking, agent_id, messages }) => {
       const llm = getClient();
       const responseFormat = response_format ? { type: response_format } : void 0;
-      const estimatedCost = estimateChatCost(mode, model, routing, routing_profile);
+      const estimatedCost = estimateChatCost(max_tokens, mode, model, routing, routing_profile);
       const budgetCheck = checkBudget(budget, agent_id, estimatedCost);
       if (!budgetCheck.allowed) {
         return {
@@ -940,7 +1000,7 @@ Run blockrun_models to see all 41+ models with pricing.`,
           };
         }
         try {
-          const result = await llm.smartChat(message, {
+          const { result, settledUsd } = await withSettledCost(llm, () => llm.smartChat(message, {
             system,
             maxTokens: max_tokens,
             maxOutputTokens: max_tokens,
@@ -951,8 +1011,8 @@ Run blockrun_models to see all 41+ models with pricing.`,
             routingProfile: routing_profile === "free" ? void 0 : routing_profile,
             responseFormat,
             stop
-          });
-          recordSpending(budget, result.routing.costEstimate || 1e-3, agent_id);
+          }));
+          recordActualSpend(budget, settledUsd, result.routing.costEstimate || estimatedCost, agent_id);
           return {
             content: [{ type: "text", text: `[${result.model} | ${result.routing.tier} | $${result.routing.costEstimate.toFixed(4)} | ${Math.round((result.routing.savings ?? 0) * 100)}% savings]
 
@@ -964,8 +1024,7 @@ ${result.response}` }],
             }
           };
         } catch (error) {
-          const errorMessage2 = error instanceof Error ? error.message : String(error);
-          return { content: [{ type: "text", text: formatError(errorMessage2) }], isError: true };
+          return { content: [{ type: "text", text: formatError(extractErrorMessage(error)) }], isError: true };
         }
       }
       if (messages && messages.length > 0) {
@@ -976,14 +1035,14 @@ ${result.response}` }],
           { role: "user", content: message }
         ];
         try {
-          const result = await llm.chatCompletion(targetModel, fullMessages, {
+          const { result, settledUsd } = await withSettledCost(llm, () => llm.chatCompletion(targetModel, fullMessages, {
             maxTokens: max_tokens,
             temperature,
             responseFormat,
             stop
-          });
+          }));
           const reply = result.choices?.[0]?.message?.content || "";
-          recordSpending(budget, estimatedCost, agent_id);
+          recordActualSpend(budget, settledUsd, estimatedCost, agent_id);
           return {
             content: [{ type: "text", text: `[${targetModel} | ${fullMessages.length} msgs]
 
@@ -991,25 +1050,23 @@ ${reply}` }],
             structuredContent: { model_used: targetModel, response: reply, message_count: fullMessages.length }
           };
         } catch (error) {
-          const errorMessage2 = error instanceof Error ? error.message : String(error);
-          return { content: [{ type: "text", text: formatError(errorMessage2) }], isError: true };
+          return { content: [{ type: "text", text: formatError(extractErrorMessage(error)) }], isError: true };
         }
       }
       if (model) {
         try {
-          const response = await llm.chat(model, message, {
+          const { result: response, settledUsd } = await withSettledCost(llm, () => llm.chat(model, message, {
             system,
             maxTokens: max_tokens,
             temperature,
             responseFormat,
             stop
-          });
-          recordSpending(budget, estimatedCost, agent_id);
+          }));
+          recordActualSpend(budget, settledUsd, estimatedCost, agent_id);
           return { content: [{ type: "text", text: response }] };
         } catch (error) {
-          const errorMessage2 = error instanceof Error ? error.message : String(error);
           return {
-            content: [{ type: "text", text: formatError(errorMessage2) }],
+            content: [{ type: "text", text: formatError(extractErrorMessage(error)) }],
             isError: true
           };
         }
@@ -1019,14 +1076,14 @@ ${reply}` }],
       let lastError = null;
       for (const m of models) {
         try {
-          const response = await llm.chat(m, message, {
+          const { result: response, settledUsd } = await withSettledCost(llm, () => llm.chat(m, message, {
             system,
             maxTokens: max_tokens,
             temperature,
             responseFormat,
             stop
-          });
-          recordSpending(budget, estimatedCost, agent_id);
+          }));
+          recordActualSpend(budget, settledUsd, estimatedCost, agent_id);
           return {
             content: [{ type: "text", text: `[${m}]
 
@@ -1038,7 +1095,7 @@ ${response}` }],
           continue;
         }
       }
-      const errorMessage = lastError?.message || "All models failed";
+      const errorMessage = lastError ? extractErrorMessage(lastError) : "All models failed";
       return {
         content: [{ type: "text", text: formatError(errorMessage) }],
         isError: true
@@ -1063,40 +1120,47 @@ function registerModelsTool(server, modelCache) {
       }
     },
     async ({ category, provider }) => {
-      let models = await loadModels(getClient(), modelCache);
-      if (provider) {
-        const p = provider.toLowerCase();
-        models = models.filter((m) => m.id.toLowerCase().startsWith(p + "/"));
-      }
-      if (category && category !== "all") {
-        if (category === "image") {
-          models = models.filter((m) => getModelType(m) === "image");
-        } else if (category === "embedding") {
-          models = models.filter((m) => m.id.includes("embed"));
-        } else {
-          models = models.filter((m) => "categories" in m && m.categories?.includes(category));
+      try {
+        let models = await loadModels(getClient(), modelCache);
+        if (provider) {
+          const p = provider.toLowerCase();
+          models = models.filter((m) => m.id.toLowerCase().startsWith(p + "/"));
+        }
+        if (category && category !== "all") {
+          if (category === "image") {
+            models = models.filter((m) => getModelType(m) === "image");
+          } else if (category === "embedding") {
+            models = models.filter((m) => m.id.includes("embed"));
+          } else {
+            models = models.filter((m) => "categories" in m && m.categories?.includes(category));
+          }
         }
-      }
-      const lines = models.map((m) => {
-        if (getModelType(m) === "image") {
-          const image = m;
-          const pricing2 = image.pricePerImage ? `$${image.pricePerImage}/image` : "";
-          const sizes = image.supportedSizes?.length ? ` | sizes: ${image.supportedSizes.join(", ")}` : "";
-          return `- ${image.id}${pricing2 ? ` (${pricing2})` : ""}${sizes} [image]`;
-        }
-        const llmModel = m;
-        const input = llmModel.inputPrice ? `$${llmModel.inputPrice}/M in` : "";
-        const output = llmModel.outputPrice ? `$${llmModel.outputPrice}/M out` : "";
-        const pricing = [input, output].filter(Boolean).join(", ");
-        const ctx = llmModel.contextWindow ? ` | ${Math.round(llmModel.contextWindow / 1e3)}K ctx` : "";
-        const cats = llmModel.categories?.length ? ` [${llmModel.categories.join(", ")}]` : "";
-        return `- ${llmModel.id}${pricing ? ` (${pricing})` : ""}${ctx}${cats}`;
-      });
-      return {
-        content: [{ type: "text", text: `Models (${models.length}):
+        const lines = models.map((m) => {
+          if (getModelType(m) === "image") {
+            const image = m;
+            const pricing2 = image.pricePerImage ? `$${image.pricePerImage}/image` : "";
+            const sizes = image.supportedSizes?.length ? ` | sizes: ${image.supportedSizes.join(", ")}` : "";
+            return `- ${image.id}${pricing2 ? ` (${pricing2})` : ""}${sizes} [image]`;
+          }
+          const llmModel = m;
+          const input = llmModel.inputPrice ? `$${llmModel.inputPrice}/M in` : "";
+          const output = llmModel.outputPrice ? `$${llmModel.outputPrice}/M out` : "";
+          const pricing = [input, output].filter(Boolean).join(", ");
+          const ctx = llmModel.contextWindow ? ` | ${Math.round(llmModel.contextWindow / 1e3)}K ctx` : "";
+          const cats = llmModel.categories?.length ? ` [${llmModel.categories.join(", ")}]` : "";
+          return `- ${llmModel.id}${pricing ? ` (${pricing})` : ""}${ctx}${cats}`;
+        });
+        return {
+          content: [{ type: "text", text: `Models (${models.length}):
 ${lines.join("\n")}` }],
-        structuredContent: { count: models.length, models }
-      };
+          structuredContent: { count: models.length, models }
+        };
+      } catch (err) {
+        return {
+          content: [{ type: "text", text: formatError(extractErrorMessage(err)) }],
+          isError: true
+        };
+      }
     }
   );
 }
@@ -1176,9 +1240,14 @@ var IMAGE_MODELS = [
   "xai/grok-imagine-image",
   "xai/grok-imagine-image-pro"
 ];
+function isLargerThanBase(size) {
+  const m = /^\s*(\d+)\s*[x×]\s*(\d+)\s*$/i.exec(size);
+  if (!m) return false;
+  return Math.max(Number(m[1]), Number(m[2])) > 1024;
+}
 function estimateCost(model, size) {
   const base = GENERATE_MODEL_COST[model] ?? 0.06;
-  if (size !== "1024x1024" && LARGE_SIZE_COST[model]) {
+  if (LARGE_SIZE_COST[model] && isLargerThanBase(size)) {
     return LARGE_SIZE_COST[model];
   }
   return base;
@@ -1455,7 +1524,7 @@ Returns a time-limited CDN URL \u2014 download immediately if you need to keep t
         const track = data.data?.[0];
         if (!track?.url) throw new Error("No track URL in response");
         const txHash = resp.headers.get("X-Payment-Receipt") || resp.headers.get("x-payment-receipt");
-        recordSpending(budget, MUSIC_COST, agent_id);
+        recordActualSpend(budget, amountToUsd(details.amount), MUSIC_COST, agent_id);
         const lines = [
           `\u{1F3B5} Track ready!`,
           `URL: ${track.url}`,
@@ -1631,6 +1700,7 @@ Returns a hosted audio URL \u2014 download immediately if you need to keep the f
         if (!prHeader) throw new Error("No PAYMENT-REQUIRED header in 402 response");
         const paymentRequired = parsePaymentRequired2(prHeader);
         const details = extractPaymentDetails2(paymentRequired);
+        const billedUsd = amountToUsd(details.amount) ?? cost;
         const paymentPayload = await createPaymentPayload2(
           privateKey,
           account.address,
@@ -1663,7 +1733,7 @@ Returns a hosted audio URL \u2014 download immediately if you need to keep the f
         const clip = data.data?.[0];
         if (!clip?.url) throw new Error("No audio URL in response");
         const txHash = resp.headers.get("X-Payment-Receipt") || resp.headers.get("x-payment-receipt");
-        recordSpending(budget, cost, agent_id);
+        recordActualSpend(budget, billedUsd, cost, agent_id);
         const lines = [
           action === "sound_effect" ? `\u{1F50A} Sound effect ready!` : `\u{1F5E3}\uFE0F Speech ready!`,
           `URL: ${clip.url}`,
@@ -1671,7 +1741,7 @@ Returns a hosted audio URL \u2014 download immediately if you need to keep the f
           ...clip.characters !== void 0 ? [`Characters: ${clip.characters}`] : [],
           ...clip.duration_seconds !== void 0 ? [`Duration: ${clip.duration_seconds}s`] : [],
           `Model: ${data.model || (action === "sound_effect" ? "elevenlabs/sound-effects" : model)}`,
-          `Cost: $${cost.toFixed(4)}`,
+          `Cost: $${billedUsd.toFixed(4)}`,
           ...txHash ? [`Tx: ${txHash}`] : [],
           ``,
           `Note: This URL may expire \u2014 download it now if you need to keep the file.`
@@ -1684,7 +1754,7 @@ Returns a hosted audio URL \u2014 download immediately if you need to keep the f
             ...clip.characters !== void 0 ? { characters: clip.characters } : {},
             ...clip.duration_seconds !== void 0 ? { duration_seconds: clip.duration_seconds } : {},
             model: data.model || (action === "sound_effect" ? "elevenlabs/sound-effects" : model),
-            cost_usd: cost,
+            cost_usd: billedUsd,
             ...txHash ? { txHash } : {}
           }
         };
@@ -1785,8 +1855,8 @@ function registerVideoTool(server, budget) {
 Turns a text prompt (and optional seed image) into a short MP4 clip. The tool submits the job, then polls until the video is ready (typical total wall-time 60-180s; 5 min hard cap). Payment is settled only when upstream returns a finished video \u2014 if the job fails or we give up, you are not charged.
 
 Models (Seedance defaults bumped to 720p + synced audio on the gateway):
-- azure/sora-2 ($0.10/sec, 720p + synced audio, text-to-video) \u2014 OpenAI Sora 2 via Azure AI Foundry. duration_seconds must be 4, 8, or 12 (4s default -> ~$0.42/clip). No image_url / RealFace.
-- xai/grok-imagine-video ($0.05/sec, 8s default -> $0.42/clip) \u2014 stylized, fast
+- azure/sora-2 ($0.10/sec, 720p + synced audio, text-to-video) \u2014 OpenAI Sora 2 via Azure AI Foundry. duration_seconds must be 4, 8, or 12 (4s default -> ~$0.40/clip). No image_url / RealFace.
+- xai/grok-imagine-video ($0.05/sec, 8s default -> $0.40/clip) \u2014 stylized, fast
 - bytedance/seedance-1.5-pro (~$0.092/sec, 720p + audio t2v, 5s default up to 10s) \u2014 cheapest Seedance, token-priced upstream
 - bytedance/seedance-2.0-fast (~$0.238/sec text \xB7 ~$0.140/sec image-to-video, 720p + audio, ~60-80s gen) \u2014 sweet-spot price/quality; supports BytePlus RealFace assets
 - bytedance/seedance-2.0 (~$0.298/sec text \xB7 ~$0.183/sec image-to-video, 720p + audio Pro) \u2014 highest quality; supports BytePlus RealFace assets
@@ -1799,11 +1869,15 @@ Returns a permanent blockrun-hosted MP4 URL (the gateway mirrors the asset to GC
         image_url: z7.string().url().optional().describe("Optional seed image URL for image-to-video generation"),
         real_face_asset_id: z7.string().regex(/^ta_[A-Za-z0-9]+$/, "token360 asset id like 'ta_xxxx'").optional().describe("BytePlus RealFace asset id (from blockrun_realface enroll/list) to generate video of a specific real person. Seedance 2.0 / 2.0-fast only. Mutually exclusive with image_url."),
         duration_seconds: z7.number().int().min(1).max(60).optional().describe("Duration to bill for (defaults to the model's default \u2014 8s for xAI, 5s for Seedance; Seedance supports up to 10s)."),
+        generate_audio: z7.boolean().optional().describe("Seedance only: whether to generate a synced audio track. Defaults ON for text-to-video and OFF for image/RealFace-conditioned. The auto-generated audio is occasionally rejected by upstream moderation ('output audio may contain sensitive information') even for benign prompts \u2014 pass false to skip audio and avoid that failure. Ignored by xAI/Sora."),
+        resolution: z7.enum(["360p", "480p", "540p", "720p", "1080p", "1K", "2K", "4K"]).optional().describe("Seedance only: output resolution. Defaults to 720p. Higher resolutions cost more (token-priced upstream) \u2014 the final price is set by the 402 challenge, so the up-front estimate may understate 1080p/4K. Ignored by xAI/Sora."),
+        aspect_ratio: z7.enum(["adaptive", "16:9", "9:16", "1:1", "4:3", "3:4", "21:9", "9:21"]).optional().describe("Seedance only: output aspect ratio, e.g. '9:16' for vertical/mobile, '16:9' for landscape. Defaults to the model's own default. Ignored by xAI/Sora."),
+        last_frame_url: z7.string().url().optional().describe("Seedance only: first-and-last-frame interpolation. A second image URL that seeds the FINAL frame so the model tweens from image_url (first frame) \u2192 last_frame_url (last frame). Requires image_url; mutually exclusive with real_face_asset_id. Priced as image-to-video."),
         model: z7.enum(["azure/sora-2", "xai/grok-imagine-video", "bytedance/seedance-1.5-pro", "bytedance/seedance-2.0-fast", "bytedance/seedance-2.0"]).optional().default("xai/grok-imagine-video").describe("Video model to use"),
         agent_id: z7.string().optional().describe("Agent identifier for budget tracking and enforcement.")
       }
     },
-    async ({ prompt, image_url, real_face_asset_id, duration_seconds, model, agent_id }) => {
+    async ({ prompt, image_url, real_face_asset_id, duration_seconds, generate_audio, resolution, aspect_ratio, last_frame_url, model, agent_id }) => {
       try {
         if (getChain() !== "base") {
           return {
@@ -1826,6 +1900,20 @@ Returns a permanent blockrun-hosted MP4 URL (the gateway mirrors the asset to GC
             };
           }
         }
+        if (last_frame_url) {
+          if (!image_url) {
+            return {
+              content: [{ type: "text", text: formatError("last_frame_url (first-and-last-frame interpolation) requires image_url as the first frame.") }],
+              isError: true
+            };
+          }
+          if (real_face_asset_id) {
+            return {
+              content: [{ type: "text", text: formatError("last_frame_url cannot be combined with real_face_asset_id.") }],
+              isError: true
+            };
+          }
+        }
         const billedSeconds = duration_seconds ?? VIDEO_DEFAULT_DURATION[selectedModel] ?? 8;
         const hasImageInput = Boolean(image_url || real_face_asset_id);
         const perSecond = (hasImageInput ? VIDEO_PRICE_PER_SECOND_IMAGE[selectedModel] : void 0) ?? VIDEO_PRICE_PER_SECOND[selectedModel] ?? 0.05;
@@ -1844,6 +1932,10 @@ Returns a permanent blockrun-hosted MP4 URL (the gateway mirrors the asset to GC
         if (image_url) body.image_url = image_url;
         if (real_face_asset_id) body.real_face_asset_id = real_face_asset_id;
         if (duration_seconds !== void 0) body.duration_seconds = duration_seconds;
+        if (generate_audio !== void 0) body.generate_audio = generate_audio;
+        if (resolution !== void 0) body.resolution = resolution;
+        if (aspect_ratio !== void 0) body.aspect_ratio = aspect_ratio;
+        if (last_frame_url) body.last_frame_url = last_frame_url;
         const resp402 = await fetchWithTimeout(submitUrl, {
           method: "POST",
           headers: { "Content-Type": "application/json" },
@@ -1857,6 +1949,7 @@ Returns a permanent blockrun-hosted MP4 URL (the gateway mirrors the asset to GC
         if (!prHeader) throw new Error("No PAYMENT-REQUIRED header in 402 response");
         const paymentRequired = parsePaymentRequired3(prHeader);
         const details = extractPaymentDetails3(paymentRequired);
+        const settledUsd = amountToUsd(details.amount);
         const paymentPayload = await createPaymentPayload3(
           privateKey,
           account.address,
@@ -1939,7 +2032,7 @@ Returns a permanent blockrun-hosted MP4 URL (the gateway mirrors the asset to GC
           ...completed.request_id ? [`Request ID: ${completed.request_id}`] : [],
           ...completed.txHash ? [`Tx: ${completed.txHash}`] : []
         ];
-        recordSpending(budget, estimatedCost, agent_id);
+        recordActualSpend(budget, settledUsd, estimatedCost, agent_id);
         return {
           content: [{ type: "text", text: lines.join("\n") }],
           structuredContent: {
@@ -2025,7 +2118,7 @@ async function payAndPostJson(url, reqBody, fallbackDescription) {
     body: reqBody
   }, 9e4);
   const data = await resp.json().catch(() => ({}));
-  return { status: resp.status, data };
+  return { status: resp.status, data, settledUsd: amountToUsd(details.amount) };
 }
 function registerRealfaceTool(server, budget) {
   server.registerTool(
@@ -2188,7 +2281,7 @@ Enroll one: blockrun_realface action:"init" name:"\u2026" (real person) or actio
           if (!budgetCheck.allowed) {
             return { content: [{ type: "text", text: `${budgetCheck.reason}. Use blockrun_wallet action:"report" to see usage or action:"delegate" to increase agent budget.` }], isError: true };
           }
-          const { status, data } = await payAndPostJson(
+          const { status, data, settledUsd } = await payAndPostJson(
             `${BLOCKRUN_API4}/v1/portrait/enroll`,
             JSON.stringify({ name, image_url }),
             "BlockRun Virtual Portrait enrollment"
@@ -2204,7 +2297,7 @@ Enroll one: blockrun_realface action:"init" name:"\u2026" (real person) or actio
           }
           const assetId = data.asset_id;
           if (!assetId) throw new Error(`Portrait response missing asset_id: ${JSON.stringify(data)}`);
-          recordSpending(budget, ENROLLMENT_PRICE_USD, agent_id);
+          recordActualSpend(budget, settledUsd, ENROLLMENT_PRICE_USD, agent_id);
           const txHash = data.settlement?.tx_hash || void 0;
           const lines = [
             `\u2705 Virtual Portrait enrolled!`,
@@ -2255,6 +2348,7 @@ Enroll one: blockrun_realface action:"init" name:"\u2026" (real person) or actio
           if (!prHeader) throw new Error("No PAYMENT-REQUIRED header in 402 response");
           const paymentRequired = parsePaymentRequired4(prHeader);
           const details = extractPaymentDetails4(paymentRequired);
+          const settledUsd = amountToUsd(details.amount);
           const paymentPayload = await createPaymentPayload4(
             privateKey,
             account.address,
@@ -2291,7 +2385,7 @@ Enroll one: blockrun_realface action:"init" name:"\u2026" (real person) or actio
           }
           const assetId = data.asset_id;
           if (!assetId) throw new Error(`Enroll response missing asset_id: ${JSON.stringify(data)}`);
-          recordSpending(budget, ENROLLMENT_PRICE_USD, agent_id);
+          recordActualSpend(budget, settledUsd, ENROLLMENT_PRICE_USD, agent_id);
           const txHash = data.settlement?.tx_hash || void 0;
           const lines = [
             `\u2705 RealFace enrolled!`,
@@ -2336,13 +2430,16 @@ import { z as z9 } from "zod";
 function coerceBody(body) {
   if (typeof body !== "string") return body;
   const trimmed = body.trim();
-  if (trimmed === "") return {};
+  if (trimmed === "") return void 0;
   try {
     return JSON.parse(trimmed);
   } catch {
     return body;
   }
 }
+function asStructuredContent(result) {
+  return typeof result === "object" && result !== null && !Array.isArray(result) ? result : { result };
+}
 
 // src/tools/search.ts
 var SEARCH_PRICE_PER_SOURCE = 0.025;
@@ -2389,7 +2486,7 @@ Full request shape + worked examples in the \`search\` skill (\`skills/search/SK
         recordSpending(budget, estimatedCost, agent_id);
         return {
           content: [{ type: "text", text: JSON.stringify(result, null, 2) }],
-          structuredContent: result
+          structuredContent: asStructuredContent(result)
         };
       } catch (err) {
         return { content: [{ type: "text", text: formatError(extractErrorMessage(err)) }], isError: true };
@@ -2447,7 +2544,7 @@ Full request/response shapes + worked research workflows in the \`exa-research\`
         recordSpending(budget, estimatedCost, agent_id);
         return {
           content: [{ type: "text", text: JSON.stringify(result, null, 2) }],
-          structuredContent: result
+          structuredContent: asStructuredContent(result)
         };
       } catch (err) {
         return { content: [{ type: "text", text: formatError(extractErrorMessage(err)) }], isError: true };
@@ -2544,12 +2641,11 @@ Pass query params via 'params' (GET). Use 'body' only for POST endpoints (e.g. p
         recordSpending(budget, estimatedCost, agent_id);
         return {
           content: [{ type: "text", text: JSON.stringify(result, null, 2) }],
-          structuredContent: result
+          structuredContent: asStructuredContent(result)
         };
       } catch (err) {
-        const errMsg = err instanceof Error ? err.message : String(err);
         return {
-          content: [{ type: "text", text: formatError(errMsg) }],
+          content: [{ type: "text", text: formatError(extractErrorMessage(err)) }],
           isError: true
         };
       }
@@ -2674,9 +2770,8 @@ Examples:
           structuredContent: result
         };
       } catch (err) {
-        const msg = err instanceof Error ? err.message : String(err);
         return {
-          content: [{ type: "text", text: formatError(msg) }],
+          content: [{ type: "text", text: formatError(extractErrorMessage(err)) }],
           isError: true
         };
       }
@@ -2770,6 +2865,15 @@ import { z as z14 } from "zod";
 function estimateModalCost(path5) {
   return path5.includes("sandbox/create") ? 0.01 : 1e-3;
 }
+var MODAL_DEFAULT_TIMEOUT_S = 300;
+var MODAL_MAX_TIMEOUT_S = 1800;
+var MODAL_SLACK_MS = 15e3;
+function modalTimeoutMs(body) {
+  const raw = body && typeof body === "object" ? body.timeout : void 0;
+  const requested = typeof raw === "number" && raw > 0 ? raw : MODAL_DEFAULT_TIMEOUT_S;
+  const clamped = Math.min(Math.max(requested, MODAL_DEFAULT_TIMEOUT_S), MODAL_MAX_TIMEOUT_S);
+  return clamped * 1e3 + MODAL_SLACK_MS;
+}
 function registerModalTool(server, budget) {
   server.registerTool(
     "blockrun_modal",
@@ -2803,13 +2907,13 @@ Full action shapes + GPU type details in the \`modal\` skill.`,
             isError: true
           };
         }
-        const client = getClient();
+        const client = buildClientWithTimeout(modalTimeoutMs(body));
         const endpoint = `/v1/modal/${cleanPath}`;
         const result = await client.requestWithPaymentRaw(endpoint, body ?? {});
         recordSpending(budget, estimatedCost, agent_id);
         return {
           content: [{ type: "text", text: JSON.stringify(result, null, 2) }],
-          structuredContent: result
+          structuredContent: asStructuredContent(result)
         };
       } catch (err) {
         return { content: [{ type: "text", text: formatError(extractErrorMessage(err)) }], isError: true };
@@ -2875,7 +2979,7 @@ Voice call flow + voice preset details + full body shapes in the \`phone\` skill
         if (estimatedCost > 0) recordSpending(budget, estimatedCost, agent_id);
         return {
           content: [{ type: "text", text: JSON.stringify(result, null, 2) }],
-          structuredContent: result
+          structuredContent: asStructuredContent(result)
         };
       } catch (err) {
         return { content: [{ type: "text", text: formatError(extractErrorMessage(err)) }], isError: true };
@@ -2973,7 +3077,7 @@ Each Surf endpoint pre-validates required params before settling \u2014 you get
         recordSpending(budget, estimatedCost, agent_id);
         return {
           content: [{ type: "text", text: JSON.stringify(result, null, 2) }],
-          structuredContent: result
+          structuredContent: asStructuredContent(result)
         };
       } catch (err) {
         return {
@@ -3170,7 +3274,13 @@ function resolveTools(argv, env) {
 
 // src/mcp-handler.ts
 function initializeMcpServer(server, profileArgs) {
-  const budget = { limit: null, spent: 0, calls: 0, agents: /* @__PURE__ */ new Map() };
+  const env = profileArgs?.env ?? process.env;
+  const budget = {
+    limit: parseBudgetLimitEnv(env.BLOCKRUN_BUDGET_LIMIT),
+    spent: 0,
+    calls: 0,
+    agents: /* @__PURE__ */ new Map()
+  };
   const modelCache = { models: null };
   const { profile, tools } = resolveTools(profileArgs?.argv, profileArgs?.env);
   const registrars = {
@@ -3243,9 +3353,15 @@ function looksLikeRawPrivateKey(value) {
   if (value.length >= 80 && value.length <= 100 && /^[1-9A-HJ-NP-Za-km-z]+$/.test(value)) return true;
   return false;
 }
+function looksLikeSolanaSecretKeyArray(value) {
+  return Array.isArray(value) && value.length === 64 && value.every((n) => typeof n === "number" && Number.isInteger(n) && n >= 0 && n <= 255);
+}
 function walk(obj, file, jsonPath, out) {
   if (obj === null || typeof obj !== "object") return;
   if (Array.isArray(obj)) {
+    if (looksLikeSolanaSecretKeyArray(obj)) {
+      out.push({ file, path: jsonPath || "(root)" });
+    }
     obj.forEach((v, i) => walk(v, file, `${jsonPath}[${i}]`, out));
     return;
   }