@mistralai/mistralai 1.9.19 → 1.10.0

package/src/lib/sdks.ts

@@ -47,12 +47,14 @@ export type RequestOptions = {
    */
   serverURL?: string | URL;
   /**
+   * @deprecated `fetchOptions` has been flattened into `RequestOptions`.
+   *
    * Sets various request options on the `fetch` call made by an SDK method.
    *
    * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/Request/Request#options|Request}
    */
   fetchOptions?: Omit<RequestInit, "method" | "body">;
-};
+} & Omit<RequestInit, "method" | "body">;
 
 type RequestConfig = {
   method: string;
@@ -63,6 +65,7 @@ type RequestConfig = {
   headers?: HeadersInit;
   security?: SecurityState | null;
   uaHeader?: string;
+  userAgent?: string | undefined;
   timeoutMs?: number;
 };
 
@@ -94,19 +97,21 @@ export class ClientSDK {
     } else {
       this.#hooks = new SDKHooks();
     }
-    this._options = { ...options, hooks: this.#hooks };
-
     const url = serverURLFromOptions(options);
     if (url) {
       url.pathname = url.pathname.replace(/\/+$/, "") + "/";
     }
+
     const { baseURL, client } = this.#hooks.sdkInit({
       baseURL: url,
       client: options.httpClient || new HTTPClient(),
     });
     this._baseURL = baseURL;
     this.#httpClient = client;
-    this.#logger = options.debugLogger;
+
+    this._options = { ...options, hooks: this.#hooks };
+
+    this.#logger = this._options.debugLogger;
     if (!this.#logger && env().MISTRAL_DEBUG) {
       this.#logger = console;
     }
@@ -172,7 +177,9 @@ export class ClientSDK {
     cookie = cookie.startsWith("; ") ? cookie.slice(2) : cookie;
     headers.set("cookie", cookie);
 
-    const userHeaders = new Headers(options?.fetchOptions?.headers);
+    const userHeaders = new Headers(
+      options?.headers ?? options?.fetchOptions?.headers,
+    );
     for (const [k, v] of userHeaders) {
       headers.set(k, v);
     }
@@ -180,23 +187,22 @@ export class ClientSDK {
     // Only set user agent header in non-browser-like environments since CORS
     // policy disallows setting it in browsers e.g. Chrome throws an error.
     if (!isBrowserLike) {
-      headers.set(conf.uaHeader ?? "user-agent", SDK_METADATA.userAgent);
+      headers.set(
+        conf.uaHeader ?? "user-agent",
+        conf.userAgent ?? SDK_METADATA.userAgent,
+      );
     }
 
-    let fetchOptions = options?.fetchOptions;
+    const fetchOptions: Omit<RequestInit, "method" | "body"> = {
+      ...options?.fetchOptions,
+      ...options,
+    };
     if (!fetchOptions?.signal && conf.timeoutMs && conf.timeoutMs > 0) {
       const timeoutSignal = AbortSignal.timeout(conf.timeoutMs);
-      if (!fetchOptions) {
-        fetchOptions = { signal: timeoutSignal };
-      } else {
-        fetchOptions.signal = timeoutSignal;
-      }
+      fetchOptions.signal = timeoutSignal;
     }
 
     if (conf.body instanceof ReadableStream) {
-      if (!fetchOptions) {
-        fetchOptions = {};
-      }
       Object.assign(fetchOptions, { duplex: "half" });
     }
 
@@ -302,7 +308,9 @@ export class ClientSDK {
   }
 }
 
-const jsonLikeContentTypeRE = /^application\/(?:.{0,100}\+)?json/;
+const jsonLikeContentTypeRE = /(application|text)\/.*?\+*json.*/;
+const jsonlLikeContentTypeRE =
+  /(application|text)\/(.*?\+*\bjsonl\b.*|.*?\+*\bx-ndjson\b.*)/;
 async function logRequest(logger: Logger | undefined, req: Request) {
   if (!logger) {
     return;
@@ -368,9 +376,13 @@ async function logResponse(
   logger.group("Body:");
   switch (true) {
     case matchContentType(res, "application/json")
-      || jsonLikeContentTypeRE.test(ct):
+      || jsonLikeContentTypeRE.test(ct) && !jsonlLikeContentTypeRE.test(ct):
       logger.log(await res.clone().json());
       break;
+    case matchContentType(res, "application/jsonl")
+      || jsonlLikeContentTypeRE.test(ct):
+      logger.log(await res.clone().text());
+      break;
     case matchContentType(res, "text/event-stream"):
       logger.log(`<${contentType}>`);
       break;

package/src/lib/security.ts

@@ -4,10 +4,11 @@
 
 import * as components from "../models/components/index.js";
 import { env } from "./env.js";
+
 type OAuth2PasswordFlow = {
   username: string;
-  password?: string | undefined;
-  clientID: string;
+  password: string;
+  clientID?: string | undefined;
   clientSecret?: string | undefined;
   tokenURL: string;
 };
@@ -83,9 +84,14 @@ type SecurityInputOAuth2 = {
 type SecurityInputOAuth2ClientCredentials = {
   type: "oauth2:client_credentials";
   value:
-    | { clientID?: string | undefined; clientSecret?: string | undefined }
+    | {
+      clientID?: string | undefined;
+      clientSecret?: string | undefined;
+    }
     | null
+    | string
     | undefined;
+  fieldName?: string;
 };
 
 type SecurityInputOAuth2PasswordCredentials = {
@@ -94,13 +100,13 @@ type SecurityInputOAuth2PasswordCredentials = {
     | string
     | null
     | undefined;
-  fieldName: string;
+  fieldName?: string;
 };
 
 type SecurityInputCustom = {
   type: "http:custom";
   value: any | null | undefined;
-  fieldName: string;
+  fieldName?: string;
 };
 
 export type SecurityInput =
@@ -137,6 +143,9 @@ export function resolveSecurity(
           typeof o.value === "string" && !!o.value
         );
       } else if (o.type === "oauth2:client_credentials") {
+        if (typeof o.value == "string") {
+          return !!o.value;
+        }
         return o.value.clientID != null || o.value.clientSecret != null;
       } else if (typeof o.value === "string") {
         return !!o.value;
@@ -225,7 +234,9 @@ function applyBearer(
     value = `Bearer ${value}`;
   }
 
-  state.headers[spec.fieldName] = value;
+  if (spec.fieldName !== undefined) {
+    state.headers[spec.fieldName] = value;
+  }
 }
 
 export function resolveGlobalSecurity(

package/src/models/components/agent.ts

@@ -52,12 +52,12 @@ import {
 } from "./websearchtool.js";
 
 export type AgentTools =
+  | (DocumentLibraryTool & { type: "document_library" })
+  | (FunctionTool & { type: "function" })
   | (CodeInterpreterTool & { type: "code_interpreter" })
   | (ImageGenerationTool & { type: "image_generation" })
   | (WebSearchTool & { type: "web_search" })
-  | (WebSearchPremiumTool & { type: "web_search_premium" })
-  | (DocumentLibraryTool & { type: "document_library" })
-  | (FunctionTool & { type: "function" });
+  | (WebSearchPremiumTool & { type: "web_search_premium" });
 
 export const AgentObject = {
   Agent: "agent",
@@ -74,12 +74,12 @@ export type Agent = {
    */
   tools?:
     | Array<
+      | (DocumentLibraryTool & { type: "document_library" })
+      | (FunctionTool & { type: "function" })
       | (CodeInterpreterTool & { type: "code_interpreter" })
       | (ImageGenerationTool & { type: "image_generation" })
       | (WebSearchTool & { type: "web_search" })
       | (WebSearchPremiumTool & { type: "web_search_premium" })
-      | (DocumentLibraryTool & { type: "document_library" })
-      | (FunctionTool & { type: "function" })
     >
     | undefined;
   /**
@@ -103,6 +103,16 @@ export const AgentTools$inboundSchema: z.ZodType<
   z.ZodTypeDef,
   unknown
 > = z.union([
+  DocumentLibraryTool$inboundSchema.and(
+    z.object({ type: z.literal("document_library") }).transform((v) => ({
+      type: v.type,
+    })),
+  ),
+  FunctionTool$inboundSchema.and(
+    z.object({ type: z.literal("function") }).transform((v) => ({
+      type: v.type,
+    })),
+  ),
   CodeInterpreterTool$inboundSchema.and(
     z.object({ type: z.literal("code_interpreter") }).transform((v) => ({
       type: v.type,
@@ -123,26 +133,16 @@ export const AgentTools$inboundSchema: z.ZodType<
       type: v.type,
     })),
   ),
-  DocumentLibraryTool$inboundSchema.and(
-    z.object({ type: z.literal("document_library") }).transform((v) => ({
-      type: v.type,
-    })),
-  ),
-  FunctionTool$inboundSchema.and(
-    z.object({ type: z.literal("function") }).transform((v) => ({
-      type: v.type,
-    })),
-  ),
 ]);
 
 /** @internal */
 export type AgentTools$Outbound =
+  | (DocumentLibraryTool$Outbound & { type: "document_library" })
+  | (FunctionTool$Outbound & { type: "function" })
   | (CodeInterpreterTool$Outbound & { type: "code_interpreter" })
   | (ImageGenerationTool$Outbound & { type: "image_generation" })
   | (WebSearchTool$Outbound & { type: "web_search" })
-  | (WebSearchPremiumTool$Outbound & { type: "web_search_premium" })
-  | (DocumentLibraryTool$Outbound & { type: "document_library" })
-  | (FunctionTool$Outbound & { type: "function" });
+  | (WebSearchPremiumTool$Outbound & { type: "web_search_premium" });
 
 /** @internal */
 export const AgentTools$outboundSchema: z.ZodType<
@@ -150,6 +150,16 @@ export const AgentTools$outboundSchema: z.ZodType<
   z.ZodTypeDef,
   AgentTools
 > = z.union([
+  DocumentLibraryTool$outboundSchema.and(
+    z.object({ type: z.literal("document_library") }).transform((v) => ({
+      type: v.type,
+    })),
+  ),
+  FunctionTool$outboundSchema.and(
+    z.object({ type: z.literal("function") }).transform((v) => ({
+      type: v.type,
+    })),
+  ),
   CodeInterpreterTool$outboundSchema.and(
     z.object({ type: z.literal("code_interpreter") }).transform((v) => ({
       type: v.type,
@@ -170,16 +180,6 @@ export const AgentTools$outboundSchema: z.ZodType<
       type: v.type,
     })),
   ),
-  DocumentLibraryTool$outboundSchema.and(
-    z.object({ type: z.literal("document_library") }).transform((v) => ({
-      type: v.type,
-    })),
-  ),
-  FunctionTool$outboundSchema.and(
-    z.object({ type: z.literal("function") }).transform((v) => ({
-      type: v.type,
-    })),
-  ),
 ]);
 
 /**
@@ -234,6 +234,16 @@ export const Agent$inboundSchema: z.ZodType<Agent, z.ZodTypeDef, unknown> = z
     instructions: z.nullable(z.string()).optional(),
     tools: z.array(
       z.union([
+        DocumentLibraryTool$inboundSchema.and(
+          z.object({ type: z.literal("document_library") }).transform((v) => ({
+            type: v.type,
+          })),
+        ),
+        FunctionTool$inboundSchema.and(
+          z.object({ type: z.literal("function") }).transform((v) => ({
+            type: v.type,
+          })),
+        ),
         CodeInterpreterTool$inboundSchema.and(
           z.object({ type: z.literal("code_interpreter") }).transform((v) => ({
             type: v.type,
@@ -254,16 +264,6 @@ export const Agent$inboundSchema: z.ZodType<Agent, z.ZodTypeDef, unknown> = z
             v,
           ) => ({ type: v.type })),
         ),
-        DocumentLibraryTool$inboundSchema.and(
-          z.object({ type: z.literal("document_library") }).transform((v) => ({
-            type: v.type,
-          })),
-        ),
-        FunctionTool$inboundSchema.and(
-          z.object({ type: z.literal("function") }).transform((v) => ({
-            type: v.type,
-          })),
-        ),
       ]),
     ).optional(),
     completion_args: CompletionArgs$inboundSchema.optional(),
@@ -293,12 +293,12 @@ export type Agent$Outbound = {
   instructions?: string | null | undefined;
   tools?:
     | Array<
+      | (DocumentLibraryTool$Outbound & { type: "document_library" })
+      | (FunctionTool$Outbound & { type: "function" })
       | (CodeInterpreterTool$Outbound & { type: "code_interpreter" })
       | (ImageGenerationTool$Outbound & { type: "image_generation" })
       | (WebSearchTool$Outbound & { type: "web_search" })
       | (WebSearchPremiumTool$Outbound & { type: "web_search_premium" })
-      | (DocumentLibraryTool$Outbound & { type: "document_library" })
-      | (FunctionTool$Outbound & { type: "function" })
     >
     | undefined;
   completion_args?: CompletionArgs$Outbound | undefined;
@@ -322,6 +322,16 @@ export const Agent$outboundSchema: z.ZodType<
   instructions: z.nullable(z.string()).optional(),
   tools: z.array(
     z.union([
+      DocumentLibraryTool$outboundSchema.and(
+        z.object({ type: z.literal("document_library") }).transform((v) => ({
+          type: v.type,
+        })),
+      ),
+      FunctionTool$outboundSchema.and(
+        z.object({ type: z.literal("function") }).transform((v) => ({
+          type: v.type,
+        })),
+      ),
       CodeInterpreterTool$outboundSchema.and(
         z.object({ type: z.literal("code_interpreter") }).transform((v) => ({
           type: v.type,
@@ -342,16 +352,6 @@ export const Agent$outboundSchema: z.ZodType<
           type: v.type,
         })),
       ),
-      DocumentLibraryTool$outboundSchema.and(
-        z.object({ type: z.literal("document_library") }).transform((v) => ({
-          type: v.type,
-        })),
-      ),
-      FunctionTool$outboundSchema.and(
-        z.object({ type: z.literal("function") }).transform((v) => ({
-          type: v.type,
-        })),
-      ),
     ]),
   ).optional(),
   completionArgs: CompletionArgs$outboundSchema.optional(),

package/src/models/components/agentcreationrequest.ts

@@ -51,12 +51,12 @@ import {
 } from "./websearchtool.js";
 
 export type AgentCreationRequestTools =
+  | (DocumentLibraryTool & { type: "document_library" })
+  | (FunctionTool & { type: "function" })
   | (CodeInterpreterTool & { type: "code_interpreter" })
   | (ImageGenerationTool & { type: "image_generation" })
   | (WebSearchTool & { type: "web_search" })
-  | (WebSearchPremiumTool & { type: "web_search_premium" })
-  | (DocumentLibraryTool & { type: "document_library" })
-  | (FunctionTool & { type: "function" });
+  | (WebSearchPremiumTool & { type: "web_search_premium" });
 
 export type AgentCreationRequest = {
   /**
@@ -68,12 +68,12 @@ export type AgentCreationRequest = {
    */
   tools?:
     | Array<
+      | (DocumentLibraryTool & { type: "document_library" })
+      | (FunctionTool & { type: "function" })
       | (CodeInterpreterTool & { type: "code_interpreter" })
       | (ImageGenerationTool & { type: "image_generation" })
       | (WebSearchTool & { type: "web_search" })
       | (WebSearchPremiumTool & { type: "web_search_premium" })
-      | (DocumentLibraryTool & { type: "document_library" })
-      | (FunctionTool & { type: "function" })
     >
     | undefined;
   /**
@@ -92,6 +92,16 @@ export const AgentCreationRequestTools$inboundSchema: z.ZodType<
   z.ZodTypeDef,
   unknown
 > = z.union([
+  DocumentLibraryTool$inboundSchema.and(
+    z.object({ type: z.literal("document_library") }).transform((v) => ({
+      type: v.type,
+    })),
+  ),
+  FunctionTool$inboundSchema.and(
+    z.object({ type: z.literal("function") }).transform((v) => ({
+      type: v.type,
+    })),
+  ),
   CodeInterpreterTool$inboundSchema.and(
     z.object({ type: z.literal("code_interpreter") }).transform((v) => ({
       type: v.type,
@@ -112,26 +122,16 @@ export const AgentCreationRequestTools$inboundSchema: z.ZodType<
       type: v.type,
     })),
   ),
-  DocumentLibraryTool$inboundSchema.and(
-    z.object({ type: z.literal("document_library") }).transform((v) => ({
-      type: v.type,
-    })),
-  ),
-  FunctionTool$inboundSchema.and(
-    z.object({ type: z.literal("function") }).transform((v) => ({
-      type: v.type,
-    })),
-  ),
 ]);
 
 /** @internal */
 export type AgentCreationRequestTools$Outbound =
+  | (DocumentLibraryTool$Outbound & { type: "document_library" })
+  | (FunctionTool$Outbound & { type: "function" })
   | (CodeInterpreterTool$Outbound & { type: "code_interpreter" })
   | (ImageGenerationTool$Outbound & { type: "image_generation" })
   | (WebSearchTool$Outbound & { type: "web_search" })
-  | (WebSearchPremiumTool$Outbound & { type: "web_search_premium" })
-  | (DocumentLibraryTool$Outbound & { type: "document_library" })
-  | (FunctionTool$Outbound & { type: "function" });
+  | (WebSearchPremiumTool$Outbound & { type: "web_search_premium" });
 
 /** @internal */
 export const AgentCreationRequestTools$outboundSchema: z.ZodType<
@@ -139,6 +139,16 @@ export const AgentCreationRequestTools$outboundSchema: z.ZodType<
   z.ZodTypeDef,
   AgentCreationRequestTools
 > = z.union([
+  DocumentLibraryTool$outboundSchema.and(
+    z.object({ type: z.literal("document_library") }).transform((v) => ({
+      type: v.type,
+    })),
+  ),
+  FunctionTool$outboundSchema.and(
+    z.object({ type: z.literal("function") }).transform((v) => ({
+      type: v.type,
+    })),
+  ),
   CodeInterpreterTool$outboundSchema.and(
     z.object({ type: z.literal("code_interpreter") }).transform((v) => ({
       type: v.type,
@@ -159,16 +169,6 @@ export const AgentCreationRequestTools$outboundSchema: z.ZodType<
       type: v.type,
     })),
   ),
-  DocumentLibraryTool$outboundSchema.and(
-    z.object({ type: z.literal("document_library") }).transform((v) => ({
-      type: v.type,
-    })),
-  ),
-  FunctionTool$outboundSchema.and(
-    z.object({ type: z.literal("function") }).transform((v) => ({
-      type: v.type,
-    })),
-  ),
 ]);
 
 /**
@@ -211,6 +211,16 @@ export const AgentCreationRequest$inboundSchema: z.ZodType<
   instructions: z.nullable(z.string()).optional(),
   tools: z.array(
     z.union([
+      DocumentLibraryTool$inboundSchema.and(
+        z.object({ type: z.literal("document_library") }).transform((v) => ({
+          type: v.type,
+        })),
+      ),
+      FunctionTool$inboundSchema.and(
+        z.object({ type: z.literal("function") }).transform((v) => ({
+          type: v.type,
+        })),
+      ),
       CodeInterpreterTool$inboundSchema.and(
         z.object({ type: z.literal("code_interpreter") }).transform((v) => ({
           type: v.type,
@@ -231,16 +241,6 @@ export const AgentCreationRequest$inboundSchema: z.ZodType<
           type: v.type,
         })),
       ),
-      DocumentLibraryTool$inboundSchema.and(
-        z.object({ type: z.literal("document_library") }).transform((v) => ({
-          type: v.type,
-        })),
-      ),
-      FunctionTool$inboundSchema.and(
-        z.object({ type: z.literal("function") }).transform((v) => ({
-          type: v.type,
-        })),
-      ),
     ]),
   ).optional(),
   completion_args: CompletionArgs$inboundSchema.optional(),
@@ -259,12 +259,12 @@ export type AgentCreationRequest$Outbound = {
   instructions?: string | null | undefined;
   tools?:
     | Array<
+      | (DocumentLibraryTool$Outbound & { type: "document_library" })
+      | (FunctionTool$Outbound & { type: "function" })
       | (CodeInterpreterTool$Outbound & { type: "code_interpreter" })
       | (ImageGenerationTool$Outbound & { type: "image_generation" })
       | (WebSearchTool$Outbound & { type: "web_search" })
       | (WebSearchPremiumTool$Outbound & { type: "web_search_premium" })
-      | (DocumentLibraryTool$Outbound & { type: "document_library" })
-      | (FunctionTool$Outbound & { type: "function" })
     >
     | undefined;
   completion_args?: CompletionArgs$Outbound | undefined;
@@ -283,6 +283,16 @@ export const AgentCreationRequest$outboundSchema: z.ZodType<
   instructions: z.nullable(z.string()).optional(),
   tools: z.array(
     z.union([
+      DocumentLibraryTool$outboundSchema.and(
+        z.object({ type: z.literal("document_library") }).transform((v) => ({
+          type: v.type,
+        })),
+      ),
+      FunctionTool$outboundSchema.and(
+        z.object({ type: z.literal("function") }).transform((v) => ({
+          type: v.type,
+        })),
+      ),
       CodeInterpreterTool$outboundSchema.and(
         z.object({ type: z.literal("code_interpreter") }).transform((v) => ({
           type: v.type,
@@ -303,16 +313,6 @@ export const AgentCreationRequest$outboundSchema: z.ZodType<
           type: v.type,
         })),
       ),
-      DocumentLibraryTool$outboundSchema.and(
-        z.object({ type: z.literal("document_library") }).transform((v) => ({
-          type: v.type,
-        })),
-      ),
-      FunctionTool$outboundSchema.and(
-        z.object({ type: z.literal("function") }).transform((v) => ({
-          type: v.type,
-        })),
-      ),
     ]),
   ).optional(),
   completionArgs: CompletionArgs$outboundSchema.optional(),

package/src/models/components/agentscompletionrequest.ts

@@ -73,9 +73,9 @@ export type AgentsCompletionRequestStop = string | Array<string>;
 
 export type AgentsCompletionRequestMessages =
   | (SystemMessage & { role: "system" })
+  | (ToolMessage & { role: "tool" })
   | (UserMessage & { role: "user" })
-  | (AssistantMessage & { role: "assistant" })
-  | (ToolMessage & { role: "tool" });
+  | (AssistantMessage & { role: "assistant" });
 
 export type AgentsCompletionRequestToolChoice = ToolChoice | ToolChoiceEnum;
 
@@ -101,9 +101,9 @@ export type AgentsCompletionRequest = {
    */
   messages: Array<
     | (SystemMessage & { role: "system" })
+    | (ToolMessage & { role: "tool" })
     | (UserMessage & { role: "user" })
     | (AssistantMessage & { role: "assistant" })
-    | (ToolMessage & { role: "tool" })
   >;
   responseFormat?: ResponseFormat | undefined;
   tools?: Array<Tool> | null | undefined;
@@ -193,6 +193,9 @@ export const AgentsCompletionRequestMessages$inboundSchema: z.ZodType<
       role: v.role,
     })),
   ),
+  ToolMessage$inboundSchema.and(
+    z.object({ role: z.literal("tool") }).transform((v) => ({ role: v.role })),
+  ),
   UserMessage$inboundSchema.and(
     z.object({ role: z.literal("user") }).transform((v) => ({ role: v.role })),
   ),
@@ -201,17 +204,14 @@ export const AgentsCompletionRequestMessages$inboundSchema: z.ZodType<
       role: v.role,
     })),
   ),
-  ToolMessage$inboundSchema.and(
-    z.object({ role: z.literal("tool") }).transform((v) => ({ role: v.role })),
-  ),
 ]);
 
 /** @internal */
 export type AgentsCompletionRequestMessages$Outbound =
   | (SystemMessage$Outbound & { role: "system" })
+  | (ToolMessage$Outbound & { role: "tool" })
   | (UserMessage$Outbound & { role: "user" })
-  | (AssistantMessage$Outbound & { role: "assistant" })
-  | (ToolMessage$Outbound & { role: "tool" });
+  | (AssistantMessage$Outbound & { role: "assistant" });
 
 /** @internal */
 export const AgentsCompletionRequestMessages$outboundSchema: z.ZodType<
@@ -224,6 +224,9 @@ export const AgentsCompletionRequestMessages$outboundSchema: z.ZodType<
       role: v.role,
     })),
   ),
+  ToolMessage$outboundSchema.and(
+    z.object({ role: z.literal("tool") }).transform((v) => ({ role: v.role })),
+  ),
   UserMessage$outboundSchema.and(
     z.object({ role: z.literal("user") }).transform((v) => ({ role: v.role })),
   ),
@@ -232,9 +235,6 @@ export const AgentsCompletionRequestMessages$outboundSchema: z.ZodType<
       role: v.role,
     })),
   ),
-  ToolMessage$outboundSchema.and(
-    z.object({ role: z.literal("tool") }).transform((v) => ({ role: v.role })),
-  ),
 ]);
 
 /**
@@ -340,6 +340,11 @@ export const AgentsCompletionRequest$inboundSchema: z.ZodType<
           role: v.role,
         })),
       ),
+      ToolMessage$inboundSchema.and(
+        z.object({ role: z.literal("tool") }).transform((v) => ({
+          role: v.role,
+        })),
+      ),
       UserMessage$inboundSchema.and(
         z.object({ role: z.literal("user") }).transform((v) => ({
           role: v.role,
@@ -350,11 +355,6 @@ export const AgentsCompletionRequest$inboundSchema: z.ZodType<
           role: v.role,
         })),
       ),
-      ToolMessage$inboundSchema.and(
-        z.object({ role: z.literal("tool") }).transform((v) => ({
-          role: v.role,
-        })),
-      ),
     ]),
   ),
   response_format: ResponseFormat$inboundSchema.optional(),
@@ -390,9 +390,9 @@ export type AgentsCompletionRequest$Outbound = {
   random_seed?: number | null | undefined;
   messages: Array<
     | (SystemMessage$Outbound & { role: "system" })
+    | (ToolMessage$Outbound & { role: "tool" })
     | (UserMessage$Outbound & { role: "user" })
     | (AssistantMessage$Outbound & { role: "assistant" })
-    | (ToolMessage$Outbound & { role: "tool" })
   >;
   response_format?: ResponseFormat$Outbound | undefined;
   tools?: Array<Tool$Outbound> | null | undefined;
@@ -423,6 +423,11 @@ export const AgentsCompletionRequest$outboundSchema: z.ZodType<
           role: v.role,
         })),
       ),
+      ToolMessage$outboundSchema.and(
+        z.object({ role: z.literal("tool") }).transform((v) => ({
+          role: v.role,
+        })),
+      ),
       UserMessage$outboundSchema.and(
         z.object({ role: z.literal("user") }).transform((v) => ({
           role: v.role,
@@ -433,11 +438,6 @@ export const AgentsCompletionRequest$outboundSchema: z.ZodType<
           role: v.role,
         })),
       ),
-      ToolMessage$outboundSchema.and(
-        z.object({ role: z.literal("tool") }).transform((v) => ({
-          role: v.role,
-        })),
-      ),
     ]),
   ),
   responseFormat: ResponseFormat$outboundSchema.optional(),