@blockrun/clawrouter 0.12.5 → 0.12.7

package/dist/cli.js

@@ -1449,8 +1449,8 @@ var DEFAULT_ROUTING_CONFIG = {
         "google/gemini-2.5-pro",
         "deepseek/deepseek-chat",
         "xai/grok-4-0709",
-        "openai/gpt-5.2",
-        // Newer and cheaper input than gpt-4o
+        "openai/gpt-5.4",
+        // Newest flagship, same price as 4o
         "openai/gpt-4o",
         "anthropic/claude-sonnet-4.6"
       ]
@@ -1516,6 +1516,8 @@ var DEFAULT_ROUTING_CONFIG = {
       primary: "anthropic/claude-opus-4.6",
       // Best quality for complex tasks
       fallback: [
+        "openai/gpt-5.4",
+        // Newest flagship
         "openai/gpt-5.2-codex",
         "anthropic/claude-opus-4.6",
         "anthropic/claude-sonnet-4.6",
@@ -1563,7 +1565,8 @@ var DEFAULT_ROUTING_CONFIG = {
       fallback: [
         "anthropic/claude-opus-4.6",
         // Latest Opus - best agentic
-        "openai/gpt-5.2",
+        "openai/gpt-5.4",
+        // Newest flagship
         "google/gemini-3.1-pro",
         // Newest Gemini
         "google/gemini-3-pro-preview",
@@ -1692,7 +1695,9 @@ var MODEL_ALIASES = {
   // OpenAI
   gpt: "openai/gpt-4o",
   gpt4: "openai/gpt-4o",
-  gpt5: "openai/gpt-5.2",
+  gpt5: "openai/gpt-5.4",
+  "gpt-5.4": "openai/gpt-5.4",
+  "gpt-5.4-pro": "openai/gpt-5.4-pro",
   codex: "openai/gpt-5.2-codex",
   mini: "openai/gpt-4o-mini",
   o1: "openai/o1",
@@ -1816,6 +1821,31 @@ var BLOCKRUN_MODELS = [
     reasoning: true,
     toolCalling: true
   },
+  // GPT-5.4 — newest flagship, same input price as 4o but much more capable
+  {
+    id: "openai/gpt-5.4",
+    name: "GPT-5.4",
+    version: "5.4",
+    inputPrice: 2.5,
+    outputPrice: 15,
+    contextWindow: 4e5,
+    maxOutput: 128e3,
+    reasoning: true,
+    vision: true,
+    agentic: true,
+    toolCalling: true
+  },
+  {
+    id: "openai/gpt-5.4-pro",
+    name: "GPT-5.4 Pro",
+    version: "5.4",
+    inputPrice: 30,
+    outputPrice: 180,
+    contextWindow: 4e5,
+    maxOutput: 128e3,
+    reasoning: true,
+    toolCalling: true
+  },
   // OpenAI Codex Family
   {
     id: "openai/gpt-5.2-codex",
@@ -3520,12 +3550,7 @@ var sha5122 = sha512;
 // src/wallet.ts
 import { privateKeyToAccount } from "viem/accounts";
 var ETH_DERIVATION_PATH = "m/44'/60'/0'/0/0";
-var SOLANA_HARDENED_INDICES = [
-  44 + 2147483648,
-  501 + 2147483648,
-  0 + 2147483648,
-  0 + 2147483648
-];
+var SOLANA_HARDENED_INDICES = [44 + 2147483648, 501 + 2147483648, 0 + 2147483648, 0 + 2147483648];
 function generateWalletMnemonic() {
   return generateMnemonic(english, 256);
 }
@@ -3572,6 +3597,11 @@ function deriveAllKeys(mnemonic) {
   const solanaPrivateKeyBytes = deriveSolanaKeyBytes(mnemonic);
   return { mnemonic, evmPrivateKey, evmAddress, solanaPrivateKeyBytes };
 }
+async function getSolanaAddress(privateKeyBytes) {
+  const { createKeyPairSignerFromPrivateKeyBytes } = await import("@solana/kit");
+  const signer = await createKeyPairSignerFromPrivateKeyBytes(privateKeyBytes);
+  return signer.address;
+}
 
 // src/auth.ts
 var WALLET_DIR = join4(homedir3(), ".openclaw", "blockrun");
@@ -3649,13 +3679,21 @@ async function generateAndSaveWallet() {
       { cause: err }
     );
   }
+  let solanaAddress;
+  try {
+    solanaAddress = await getSolanaAddress(derived.solanaPrivateKeyBytes);
+  } catch {
+  }
   console.log(`[ClawRouter]`);
   console.log(`[ClawRouter] \u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550`);
   console.log(`[ClawRouter]   NEW WALLET GENERATED \u2014 BACK UP YOUR KEY NOW`);
   console.log(`[ClawRouter] \u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550`);
-  console.log(`[ClawRouter]   EVM Address : ${derived.evmAddress}`);
-  console.log(`[ClawRouter]   Key file    : ${WALLET_FILE}`);
-  console.log(`[ClawRouter]   Mnemonic    : ${MNEMONIC_FILE}`);
+  console.log(`[ClawRouter]   EVM Address    : ${derived.evmAddress}`);
+  if (solanaAddress) {
+    console.log(`[ClawRouter]   Solana Address : ${solanaAddress}`);
+  }
+  console.log(`[ClawRouter]   Key file       : ${WALLET_FILE}`);
+  console.log(`[ClawRouter]   Mnemonic       : ${MNEMONIC_FILE}`);
   console.log(`[ClawRouter]`);
   console.log(`[ClawRouter]   Both EVM (Base) and Solana wallets are ready.`);
   console.log(`[ClawRouter]   To back up, run in OpenClaw:`);
@@ -6600,13 +6638,24 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
           `[ClawRouter] Context filter (~${estimatedTotalTokens} tokens): excluded ${contextExcluded.join(", ")}`
         );
       }
-      const toolFiltered = filterByToolCalling(contextFiltered, hasTools, supportsToolCalling);
+      let toolFiltered = filterByToolCalling(contextFiltered, hasTools, supportsToolCalling);
       const toolExcluded = contextFiltered.filter((m) => !toolFiltered.includes(m));
       if (toolExcluded.length > 0) {
         console.log(
           `[ClawRouter] Tool-calling filter: excluded ${toolExcluded.join(", ")} (no structured function call support)`
         );
       }
+      const TOOL_NONCOMPLIANT_MODELS = ["google/gemini-2.5-flash-lite"];
+      if (hasTools && toolFiltered.length > 1) {
+        const compliant = toolFiltered.filter((m) => !TOOL_NONCOMPLIANT_MODELS.includes(m));
+        if (compliant.length > 0 && compliant.length < toolFiltered.length) {
+          const dropped = toolFiltered.filter((m) => TOOL_NONCOMPLIANT_MODELS.includes(m));
+          console.log(
+            `[ClawRouter] Tool-compliance filter: excluded ${dropped.join(", ")} (unreliable tool schema handling)`
+          );
+          toolFiltered = compliant;
+        }
+      }
       const visionFiltered = filterByVision(toolFiltered, hasVision, supportsVision);
       const visionExcluded = toolFiltered.filter((m) => !visionFiltered.includes(m));
       if (visionExcluded.length > 0) {
@@ -7089,18 +7138,26 @@ function collectSystemInfo() {
 }
 async function collectWalletInfo() {
   try {
-    const { key, address, source } = await resolveOrGenerateWalletKey();
+    const { key, address, source, solanaPrivateKeyBytes } = await resolveOrGenerateWalletKey();
     if (!key || !address) {
       return {
         exists: false,
         valid: false,
         address: null,
+        solanaAddress: null,
         balance: null,
         isLow: false,
         isEmpty: true,
         source: null
       };
     }
+    let solanaAddress = null;
+    if (solanaPrivateKeyBytes) {
+      try {
+        solanaAddress = await getSolanaAddress(solanaPrivateKeyBytes);
+      } catch {
+      }
+    }
     const monitor = new BalanceMonitor(address);
     try {
       const balanceInfo = await monitor.checkBalance();
@@ -7108,6 +7165,7 @@ async function collectWalletInfo() {
         exists: true,
         valid: true,
         address,
+        solanaAddress,
         balance: balanceInfo.balanceUSD,
         isLow: balanceInfo.isLow,
         isEmpty: balanceInfo.isEmpty,
@@ -7118,6 +7176,7 @@ async function collectWalletInfo() {
         exists: true,
         valid: true,
         address,
+        solanaAddress,
         balance: null,
         isLow: false,
         isEmpty: false,
@@ -7129,6 +7188,7 @@ async function collectWalletInfo() {
       exists: false,
       valid: false,
       address: null,
+      solanaAddress: null,
       balance: null,
       isLow: false,
       isEmpty: true,
@@ -7210,7 +7270,10 @@ function printDiagnostics(result) {
   console.log("\nWallet");
   if (result.wallet.exists && result.wallet.valid) {
     console.log(`  ${green(`Key: ${WALLET_FILE} (${result.wallet.source})`)}`);
-    console.log(`  ${green(`Address: ${result.wallet.address}`)}`);
+    console.log(`  ${green(`EVM Address:    ${result.wallet.address}`)}`);
+    if (result.wallet.solanaAddress) {
+      console.log(`  ${green(`Solana Address: ${result.wallet.solanaAddress}`)}`);
+    }
     if (result.wallet.isEmpty) {
       console.log(`  ${red(`Balance: $0.00 - NEED TO FUND!`)}`);
     } else if (result.wallet.isLow) {
@@ -7265,7 +7328,10 @@ var DOCTOR_MODELS = {
 async function analyzeWithAI(diagnostics, userQuestion, model = "sonnet") {
   if (diagnostics.wallet.isEmpty) {
     console.log("\n\u{1F4B3} Wallet is empty - cannot call AI for analysis.");
-    console.log(`   Fund your wallet with USDC on Base: ${diagnostics.wallet.address}`);
+    console.log(`   Fund your EVM wallet with USDC on Base: ${diagnostics.wallet.address}`);
+    if (diagnostics.wallet.solanaAddress) {
+      console.log(`   Fund your Solana wallet with USDC: ${diagnostics.wallet.solanaAddress}`);
+    }
     console.log("   Get USDC: https://www.coinbase.com/price/usd-coin");
     console.log("   Bridge to Base: https://bridge.base.org\n");
     return;
@@ -7557,6 +7623,13 @@ ClawRouter Partner APIs (v${VERSION})
   } else {
     console.log(`[ClawRouter] Using wallet from BLOCKRUN_WALLET_KEY: ${wallet.address}`);
   }
+  if (wallet.solanaPrivateKeyBytes) {
+    try {
+      const solAddr = await getSolanaAddress(wallet.solanaPrivateKeyBytes);
+      console.log(`[ClawRouter] Solana address: ${solAddr}`);
+    } catch {
+    }
+  }
   const proxy = await startProxy({
     wallet,
     port: args.port,