ai-sdk-ollama 3.8.7 → 3.8.8

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 3.8.8
+
+### Patch Changes
+
+- b4dde41: Return AI SDK `tool-calls` finish reasons when Ollama responses emit tool calls.
+
 ## 3.8.7
 
 ### Patch Changes

package/dist/index.browser.cjs

@@ -525,7 +525,13 @@ function convertToOllamaChatMessages(prompt) {
 }
 
 // src/utils/map-ollama-finish-reason.ts
-function mapOllamaFinishReason(reason) {
+function mapOllamaFinishReason(reason, hasToolCalls = false) {
+  if (hasToolCalls) {
+    return {
+      unified: "tool-calls",
+      raw: reason || void 0
+    };
+  }
   if (!reason) {
     return {
       unified: "stop",
@@ -576,6 +582,28 @@ var OllamaError = class _OllamaError extends Error {
 // src/utils/object-generation-reliability.ts
 var import_provider_utils = require("@ai-sdk/provider-utils");
 var import_jsonrepair2 = require("jsonrepair");
+var WHITESPACE_CHARS = /* @__PURE__ */ new Set([" ", "	", "\n"]);
+var STRUCTURAL_CLOSE_CHARS = /* @__PURE__ */ new Set(["}", "]"]);
+var KEY_START_CHARS = /* @__PURE__ */ new Set(['"', "\u201C", "_", "$"]);
+var VALUE_START_CHARS = /* @__PURE__ */ new Set([
+  '"',
+  "\u201C",
+  "{",
+  "[",
+  "-",
+  "t",
+  "T",
+  "f",
+  "F",
+  "n",
+  "N"
+]);
+var SMART_SINGLE_QUOTE_CHARS = /* @__PURE__ */ new Set([
+  "\u2018",
+  "\u2019",
+  "`",
+  "\xB4"
+]);
 function isZodSchema(schema) {
   return typeof schema === "object" && schema !== null && "parse" in schema && typeof schema.parse === "function";
 }
@@ -926,11 +954,14 @@ function replaceSmartQuotesOutsideStrings(text) {
       let j = i + 1;
       while (j < text.length) {
         const nextChar = text[j];
-        if (nextChar === " " || nextChar === "	" || nextChar === "\n") {
+        if (!nextChar) {
+          break;
+        }
+        if (WHITESPACE_CHARS.has(nextChar)) {
           j++;
           continue;
         }
-        if (nextChar === "}" || nextChar === "]") {
+        if (STRUCTURAL_CLOSE_CHARS.has(nextChar)) {
           isClosing = true;
           break;
         }
@@ -941,18 +972,21 @@ function replaceSmartQuotesOutsideStrings(text) {
             if (!afterComma) {
               break;
             }
-            if (afterComma === " " || afterComma === "	" || afterComma === "\n") {
+            if (WHITESPACE_CHARS.has(afterComma)) {
               k++;
               continue;
             }
-            if (afterComma === '"' || afterComma === "\u201C" || afterComma >= "a" && afterComma <= "z" || afterComma >= "A" && afterComma <= "Z" || afterComma === "_" || afterComma === "$") {
+            if (KEY_START_CHARS.has(afterComma) || afterComma >= "a" && afterComma <= "z" || afterComma >= "A" && afterComma <= "Z") {
               isClosing = true;
               break;
             } else if (afterComma >= "0" && afterComma <= "9") {
               let m = k + 1;
               while (m < text.length) {
                 const afterDigit = text[m];
-                if (afterDigit === " " || afterDigit === "	" || afterDigit === "\n") {
+                if (!afterDigit) {
+                  break;
+                }
+                if (WHITESPACE_CHARS.has(afterDigit)) {
                   m++;
                   continue;
                 }
@@ -979,12 +1013,11 @@ function replaceSmartQuotesOutsideStrings(text) {
             if (!afterColon) {
               break;
             }
-            if (afterColon === " " || afterColon === "	" || afterColon === "\n") {
+            if (WHITESPACE_CHARS.has(afterColon)) {
               k++;
               continue;
             }
-            if (afterColon === '"' || afterColon === "\u201C" || // Opening smart quote
-            afterColon === "{" || afterColon === "[" || afterColon >= "0" && afterColon <= "9" || afterColon === "-" || afterColon === "t" || afterColon === "T" || afterColon === "f" || afterColon === "F" || afterColon === "n" || afterColon === "N") {
+            if (VALUE_START_CHARS.has(afterColon) || afterColon >= "0" && afterColon <= "9") {
               isClosing = true;
             }
             break;
@@ -1003,7 +1036,7 @@ function replaceSmartQuotesOutsideStrings(text) {
       }
     }
     if (!inSingleQuote && !inDoubleQuote && !inSmartDoubleQuote) {
-      if (char === "\u2018" || char === "\u2019" || char === "`" || char === "\xB4") {
+      if (char !== void 0 && SMART_SINGLE_QUOTE_CHARS.has(char)) {
         result += "'";
         i++;
         continue;
@@ -1862,7 +1895,10 @@ var OllamaChatLanguageModel = class {
           });
         }
       }
-      const finishReason = parsedToolCalls.length > 0 ? mapOllamaFinishReason("stop") : mapOllamaFinishReason(response.done_reason);
+      const finishReason = mapOllamaFinishReason(
+        response.done_reason,
+        parsedToolCalls.length > 0
+      );
       return {
         content,
         finishReason,
@@ -2455,7 +2491,10 @@ var OllamaChatLanguageModel = class {
               chunk.prompt_eval_count ?? void 0,
               chunk.eval_count ?? void 0
             );
-            finishReason = hasToolCalls ? mapOllamaFinishReason("stop") : mapOllamaFinishReason(chunk.done_reason);
+            finishReason = mapOllamaFinishReason(
+              chunk.done_reason,
+              hasToolCalls
+            );
             controller.enqueue({
               type: "finish",
               finishReason,