@mastra/client-js 1.24.0 → 1.25.0

package/dist/index.js

@@ -297,6 +297,40 @@ function requestContextQueryString(requestContext, delimiter = "?") {
   const queryString = searchParams.toString();
   return queryString ? `${delimiter}${queryString}` : "";
 }
+
+// src/utils/client-tool-model-output.ts
+function normalizeModelOutput(output) {
+  if (output == null || typeof output !== "object") return output;
+  const obj = output;
+  if (obj.type !== "content" || !Array.isArray(obj.value)) return output;
+  return {
+    ...obj,
+    value: obj.value.map((item) => {
+      if (item == null || typeof item !== "object") return item;
+      const part = item;
+      if (part.type === "image-url" && typeof part.url === "string") {
+        const semicolonIndex = part.url.indexOf(";");
+        const commaIndex = part.url.indexOf(",");
+        const mediaTypeEnd = semicolonIndex === -1 ? commaIndex : commaIndex === -1 ? semicolonIndex : Math.min(semicolonIndex, commaIndex);
+        const mediaType = typeof part.mediaType === "string" && part.mediaType ? part.mediaType : part.url.startsWith("data:") ? part.url.slice(5, mediaTypeEnd === -1 ? void 0 : mediaTypeEnd) || "image/jpeg" : "image/jpeg";
+        return { type: "media", data: part.url, mediaType };
+      }
+      if (part.type === "image-data" && typeof part.data === "string") {
+        return { type: "media", data: part.data, mediaType: part.mediaType ?? "image/jpeg" };
+      }
+      if (part.type === "file-data" && typeof part.data === "string") {
+        return { type: "media", data: part.data, mediaType: part.mediaType ?? "application/octet-stream" };
+      }
+      return part;
+    })
+  };
+}
+async function getClientToolModelOutput(clientTool, result) {
+  const toModelOutput = clientTool.toModelOutput;
+  if (typeof toModelOutput !== "function" || result == null) return void 0;
+  const modelOutput = await toModelOutput(result);
+  return modelOutput == null ? void 0 : normalizeModelOutput(modelOutput);
+}
 function isZodType(value) {
   return typeof value === "object" && value !== null && "_def" in value && "parse" in value && typeof value.parse === "function" && "safeParse" in value && typeof value.safeParse === "function";
 }
@@ -591,11 +625,15 @@ async function executeToolCallAndRespond({
             }
           }
         });
+        const modelOutput = await getClientToolModelOutput(clientTool, result);
         const toolResultContent = {
           type: "tool-result",
           toolCallId: toolCall.payload.toolCallId,
           toolName: toolCall.payload.toolName,
-          result
+          result,
+          // Carry the client-side toModelOutput result so the server uses it
+          // when building the model prompt, while result keeps the raw value.
+          ...modelOutput != null ? { providerOptions: { mastra: { modelOutput } } } : {}
         };
         if (observability) {
           toolResultContent.__mastraObservability = observability;
@@ -943,6 +981,7 @@ var Agent = class extends BaseResource {
             const clientTool = activeClientTools[toolCall.toolName];
             if (!clientTool || typeof clientTool.execute !== "function") continue;
             let result;
+            let modelOutput;
             let observability;
             try {
               const execution = await executeClientToolWithObservability({
@@ -966,8 +1005,14 @@ var Agent = class extends BaseResource {
               });
               result = execution.result;
               observability = execution.observability;
+              try {
+                modelOutput = await getClientToolModelOutput(clientTool, result);
+              } catch {
+                modelOutput = void 0;
+              }
             } catch (error) {
               result = { error: String(error) };
+              modelOutput = void 0;
             }
             const toolResultContent = {
               type: "tool-result",
@@ -993,6 +1038,9 @@ var Agent = class extends BaseResource {
               toolCallId: toolCall.toolCallId,
               toolName: toolCall.toolName,
               output: { type: "json", value: result },
+              // Carry the client-side toModelOutput result so the server uses it
+              // when building the model prompt, while output keeps the raw result.
+              ...modelOutput != null ? { providerOptions: { mastra: { modelOutput } } } : {},
               ...observability ? { __mastraObservability: observability } : {}
             };
             toolResultMessages.push({
@@ -1974,6 +2022,7 @@ var Agent = class extends BaseResource {
                 shouldExecuteClientTool = true;
                 const runId = streamRunId ?? toolCall2.toolCallId;
                 let result;
+                let modelOutput;
                 let observability;
                 let synthetic;
                 try {
@@ -1996,6 +2045,7 @@ var Agent = class extends BaseResource {
                       }
                     }
                   }));
+                  modelOutput = await getClientToolModelOutput(clientTool, result);
                   synthetic = {
                     type: "tool-result",
                     runId,
@@ -2054,6 +2104,14 @@ var Agent = class extends BaseResource {
                     result,
                     ...observability ? { __mastraObservability: observability } : {}
                   };
+                  if (modelOutput != null) {
+                    const partWithMetadata = toolInvocationPart;
+                    const existingMastra = partWithMetadata.providerMetadata?.mastra != null && typeof partWithMetadata.providerMetadata.mastra === "object" ? partWithMetadata.providerMetadata.mastra : {};
+                    partWithMetadata.providerMetadata = {
+                      ...partWithMetadata.providerMetadata,
+                      mastra: { ...existingMastra, modelOutput }
+                    };
+                  }
                 }
                 const toolInvocation = lastMessage?.toolInvocations?.find(
                   (toolInvocation2) => toolInvocation2.toolCallId === toolCall2.toolCallId
@@ -4809,6 +4867,15 @@ var StoredAgent = class extends BaseResource {
       body: params
     });
   }
+  /**
+   * Opens a source-provider change request for deterministic agent JSON without mutating storage.
+   */
+  openChangeRequest(params) {
+    return this.request(`/stored/agents/${encodeURIComponent(this.storedAgentId)}/change-request`, {
+      method: "POST",
+      body: params
+    });
+  }
   /**
    * Deletes the stored agent
    * @param requestContext - Optional request context to pass as query parameter