@blockrun/clawrouter 0.10.21 → 0.11.0

package/dist/cli.js

@@ -566,6 +566,11 @@ function filterByToolCalling(models, hasTools, supportsToolCalling2) {
   const filtered = models.filter(supportsToolCalling2);
   return filtered.length > 0 ? filtered : models;
 }
+function filterByVision(models, hasVision, supportsVision2) {
+  if (!hasVision) return models;
+  const filtered = models.filter(supportsVision2);
+  return filtered.length > 0 ? filtered : models;
+}
 function getFallbackChainFiltered(tier, tierConfigs, estimatedTotalTokens, getContextWindow) {
   const fullChain = getFallbackChain(tier, tierConfigs);
   const filtered = fullChain.filter((modelId) => {
@@ -1899,6 +1904,8 @@ var MODEL_ALIASES = {
   // Google
   gemini: "google/gemini-2.5-pro",
   flash: "google/gemini-2.5-flash",
+  "gemini-3.1-pro-preview": "google/gemini-3.1-pro",
+  "google/gemini-3.1-pro-preview": "google/gemini-3.1-pro",
   // xAI
   grok: "xai/grok-3",
   "grok-fast": "xai/grok-4-fast-reasoning",
@@ -2138,6 +2145,7 @@ var BLOCKRUN_MODELS = [
     outputPrice: 5,
     contextWindow: 2e5,
     maxOutput: 8192,
+    vision: true,
     agentic: true,
     toolCalling: true
   },
@@ -2150,6 +2158,7 @@ var BLOCKRUN_MODELS = [
     contextWindow: 2e5,
     maxOutput: 64e3,
     reasoning: true,
+    vision: true,
     agentic: true,
     toolCalling: true
   },
@@ -2162,6 +2171,7 @@ var BLOCKRUN_MODELS = [
     contextWindow: 2e5,
     maxOutput: 32e3,
     reasoning: true,
+    vision: true,
     agentic: true,
     toolCalling: true
   },
@@ -2221,6 +2231,7 @@ var BLOCKRUN_MODELS = [
     outputPrice: 2.5,
     contextWindow: 1e6,
     maxOutput: 65536,
+    vision: true,
     toolCalling: true
   },
   {
@@ -2436,6 +2447,11 @@ function supportsToolCalling(modelId) {
   const model = BLOCKRUN_MODELS.find((m) => m.id === normalized);
   return model?.toolCalling ?? false;
 }
+function supportsVision(modelId) {
+  const normalized = modelId.replace("blockrun/", "");
+  const model = BLOCKRUN_MODELS.find((m) => m.id === normalized);
+  return model?.vision ?? false;
+}
 function getModelContextWindow(modelId) {
   const normalized = modelId.replace("blockrun/", "");
   const model = BLOCKRUN_MODELS.find((m) => m.id === normalized);
@@ -3889,7 +3905,10 @@ var SessionStore = class {
         tier,
         createdAt: now,
         lastUsedAt: now,
-        requestCount: 1
+        requestCount: 1,
+        recentHashes: [],
+        strikes: 0,
+        escalated: false
       });
     }
   }
@@ -3941,6 +3960,43 @@ var SessionStore = class {
       }
     }
   }
+  /**
+   * Record a request content hash and detect repetitive patterns.
+   * Returns true if escalation should be triggered (3+ consecutive similar requests).
+   */
+  recordRequestHash(sessionId, hash) {
+    const entry = this.sessions.get(sessionId);
+    if (!entry) return false;
+    const prev = entry.recentHashes;
+    if (prev.length > 0 && prev[prev.length - 1] === hash) {
+      entry.strikes++;
+    } else {
+      entry.strikes = 0;
+    }
+    entry.recentHashes.push(hash);
+    if (entry.recentHashes.length > 3) {
+      entry.recentHashes.shift();
+    }
+    return entry.strikes >= 2 && !entry.escalated;
+  }
+  /**
+   * Escalate session to next tier. Returns the new model/tier or null if already at max.
+   */
+  escalateSession(sessionId, tierConfigs) {
+    const entry = this.sessions.get(sessionId);
+    if (!entry) return null;
+    const TIER_ORDER = ["SIMPLE", "MEDIUM", "COMPLEX", "REASONING"];
+    const currentIdx = TIER_ORDER.indexOf(entry.tier);
+    if (currentIdx < 0 || currentIdx >= TIER_ORDER.length - 1) return null;
+    const nextTier = TIER_ORDER[currentIdx + 1];
+    const nextConfig = tierConfigs[nextTier];
+    if (!nextConfig) return null;
+    entry.model = nextConfig.primary;
+    entry.tier = nextTier;
+    entry.strikes = 0;
+    entry.escalated = true;
+    return { model: nextConfig.primary, tier: nextTier };
+  }
   /**
    * Stop the cleanup interval.
    */
@@ -3967,6 +4023,11 @@ function deriveSessionId(messages) {
   const content = typeof firstUser.content === "string" ? firstUser.content : JSON.stringify(firstUser.content);
   return createHash3("sha256").update(content).digest("hex").slice(0, 8);
 }
+function hashRequestContent(lastUserContent, toolCallNames) {
+  const normalized = lastUserContent.replace(/\s+/g, " ").trim().slice(0, 500);
+  const toolSuffix = toolCallNames?.length ? `|tools:${toolCallNames.sort().join(",")}` : "";
+  return createHash3("sha256").update(normalized + toolSuffix).digest("hex").slice(0, 12);
+}
 
 // src/updater.ts
 var NPM_REGISTRY = "https://registry.npmjs.org/@blockrun/clawrouter/latest";
@@ -5097,6 +5158,7 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
   const debugMode = req.headers["x-clawrouter-debug"] !== "false";
   let routingDecision;
   let hasTools = false;
+  let hasVision = false;
   let isStreaming = false;
   let modelId = "";
   let maxTokens = 4096;
@@ -5238,6 +5300,154 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
         console.log(`[ClawRouter] /debug command \u2192 ${debugRouting.tier} | ${debugRouting.model}`);
         return;
       }
+      if (lastContent.startsWith("/imagegen")) {
+        const imageArgs = lastContent.slice("/imagegen".length).trim();
+        let imageModel = "google/nano-banana";
+        let imageSize = "1024x1024";
+        let imagePrompt = imageArgs;
+        const modelMatch = imageArgs.match(/--model\s+(\S+)/);
+        if (modelMatch) {
+          const raw = modelMatch[1];
+          const IMAGE_MODEL_ALIASES = {
+            "dall-e-3": "openai/dall-e-3",
+            "dalle3": "openai/dall-e-3",
+            "dalle": "openai/dall-e-3",
+            "gpt-image": "openai/gpt-image-1",
+            "gpt-image-1": "openai/gpt-image-1",
+            "flux": "black-forest/flux-1.1-pro",
+            "flux-pro": "black-forest/flux-1.1-pro",
+            "banana": "google/nano-banana",
+            "nano-banana": "google/nano-banana",
+            "banana-pro": "google/nano-banana-pro",
+            "nano-banana-pro": "google/nano-banana-pro"
+          };
+          imageModel = IMAGE_MODEL_ALIASES[raw] ?? raw;
+          imagePrompt = imagePrompt.replace(/--model\s+\S+/, "").trim();
+        }
+        const sizeMatch = imageArgs.match(/--size\s+(\d+x\d+)/);
+        if (sizeMatch) {
+          imageSize = sizeMatch[1];
+          imagePrompt = imagePrompt.replace(/--size\s+\d+x\d+/, "").trim();
+        }
+        if (!imagePrompt) {
+          const errorText = [
+            "Usage: /imagegen <prompt>",
+            "",
+            "Options:",
+            "  --model <model>  Model to use (default: nano-banana)",
+            "  --size <WxH>     Image size (default: 1024x1024)",
+            "",
+            "Models:",
+            "  nano-banana       Google Gemini Flash \u2014 $0.05/image",
+            "  banana-pro        Google Gemini Pro \u2014 $0.10/image (up to 4K)",
+            "  dall-e-3          OpenAI DALL-E 3 \u2014 $0.04/image",
+            "  gpt-image         OpenAI GPT Image 1 \u2014 $0.02/image",
+            "  flux              Black Forest Flux 1.1 Pro \u2014 $0.04/image",
+            "",
+            "Examples:",
+            "  /imagegen a cat wearing sunglasses",
+            "  /imagegen --model dall-e-3 a futuristic city at sunset",
+            "  /imagegen --model banana-pro --size 2048x2048 mountain landscape"
+          ].join("\n");
+          const completionId = `chatcmpl-image-${Date.now()}`;
+          const timestamp = Math.floor(Date.now() / 1e3);
+          if (isStreaming) {
+            res.writeHead(200, {
+              "Content-Type": "text/event-stream",
+              "Cache-Control": "no-cache",
+              Connection: "keep-alive"
+            });
+            res.write(`data: ${JSON.stringify({ id: completionId, object: "chat.completion.chunk", created: timestamp, model: "clawrouter/image", choices: [{ index: 0, delta: { role: "assistant", content: errorText }, finish_reason: null }] })}
+
+`);
+            res.write(`data: ${JSON.stringify({ id: completionId, object: "chat.completion.chunk", created: timestamp, model: "clawrouter/image", choices: [{ index: 0, delta: {}, finish_reason: "stop" }] })}
+
+`);
+            res.write("data: [DONE]\n\n");
+            res.end();
+          } else {
+            res.writeHead(200, { "Content-Type": "application/json" });
+            res.end(JSON.stringify({
+              id: completionId,
+              object: "chat.completion",
+              created: timestamp,
+              model: "clawrouter/image",
+              choices: [{ index: 0, message: { role: "assistant", content: errorText }, finish_reason: "stop" }],
+              usage: { prompt_tokens: 0, completion_tokens: 0, total_tokens: 0 }
+            }));
+          }
+          console.log(`[ClawRouter] /imagegen command \u2192 showing usage help`);
+          return;
+        }
+        console.log(`[ClawRouter] /imagegen command \u2192 ${imageModel} (${imageSize}): ${imagePrompt.slice(0, 80)}...`);
+        try {
+          const imageUpstreamUrl = `${apiBase}/v1/images/generations`;
+          const imageBody = JSON.stringify({ model: imageModel, prompt: imagePrompt, size: imageSize, n: 1 });
+          const imageResponse = await payFetch(imageUpstreamUrl, {
+            method: "POST",
+            headers: { "content-type": "application/json", "user-agent": USER_AGENT },
+            body: imageBody
+          });
+          const imageResult = await imageResponse.json();
+          let responseText;
+          if (!imageResponse.ok || imageResult.error) {
+            const errMsg = typeof imageResult.error === "string" ? imageResult.error : imageResult.error?.message ?? `HTTP ${imageResponse.status}`;
+            responseText = `Image generation failed: ${errMsg}`;
+            console.log(`[ClawRouter] /imagegen error: ${errMsg}`);
+          } else {
+            const images = imageResult.data ?? [];
+            if (images.length === 0) {
+              responseText = "Image generation returned no results.";
+            } else {
+              const lines = [];
+              for (const img of images) {
+                if (img.url) lines.push(`![Generated Image](${img.url})`);
+                if (img.revised_prompt) lines.push(`*Revised prompt: ${img.revised_prompt}*`);
+              }
+              lines.push("", `Model: ${imageModel} | Size: ${imageSize}`);
+              responseText = lines.join("\n");
+            }
+            console.log(`[ClawRouter] /imagegen success: ${images.length} image(s) generated`);
+          }
+          const completionId = `chatcmpl-image-${Date.now()}`;
+          const timestamp = Math.floor(Date.now() / 1e3);
+          if (isStreaming) {
+            res.writeHead(200, {
+              "Content-Type": "text/event-stream",
+              "Cache-Control": "no-cache",
+              Connection: "keep-alive"
+            });
+            res.write(`data: ${JSON.stringify({ id: completionId, object: "chat.completion.chunk", created: timestamp, model: "clawrouter/image", choices: [{ index: 0, delta: { role: "assistant", content: responseText }, finish_reason: null }] })}
+
+`);
+            res.write(`data: ${JSON.stringify({ id: completionId, object: "chat.completion.chunk", created: timestamp, model: "clawrouter/image", choices: [{ index: 0, delta: {}, finish_reason: "stop" }] })}
+
+`);
+            res.write("data: [DONE]\n\n");
+            res.end();
+          } else {
+            res.writeHead(200, { "Content-Type": "application/json" });
+            res.end(JSON.stringify({
+              id: completionId,
+              object: "chat.completion",
+              created: timestamp,
+              model: "clawrouter/image",
+              choices: [{ index: 0, message: { role: "assistant", content: responseText }, finish_reason: "stop" }],
+              usage: { prompt_tokens: 0, completion_tokens: 0, total_tokens: 0 }
+            }));
+          }
+        } catch (err) {
+          const errMsg = err instanceof Error ? err.message : String(err);
+          console.error(`[ClawRouter] /imagegen error: ${errMsg}`);
+          if (!res.headersSent) {
+            res.writeHead(500, { "Content-Type": "application/json" });
+            res.end(JSON.stringify({
+              error: { message: `Image generation failed: ${errMsg}`, type: "image_error" }
+            }));
+          }
+        }
+        return;
+      }
       if (parsed.stream === true) {
         parsed.stream = false;
         bodyModified = true;
@@ -5289,6 +5499,15 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
           if (hasTools && tools) {
             console.log(`[ClawRouter] Tools detected (${tools.length}), agentic mode via keywords`);
           }
+          hasVision = parsedMessages.some((m) => {
+            if (Array.isArray(m.content)) {
+              return m.content.some((p) => p.type === "image_url");
+            }
+            return false;
+          });
+          if (hasVision) {
+            console.log(`[ClawRouter] Vision content detected, filtering to vision-capable models`);
+          }
           routingDecision = route(prompt, systemPrompt, maxTokens, {
             ...routerOpts,
             routingProfile: routingProfile ?? void 0
@@ -5330,6 +5549,43 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
                 tier: existingSession.tier
               };
             }
+            const lastAssistantMsg = [...parsedMessages].reverse().find((m) => m.role === "assistant");
+            const toolCallNames = Array.isArray(lastAssistantMsg?.tool_calls) ? lastAssistantMsg.tool_calls.map((tc) => tc.function?.name).filter(Boolean) : void 0;
+            const contentHash = hashRequestContent(prompt, toolCallNames);
+            const shouldEscalate = sessionStore.recordRequestHash(
+              effectiveSessionId,
+              contentHash
+            );
+            if (shouldEscalate) {
+              const activeTierConfigs = (() => {
+                if (routingDecision.reasoning?.includes("agentic") && routerOpts.config.agenticTiers) {
+                  return routerOpts.config.agenticTiers;
+                }
+                if (routingProfile === "eco" && routerOpts.config.ecoTiers) {
+                  return routerOpts.config.ecoTiers;
+                }
+                if (routingProfile === "premium" && routerOpts.config.premiumTiers) {
+                  return routerOpts.config.premiumTiers;
+                }
+                return routerOpts.config.tiers;
+              })();
+              const escalation = sessionStore.escalateSession(
+                effectiveSessionId,
+                activeTierConfigs
+              );
+              if (escalation) {
+                console.log(
+                  `[ClawRouter] \u26A1 3-strike escalation: ${existingSession.model} \u2192 ${escalation.model} (${existingSession.tier} \u2192 ${escalation.tier})`
+                );
+                parsed.model = escalation.model;
+                modelId = escalation.model;
+                routingDecision = {
+                  ...routingDecision,
+                  model: escalation.model,
+                  tier: escalation.tier
+                };
+              }
+            }
           } else {
             parsed.model = routingDecision.model;
             modelId = routingDecision.model;
@@ -5549,7 +5805,14 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
           `[ClawRouter] Tool-calling filter: excluded ${toolExcluded.join(", ")} (no structured function call support)`
         );
       }
-      modelsToTry = toolFiltered.slice(0, MAX_FALLBACK_ATTEMPTS);
+      const visionFiltered = filterByVision(toolFiltered, hasVision, supportsVision);
+      const visionExcluded = toolFiltered.filter((m) => !visionFiltered.includes(m));
+      if (visionExcluded.length > 0) {
+        console.log(
+          `[ClawRouter] Vision filter: excluded ${visionExcluded.join(", ")} (no vision support)`
+        );
+      }
+      modelsToTry = visionFiltered.slice(0, MAX_FALLBACK_ATTEMPTS);
       modelsToTry = prioritizeNonRateLimited(modelsToTry);
     } else {
       modelsToTry = modelId ? [modelId] : [];
@@ -5595,9 +5858,7 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
         if (isPaymentErr && tryModel !== FREE_MODEL) {
           const freeIdx = modelsToTry.indexOf(FREE_MODEL);
           if (freeIdx > i + 1) {
-            console.log(
-              `[ClawRouter] Payment error \u2014 skipping to free model: ${FREE_MODEL}`
-            );
+            console.log(`[ClawRouter] Payment error \u2014 skipping to free model: ${FREE_MODEL}`);
             i = freeIdx - 1;
             continue;
           }