@blockrun/clawrouter 0.10.17 → 0.10.19

package/dist/cli.js

@@ -1,10 +1,4 @@
 #!/usr/bin/env node
-var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
-  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
-}) : x)(function(x) {
-  if (typeof require !== "undefined") return require.apply(this, arguments);
-  throw Error('Dynamic require of "' + x + '" is not supported');
-});
 
 // src/proxy.ts
 import { createServer } from "http";
@@ -3838,6 +3832,7 @@ function shouldCompress(messages) {
 }
 
 // src/session.ts
+import { createHash as createHash3 } from "crypto";
 var DEFAULT_SESSION_CONFIG = {
   enabled: true,
   timeoutMs: 30 * 60 * 1e3,
@@ -3970,7 +3965,6 @@ function deriveSessionId(messages) {
   const firstUser = messages.find((m) => m.role === "user");
   if (!firstUser) return void 0;
   const content = typeof firstUser.content === "string" ? firstUser.content : JSON.stringify(firstUser.content);
-  const { createHash: createHash3 } = __require("crypto");
   return createHash3("sha256").update(content).digest("hex").slice(0, 8);
 }
 
@@ -5110,6 +5104,7 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
   let accumulatedContent = "";
   const isChatCompletion = req.url?.includes("/chat/completions");
   const sessionId = getSessionId(req.headers);
+  let effectiveSessionId = sessionId;
   if (isChatCompletion && body.length > 0) {
     try {
       const parsed = JSON.parse(body.toString());
@@ -5119,7 +5114,8 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
       let bodyModified = false;
       const parsedMessages = Array.isArray(parsed.messages) ? parsed.messages : [];
       const lastUserMsg = [...parsedMessages].reverse().find((m) => m.role === "user");
-      const lastContent = typeof lastUserMsg?.content === "string" ? lastUserMsg.content : "";
+      const rawLastContent = lastUserMsg?.content;
+      const lastContent = typeof rawLastContent === "string" ? rawLastContent : Array.isArray(rawLastContent) ? rawLastContent.filter((b) => b.type === "text").map((b) => b.text ?? "").join(" ") : "";
       if (sessionId && parsedMessages.length > 0) {
         const messages = parsedMessages;
         if (sessionJournal.needsContext(lastContent)) {
@@ -5282,52 +5278,76 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
             latencyMs: 0
           });
         } else {
-          const sessionId2 = getSessionId(req.headers) ?? deriveSessionId(parsedMessages);
-          const existingSession = sessionId2 ? sessionStore.getSession(sessionId2) : void 0;
-          if (existingSession) {
+          effectiveSessionId = getSessionId(req.headers) ?? deriveSessionId(parsedMessages);
+          const existingSession = effectiveSessionId ? sessionStore.getSession(effectiveSessionId) : void 0;
+          const rawPrompt = lastUserMsg?.content;
+          const prompt = typeof rawPrompt === "string" ? rawPrompt : Array.isArray(rawPrompt) ? rawPrompt.filter((b) => b.type === "text").map((b) => b.text ?? "").join(" ") : "";
+          const systemMsg = parsedMessages.find((m) => m.role === "system");
+          const systemPrompt = typeof systemMsg?.content === "string" ? systemMsg.content : void 0;
+          const tools = parsed.tools;
+          hasTools = Array.isArray(tools) && tools.length > 0;
+          if (hasTools && tools) {
             console.log(
-              `[ClawRouter] Session ${sessionId2?.slice(0, 8)}... using pinned model: ${existingSession.model}`
+              `[ClawRouter] Tools detected (${tools.length}), agentic mode via keywords`
             );
-            parsed.model = existingSession.model;
-            modelId = existingSession.model;
-            bodyModified = true;
-            sessionStore.touchSession(sessionId2);
-          } else {
-            const messages = parsed.messages;
-            let lastUserMsg2;
-            if (messages) {
-              for (let i = messages.length - 1; i >= 0; i--) {
-                if (messages[i].role === "user") {
-                  lastUserMsg2 = messages[i];
-                  break;
-                }
+          }
+          routingDecision = route(prompt, systemPrompt, maxTokens, {
+            ...routerOpts,
+            routingProfile: routingProfile ?? void 0
+          });
+          if (existingSession) {
+            const tierRank = {
+              SIMPLE: 0,
+              MEDIUM: 1,
+              COMPLEX: 2,
+              REASONING: 3
+            };
+            const existingRank = tierRank[existingSession.tier] ?? 0;
+            const newRank = tierRank[routingDecision.tier] ?? 0;
+            if (newRank > existingRank) {
+              console.log(
+                `[ClawRouter] Session ${effectiveSessionId?.slice(0, 8)}... upgrading: ${existingSession.tier} \u2192 ${routingDecision.tier} (${routingDecision.model})`
+              );
+              parsed.model = routingDecision.model;
+              modelId = routingDecision.model;
+              bodyModified = true;
+              if (effectiveSessionId) {
+                sessionStore.setSession(
+                  effectiveSessionId,
+                  routingDecision.model,
+                  routingDecision.tier
+                );
               }
-            }
-            const systemMsg = messages?.find((m) => m.role === "system");
-            const prompt = typeof lastUserMsg2?.content === "string" ? lastUserMsg2.content : "";
-            const systemPrompt = typeof systemMsg?.content === "string" ? systemMsg.content : void 0;
-            const tools = parsed.tools;
-            hasTools = Array.isArray(tools) && tools.length > 0;
-            if (hasTools && tools) {
+            } else {
               console.log(
-                `[ClawRouter] Tools detected (${tools.length}), agentic mode via keywords`
+                `[ClawRouter] Session ${effectiveSessionId?.slice(0, 8)}... keeping pinned model: ${existingSession.model} (${existingSession.tier} >= ${routingDecision.tier})`
               );
+              parsed.model = existingSession.model;
+              modelId = existingSession.model;
+              bodyModified = true;
+              sessionStore.touchSession(effectiveSessionId);
+              routingDecision = {
+                ...routingDecision,
+                model: existingSession.model,
+                tier: existingSession.tier
+              };
             }
-            routingDecision = route(prompt, systemPrompt, maxTokens, {
-              ...routerOpts,
-              routingProfile: routingProfile ?? void 0
-            });
+          } else {
             parsed.model = routingDecision.model;
             modelId = routingDecision.model;
             bodyModified = true;
-            if (sessionId2) {
-              sessionStore.setSession(sessionId2, routingDecision.model, routingDecision.tier);
+            if (effectiveSessionId) {
+              sessionStore.setSession(
+                effectiveSessionId,
+                routingDecision.model,
+                routingDecision.tier
+              );
               console.log(
-                `[ClawRouter] Session ${sessionId2.slice(0, 8)}... pinned to model: ${routingDecision.model}`
+                `[ClawRouter] Session ${effectiveSessionId.slice(0, 8)}... pinned to model: ${routingDecision.model}`
               );
             }
-            options.onRouted?.(routingDecision);
           }
+          options.onRouted?.(routingDecision);
         }
       }
       if (bodyModified) {
@@ -5613,6 +5633,12 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
         savings: newCosts.savings
       };
       options.onRouted?.(routingDecision);
+      if (effectiveSessionId) {
+        sessionStore.setSession(effectiveSessionId, actualModelUsed, routingDecision.tier);
+        console.log(
+          `[ClawRouter] Session ${effectiveSessionId.slice(0, 8)}... updated pin to fallback: ${actualModelUsed}`
+        );
+      }
     }
     if (!upstream) {
       const rawErrBody = lastError?.body || "All models in fallback chain failed";