ai-sdk-ollama 3.8.0 → 3.8.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 3.8.2
+
+### Patch Changes
+
+- 92ca938: Fix TypeScript 6.0 build failure caused by deprecated baseUrl option in tsup DTS generation
+
+## 3.8.1
+
+### Patch Changes
+
+- aeafdd6: - Update `generateText` to detect and use the stable `output` option instead of the deprecated `experimental_output` when `enableToolsWithStructuredOutput` is enabled, including a two-phase tools + structured output path and an integration test to guard this behavior.
+
 ## 3.8.0
 
 ### Minor Changes

package/dist/index.browser.cjs

@@ -17066,6 +17066,17 @@ var ollama = createOllama();
 
 // src/functions/generate-text.ts
 var import_ai3 = require("ai");
+function resultWithOverrides(base, overrides) {
+  const descriptors = {};
+  for (const key of Object.keys(overrides)) {
+    descriptors[key] = {
+      value: overrides[key],
+      enumerable: true,
+      configurable: true
+    };
+  }
+  return Object.create(base, descriptors);
+}
 async function generateText(options) {
   const { enhancedOptions = {}, ...generateTextOptions } = options;
   const {
@@ -17076,33 +17087,42 @@ async function generateText(options) {
     enableToolsWithStructuredOutput = false
   } = enhancedOptions;
   const hasTools = generateTextOptions.tools && Object.keys(generateTextOptions.tools).length > 0;
-  const hasExperimentalOutput = "experimental_output" in generateTextOptions;
+  const hasOutput = "output" in generateTextOptions;
   const requiresTools = generateTextOptions.toolChoice === "required" || typeof generateTextOptions.toolChoice === "object" && "type" in generateTextOptions.toolChoice && generateTextOptions.toolChoice.type === "tool";
-  if (enableToolsWithStructuredOutput && hasExperimentalOutput && requiresTools && hasTools) {
-    const toolResult = await (0, import_ai3.generateText)({
-      ...generateTextOptions,
-      experimental_output: void 0
-    });
+  if (enableToolsWithStructuredOutput && hasOutput && requiresTools && hasTools) {
+    const phase1Options = Object.fromEntries(
+      Object.entries(generateTextOptions).filter(([key]) => key !== "output")
+    );
+    const toolResult = await (0, import_ai3.generateText)(
+      phase1Options
+    );
     if (toolResult.toolCalls && toolResult.toolCalls.length > 0) {
       const toolContext = toolResult.toolResults?.map(
-        (tr, i) => `${toolResult.toolCalls?.[i]?.toolName}: ${JSON.stringify(tr.output || tr)}`
+        (tr, i) => `${toolResult.toolCalls?.[i]?.toolName}: ${JSON.stringify(tr.output ?? tr)}`
       ).join("\n");
-      const contextualPrompt = typeof generateTextOptions.prompt === "string" ? `${generateTextOptions.prompt}
+      const toolResultsSuffix = `
 
 Tool Results:
 ${toolContext}
 
-Please provide a structured response based on these tool results.` : generateTextOptions.prompt;
-      const _generateTextOptions = {
-        ...generateTextOptions,
-        prompt: contextualPrompt,
-        tools: void 0,
-        toolChoice: void 0
-      };
+Please provide a structured response based on these tool results.`;
+      const phase2Base = Object.fromEntries(
+        Object.entries(generateTextOptions).filter(
+          ([key]) => key !== "tools" && key !== "toolChoice"
+        )
+      );
+      const phase2OptionsWithPrompt = typeof phase2Base.prompt === "string" ? { ...phase2Base, prompt: phase2Base.prompt + toolResultsSuffix } : phase2Base.messages ? {
+        ...phase2Base,
+        prompt: void 0,
+        messages: [
+          ...phase2Base.messages,
+          { role: "user", content: toolResultsSuffix.trim() }
+        ]
+      } : phase2Base;
       const structuredResult = await (0, import_ai3.generateText)(
-        _generateTextOptions
+        phase2OptionsWithPrompt
       );
-      const enhancedResult = Object.assign(structuredResult, {
+      const enhancedResult = resultWithOverrides(structuredResult, {
         toolCalls: toolResult.toolCalls,
         toolResults: toolResult.toolResults,
         staticToolCalls: toolResult.staticToolCalls,
@@ -17110,9 +17130,9 @@ Please provide a structured response based on these tool results.` : generateTex
         staticToolResults: toolResult.staticToolResults,
         dynamicToolResults: toolResult.dynamicToolResults,
         usage: {
-          inputTokens: (toolResult.usage.inputTokens || 0) + (structuredResult.usage.inputTokens || 0),
-          outputTokens: (toolResult.usage.outputTokens || 0) + (structuredResult.usage.outputTokens || 0),
-          totalTokens: (toolResult.usage.totalTokens || 0) + (structuredResult.usage.totalTokens || 0)
+          inputTokens: (toolResult.usage.inputTokens ?? 0) + (structuredResult.usage.inputTokens ?? 0),
+          outputTokens: (toolResult.usage.outputTokens ?? 0) + (structuredResult.usage.outputTokens ?? 0),
+          totalTokens: (toolResult.usage.totalTokens ?? 0) + (structuredResult.usage.totalTokens ?? 0)
         }
       });
       return enhancedResult;
@@ -17123,7 +17143,9 @@ Please provide a structured response based on these tool results.` : generateTex
     // Only set stopWhen default if user didn't provide one and tools are enabled
     stopWhen: generateTextOptions.stopWhen ?? (hasTools ? (0, import_ai3.stepCountIs)(5) : void 0)
   });
-  const toolsWereCalled = result.steps?.some((step) => step.toolCalls && step.toolCalls.length > 0) ?? false;
+  const toolsWereCalled = result.steps?.some(
+    (step) => step.toolCalls && step.toolCalls.length > 0
+  ) ?? false;
   const hasMinimalText = !result.text || result.text.trim().length < minResponseLength;
   if (!hasTools || !toolsWereCalled || !hasMinimalText || !enableSynthesis) {
     return result;
@@ -17155,11 +17177,16 @@ Tool results:
 ${toolContext}
 
 ${synthesisPrompt}`;
-      const { tools, prompt, messages, ...baseOptions } = generateTextOptions;
-      const synthesisOptions = messages ? {
+      const generateOptions = generateTextOptions;
+      const baseOptions = Object.fromEntries(
+        Object.entries(generateOptions).filter(
+          ([key]) => key !== "tools" && key !== "prompt" && key !== "messages"
+        )
+      );
+      const synthesisOptions = generateOptions.messages ? {
         ...baseOptions,
         messages: [
-          ...messages || [],
+          ...generateOptions.messages || [],
           { role: "user", content: fullSynthesisPrompt }
         ]
       } : {
@@ -17170,12 +17197,12 @@ ${synthesisPrompt}`;
         synthesisOptions
       );
       if (synthesisResult.text && synthesisResult.text.trim().length >= minResponseLength) {
-        const enhancedResult = Object.assign(result, {
+        const enhancedResult = resultWithOverrides(result, {
           text: synthesisResult.text,
           usage: {
-            inputTokens: (result.usage.inputTokens || 0) + (synthesisResult.usage.inputTokens || 0),
-            outputTokens: (result.usage.outputTokens || 0) + (synthesisResult.usage.outputTokens || 0),
-            totalTokens: (result.usage.totalTokens || 0) + (synthesisResult.usage.totalTokens || 0)
+            inputTokens: (result.usage.inputTokens ?? 0) + (synthesisResult.usage.inputTokens ?? 0),
+            outputTokens: (result.usage.outputTokens ?? 0) + (synthesisResult.usage.outputTokens ?? 0),
+            totalTokens: (result.usage.totalTokens ?? 0) + (synthesisResult.usage.totalTokens ?? 0)
           }
         });
         return enhancedResult;
@@ -17201,7 +17228,6 @@ async function streamText(options) {
   }
   const streamResult = await (0, import_ai4.streamText)({
     ...streamTextOptions,
-    // Only set stopWhen default if user didn't provide one and tools are enabled
     stopWhen: streamTextOptions.stopWhen ?? (hasTools ? (0, import_ai4.stepCountIs)(5) : void 0)
   });
   const state = {
@@ -17213,11 +17239,13 @@ async function streamText(options) {
   };
   let synthesisApplied = false;
   let synthesisInProgress = false;
-  const generateSynthesis = async () => {
+  const generateSynthesis = async (toolCallsOverride, toolResultsOverride) => {
     if (synthesisApplied || synthesisInProgress) {
       return "";
     }
-    if (state.toolCalls.length === 0) {
+    const toolCalls = toolCallsOverride ?? state.toolCalls;
+    const toolResults = toolResultsOverride ?? state.toolResults;
+    if (toolCalls.length === 0) {
       return "";
     }
     if (state.textContent.length >= minStreamLength) {
@@ -17225,7 +17253,7 @@ async function streamText(options) {
     }
     synthesisInProgress = true;
     try {
-      const toolContext = state.toolResults.map((tr) => {
+      const toolContext = toolResults.map((tr) => {
         return `${tr.toolName}: ${JSON.stringify(tr.output)}`;
       }).join("\n") || "";
       const originalPromptText = typeof options.prompt === "string" ? options.prompt : options.messages?.at(-1)?.content || "the user question";
@@ -17290,20 +17318,55 @@ Based on the tool results above, please provide a comprehensive response to the
           }
           return false;
         };
-        const applySynthesis = async () => {
+        const applySynthesisFromSteps = async () => {
           if (synthesisApplied || controllerClosed) return;
-          const synthesisText = await generateSynthesis();
-          if (synthesisText && !controllerClosed) {
-            for (const char of synthesisText) {
-              if (!safeEnqueue(char)) break;
+          try {
+            const steps = await streamResult.steps;
+            const allToolCalls = [];
+            const allToolResults = [];
+            if (steps) {
+              for (const step of steps) {
+                if (step.toolCalls) {
+                  for (const tc of step.toolCalls) {
+                    allToolCalls.push({
+                      toolCallId: tc.toolCallId,
+                      toolName: tc.toolName,
+                      input: tc.input
+                    });
+                  }
+                }
+                if (step.toolResults) {
+                  for (const tr of step.toolResults) {
+                    allToolResults.push({
+                      toolCallId: tr.toolCallId,
+                      toolName: tr.toolName,
+                      output: tr.output
+                    });
+                  }
+                }
+              }
+            }
+            if (allToolCalls.length > 0 && state.textContent.length < minStreamLength) {
+              const synthesisText = await generateSynthesis(
+                allToolCalls,
+                allToolResults
+              );
+              if (synthesisText && !controllerClosed) {
+                const chunkSize = 20;
+                for (let i = 0; i < synthesisText.length; i += chunkSize) {
+                  if (!safeEnqueue(synthesisText.slice(i, i + chunkSize)))
+                    break;
+                }
+              }
             }
+          } catch {
           }
         };
         const resetTimeout = () => {
           if (streamTimeout) clearTimeout(streamTimeout);
           streamTimeout = setTimeout(async () => {
             if (!streamComplete && !synthesisApplied && !controllerClosed) {
-              await applySynthesis();
+              await applySynthesisFromSteps();
             }
             safeClose();
           }, synthesisTimeout);
@@ -17318,7 +17381,7 @@ Based on the tool results above, please provide a comprehensive response to the
               if (streamTimeout) clearTimeout(streamTimeout);
               state.hasFinished = true;
               if (!synthesisApplied && !controllerClosed) {
-                await applySynthesis();
+                await applySynthesisFromSteps();
               }
               safeClose();
               break;
@@ -17342,7 +17405,7 @@ Based on the tool results above, please provide a comprehensive response to the
     return new ReadableStream({
       async start(controller) {
         let controllerClosed = false;
-        let hasSeenText = false;
+        let hasSeenMeaningfulText = false;
         let currentTextId = null;
         const safeClose = () => {
           if (!controllerClosed) {
@@ -17392,7 +17455,7 @@ Based on the tool results above, please provide a comprehensive response to the
                   output: tr.output
                 }));
               }
-              if (state.toolCalls.length > 0 && state.textContent.length < minStreamLength && !hasSeenText) {
+              if (state.toolCalls.length > 0 && state.textContent.length < minStreamLength && !hasSeenMeaningfulText) {
                 const synthesisText = await generateSynthesis();
                 if (synthesisText && synthesisText.length > 0) {
                   currentTextId = crypto.randomUUID();
@@ -17428,12 +17491,12 @@ Based on the tool results above, please provide a comprehensive response to the
               switch (part.type) {
                 case "text-delta":
                 case "text-delta-text": {
-                  hasSeenText = true;
                   const delta = typeof part.delta === "string" ? part.delta : "";
                   const text = typeof part.text === "string" ? part.text : "";
                   const textDelta = delta || text;
                   if (textDelta) {
                     state.textContent += textDelta;
+                    hasSeenMeaningfulText = true;
                   }
                   if (!currentTextId && typeof part.id === "string") {
                     currentTextId = part.id;
@@ -17441,7 +17504,6 @@ Based on the tool results above, please provide a comprehensive response to the
                   break;
                 }
                 case "text-start": {
-                  hasSeenText = true;
                   if (typeof part.id === "string") {
                     currentTextId = part.id;
                   }