@musistudio/claude-code-router 1.0.44 → 1.0.46

package/README.md

@@ -570,6 +570,7 @@ A huge thank you to all our sponsors for their generous support!
 - @zcutlip
 - [@Peng-YM](http://github.com/Peng-YM)
 - @\*更
+- @\*.
 
 
 (If your name is masked, please contact me via my homepage email to update it with your GitHub username.)

package/README_zh.md

@@ -539,6 +539,7 @@ jobs:
 - @zcutlip
 - [@Peng-YM](http://github.com/Peng-YM)
 - @\*更
+- @\*.
 
 （如果您的名字被屏蔽，请通过我的主页电子邮件与我联系，以便使用您的 GitHub 用户名进行更新。）
 

package/dist/cli.js

@@ -66532,7 +66532,7 @@ var require_package3 = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@musistudio/claude-code-router",
-      version: "1.0.44",
+      version: "1.0.46",
       description: "Use Claude Code without an Anthropics account and route it to another LLM provider",
       bin: {
         ccr: "./dist/cli.js"
@@ -66552,7 +66552,7 @@ var require_package3 = __commonJS({
       license: "MIT",
       dependencies: {
         "@fastify/static": "^8.2.0",
-        "@musistudio/llms": "^1.0.29",
+        "@musistudio/llms": "^1.0.30",
         dotenv: "^16.4.7",
         json5: "^2.2.3",
         openurl: "^1.1.1",
@@ -67044,7 +67044,7 @@ var import_os = require("os");
 var import_path4 = require("path");
 init_utils();
 
-// node_modules/.pnpm/@musistudio+llms@1.0.29_ws@8.18.3/node_modules/@musistudio/llms/dist/esm/server.mjs
+// node_modules/.pnpm/@musistudio+llms@1.0.30_ws@8.18.3/node_modules/@musistudio/llms/dist/esm/server.mjs
 var import_node_fs = require("node:fs");
 var import_node_path4 = require("node:path");
 var import_node_stream = __toESM(require("node:stream"), 1);
@@ -76071,7 +76071,7 @@ function Uf(r, e, t, n) {
   let l = { method: "POST", headers: o, body: JSON.stringify(e), signal: a };
   return t.httpsProxy && (l.dispatcher = new import_undici.ProxyAgent(new URL(t.httpsProxy).toString())), n?.debug({ request: l, headers: Object.fromEntries(o.entries()), requestUrl: typeof r == "string" ? r : r.toString(), useProxy: t.httpsProxy }, "final request"), fetch(typeof r == "string" ? r : r.toString(), l);
 }
-var Mf = "1.0.29";
+var Mf = "1.0.30";
 async function a0(r, e, t, n) {
   let o = r.body, a = r.provider, u = t._server.providerService.getProvider(a);
   if (!u) throw nt(`Provider '${a}' not found`, 404, "provider_not_found");
@@ -76372,7 +76372,7 @@ var bo = class {
             let f = a.content.filter((h) => h.type === "text" && h.text || h.type === "image" && h.source);
             f.length && t.push({ role: "user", content: f.map((h) => h?.type === "image" ? { type: "image_url", image_url: { url: h.source?.type === "base64" ? `data:${h.source.media_type},${h.source.data}` : h.source.url }, media_type: h.source.media_type } : h) });
           } else if (a.role === "assistant") {
-            let l = { role: "assistant", content: null }, f = a.content.filter((d) => d.type === "text" && d.text);
+            let l = { role: "assistant", content: "" }, f = a.content.filter((d) => d.type === "text" && d.text);
             f.length && (l.content = f.map((d) => d.text).join(`
 `));
             let h = a.content.filter((d) => d.type === "tool_use" && d.id);
@@ -79320,9 +79320,6 @@ var rewriteStream = (stream, processor) => {
 // src/index.ts
 var import_json52 = __toESM(require_lib());
 
-// src/agents/image.agent.ts
-var import_crypto3 = require("crypto");
-
 // node_modules/.pnpm/lru-cache@11.1.0/node_modules/lru-cache/dist/esm/index.js
 var perf = typeof performance === "object" && performance && typeof performance.now === "function" ? performance : Date;
 var warned = /* @__PURE__ */ new Set();
@@ -80719,14 +80716,8 @@ var ImageCache = class {
       ttl: 24 * 60 * 60 * 1e3
     });
   }
-  calculateHash(base64Image) {
-    const hash = (0, import_crypto3.createHash)("sha256");
-    hash.update(base64Image);
-    return hash.digest("hex");
-  }
   storeImage(id2, source) {
     if (this.hasImage(id2)) return;
-    const base64Image = source.data;
     this.cache.set(id2, {
       source,
       timestamp: Date.now()
@@ -80755,7 +80746,7 @@ var ImageAgent = class {
     this.appendTools();
   }
   shouldHandle(req, config) {
-    if (!config.Router.image) return false;
+    if (!config.Router.image || req.body.model === config.Router.image) return false;
     const lastMessage = req.body.messages[req.body.messages.length - 1];
     if (!config.forceUseImageAgent && lastMessage.role === "user" && Array.isArray(lastMessage.content) && lastMessage.content.find((item) => item.type === "image")) {
       req.body.model = config.Router.image;
@@ -80801,6 +80792,7 @@ var ImageAgent = class {
         "required": ["imageId", "task"]
       },
       handler: async (args, context) => {
+        console.log("args", JSON.stringify(args, null, 2));
         const imageMessages = [];
         let imageId;
         if (args.imageId && Array.isArray(args.imageId)) {
@@ -80832,7 +80824,10 @@ var ImageAgent = class {
             model: context.config.Router.image,
             system: [{
               type: "text",
-              text: `\u4F60\u9700\u8981\u6309\u7167\u4EFB\u52A1\u53BB\u89E3\u6790\u56FE\u7247`
+              text: `You must interpret and analyze images strictly according to the assigned task.  
+When an image placeholder is provided, your role is to parse the image content only within the scope of the user\u2019s instructions.  
+Do not ignore or deviate from the task.  
+Always ensure that your response reflects a clear, accurate interpretation of the image aligned with the given objective.`
             }],
             messages: [
               {
@@ -80845,6 +80840,7 @@ var ImageAgent = class {
         }).then((res) => res.json()).catch((err) => {
           return null;
         });
+        console.log(agentResponse.content);
         if (!agentResponse || !agentResponse.content) {
           return "analyzeImage Error";
         }
@@ -81018,6 +81014,9 @@ async function run(options = {}) {
           useAgents.push(agent.name);
           agent.reqHandler(req, config);
           if (agent.tools.size) {
+            if (!req.body?.tools?.length) {
+              req.body.tools = [];
+            }
             req.body.tools.unshift(...Array.from(agent.tools.values()).map((item) => {
               return {
                 name: item.name,
@@ -81034,10 +81033,11 @@ async function run(options = {}) {
       await router(req, reply, config);
     }
   });
-  server.addHook("onSend", async (req, reply, payload) => {
+  server.addHook("onSend", (req, reply, payload, done) => {
     if (req.sessionId && req.url.startsWith("/v1/messages")) {
       if (payload instanceof ReadableStream) {
         if (req.agents) {
+          const abortController = new AbortController();
           const eventStream = payload.pipeThrough(new SSEParserTransform());
           let currentAgent;
           let currentToolIndex = -1;
@@ -81046,110 +81046,147 @@ async function run(options = {}) {
           let currentToolId = "";
           const toolMessages = [];
           const assistantMessages = [];
-          return rewriteStream(eventStream, async (data, controller) => {
-            if (data.event === "content_block_start" && data?.data?.content_block?.name) {
-              const agent = req.agents.find((name) => agents_default.getAgent(name)?.tools.get(data.data.content_block.name));
-              if (agent) {
-                currentAgent = agents_default.getAgent(agent);
-                currentToolIndex = data.data.index;
-                currentToolName = data.data.content_block.name;
-                currentToolId = data.data.content_block.id;
+          return done(null, rewriteStream(eventStream, async (data, controller) => {
+            try {
+              if (data.event === "content_block_start" && data?.data?.content_block?.name) {
+                const agent = req.agents.find((name) => agents_default.getAgent(name)?.tools.get(data.data.content_block.name));
+                if (agent) {
+                  currentAgent = agents_default.getAgent(agent);
+                  currentToolIndex = data.data.index;
+                  currentToolName = data.data.content_block.name;
+                  currentToolId = data.data.content_block.id;
+                  return void 0;
+                }
+              }
+              if (currentToolIndex > -1 && data.data.index === currentToolIndex && data.data?.delta?.type === "input_json_delta") {
+                currentToolArgs += data.data?.delta?.partial_json;
                 return void 0;
               }
-            }
-            if (currentToolIndex > -1 && data.data.index === currentToolIndex && data.data?.delta?.type === "input_json_delta") {
-              currentToolArgs += data.data?.delta?.partial_json;
-              return void 0;
-            }
-            if (currentToolIndex > -1 && data.data.index === currentToolIndex && data.data.type === "content_block_stop") {
-              try {
-                const args = import_json52.default.parse(currentToolArgs);
-                assistantMessages.push({
-                  type: "tool_use",
-                  id: currentToolId,
-                  name: currentToolName,
-                  input: args
+              if (currentToolIndex > -1 && data.data.index === currentToolIndex && data.data.type === "content_block_stop") {
+                try {
+                  const args = import_json52.default.parse(currentToolArgs);
+                  assistantMessages.push({
+                    type: "tool_use",
+                    id: currentToolId,
+                    name: currentToolName,
+                    input: args
+                  });
+                  const toolResult = await currentAgent?.tools.get(currentToolName)?.handler(args, {
+                    req,
+                    config
+                  });
+                  console.log("result", toolResult);
+                  toolMessages.push({
+                    "tool_use_id": currentToolId,
+                    "type": "tool_result",
+                    "content": toolResult
+                  });
+                  currentAgent = void 0;
+                  currentToolIndex = -1;
+                  currentToolName = "";
+                  currentToolArgs = "";
+                  currentToolId = "";
+                } catch (e) {
+                  console.log(e);
+                }
+                return void 0;
+              }
+              if (data.event === "message_delta" && toolMessages.length) {
+                req.body.messages.push({
+                  role: "assistant",
+                  content: assistantMessages
                 });
-                const toolResult = await currentAgent?.tools.get(currentToolName)?.handler(args, {
-                  req,
-                  config
+                req.body.messages.push({
+                  role: "user",
+                  content: toolMessages
                 });
-                toolMessages.push({
-                  "tool_use_id": currentToolId,
-                  "type": "tool_result",
-                  "content": toolResult
+                const response = await fetch(`http://127.0.0.1:${config.PORT}/v1/messages`, {
+                  method: "POST",
+                  headers: {
+                    "x-api-key": config.APIKEY,
+                    "content-type": "application/json"
+                  },
+                  body: JSON.stringify(req.body)
                 });
-                currentAgent = void 0;
-                currentToolIndex = -1;
-                currentToolName = "";
-                currentToolArgs = "";
-                currentToolId = "";
-              } catch (e) {
-                console.log(e);
-              }
-              return void 0;
-            }
-            if (data.event === "message_delta" && toolMessages.length) {
-              req.body.messages.push({
-                role: "assistant",
-                content: assistantMessages
-              });
-              req.body.messages.push({
-                role: "user",
-                content: toolMessages
-              });
-              const response = await fetch(`http://127.0.0.1:${config.PORT}/v1/messages`, {
-                method: "POST",
-                headers: {
-                  "x-api-key": config.APIKEY,
-                  "content-type": "application/json"
-                },
-                body: JSON.stringify(req.body)
-              });
-              if (!response.ok) {
-                return void 0;
-              }
-              const stream = response.body.pipeThrough(new SSEParserTransform());
-              const reader = stream.getReader();
-              while (true) {
-                const { value, done } = await reader.read();
-                if (done) {
-                  break;
+                if (!response.ok) {
+                  return void 0;
                 }
-                if (["message_start", "message_stop"].includes(value.event)) {
-                  continue;
+                const stream = response.body.pipeThrough(new SSEParserTransform());
+                const reader = stream.getReader();
+                while (true) {
+                  try {
+                    const { value, done: done2 } = await reader.read();
+                    if (done2) {
+                      break;
+                    }
+                    if (["message_start", "message_stop"].includes(value.event)) {
+                      continue;
+                    }
+                    if (!controller.desiredSize) {
+                      console.log("Stream backpressure detected");
+                      break;
+                    }
+                    controller.enqueue(value);
+                  } catch (readError) {
+                    if (readError.name === "AbortError" || readError.code === "ERR_STREAM_PREMATURE_CLOSE") {
+                      console.log("Stream reading aborted due to client disconnect");
+                      abortController.abort();
+                      break;
+                    }
+                    throw readError;
+                  }
                 }
-                controller.enqueue(value);
+                return void 0;
               }
-              return void 0;
+              return data;
+            } catch (error) {
+              console.error("Unexpected error in stream processing:", error);
+              if (error.code === "ERR_STREAM_PREMATURE_CLOSE") {
+                console.log("Stream prematurely closed, aborting operations");
+                abortController.abort();
+                return void 0;
+              }
+              throw error;
             }
-            return data;
-          }).pipeThrough(new SSESerializerTransform());
+          }).pipeThrough(new SSESerializerTransform()));
         }
         const [originalStream, clonedStream] = payload.tee();
         const read = async (stream) => {
           const reader = stream.getReader();
-          while (true) {
-            const { done, value } = await reader.read();
-            if (done) break;
-            const dataStr = new TextDecoder().decode(value);
-            if (!dataStr.startsWith("event: message_delta")) {
-              continue;
+          try {
+            while (true) {
+              const { done: done2, value } = await reader.read();
+              if (done2) break;
+              const dataStr = new TextDecoder().decode(value);
+              if (!dataStr.startsWith("event: message_delta")) {
+                continue;
+              }
+              const str = dataStr.slice(27);
+              try {
+                const message = JSON.parse(str);
+                sessionUsageCache.put(req.sessionId, message.usage);
+              } catch {
+              }
             }
-            const str = dataStr.slice(27);
-            try {
-              const message = JSON.parse(str);
-              sessionUsageCache.put(req.sessionId, message.usage);
-            } catch {
+          } catch (readError) {
+            if (readError.name === "AbortError" || readError.code === "ERR_STREAM_PREMATURE_CLOSE") {
+              console.log("Background read stream closed prematurely");
+            } else {
+              console.error("Error in background stream reading:", readError);
             }
+          } finally {
+            reader.releaseLock();
           }
         };
         read(clonedStream);
-        return originalStream;
+        return done(null, originalStream);
       }
       sessionUsageCache.put(req.sessionId, payload.usage);
     }
-    return payload;
+    if (typeof payload === "object" && payload.error) {
+      done(payload.error, null);
+    }
+    done(null, payload);
   });
   server.start();
 }
@@ -81241,7 +81278,6 @@ async function executeCodeCommand(args = []) {
   const claudePath = config?.CLAUDE_PATH || process.env.CLAUDE_PATH || "claude";
   const joinedArgs = args.length > 0 ? args.map((arg) => `"${arg.replace(/\"/g, '\\"')}"`).join(" ") : "";
   const stdioConfig = config.NON_INTERACTIVE_MODE ? ["pipe", "inherit", "inherit"] : "inherit";
-  console.log(joinedArgs);
   const claudeProcess = (0, import_child_process3.spawn)(
     claudePath + (joinedArgs ? ` ${joinedArgs}` : ""),
     [],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@musistudio/claude-code-router",
-  "version": "1.0.44",
+  "version": "1.0.46",
   "description": "Use Claude Code without an Anthropics account and route it to another LLM provider",
   "bin": {
     "ccr": "./dist/cli.js"
@@ -20,7 +20,7 @@
   "license": "MIT",
   "dependencies": {
     "@fastify/static": "^8.2.0",
-    "@musistudio/llms": "^1.0.29",
+    "@musistudio/llms": "^1.0.30",
     "dotenv": "^16.4.7",
     "json5": "^2.2.3",
     "openurl": "^1.1.1",