@kenkaiiii/gg-ai 4.3.39 → 4.3.40

package/dist/index.cjs

@@ -174,12 +174,70 @@ function zodToJsonSchema(schema) {
 }
 
 // src/providers/transform.ts
+var NON_VISION_USER_IMAGE_PLACEHOLDER = "(image omitted: model does not support images)";
+var NON_VISION_TOOL_IMAGE_PLACEHOLDER = "(tool image omitted: model does not support images)";
+function stripImages(content, placeholder) {
+  const out = [];
+  let lastWasPlaceholder = false;
+  for (const block of content) {
+    if (block.type === "image") {
+      if (!lastWasPlaceholder) out.push({ type: "text", text: placeholder });
+      lastWasPlaceholder = true;
+      continue;
+    }
+    out.push(block);
+    lastWasPlaceholder = block.text === placeholder;
+  }
+  return out;
+}
+function downgradeUnsupportedImages(messages, supportsImages) {
+  if (supportsImages !== false) return messages;
+  return messages.map((msg) => {
+    if (msg.role === "user" && Array.isArray(msg.content)) {
+      return { ...msg, content: stripImages(msg.content, NON_VISION_USER_IMAGE_PLACEHOLDER) };
+    }
+    if (msg.role === "tool") {
+      return {
+        ...msg,
+        content: msg.content.map(
+          (tr) => Array.isArray(tr.content) ? {
+            ...tr,
+            content: stripImages(tr.content, NON_VISION_TOOL_IMAGE_PLACEHOLDER)
+          } : tr
+        )
+      };
+    }
+    return msg;
+  });
+}
+function toolResultText(content) {
+  if (typeof content === "string") return content;
+  return content.filter((b) => b.type === "text").map((b) => b.text).join("\n");
+}
+function toolResultImages(content) {
+  if (typeof content === "string") return [];
+  return content.filter((b) => b.type === "image");
+}
 function toAnthropicCacheControl(retention, baseUrl) {
   const resolved = retention ?? "short";
   if (resolved === "none") return void 0;
   const ttl = resolved === "long" && (!baseUrl || baseUrl.includes("api.anthropic.com")) ? "1h" : void 0;
   return { type: "ephemeral", ...ttl && { ttl } };
 }
+function toAnthropicToolResultContent(content) {
+  if (typeof content === "string") return content;
+  return content.map((block) => {
+    if (block.type === "text") return { type: "text", text: block.text };
+    return {
+      type: "image",
+      source: {
+        type: "base64",
+        media_type: block.mediaType,
+        data: block.data
+      }
+    };
+  });
+}
 function toAnthropicMessages(messages, cacheControl) {
   let systemText;
   const out = [];
@@ -243,7 +301,7 @@ function toAnthropicMessages(messages, cacheControl) {
         content: msg.content.map((result) => ({
           type: "tool_result",
           tool_use_id: result.toolCallId,
-          content: result.content,
+          content: toAnthropicToolResultContent(result.content),
           is_error: result.isError
         }))
       });
@@ -414,11 +472,29 @@ function toOpenAIMessages(messages, options) {
       continue;
     }
     if (msg.role === "tool") {
+      const imageBlocks = [];
       for (const result of msg.content) {
+        const text = toolResultText(result.content);
+        const images = toolResultImages(result.content);
+        const hasText = text.length > 0;
         out.push({
           role: "tool",
           tool_call_id: remapToolCallId(result.toolCallId, idMap),
-          content: result.content
+          content: hasText ? text : "(see attached image)"
+        });
+        if (images.length > 0 && options?.supportsImages !== false) {
+          for (const img of images) {
+            imageBlocks.push({
+              type: "image_url",
+              image_url: { url: `data:${img.mediaType};base64,${img.data}` }
+            });
+          }
+        }
+      }
+      if (imageBlocks.length > 0) {
+        out.push({
+          role: "user",
+          content: [{ type: "text", text: "Attached image(s) from tool result:" }, ...imageBlocks]
         });
       }
     }
@@ -500,7 +576,8 @@ async function* runStream(options) {
   const isOAuth = options.apiKey?.startsWith("sk-ant-oat");
   const useStreaming = options.streaming !== false;
   const cacheControl = toAnthropicCacheControl(options.cacheRetention, options.baseUrl);
-  const { system: rawSystem, messages } = toAnthropicMessages(options.messages, cacheControl);
+  const downgradedMessages = downgradeUnsupportedImages(options.messages, options.supportsImages);
+  const { system: rawSystem, messages } = toAnthropicMessages(downgradedMessages, cacheControl);
   const system = isOAuth ? [
     {
       type: "text",
@@ -892,9 +969,11 @@ async function* runStream2(options) {
   const useStreaming = options.streaming !== false;
   const client = createClient2(options);
   const usesThinkingParam = options.provider === "glm" || options.provider === "moonshot" || options.provider === "xiaomi";
-  const messages = toOpenAIMessages(options.messages, {
+  const downgradedMessages = downgradeUnsupportedImages(options.messages, options.supportsImages);
+  const messages = toOpenAIMessages(downgradedMessages, {
     provider: options.provider,
-    thinking: !!options.thinking
+    thinking: !!options.thinking,
+    supportsImages: options.supportsImages
   });
   const defaultTemp = options.provider === "glm" ? 0.6 : void 0;
   const effectiveTemp = options.temperature ?? defaultTemp;
@@ -1186,7 +1265,8 @@ function streamOpenAICodex(options) {
 async function* runStream3(options) {
   const baseUrl = (options.baseUrl || DEFAULT_BASE_URL).replace(/\/+$/, "");
   const url = `${baseUrl}/codex/responses`;
-  const { system, input } = toCodexInput(options.messages);
+  const downgraded = downgradeUnsupportedImages(options.messages, options.supportsImages);
+  const { system, input } = toCodexInput(downgraded, { supportsImages: options.supportsImages });
   const body = {
     model: options.model,
     store: false,
@@ -1406,7 +1486,11 @@ function remapCodexId(id, idMap) {
   idMap.set(id, mapped);
   return mapped;
 }
-function toCodexInput(messages) {
+function codexToolResultText(content) {
+  if (typeof content === "string") return content;
+  return content.filter((b) => b.type === "text").map((b) => b.text).join("\n");
+}
+function toCodexInput(messages, options) {
   let system;
   const input = [];
   const idMap = /* @__PURE__ */ new Map();
@@ -1459,12 +1543,33 @@ function toCodexInput(messages) {
       continue;
     }
     if (msg.role === "tool") {
+      const toolImages = [];
       for (const result of msg.content) {
         const [callId] = result.toolCallId.includes("|") ? result.toolCallId.split("|", 2) : [result.toolCallId];
+        const text = codexToolResultText(result.content);
         input.push({
           type: "function_call_output",
           call_id: remapCodexId(callId, idMap),
-          output: result.content
+          output: text.length > 0 ? text : "(see attached image)"
+        });
+        if (options?.supportsImages !== false && Array.isArray(result.content)) {
+          for (const block of result.content) {
+            if (block.type === "image") toolImages.push(block);
+          }
+        }
+      }
+      if (toolImages.length > 0) {
+        input.push({
+          type: "message",
+          role: "user",
+          content: [
+            { type: "input_text", text: "Attached image(s) from tool result:" },
+            ...toolImages.map((img) => ({
+              type: "input_image",
+              detail: "auto",
+              image_url: `data:${img.mediaType};base64,${img.data}`
+            }))
+          ]
         });
       }
     }