@blockrun/clawrouter 0.12.4 → 0.12.6

package/dist/index.d.ts

@@ -270,6 +270,7 @@ type RouterOptions = {
     config: RoutingConfig;
     modelPricing: Map<string, ModelPricing>;
     routingProfile?: "free" | "eco" | "auto" | "premium";
+    hasTools?: boolean;
 };
 /**
  * Route a request to the cheapest capable model.

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"() {
@@ -3204,9 +3210,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) {
@@ -4115,13 +4122,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:`);
@@ -6783,7 +6798,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)) {
@@ -6796,7 +6811,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 = {