@zenning/openai 3.0.22 → 3.0.24

package/dist/internal/index.js

@@ -2471,27 +2471,21 @@ async function convertToOpenAIResponsesInput({
   hasApplyPatchTool = false,
   compactionInput,
   previousResponseId,
-  containsApprovalResponses
+  containsApprovalResponses,
+  approvalToolCallIds: approvalToolCallIdsArray
 }) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
   const input = [];
   const warnings = [];
   const processedApprovalIds = /* @__PURE__ */ new Set();
-  const approvalToolCallIds = /* @__PURE__ */ new Set();
-  if (containsApprovalResponses) {
-    for (const message of prompt) {
-      if (message.role !== "assistant") continue;
-      if (typeof message.content === "string") continue;
-      for (const part of message.content) {
-        if (part.type === "tool-call") {
-          const approval = part.approval;
-          if ((approval == null ? void 0 : approval.approved) != null) {
-            approvalToolCallIds.add(part.toolCallId);
-          }
-        }
-      }
-    }
-  }
+  const approvalToolCallIds = new Set(approvalToolCallIdsArray || []);
+  console.log("CALDEBUG [convertToOpenAIResponsesInput] Starting conversion:", {
+    containsApprovalResponses,
+    approvalToolCallIdsCount: approvalToolCallIds.size,
+    approvalToolCallIds: Array.from(approvalToolCallIds),
+    previousResponseId,
+    promptLength: prompt.length
+  });
   if (compactionInput && compactionInput.length > 0) {
     input.push(...compactionInput);
   }
@@ -2655,10 +2649,11 @@ 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) {
+              const toolResultHadApproval = containsApprovalResponses && approvalToolCallIds.has(part.toolCallId);
+              if (store && !toolResultHadApproval) {
                 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 {
+              } else if (!store) {
                 warnings.push({
                   type: "other",
                   message: `Results for OpenAI tool ${part.toolName} are not sent to the API when store is false`
@@ -2725,6 +2720,10 @@ async function convertToOpenAIResponsesInput({
         break;
       }
       case "tool": {
+        console.log("CALDEBUG [convertToOpenAIResponsesInput] Processing tool role message:", {
+          partsCount: content.length,
+          partTypes: content.map((p) => p.type)
+        });
         for (const part of content) {
           if (part.type === "tool-approval-response") {
             const approvalResponse = part;
@@ -2748,6 +2747,13 @@ async function convertToOpenAIResponsesInput({
           const output = part.output;
           if (output.type === "execution-denied") {
             const approvalId = (_l = (_k = output.providerOptions) == null ? void 0 : _k.openai) == null ? void 0 : _l.approvalId;
+            console.log("CALDEBUG [convertToOpenAIResponsesInput] Found execution-denied:", {
+              toolCallId: part.toolCallId,
+              toolName: part.toolName,
+              hasApprovalId: !!approvalId,
+              approvalId,
+              willSkip: !!approvalId
+            });
             if (approvalId) {
               continue;
             }
@@ -3808,7 +3814,12 @@ var openaiResponsesProviderOptionsSchema = (0, import_provider_utils24.lazySchem
        * Whether the request contains tool approval responses.
        * Defaults to `false`.
        */
-      containsApprovalResponses: import_v417.z.boolean().optional()
+      containsApprovalResponses: import_v417.z.boolean().optional(),
+      /**
+       * Array of tool call IDs that have approval responses (approved or denied).
+       * Used to skip item_reference for tools that had user approval flow.
+       */
+      approvalToolCallIds: import_v417.z.array(import_v417.z.string()).optional()
     })
   )
 );
@@ -4331,7 +4342,7 @@ var OpenAIResponsesLanguageModel = class {
     toolChoice,
     responseFormat
   }) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
     const warnings = [];
     const modelCapabilities = getOpenAILanguageModelCapabilities(this.modelId);
     if (topK != null) {
@@ -4396,10 +4407,11 @@ var OpenAIResponsesLanguageModel = class {
       hasApplyPatchTool: hasOpenAITool("openai.apply_patch"),
       compactionInput: openaiOptions == null ? void 0 : openaiOptions.compactionInput,
       previousResponseId: (_d = openaiOptions == null ? void 0 : openaiOptions.previousResponseId) != null ? _d : void 0,
-      containsApprovalResponses: (_e = openaiOptions == null ? void 0 : openaiOptions.containsApprovalResponses) != null ? _e : false
+      containsApprovalResponses: (_e = openaiOptions == null ? void 0 : openaiOptions.containsApprovalResponses) != null ? _e : false,
+      approvalToolCallIds: (_f = openaiOptions == null ? void 0 : openaiOptions.approvalToolCallIds) != null ? _f : void 0
     });
     warnings.push(...inputWarnings);
-    const strictJsonSchema = (_f = openaiOptions == null ? void 0 : openaiOptions.strictJsonSchema) != null ? _f : true;
+    const strictJsonSchema = (_g = openaiOptions == null ? void 0 : openaiOptions.strictJsonSchema) != null ? _g : true;
     let include = openaiOptions == null ? void 0 : openaiOptions.include;
     function addInclude(key) {
       if (include == null) {
@@ -4415,9 +4427,9 @@ var OpenAIResponsesLanguageModel = class {
     if (topLogprobs) {
       addInclude("message.output_text.logprobs");
     }
-    const webSearchToolName = (_g = tools == null ? void 0 : tools.find(
+    const webSearchToolName = (_h = tools == null ? void 0 : tools.find(
       (tool) => tool.type === "provider" && (tool.id === "openai.web_search" || tool.id === "openai.web_search_preview")
-    )) == null ? void 0 : _g.name;
+    )) == null ? void 0 : _h.name;
     if (webSearchToolName) {
       addInclude("web_search_call.action.sources");
     }
@@ -4440,7 +4452,7 @@ var OpenAIResponsesLanguageModel = class {
             format: responseFormat.schema != null ? {
               type: "json_schema",
               strict: strictJsonSchema,
-              name: (_h = responseFormat.name) != null ? _h : "response",
+              name: (_i = responseFormat.name) != null ? _i : "response",
               description: responseFormat.description,
               schema: responseFormat.schema
             } : { type: "json_object" }