@blockrun/clawrouter 0.12.4 → 0.12.6

package/dist/cli.js

@@ -1607,9 +1607,10 @@ function route(prompt, systemPrompt, maxOutputTokens, options) {
     const agenticScore = ruleResult.agenticScore ?? 0;
     const isAutoAgentic = agenticScore >= 0.5;
     const isExplicitAgentic = config.overrides.agenticMode ?? false;
-    const useAgenticTiers = (isAutoAgentic || isExplicitAgentic) && config.agenticTiers != null;
+    const hasToolsInRequest = options.hasTools ?? false;
+    const useAgenticTiers = (hasToolsInRequest || isAutoAgentic || isExplicitAgentic) && config.agenticTiers != null;
     tierConfigs = useAgenticTiers ? config.agenticTiers : config.tiers;
-    profileSuffix = useAgenticTiers ? " | agentic" : "";
+    profileSuffix = useAgenticTiers ? ` | agentic${hasToolsInRequest ? " (tools)" : ""}` : "";
   }
   const agenticScoreValue = ruleResult.agenticScore;
   if (estimatedTokens > config.overrides.maxTokensForceComplex) {
@@ -3571,6 +3572,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");
@@ -3648,13 +3654,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:`);
@@ -6293,7 +6307,7 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
           const tools = parsed.tools;
           hasTools = Array.isArray(tools) && tools.length > 0;
           if (hasTools && tools) {
-            console.log(`[ClawRouter] Tools detected (${tools.length}), agentic mode via keywords`);
+            console.log(`[ClawRouter] Tools detected (${tools.length}), forcing agentic tiers`);
           }
           hasVision = parsedMessages.some((m) => {
             if (Array.isArray(m.content)) {
@@ -6306,7 +6320,8 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
           }
           routingDecision = route(prompt, systemPrompt, maxTokens, {
             ...routerOpts,
-            routingProfile: routingProfile ?? void 0
+            routingProfile: routingProfile ?? void 0,
+            hasTools
           });
           if (existingSession) {
             const tierRank = {
@@ -7087,18 +7102,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();
@@ -7106,6 +7129,7 @@ async function collectWalletInfo() {
         exists: true,
         valid: true,
         address,
+        solanaAddress,
         balance: balanceInfo.balanceUSD,
         isLow: balanceInfo.isLow,
         isEmpty: balanceInfo.isEmpty,
@@ -7116,6 +7140,7 @@ async function collectWalletInfo() {
         exists: true,
         valid: true,
         address,
+        solanaAddress,
         balance: null,
         isLow: false,
         isEmpty: false,
@@ -7127,6 +7152,7 @@ async function collectWalletInfo() {
       exists: false,
       valid: false,
       address: null,
+      solanaAddress: null,
       balance: null,
       isLow: false,
       isEmpty: true,
@@ -7208,7 +7234,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) {
@@ -7263,7 +7292,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;
@@ -7555,6 +7587,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,