@zenning/openai 3.0.19 → 3.0.21

package/dist/internal/index.js

@@ -2470,7 +2470,8 @@ async function convertToOpenAIResponsesInput({
   hasShellTool = false,
   hasApplyPatchTool = false,
   compactionInput,
-  previousResponseId
+  previousResponseId,
+  containsApprovalResponses
 }) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
   const input = [];
@@ -2557,13 +2558,10 @@ async function convertToOpenAIResponsesInput({
           switch (part.type) {
             case "text": {
               const id = (_b = (_a = part.providerOptions) == null ? void 0 : _a[providerOptionsName]) == null ? void 0 : _b.itemId;
-              if (store && id != null && !previousResponseId) {
+              if (store && id != null) {
                 input.push({ type: "item_reference", id });
                 break;
               }
-              if (store && id != null && previousResponseId) {
-                break;
-              }
               input.push({
                 role: "assistant",
                 content: [{ type: "output_text", text: part.text }],
@@ -2574,16 +2572,16 @@ async function convertToOpenAIResponsesInput({
             case "tool-call": {
               const id = (_g = (_d = (_c = part.providerOptions) == null ? void 0 : _c[providerOptionsName]) == null ? void 0 : _d.itemId) != null ? _g : (_f = (_e = part.providerMetadata) == null ? void 0 : _e[providerOptionsName]) == null ? void 0 : _f.itemId;
               if (part.providerExecuted) {
-                if (store && id != null && !previousResponseId) {
+                if (store && id != null && !containsApprovalResponses) {
                   input.push({ type: "item_reference", id });
                 }
                 break;
               }
-              if (store && id != null && !previousResponseId) {
+              if (store && id != null && !containsApprovalResponses) {
                 input.push({ type: "item_reference", id });
                 break;
               }
-              if (store && id != null && previousResponseId) {
+              if (store && id != null && containsApprovalResponses) {
                 break;
               }
               const resolvedToolName = toolNameMapping.toProviderToolName(
@@ -2641,10 +2639,9 @@ async function convertToOpenAIResponsesInput({
               if (part.output.type === "execution-denied" || part.output.type === "json" && typeof part.output.value === "object" && part.output.value != null && "type" in part.output.value && part.output.value.type === "execution-denied") {
                 break;
               }
-              if (store && !previousResponseId) {
+              if (store) {
                 const itemId = (_j = (_i = (_h = part.providerMetadata) == null ? void 0 : _h[providerOptionsName]) == null ? void 0 : _i.itemId) != null ? _j : part.toolCallId;
                 input.push({ type: "item_reference", id: itemId });
-              } else if (store) {
               } else {
                 warnings.push({
                   type: "other",
@@ -2662,7 +2659,7 @@ async function convertToOpenAIResponsesInput({
               const reasoningId = providerOptions == null ? void 0 : providerOptions.itemId;
               if (reasoningId != null) {
                 const reasoningMessage = reasoningMessages[reasoningId];
-                if (store && !previousResponseId) {
+                if (store) {
                   if (reasoningMessage === void 0) {
                     input.push({ type: "item_reference", id: reasoningId });
                     reasoningMessages[reasoningId] = {
@@ -2671,14 +2668,6 @@ async function convertToOpenAIResponsesInput({
                       summary: []
                     };
                   }
-                } else if (store) {
-                  if (reasoningMessage === void 0) {
-                    reasoningMessages[reasoningId] = {
-                      type: "reasoning",
-                      id: reasoningId,
-                      summary: []
-                    };
-                  }
                 } else {
                   const summaryParts = [];
                   if (part.text.length > 0) {
@@ -3798,7 +3787,12 @@ var openaiResponsesProviderOptionsSchema = (0, import_provider_utils24.lazySchem
           type: import_v417.z.literal("compaction"),
           encrypted_content: import_v417.z.string()
         })
-      ).optional()
+      ).optional(),
+      /**
+       * Whether the request contains tool approval responses.
+       * Defaults to `false`.
+       */
+      containsApprovalResponses: import_v417.z.boolean().optional()
     })
   )
 );
@@ -4321,7 +4315,7 @@ var OpenAIResponsesLanguageModel = class {
     toolChoice,
     responseFormat
   }) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     const warnings = [];
     const modelCapabilities = getOpenAILanguageModelCapabilities(this.modelId);
     if (topK != null) {
@@ -4385,10 +4379,11 @@ var OpenAIResponsesLanguageModel = class {
       hasShellTool: hasOpenAITool("openai.shell"),
       hasApplyPatchTool: hasOpenAITool("openai.apply_patch"),
       compactionInput: openaiOptions == null ? void 0 : openaiOptions.compactionInput,
-      previousResponseId: (_d = openaiOptions == null ? void 0 : openaiOptions.previousResponseId) != null ? _d : void 0
+      previousResponseId: (_d = openaiOptions == null ? void 0 : openaiOptions.previousResponseId) != null ? _d : void 0,
+      containsApprovalResponses: (_e = openaiOptions == null ? void 0 : openaiOptions.containsApprovalResponses) != null ? _e : false
     });
     warnings.push(...inputWarnings);
-    const strictJsonSchema = (_e = openaiOptions == null ? void 0 : openaiOptions.strictJsonSchema) != null ? _e : true;
+    const strictJsonSchema = (_f = openaiOptions == null ? void 0 : openaiOptions.strictJsonSchema) != null ? _f : true;
     let include = openaiOptions == null ? void 0 : openaiOptions.include;
     function addInclude(key) {
       if (include == null) {
@@ -4404,9 +4399,9 @@ var OpenAIResponsesLanguageModel = class {
     if (topLogprobs) {
       addInclude("message.output_text.logprobs");
     }
-    const webSearchToolName = (_f = tools == null ? void 0 : tools.find(
+    const webSearchToolName = (_g = tools == null ? void 0 : tools.find(
       (tool) => tool.type === "provider" && (tool.id === "openai.web_search" || tool.id === "openai.web_search_preview")
-    )) == null ? void 0 : _f.name;
+    )) == null ? void 0 : _g.name;
     if (webSearchToolName) {
       addInclude("web_search_call.action.sources");
     }
@@ -4429,7 +4424,7 @@ var OpenAIResponsesLanguageModel = class {
             format: responseFormat.schema != null ? {
               type: "json_schema",
               strict: strictJsonSchema,
-              name: (_g = responseFormat.name) != null ? _g : "response",
+              name: (_h = responseFormat.name) != null ? _h : "response",
               description: responseFormat.description,
               schema: responseFormat.schema
             } : { type: "json_object" }