@ny4n/ai 1.2.0 → 1.3.0

package/LICENSE

@@ -1,6 +1,7 @@
 MIT License
 
 Copyright (c) 2025 Mario Zechner
+Copyright (c) 2026 Nyan contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/api/anthropic-messages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"anthropic-messages.d.ts","sourceRoot":"","sources":["../../src/api/anthropic-messages.ts"],"names":[],"mappings":"AAAA,OAAO,SAAiC,MAAM,mBAAmB,CAAC;AAmBlE,OAAO,KAAK,EASX,mBAAmB,EAEnB,cAAc,EACd,aAAa,EAMb,MAAM,aAAa,CAAC;AAoJrB,MAAM,MAAM,eAAe,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,OAAO,GAAG,KAAK,CAAC;AAE1E,MAAM,MAAM,wBAAwB,GAAG,YAAY,GAAG,SAAS,CAAC;AA2ChE,MAAM,WAAW,gBAAiB,SAAQ,aAAa;IACtD;;;;;;OAMG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;;;OAIG;IACH,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B;;;;;;;;;;;OAWG;IACH,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB;;;;;;;;;;;OAWG;IACH,eAAe,CAAC,EAAE,wBAAwB,CAAC;IAC3C;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,MAAM,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACtE;;;;OAIG;IACH,MAAM,CAAC,EAAE,SAAS,CAAC;CACnB;AAwRD,eAAO,MAAM,MAAM,EAAE,cAAc,CAAC,oBAAoB,EAAE,gBAAgB,CA0UzE,CAAC;AA2BF,eAAO,MAAM,YAAY,EAAE,cAAc,CAAC,oBAAoB,EAAE,mBAAmB,CAgDlF,CAAC"}
+{"version":3,"file":"anthropic-messages.d.ts","sourceRoot":"","sources":["../../src/api/anthropic-messages.ts"],"names":[],"mappings":"AAAA,OAAO,SAAiC,MAAM,mBAAmB,CAAC;AAmBlE,OAAO,KAAK,EASX,mBAAmB,EAEnB,cAAc,EACd,aAAa,EAMb,MAAM,aAAa,CAAC;AAoJrB,MAAM,MAAM,eAAe,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,OAAO,GAAG,KAAK,CAAC;AAE1E,MAAM,MAAM,wBAAwB,GAAG,YAAY,GAAG,SAAS,CAAC;AA2ChE,MAAM,WAAW,gBAAiB,SAAQ,aAAa;IACtD;;;;;;OAMG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;;;OAIG;IACH,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B;;;;;;;;;;;OAWG;IACH,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB;;;;;;;;;;;OAWG;IACH,eAAe,CAAC,EAAE,wBAAwB,CAAC;IAC3C;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,MAAM,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACtE;;;;OAIG;IACH,MAAM,CAAC,EAAE,SAAS,CAAC;CACnB;AAwRD,eAAO,MAAM,MAAM,EAAE,cAAc,CAAC,oBAAoB,EAAE,gBAAgB,CA2WzE,CAAC;AA2BF,eAAO,MAAM,YAAY,EAAE,cAAc,CAAC,oBAAoB,EAAE,mBAAmB,CAgDlF,CAAC"}

package/dist/api/anthropic-messages.js

@@ -425,21 +425,53 @@ export const stream = (model, context, options) => {
                 client = created.client;
                 isOAuth = created.isOAuthToken;
             }
-            let params = buildParams(model, normalizedContext, isOAuth, options);
-            const nextParams = await options?.onPayload?.(params, model);
-            if (nextParams !== undefined) {
-                params = { ...nextParams, stream: true };
-            }
             const requestOptions = {
                 ...(options?.signal ? { signal: options.signal } : {}),
                 ...(options?.timeoutMs !== undefined ? { timeout: options.timeoutMs } : {}),
                 maxRetries: 0,
             };
-            const response = await retryProviderRequest(() => client.beta.messages.create(params, requestOptions).asResponse(), {
-                maxRetries: options?.maxRetries,
-                maxRetryDelayMs: options?.maxRetryDelayMs,
-                signal: options?.signal,
-            });
+            let disablePreferredStrictTools = false;
+            let response;
+            for (;;) {
+                options?.signal?.throwIfAborted();
+                const built = buildParams(model, normalizedContext, isOAuth, options, disablePreferredStrictTools);
+                let params = built.params;
+                const nextParams = await options?.onPayload?.(params, model);
+                if (nextParams !== undefined) {
+                    params = { ...nextParams, stream: true };
+                }
+                try {
+                    response = await retryProviderRequest(() => client.beta.messages.create(params, requestOptions).asResponse(), {
+                        maxRetries: options?.maxRetries,
+                        maxRetryDelayMs: options?.maxRetryDelayMs,
+                        signal: options?.signal,
+                    });
+                    break;
+                }
+                catch (error) {
+                    // Only downgrade a rejected request, never an already-started stream.
+                    if (options?.signal?.aborted ||
+                        disablePreferredStrictTools ||
+                        !built.hasPreferredStrictTools ||
+                        !(error instanceof Anthropic.APIError) ||
+                        error.status !== 400 ||
+                        error.type !== "invalid_request_error" ||
+                        ![
+                            "The compiled grammar is too large",
+                            "Too many strict tools (",
+                            "Schemas contains too many parameters with union types (",
+                        ].some((message) => error.message.includes(message))) {
+                        throw error;
+                    }
+                    disablePreferredStrictTools = true;
+                    appendAssistantMessageDiagnostic(output, {
+                        type: "anthropic_strict_tools_fallback",
+                        timestamp: Date.now(),
+                        error: { message: error.message },
+                        details: { reason: "strict_tool_limits_exceeded" },
+                    });
+                }
+            }
             await options?.onResponse?.({ status: response.status, headers: headersToRecord(response.headers) }, model);
             stream.push({ type: "start", partial: output });
             const blocks = output.content;
@@ -855,7 +887,7 @@ function getBetaFeatures(model, context, isOAuthToken, nativeToolChanges, option
         features.push(INLINE_TOOLS_BETA);
     return [...new Set(features)];
 }
-function buildParams(model, context, isOAuthToken, options) {
+function buildParams(model, context, isOAuthToken, options, disablePreferredStrictTools = false) {
     const { cacheControl } = getCacheControl(model, options?.cacheRetention, options?.env);
     const compat = getAnthropicCompat(model);
     const initialSystemMessage = getInitialSystemMessage(context.messages);
@@ -866,11 +898,20 @@ function buildParams(model, context, isOAuthToken, options) {
     // by value in a `tool_addition` block, which also expresses same-name redefinitions.
     // Anthropic rejects a tool list where every tool is deferred, so there must be an initial
     // active tool to anchor the placeholder. Otherwise the current tool list is sent.
+    let hasPreferredStrictTools = false;
+    const convertToolDefinitions = (tools, toolCacheControl) => {
+        const definitions = convertTools(tools, isOAuthToken, compat.supportsEagerToolInputStreaming, compat.supportsStrictTools, toolCacheControl, disablePreferredStrictTools);
+        if (definitions.some((definition, index) => {
+            const config = tools[index].constrainedSampling;
+            return definition.strict === true && config && config.type === "json_schema" && config.strict === "prefer";
+        })) {
+            hasPreferredStrictTools = true;
+        }
+        return definitions;
+    };
     const initialTools = initialSystemMessage?.toolsAdded ?? [];
     const nativeToolChanges = compat.supportsMidConvoSystemMessages && compat.supportsMidConvoToolChanges && initialTools.length > 0;
-    const converted = convertMessages(conversationMessages, isOAuthToken, cacheControl, compat.allowEmptySignature, model.compat?.supportsMidConvoEffort === true ? model.provider : undefined, nativeToolChanges
-        ? (tools) => convertTools(tools, isOAuthToken, compat.supportsEagerToolInputStreaming, compat.supportsStrictTools)
-        : undefined);
+    const converted = convertMessages(conversationMessages, isOAuthToken, cacheControl, compat.allowEmptySignature, model.compat?.supportsMidConvoEffort === true ? model.provider : undefined, nativeToolChanges ? convertToolDefinitions : undefined);
     const activeEffort = options?.effort ?? "high";
     const betaFeatures = getBetaFeatures(model, context, isOAuthToken, nativeToolChanges, options);
     const params = {
@@ -922,15 +963,12 @@ function buildParams(model, context, isOAuthToken, options) {
         // placeholder. The list never changes afterwards: later tools are defined by value in
         // `tool_addition` blocks and withdrawn by `tool_removal`, so the cached prefix survives
         // every tool change.
-        params.tools = [
-            ...convertTools(initialTools, isOAuthToken, compat.supportsEagerToolInputStreaming, compat.supportsStrictTools, toolCacheControl),
-            DEFERRED_TOOL_PLACEHOLDER,
-        ];
+        params.tools = [...convertToolDefinitions(initialTools, toolCacheControl), DEFERRED_TOOL_PLACEHOLDER];
     }
     else {
         const tools = getCurrentTools(context.messages);
         if (tools.length > 0) {
-            params.tools = convertTools(tools, isOAuthToken, compat.supportsEagerToolInputStreaming, compat.supportsStrictTools, toolCacheControl);
+            params.tools = convertToolDefinitions(tools, toolCacheControl);
         }
     }
     // Managed effort models always use adaptive thinking so prefix mismatches can
@@ -986,17 +1024,24 @@ function buildParams(model, context, isOAuthToken, options) {
     if (allowedFallbackModels && allowedFallbackModels.length > 0) {
         params.fallbacks = allowedFallbackModels.map((fallback) => ({ model: fallback.model }));
     }
-    return params;
+    return { params, hasPreferredStrictTools };
 }
 // Normalize tool call IDs to match Anthropic's required pattern and length
 function normalizeToolCallId(id) {
     return id.replace(/[^a-zA-Z0-9_-]/g, "_").slice(0, 64);
 }
 function convertToolResult(msg) {
+    // Anthropic rejects error tool results that contain anything but text, so images are replaced
+    // with a note.
+    const content = msg.isError
+        ? msg.content.map((block) => block.type === "image"
+            ? { type: "text", text: "[image omitted: error tool results cannot contain images]" }
+            : block)
+        : msg.content;
     return {
         type: "tool_result",
         tool_use_id: msg.toolCallId,
-        content: convertContentBlocks(msg.content),
+        content: convertContentBlocks(content),
         is_error: msg.isError,
     };
 }
@@ -1255,11 +1300,14 @@ const isAnthropicStrictUnsupportedKeyword = (key, value) => {
         return typeof value !== "string" || !ANTHROPIC_STRICT_STRING_FORMATS.has(value);
     return false;
 };
-function convertTools(tools, isOAuthToken, supportsEagerToolInputStreaming, supportsStrictTools, cacheControl) {
+function convertTools(tools, isOAuthToken, supportsEagerToolInputStreaming, supportsStrictTools, cacheControl, disablePreferredStrictTools = false) {
     if (!tools)
         return [];
     return tools.map((tool, index) => {
-        const strict = resolveJsonSchemaStrictSampling(tool, supportsStrictTools, isAnthropicStrictUnsupportedKeyword);
+        const config = tool.constrainedSampling;
+        const strict = disablePreferredStrictTools && config && config.type === "json_schema" && config.strict === "prefer"
+            ? undefined
+            : resolveJsonSchemaStrictSampling(tool, supportsStrictTools, isAnthropicStrictUnsupportedKeyword);
         const parameters = getJsonSchemaToolParameters(tool, strict);
         const schema = parameters;
         const legacyInputSchema = {