@ai-sdk/openai 3.0.28 → 3.0.30

package/dist/index.mjs

@@ -1867,15 +1867,20 @@ var OpenAIImageModel = class {
         },
         providerMetadata: {
           openai: {
-            images: response2.data.map((item) => {
-              var _a2, _b2, _c2, _d2, _e2;
+            images: response2.data.map((item, index) => {
+              var _a2, _b2, _c2, _d2, _e2, _f2;
               return {
                 ...item.revised_prompt ? { revisedPrompt: item.revised_prompt } : {},
                 created: (_a2 = response2.created) != null ? _a2 : void 0,
                 size: (_b2 = response2.size) != null ? _b2 : void 0,
                 quality: (_c2 = response2.quality) != null ? _c2 : void 0,
                 background: (_d2 = response2.background) != null ? _d2 : void 0,
-                outputFormat: (_e2 = response2.output_format) != null ? _e2 : void 0
+                outputFormat: (_e2 = response2.output_format) != null ? _e2 : void 0,
+                ...distributeTokenDetails(
+                  (_f2 = response2.usage) == null ? void 0 : _f2.input_tokens_details,
+                  index,
+                  response2.data.length
+                )
               };
             })
           }
@@ -1918,15 +1923,20 @@ var OpenAIImageModel = class {
       },
       providerMetadata: {
         openai: {
-          images: response.data.map((item) => {
-            var _a2, _b2, _c2, _d2, _e2;
+          images: response.data.map((item, index) => {
+            var _a2, _b2, _c2, _d2, _e2, _f2;
             return {
               ...item.revised_prompt ? { revisedPrompt: item.revised_prompt } : {},
               created: (_a2 = response.created) != null ? _a2 : void 0,
               size: (_b2 = response.size) != null ? _b2 : void 0,
               quality: (_c2 = response.quality) != null ? _c2 : void 0,
               background: (_d2 = response.background) != null ? _d2 : void 0,
-              outputFormat: (_e2 = response.output_format) != null ? _e2 : void 0
+              outputFormat: (_e2 = response.output_format) != null ? _e2 : void 0,
+              ...distributeTokenDetails(
+                (_f2 = response.usage) == null ? void 0 : _f2.input_tokens_details,
+                index,
+                response.data.length
+              )
             };
           })
         }
@@ -1934,6 +1944,23 @@ var OpenAIImageModel = class {
     };
   }
 };
+function distributeTokenDetails(details, index, total) {
+  if (details == null) {
+    return {};
+  }
+  const result = {};
+  if (details.image_tokens != null) {
+    const base = Math.floor(details.image_tokens / total);
+    const remainder = details.image_tokens - base * (total - 1);
+    result.imageTokens = index === total - 1 ? remainder : base;
+  }
+  if (details.text_tokens != null) {
+    const base = Math.floor(details.text_tokens / total);
+    const remainder = details.text_tokens - base * (total - 1);
+    result.textTokens = index === total - 1 ? remainder : base;
+  }
+  return result;
+}
 async function fileToBlob(file) {
   if (!file) return void 0;
   if (file.type === "url") {
@@ -2193,6 +2220,67 @@ var shellOutputSchema = lazySchema13(
     })
   )
 );
+var shellSkillsSchema = z14.array(
+  z14.discriminatedUnion("type", [
+    z14.object({
+      type: z14.literal("skillReference"),
+      skillId: z14.string(),
+      version: z14.string().optional()
+    }),
+    z14.object({
+      type: z14.literal("inline"),
+      name: z14.string(),
+      description: z14.string(),
+      source: z14.object({
+        type: z14.literal("base64"),
+        mediaType: z14.literal("application/zip"),
+        data: z14.string()
+      })
+    })
+  ])
+).optional();
+var shellArgsSchema = lazySchema13(
+  () => zodSchema13(
+    z14.object({
+      environment: z14.union([
+        z14.object({
+          type: z14.literal("containerAuto"),
+          fileIds: z14.array(z14.string()).optional(),
+          memoryLimit: z14.enum(["1g", "4g", "16g", "64g"]).optional(),
+          networkPolicy: z14.discriminatedUnion("type", [
+            z14.object({ type: z14.literal("disabled") }),
+            z14.object({
+              type: z14.literal("allowlist"),
+              allowedDomains: z14.array(z14.string()),
+              domainSecrets: z14.array(
+                z14.object({
+                  domain: z14.string(),
+                  name: z14.string(),
+                  value: z14.string()
+                })
+              ).optional()
+            })
+          ]).optional(),
+          skills: shellSkillsSchema
+        }),
+        z14.object({
+          type: z14.literal("containerReference"),
+          containerId: z14.string()
+        }),
+        z14.object({
+          type: z14.literal("local").optional(),
+          skills: z14.array(
+            z14.object({
+              name: z14.string(),
+              description: z14.string(),
+              path: z14.string()
+            })
+          ).optional()
+        })
+      ]).optional()
+    })
+  )
+);
 var shell = createProviderToolFactoryWithOutputSchema6({
   id: "openai.shell",
   inputSchema: shellInputSchema,
@@ -2736,8 +2824,32 @@ async function convertToOpenAIResponsesInput({
               if (hasConversation) {
                 break;
               }
+              const resolvedResultToolName = toolNameMapping.toProviderToolName(
+                part.toolName
+              );
+              if (hasShellTool && resolvedResultToolName === "shell") {
+                if (part.output.type === "json") {
+                  const parsedOutput = await validateTypes({
+                    value: part.output.value,
+                    schema: shellOutputSchema
+                  });
+                  input.push({
+                    type: "shell_call_output",
+                    call_id: part.toolCallId,
+                    output: parsedOutput.output.map((item) => ({
+                      stdout: item.stdout,
+                      stderr: item.stderr,
+                      outcome: item.outcome.type === "timeout" ? { type: "timeout" } : {
+                        type: "exit",
+                        exit_code: item.outcome.exitCode
+                      }
+                    }))
+                  });
+                }
+                break;
+              }
               if (store) {
-                const itemId = (_j = (_i = (_h = part.providerMetadata) == null ? void 0 : _h[providerOptionsName]) == null ? void 0 : _i.itemId) != null ? _j : part.toolCallId;
+                const itemId = (_j = (_i = (_h = part.providerOptions) == null ? void 0 : _h[providerOptionsName]) == null ? void 0 : _i.itemId) != null ? _j : part.toolCallId;
                 input.push({ type: "item_reference", id: itemId });
               } else {
                 warnings.push({
@@ -3112,6 +3224,25 @@ var openaiResponsesChunkSchema = lazySchema17(
             action: z19.object({
               commands: z19.array(z19.string())
             })
+          }),
+          z19.object({
+            type: z19.literal("shell_call_output"),
+            id: z19.string(),
+            call_id: z19.string(),
+            status: z19.enum(["in_progress", "completed", "incomplete"]),
+            output: z19.array(
+              z19.object({
+                stdout: z19.string(),
+                stderr: z19.string(),
+                outcome: z19.discriminatedUnion("type", [
+                  z19.object({ type: z19.literal("timeout") }),
+                  z19.object({
+                    type: z19.literal("exit"),
+                    exit_code: z19.number()
+                  })
+                ])
+              })
+            )
           })
         ])
       }),
@@ -3291,6 +3422,25 @@ var openaiResponsesChunkSchema = lazySchema17(
             action: z19.object({
               commands: z19.array(z19.string())
             })
+          }),
+          z19.object({
+            type: z19.literal("shell_call_output"),
+            id: z19.string(),
+            call_id: z19.string(),
+            status: z19.enum(["in_progress", "completed", "incomplete"]),
+            output: z19.array(
+              z19.object({
+                stdout: z19.string(),
+                stderr: z19.string(),
+                outcome: z19.discriminatedUnion("type", [
+                  z19.object({ type: z19.literal("timeout") }),
+                  z19.object({
+                    type: z19.literal("exit"),
+                    exit_code: z19.number()
+                  })
+                ])
+              })
+            )
           })
         ])
       }),
@@ -3636,6 +3786,25 @@ var openaiResponsesResponseSchema = lazySchema17(
             action: z19.object({
               commands: z19.array(z19.string())
             })
+          }),
+          z19.object({
+            type: z19.literal("shell_call_output"),
+            id: z19.string(),
+            call_id: z19.string(),
+            status: z19.enum(["in_progress", "completed", "incomplete"]),
+            output: z19.array(
+              z19.object({
+                stdout: z19.string(),
+                stderr: z19.string(),
+                outcome: z19.discriminatedUnion("type", [
+                  z19.object({ type: z19.literal("timeout") }),
+                  z19.object({
+                    type: z19.literal("exit"),
+                    exit_code: z19.number()
+                  })
+                ])
+              })
+            )
           })
         ])
       ).optional(),
@@ -3931,8 +4100,15 @@ async function prepareResponsesTools({
             break;
           }
           case "openai.shell": {
+            const args = await validateTypes2({
+              value: tool.args,
+              schema: shellArgsSchema
+            });
             openaiTools2.push({
-              type: "shell"
+              type: "shell",
+              ...args.environment && {
+                environment: mapShellEnvironment(args.environment)
+              }
             });
             break;
           }
@@ -4062,6 +4238,52 @@ async function prepareResponsesTools({
     }
   }
 }
+function mapShellEnvironment(environment) {
+  if (environment.type === "containerReference") {
+    const env2 = environment;
+    return {
+      type: "container_reference",
+      container_id: env2.containerId
+    };
+  }
+  if (environment.type === "containerAuto") {
+    const env2 = environment;
+    return {
+      type: "container_auto",
+      file_ids: env2.fileIds,
+      memory_limit: env2.memoryLimit,
+      network_policy: env2.networkPolicy == null ? void 0 : env2.networkPolicy.type === "disabled" ? { type: "disabled" } : {
+        type: "allowlist",
+        allowed_domains: env2.networkPolicy.allowedDomains,
+        domain_secrets: env2.networkPolicy.domainSecrets
+      },
+      skills: mapShellSkills(env2.skills)
+    };
+  }
+  const env = environment;
+  return {
+    type: "local",
+    skills: env.skills
+  };
+}
+function mapShellSkills(skills) {
+  return skills == null ? void 0 : skills.map(
+    (skill) => skill.type === "skillReference" ? {
+      type: "skill_reference",
+      skill_id: skill.skillId,
+      version: skill.version
+    } : {
+      type: "inline",
+      name: skill.name,
+      description: skill.description,
+      source: {
+        type: "base64",
+        media_type: skill.source.mediaType,
+        data: skill.source.data
+      }
+    }
+  );
+}
 
 // src/responses/openai-responses-language-model.ts
 function extractApprovalRequestIdToToolCallIdMapping(prompt) {
@@ -4107,7 +4329,7 @@ var OpenAIResponsesLanguageModel = class {
     toolChoice,
     responseFormat
   }) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
     const warnings = [];
     const modelCapabilities = getOpenAILanguageModelCapabilities(this.modelId);
     if (topK != null) {
@@ -4311,6 +4533,10 @@ var OpenAIResponsesLanguageModel = class {
       tools,
       toolChoice
     });
+    const shellToolEnvType = (_i = (_h = (_g = tools == null ? void 0 : tools.find(
+      (tool) => tool.type === "provider" && tool.id === "openai.shell"
+    )) == null ? void 0 : _g.args) == null ? void 0 : _h.environment) == null ? void 0 : _i.type;
+    const isShellProviderExecuted = shellToolEnvType === "containerAuto" || shellToolEnvType === "containerReference";
     return {
       webSearchToolName,
       args: {
@@ -4321,7 +4547,8 @@ var OpenAIResponsesLanguageModel = class {
       warnings: [...warnings, ...toolWarnings],
       store,
       toolNameMapping,
-      providerOptionsName
+      providerOptionsName,
+      isShellProviderExecuted
     };
   }
   async doGenerate(options) {
@@ -4331,7 +4558,8 @@ var OpenAIResponsesLanguageModel = class {
       warnings,
       webSearchToolName,
       toolNameMapping,
-      providerOptionsName
+      providerOptionsName,
+      isShellProviderExecuted
     } = await this.getArgs(options);
     const url = this.config.url({
       path: "/responses",
@@ -4431,6 +4659,7 @@ var OpenAIResponsesLanguageModel = class {
                 commands: part.action.commands
               }
             }),
+            ...isShellProviderExecuted && { providerExecuted: true },
             providerMetadata: {
               [providerOptionsName]: {
                 itemId: part.id
@@ -4439,6 +4668,24 @@ var OpenAIResponsesLanguageModel = class {
           });
           break;
         }
+        case "shell_call_output": {
+          content.push({
+            type: "tool-result",
+            toolCallId: part.call_id,
+            toolName: toolNameMapping.toCustomToolName("shell"),
+            result: {
+              output: part.output.map((item) => ({
+                stdout: item.stdout,
+                stderr: item.stderr,
+                outcome: item.outcome.type === "exit" ? {
+                  type: "exit",
+                  exitCode: item.outcome.exit_code
+                } : { type: "timeout" }
+              }))
+            }
+          });
+          break;
+        }
         case "message": {
           for (const contentPart of part.content) {
             if (((_c = (_b = options.providerOptions) == null ? void 0 : _b[providerOptionsName]) == null ? void 0 : _c.logprobs) && contentPart.logprobs) {
@@ -4728,7 +4975,8 @@ var OpenAIResponsesLanguageModel = class {
       webSearchToolName,
       toolNameMapping,
       store,
-      providerOptionsName
+      providerOptionsName,
+      isShellProviderExecuted
     } = await this.getArgs(options);
     const { responseHeaders, value: response } = await postJsonToApi5({
       url: this.config.url({
@@ -4907,6 +5155,7 @@ var OpenAIResponsesLanguageModel = class {
                   toolName: toolNameMapping.toCustomToolName("shell"),
                   toolCallId: value.item.call_id
                 };
+              } else if (value.item.type === "shell_call_output") {
               } else if (value.item.type === "message") {
                 ongoingAnnotations.splice(0, ongoingAnnotations.length);
                 controller.enqueue({
@@ -5160,10 +5409,31 @@ var OpenAIResponsesLanguageModel = class {
                       commands: value.item.action.commands
                     }
                   }),
+                  ...isShellProviderExecuted && {
+                    providerExecuted: true
+                  },
                   providerMetadata: {
                     [providerOptionsName]: { itemId: value.item.id }
                   }
                 });
+              } else if (value.item.type === "shell_call_output") {
+                controller.enqueue({
+                  type: "tool-result",
+                  toolCallId: value.item.call_id,
+                  toolName: toolNameMapping.toCustomToolName("shell"),
+                  result: {
+                    output: value.item.output.map(
+                      (item) => ({
+                        stdout: item.stdout,
+                        stderr: item.stderr,
+                        outcome: item.outcome.type === "exit" ? {
+                          type: "exit",
+                          exitCode: item.outcome.exit_code
+                        } : { type: "timeout" }
+                      })
+                    )
+                  }
+                });
               } else if (value.item.type === "reasoning") {
                 const activeReasoningPart = activeReasoning[value.item.id];
                 const summaryPartIndices = Object.entries(
@@ -5868,7 +6138,7 @@ var OpenAITranscriptionModel = class {
 };
 
 // src/version.ts
-var VERSION = true ? "3.0.28" : "0.0.0-test";
+var VERSION = true ? "3.0.30" : "0.0.0-test";
 
 // src/openai-provider.ts
 function createOpenAI(options = {}) {