@blockrun/clawrouter 0.12.31 → 0.12.33

package/dist/index.js

@@ -1640,6 +1640,7 @@ import { finished } from "stream";
 import { homedir as homedir4 } from "os";
 import { join as join5 } from "path";
 import { mkdir as mkdir3, writeFile as writeFile2, readFile, stat as fsStat } from "fs/promises";
+import { readFileSync, existsSync } from "fs";
 import { createPublicClient as createPublicClient2, http as http2 } from "viem";
 import { base as base2 } from "viem/chains";
 import { privateKeyToAccount as privateKeyToAccount3 } from "viem/accounts";
@@ -6064,6 +6065,22 @@ async function proxyPartnerRequest(req, res, apiBase, payFetch) {
   }).catch(() => {
   });
 }
+function readImageFileAsDataUri(filePath) {
+  const resolved = filePath.startsWith("~/") ? join5(homedir4(), filePath.slice(2)) : filePath;
+  if (!existsSync(resolved)) {
+    throw new Error(`Image file not found: ${resolved}`);
+  }
+  const ext = resolved.split(".").pop()?.toLowerCase() ?? "png";
+  const mimeMap = {
+    png: "image/png",
+    jpg: "image/jpeg",
+    jpeg: "image/jpeg",
+    webp: "image/webp"
+  };
+  const mime = mimeMap[ext] ?? "image/png";
+  const data = readFileSync(resolved);
+  return `data:${mime};base64,${data.toString("base64")}`;
+}
 async function uploadDataUriToHost(dataUri) {
   const match = dataUri.match(/^data:(image\/\w+);base64,(.+)$/);
   if (!match) throw new Error("Invalid data URI format");
@@ -6337,14 +6354,31 @@ async function startProxy(options) {
           await mkdir3(IMAGE_DIR, { recursive: true });
           const port2 = server.address()?.port ?? 8402;
           for (const img of result.data) {
-            const m = img.url?.match(/^data:(image\/\w+);base64,(.+)$/);
-            if (m) {
-              const [, mimeType, b64] = m;
+            const dataUriMatch = img.url?.match(/^data:(image\/\w+);base64,(.+)$/);
+            if (dataUriMatch) {
+              const [, mimeType, b64] = dataUriMatch;
               const ext = mimeType === "image/jpeg" ? "jpg" : mimeType.split("/")[1] ?? "png";
               const filename = `${Date.now()}-${Math.random().toString(36).slice(2, 10)}.${ext}`;
               await writeFile2(join5(IMAGE_DIR, filename), Buffer.from(b64, "base64"));
               img.url = `http://localhost:${port2}/images/${filename}`;
               console.log(`[ClawRouter] Image saved \u2192 ${img.url}`);
+            } else if (img.url?.startsWith("https://") || img.url?.startsWith("http://")) {
+              try {
+                const imgResp = await fetch(img.url);
+                if (imgResp.ok) {
+                  const contentType = imgResp.headers.get("content-type") ?? "image/png";
+                  const ext = contentType.includes("jpeg") || contentType.includes("jpg") ? "jpg" : contentType.includes("webp") ? "webp" : "png";
+                  const filename = `${Date.now()}-${Math.random().toString(36).slice(2, 10)}.${ext}`;
+                  const buf = Buffer.from(await imgResp.arrayBuffer());
+                  await writeFile2(join5(IMAGE_DIR, filename), buf);
+                  img.url = `http://localhost:${port2}/images/${filename}`;
+                  console.log(`[ClawRouter] Image downloaded & saved \u2192 ${img.url}`);
+                }
+              } catch (downloadErr) {
+                console.warn(
+                  `[ClawRouter] Failed to download image, using original URL: ${downloadErr instanceof Error ? downloadErr.message : String(downloadErr)}`
+                );
+              }
             }
           }
         }
@@ -6360,6 +6394,76 @@ async function startProxy(options) {
       }
       return;
     }
+    if (req.url === "/v1/images/image2image" && req.method === "POST") {
+      const chunks = [];
+      for await (const chunk of req) {
+        chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
+      }
+      const reqBody = Buffer.concat(chunks);
+      try {
+        const upstream = await payFetch(`${apiBase}/v1/images/image2image`, {
+          method: "POST",
+          headers: { "content-type": "application/json", "user-agent": USER_AGENT },
+          body: reqBody
+        });
+        const text = await upstream.text();
+        if (!upstream.ok) {
+          res.writeHead(upstream.status, { "Content-Type": "application/json" });
+          res.end(text);
+          return;
+        }
+        let result;
+        try {
+          result = JSON.parse(text);
+        } catch {
+          res.writeHead(200, { "Content-Type": "application/json" });
+          res.end(text);
+          return;
+        }
+        if (result.data?.length) {
+          await mkdir3(IMAGE_DIR, { recursive: true });
+          const port2 = server.address()?.port ?? 8402;
+          for (const img of result.data) {
+            const dataUriMatch = img.url?.match(/^data:(image\/\w+);base64,(.+)$/);
+            if (dataUriMatch) {
+              const [, mimeType, b64] = dataUriMatch;
+              const ext = mimeType === "image/jpeg" ? "jpg" : mimeType.split("/")[1] ?? "png";
+              const filename = `${Date.now()}-${Math.random().toString(36).slice(2, 10)}.${ext}`;
+              await writeFile2(join5(IMAGE_DIR, filename), Buffer.from(b64, "base64"));
+              img.url = `http://localhost:${port2}/images/${filename}`;
+              console.log(`[ClawRouter] Image saved \u2192 ${img.url}`);
+            } else if (img.url?.startsWith("https://") || img.url?.startsWith("http://")) {
+              try {
+                const imgResp = await fetch(img.url);
+                if (imgResp.ok) {
+                  const contentType = imgResp.headers.get("content-type") ?? "image/png";
+                  const ext = contentType.includes("jpeg") || contentType.includes("jpg") ? "jpg" : contentType.includes("webp") ? "webp" : "png";
+                  const filename = `${Date.now()}-${Math.random().toString(36).slice(2, 10)}.${ext}`;
+                  const buf = Buffer.from(await imgResp.arrayBuffer());
+                  await writeFile2(join5(IMAGE_DIR, filename), buf);
+                  img.url = `http://localhost:${port2}/images/${filename}`;
+                  console.log(`[ClawRouter] Image downloaded & saved \u2192 ${img.url}`);
+                }
+              } catch (downloadErr) {
+                console.warn(
+                  `[ClawRouter] Failed to download image, using original URL: ${downloadErr instanceof Error ? downloadErr.message : String(downloadErr)}`
+                );
+              }
+            }
+          }
+        }
+        res.writeHead(200, { "Content-Type": "application/json" });
+        res.end(JSON.stringify(result));
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        console.error(`[ClawRouter] Image editing error: ${msg}`);
+        if (!res.headersSent) {
+          res.writeHead(502, { "Content-Type": "application/json" });
+          res.end(JSON.stringify({ error: "Image editing failed", details: msg }));
+        }
+      }
+      return;
+    }
     if (req.url?.match(/^\/v1\/(?:x|partner)\//)) {
       try {
         await proxyPartnerRequest(req, res, apiBase, payFetch);
@@ -6974,6 +7078,177 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
         }
         return;
       }
+      if (lastContent.startsWith("/img2img")) {
+        const imgArgs = lastContent.slice("/img2img".length).trim();
+        let img2imgModel = "openai/gpt-image-1";
+        let img2imgSize = "1024x1024";
+        let imagePath = null;
+        let maskPath = null;
+        let img2imgPrompt = imgArgs;
+        const imageMatch = imgArgs.match(/--image\s+(\S+)/);
+        if (imageMatch) {
+          imagePath = imageMatch[1];
+          img2imgPrompt = img2imgPrompt.replace(/--image\s+\S+/, "").trim();
+        }
+        const maskMatch = imgArgs.match(/--mask\s+(\S+)/);
+        if (maskMatch) {
+          maskPath = maskMatch[1];
+          img2imgPrompt = img2imgPrompt.replace(/--mask\s+\S+/, "").trim();
+        }
+        const img2imgSizeMatch = imgArgs.match(/--size\s+(\d+x\d+)/);
+        if (img2imgSizeMatch) {
+          img2imgSize = img2imgSizeMatch[1];
+          img2imgPrompt = img2imgPrompt.replace(/--size\s+\d+x\d+/, "").trim();
+        }
+        const img2imgModelMatch = imgArgs.match(/--model\s+(\S+)/);
+        if (img2imgModelMatch) {
+          const raw = img2imgModelMatch[1];
+          const IMG2IMG_ALIASES = {
+            "gpt-image": "openai/gpt-image-1",
+            "gpt-image-1": "openai/gpt-image-1"
+          };
+          img2imgModel = IMG2IMG_ALIASES[raw] ?? raw;
+          img2imgPrompt = img2imgPrompt.replace(/--model\s+\S+/, "").trim();
+        }
+        const usageText = [
+          "Usage: /img2img --image <path> <prompt>",
+          "",
+          "Options:",
+          "  --image <path>   Source image path (required)",
+          "  --mask <path>    Mask image path (optional, white = area to edit)",
+          "  --model <model>  Model (default: gpt-image-1)",
+          "  --size <WxH>     Output size (default: 1024x1024)",
+          "",
+          "Models:",
+          "  gpt-image-1      OpenAI GPT Image 1 \u2014 $0.02/image",
+          "",
+          "Examples:",
+          "  /img2img --image ~/photo.png change background to starry sky",
+          "  /img2img --image ./cat.jpg --mask ./mask.png remove the background",
+          "  /img2img --image /tmp/portrait.png --size 1536x1024 add a hat"
+        ].join("\n");
+        const sendImg2ImgText = (text) => {
+          const completionId = `chatcmpl-img2img-${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/img2img", choices: [{ index: 0, delta: { role: "assistant", content: text }, finish_reason: null }] })}
+
+`
+            );
+            res.write(
+              `data: ${JSON.stringify({ id: completionId, object: "chat.completion.chunk", created: timestamp, model: "clawrouter/img2img", 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/img2img",
+                choices: [
+                  {
+                    index: 0,
+                    message: { role: "assistant", content: text },
+                    finish_reason: "stop"
+                  }
+                ],
+                usage: { prompt_tokens: 0, completion_tokens: 0, total_tokens: 0 }
+              })
+            );
+          }
+        };
+        if (!imagePath || !img2imgPrompt) {
+          sendImg2ImgText(usageText);
+          return;
+        }
+        let imageDataUri;
+        let maskDataUri;
+        try {
+          imageDataUri = readImageFileAsDataUri(imagePath);
+          if (maskPath) maskDataUri = readImageFileAsDataUri(maskPath);
+        } catch (fileErr) {
+          const fileErrMsg = fileErr instanceof Error ? fileErr.message : String(fileErr);
+          sendImg2ImgText(`Failed to read image file: ${fileErrMsg}`);
+          return;
+        }
+        console.log(
+          `[ClawRouter] /img2img \u2192 ${img2imgModel} (${img2imgSize}): ${img2imgPrompt.slice(0, 80)}`
+        );
+        try {
+          const img2imgBody = JSON.stringify({
+            model: img2imgModel,
+            prompt: img2imgPrompt,
+            image: imageDataUri,
+            ...maskDataUri ? { mask: maskDataUri } : {},
+            size: img2imgSize,
+            n: 1
+          });
+          const img2imgResponse = await payFetch(`${apiBase}/v1/images/image2image`, {
+            method: "POST",
+            headers: { "content-type": "application/json", "user-agent": USER_AGENT },
+            body: img2imgBody
+          });
+          const img2imgResult = await img2imgResponse.json();
+          let responseText;
+          if (!img2imgResponse.ok || img2imgResult.error) {
+            const errMsg = typeof img2imgResult.error === "string" ? img2imgResult.error : img2imgResult.error?.message ?? `HTTP ${img2imgResponse.status}`;
+            responseText = `Image editing failed: ${errMsg}`;
+            console.log(`[ClawRouter] /img2img error: ${errMsg}`);
+          } else {
+            const images = img2imgResult.data ?? [];
+            if (images.length === 0) {
+              responseText = "Image editing returned no results.";
+            } else {
+              const lines = [];
+              for (const img of images) {
+                if (img.url) {
+                  if (img.url.startsWith("data:")) {
+                    try {
+                      const hostedUrl = await uploadDataUriToHost(img.url);
+                      lines.push(hostedUrl);
+                    } catch (uploadErr) {
+                      console.error(
+                        `[ClawRouter] /img2img: failed to upload data URI: ${uploadErr instanceof Error ? uploadErr.message : String(uploadErr)}`
+                      );
+                      lines.push("Image edited but upload failed. Try again.");
+                    }
+                  } else {
+                    lines.push(img.url);
+                  }
+                }
+                if (img.revised_prompt) lines.push(`Revised prompt: ${img.revised_prompt}`);
+              }
+              lines.push("", `Model: ${img2imgModel} | Size: ${img2imgSize}`);
+              responseText = lines.join("\n");
+            }
+            console.log(`[ClawRouter] /img2img success: ${images.length} image(s)`);
+          }
+          sendImg2ImgText(responseText);
+        } catch (err) {
+          const errMsg = err instanceof Error ? err.message : String(err);
+          console.error(`[ClawRouter] /img2img error: ${errMsg}`);
+          if (!res.headersSent) {
+            res.writeHead(500, { "Content-Type": "application/json" });
+            res.end(
+              JSON.stringify({
+                error: { message: `Image editing failed: ${errMsg}`, type: "img2img_error" }
+              })
+            );
+          }
+        }
+        return;
+      }
       if (parsed.stream === true) {
         parsed.stream = false;
         bodyModified = true;
@@ -7763,7 +8038,7 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
 // src/index.ts
 import {
   writeFileSync as writeFileSync2,
-  existsSync as existsSync2,
+  existsSync as existsSync3,
   readdirSync,
   mkdirSync as mkdirSync2,
   copyFileSync,
@@ -8205,7 +8480,7 @@ function injectModelsConfig(logger) {
   const configPath = join7(configDir, "openclaw.json");
   let config = {};
   let needsWrite = false;
-  if (!existsSync2(configDir)) {
+  if (!existsSync3(configDir)) {
     try {
       mkdirSync2(configDir, { recursive: true });
       logger.info("Created OpenClaw config directory");
@@ -8216,7 +8491,7 @@ function injectModelsConfig(logger) {
       return;
     }
   }
-  if (existsSync2(configPath)) {
+  if (existsSync3(configPath)) {
     try {
       const content = readTextFileSync(configPath).trim();
       if (content) {
@@ -8364,7 +8639,7 @@ function injectModelsConfig(logger) {
 }
 function injectAuthProfile(logger) {
   const agentsDir = join7(homedir6(), ".openclaw", "agents");
-  if (!existsSync2(agentsDir)) {
+  if (!existsSync3(agentsDir)) {
     try {
       mkdirSync2(agentsDir, { recursive: true });
     } catch (err) {
@@ -8382,7 +8657,7 @@ function injectAuthProfile(logger) {
     for (const agentId of agents) {
       const authDir = join7(agentsDir, agentId, "agent");
       const authPath = join7(authDir, "auth-profiles.json");
-      if (!existsSync2(authDir)) {
+      if (!existsSync3(authDir)) {
         try {
           mkdirSync2(authDir, { recursive: true });
         } catch {
@@ -8393,7 +8668,7 @@ function injectAuthProfile(logger) {
         version: 1,
         profiles: {}
       };
-      if (existsSync2(authPath)) {
+      if (existsSync3(authPath)) {
         try {
           const existing = JSON.parse(readTextFileSync(authPath));
           if (existing.version && existing.profiles) {
@@ -8537,7 +8812,7 @@ async function createWalletCommand() {
       let walletKey;
       let address;
       try {
-        if (existsSync2(WALLET_FILE)) {
+        if (existsSync3(WALLET_FILE)) {
           walletKey = readTextFileSync(WALLET_FILE).trim();
           if (walletKey.startsWith("0x") && walletKey.length === 66) {
             const account = privateKeyToAccount4(walletKey);
@@ -8567,7 +8842,7 @@ Run \`openclaw plugins install @blockrun/clawrouter\` to generate a wallet.`,
         ];
         let hasMnemonic = false;
         try {
-          if (existsSync2(MNEMONIC_FILE)) {
+          if (existsSync3(MNEMONIC_FILE)) {
             const mnemonic = readTextFileSync(MNEMONIC_FILE).trim();
             if (mnemonic) {
               hasMnemonic = true;
@@ -8609,7 +8884,7 @@ Run \`openclaw plugins install @blockrun/clawrouter\` to generate a wallet.`,
       if (subcommand === "solana") {
         try {
           let solanaAddr;
-          if (existsSync2(MNEMONIC_FILE)) {
+          if (existsSync3(MNEMONIC_FILE)) {
             const existingMnemonic = readTextFileSync(MNEMONIC_FILE).trim();
             if (existingMnemonic) {
               await savePaymentChain("solana");
@@ -8654,7 +8929,7 @@ Run \`openclaw plugins install @blockrun/clawrouter\` to generate a wallet.`,
       }
       if (subcommand === "migrate-solana") {
         try {
-          if (!existsSync2(MNEMONIC_FILE)) {
+          if (!existsSync3(MNEMONIC_FILE)) {
             return {
               text: "No mnemonic file found. Solana wallet not set up \u2014 nothing to migrate.",
               isError: true
@@ -8757,7 +9032,7 @@ Run \`openclaw plugins install @blockrun/clawrouter\` to generate a wallet.`,
       }
       let solanaSection = "";
       try {
-        if (existsSync2(MNEMONIC_FILE)) {
+        if (existsSync3(MNEMONIC_FILE)) {
           const { deriveSolanaKeyBytes: deriveSolanaKeyBytes2 } = await Promise.resolve().then(() => (init_wallet(), wallet_exports));
           const mnemonic = readTextFileSync(MNEMONIC_FILE).trim();
           if (mnemonic) {