@ai-sdk/anthropic 2.0.111 → 2.0.112

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @ai-sdk/anthropic
 
+## 2.0.112
+
+### Patch Changes
+
+- 0a069bd: Enable native structured output for supported Claude 5 models on Bedrock. In automatic mode, Bedrock and Anthropic now fall back for schemas that native structured output cannot represent: recursive references, open objects, or more than ten optional properties. Anthropic uses the JSON response tool; Bedrock Converse uses the JSON tool or JSON instructions for models that reject forced tool use. The JSON-tool fallback excludes disabled and unselected application tools. Explicit `outputFormat` selection remains unchanged.
+- 0a069bd: fix(anthropic): parse valid JSON string tool input and safely serialize BigInt and cycles in tool results
+- 0a069bd: Preserve final JSON text when a model answers without calling the JSON response tool, including open-schema fallbacks on Claude models that reject forced tools. Keep tool preambles out of structured output in generation and streaming.
+
+  When the model answers in text, streaming buffers that text until the message finishes to avoid exposing tool preambles as partial structured output.
+
+- Updated dependencies [0a069bd]
+- Updated dependencies [0a069bd]
+- Updated dependencies [0a069bd]
+  - @ai-sdk/provider-utils@3.0.44
+
 ## 2.0.111
 
 ### Patch Changes

package/dist/index.js

@@ -31,7 +31,7 @@ var import_provider4 = require("@ai-sdk/provider");
 var import_provider_utils22 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "2.0.111" : "0.0.0-test";
+var VERSION = true ? "2.0.112" : "0.0.0-test";
 
 // src/anthropic-messages-language-model.ts
 var import_provider3 = require("@ai-sdk/provider");
@@ -1937,7 +1937,7 @@ async function convertToAnthropicMessagesPrompt({
                   case "json":
                   case "error-json":
                   default:
-                    contentValue = JSON.stringify(output.value);
+                    contentValue = (0, import_provider_utils11.stringifyWithBigIntAndCycles)(output.value);
                     break;
                 }
                 const toolsetName = getAnthropicToolsetName({
@@ -2111,7 +2111,7 @@ async function convertToAnthropicMessagesPrompt({
                   type: "tool_use",
                   id: part.toolCallId,
                   name: part.toolName,
-                  input: part.input,
+                  input: parseToolCallInput(part.input),
                   cache_control: cacheControl
                 });
                 break;
@@ -2346,6 +2346,18 @@ function getAnthropicToolsetName({
   const fromMetadata = (_a = providerOptions == null ? void 0 : providerOptions.anthropic) == null ? void 0 : _a.toolsetName;
   return typeof fromMetadata === "string" ? fromMetadata : void 0;
 }
+function parseToolCallInput(input) {
+  if (typeof input === "string") {
+    try {
+      const parsed = (0, import_provider_utils11.secureJsonParse)(input);
+      if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
+        return parsed;
+      }
+    } catch (e) {
+    }
+  }
+  return input;
+}
 
 // src/map-anthropic-stop-reason.ts
 function mapAnthropicStopReason({
@@ -2516,6 +2528,187 @@ function isPlainObject(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
+// src/has-circular-schema-reference.ts
+var SCHEMA_MAP_KEYWORDS = /* @__PURE__ */ new Set([
+  "dependentSchemas",
+  "patternProperties",
+  "properties"
+]);
+var DATA_KEYWORDS = /* @__PURE__ */ new Set(["const", "default", "enum", "examples"]);
+function hasCircularSchemaReference(schema) {
+  const visiting = /* @__PURE__ */ new Set();
+  const visited = /* @__PURE__ */ new Set();
+  const visit = (pointer) => {
+    if (visiting.has(pointer)) {
+      return true;
+    }
+    if (visited.has(pointer)) {
+      return false;
+    }
+    const target = resolveSchemaPointer(schema, pointer);
+    if (target === void 0) {
+      return false;
+    }
+    visiting.add(pointer);
+    const isCircular = collectLocalRefs(target).some(visit);
+    visiting.delete(pointer);
+    visited.add(pointer);
+    return isCircular;
+  };
+  return visit("#");
+}
+function collectLocalRefs(node, refs = []) {
+  if (Array.isArray(node)) {
+    for (const item of node) {
+      collectLocalRefs(item, refs);
+    }
+    return refs;
+  }
+  if (!isRecord(node)) {
+    return refs;
+  }
+  for (const [key, value] of Object.entries(node)) {
+    if (key === "$ref") {
+      if (typeof value === "string" && value.startsWith("#")) {
+        refs.push(value);
+      }
+    } else if (SCHEMA_MAP_KEYWORDS.has(key) && isRecord(value)) {
+      for (const subschema of Object.values(value)) {
+        collectLocalRefs(subschema, refs);
+      }
+    } else if (
+      // definitions are only reached through a `$ref`:
+      key !== "$defs" && key !== "definitions" && !DATA_KEYWORDS.has(key)
+    ) {
+      collectLocalRefs(value, refs);
+    }
+  }
+  return refs;
+}
+function resolveSchemaPointer(schema, pointer) {
+  if (pointer === "#") {
+    return schema;
+  }
+  if (!pointer.startsWith("#/")) {
+    return void 0;
+  }
+  let decodedPointer;
+  try {
+    decodedPointer = decodeURIComponent(pointer.slice(2));
+  } catch (e) {
+    return void 0;
+  }
+  let current = schema;
+  for (const rawSegment of decodedPointer.split("/")) {
+    const segment = rawSegment.replace(/~1/g, "/").replace(/~0/g, "~");
+    if (Array.isArray(current)) {
+      current = current[Number(segment)];
+    } else if (isRecord(current)) {
+      current = current[segment];
+    } else {
+      return void 0;
+    }
+  }
+  return current;
+}
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+// src/supports-native-structured-output-schema.ts
+var MAX_OPTIONAL_PROPERTIES = 10;
+var SUBSCHEMA_KEYWORDS = [
+  "additionalProperties",
+  "contains",
+  "else",
+  "if",
+  "items",
+  "not",
+  "then"
+];
+var SUBSCHEMA_LIST_KEYWORDS = ["allOf", "anyOf", "oneOf", "prefixItems"];
+var SUBSCHEMA_MAP_KEYWORDS = [
+  "dependentSchemas",
+  "patternProperties",
+  "properties"
+];
+function supportsNativeStructuredOutputSchema(schema) {
+  if (schema.$ref != null || hasCircularSchemaReference(schema)) {
+    return false;
+  }
+  const { optionalProperties, hasOpenObject } = getSchemaStats(
+    schema,
+    schema,
+    /* @__PURE__ */ new Map()
+  );
+  return !hasOpenObject && optionalProperties <= MAX_OPTIONAL_PROPERTIES;
+}
+function getSchemaStats(node, root, refStats) {
+  const stats = { optionalProperties: 0, hasOpenObject: false };
+  if (!isRecord(node)) {
+    return stats;
+  }
+  const add = (child) => {
+    const childStats = getSchemaStats(child, root, refStats);
+    stats.optionalProperties += childStats.optionalProperties;
+    stats.hasOpenObject || (stats.hasOpenObject = childStats.hasOpenObject);
+  };
+  if (typeof node.$ref === "string" && node.$ref.startsWith("#")) {
+    let resolved = refStats.get(node.$ref);
+    if (resolved == null) {
+      resolved = getSchemaStats(
+        resolveSchemaPointer(root, node.$ref),
+        root,
+        refStats
+      );
+      refStats.set(node.$ref, resolved);
+    }
+    stats.optionalProperties += resolved.optionalProperties;
+    stats.hasOpenObject || (stats.hasOpenObject = resolved.hasOpenObject);
+  }
+  if (isOpenObject(node)) {
+    stats.hasOpenObject = true;
+  }
+  if (isRecord(node.properties)) {
+    const required = new Set(Array.isArray(node.required) ? node.required : []);
+    stats.optionalProperties += Object.keys(node.properties).filter(
+      (name) => !required.has(name)
+    ).length;
+  }
+  for (const keyword of SUBSCHEMA_KEYWORDS) {
+    const value = node[keyword];
+    if (Array.isArray(value)) {
+      value.forEach(add);
+    } else {
+      add(value);
+    }
+  }
+  for (const keyword of SUBSCHEMA_LIST_KEYWORDS) {
+    const value = node[keyword];
+    if (Array.isArray(value)) {
+      value.forEach(add);
+    }
+  }
+  for (const keyword of SUBSCHEMA_MAP_KEYWORDS) {
+    const value = node[keyword];
+    if (isRecord(value)) {
+      Object.values(value).forEach(add);
+    }
+  }
+  return stats;
+}
+function isOpenObject(node) {
+  const { additionalProperties, patternProperties, properties, type } = node;
+  if (additionalProperties === true || isRecord(additionalProperties)) {
+    return true;
+  }
+  if (isRecord(patternProperties) && Object.keys(patternProperties).length > 0) {
+    return true;
+  }
+  const isObjectType = type === "object" || Array.isArray(type) && type.includes("object");
+  return isObjectType && properties == null && additionalProperties !== false;
+}
+
 // src/anthropic-messages-language-model.ts
 function getAnthropicToolsetNames(tools) {
   const toolsetNames = {};
@@ -2573,6 +2766,31 @@ function createCitationSource(citation, citationDocuments, generateId3) {
     }
   };
 }
+var TEXT_OR_THINKING_BLOCK_TYPES = /* @__PURE__ */ new Set([
+  "redacted_thinking",
+  "text",
+  "thinking"
+]);
+function isContinuationStopReason(stopReason) {
+  return stopReason === "pause_turn" || stopReason === "tool_use";
+}
+function getJsonResponseToolFallbackText(content, stopReason, jsonResponseToolName) {
+  const text = /* @__PURE__ */ new Set();
+  if (isContinuationStopReason(stopReason)) {
+    return text;
+  }
+  for (const part of content) {
+    if (part.type === "tool_use" && part.name === jsonResponseToolName) {
+      return /* @__PURE__ */ new Set();
+    }
+    if (part.type === "text") {
+      text.add(part);
+    } else if (!TEXT_OR_THINKING_BLOCK_TYPES.has(part.type)) {
+      text.clear();
+    }
+  }
+  return text;
+}
 var AnthropicMessagesLanguageModel = class {
   constructor(modelId, config) {
     this.specificationVersion = "v2";
@@ -2700,9 +2918,10 @@ var AnthropicMessagesLanguageModel = class {
       }
     }
     const isAnthropicModel = isKnownModel || this.modelId.includes("claude-");
+    const supportsResponseSchema = (responseFormat == null ? void 0 : responseFormat.type) !== "json" || responseFormat.schema == null || supportsNativeStructuredOutputSchema(responseFormat.schema);
     const structureOutputMode = (_a = anthropicOptions == null ? void 0 : anthropicOptions.structuredOutputMode) != null ? _a : this.modelId.includes("claude-fable-5-1") || this.modelId.includes("claude-opus-5-5") || this.modelId.includes("claude-sonnet-5-5") ? "auto" : "jsonTool";
-    let useStructuredOutput = structureOutputMode === "outputFormat" || structureOutputMode === "auto" && supportsStructuredOutput;
-    if (!useStructuredOutput && rejectsForcedToolUse && supportsStructuredOutput && (responseFormat == null ? void 0 : responseFormat.type) === "json" && responseFormat.schema != null) {
+    let useStructuredOutput = structureOutputMode === "outputFormat" || structureOutputMode === "auto" && supportsStructuredOutput && supportsResponseSchema;
+    if (!useStructuredOutput && rejectsForcedToolUse && supportsStructuredOutput && (responseFormat == null ? void 0 : responseFormat.type) === "json" && responseFormat.schema != null && supportsResponseSchema) {
       warnings.push({
         type: "unsupported-setting",
         setting: "providerOptions.anthropic.structuredOutputMode",
@@ -3011,8 +3230,13 @@ var AnthropicMessagesLanguageModel = class {
       betas: toolsBetas
     } = await prepareTools(
       jsonResponseTool != null ? {
-        tools: [...tools != null ? tools : [], jsonResponseTool],
-        toolChoice: tools != null && tools.length > 0 ? { type: "required" } : { type: "tool", toolName: jsonResponseTool.name },
+        tools: [
+          ...(tools != null ? tools : []).filter(
+            (tool) => (toolChoice == null ? void 0 : toolChoice.type) !== "none" && ((toolChoice == null ? void 0 : toolChoice.type) !== "tool" || tool.name === toolChoice.toolName)
+          ),
+          jsonResponseTool
+        ],
+        toolChoice: rejectsForcedToolUse ? { type: "auto" } : tools != null && tools.length > 0 ? { type: "required" } : { type: "tool", toolName: jsonResponseTool.name },
         disableParallelToolUse: true,
         cacheControlValidator,
         rejectsForcedToolUse
@@ -3118,10 +3342,15 @@ var AnthropicMessagesLanguageModel = class {
     });
     const content = [];
     let isJsonResponseFromTool = false;
+    const jsonResponseToolFallbackText = jsonResponseToolName != null ? getJsonResponseToolFallbackText(
+      response.content,
+      response.stop_reason,
+      jsonResponseToolName
+    ) : void 0;
     for (const part of response.content) {
       switch (part.type) {
         case "text": {
-          if (jsonResponseToolName == null) {
+          if (jsonResponseToolFallbackText == null || jsonResponseToolFallbackText.has(part)) {
             const webSearchCitations = (_a = part.citations) == null ? void 0 : _a.filter(
               (citation) => citation.type === "web_search_result_location"
             );
@@ -3500,6 +3729,16 @@ var AnthropicMessagesLanguageModel = class {
     let iterations = null;
     let contextManagement = null;
     let isJsonResponseFromTool = false;
+    let rawStopReason;
+    const heldBackText = [];
+    const heldBackTextByIndex = /* @__PURE__ */ new Map();
+    const createTextEnd = (id, citations) => ({
+      type: "text-end",
+      id,
+      ...citations.length > 0 && {
+        providerMetadata: { anthropic: { citations } }
+      }
+    });
     let isMessageOpen = false;
     let activeMessageId;
     let hasInvalidMessageSequence = false;
@@ -3511,7 +3750,7 @@ var AnthropicMessagesLanguageModel = class {
           controller.enqueue({ type: "stream-start", warnings });
         },
         transform(chunk, controller) {
-          var _a2, _b2, _c, _d, _e, _f, _g, _h, _i, _j, _k;
+          var _a2, _b2, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
           if (hasInvalidMessageSequence) {
             return;
           }
@@ -3533,8 +3772,21 @@ var AnthropicMessagesLanguageModel = class {
                 return;
               }
               blockType = contentBlockType;
+              if (!TEXT_OR_THINKING_BLOCK_TYPES.has(contentBlockType)) {
+                heldBackText.length = 0;
+              }
               switch (contentBlockType) {
                 case "text": {
+                  if (jsonResponseToolName != null) {
+                    const entry = {
+                      id: String(value.index),
+                      text: "",
+                      citations: []
+                    };
+                    heldBackText.push(entry);
+                    heldBackTextByIndex.set(value.index, entry);
+                    return;
+                  }
                   contentBlocks[value.index] = {
                     type: "text",
                     citations: []
@@ -3870,6 +4122,8 @@ var AnthropicMessagesLanguageModel = class {
               switch (deltaType) {
                 case "text_delta": {
                   if (jsonResponseToolName != null) {
+                    const entry = heldBackTextByIndex.get(value.index);
+                    if (entry != null) entry.text += value.delta.text;
                     return;
                   }
                   controller.enqueue({
@@ -3948,8 +4202,10 @@ var AnthropicMessagesLanguageModel = class {
                 case "citations_delta": {
                   const citation = value.delta.citation;
                   const contentBlock = contentBlocks[value.index];
-                  if ((contentBlock == null ? void 0 : contentBlock.type) === "text" && citation.type === "web_search_result_location") {
-                    contentBlock.citations.push(citation);
+                  if (citation.type === "web_search_result_location") {
+                    if ((contentBlock == null ? void 0 : contentBlock.type) === "text")
+                      contentBlock.citations.push(citation);
+                    (_b2 = heldBackTextByIndex.get(value.index)) == null ? void 0 : _b2.citations.push(citation);
                   }
                   const source = createCitationSource(
                     citation,
@@ -3986,16 +4242,17 @@ var AnthropicMessagesLanguageModel = class {
               }
               isMessageOpen = true;
               activeMessageId = value.message.id;
+              heldBackTextByIndex.clear();
               usage.inputTokens = value.message.usage.input_tokens;
-              usage.cachedInputTokens = (_b2 = value.message.usage.cache_read_input_tokens) != null ? _b2 : void 0;
+              usage.cachedInputTokens = (_c = value.message.usage.cache_read_input_tokens) != null ? _c : void 0;
               rawUsage = {
                 ...value.message.usage
               };
-              cacheCreationInputTokens = (_c = value.message.usage.cache_creation_input_tokens) != null ? _c : null;
+              cacheCreationInputTokens = (_d = value.message.usage.cache_creation_input_tokens) != null ? _d : null;
               controller.enqueue({
                 type: "response-metadata",
-                id: (_d = value.message.id) != null ? _d : void 0,
-                modelId: (_e = value.message.model) != null ? _e : void 0
+                id: (_e = value.message.id) != null ? _e : void 0,
+                modelId: (_f = value.message.model) != null ? _f : void 0
               });
               return;
             }
@@ -4009,7 +4266,7 @@ var AnthropicMessagesLanguageModel = class {
               if (value.usage.iterations != null) {
                 iterations = value.usage.iterations;
               }
-              const servedByFallback = (_f = value.usage.iterations) == null ? void 0 : _f.some(
+              const servedByFallback = (_g = value.usage.iterations) == null ? void 0 : _g.some(
                 (iter) => iter.type === "fallback_message"
               );
               if (value.usage.iterations && value.usage.iterations.length > 0 && !servedByFallback) {
@@ -4028,21 +4285,22 @@ var AnthropicMessagesLanguageModel = class {
                 }
                 usage.outputTokens = value.usage.output_tokens;
               }
-              usage.totalTokens = ((_g = usage.inputTokens) != null ? _g : 0) + ((_h = usage.outputTokens) != null ? _h : 0);
+              usage.totalTokens = ((_h = usage.inputTokens) != null ? _h : 0) + ((_i = usage.outputTokens) != null ? _i : 0);
+              rawStopReason = value.delta.stop_reason;
               finishReason = mapAnthropicStopReason({
                 finishReason: value.delta.stop_reason,
                 isJsonResponseFromTool
               });
               stopDetails = mapAnthropicStopDetails(value.delta.stop_details);
-              stopSequence = (_i = value.delta.stop_sequence) != null ? _i : null;
+              stopSequence = (_j = value.delta.stop_sequence) != null ? _j : null;
               container = value.delta.container != null ? {
                 expiresAt: value.delta.container.expires_at,
                 id: value.delta.container.id,
-                skills: (_k = (_j = value.delta.container.skills) == null ? void 0 : _j.map((skill) => ({
+                skills: (_l = (_k = value.delta.container.skills) == null ? void 0 : _k.map((skill) => ({
                   type: skill.type,
                   skillId: skill.skill_id,
                   version: skill.version
-                }))) != null ? _k : null
+                }))) != null ? _l : null
               } : null;
               if (value.context_management != null) {
                 contextManagement = {
@@ -4080,6 +4338,15 @@ var AnthropicMessagesLanguageModel = class {
             case "message_stop": {
               isMessageOpen = false;
               activeMessageId = void 0;
+              if (!isJsonResponseFromTool && !isContinuationStopReason(rawStopReason)) {
+                for (const { id, text, citations } of heldBackText) {
+                  if (text.length === 0) continue;
+                  controller.enqueue({ type: "text-start", id });
+                  controller.enqueue({ type: "text-delta", id, delta: text });
+                  controller.enqueue(createTextEnd(id, citations));
+                }
+              }
+              heldBackText.length = 0;
               controller.enqueue({
                 type: "finish",
                 finishReason,