@blockrun/clawrouter 0.9.18 → 0.9.20

package/dist/index.d.ts

@@ -667,16 +667,16 @@ declare const blockrunProvider: ProviderPlugin;
 
 /**
  * Model aliases for convenient shorthand access.
- * Users can type `/model claude` instead of `/model blockrun/anthropic/claude-sonnet-4`.
+ * Users can type `/model claude` instead of `/model blockrun/anthropic/claude-sonnet-4.6`.
  */
 declare const MODEL_ALIASES: Record<string, string>;
 /**
  * Resolve a model alias to its full model ID.
  * Also strips "blockrun/" prefix for direct model paths.
  * Examples:
- *   - "claude" -> "anthropic/claude-sonnet-4" (alias)
- *   - "blockrun/claude" -> "anthropic/claude-sonnet-4" (alias with prefix)
- *   - "blockrun/anthropic/claude-sonnet-4" -> "anthropic/claude-sonnet-4" (prefix stripped)
+ *   - "claude" -> "anthropic/claude-sonnet-4.6" (alias)
+ *   - "blockrun/claude" -> "anthropic/claude-sonnet-4.6" (alias with prefix)
+ *   - "blockrun/anthropic/claude-sonnet-4.6" -> "anthropic/claude-sonnet-4.6" (prefix stripped)
  *   - "openai/gpt-4o" -> "openai/gpt-4o" (unchanged)
  */
 declare function resolveModelAlias(model: string): string;
@@ -793,6 +793,8 @@ type CachedPaymentParams = {
         version?: string;
     };
     maxTimeoutSeconds?: number;
+    resourceUrl?: string;
+    resourceDescription?: string;
     cachedAt: number;
 };
 declare class PaymentCache {

package/dist/index.js

@@ -1,18 +1,18 @@
 // src/models.ts
 var MODEL_ALIASES = {
   // Claude - short names
-  claude: "anthropic/claude-sonnet-4",
-  sonnet: "anthropic/claude-sonnet-4",
+  claude: "anthropic/claude-sonnet-4.6",
+  sonnet: "anthropic/claude-sonnet-4.6",
   opus: "anthropic/claude-opus-4.6",
   // Updated to latest Opus 4.6
   "opus-46": "anthropic/claude-opus-4.6",
   "opus-45": "anthropic/claude-opus-4.5",
   haiku: "anthropic/claude-haiku-4.5",
   // Claude - provider/shortname patterns (common in agent frameworks)
-  "anthropic/sonnet": "anthropic/claude-sonnet-4",
+  "anthropic/sonnet": "anthropic/claude-sonnet-4.6",
   "anthropic/opus": "anthropic/claude-opus-4.6",
   "anthropic/haiku": "anthropic/claude-haiku-4.5",
-  "anthropic/claude": "anthropic/claude-sonnet-4",
+  "anthropic/claude": "anthropic/claude-sonnet-4.6",
   // OpenAI
   gpt: "openai/gpt-4o",
   gpt4: "openai/gpt-4o",
@@ -208,8 +208,8 @@ var BLOCKRUN_MODELS = [
     agentic: true
   },
   {
-    id: "anthropic/claude-sonnet-4",
-    name: "Claude Sonnet 4",
+    id: "anthropic/claude-sonnet-4.6",
+    name: "Claude Sonnet 4.6",
     inputPrice: 3,
     outputPrice: 15,
     contextWindow: 2e5,
@@ -514,13 +514,11 @@ var PaymentCache = class {
 
 // src/x402.ts
 var BASE_CHAIN_ID = 8453;
-var USDC_BASE = "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913";
-var USDC_DOMAIN = {
-  name: "USD Coin",
-  version: "2",
-  chainId: BASE_CHAIN_ID,
-  verifyingContract: USDC_BASE
-};
+var BASE_SEPOLIA_CHAIN_ID = 84532;
+var DEFAULT_TOKEN_NAME = "USD Coin";
+var DEFAULT_TOKEN_VERSION = "2";
+var DEFAULT_NETWORK = "eip155:8453";
+var DEFAULT_MAX_TIMEOUT_SECONDS = 300;
 var TRANSFER_TYPES = {
   TransferWithAuthorization: [
     { name: "from", type: "address" },
@@ -536,18 +534,78 @@ function createNonce() {
   crypto.getRandomValues(bytes);
   return `0x${Array.from(bytes).map((b) => b.toString(16).padStart(2, "0")).join("")}`;
 }
-function parsePaymentRequired(headerValue) {
-  const decoded = atob(headerValue);
+function decodeBase64Json(value) {
+  const normalized = value.replace(/-/g, "+").replace(/_/g, "/");
+  const padding = (4 - normalized.length % 4) % 4;
+  const padded = normalized + "=".repeat(padding);
+  const decoded = Buffer.from(padded, "base64").toString("utf8");
   return JSON.parse(decoded);
 }
-async function createPaymentPayload(privateKey, fromAddress, recipient, amount, resourceUrl) {
+function encodeBase64Json(value) {
+  return Buffer.from(JSON.stringify(value), "utf8").toString("base64");
+}
+function parsePaymentRequired(headerValue) {
+  return decodeBase64Json(headerValue);
+}
+function normalizeNetwork(network) {
+  if (!network || network.trim().length === 0) {
+    return DEFAULT_NETWORK;
+  }
+  return network.trim().toLowerCase();
+}
+function resolveChainId(network) {
+  const eip155Match = network.match(/^eip155:(\d+)$/i);
+  if (eip155Match) {
+    const parsed = Number.parseInt(eip155Match[1], 10);
+    if (Number.isFinite(parsed) && parsed > 0) {
+      return parsed;
+    }
+  }
+  if (network === "base") return BASE_CHAIN_ID;
+  if (network === "base-sepolia") return BASE_SEPOLIA_CHAIN_ID;
+  return BASE_CHAIN_ID;
+}
+function parseHexAddress(value) {
+  if (!value) return void 0;
+  const direct = value.match(/^0x[a-fA-F0-9]{40}$/);
+  if (direct) {
+    return direct[0];
+  }
+  const caipSuffix = value.match(/0x[a-fA-F0-9]{40}$/);
+  if (caipSuffix) {
+    return caipSuffix[0];
+  }
+  return void 0;
+}
+function requireHexAddress(value, field) {
+  const parsed = parseHexAddress(value);
+  if (!parsed) {
+    throw new Error(`Invalid ${field} in payment requirements: ${String(value)}`);
+  }
+  return parsed;
+}
+function setPaymentHeaders(headers, payload) {
+  headers.set("payment-signature", payload);
+  headers.set("x-payment", payload);
+}
+async function createPaymentPayload(privateKey, fromAddress, option, amount, requestUrl, resource) {
+  const network = normalizeNetwork(option.network);
+  const chainId = resolveChainId(network);
+  const recipient = requireHexAddress(option.payTo, "payTo");
+  const verifyingContract = requireHexAddress(option.asset, "asset");
+  const maxTimeoutSeconds = typeof option.maxTimeoutSeconds === "number" && option.maxTimeoutSeconds > 0 ? Math.floor(option.maxTimeoutSeconds) : DEFAULT_MAX_TIMEOUT_SECONDS;
   const now = Math.floor(Date.now() / 1e3);
   const validAfter = now - 600;
-  const validBefore = now + 300;
+  const validBefore = now + maxTimeoutSeconds;
   const nonce = createNonce();
   const signature = await signTypedData({
     privateKey,
-    domain: USDC_DOMAIN,
+    domain: {
+      name: option.extra?.name || DEFAULT_TOKEN_NAME,
+      version: option.extra?.version || DEFAULT_TOKEN_VERSION,
+      chainId,
+      verifyingContract
+    },
     types: TRANSFER_TYPES,
     primaryType: "TransferWithAuthorization",
     message: {
@@ -562,18 +620,18 @@ async function createPaymentPayload(privateKey, fromAddress, recipient, amount,
   const paymentData = {
     x402Version: 2,
     resource: {
-      url: resourceUrl,
-      description: "BlockRun AI API call",
+      url: resource?.url || requestUrl,
+      description: resource?.description || "BlockRun AI API call",
       mimeType: "application/json"
     },
     accepted: {
-      scheme: "exact",
-      network: "eip155:8453",
+      scheme: option.scheme,
+      network,
       amount,
-      asset: USDC_BASE,
-      payTo: recipient,
-      maxTimeoutSeconds: 300,
-      extra: { name: "USD Coin", version: "2" }
+      asset: option.asset,
+      payTo: option.payTo,
+      maxTimeoutSeconds: option.maxTimeoutSeconds,
+      extra: option.extra
     },
     payload: {
       signature,
@@ -588,7 +646,7 @@ async function createPaymentPayload(privateKey, fromAddress, recipient, amount,
     },
     extensions: {}
   };
-  return btoa(JSON.stringify(paymentData));
+  return encodeBase64Json(paymentData);
 }
 function createPaymentFetch(privateKey) {
   const account = privateKeyToAccount(privateKey);
@@ -602,12 +660,23 @@ function createPaymentFetch(privateKey) {
       const paymentPayload = await createPaymentPayload(
         privateKey,
         walletAddress,
-        cached.payTo,
+        {
+          scheme: cached.scheme,
+          network: cached.network,
+          asset: cached.asset,
+          payTo: cached.payTo,
+          maxTimeoutSeconds: cached.maxTimeoutSeconds,
+          extra: cached.extra
+        },
         preAuth.estimatedAmount,
-        url
+        url,
+        {
+          url: cached.resourceUrl,
+          description: cached.resourceDescription
+        }
       );
       const preAuthHeaders = new Headers(init?.headers);
-      preAuthHeaders.set("payment-signature", paymentPayload);
+      setPaymentHeaders(preAuthHeaders, paymentPayload);
       const response2 = await fetch(input, { ...init, headers: preAuthHeaders });
       if (response2.status !== 402) {
         return response2;
@@ -653,17 +722,20 @@ function createPaymentFetch(privateKey) {
       scheme: option.scheme,
       network: option.network,
       extra: option.extra,
-      maxTimeoutSeconds: option.maxTimeoutSeconds
+      maxTimeoutSeconds: option.maxTimeoutSeconds,
+      resourceUrl: paymentRequired.resource?.url,
+      resourceDescription: paymentRequired.resource?.description
     });
     const paymentPayload = await createPaymentPayload(
       privateKey,
       walletAddress,
-      option.payTo,
+      option,
       amount,
-      url
+      url,
+      paymentRequired.resource
     );
     const retryHeaders = new Headers(init?.headers);
-    retryHeaders.set("payment-signature", paymentPayload);
+    setPaymentHeaders(retryHeaders, paymentPayload);
     return fetch(input, {
       ...init,
       headers: retryHeaders
@@ -1635,7 +1707,7 @@ var DEFAULT_ROUTING_CONFIG = {
         "openai/gpt-5.2",
         // Newer and cheaper input than gpt-4o
         "openai/gpt-4o",
-        "anthropic/claude-sonnet-4"
+        "anthropic/claude-sonnet-4.6"
       ]
     },
     REASONING: {
@@ -1688,22 +1760,22 @@ var DEFAULT_ROUTING_CONFIG = {
         "moonshot/kimi-k2.5",
         "google/gemini-2.5-pro",
         "xai/grok-4-0709",
-        "anthropic/claude-sonnet-4"
+        "anthropic/claude-sonnet-4.6"
       ]
     },
     COMPLEX: {
       primary: "anthropic/claude-opus-4.6",
       // Best quality for complex tasks
       fallback: [
-        "anthropic/claude-opus-4.5",
-        "anthropic/claude-sonnet-4",
         "openai/gpt-5.2-codex",
+        "anthropic/claude-opus-4.5",
+        "anthropic/claude-sonnet-4.6",
         "google/gemini-3-pro-preview",
         "moonshot/kimi-k2.5"
       ]
     },
     REASONING: {
-      primary: "anthropic/claude-sonnet-4",
+      primary: "anthropic/claude-sonnet-4.6",
       // $3/$15 - best for reasoning/instructions
       fallback: [
         "anthropic/claude-opus-4.6",
@@ -1729,10 +1801,10 @@ var DEFAULT_ROUTING_CONFIG = {
     MEDIUM: {
       primary: "xai/grok-code-fast-1",
       // Code specialist for agentic coding
-      fallback: ["moonshot/kimi-k2.5", "anthropic/claude-haiku-4.5", "anthropic/claude-sonnet-4"]
+      fallback: ["moonshot/kimi-k2.5", "anthropic/claude-haiku-4.5", "anthropic/claude-sonnet-4.6"]
     },
     COMPLEX: {
-      primary: "anthropic/claude-sonnet-4",
+      primary: "anthropic/claude-sonnet-4.6",
       fallback: [
         "anthropic/claude-opus-4.6",
         // Latest Opus - best agentic
@@ -1742,7 +1814,7 @@ var DEFAULT_ROUTING_CONFIG = {
       ]
     },
     REASONING: {
-      primary: "anthropic/claude-sonnet-4",
+      primary: "anthropic/claude-sonnet-4.6",
       // Strong tool use + reasoning for agentic tasks
       fallback: [
         "anthropic/claude-opus-4.6",
@@ -2434,7 +2506,7 @@ function isRpcError(error) {
 }
 
 // src/balance.ts
-var USDC_BASE2 = "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913";
+var USDC_BASE = "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913";
 var CACHE_TTL_MS = 3e4;
 var BALANCE_THRESHOLDS = {
   /** Low balance warning threshold: $1.00 */
@@ -2533,7 +2605,7 @@ var BalanceMonitor = class {
   async fetchBalance() {
     try {
       const balance = await this.client.readContract({
-        address: USDC_BASE2,
+        address: USDC_BASE,
         abi: erc20Abi,
         functionName: "balanceOf",
         args: [this.walletAddress]
@@ -5268,7 +5340,13 @@ function injectModelsConfig(logger) {
     { id: "gemini", alias: "gemini" },
     { id: "flash", alias: "flash" }
   ];
-  const DEPRECATED_ALIASES = ["blockrun/nvidia", "blockrun/gpt", "blockrun/o3", "blockrun/grok", "blockrun/mini"];
+  const DEPRECATED_ALIASES = [
+    "blockrun/nvidia",
+    "blockrun/gpt",
+    "blockrun/o3",
+    "blockrun/grok",
+    "blockrun/mini"
+  ];
   if (!defaults.models) {
     defaults.models = {};
     needsWrite = true;