@code-yeongyu/senpi-ai 2026.8.14 → 2026.8.16

package/dist/api/openai-completions.js

@@ -11,7 +11,7 @@ import { retryProviderStreamRequest } from "../utils/provider-retry.js";
 import { sanitizeSurrogates } from "../utils/sanitize-unicode.js";
 import { isForcedToolChoiceUnsupportedError, omitToolChoiceParam } from "../utils/tool-choice-fallback.js";
 import { normalizeToolParametersForMoonshot, normalizeToolParametersForOpenAICompat, } from "../utils/tool-schema-compat.js";
-import { appendGrammarToolInputJsonDelta, createGrammarToolInputProperties, getGrammarToolInput, resolveGrammarConstrainedSampling, resolveJsonSchemaStrictSampling, } from "./constrained-sampling.js";
+import { appendGrammarToolInputJsonDelta, createGrammarToolInputProperties, getGrammarToolInput, getJsonSchemaToolParameters, resolveGrammarConstrainedSampling, resolveJsonSchemaStrictSampling, } from "./constrained-sampling.js";
 import { buildCopilotDynamicHeaders, hasCopilotVisionInput } from "./github-copilot-headers.js";
 import { resolveOpenAIClientAuth } from "./openai-client-auth.js";
 import { clampOpenAIPromptCacheKey } from "./openai-prompt-cache.js";
@@ -68,7 +68,7 @@ function getThinkingLevelMap(model, compat) {
     const isKimiK3 = id === "k3" || id.startsWith("k3-") || /(?:^|[/:-])kimi-k3(?:$|[/.:_-])/.test(id);
     const isDeepSeek = id.includes("deepseek");
     const isMiMo = /\bmimo\b/.test(id);
-    const isGlm52 = /(?:^|[/:-])glm-5\.2(?:$|[/.:_-])/.test(id);
+    const isGlm5x = /(?:^|[/:-])glm-5\.[23](?:$|[/.:_-])/.test(id);
     if (model.provider === "ollama") {
         return OLLAMA_THINKING_LEVEL_MAP;
     }
@@ -84,7 +84,7 @@ function getThinkingLevelMap(model, compat) {
     if (isDeepSeek) {
         return DEEPSEEK_THINKING_LEVEL_MAP;
     }
-    if (isGlm52) {
+    if (isGlm5x) {
         if (compat.thinkingFormat === "zai") {
             return DEEPSEEK_THINKING_LEVEL_MAP;
         }
@@ -756,8 +756,10 @@ function buildParams(model, context, options, compat = getCompat(model), cacheRe
         params.tool_choice = options.toolChoice;
     }
     if (compat.thinkingFormat === "zai" && model.reasoning) {
+        const isGlm53 = /(?:^|[/:-])glm-5\.3(?:$|[/.:_-])/.test(model.id.toLowerCase());
         const zaiParams = params;
-        zaiParams.thinking = options?.reasoningEffort ? { type: "enabled", clear_thinking: false } : { type: "disabled" };
+        zaiParams.thinking =
+            options?.reasoningEffort || isGlm53 ? { type: "enabled", clear_thinking: false } : { type: "disabled" };
         if (options?.reasoningEffort && compat.supportsReasoningEffort) {
             const effort = resolveReasoningEffort(thinkingLevelMap, options.reasoningEffort);
             if (effort !== undefined) {
@@ -1307,10 +1309,11 @@ function convertTools(tools, compat) {
         if (tool.freeform) {
             throw new Error("Freeform tools cannot be sent to OpenAI Chat Completions; use Responses API");
         }
-        const normalizedParameters = compat.toolSchemaFlavor === "moonshot-mfjs"
-            ? normalizeToolParametersForMoonshot(tool.parameters)
-            : normalizeToolParametersForOpenAICompat(tool.parameters);
         const strict = resolveJsonSchemaStrictSampling(tool, compat.supportsStrictMode !== false);
+        const schemaParameters = getJsonSchemaToolParameters(tool, strict);
+        const normalizedParameters = compat.toolSchemaFlavor === "moonshot-mfjs"
+            ? normalizeToolParametersForMoonshot(schemaParameters)
+            : normalizeToolParametersForOpenAICompat(schemaParameters);
         return {
             type: "function",
             function: {