@zenning/openai 3.0.7 → 3.0.10

package/dist/internal/index.js

@@ -2475,6 +2475,39 @@ async function convertToOpenAIResponsesInput({
   const input = [];
   const warnings = [];
   const processedApprovalIds = /* @__PURE__ */ new Set();
+  const approvalIdToToolCallId = /* @__PURE__ */ new Map();
+  for (const message of prompt) {
+    if (message.role === "assistant" && Array.isArray(message.content)) {
+      const approvalRequests = message.content.filter(
+        (p) => p.type === "tool-approval-request"
+      );
+      for (const req of approvalRequests) {
+        approvalIdToToolCallId.set(req.approvalId, req.toolCallId);
+      }
+    }
+  }
+  console.log("[OpenAI Provider] approvalIdToToolCallId:", approvalIdToToolCallId);
+  const toolCallsWithApprovalResponses = /* @__PURE__ */ new Set();
+  for (const message of prompt) {
+    if (message.role === "tool") {
+      for (const part of message.content) {
+        if (part.type === "tool-approval-response") {
+          const toolCallId = approvalIdToToolCallId.get(part.approvalId);
+          console.log("[OpenAI Provider] Found approval response:", {
+            approvalId: part.approvalId,
+            toolCallId
+          });
+          if (toolCallId) {
+            toolCallsWithApprovalResponses.add(toolCallId);
+          }
+        }
+      }
+    }
+  }
+  console.log(
+    "[OpenAI Provider] toolCallsWithApprovalResponses:",
+    toolCallsWithApprovalResponses
+  );
   if (compactionInput && compactionInput.length > 0) {
     input.push(...compactionInput);
   }
@@ -2552,6 +2585,14 @@ async function convertToOpenAIResponsesInput({
       }
       case "assistant": {
         const reasoningMessages = {};
+        const toolCallsWithApprovalRequest = /* @__PURE__ */ new Set();
+        if (Array.isArray(content)) {
+          for (const part of content) {
+            if (part.type === "tool-approval-request") {
+              toolCallsWithApprovalRequest.add(part.toolCallId);
+            }
+          }
+        }
         for (const part of content) {
           switch (part.type) {
             case "text": {
@@ -2569,13 +2610,33 @@ 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;
+              const hasApprovalResponse = toolCallsWithApprovalResponses.has(
+                part.toolCallId
+              );
+              const hasApprovalRequest = toolCallsWithApprovalRequest.has(
+                part.toolCallId
+              );
+              const skipItemReference = hasApprovalResponse || hasApprovalRequest && toolCallsWithApprovalResponses.size > 0;
+              console.log("[OpenAI Provider] Processing tool-call:", {
+                toolCallId: part.toolCallId,
+                toolName: part.toolName,
+                id,
+                providerExecuted: part.providerExecuted,
+                store,
+                hasApprovalResponse,
+                hasApprovalRequest,
+                skipItemReference,
+                willCreateItemReference: store && id != null && !skipItemReference
+              });
               if (part.providerExecuted) {
-                if (store && id != null) {
+                if (store && id != null && !skipItemReference) {
+                  console.log("[OpenAI Provider] Creating item_reference (providerExecuted)");
                   input.push({ type: "item_reference", id });
                 }
                 break;
               }
-              if (store && id != null) {
+              if (store && id != null && !skipItemReference) {
+                console.log("[OpenAI Provider] Creating item_reference (non-providerExecuted)");
                 input.push({ type: "item_reference", id });
                 break;
               }