@ai-sdk/openai 3.0.0-beta.109 → 3.0.0-beta.111

package/dist/internal/index.mjs

@@ -237,6 +237,9 @@ function convertToOpenAIChatMessages({
       }
       case "tool": {
         for (const toolResponse of content) {
+          if (toolResponse.type === "tool-approval-response") {
+            continue;
+          }
           const output = toolResponse.output;
           let contentValue;
           switch (output.type) {
@@ -2710,6 +2713,9 @@ async function convertToOpenAIResponsesInput({
       }
       case "tool": {
         for (const part of content) {
+          if (part.type === "tool-approval-response") {
+            continue;
+          }
           const output = part.output;
           const resolvedToolName = toolNameMapping.toProviderToolName(
             part.toolName
@@ -3236,6 +3242,19 @@ var openaiResponsesChunkSchema = lazySchema14(
         item_id: z16.string(),
         summary_index: z16.number()
       }),
+      z16.object({
+        type: z16.literal("response.apply_patch_call_operation_diff.delta"),
+        item_id: z16.string(),
+        output_index: z16.number(),
+        delta: z16.string(),
+        obfuscation: z16.string().nullish()
+      }),
+      z16.object({
+        type: z16.literal("response.apply_patch_call_operation_diff.done"),
+        item_id: z16.string(),
+        output_index: z16.number(),
+        diff: z16.string()
+      }),
       z16.object({
         type: z16.literal("error"),
         sequence_number: z16.number(),
@@ -3917,16 +3936,14 @@ var mcpArgsSchema = lazySchema19(
       authorization: z21.string().optional(),
       connectorId: z21.string().optional(),
       headers: z21.record(z21.string(), z21.string()).optional(),
-      // TODO: Integrate this MCP tool approval with our SDK's existing tool approval architecture
-      // requireApproval: z
-      //   .union([
-      //     z.enum(['always', 'never']),
-      //     z.object({
-      //       readOnly: z.boolean().optional(),
-      //       toolNames: z.array(z.string()).optional(),
-      //     }),
-      //   ])
-      //   .optional(),
+      requireApproval: z21.union([
+        z21.enum(["always", "never"]),
+        z21.object({
+          never: z21.object({
+            toolNames: z21.array(z21.string()).optional()
+          }).optional()
+        })
+      ]).optional(),
       serverDescription: z21.string().optional(),
       serverUrl: z21.string().optional()
     }).refine(
@@ -3938,36 +3955,14 @@ var mcpArgsSchema = lazySchema19(
 var mcpInputSchema = lazySchema19(() => zodSchema19(z21.object({})));
 var mcpOutputSchema = lazySchema19(
   () => zodSchema19(
-    z21.discriminatedUnion("type", [
-      z21.object({
-        type: z21.literal("call"),
-        serverLabel: z21.string(),
-        name: z21.string(),
-        arguments: z21.string(),
-        output: z21.string().nullable().optional(),
-        error: z21.union([z21.string(), jsonValueSchema]).optional()
-      }),
-      z21.object({
-        type: z21.literal("listTools"),
-        serverLabel: z21.string(),
-        tools: z21.array(
-          z21.object({
-            name: z21.string(),
-            description: z21.string().optional(),
-            inputSchema: jsonValueSchema,
-            annotations: z21.record(z21.string(), jsonValueSchema).optional()
-          })
-        ),
-        error: z21.union([z21.string(), jsonValueSchema]).optional()
-      }),
-      z21.object({
-        type: z21.literal("approvalRequest"),
-        serverLabel: z21.string(),
-        name: z21.string(),
-        arguments: z21.string(),
-        approvalRequestId: z21.string()
-      })
-    ])
+    z21.object({
+      type: z21.literal("call"),
+      serverLabel: z21.string(),
+      name: z21.string(),
+      arguments: z21.string(),
+      output: z21.string().nullable().optional(),
+      error: z21.union([z21.string(), jsonValueSchema]).optional()
+    })
   )
 );
 var mcpToolFactory = createProviderToolFactoryWithOutputSchema7({
@@ -4746,54 +4741,9 @@ var OpenAIResponsesLanguageModel = class {
           break;
         }
         case "mcp_list_tools": {
-          content.push({
-            type: "tool-call",
-            toolCallId: part.id,
-            toolName: toolNameMapping.toCustomToolName("mcp"),
-            input: JSON.stringify({}),
-            providerExecuted: true
-          });
-          content.push({
-            type: "tool-result",
-            toolCallId: part.id,
-            toolName: toolNameMapping.toCustomToolName("mcp"),
-            result: {
-              type: "listTools",
-              serverLabel: part.server_label,
-              tools: part.tools.map((t) => {
-                var _a2, _b2;
-                return {
-                  name: t.name,
-                  description: (_a2 = t.description) != null ? _a2 : void 0,
-                  inputSchema: t.input_schema,
-                  annotations: (_b2 = t.annotations) != null ? _b2 : void 0
-                };
-              }),
-              ...part.error != null ? { error: part.error } : {}
-            }
-          });
           break;
         }
         case "mcp_approval_request": {
-          content.push({
-            type: "tool-call",
-            toolCallId: part.id,
-            toolName: toolNameMapping.toCustomToolName("mcp"),
-            input: JSON.stringify({}),
-            providerExecuted: true
-          });
-          content.push({
-            type: "tool-result",
-            toolCallId: part.id,
-            toolName: toolNameMapping.toCustomToolName("mcp"),
-            result: {
-              type: "approvalRequest",
-              serverLabel: part.server_label,
-              name: part.name,
-              arguments: part.arguments,
-              approvalRequestId: part.approval_request_id
-            }
-          });
           break;
         }
         case "computer_call": {
@@ -5062,24 +5012,40 @@ var OpenAIResponsesLanguageModel = class {
                   providerExecuted: true
                 });
               } else if (value.item.type === "apply_patch_call") {
+                const { call_id: callId, operation } = value.item;
                 ongoingToolCalls[value.output_index] = {
                   toolName: toolNameMapping.toCustomToolName("apply_patch"),
-                  toolCallId: value.item.call_id
+                  toolCallId: callId,
+                  applyPatch: {
+                    // delete_file doesn't have diff
+                    hasDiff: operation.type === "delete_file",
+                    endEmitted: operation.type === "delete_file"
+                  }
                 };
-                if (value.item.status === "completed") {
+                controller.enqueue({
+                  type: "tool-input-start",
+                  id: callId,
+                  toolName: toolNameMapping.toCustomToolName("apply_patch")
+                });
+                if (operation.type === "delete_file") {
+                  const inputString = JSON.stringify({
+                    callId,
+                    operation
+                  });
                   controller.enqueue({
-                    type: "tool-call",
-                    toolCallId: value.item.call_id,
-                    toolName: toolNameMapping.toCustomToolName("apply_patch"),
-                    input: JSON.stringify({
-                      callId: value.item.call_id,
-                      operation: value.item.operation
-                    }),
-                    providerMetadata: {
-                      [providerKey]: {
-                        itemId: value.item.id
-                      }
-                    }
+                    type: "tool-input-delta",
+                    id: callId,
+                    delta: inputString
+                  });
+                  controller.enqueue({
+                    type: "tool-input-end",
+                    id: callId
+                  });
+                } else {
+                  controller.enqueue({
+                    type: "tool-input-delta",
+                    id: callId,
+                    delta: `{"callId":"${escapeJSONDelta(callId)}","operation":{"type":"${escapeJSONDelta(operation.type)}","path":"${escapeJSONDelta(operation.path)}","diff":"`
                   });
                 }
               } else if (value.item.type === "shell_call") {
@@ -5231,31 +5197,31 @@ var OpenAIResponsesLanguageModel = class {
                 });
               } else if (value.item.type === "mcp_list_tools") {
                 ongoingToolCalls[value.output_index] = void 0;
-                controller.enqueue({
-                  type: "tool-result",
-                  toolCallId: value.item.id,
-                  toolName: toolNameMapping.toCustomToolName("mcp"),
-                  result: {
-                    type: "listTools",
-                    serverLabel: value.item.server_label,
-                    tools: value.item.tools.map((t) => {
-                      var _a2, _b2;
-                      return {
-                        name: t.name,
-                        description: (_a2 = t.description) != null ? _a2 : void 0,
-                        inputSchema: t.input_schema,
-                        annotations: (_b2 = t.annotations) != null ? _b2 : void 0
-                      };
-                    }),
-                    ...value.item.error != null ? { error: value.item.error } : {}
-                  }
-                });
               } else if (value.item.type === "apply_patch_call") {
-                ongoingToolCalls[value.output_index] = void 0;
-                if (value.item.status === "completed") {
+                const toolCall = ongoingToolCalls[value.output_index];
+                if ((toolCall == null ? void 0 : toolCall.applyPatch) && !toolCall.applyPatch.endEmitted && value.item.operation.type !== "delete_file") {
+                  if (!toolCall.applyPatch.hasDiff) {
+                    controller.enqueue({
+                      type: "tool-input-delta",
+                      id: toolCall.toolCallId,
+                      delta: escapeJSONDelta(value.item.operation.diff)
+                    });
+                  }
+                  controller.enqueue({
+                    type: "tool-input-delta",
+                    id: toolCall.toolCallId,
+                    delta: '"}}'
+                  });
+                  controller.enqueue({
+                    type: "tool-input-end",
+                    id: toolCall.toolCallId
+                  });
+                  toolCall.applyPatch.endEmitted = true;
+                }
+                if (toolCall && value.item.status === "completed") {
                   controller.enqueue({
                     type: "tool-call",
-                    toolCallId: value.item.call_id,
+                    toolCallId: toolCall.toolCallId,
                     toolName: toolNameMapping.toCustomToolName("apply_patch"),
                     input: JSON.stringify({
                       callId: value.item.call_id,
@@ -5268,20 +5234,9 @@ var OpenAIResponsesLanguageModel = class {
                     }
                   });
                 }
+                ongoingToolCalls[value.output_index] = void 0;
               } else if (value.item.type === "mcp_approval_request") {
                 ongoingToolCalls[value.output_index] = void 0;
-                controller.enqueue({
-                  type: "tool-result",
-                  toolCallId: value.item.id,
-                  toolName: toolNameMapping.toCustomToolName("mcp"),
-                  result: {
-                    type: "approvalRequest",
-                    serverLabel: value.item.server_label,
-                    name: value.item.name,
-                    arguments: value.item.arguments,
-                    approvalRequestId: value.item.approval_request_id
-                  }
-                });
               } else if (value.item.type === "local_shell_call") {
                 ongoingToolCalls[value.output_index] = void 0;
                 controller.enqueue({
@@ -5347,6 +5302,38 @@ var OpenAIResponsesLanguageModel = class {
                   delta: value.delta
                 });
               }
+            } else if (isResponseApplyPatchCallOperationDiffDeltaChunk(value)) {
+              const toolCall = ongoingToolCalls[value.output_index];
+              if (toolCall == null ? void 0 : toolCall.applyPatch) {
+                controller.enqueue({
+                  type: "tool-input-delta",
+                  id: toolCall.toolCallId,
+                  delta: escapeJSONDelta(value.delta)
+                });
+                toolCall.applyPatch.hasDiff = true;
+              }
+            } else if (isResponseApplyPatchCallOperationDiffDoneChunk(value)) {
+              const toolCall = ongoingToolCalls[value.output_index];
+              if ((toolCall == null ? void 0 : toolCall.applyPatch) && !toolCall.applyPatch.endEmitted) {
+                if (!toolCall.applyPatch.hasDiff) {
+                  controller.enqueue({
+                    type: "tool-input-delta",
+                    id: toolCall.toolCallId,
+                    delta: escapeJSONDelta(value.diff)
+                  });
+                  toolCall.applyPatch.hasDiff = true;
+                }
+                controller.enqueue({
+                  type: "tool-input-delta",
+                  id: toolCall.toolCallId,
+                  delta: '"}}'
+                });
+                controller.enqueue({
+                  type: "tool-input-end",
+                  id: toolCall.toolCallId
+                });
+                toolCall.applyPatch.endEmitted = true;
+              }
             } else if (isResponseImageGenerationCallPartialImageChunk(value)) {
               controller.enqueue({
                 type: "tool-result",
@@ -5363,9 +5350,7 @@ var OpenAIResponsesLanguageModel = class {
                 controller.enqueue({
                   type: "tool-input-delta",
                   id: toolCall.toolCallId,
-                  // The delta is code, which is embedding in a JSON string.
-                  // To escape it, we use JSON.stringify and slice to remove the outer quotes.
-                  delta: JSON.stringify(value.delta).slice(1, -1)
+                  delta: escapeJSONDelta(value.delta)
                 });
               }
             } else if (isResponseCodeInterpreterCallCodeDoneChunk(value)) {
@@ -5585,6 +5570,12 @@ function isResponseCodeInterpreterCallCodeDeltaChunk(chunk) {
 function isResponseCodeInterpreterCallCodeDoneChunk(chunk) {
   return chunk.type === "response.code_interpreter_call_code.done";
 }
+function isResponseApplyPatchCallOperationDiffDeltaChunk(chunk) {
+  return chunk.type === "response.apply_patch_call_operation_diff.delta";
+}
+function isResponseApplyPatchCallOperationDiffDoneChunk(chunk) {
+  return chunk.type === "response.apply_patch_call_operation_diff.done";
+}
 function isResponseOutputItemAddedChunk(chunk) {
   return chunk.type === "response.output_item.added";
 }
@@ -5615,6 +5606,9 @@ function mapWebSearchOutput(action) {
       };
   }
 }
+function escapeJSONDelta(delta) {
+  return JSON.stringify(delta).slice(1, -1);
+}
 export {
   OpenAIChatLanguageModel,
   OpenAICompletionLanguageModel,