@code-yeongyu/senpi-ai 2026.10.3 → 2026.10.5

package/dist/utils/tool-choice-fallback.d.ts

@@ -2,6 +2,16 @@ import type { Api, Model } from "../types.ts";
 /** The wire identity a forced tool_choice refusal is remembered under. */
 export type ForcedToolChoiceTarget = Pick<Model<Api>, "api" | "provider" | "baseUrl" | "id">;
 export declare function isForcedToolChoiceUnsupportedError(error: unknown, sentForcedToolChoice: boolean): boolean;
+/**
+ * A 400 to a request that forced a tool and whose message names that very tool: its `tools.N` /
+ * `tools[N]` position or its quoted name. Strict-schema gateways refuse the forced tool's schema this
+ * way (senpi#2648); the same request without the forced choice is accepted. A 400 that names
+ * no tool, or another one, is not this refusal.
+ */
+export declare function refusalNamesForcedTool(error: unknown, params: {
+    readonly tool_choice?: unknown;
+    readonly tools?: unknown;
+}): boolean;
 export declare function omitToolChoiceParam<TParams extends {
     tool_choice?: unknown;
 }>(params: TParams): TParams;

package/dist/utils/tool-choice-fallback.js

@@ -50,6 +50,44 @@ export function isForcedToolChoiceUnsupportedError(error, sentForcedToolChoice)
         // cannot force tool use. Use tool_choice 'auto' or 'none'."
         /tool[_\s-]?choice\s+cannot\s+force\s+tool\s+use/is.test(message));
 }
+/** The tool a `tool_choice` forces, in the wire shapes senpi sends (Chat Completions, Responses, Messages). */
+function forcedToolName(toolChoice) {
+    if (!isRecord(toolChoice))
+        return undefined;
+    const named = isRecord(toolChoice.function) ? toolChoice.function.name : toolChoice.name;
+    return typeof named === "string" && named.length > 0 ? named : undefined;
+}
+function toolNames(tools) {
+    if (!Array.isArray(tools))
+        return [];
+    return tools.map((tool) => {
+        if (!isRecord(tool))
+            return undefined;
+        const named = isRecord(tool.function) ? tool.function.name : tool.name;
+        return typeof named === "string" ? named : undefined;
+    });
+}
+function escapeRegExp(text) {
+    return text.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+/**
+ * A 400 to a request that forced a tool and whose message names that very tool: its `tools.N` /
+ * `tools[N]` position or its quoted name. Strict-schema gateways refuse the forced tool's schema this
+ * way (senpi#2648); the same request without the forced choice is accepted. A 400 that names
+ * no tool, or another one, is not this refusal.
+ */
+export function refusalNamesForcedTool(error, params) {
+    if (extractHttpStatus(error) !== 400)
+        return false;
+    const name = forcedToolName(params.tool_choice);
+    if (name === undefined)
+        return false;
+    const message = errorMessage(error);
+    const index = toolNames(params.tools).indexOf(name);
+    if (index >= 0 && new RegExp(`\\btools(?:\\.${index}|\\[${index}\\])(?!\\d)`).test(message))
+        return true;
+    return new RegExp(`['"\`]${escapeRegExp(name)}['"\`]`).test(message);
+}
 export function omitToolChoiceParam(params) {
     const nextParams = { ...params };
     delete nextParams.tool_choice;
@@ -82,7 +120,8 @@ export async function sendWithForcedToolChoiceFallback(request) {
         return { params: request.params, result: await request.send(request.params) };
     }
     catch (error) {
-        if (!isForcedToolChoiceUnsupportedError(error, forced))
+        if (!isForcedToolChoiceUnsupportedError(error, forced) &&
+            !(forced && refusalNamesForcedTool(error, request.params)))
             throw error;
         const params = omitToolChoiceParam(request.params);
         const result = await request.send(params);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@code-yeongyu/senpi-ai",
-	"version": "2026.10.3",
+	"version": "2026.10.5",
 	"description": "Unified LLM API with automatic model discovery and provider configuration",
 	"type": "module",
 	"main": "./dist/index.js",
@@ -88,7 +88,7 @@
 	"dependencies": {
 		"@anthropic-ai/sdk": "0.127.0",
 		"@aws-sdk/client-bedrock-runtime": "3.1136.0",
-		"@earendil-works/pi-telemetry": "npm:@code-yeongyu/senpi-telemetry@2026.10.3",
+		"@earendil-works/pi-telemetry": "npm:@code-yeongyu/senpi-telemetry@2026.10.5",
 		"@google/genai": "2.23.0",
 		"@smithy/node-http-handler": "4.12.1",
 		"http-proxy-agent": "9.1.0",