@zenning/ai 6.0.14 → 6.0.16

package/dist/index.mjs

@@ -898,7 +898,7 @@ import {
 } from "@zenning/provider-utils";
 
 // src/version.ts
-var VERSION = true ? "6.0.14" : "0.0.0-test";
+var VERSION = true ? "6.0.15" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({ url }) => {
@@ -2284,7 +2284,8 @@ function prepareRetries({
 
 // src/generate-text/collect-tool-approvals.ts
 function collectToolApprovals({
-  messages
+  messages,
+  skipValidation = false
 }) {
   const lastMessage = messages.at(-1);
   if ((lastMessage == null ? void 0 : lastMessage.role) != "tool") {
@@ -2329,19 +2330,25 @@ function collectToolApprovals({
   for (const approvalResponse of approvalResponses) {
     const approvalRequest = toolApprovalRequestsByApprovalId[approvalResponse.approvalId];
     if (approvalRequest == null) {
-      throw new InvalidToolApprovalError({
-        approvalId: approvalResponse.approvalId
-      });
+      if (!skipValidation) {
+        throw new InvalidToolApprovalError({
+          approvalId: approvalResponse.approvalId
+        });
+      }
+      continue;
     }
     if (toolResults[approvalRequest.toolCallId] != null) {
       continue;
     }
     const toolCall = toolCallsByToolCallId[approvalRequest.toolCallId];
     if (toolCall == null) {
-      throw new ToolCallNotFoundForApprovalError({
-        toolCallId: approvalRequest.toolCallId,
-        approvalId: approvalRequest.approvalId
-      });
+      if (!skipValidation) {
+        throw new ToolCallNotFoundForApprovalError({
+          toolCallId: approvalRequest.toolCallId,
+          approvalId: approvalRequest.approvalId
+        });
+      }
+      continue;
     }
     const approval = {
       approvalRequest,
@@ -3583,10 +3590,13 @@ async function generateText({
       }),
       tracer,
       fn: async (span) => {
-        var _a16, _b, _c, _d, _e, _f, _g, _h;
+        var _a16, _b, _c, _d, _e, _f, _g, _h, _i;
         const initialMessages = initialPrompt.messages;
         const responseMessages = [];
-        const { approvedToolApprovals, deniedToolApprovals } = collectToolApprovals({ messages: initialMessages });
+        const { approvedToolApprovals, deniedToolApprovals } = collectToolApprovals({
+          messages: initialMessages,
+          skipValidation: ((_a16 = providerOptions == null ? void 0 : providerOptions.openai) == null ? void 0 : _a16.previousResponseId) != null
+        });
         const localApprovedToolApprovals = approvedToolApprovals.filter(
           (toolApproval) => !toolApproval.toolCall.providerExecuted
         );
@@ -3676,21 +3686,21 @@ async function generateText({
             experimental_context
           }));
           const stepModel = resolveLanguageModel(
-            (_a16 = prepareStepResult == null ? void 0 : prepareStepResult.model) != null ? _a16 : model
+            (_b = prepareStepResult == null ? void 0 : prepareStepResult.model) != null ? _b : model
           );
           const promptMessages = await convertToLanguageModelPrompt({
             prompt: {
-              system: (_b = prepareStepResult == null ? void 0 : prepareStepResult.system) != null ? _b : initialPrompt.system,
-              messages: (_c = prepareStepResult == null ? void 0 : prepareStepResult.messages) != null ? _c : stepInputMessages
+              system: (_c = prepareStepResult == null ? void 0 : prepareStepResult.system) != null ? _c : initialPrompt.system,
+              messages: (_d = prepareStepResult == null ? void 0 : prepareStepResult.messages) != null ? _d : stepInputMessages
             },
             supportedUrls: await stepModel.supportedUrls,
             download: download2
           });
-          experimental_context = (_d = prepareStepResult == null ? void 0 : prepareStepResult.experimental_context) != null ? _d : experimental_context;
+          experimental_context = (_e = prepareStepResult == null ? void 0 : prepareStepResult.experimental_context) != null ? _e : experimental_context;
           const { toolChoice: stepToolChoice, tools: stepTools } = await prepareToolsAndToolChoice({
             tools,
-            toolChoice: (_e = prepareStepResult == null ? void 0 : prepareStepResult.toolChoice) != null ? _e : toolChoice,
-            activeTools: (_f = prepareStepResult == null ? void 0 : prepareStepResult.activeTools) != null ? _f : activeTools
+            toolChoice: (_f = prepareStepResult == null ? void 0 : prepareStepResult.toolChoice) != null ? _f : toolChoice,
+            activeTools: (_g = prepareStepResult == null ? void 0 : prepareStepResult.activeTools) != null ? _g : activeTools
           });
           currentModelResponse = await retry(
             () => {
@@ -3910,7 +3920,7 @@ async function generateText({
             usage: asLanguageModelUsage(currentModelResponse.usage),
             warnings: currentModelResponse.warnings,
             providerMetadata: currentModelResponse.providerMetadata,
-            request: (_g = currentModelResponse.request) != null ? _g : {},
+            request: (_h = currentModelResponse.request) != null ? _h : {},
             response: {
               ...currentModelResponse.response,
               // deep clone msgs to avoid mutating past messages in multi-step:
@@ -3918,7 +3928,7 @@ async function generateText({
             }
           });
           logWarnings({
-            warnings: (_h = currentModelResponse.warnings) != null ? _h : [],
+            warnings: (_i = currentModelResponse.warnings) != null ? _i : [],
             provider: stepModel.provider,
             model: stepModel.modelId
           });
@@ -6092,6 +6102,7 @@ var DefaultStreamTextResult = class {
       tracer,
       endWhenDone: false,
       fn: async (rootSpanArg) => {
+        var _a16;
         rootSpan = rootSpanArg;
         const initialPrompt = await standardizePrompt({
           system,
@@ -6100,7 +6111,10 @@ var DefaultStreamTextResult = class {
         });
         const initialMessages = initialPrompt.messages;
         const initialResponseMessages = [];
-        const { approvedToolApprovals, deniedToolApprovals } = collectToolApprovals({ messages: initialMessages });
+        const { approvedToolApprovals, deniedToolApprovals } = collectToolApprovals({
+          messages: initialMessages,
+          skipValidation: ((_a16 = providerOptions == null ? void 0 : providerOptions.openai) == null ? void 0 : _a16.previousResponseId) != null
+        });
         if (deniedToolApprovals.length > 0 || approvedToolApprovals.length > 0) {
           const providerExecutedToolApprovals = [
             ...approvedToolApprovals,
@@ -6210,7 +6224,7 @@ var DefaultStreamTextResult = class {
           responseMessages,
           usage
         }) {
-          var _a16, _b, _c, _d, _e, _f;
+          var _a17, _b, _c, _d, _e, _f;
           const includeRawChunks2 = self.includeRawChunks;
           stepFinish = new DelayedPromise();
           const stepInputMessages = [...initialMessages, ...responseMessages];
@@ -6222,7 +6236,7 @@ var DefaultStreamTextResult = class {
             experimental_context
           }));
           const stepModel = resolveLanguageModel(
-            (_a16 = prepareStepResult == null ? void 0 : prepareStepResult.model) != null ? _a16 : model
+            (_a17 = prepareStepResult == null ? void 0 : prepareStepResult.model) != null ? _a17 : model
           );
           const promptMessages = await convertToLanguageModelPrompt({
             prompt: {
@@ -6335,7 +6349,7 @@ var DefaultStreamTextResult = class {
             streamWithToolResults.pipeThrough(
               new TransformStream({
                 async transform(chunk, controller) {
-                  var _a17, _b2, _c2, _d2, _e2;
+                  var _a18, _b2, _c2, _d2, _e2;
                   if (chunk.type === "stream-start") {
                     warnings = chunk.warnings;
                     return;
@@ -6408,7 +6422,7 @@ var DefaultStreamTextResult = class {
                     }
                     case "response-metadata": {
                       stepResponse = {
-                        id: (_a17 = chunk.id) != null ? _a17 : stepResponse.id,
+                        id: (_a18 = chunk.id) != null ? _a18 : stepResponse.id,
                         timestamp: (_b2 = chunk.timestamp) != null ? _b2 : stepResponse.timestamp,
                         modelId: (_c2 = chunk.modelId) != null ? _c2 : stepResponse.modelId
                       };
@@ -7407,7 +7421,7 @@ async function convertToModelMessages(messages, options) {
                 });
               } else if (isToolUIPart(part)) {
                 const toolName = getToolName(part);
-                if (part.state !== "input-streaming") {
+                if (part.state !== "input-streaming" && part.state !== "approval-responded" && part.state !== "output-denied") {
                   content.push({
                     type: "tool-call",
                     toolCallId: part.toolCallId,
@@ -7423,7 +7437,7 @@ async function convertToModelMessages(messages, options) {
                       toolCallId: part.toolCallId
                     });
                   }
-                  if (part.providerExecuted === true && part.state !== "approval-responded" && (part.state === "output-available" || part.state === "output-error")) {
+                  if (part.providerExecuted === true && (part.state === "output-available" || part.state === "output-error")) {
                     content.push({
                       type: "tool-result",
                       toolCallId: part.toolCallId,