@blockrun/clawrouter 0.12.5 → 0.12.7

package/dist/index.js

@@ -658,6 +658,7 @@ __export(wallet_exports, {
   deriveSolanaKeyBytes: () => deriveSolanaKeyBytes,
   deriveSolanaKeyBytesLegacy: () => deriveSolanaKeyBytesLegacy,
   generateWalletMnemonic: () => generateWalletMnemonic,
+  getSolanaAddress: () => getSolanaAddress,
   isValidMnemonic: () => isValidMnemonic
 });
 import { HDKey } from "@scure/bip32";
@@ -710,6 +711,11 @@ function deriveAllKeys(mnemonic) {
   const solanaPrivateKeyBytes = deriveSolanaKeyBytes(mnemonic);
   return { mnemonic, evmPrivateKey, evmAddress, solanaPrivateKeyBytes };
 }
+async function getSolanaAddress(privateKeyBytes) {
+  const { createKeyPairSignerFromPrivateKeyBytes: createKeyPairSignerFromPrivateKeyBytes2 } = await import("@solana/kit");
+  const signer = await createKeyPairSignerFromPrivateKeyBytes2(privateKeyBytes);
+  return signer.address;
+}
 var ETH_DERIVATION_PATH, SOLANA_HARDENED_INDICES;
 var init_wallet = __esm({
   "src/wallet.ts"() {
@@ -717,12 +723,7 @@ var init_wallet = __esm({
     init_hmac();
     init_sha512();
     ETH_DERIVATION_PATH = "m/44'/60'/0'/0/0";
-    SOLANA_HARDENED_INDICES = [
-      44 + 2147483648,
-      501 + 2147483648,
-      0 + 2147483648,
-      0 + 2147483648
-    ];
+    SOLANA_HARDENED_INDICES = [44 + 2147483648, 501 + 2147483648, 0 + 2147483648, 0 + 2147483648];
   }
 });
 
@@ -846,11 +847,7 @@ async function sweepSolanaWallet(oldKeyBytes, newKeyBytes, rpcUrl) {
   let usdcBalance = 0n;
   const oldTokenAccounts = [];
   try {
-    const response = await rpc.getTokenAccountsByOwner(
-      solAddress2(oldAddress),
-      { mint },
-      { encoding: "jsonParsed" }
-    ).send();
+    const response = await rpc.getTokenAccountsByOwner(solAddress2(oldAddress), { mint }, { encoding: "jsonParsed" }).send();
     if (response.value.length > 0) {
       for (const account of response.value) {
         const parsed = account.account.data;
@@ -914,10 +911,7 @@ async function sweepSolanaWallet(oldKeyBytes, newKeyBytes, rpcUrl) {
       (msg) => setTransactionMessageLifetimeUsingBlockhash(latestBlockhash, msg),
       (msg) => appendTransactionMessageInstructions([createAtaIx, ...transferIxs], msg)
     );
-    const txMessageWithSigners = addSignersToTransactionMessage(
-      [newSigner, oldSigner],
-      txMessage
-    );
+    const txMessageWithSigners = addSignersToTransactionMessage([newSigner, oldSigner], txMessage);
     const signedTx = await signTransactionMessageWithSigners(txMessageWithSigners);
     const txSignature = getSignatureFromTransaction(signedTx);
     const wsUrl = url.replace("https://", "wss://").replace("http://", "ws://");
@@ -983,7 +977,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",
@@ -1107,6 +1103,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",
@@ -3046,8 +3067,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"
       ]
@@ -3113,6 +3134,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",
@@ -3160,7 +3183,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",
@@ -4116,13 +4140,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:`);
@@ -7090,13 +7122,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) {