@anuma/sdk 6.26.2 → 6.27.1

package/dist/react/index.cjs

@@ -5844,6 +5844,116 @@ async function chunkAndEmbedAllMessages(ctx, options, filter) {
 
 // src/lib/chat/toolLoop.ts
 init_redactor();
+
+// src/lib/storage/mcpImages.ts
+var IMAGE_TOOL_NAMES = /* @__PURE__ */ new Set([
+  "AnumaMediaMCP-anuma_create_image",
+  "anuma_create_image",
+  // Deprecated anuma-image-mcp tools, retained so images in already-stored
+  // conversations still re-materialize on replay.
+  "AnumaImageMCP-generate_cloud_image",
+  "AnumaImageMCP-edit_cloud_image",
+  "generate_cloud_image",
+  "edit_cloud_image"
+]);
+function toolOutputForModel(name, output) {
+  if (!name || !IMAGE_TOOL_NAMES.has(name)) return output;
+  try {
+    const {
+      imageUrl: _imageUrl,
+      url: _url,
+      output_images: _outputImages,
+      ...rest
+    } = JSON.parse(output);
+    return JSON.stringify(rest);
+  } catch {
+    return output;
+  }
+}
+var VIDEO_TOOL_NAMES = /* @__PURE__ */ new Set([
+  "AnumaMediaMCP-anuma_create_video",
+  "AnumaFalMCP-fal_generate_video",
+  "anuma_create_video",
+  "fal_generate_video"
+]);
+var VIDEO_EXTENSIONS = ["mp4", "webm", "mov"];
+var VIDEO_EXTENSION_RE = new RegExp(`\\.(${VIDEO_EXTENSIONS.join("|")})(?:[?#]|$)`, "i");
+function videoExtensionOf(value) {
+  return value?.match(VIDEO_EXTENSION_RE)?.[1]?.toLowerCase() ?? null;
+}
+function classifyUrl(url) {
+  return VIDEO_EXTENSION_RE.test(url) ? "video" : "image";
+}
+function extractMCPImageUrls(content, toolCallEvents, mcpR2Domain) {
+  const urls = [];
+  if (toolCallEvents && toolCallEvents.length > 0) {
+    for (const event of toolCallEvents) {
+      if (!event.name) continue;
+      if (IMAGE_TOOL_NAMES.has(event.name)) {
+        try {
+          const output = JSON.parse(event.output || "{}");
+          const model = output.model || "image";
+          const imageUrls = [
+            ...new Set(
+              [
+                ...output.output_images?.map((i) => i.url) ?? [],
+                output.imageUrl,
+                output.url
+              ].filter((u) => Boolean(u))
+            )
+          ];
+          for (const url of imageUrls) {
+            urls.push({ url, model, mediaType: "image" });
+          }
+        } catch {
+        }
+      } else if (VIDEO_TOOL_NAMES.has(event.name)) {
+        try {
+          const output = JSON.parse(event.output || "{}");
+          const model = output.model || "video";
+          const videoUrls = [
+            ...new Set(
+              [
+                ...output.videos?.map((v) => v.video_url) ?? [],
+                output.videoUrl,
+                output.url
+              ].filter((u) => Boolean(u))
+            )
+          ];
+          for (const url of videoUrls) {
+            urls.push({ url, model, mediaType: "video" });
+          }
+        } catch {
+        }
+      }
+    }
+  }
+  if (urls.length === 0 && content) {
+    const escaped = mcpR2Domain.replace(/\./g, "\\.");
+    const patterns = [
+      new RegExp(`https://${escaped}[^\\s"'<>)\\]]+`, "gi"),
+      // Require the proxy's <svc>/<token> shape (>=2 path segments after
+      // /api/v1/media/) so a third-party URL that only shallowly contains
+      // /api/v1/media/ isn't returned as a portal media asset.
+      new RegExp(`https?://[^\\s"'<>)\\]]+/api/v1/media/[^/\\s"'<>)\\]]+/[^\\s"'<>)\\]]+`, "gi")
+    ];
+    const matches = patterns.flatMap((re) => content.match(re) ?? []);
+    if (matches.length > 0) {
+      const seen = /* @__PURE__ */ new Set();
+      for (const url of matches) {
+        const normalized = url.replace(/[)"'>\s]+$/, "");
+        if (!seen.has(normalized)) {
+          seen.add(normalized);
+          const mediaType = classifyUrl(normalized);
+          urls.push({ url: normalized, model: "image", mediaType });
+        }
+      }
+    }
+  }
+  return urls;
+}
+
+// src/lib/chat/toolLoop.ts
 init_endpointOverride();
 
 // src/lib/chat/runHooks.ts
@@ -7977,6 +8087,40 @@ function extractLastUserText(messages) {
 function isToolErrorResult(result) {
   return result !== null && typeof result === "object" && "error" in result && typeof result.error === "string";
 }
+function serverToolCallMessages(events, messages, skipIds) {
+  const seen = new Set(skipIds);
+  for (const m of messages) {
+    if (m.tool_call_id) seen.add(m.tool_call_id);
+    for (const tc of m.tool_calls ?? []) if (tc.id) seen.add(tc.id);
+  }
+  const executed = [];
+  for (const event of events ?? []) {
+    if (!event.id || event.output === void 0 || event.output === null || seen.has(event.id)) {
+      continue;
+    }
+    seen.add(event.id);
+    executed.push(event);
+  }
+  if (executed.length === 0) return [];
+  return [
+    {
+      role: "assistant",
+      content: void 0,
+      tool_calls: executed.map((event) => ({
+        id: event.id,
+        type: "function",
+        function: { name: event.name, arguments: event.arguments }
+      }))
+    },
+    ...executed.map(
+      (event) => ({
+        role: "tool",
+        tool_call_id: event.id,
+        content: [{ type: "text", text: toolOutputForModel(event.name, event.output ?? "") }]
+      })
+    )
+  ];
+}
 function getToolName(tool) {
   const func = tool.function;
   const nestedName = func?.name;
@@ -8746,7 +8890,14 @@ Executing tool: ${toolInfo}
           }
         }))
       };
-      const toolResultMessages = [assistantMessage];
+      const toolResultMessages = [
+        ...serverToolCallMessages(
+          currentAccumulator.toolCallEvents,
+          currentMessages,
+          new Set(toolCallsToExecute.map((tc) => tc.id))
+        ),
+        assistantMessage
+      ];
       for (const execResult of continueResults) {
         const resultContent = execResult.error ? `Error: ${execResult.error}` : safeJsonStringify(execResult.result);
         toolResultMessages.push({
@@ -11423,100 +11574,6 @@ function isSupportedMediaType(mimeType) {
 var import_watermelondb8 = require("@nozbe/watermelondb");
 init_logger();
 
-// src/lib/storage/mcpImages.ts
-var IMAGE_TOOL_NAMES = /* @__PURE__ */ new Set([
-  "AnumaMediaMCP-anuma_create_image",
-  "anuma_create_image",
-  // Deprecated anuma-image-mcp tools, retained so images in already-stored
-  // conversations still re-materialize on replay.
-  "AnumaImageMCP-generate_cloud_image",
-  "AnumaImageMCP-edit_cloud_image",
-  "generate_cloud_image",
-  "edit_cloud_image"
-]);
-var VIDEO_TOOL_NAMES = /* @__PURE__ */ new Set([
-  "AnumaMediaMCP-anuma_create_video",
-  "AnumaFalMCP-fal_generate_video",
-  "anuma_create_video",
-  "fal_generate_video"
-]);
-var VIDEO_EXTENSIONS = ["mp4", "webm", "mov"];
-var VIDEO_EXTENSION_RE = new RegExp(`\\.(${VIDEO_EXTENSIONS.join("|")})(?:[?#]|$)`, "i");
-function videoExtensionOf(value) {
-  return value?.match(VIDEO_EXTENSION_RE)?.[1]?.toLowerCase() ?? null;
-}
-function classifyUrl(url) {
-  return VIDEO_EXTENSION_RE.test(url) ? "video" : "image";
-}
-function extractMCPImageUrls(content, toolCallEvents, mcpR2Domain) {
-  const urls = [];
-  if (toolCallEvents && toolCallEvents.length > 0) {
-    for (const event of toolCallEvents) {
-      if (!event.name) continue;
-      if (IMAGE_TOOL_NAMES.has(event.name)) {
-        try {
-          const output = JSON.parse(event.output || "{}");
-          const model = output.model || "image";
-          const imageUrls = [
-            ...new Set(
-              [
-                ...output.output_images?.map((i) => i.url) ?? [],
-                output.imageUrl,
-                output.url
-              ].filter((u) => Boolean(u))
-            )
-          ];
-          for (const url of imageUrls) {
-            urls.push({ url, model, mediaType: "image" });
-          }
-        } catch {
-        }
-      } else if (VIDEO_TOOL_NAMES.has(event.name)) {
-        try {
-          const output = JSON.parse(event.output || "{}");
-          const model = output.model || "video";
-          const videoUrls = [
-            ...new Set(
-              [
-                ...output.videos?.map((v) => v.video_url) ?? [],
-                output.videoUrl,
-                output.url
-              ].filter((u) => Boolean(u))
-            )
-          ];
-          for (const url of videoUrls) {
-            urls.push({ url, model, mediaType: "video" });
-          }
-        } catch {
-        }
-      }
-    }
-  }
-  if (urls.length === 0 && content) {
-    const escaped = mcpR2Domain.replace(/\./g, "\\.");
-    const patterns = [
-      new RegExp(`https://${escaped}[^\\s"'<>)\\]]+`, "gi"),
-      // Require the proxy's <svc>/<token> shape (>=2 path segments after
-      // /api/v1/media/) so a third-party URL that only shallowly contains
-      // /api/v1/media/ isn't returned as a portal media asset.
-      new RegExp(`https?://[^\\s"'<>)\\]]+/api/v1/media/[^/\\s"'<>)\\]]+/[^\\s"'<>)\\]]+`, "gi")
-    ];
-    const matches = patterns.flatMap((re) => content.match(re) ?? []);
-    if (matches.length > 0) {
-      const seen = /* @__PURE__ */ new Set();
-      for (const url of matches) {
-        const normalized = url.replace(/[)"'>\s]+$/, "");
-        if (!seen.has(normalized)) {
-          seen.add(normalized);
-          const mediaType = classifyUrl(normalized);
-          urls.push({ url: normalized, model: "image", mediaType });
-        }
-      }
-    }
-  }
-  return urls;
-}
-
 // src/lib/storage/opfs.ts
 init_logger();
 var FILE_PLACEHOLDER_PREFIX = "__SDKFILE__";
@@ -23976,24 +24033,10 @@ async function storedToLlmapiMessage(stored, encryptionKey, resolveMediaByIds) {
     });
     for (const event of stored.toolCallEvents) {
       if (event.id && event.output !== void 0 && event.output !== null) {
-        let toolOutput = event.output;
-        if (event.name && IMAGE_TOOL_NAMES.has(event.name)) {
-          try {
-            const parsed = JSON.parse(toolOutput);
-            const {
-              imageUrl: _imageUrl,
-              url: _url,
-              output_images: _outputImages,
-              ...rest
-            } = parsed;
-            toolOutput = JSON.stringify(rest);
-          } catch {
-          }
-        }
         messages.push({
           role: "tool",
           tool_call_id: event.id,
-          content: [{ type: "text", text: toolOutput }]
+          content: [{ type: "text", text: toolOutputForModel(event.name, event.output) }]
         });
       }
     }

package/dist/react/index.mjs

@@ -3986,6 +3986,114 @@ async function chunkAndEmbedAllMessages(ctx, options, filter) {
   return embeddedCount;
 }
 
+// src/lib/storage/mcpImages.ts
+var IMAGE_TOOL_NAMES = /* @__PURE__ */ new Set([
+  "AnumaMediaMCP-anuma_create_image",
+  "anuma_create_image",
+  // Deprecated anuma-image-mcp tools, retained so images in already-stored
+  // conversations still re-materialize on replay.
+  "AnumaImageMCP-generate_cloud_image",
+  "AnumaImageMCP-edit_cloud_image",
+  "generate_cloud_image",
+  "edit_cloud_image"
+]);
+function toolOutputForModel(name, output) {
+  if (!name || !IMAGE_TOOL_NAMES.has(name)) return output;
+  try {
+    const {
+      imageUrl: _imageUrl,
+      url: _url,
+      output_images: _outputImages,
+      ...rest
+    } = JSON.parse(output);
+    return JSON.stringify(rest);
+  } catch {
+    return output;
+  }
+}
+var VIDEO_TOOL_NAMES = /* @__PURE__ */ new Set([
+  "AnumaMediaMCP-anuma_create_video",
+  "AnumaFalMCP-fal_generate_video",
+  "anuma_create_video",
+  "fal_generate_video"
+]);
+var VIDEO_EXTENSIONS = ["mp4", "webm", "mov"];
+var VIDEO_EXTENSION_RE = new RegExp(`\\.(${VIDEO_EXTENSIONS.join("|")})(?:[?#]|$)`, "i");
+function videoExtensionOf(value) {
+  return value?.match(VIDEO_EXTENSION_RE)?.[1]?.toLowerCase() ?? null;
+}
+function classifyUrl(url) {
+  return VIDEO_EXTENSION_RE.test(url) ? "video" : "image";
+}
+function extractMCPImageUrls(content, toolCallEvents, mcpR2Domain) {
+  const urls = [];
+  if (toolCallEvents && toolCallEvents.length > 0) {
+    for (const event of toolCallEvents) {
+      if (!event.name) continue;
+      if (IMAGE_TOOL_NAMES.has(event.name)) {
+        try {
+          const output = JSON.parse(event.output || "{}");
+          const model = output.model || "image";
+          const imageUrls = [
+            ...new Set(
+              [
+                ...output.output_images?.map((i) => i.url) ?? [],
+                output.imageUrl,
+                output.url
+              ].filter((u) => Boolean(u))
+            )
+          ];
+          for (const url of imageUrls) {
+            urls.push({ url, model, mediaType: "image" });
+          }
+        } catch {
+        }
+      } else if (VIDEO_TOOL_NAMES.has(event.name)) {
+        try {
+          const output = JSON.parse(event.output || "{}");
+          const model = output.model || "video";
+          const videoUrls = [
+            ...new Set(
+              [
+                ...output.videos?.map((v) => v.video_url) ?? [],
+                output.videoUrl,
+                output.url
+              ].filter((u) => Boolean(u))
+            )
+          ];
+          for (const url of videoUrls) {
+            urls.push({ url, model, mediaType: "video" });
+          }
+        } catch {
+        }
+      }
+    }
+  }
+  if (urls.length === 0 && content) {
+    const escaped = mcpR2Domain.replace(/\./g, "\\.");
+    const patterns = [
+      new RegExp(`https://${escaped}[^\\s"'<>)\\]]+`, "gi"),
+      // Require the proxy's <svc>/<token> shape (>=2 path segments after
+      // /api/v1/media/) so a third-party URL that only shallowly contains
+      // /api/v1/media/ isn't returned as a portal media asset.
+      new RegExp(`https?://[^\\s"'<>)\\]]+/api/v1/media/[^/\\s"'<>)\\]]+/[^\\s"'<>)\\]]+`, "gi")
+    ];
+    const matches = patterns.flatMap((re) => content.match(re) ?? []);
+    if (matches.length > 0) {
+      const seen = /* @__PURE__ */ new Set();
+      for (const url of matches) {
+        const normalized = url.replace(/[)"'>\s]+$/, "");
+        if (!seen.has(normalized)) {
+          seen.add(normalized);
+          const mediaType = classifyUrl(normalized);
+          urls.push({ url: normalized, model: "image", mediaType });
+        }
+      }
+    }
+  }
+  return urls;
+}
+
 // src/lib/chat/runHooks.ts
 function composeHooks(hooks) {
   const handlers = hooks.filter((h) => h !== void 0 && h !== null);
@@ -6116,6 +6224,40 @@ function extractLastUserText(messages) {
 function isToolErrorResult(result) {
   return result !== null && typeof result === "object" && "error" in result && typeof result.error === "string";
 }
+function serverToolCallMessages(events, messages, skipIds) {
+  const seen = new Set(skipIds);
+  for (const m of messages) {
+    if (m.tool_call_id) seen.add(m.tool_call_id);
+    for (const tc of m.tool_calls ?? []) if (tc.id) seen.add(tc.id);
+  }
+  const executed = [];
+  for (const event of events ?? []) {
+    if (!event.id || event.output === void 0 || event.output === null || seen.has(event.id)) {
+      continue;
+    }
+    seen.add(event.id);
+    executed.push(event);
+  }
+  if (executed.length === 0) return [];
+  return [
+    {
+      role: "assistant",
+      content: void 0,
+      tool_calls: executed.map((event) => ({
+        id: event.id,
+        type: "function",
+        function: { name: event.name, arguments: event.arguments }
+      }))
+    },
+    ...executed.map(
+      (event) => ({
+        role: "tool",
+        tool_call_id: event.id,
+        content: [{ type: "text", text: toolOutputForModel(event.name, event.output ?? "") }]
+      })
+    )
+  ];
+}
 function getToolName(tool) {
   const func = tool.function;
   const nestedName = func?.name;
@@ -6885,7 +7027,14 @@ Executing tool: ${toolInfo}
           }
         }))
       };
-      const toolResultMessages = [assistantMessage];
+      const toolResultMessages = [
+        ...serverToolCallMessages(
+          currentAccumulator.toolCallEvents,
+          currentMessages,
+          new Set(toolCallsToExecute.map((tc) => tc.id))
+        ),
+        assistantMessage
+      ];
       for (const execResult of continueResults) {
         const resultContent = execResult.error ? `Error: ${execResult.error}` : safeJsonStringify(execResult.result);
         toolResultMessages.push({
@@ -9568,100 +9717,6 @@ function isSupportedMediaType(mimeType) {
 // src/lib/db/media/operations.ts
 import { Q as Q4 } from "@nozbe/watermelondb";
 
-// src/lib/storage/mcpImages.ts
-var IMAGE_TOOL_NAMES = /* @__PURE__ */ new Set([
-  "AnumaMediaMCP-anuma_create_image",
-  "anuma_create_image",
-  // Deprecated anuma-image-mcp tools, retained so images in already-stored
-  // conversations still re-materialize on replay.
-  "AnumaImageMCP-generate_cloud_image",
-  "AnumaImageMCP-edit_cloud_image",
-  "generate_cloud_image",
-  "edit_cloud_image"
-]);
-var VIDEO_TOOL_NAMES = /* @__PURE__ */ new Set([
-  "AnumaMediaMCP-anuma_create_video",
-  "AnumaFalMCP-fal_generate_video",
-  "anuma_create_video",
-  "fal_generate_video"
-]);
-var VIDEO_EXTENSIONS = ["mp4", "webm", "mov"];
-var VIDEO_EXTENSION_RE = new RegExp(`\\.(${VIDEO_EXTENSIONS.join("|")})(?:[?#]|$)`, "i");
-function videoExtensionOf(value) {
-  return value?.match(VIDEO_EXTENSION_RE)?.[1]?.toLowerCase() ?? null;
-}
-function classifyUrl(url) {
-  return VIDEO_EXTENSION_RE.test(url) ? "video" : "image";
-}
-function extractMCPImageUrls(content, toolCallEvents, mcpR2Domain) {
-  const urls = [];
-  if (toolCallEvents && toolCallEvents.length > 0) {
-    for (const event of toolCallEvents) {
-      if (!event.name) continue;
-      if (IMAGE_TOOL_NAMES.has(event.name)) {
-        try {
-          const output = JSON.parse(event.output || "{}");
-          const model = output.model || "image";
-          const imageUrls = [
-            ...new Set(
-              [
-                ...output.output_images?.map((i) => i.url) ?? [],
-                output.imageUrl,
-                output.url
-              ].filter((u) => Boolean(u))
-            )
-          ];
-          for (const url of imageUrls) {
-            urls.push({ url, model, mediaType: "image" });
-          }
-        } catch {
-        }
-      } else if (VIDEO_TOOL_NAMES.has(event.name)) {
-        try {
-          const output = JSON.parse(event.output || "{}");
-          const model = output.model || "video";
-          const videoUrls = [
-            ...new Set(
-              [
-                ...output.videos?.map((v) => v.video_url) ?? [],
-                output.videoUrl,
-                output.url
-              ].filter((u) => Boolean(u))
-            )
-          ];
-          for (const url of videoUrls) {
-            urls.push({ url, model, mediaType: "video" });
-          }
-        } catch {
-        }
-      }
-    }
-  }
-  if (urls.length === 0 && content) {
-    const escaped = mcpR2Domain.replace(/\./g, "\\.");
-    const patterns = [
-      new RegExp(`https://${escaped}[^\\s"'<>)\\]]+`, "gi"),
-      // Require the proxy's <svc>/<token> shape (>=2 path segments after
-      // /api/v1/media/) so a third-party URL that only shallowly contains
-      // /api/v1/media/ isn't returned as a portal media asset.
-      new RegExp(`https?://[^\\s"'<>)\\]]+/api/v1/media/[^/\\s"'<>)\\]]+/[^\\s"'<>)\\]]+`, "gi")
-    ];
-    const matches = patterns.flatMap((re) => content.match(re) ?? []);
-    if (matches.length > 0) {
-      const seen = /* @__PURE__ */ new Set();
-      for (const url of matches) {
-        const normalized = url.replace(/[)"'>\s]+$/, "");
-        if (!seen.has(normalized)) {
-          seen.add(normalized);
-          const mediaType = classifyUrl(normalized);
-          urls.push({ url: normalized, model: "image", mediaType });
-        }
-      }
-    }
-  }
-  return urls;
-}
-
 // src/lib/storage/opfs.ts
 var FILE_PLACEHOLDER_PREFIX = "__SDKFILE__";
 var FILE_PLACEHOLDER_SUFFIX = "__";
@@ -22053,24 +22108,10 @@ async function storedToLlmapiMessage(stored, encryptionKey, resolveMediaByIds) {
     });
     for (const event of stored.toolCallEvents) {
       if (event.id && event.output !== void 0 && event.output !== null) {
-        let toolOutput = event.output;
-        if (event.name && IMAGE_TOOL_NAMES.has(event.name)) {
-          try {
-            const parsed = JSON.parse(toolOutput);
-            const {
-              imageUrl: _imageUrl,
-              url: _url,
-              output_images: _outputImages,
-              ...rest
-            } = parsed;
-            toolOutput = JSON.stringify(rest);
-          } catch {
-          }
-        }
         messages.push({
           role: "tool",
           tool_call_id: event.id,
-          content: [{ type: "text", text: toolOutput }]
+          content: [{ type: "text", text: toolOutputForModel(event.name, event.output) }]
         });
       }
     }

package/dist/server/index.cjs

@@ -23358,6 +23358,30 @@ var import_watermelondb20 = __toESM(require_watermelondb());
 init_logger();
 
 // src/lib/storage/mcpImages.ts
+var IMAGE_TOOL_NAMES = /* @__PURE__ */ new Set([
+  "AnumaMediaMCP-anuma_create_image",
+  "anuma_create_image",
+  // Deprecated anuma-image-mcp tools, retained so images in already-stored
+  // conversations still re-materialize on replay.
+  "AnumaImageMCP-generate_cloud_image",
+  "AnumaImageMCP-edit_cloud_image",
+  "generate_cloud_image",
+  "edit_cloud_image"
+]);
+function toolOutputForModel(name, output) {
+  if (!name || !IMAGE_TOOL_NAMES.has(name)) return output;
+  try {
+    const {
+      imageUrl: _imageUrl,
+      url: _url,
+      output_images: _outputImages,
+      ...rest
+    } = JSON.parse(output);
+    return JSON.stringify(rest);
+  } catch {
+    return output;
+  }
+}
 var VIDEO_EXTENSIONS = ["mp4", "webm", "mov"];
 var VIDEO_EXTENSION_RE = new RegExp(`\\.(${VIDEO_EXTENSIONS.join("|")})(?:[?#]|$)`, "i");
 function videoExtensionOf(value) {
@@ -37102,6 +37126,40 @@ function extractLastUserText(messages) {
 function isToolErrorResult(result) {
   return result !== null && typeof result === "object" && "error" in result && typeof result.error === "string";
 }
+function serverToolCallMessages(events, messages, skipIds) {
+  const seen = new Set(skipIds);
+  for (const m of messages) {
+    if (m.tool_call_id) seen.add(m.tool_call_id);
+    for (const tc of m.tool_calls ?? []) if (tc.id) seen.add(tc.id);
+  }
+  const executed = [];
+  for (const event of events ?? []) {
+    if (!event.id || event.output === void 0 || event.output === null || seen.has(event.id)) {
+      continue;
+    }
+    seen.add(event.id);
+    executed.push(event);
+  }
+  if (executed.length === 0) return [];
+  return [
+    {
+      role: "assistant",
+      content: void 0,
+      tool_calls: executed.map((event) => ({
+        id: event.id,
+        type: "function",
+        function: { name: event.name, arguments: event.arguments }
+      }))
+    },
+    ...executed.map(
+      (event) => ({
+        role: "tool",
+        tool_call_id: event.id,
+        content: [{ type: "text", text: toolOutputForModel(event.name, event.output ?? "") }]
+      })
+    )
+  ];
+}
 function getToolName(tool) {
   const func = tool.function;
   const nestedName = func?.name;
@@ -37871,7 +37929,14 @@ Executing tool: ${toolInfo}
           }
         }))
       };
-      const toolResultMessages = [assistantMessage];
+      const toolResultMessages = [
+        ...serverToolCallMessages(
+          currentAccumulator.toolCallEvents,
+          currentMessages,
+          new Set(toolCallsToExecute.map((tc) => tc.id))
+        ),
+        assistantMessage
+      ];
       for (const execResult of continueResults) {
         const resultContent = execResult.error ? `Error: ${execResult.error}` : safeJsonStringify(execResult.result);
         toolResultMessages.push({