omnigateway 0.12.10 → 0.12.12

package/bin/omni.js

@@ -20257,7 +20257,7 @@ function blockTokens(block) {
     case "toolUse":
       return BLOCK_OVERHEAD + fromText(block.name) + fromText(safeJson(block.input));
     case "toolResult":
-      return BLOCK_OVERHEAD + fromText(block.toolUseId) + fromText(block.content);
+      return BLOCK_OVERHEAD + fromText(block.toolUseId) + fromText(block.content) + (block.images?.length ?? 0) * IMAGE_TOKENS + (block.files ?? []).reduce((sum, f) => sum + fromText(f.data), 0) + (block.native ?? []).reduce((sum, n) => sum + blockTokens(n), 0);
     case "providerNative":
       return BLOCK_OVERHEAD + fromText(block.blockType) + fromText(safeJson(block.data));
   }
@@ -20322,6 +20322,9 @@ function estimateCachedInputTokens(request) {
       running += blockTokens(block);
       if (cacheControlOf(block) !== undefined)
         cached2 = running;
+      if (block.type === "toolResult" && [...block.images ?? [], ...block.native ?? []].some((p) => p.cacheControl !== undefined)) {
+        cached2 = running;
+      }
     }
   }
   return cached2;
@@ -27070,6 +27073,69 @@ function systemText(system, provider, note2) {
 `);
 }
 
+// packages/providers/src/toolResultFiles.ts
+function isTextual(mediaType) {
+  const type = mediaType.split(";")[0]?.trim().toLowerCase() ?? "";
+  return type.startsWith("text/") || type.endsWith("+json") || type.endsWith("+xml") || TEXTUAL.has(type);
+}
+var TEXTUAL = new Set([
+  "application/json",
+  "application/x-ndjson",
+  "application/xml",
+  "application/yaml",
+  "application/x-yaml",
+  "application/toml",
+  "application/javascript",
+  "application/typescript",
+  "application/sql",
+  "application/x-sh",
+  "message/rfc822"
+]);
+function fileText(file2) {
+  return Buffer.from(file2.data, "base64").toString("utf8");
+}
+function splitFiles(files, carries) {
+  const text = [];
+  const carried = [];
+  let dropped = false;
+  for (const file2 of files) {
+    if (isTextual(file2.mediaType))
+      text.push(fileText(file2));
+    else if (carries(file2.mediaType))
+      carried.push(file2);
+    else
+      dropped = true;
+  }
+  return { text, carried, dropped };
+}
+function withFileText(content, text) {
+  return [content, ...text].filter((t) => t.length > 0).join(`
+
+`);
+}
+var RESPONSES_FILE_TYPES = Object.assign(Object.create(null), {
+  "application/pdf": "pdf",
+  "application/rtf": "rtf",
+  "application/msword": "doc",
+  "application/vnd.ms-excel": "xls",
+  "application/vnd.ms-powerpoint": "ppt",
+  "application/vnd.openxmlformats-officedocument.wordprocessingml.document": "docx",
+  "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet": "xlsx",
+  "application/vnd.openxmlformats-officedocument.presentationml.presentation": "pptx"
+});
+function fileName(file2) {
+  return file2.filename ?? `file.${RESPONSES_FILE_TYPES[file2.mediaType] ?? "bin"}`;
+}
+function responsesFiles(files) {
+  const { text, carried, dropped } = splitFiles(files, (t) => (t in RESPONSES_FILE_TYPES));
+  const parts = carried.map((file2) => ({
+    type: "input_file",
+    filename: fileName(file2),
+    file_data: `data:${file2.mediaType};base64,${file2.data}`
+  }));
+  return { parts, text, dropped };
+}
+
 // packages/providers/src/anthropic/wire.ts
 var OAUTH_IDENTITY = "You are Claude Code, Anthropic's official CLI for Claude.";
 function wireCacheControl(c) {
@@ -27106,14 +27172,27 @@ function encodeBlock(b, cloak) {
         input: b.input,
         ...cache
       };
-    case "toolResult":
+    case "toolResult": {
+      const files = splitFiles(b.files ?? [], (t) => t === "application/pdf");
+      const text = withFileText(b.content, files.text);
+      const documents = files.carried.map((file2) => ({
+        type: "document",
+        source: { type: "base64", media_type: file2.mediaType, data: file2.data },
+        ...file2.filename !== undefined && { title: file2.filename }
+      }));
+      const parts = [
+        ...(b.images ?? []).map((image) => encodeBlock(image, cloak)),
+        ...documents,
+        ...(b.native ?? []).map((part) => encodeBlock(part, cloak))
+      ];
       return {
         type: "tool_result",
         tool_use_id: b.toolUseId,
-        content: b.content,
+        content: parts.length === 0 ? text : [...text.length > 0 ? [{ type: "text", text }] : [], ...parts],
         is_error: b.isError,
         ...cache
       };
+    }
     case "providerNative":
       if (b.provider !== "anthropic") {
         throw new GatewayError("INTERNAL", `anthropic adapter received a ${b.provider} provider-native block`);
@@ -27283,6 +27362,17 @@ function toWire(req, model, opts) {
   const systemCache = systemCacheControl(req);
   if (systemCache.lost)
     note2("anthropic:system-turn-cache-control-dropped");
+  for (const m of req.messages) {
+    for (const b of m.content) {
+      if (b.type === "toolResult" && b.files !== undefined) {
+        const files = splitFiles(b.files, (t) => t === "application/pdf");
+        if (files.text.length > 0)
+          note2("anthropic:tool-result-files-inlined");
+        if (files.dropped)
+          note2("anthropic:files-dropped");
+      }
+    }
+  }
   const body = {
     model,
     messages: req.messages.flatMap((m) => {
@@ -28367,17 +28457,28 @@ function toAntigravityWire(req, model, identity) {
           });
           break;
         case "toolResult": {
+          if (block.native !== undefined)
+            note2("antigravity:provider-native-block-dropped");
           const name = names.get(block.toolUseId);
           if (name === undefined)
             note2("antigravity:tool-result-unmatched");
           if (block.isError === true)
             note2("antigravity:tool-result-error-flag-dropped");
+          const files = splitFiles(block.files ?? [], () => true);
+          if (files.text.length > 0)
+            note2("antigravity:tool-result-files-inlined");
           parts.push({
             functionResponse: {
               name: cloakName2(cloak, name ?? block.toolUseId),
-              response: { output: block.content }
+              response: { output: withFileText(block.content, files.text) }
             }
           });
+          for (const image of block.images ?? []) {
+            parts.push({ inlineData: { mimeType: image.mediaType, data: image.data } });
+          }
+          for (const file2 of files.carried) {
+            parts.push({ inlineData: { mimeType: file2.mediaType, data: file2.data } });
+          }
           role = "user";
           break;
         }
@@ -30181,13 +30282,23 @@ function toCustomChatWire(req, model) {
             function: { name: block.name, arguments: JSON.stringify(block.input) }
           });
           break;
-        case "toolResult":
+        case "toolResult": {
+          if (block.native !== undefined)
+            note2("custom:anthropic-native-block-dropped");
+          const files = splitFiles(block.files ?? [], () => false);
           messages.push({
             role: "tool",
             tool_call_id: block.toolUseId,
-            content: block.content
+            content: withFileText(block.content, files.text)
           });
+          if (block.images !== undefined)
+            note2("custom:images-dropped");
+          if (files.text.length > 0)
+            note2("custom:tool-result-files-inlined");
+          if (files.dropped)
+            note2("custom:files-dropped");
           break;
+        }
         case "providerNative":
           note2("custom:anthropic-native-block-dropped");
           break;
@@ -30301,14 +30412,35 @@ function toCustomResponsesWire(req, model) {
             arguments: JSON.stringify(block.input)
           });
           break;
-        case "toolResult":
+        case "toolResult": {
+          if (block.native !== undefined)
+            note2("custom:anthropic-native-block-dropped");
           flush();
+          const files = responsesFiles(block.files ?? []);
           input2.push({
             type: "function_call_output",
             call_id: block.toolUseId,
-            output: block.content
+            output: withFileText(block.content, files.text)
           });
+          if (block.images !== undefined) {
+            note2("custom:tool-result-images-moved");
+            for (const image of block.images) {
+              parts.push({
+                type: "input_image",
+                image_url: `data:${image.mediaType};base64,${image.data}`
+              });
+            }
+          }
+          if (files.parts.length > 0) {
+            note2("custom:tool-result-files-moved");
+            parts.push(...files.parts);
+          }
+          if (files.text.length > 0)
+            note2("custom:tool-result-files-inlined");
+          if (files.dropped)
+            note2("custom:files-dropped");
           break;
+        }
         case "providerNative":
           note2("custom:anthropic-native-block-dropped");
           break;
@@ -30666,14 +30798,35 @@ function toGrokWire(req, model) {
             arguments: JSON.stringify(block.input)
           });
           break;
-        case "toolResult":
+        case "toolResult": {
+          if (block.native !== undefined)
+            note2("grok:anthropic-native-block-dropped");
           flush();
+          const files = responsesFiles(block.files ?? []);
           input2.push({
             type: "function_call_output",
             call_id: block.toolUseId,
-            output: block.content
+            output: withFileText(block.content, files.text)
           });
+          if (block.images !== undefined) {
+            note2("grok:tool-result-images-moved");
+            for (const image of block.images) {
+              parts.push({
+                type: "input_image",
+                image_url: `data:${image.mediaType};base64,${image.data}`
+              });
+            }
+          }
+          if (files.parts.length > 0) {
+            note2("grok:tool-result-files-moved");
+            parts.push(...files.parts);
+          }
+          if (files.text.length > 0)
+            note2("grok:tool-result-files-inlined");
+          if (files.dropped)
+            note2("grok:files-dropped");
           break;
+        }
         case "providerNative":
           note2("grok:anthropic-native-block-dropped");
           break;
@@ -31080,6 +31233,7 @@ function toKiloWire(req, model) {
   for (const message of req.messages) {
     let parts = [];
     const toolCalls = [];
+    const toolImages = [];
     const flush = () => {
       if (toolCalls.length > 0) {
         messages.push({ role: message.role, content: collapse(parts), tool_calls: [...toolCalls] });
@@ -31110,20 +31264,47 @@ function toKiloWire(req, model) {
             function: { name: block.name, arguments: JSON.stringify(block.input) }
           });
           break;
-        case "toolResult":
+        case "toolResult": {
+          if (block.native !== undefined)
+            note2("kilo:anthropic-native-block-dropped");
           flush();
+          const files = splitFiles(block.files ?? [], (t) => t === "application/pdf");
           messages.push({
             role: "tool",
             tool_call_id: block.toolUseId,
-            content: block.content
+            content: withFileText(block.content, files.text)
           });
+          if (files.text.length > 0)
+            note2("kilo:tool-result-files-inlined");
+          if (files.dropped)
+            note2("kilo:files-dropped");
+          for (const image of block.images ?? []) {
+            note2("kilo:tool-result-images-moved");
+            toolImages.push({
+              type: "image_url",
+              image_url: { url: `data:${image.mediaType};base64,${image.data}` }
+            });
+          }
+          for (const file2 of files.carried) {
+            note2("kilo:tool-result-files-moved");
+            toolImages.push({
+              type: "file",
+              file: {
+                filename: fileName(file2),
+                file_data: `data:${file2.mediaType};base64,${file2.data}`
+              }
+            });
+          }
           break;
+        }
         case "providerNative":
           note2("kilo:anthropic-native-block-dropped");
           break;
       }
     }
     flush();
+    if (toolImages.length > 0)
+      messages.push({ role: "user", content: toolImages });
   }
   const body = {
     model,
@@ -31369,13 +31550,23 @@ function toChatWire(req, model, vendor = "kimi") {
             function: { name: block.name, arguments: JSON.stringify(block.input) }
           });
           break;
-        case "toolResult":
+        case "toolResult": {
+          if (block.native !== undefined)
+            note2("kimi:anthropic-native-block-dropped");
+          const files = splitFiles(block.files ?? [], () => false);
           messages.push({
             role: "tool",
             tool_call_id: block.toolUseId,
-            content: block.content
+            content: withFileText(block.content, files.text)
           });
+          if (block.images !== undefined)
+            note2("kimi:images-dropped");
+          if (files.text.length > 0)
+            note2("kimi:tool-result-files-inlined");
+          if (files.dropped)
+            note2("kimi:files-dropped");
           break;
+        }
         case "providerNative":
           note2("kimi:anthropic-native-block-dropped");
           break;
@@ -31774,14 +31965,35 @@ function toMuseWire(req, model) {
             arguments: JSON.stringify(block.input)
           });
           break;
-        case "toolResult":
+        case "toolResult": {
+          if (block.native !== undefined)
+            note2("muse:foreign-native-block-dropped");
           flush();
+          const files = responsesFiles(block.files ?? []);
           input2.push({
             type: "function_call_output",
             call_id: block.toolUseId,
-            output: block.content
+            output: withFileText(block.content, files.text)
           });
+          if (block.images !== undefined) {
+            note2("muse:tool-result-images-moved");
+            for (const image of block.images) {
+              parts.push({
+                type: "input_image",
+                image_url: `data:${image.mediaType};base64,${image.data}`
+              });
+            }
+          }
+          if (files.parts.length > 0) {
+            note2("muse:tool-result-files-moved");
+            parts.push(...files.parts);
+          }
+          if (files.text.length > 0)
+            note2("muse:tool-result-files-inlined");
+          if (files.dropped)
+            note2("muse:files-dropped");
           break;
+        }
         case "providerNative":
           if (block.provider === "muse") {
             flush();
@@ -32179,14 +32391,35 @@ function toResponsesWire(req, model, opts = { oauth: false }) {
             arguments: JSON.stringify(block.input)
           });
           break;
-        case "toolResult":
+        case "toolResult": {
+          if (block.native !== undefined)
+            note2("openai:anthropic-native-block-dropped");
           flush();
+          const files = responsesFiles(block.files ?? []);
           input2.push({
             type: "function_call_output",
             call_id: block.toolUseId,
-            output: block.content
+            output: withFileText(block.content, files.text)
           });
+          if (block.images !== undefined) {
+            note2("openai:tool-result-images-moved");
+            for (const image of block.images) {
+              parts.push({
+                type: "input_image",
+                image_url: `data:${image.mediaType};base64,${image.data}`
+              });
+            }
+          }
+          if (files.parts.length > 0) {
+            note2("openai:tool-result-files-moved");
+            parts.push(...files.parts);
+          }
+          if (files.text.length > 0)
+            note2("openai:tool-result-files-inlined");
+          if (files.dropped)
+            note2("openai:files-dropped");
           break;
+        }
         case "providerNative":
           if (block.provider === "openai") {
             flush();
@@ -32779,12 +33012,15 @@ function requiredProviders(request2) {
     for (const block of message.content) {
       if (block.type === "providerNative")
         owners.add(block.provider);
+      if (block.type === "toolResult")
+        for (const n of block.native ?? [])
+          owners.add(n.provider);
     }
   }
   return owners;
 }
 function requiredCapabilities(request2) {
-  const hasImage = (blocks) => blocks.some((b) => b.type === "image");
+  const hasImage = (blocks) => blocks.some((b) => b.type === "image" || b.type === "toolResult" && (b.images !== undefined || b.files !== undefined));
   const images = hasImage(request2.system ?? []) || request2.messages.some((m) => hasImage(m.content));
   return {
     tools: (request2.tools?.length ?? 0) > 0,
@@ -37919,7 +38155,7 @@ function createServiceDeps(input2) {
 }
 
 // apps/cli/src/version.ts
-var VERSION = "0.12.10";
+var VERSION = "0.12.12";
 
 // apps/cli/src/commands/service.ts
 function gatewayArgv(root) {

package/gateway.js

@@ -25673,7 +25673,7 @@ function blockTokens(block) {
     case "toolUse":
       return BLOCK_OVERHEAD + fromText(block.name) + fromText(safeJson(block.input));
     case "toolResult":
-      return BLOCK_OVERHEAD + fromText(block.toolUseId) + fromText(block.content);
+      return BLOCK_OVERHEAD + fromText(block.toolUseId) + fromText(block.content) + (block.images?.length ?? 0) * IMAGE_TOKENS + (block.files ?? []).reduce((sum, f) => sum + fromText(f.data), 0) + (block.native ?? []).reduce((sum, n) => sum + blockTokens(n), 0);
     case "providerNative":
       return BLOCK_OVERHEAD + fromText(block.blockType) + fromText(safeJson(block.data));
   }
@@ -25738,6 +25738,9 @@ function estimateCachedInputTokens(request) {
       running += blockTokens(block);
       if (cacheControlOf(block) !== undefined)
         cached2 = running;
+      if (block.type === "toolResult" && [...block.images ?? [], ...block.native ?? []].some((p) => p.cacheControl !== undefined)) {
+        cached2 = running;
+      }
     }
   }
   return cached2;
@@ -32632,6 +32635,69 @@ function systemText(system, provider, note) {
 `);
 }
 
+// packages/providers/src/toolResultFiles.ts
+function isTextual(mediaType) {
+  const type = mediaType.split(";")[0]?.trim().toLowerCase() ?? "";
+  return type.startsWith("text/") || type.endsWith("+json") || type.endsWith("+xml") || TEXTUAL.has(type);
+}
+var TEXTUAL = new Set([
+  "application/json",
+  "application/x-ndjson",
+  "application/xml",
+  "application/yaml",
+  "application/x-yaml",
+  "application/toml",
+  "application/javascript",
+  "application/typescript",
+  "application/sql",
+  "application/x-sh",
+  "message/rfc822"
+]);
+function fileText(file2) {
+  return Buffer.from(file2.data, "base64").toString("utf8");
+}
+function splitFiles(files, carries) {
+  const text = [];
+  const carried = [];
+  let dropped = false;
+  for (const file2 of files) {
+    if (isTextual(file2.mediaType))
+      text.push(fileText(file2));
+    else if (carries(file2.mediaType))
+      carried.push(file2);
+    else
+      dropped = true;
+  }
+  return { text, carried, dropped };
+}
+function withFileText(content, text) {
+  return [content, ...text].filter((t) => t.length > 0).join(`
+
+`);
+}
+var RESPONSES_FILE_TYPES = Object.assign(Object.create(null), {
+  "application/pdf": "pdf",
+  "application/rtf": "rtf",
+  "application/msword": "doc",
+  "application/vnd.ms-excel": "xls",
+  "application/vnd.ms-powerpoint": "ppt",
+  "application/vnd.openxmlformats-officedocument.wordprocessingml.document": "docx",
+  "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet": "xlsx",
+  "application/vnd.openxmlformats-officedocument.presentationml.presentation": "pptx"
+});
+function fileName(file2) {
+  return file2.filename ?? `file.${RESPONSES_FILE_TYPES[file2.mediaType] ?? "bin"}`;
+}
+function responsesFiles(files) {
+  const { text, carried, dropped } = splitFiles(files, (t) => (t in RESPONSES_FILE_TYPES));
+  const parts = carried.map((file2) => ({
+    type: "input_file",
+    filename: fileName(file2),
+    file_data: `data:${file2.mediaType};base64,${file2.data}`
+  }));
+  return { parts, text, dropped };
+}
+
 // packages/providers/src/anthropic/wire.ts
 var OAUTH_IDENTITY = "You are Claude Code, Anthropic's official CLI for Claude.";
 function wireCacheControl(c) {
@@ -32668,14 +32734,27 @@ function encodeBlock(b, cloak) {
         input: b.input,
         ...cache
       };
-    case "toolResult":
+    case "toolResult": {
+      const files = splitFiles(b.files ?? [], (t) => t === "application/pdf");
+      const text = withFileText(b.content, files.text);
+      const documents = files.carried.map((file2) => ({
+        type: "document",
+        source: { type: "base64", media_type: file2.mediaType, data: file2.data },
+        ...file2.filename !== undefined && { title: file2.filename }
+      }));
+      const parts = [
+        ...(b.images ?? []).map((image) => encodeBlock(image, cloak)),
+        ...documents,
+        ...(b.native ?? []).map((part) => encodeBlock(part, cloak))
+      ];
       return {
         type: "tool_result",
         tool_use_id: b.toolUseId,
-        content: b.content,
+        content: parts.length === 0 ? text : [...text.length > 0 ? [{ type: "text", text }] : [], ...parts],
         is_error: b.isError,
         ...cache
       };
+    }
     case "providerNative":
       if (b.provider !== "anthropic") {
         throw new GatewayError("INTERNAL", `anthropic adapter received a ${b.provider} provider-native block`);
@@ -32845,6 +32924,17 @@ function toWire(req, model, opts) {
   const systemCache = systemCacheControl(req);
   if (systemCache.lost)
     note("anthropic:system-turn-cache-control-dropped");
+  for (const m of req.messages) {
+    for (const b of m.content) {
+      if (b.type === "toolResult" && b.files !== undefined) {
+        const files = splitFiles(b.files, (t) => t === "application/pdf");
+        if (files.text.length > 0)
+          note("anthropic:tool-result-files-inlined");
+        if (files.dropped)
+          note("anthropic:files-dropped");
+      }
+    }
+  }
   const body = {
     model,
     messages: req.messages.flatMap((m) => {
@@ -33929,17 +34019,28 @@ function toAntigravityWire(req, model, identity) {
           });
           break;
         case "toolResult": {
+          if (block.native !== undefined)
+            note("antigravity:provider-native-block-dropped");
           const name = names.get(block.toolUseId);
           if (name === undefined)
             note("antigravity:tool-result-unmatched");
           if (block.isError === true)
             note("antigravity:tool-result-error-flag-dropped");
+          const files = splitFiles(block.files ?? [], () => true);
+          if (files.text.length > 0)
+            note("antigravity:tool-result-files-inlined");
           parts.push({
             functionResponse: {
               name: cloakName2(cloak, name ?? block.toolUseId),
-              response: { output: block.content }
+              response: { output: withFileText(block.content, files.text) }
             }
           });
+          for (const image of block.images ?? []) {
+            parts.push({ inlineData: { mimeType: image.mediaType, data: image.data } });
+          }
+          for (const file2 of files.carried) {
+            parts.push({ inlineData: { mimeType: file2.mediaType, data: file2.data } });
+          }
           role = "user";
           break;
         }
@@ -35743,13 +35844,23 @@ function toCustomChatWire(req, model) {
             function: { name: block.name, arguments: JSON.stringify(block.input) }
           });
           break;
-        case "toolResult":
+        case "toolResult": {
+          if (block.native !== undefined)
+            note("custom:anthropic-native-block-dropped");
+          const files = splitFiles(block.files ?? [], () => false);
           messages.push({
             role: "tool",
             tool_call_id: block.toolUseId,
-            content: block.content
+            content: withFileText(block.content, files.text)
           });
+          if (block.images !== undefined)
+            note("custom:images-dropped");
+          if (files.text.length > 0)
+            note("custom:tool-result-files-inlined");
+          if (files.dropped)
+            note("custom:files-dropped");
           break;
+        }
         case "providerNative":
           note("custom:anthropic-native-block-dropped");
           break;
@@ -35863,14 +35974,35 @@ function toCustomResponsesWire(req, model) {
             arguments: JSON.stringify(block.input)
           });
           break;
-        case "toolResult":
+        case "toolResult": {
+          if (block.native !== undefined)
+            note("custom:anthropic-native-block-dropped");
           flush();
+          const files = responsesFiles(block.files ?? []);
           input2.push({
             type: "function_call_output",
             call_id: block.toolUseId,
-            output: block.content
+            output: withFileText(block.content, files.text)
           });
+          if (block.images !== undefined) {
+            note("custom:tool-result-images-moved");
+            for (const image of block.images) {
+              parts.push({
+                type: "input_image",
+                image_url: `data:${image.mediaType};base64,${image.data}`
+              });
+            }
+          }
+          if (files.parts.length > 0) {
+            note("custom:tool-result-files-moved");
+            parts.push(...files.parts);
+          }
+          if (files.text.length > 0)
+            note("custom:tool-result-files-inlined");
+          if (files.dropped)
+            note("custom:files-dropped");
           break;
+        }
         case "providerNative":
           note("custom:anthropic-native-block-dropped");
           break;
@@ -36228,14 +36360,35 @@ function toGrokWire(req, model) {
             arguments: JSON.stringify(block.input)
           });
           break;
-        case "toolResult":
+        case "toolResult": {
+          if (block.native !== undefined)
+            note("grok:anthropic-native-block-dropped");
           flush();
+          const files = responsesFiles(block.files ?? []);
           input2.push({
             type: "function_call_output",
             call_id: block.toolUseId,
-            output: block.content
+            output: withFileText(block.content, files.text)
           });
+          if (block.images !== undefined) {
+            note("grok:tool-result-images-moved");
+            for (const image of block.images) {
+              parts.push({
+                type: "input_image",
+                image_url: `data:${image.mediaType};base64,${image.data}`
+              });
+            }
+          }
+          if (files.parts.length > 0) {
+            note("grok:tool-result-files-moved");
+            parts.push(...files.parts);
+          }
+          if (files.text.length > 0)
+            note("grok:tool-result-files-inlined");
+          if (files.dropped)
+            note("grok:files-dropped");
           break;
+        }
         case "providerNative":
           note("grok:anthropic-native-block-dropped");
           break;
@@ -36642,6 +36795,7 @@ function toKiloWire(req, model) {
   for (const message of req.messages) {
     let parts = [];
     const toolCalls = [];
+    const toolImages = [];
     const flush = () => {
       if (toolCalls.length > 0) {
         messages.push({ role: message.role, content: collapse(parts), tool_calls: [...toolCalls] });
@@ -36672,20 +36826,47 @@ function toKiloWire(req, model) {
             function: { name: block.name, arguments: JSON.stringify(block.input) }
           });
           break;
-        case "toolResult":
+        case "toolResult": {
+          if (block.native !== undefined)
+            note("kilo:anthropic-native-block-dropped");
           flush();
+          const files = splitFiles(block.files ?? [], (t) => t === "application/pdf");
           messages.push({
             role: "tool",
             tool_call_id: block.toolUseId,
-            content: block.content
+            content: withFileText(block.content, files.text)
           });
+          if (files.text.length > 0)
+            note("kilo:tool-result-files-inlined");
+          if (files.dropped)
+            note("kilo:files-dropped");
+          for (const image of block.images ?? []) {
+            note("kilo:tool-result-images-moved");
+            toolImages.push({
+              type: "image_url",
+              image_url: { url: `data:${image.mediaType};base64,${image.data}` }
+            });
+          }
+          for (const file2 of files.carried) {
+            note("kilo:tool-result-files-moved");
+            toolImages.push({
+              type: "file",
+              file: {
+                filename: fileName(file2),
+                file_data: `data:${file2.mediaType};base64,${file2.data}`
+              }
+            });
+          }
           break;
+        }
         case "providerNative":
           note("kilo:anthropic-native-block-dropped");
           break;
       }
     }
     flush();
+    if (toolImages.length > 0)
+      messages.push({ role: "user", content: toolImages });
   }
   const body = {
     model,
@@ -36931,13 +37112,23 @@ function toChatWire(req, model, vendor = "kimi") {
             function: { name: block.name, arguments: JSON.stringify(block.input) }
           });
           break;
-        case "toolResult":
+        case "toolResult": {
+          if (block.native !== undefined)
+            note("kimi:anthropic-native-block-dropped");
+          const files = splitFiles(block.files ?? [], () => false);
           messages.push({
             role: "tool",
             tool_call_id: block.toolUseId,
-            content: block.content
+            content: withFileText(block.content, files.text)
           });
+          if (block.images !== undefined)
+            note("kimi:images-dropped");
+          if (files.text.length > 0)
+            note("kimi:tool-result-files-inlined");
+          if (files.dropped)
+            note("kimi:files-dropped");
           break;
+        }
         case "providerNative":
           note("kimi:anthropic-native-block-dropped");
           break;
@@ -37336,14 +37527,35 @@ function toMuseWire(req, model) {
             arguments: JSON.stringify(block.input)
           });
           break;
-        case "toolResult":
+        case "toolResult": {
+          if (block.native !== undefined)
+            note("muse:foreign-native-block-dropped");
           flush();
+          const files = responsesFiles(block.files ?? []);
           input2.push({
             type: "function_call_output",
             call_id: block.toolUseId,
-            output: block.content
+            output: withFileText(block.content, files.text)
           });
+          if (block.images !== undefined) {
+            note("muse:tool-result-images-moved");
+            for (const image of block.images) {
+              parts.push({
+                type: "input_image",
+                image_url: `data:${image.mediaType};base64,${image.data}`
+              });
+            }
+          }
+          if (files.parts.length > 0) {
+            note("muse:tool-result-files-moved");
+            parts.push(...files.parts);
+          }
+          if (files.text.length > 0)
+            note("muse:tool-result-files-inlined");
+          if (files.dropped)
+            note("muse:files-dropped");
           break;
+        }
         case "providerNative":
           if (block.provider === "muse") {
             flush();
@@ -37741,14 +37953,35 @@ function toResponsesWire(req, model, opts = { oauth: false }) {
             arguments: JSON.stringify(block.input)
           });
           break;
-        case "toolResult":
+        case "toolResult": {
+          if (block.native !== undefined)
+            note("openai:anthropic-native-block-dropped");
           flush();
+          const files = responsesFiles(block.files ?? []);
           input2.push({
             type: "function_call_output",
             call_id: block.toolUseId,
-            output: block.content
+            output: withFileText(block.content, files.text)
           });
+          if (block.images !== undefined) {
+            note("openai:tool-result-images-moved");
+            for (const image of block.images) {
+              parts.push({
+                type: "input_image",
+                image_url: `data:${image.mediaType};base64,${image.data}`
+              });
+            }
+          }
+          if (files.parts.length > 0) {
+            note("openai:tool-result-files-moved");
+            parts.push(...files.parts);
+          }
+          if (files.text.length > 0)
+            note("openai:tool-result-files-inlined");
+          if (files.dropped)
+            note("openai:files-dropped");
           break;
+        }
         case "providerNative":
           if (block.provider === "openai") {
             flush();
@@ -38265,12 +38498,15 @@ function requiredProviders(request2) {
     for (const block of message.content) {
       if (block.type === "providerNative")
         owners.add(block.provider);
+      if (block.type === "toolResult")
+        for (const n of block.native ?? [])
+          owners.add(n.provider);
     }
   }
   return owners;
 }
 function requiredCapabilities(request2) {
-  const hasImage = (blocks) => blocks.some((b) => b.type === "image");
+  const hasImage = (blocks) => blocks.some((b) => b.type === "image" || b.type === "toolResult" && (b.images !== undefined || b.files !== undefined));
   const images = hasImage(request2.system ?? []) || request2.messages.some((m) => hasImage(m.content));
   return {
     tools: (request2.tools?.length ?? 0) > 0,
@@ -60822,18 +61058,84 @@ var KNOWN = [
   "thinking",
   "metadata"
 ];
-function flattenToolResult(content) {
+var TOOL_RESULT_NATIVE = new Set(["document", "search_result"]);
+function readToolResult(content) {
   if (typeof content === "string")
-    return content;
+    return { content };
   if (!Array.isArray(content))
-    return "";
-  return content.map((part) => {
-    if (typeof part === "string")
-      return part;
+    return { content: "" };
+  const text = [];
+  const images = [];
+  const files = [];
+  const native = [];
+  for (const part of content) {
+    if (typeof part === "string") {
+      text.push(part);
+      continue;
+    }
+    const image = imageBlock.safeParse(part);
+    if (image.success) {
+      images.push({
+        type: "image",
+        mediaType: image.data.source.media_type,
+        data: image.data.source.data,
+        ...irCacheControl(image.data.cache_control)
+      });
+      continue;
+    }
     const p = part !== null && typeof part === "object" ? part : undefined;
-    return p?.type === "text" && typeof p.text === "string" ? p.text : JSON.stringify(part);
-  }).join(`
-`);
+    const nativeSchema = p?.type !== undefined && TOOL_RESULT_NATIVE.has(p.type) ? nativeSchemas[p.type] : undefined;
+    const parsed2 = nativeSchema?.safeParse(part);
+    if (p?.type === "document" && parsed2?.success === true) {
+      const portable = portableDocument(parsed2.data);
+      if (portable !== undefined) {
+        if (typeof portable === "string")
+          text.push(portable);
+        else
+          files.push(portable);
+        continue;
+      }
+    }
+    if (p?.type !== undefined && parsed2?.success === true) {
+      const { type: _type, cache_control, ...data } = parsed2.data;
+      native.push({
+        type: "providerNative",
+        provider: "anthropic",
+        blockType: p.type,
+        data,
+        ...cache_control === undefined || cache_control === null ? {} : irCacheControl(cache_control)
+      });
+      continue;
+    }
+    text.push(p?.type === "text" && typeof p.text === "string" ? p.text : JSON.stringify(part));
+  }
+  return {
+    content: text.join(`
+`),
+    ...images.length > 0 && { images },
+    ...files.length > 0 && { files },
+    ...native.length > 0 && { native }
+  };
+}
+function portableDocument(doc2) {
+  if (doc2.citations !== undefined && doc2.citations !== null || doc2.context !== undefined && doc2.context !== null || doc2.cache_control !== undefined && doc2.cache_control !== null) {
+    return;
+  }
+  const source = doc2.source;
+  const title = typeof doc2.title === "string" ? doc2.title : undefined;
+  if (source.type === "base64" && typeof source.data === "string") {
+    return {
+      type: "file",
+      mediaType: "application/pdf",
+      data: source.data,
+      ...title !== undefined && { filename: title }
+    };
+  }
+  if (source.type === "text" && typeof source.data === "string") {
+    return title === undefined ? source.data : `${title}
+${source.data}`;
+  }
+  return;
 }
 function toIrBlock(b) {
   switch (b.type) {
@@ -60869,7 +61171,7 @@ function toIrBlock(b) {
       return {
         type: "toolResult",
         toolUseId: b.tool_use_id,
-        content: flattenToolResult(b.content),
+        ...readToolResult(b.content),
         isError: b.is_error ?? false,
         ...irCacheControl(b.cache_control)
       };
@@ -61174,13 +61476,17 @@ function parseOpenAIRequest(body2, headers) {
       if (m.tool_call_id === undefined) {
         throw new GatewayError("BAD_REQUEST", "messages: tool message requires tool_call_id");
       }
+      const parts = contentBlocks(Array.isArray(m.content) ? m.content.filter((p) => p.type !== "image_url" || p.image_url.url.startsWith("data:")) : m.content);
+      const images = parts.filter((b) => b.type === "image");
       messages.push({
         role: "user",
         content: [
           {
             type: "toolResult",
             toolUseId: m.tool_call_id,
-            content: typeof m.content === "string" ? m.content : "",
+            content: typeof m.content === "string" ? m.content : parts.flatMap((b) => b.type === "text" ? [b.text] : []).join(`
+`),
+            ...images.length > 0 && { images },
             isError: false,
             ...looseCacheControl(m.cache_control)
           }
@@ -61334,6 +61640,45 @@ function contentPart(part2) {
   }
   throw new GatewayError("BAD_REQUEST", `input: unsupported content part type "${safeToken(type)}"`);
 }
+function readToolOutput(output2) {
+  if (typeof output2 === "string")
+    return { content: output2 };
+  if (!Array.isArray(output2))
+    return { content: JSON.stringify(output2 ?? "") };
+  const text = [];
+  const images = [];
+  const files = [];
+  for (const part2 of output2) {
+    if (isRecord9(part2) && (part2.type === "input_text" || part2.type === "output_text")) {
+      text.push(String(part2.text ?? ""));
+    } else if (isRecord9(part2) && part2.type === "input_image" && typeof part2.image_url === "string" && part2.image_url.startsWith("data:")) {
+      images.push({ type: "image", ...parseDataUrl(part2.image_url) });
+    } else if (isRecord9(part2) && part2.type === "input_file" && typeof part2.file_data === "string") {
+      files.push({
+        type: "file",
+        ...fileData(part2.file_data),
+        ...typeof part2.filename === "string" && { filename: part2.filename }
+      });
+    } else {
+      text.push(JSON.stringify(part2));
+    }
+  }
+  return {
+    content: text.join(`
+`),
+    ...images.length > 0 && { images },
+    ...files.length > 0 && { files }
+  };
+}
+function fileData(raw) {
+  const url2 = /^data:([^;,]+);base64,(.*)$/s.exec(raw);
+  if (url2 !== null)
+    return { mediaType: url2[1], data: url2[2] };
+  return {
+    mediaType: raw.startsWith("JVBERi") ? "application/pdf" : "application/octet-stream",
+    data: raw
+  };
+}
 function messageBlocks(content) {
   if (typeof content === "string")
     return [{ type: "text", text: content }];
@@ -61390,7 +61735,7 @@ function readInputItems(items) {
           {
             type: "toolResult",
             toolUseId: clampCallId(callId),
-            content: typeof raw.output === "string" ? raw.output : JSON.stringify(raw.output ?? ""),
+            ...readToolOutput(raw.output),
             isError: false
           }
         ]);
@@ -62779,7 +63124,7 @@ function createRing(limits = DEFAULT_RING_LIMITS) {
 }
 
 // apps/gateway/src/version.ts
-var VERSION = "0.12.10";
+var VERSION = "0.12.12";
 
 // apps/gateway/src/app.ts
 var ADMIN_SESSION_TTL_MS = 12 * 60 * 60 * 1000;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "omnigateway",
-  "version": "0.12.10",
+  "version": "0.12.12",
   "description": "Self-hosted AI gateway with Anthropic- and OpenAI-compatible APIs, an admin console, and a CLI",
   "license": "MIT",
   "author": "Harismawan <mail@harismawan.com>",