llm-simple-router 0.9.27 → 0.9.29

package/config/recommended-providers.json

@@ -7,6 +7,7 @@
         "presetName": "deepseek",
         "apiType": "anthropic",
         "baseUrl": "https://api.deepseek.com/anthropic",
+        "modelsEndpoint": "/v1/models",
         "models": [
           "deepseek-v4-flash",
           "deepseek-v4-pro"
@@ -17,6 +18,7 @@
         "presetName": "deepseek-openai",
         "apiType": "openai",
         "baseUrl": "https://api.deepseek.com",
+        "modelsEndpoint": "/v1/models",
         "models": [
           "deepseek-v4-flash",
           "deepseek-v4-pro"
@@ -32,6 +34,7 @@
         "presetName": "qianfan",
         "apiType": "openai",
         "baseUrl": "https://qianfan.baidubce.com/v2",
+        "modelsEndpoint": "/v1/models",
         "models": [
           "ernie-4.0-8k",
           "ernie-4.0-turbo-8k",
@@ -54,6 +57,7 @@
         "presetName": "iflytek-spark",
         "apiType": "openai",
         "baseUrl": "https://spark-api-open.xf-yun.com",
+        "modelsEndpoint": "/v1/models",
         "models": [
           "4.0Ultra",
           "generalv3.5",
@@ -73,6 +77,7 @@
         "presetName": "siliconflow",
         "apiType": "openai",
         "baseUrl": "https://api.siliconflow.cn",
+        "modelsEndpoint": "/v1/models",
         "models": [
           "deepseek-ai/DeepSeek-V3.2-Exp",
           "deepseek-ai/DeepSeek-R1",
@@ -93,6 +98,7 @@
         "presetName": "zhipu-coding-plan",
         "apiType": "anthropic",
         "baseUrl": "https://open.bigmodel.cn/api/anthropic",
+        "modelsEndpoint": "/v1/models",
         "models": [
           "glm-5.1",
           "glm-5",
@@ -106,6 +112,7 @@
         "presetName": "zhipu",
         "apiType": "openai",
         "baseUrl": "https://open.bigmodel.cn/api/paas/v4",
+        "modelsEndpoint": "/models",
         "models": [
           "glm-5.1",
           "glm-5",
@@ -125,6 +132,7 @@
         "presetName": "kimi-coding-plan",
         "apiType": "anthropic",
         "baseUrl": "https://api.kimi.com/coding",
+        "modelsEndpoint": "/v1/models",
         "models": [
           "kimi-for-coding",
           "kimi-k2.5"
@@ -135,6 +143,7 @@
         "presetName": "kimi",
         "apiType": "openai",
         "baseUrl": "https://api.moonshot.cn",
+        "modelsEndpoint": "/v1/models",
         "models": [
           "kimi-k2.6",
           "kimi-k2.5",
@@ -153,6 +162,7 @@
         "presetName": "minimax-token-plan",
         "apiType": "anthropic",
         "baseUrl": "https://api.minimaxi.com/anthropic",
+        "modelsEndpoint": "/v1/models",
         "models": [
           "MiniMax-M2.7"
         ]
@@ -162,6 +172,7 @@
         "presetName": "minimax",
         "apiType": "openai",
         "baseUrl": "https://api.minimax.chat",
+        "modelsEndpoint": "/v1/models",
         "models": [
           "MiniMax-M2.7",
           "MiniMax-M2.7-highspeed",
@@ -181,6 +192,7 @@
         "presetName": "volcengine-coding-plan",
         "apiType": "anthropic",
         "baseUrl": "https://ark.cn-beijing.volces.com/api/coding",
+        "modelsEndpoint": "/v1/models",
         "models": [
           "ark-code-latest",
           "doubao-seed-2.0-code",
@@ -194,6 +206,7 @@
         "presetName": "volcengine",
         "apiType": "openai",
         "baseUrl": "https://ark.cn-beijing.volces.com/api/v3",
+        "modelsEndpoint": "/models",
         "models": [
           "doubao-seed-2-0-pro-260215",
           "doubao-seed-1-8-251228",
@@ -224,6 +237,7 @@
         "presetName": "aliyun",
         "apiType": "openai",
         "baseUrl": "https://dashscope.aliyuncs.com/compatible-mode",
+        "modelsEndpoint": "/v1/models",
         "models": [
           "qwen3.6-plus",
           "qwen3.5-plus",
@@ -243,6 +257,7 @@
         "presetName": "tencent-coding-plan",
         "apiType": "anthropic",
         "baseUrl": "https://api.lkeap.cloud.tencent.com/coding/anthropic",
+        "modelsEndpoint": "/v1/models",
         "models": [
           "tc-code-latest",
           "hunyuan-2.0-instruct",
@@ -258,6 +273,7 @@
         "presetName": "tencent",
         "apiType": "openai",
         "baseUrl": "https://api.hunyuan.cloud.tencent.com",
+        "modelsEndpoint": "/v1/models",
         "models": [
           "hunyuan-2.0-thinking",
           "hunyuan-2.0-instruct",
@@ -276,6 +292,7 @@
         "presetName": "opencode-go-openai",
         "apiType": "openai",
         "baseUrl": "https://opencode.ai/zen/go/v1/chat/completions",
+        "modelsEndpoint": "/models",
         "models": [
           "glm-5.1",
           "glm-5",
@@ -311,6 +328,7 @@
         "presetName": "stepfun-step-plan",
         "apiType": "anthropic",
         "baseUrl": "https://api.stepfun.com/step_plan",
+        "modelsEndpoint": "/v1/models",
         "models": [
           "step-3.5-flash-2603",
           "step-3.5-flash"
@@ -321,6 +339,7 @@
         "presetName": "stepfun",
         "apiType": "openai",
         "baseUrl": "https://api.stepfun.com",
+        "modelsEndpoint": "/v1/models",
         "models": [
           "step-3.5-flash",
           "step-3",

package/dist/admin/constants.d.ts

@@ -1 +1 @@
-export { HTTP_BAD_REQUEST, HTTP_CREATED, HTTP_FORBIDDEN, HTTP_NOT_FOUND, HTTP_CONFLICT, HTTP_INTERNAL_ERROR, HTTP_BAD_GATEWAY, HTTP_SERVICE_UNAVAILABLE, } from "../core/constants.js";
+export { HTTP_OK, HTTP_BAD_REQUEST, HTTP_CREATED, HTTP_FORBIDDEN, HTTP_NOT_FOUND, HTTP_CONFLICT, HTTP_INTERNAL_ERROR, HTTP_BAD_GATEWAY, HTTP_SERVICE_UNAVAILABLE, } from "../core/constants.js";

package/dist/admin/constants.js

@@ -1,2 +1,2 @@
 // HTTP 状态码统一从 core/constants.ts 导入，避免重复定义
-export { HTTP_BAD_REQUEST, HTTP_CREATED, HTTP_FORBIDDEN, HTTP_NOT_FOUND, HTTP_CONFLICT, HTTP_INTERNAL_ERROR, HTTP_BAD_GATEWAY, HTTP_SERVICE_UNAVAILABLE, } from "../core/constants.js";
+export { HTTP_OK, HTTP_BAD_REQUEST, HTTP_CREATED, HTTP_FORBIDDEN, HTTP_NOT_FOUND, HTTP_CONFLICT, HTTP_INTERNAL_ERROR, HTTP_BAD_GATEWAY, HTTP_SERVICE_UNAVAILABLE, } from "../core/constants.js";

package/dist/admin/providers.js

@@ -2,11 +2,14 @@ import { Type } from "@sinclair/typebox";
 import { getAllProviders, getProviderById, createProvider, updateProvider, deleteProvider, getAllMappingGroups, updateMappingGroup, PROVIDER_CONCURRENCY_DEFAULTS } from "../db/index.js";
 import { encrypt, decrypt } from "../utils/crypto.js";
 import { getSetting } from "../db/settings.js";
-import { HTTP_CREATED, HTTP_NOT_FOUND, HTTP_CONFLICT, HTTP_BAD_REQUEST } from "./constants.js";
+import { HTTP_CREATED, HTTP_NOT_FOUND, HTTP_CONFLICT, HTTP_BAD_REQUEST, HTTP_OK } from "./constants.js";
 import { API_CODE, apiError } from "./api-response.js";
 import { parseModels, buildModelInfoList } from "../config/model-context.js";
 import { getModelInfoForProvider, setModelInfoForProvider, deleteAllModelInfoForProvider } from "../db/model-info.js";
+import { buildUpstreamHeaders } from "../proxy/proxy-core.js";
+import { callGet } from "../proxy/transport/http.js";
 const API_KEY_PREVIEW_MIN_LENGTH = 8;
+const FETCH_MODELS_BODY_PREVIEW_LENGTH = 200;
 function cascadeProviderDisable(db, providerId) {
     const result = { updatedGroups: [] };
     const groups = getAllMappingGroups(db);
@@ -96,10 +99,10 @@ const CreateProviderSchema = Type.Object({
     queue_timeout_ms: Type.Optional(Type.Integer({ minimum: 0 })),
     max_queue_size: Type.Optional(Type.Integer({ minimum: 1 })),
     adaptive_enabled: Type.Optional(Type.Integer({ minimum: 0, maximum: 1 })),
-    proxy_type: Type.Optional(Type.Union([Type.Literal("http"), Type.Literal("socks5")])),
-    proxy_url: Type.Optional(Type.String({ minLength: 1 })),
-    proxy_username: Type.Optional(Type.String()),
-    proxy_password: Type.Optional(Type.String()),
+    proxy_type: Type.Optional(Type.Union([Type.Literal("http"), Type.Literal("socks5"), Type.Null()])),
+    proxy_url: Type.Optional(Type.Union([Type.String({ minLength: 1 }), Type.Null()])),
+    proxy_username: Type.Optional(Type.Union([Type.String(), Type.Null()])),
+    proxy_password: Type.Optional(Type.Union([Type.String(), Type.Null()])),
 });
 const UpdateProviderSchema = Type.Object({
     name: Type.Optional(Type.String({ minLength: 1 })),
@@ -117,10 +120,10 @@ const UpdateProviderSchema = Type.Object({
     queue_timeout_ms: Type.Optional(Type.Integer({ minimum: 0 })),
     max_queue_size: Type.Optional(Type.Integer({ minimum: 1 })),
     adaptive_enabled: Type.Optional(Type.Integer({ minimum: 0, maximum: 1 })),
-    proxy_type: Type.Optional(Type.Union([Type.Literal("http"), Type.Literal("socks5")])),
-    proxy_url: Type.Optional(Type.String({ minLength: 1 })),
-    proxy_username: Type.Optional(Type.String()),
-    proxy_password: Type.Optional(Type.String()),
+    proxy_type: Type.Optional(Type.Union([Type.Literal("http"), Type.Literal("socks5"), Type.Null()])),
+    proxy_url: Type.Optional(Type.Union([Type.String({ minLength: 1 }), Type.Null()])),
+    proxy_username: Type.Optional(Type.Union([Type.String(), Type.Null()])),
+    proxy_password: Type.Optional(Type.Union([Type.String(), Type.Null()])),
 });
 export const adminProviderRoutes = (app, options, done) => {
     const { db, stateRegistry, tracker, adaptiveController, proxyAgentFactory } = options;
@@ -164,11 +167,11 @@ export const adminProviderRoutes = (app, options, done) => {
         const encryptedKey = encrypt(body.api_key, getSetting(db, "encryption_key"));
         const { entries: normalizedModels, overrides: contextOverrides } = extractModelOverrides((body.models ?? []));
         const isAdaptiveEnabled = body.adaptive_enabled ?? 0;
-        if (body.proxy_type && !body.proxy_url) {
-            return reply.code(HTTP_BAD_REQUEST).send(apiError(API_CODE.VALIDATION_FAILED, "proxy_url is required when proxy_type is set"));
-        }
-        const encryptedProxyUsername = body.proxy_username ? encrypt(body.proxy_username, getSetting(db, "encryption_key")) : null;
-        const encryptedProxyPassword = body.proxy_password ? encrypt(body.proxy_password, getSetting(db, "encryption_key")) : null;
+        // 将空 proxy_url 视为不使用代理
+        const effectiveProxyType = body.proxy_url?.trim() ? body.proxy_type : null;
+        const effectiveProxyUrl = body.proxy_url?.trim() || null;
+        const encryptedProxyUsername = (effectiveProxyType && body.proxy_username) ? encrypt(body.proxy_username, getSetting(db, "encryption_key")) : null;
+        const encryptedProxyPassword = (effectiveProxyType && body.proxy_password) ? encrypt(body.proxy_password, getSetting(db, "encryption_key")) : null;
         const id = createProvider(db, {
             name: body.name,
             api_type: body.api_type,
@@ -182,8 +185,8 @@ export const adminProviderRoutes = (app, options, done) => {
             queue_timeout_ms: body.queue_timeout_ms ?? PROVIDER_CONCURRENCY_DEFAULTS.queue_timeout_ms,
             max_queue_size: body.max_queue_size ?? PROVIDER_CONCURRENCY_DEFAULTS.max_queue_size,
             adaptive_enabled: isAdaptiveEnabled,
-            proxy_type: body.proxy_type ?? null,
-            proxy_url: body.proxy_type ? body.proxy_url : null,
+            proxy_type: effectiveProxyType,
+            proxy_url: effectiveProxyUrl,
             proxy_username: encryptedProxyUsername,
             proxy_password: encryptedProxyPassword,
         });
@@ -255,22 +258,21 @@ export const adminProviderRoutes = (app, options, done) => {
             fields.api_key = encrypt(body.api_key, getSetting(db, "encryption_key"));
             fields.api_key_preview = body.api_key.length > API_KEY_PREVIEW_MIN_LENGTH ? `${body.api_key.slice(0, API_KEY_PREVIEW_PREFIX_LEN)}...${body.api_key.slice(-API_KEY_PREVIEW_PREFIX_LEN)}` : "****";
         }
-        // Proxy field handling
-        if (body.proxy_type !== undefined) {
-            fields.proxy_type = body.proxy_type || null;
-            if (!body.proxy_type) {
-                fields.proxy_url = null;
+        // Proxy field handling - 空URL视为不使用代理
+        const effectiveProxyUrl = body.proxy_url !== undefined ? (body.proxy_url?.trim() || null) : undefined;
+        const effectiveProxyType = effectiveProxyUrl !== undefined ? (effectiveProxyUrl ? body.proxy_type : null) : undefined;
+        if (effectiveProxyType !== undefined) {
+            fields.proxy_type = effectiveProxyType;
+            fields.proxy_url = effectiveProxyUrl;
+            if (!effectiveProxyType) {
                 fields.proxy_username = null;
                 fields.proxy_password = null;
             }
         }
-        if (body.proxy_url !== undefined && body.proxy_type) {
-            fields.proxy_url = body.proxy_url;
-        }
-        if (body.proxy_username !== undefined && body.proxy_type) {
+        if (body.proxy_username !== undefined && effectiveProxyType) {
             fields.proxy_username = body.proxy_username ? encrypt(body.proxy_username, getSetting(db, "encryption_key")) : null;
         }
-        if (body.proxy_password !== undefined && body.proxy_type) {
+        if (body.proxy_password !== undefined && effectiveProxyType) {
             fields.proxy_password = body.proxy_password ? encrypt(body.proxy_password, getSetting(db, "encryption_key")) : null;
         }
         updateProvider(db, id, fields);
@@ -374,6 +376,52 @@ export const adminProviderRoutes = (app, options, done) => {
         tracker?.removeProviderConfig(id);
         return reply.send({ success: true });
     });
+    // --- 从上游 Provider 获取可用模型列表 ---
+    const FetchModelsSchema = Type.Object({
+        base_url: Type.String({ minLength: 1 }),
+        models_endpoint: Type.String({ minLength: 1 }),
+        api_key: Type.String({ minLength: 1 }),
+        api_type: Type.Union([Type.Literal("openai"), Type.Literal("anthropic")]),
+    });
+    app.post("/admin/api/providers/fetch-models", { schema: { body: FetchModelsSchema } }, async (request, reply) => {
+        const { base_url, models_endpoint, api_key, api_type } = request.body;
+        const backend = { base_url };
+        const clientHeaders = {};
+        try {
+            const result = await callGet(backend, api_key, clientHeaders, models_endpoint, (cliHdrs, key) => buildUpstreamHeaders(cliHdrs, key, undefined, api_type));
+            if (result.statusCode !== HTTP_OK) {
+                return reply.code(HTTP_BAD_REQUEST).send(apiError(API_CODE.BAD_REQUEST, `上游返回 HTTP ${result.statusCode}: ${result.body.substring(0, FETCH_MODELS_BODY_PREVIEW_LENGTH)}`));
+            }
+            let parsed;
+            try {
+                parsed = JSON.parse(result.body);
+            }
+            catch {
+                return reply.code(HTTP_BAD_REQUEST).send(apiError(API_CODE.BAD_REQUEST, "上游返回非 JSON 响应"));
+            }
+            // OpenAI 格式: { object: "list", data: [{ id: "model-name", ... }] }
+            // Anthropic 格式: { data: [{ type: "model", id: "model-name", ... }] }
+            const data = parsed?.data;
+            if (!Array.isArray(data)) {
+                return reply.code(HTTP_BAD_REQUEST).send(apiError(API_CODE.BAD_REQUEST, "上游返回的模型列表格式不符合预期"));
+            }
+            const modelIds = data
+                .map((item) => {
+                if (typeof item === "string")
+                    return item;
+                if (typeof item === "object" && item !== null && "id" in item)
+                    return item.id;
+                return null;
+            })
+                .filter((id) => typeof id === "string")
+                .sort();
+            return reply.send(modelIds);
+        }
+        catch (err) {
+            const message = err instanceof Error ? err.message : String(err);
+            return reply.code(HTTP_BAD_REQUEST).send(apiError(API_CODE.BAD_REQUEST, `连接上游失败: ${message}`));
+        }
+    });
     app.get("/admin/api/providers/:id/adaptive-status", async (request, reply) => {
         const { id } = request.params;
         const status = adaptiveController?.getStatus(id);

package/dist/admin/upgrade.js

@@ -1,8 +1,8 @@
 import { getConfigSyncSource, setConfigSyncSource } from '../db/settings.js';
-import { detectDeployment, hasProcessManager, resolveRestartBinPath, getRestartMethod } from '../upgrade/deployment.js';
+import { detectDeployment, hasProcessManager, getRestartMethod } from '../upgrade/deployment.js';
 import { createUpgradeChecker, fetchJson } from '../upgrade/checker.js';
 import { reloadConfig } from '../config/recommended.js';
-import { execSync, spawn } from 'node:child_process';
+import { execSync } from 'node:child_process';
 import fs from 'node:fs';
 import path from 'node:path';
 import { HTTP_BAD_REQUEST, HTTP_INTERNAL_ERROR } from '../core/constants.js';
@@ -86,28 +86,19 @@ export const adminUpgradeRoutes = (app, options, done) => {
     app.post('/admin/api/upgrade/restart', async (req, reply) => {
         const managed = hasProcessManager();
         const method = getRestartMethod();
+        if (!managed) {
+            // 无进程管理器（npx / 手动 node）时无法安全自动重启：
+            // 1. spawn 路径不可靠（npx 不注册全局 bin）
+            // 2. 新旧进程端口竞态（EADDRINUSE）
+            // 3. 原始启动参数无法复现
+            return reply.code(HTTP_BAD_REQUEST).send(apiError(API_CODE.BAD_REQUEST, 'No process manager detected (PM2/systemd/Docker). Please restart manually.'));
+        }
         // 先回复客户端，再执行重启（否则客户端收不到响应）
         reply.send({ ok: true, method });
         // 给响应发送窗口
         await new Promise((resolve) => setTimeout(resolve, RESTART_RESPONSE_FLUSH_MS));
         try {
             req.log.info({ method, managed }, 'Restarting server...');
-            if (!managed) {
-                // 无进程管理器（npx / 手动 node）：先 spawn 新进程，再关闭旧进程。
-                // 必须在 closeFn 之前 spawn，否则 closeFn 可能因活跃 SSE 连接卡住导致新进程永远不启动。
-                const binPath = resolveRestartBinPath();
-                const args = process.argv.slice(2); // eslint-disable-line no-magic-numbers
-                req.log.info({ binPath, args }, 'Spawning new process before exit');
-                const child = spawn(binPath, args, {
-                    detached: true,
-                    stdio: 'ignore',
-                    env: { ...process.env },
-                });
-                child.on('error', (err) => {
-                    req.log.error({ err, binPath }, 'Failed to spawn new process');
-                });
-                child.unref();
-            }
             // 强制退出兜底：即使 closeFn 卡住（如活跃代理 SSE 流），也能确保进程退出。
             const forceExitTimer = setTimeout(() => {
                 req.log.warn('Graceful shutdown timed out during restart, forcing exit');
@@ -121,7 +112,6 @@ export const adminUpgradeRoutes = (app, options, done) => {
             process.exit(0);
         }
         catch (err) {
-            // 优雅关闭失败时也必须退出：新进程已经 spawn，旧进程必须让出端口
             const msg = err instanceof Error ? err.message : String(err);
             req.log.error({ err }, `Restart failed: ${msg}`);
             process.exit(1);

package/dist/config/model-context.d.ts

@@ -14,5 +14,7 @@ export declare const MODEL_CONTEXT_WINDOWS: Record<string, number>;
 export declare const DEFAULT_CONTEXT_WINDOW = 200000;
 export declare const OVERFLOW_THRESHOLD = 1000000;
 export declare function lookupContextWindow(modelName: string): number;
+/** 标准化 patch 名称：连字符 → 下划线 */
+export declare function normalizePatchName(name: string): string;
 export declare function parseModels(raw: string): ModelEntry[];
 export declare function buildModelInfoList(modelEntries: ModelEntry[], overrides: Map<string, number>): ModelInfo[];

package/dist/config/model-context.js

@@ -85,7 +85,7 @@ export function lookupContextWindow(modelName) {
     return MODEL_CONTEXT_WINDOWS[modelName] ?? DEFAULT_CONTEXT_WINDOW;
 }
 /** 标准化 patch 名称：连字符 → 下划线 */
-function normalizePatchName(name) {
+export function normalizePatchName(name) {
     return name.replace(/-/g, "_");
 }
 export function parseModels(raw) {

package/dist/config/recommended.d.ts

@@ -4,6 +4,8 @@ export interface ProviderPreset {
     apiType: 'openai' | 'openai-responses' | 'anthropic';
     baseUrl: string;
     upstreamPath?: string;
+    /** 上游模型列表端点路径，如 /v1/models 或 /models；拼接在 baseUrl 后 */
+    modelsEndpoint?: string;
     models: string[];
 }
 export interface ProviderGroup {

package/dist/proxy/patch/deepseek/index.d.ts

@@ -12,7 +12,8 @@
  *   4. patchOrphanToolResults — 清理孤儿 tool_result
  *
  * OpenAI 格式执行顺序（参考 docs/deepseek-patch-investigation.md §5.5）：
- *   1. patchNonDeepSeekToolMessages — 将非 DeepSeek 生成的 tool_calls 降级为 text
- *   2. patchOrphanToolResultsOA — 处理孤儿 tool 消息
+ *   1. patchThinkingParam — 检测历史 reasoning_content，注入 thinking 参数
+ *   2. patchNonDeepSeekToolMessages — 将非 DeepSeek 生成的 tool_calls 降级为 text
+ *   3. patchOrphanToolResultsOA — 处理孤儿 tool 消息
  */
 export declare function applyDeepSeekPatches(body: Record<string, unknown>, apiType: "openai" | "openai-responses" | "anthropic"): void;

package/dist/proxy/patch/deepseek/index.js

@@ -17,8 +17,9 @@ import { patchOrphanToolResults, patchOrphanToolResultsOA } from "./patch-orphan
  *   4. patchOrphanToolResults — 清理孤儿 tool_result
  *
  * OpenAI 格式执行顺序（参考 docs/deepseek-patch-investigation.md §5.5）：
- *   1. patchNonDeepSeekToolMessages — 将非 DeepSeek 生成的 tool_calls 降级为 text
- *   2. patchOrphanToolResultsOA — 处理孤儿 tool 消息
+ *   1. patchThinkingParam — 检测历史 reasoning_content，注入 thinking 参数
+ *   2. patchNonDeepSeekToolMessages — 将非 DeepSeek 生成的 tool_calls 降级为 text
+ *   3. patchOrphanToolResultsOA — 处理孤儿 tool 消息
  */
 export function applyDeepSeekPatches(body, apiType) {
     if (apiType === "anthropic") {
@@ -28,6 +29,7 @@ export function applyDeepSeekPatches(body, apiType) {
         patchOrphanToolResults(body);
     }
     else {
+        patchThinkingParam(body, apiType);
         patchNonDeepSeekToolMessages(body);
         patchOrphanToolResultsOA(body);
     }

package/dist/proxy/patch/deepseek/patch-non-deepseek-tools.d.ts

@@ -5,6 +5,10 @@
  * 可能不包含 DeepSeek 要求的 reasoning_content，导致上游校验失败或
  * 工具调用无限循环。
  *
+ * 前置条件：仅 thinking 模式激活时执行。
+ * DeepSeek 只在 thinking 模式下才要求 reasoning_content，未激活时
+ * 降级既无必要又可能导致模型学会以文本形式输出 tool_calls。
+ *
  * 判断标准：assistant 消息有 tool_calls 但无 reasoning_content → 非 DeepSeek 生成。
  *
  * 转换：

package/dist/proxy/patch/deepseek/patch-non-deepseek-tools.js

@@ -5,6 +5,10 @@
  * 可能不包含 DeepSeek 要求的 reasoning_content，导致上游校验失败或
  * 工具调用无限循环。
  *
+ * 前置条件：仅 thinking 模式激活时执行。
+ * DeepSeek 只在 thinking 模式下才要求 reasoning_content，未激活时
+ * 降级既无必要又可能导致模型学会以文本形式输出 tool_calls。
+ *
  * 判断标准：assistant 消息有 tool_calls 但无 reasoning_content → 非 DeepSeek 生成。
  *
  * 转换：
@@ -14,6 +18,9 @@
  * 设计文档：docs/deepseek-patch-investigation.md §5
  */
 export function patchNonDeepSeekToolMessages(body) {
+    // thinking 模式未激活时，DeepSeek 不要求 reasoning_content，无需降级
+    if (!body.thinking && !body.reasoning)
+        return;
     const messages = body.messages;
     if (!messages || !Array.isArray(messages))
         return;

package/dist/proxy/patch/index.d.ts

@@ -1,4 +1,4 @@
-import type { ModelEntry } from "../../config/model-context.js";
+import { type ModelEntry } from "../../config/model-context.js";
 export interface ProviderInfo {
     base_url: string;
     api_type: string;

package/dist/proxy/patch/index.js

@@ -1,3 +1,4 @@
+import { normalizePatchName } from "../../config/model-context.js";
 import { applyDeepSeekPatches } from "./deepseek/index.js";
 const OPENAI_ORIGIN_HOSTS = ["api.openai.com", "openai.com"];
 /**
@@ -23,19 +24,19 @@ export function applyProviderPatches(body, provider) {
         const modelPatches = modelEntry?.patches ?? [];
         if (modelPatches.length > 0) {
             // developer_role 补丁（仅 openai 格式需要）
-            if (modelPatches.includes("developer_role") && provider.api_type === "openai" && hasDeveloperRole(body)) {
+            if (hasPatch(modelPatches, "developer-role") && provider.api_type === "openai" && hasDeveloperRole(body)) {
                 patchDeveloperRole(ensureCloned());
                 patches.push("developer_role");
             }
             // DeepSeek Anthropic 补丁
             const dsAnthropicPatches = ["thinking-param", "cache-control", "thinking-blocks", "orphan-tool-results"];
-            if (dsAnthropicPatches.some(p => modelPatches.includes(p)) && provider.api_type === "anthropic") {
+            if (dsAnthropicPatches.some(p => hasPatch(modelPatches, p)) && provider.api_type === "anthropic") {
                 applyDeepSeekPatches(ensureCloned(), "anthropic");
                 patches.push("deepseek");
             }
             // DeepSeek OpenAI 补丁
             const dsOpenAIPatches = ["non-ds-tools", "orphan-tool-results-oa"];
-            if (dsOpenAIPatches.some(p => modelPatches.includes(p)) && provider.api_type === "openai") {
+            if (dsOpenAIPatches.some(p => hasPatch(modelPatches, p)) && provider.api_type === "openai") {
                 applyDeepSeekPatches(ensureCloned(), "openai");
                 patches.push("deepseek");
             }
@@ -92,3 +93,10 @@ function needsDeepSeekPatch(body, provider) {
     const model = body.model ?? "";
     return model.includes("deepseek");
 }
+/**
+ * 格式无关的 patch 匹配：将比较值与 modelPatches（已由 parseModels 归一化）
+ * 通过同一个 normalizePatchName 函数比较，无论 DB 存的是连字符还是下划线都能匹配。
+ */
+function hasPatch(modelPatches, name) {
+    return modelPatches.includes(normalizePatchName(name));
+}

package/dist/proxy/transform/message-mapper.js

@@ -1,3 +1,4 @@
+import { randomUUID } from "crypto";
 import { sanitizeToolUseId, ensureNonEmptyContent, parseToolArguments } from "./sanitize.js";
 // ---------- extractSystemMessages ----------
 export function extractSystemMessages(messages) {
@@ -115,6 +116,42 @@ export function convertMessagesOA2Ant(messages) {
 // ---------- Anthropic → OpenAI ----------
 export function convertMessagesAnt2OA(system, messages) {
     const result = [];
+    // 预扫描：收集无 id 的 tool_use，为每个生成唯一 UUID。
+    // 返回 assistant 索引 → { tool_use 数组索引 → UUID } 的映射，
+    // 以及空 tool_use_id 的 tool_result → UUID 的顺序配对列表。
+    // OpenAI 格式要求 tool_calls[].id 非空，且 tool.tool_call_id 与之匹配。
+    const syntheticIds = [];
+    const assistantToolMap = new Map();
+    {
+        let assistantIdx = 0;
+        for (const msg of messages) {
+            const m = msg;
+            if (m.role !== "assistant")
+                continue;
+            const content = m.content;
+            if (!content) {
+                assistantIdx++;
+                continue;
+            }
+            const toolBlocks = content.filter(b => b.type === "tool_use");
+            if (toolBlocks.length > 0) {
+                const idxMap = new Map();
+                for (let i = 0; i < toolBlocks.length; i++) {
+                    if (!toolBlocks[i].id) {
+                        const uid = randomUUID();
+                        idxMap.set(i, uid);
+                        syntheticIds.push(uid);
+                    }
+                }
+                if (idxMap.size > 0)
+                    assistantToolMap.set(assistantIdx, idxMap);
+            }
+            assistantIdx++;
+        }
+    }
+    // 空 tool_use_id 的 tool_result 按出现顺序配对到 syntheticIds
+    let syntheticCursor = 0;
+    let assistantCounter = 0;
     // system → role:"system"
     if (system != null) {
         const text = typeof system === "string"
@@ -137,12 +174,19 @@ export function convertMessagesAnt2OA(system, messages) {
                 result.push({ role: "user", content: textParts.map(b => b.text ?? "").join("") });
             }
             for (const tr of toolResults) {
-                result.push({ role: "tool", tool_call_id: tr.tool_use_id, content: tr.content ?? "" });
+                let toolCallId = String(tr.tool_use_id ?? "");
+                // 空 tool_use_id → 按顺序配对到预生成的 UUID
+                if (!toolCallId && syntheticCursor < syntheticIds.length) {
+                    toolCallId = syntheticIds[syntheticCursor++];
+                }
+                result.push({ role: "tool", tool_call_id: toolCallId, content: tr.content ?? "" });
             }
         }
         else if (m.role === "assistant") {
-            if (!content || !Array.isArray(content))
+            if (!content || !Array.isArray(content)) {
+                assistantCounter++;
                 continue;
+            }
             const textBlocks = content.filter(b => b.type === "text");
             const toolBlocks = content.filter(b => b.type === "tool_use");
             const oaiMsg = { role: "assistant" };
@@ -156,10 +200,11 @@ export function convertMessagesAnt2OA(system, messages) {
             if (textBlocks.length > 0) {
                 oaiMsg.content = textBlocks.map(b => b.text ?? "").join("");
             }
-            // tool_use → tool_calls
+            // tool_use → tool_calls（无 id 的 tool_use 使用预生成的 UUID）
             if (toolBlocks.length > 0) {
-                oaiMsg.tool_calls = toolBlocks.map(b => ({
-                    id: b.id,
+                const idMap = assistantToolMap.get(assistantCounter);
+                oaiMsg.tool_calls = toolBlocks.map((b, i) => ({
+                    id: b.id || (idMap ? idMap.get(i) || randomUUID() : randomUUID()),
                     type: "function",
                     function: { name: b.name, arguments: JSON.stringify(b.input ?? {}) },
                 }));
@@ -167,6 +212,7 @@ export function convertMessagesAnt2OA(system, messages) {
             if (oaiMsg.content || oaiMsg.tool_calls) {
                 result.push(oaiMsg);
             }
+            assistantCounter++;
         }
     }
     return result;

package/frontend-dist/assets/{CardContent-D2E8XPMF.js → CardContent-B7Q1YCsK.js}

@@ -1 +1 @@
-import{$ as e,Vt as t,X as n,dt as r,mt as i,r as a,zt as o}from"./button-CGbcdJgN.js";var s=[`data-size`],c=e({__name:`Card`,props:{class:{type:[Boolean,null,String,Object,Array]},size:{default:`default`}},setup(e){let c=e;return(l,u)=>(r(),n(`div`,{"data-slot":`card`,"data-size":e.size,class:t(o(a)(`ring-foreground/10 bg-card text-card-foreground gap-4 overflow-hidden rounded-lg py-4 text-sm ring-1 has-data-[slot=card-footer]:pb-0 has-[>img:first-child]:pt-0 data-[size=sm]:gap-3 data-[size=sm]:py-3 data-[size=sm]:has-data-[slot=card-footer]:pb-0 *:[img:first-child]:rounded-t-lg *:[img:last-child]:rounded-b-lg group/card flex flex-col`,c.class))},[i(l.$slots,`default`)],10,s))}}),l=e({__name:`CardContent`,props:{class:{type:[Boolean,null,String,Object,Array]}},setup(e){let s=e;return(e,c)=>(r(),n(`div`,{"data-slot":`card-content`,class:t(o(a)(`px-4 group-data-[size=sm]/card:px-3`,s.class))},[i(e.$slots,`default`)],2))}});export{c as n,l as t};
+import{$ as e,Vt as t,X as n,dt as r,mt as i,r as a,zt as o}from"./button-m0I0MyCI.js";var s=[`data-size`],c=e({__name:`Card`,props:{class:{type:[Boolean,null,String,Object,Array]},size:{default:`default`}},setup(e){let c=e;return(l,u)=>(r(),n(`div`,{"data-slot":`card`,"data-size":e.size,class:t(o(a)(`ring-foreground/10 bg-card text-card-foreground gap-4 overflow-hidden rounded-lg py-4 text-sm ring-1 has-data-[slot=card-footer]:pb-0 has-[>img:first-child]:pt-0 data-[size=sm]:gap-3 data-[size=sm]:py-3 data-[size=sm]:has-data-[slot=card-footer]:pb-0 *:[img:first-child]:rounded-t-lg *:[img:last-child]:rounded-b-lg group/card flex flex-col`,c.class))},[i(l.$slots,`default`)],10,s))}}),l=e({__name:`CardContent`,props:{class:{type:[Boolean,null,String,Object,Array]}},setup(e){let s=e;return(e,c)=>(r(),n(`div`,{"data-slot":`card-content`,class:t(o(a)(`px-4 group-data-[size=sm]/card:px-3`,s.class))},[i(e.$slots,`default`)],2))}});export{c as n,l as t};

package/frontend-dist/assets/{CardTitle-Bvn47Yr0.js → CardTitle-C5Bsezde.js}

@@ -1 +1 @@
-import{$ as e,Vt as t,X as n,dt as r,mt as i,r as a,zt as o}from"./button-CGbcdJgN.js";var s=e({__name:`CardHeader`,props:{class:{type:[Boolean,null,String,Object,Array]}},setup(e){let s=e;return(e,c)=>(r(),n(`div`,{"data-slot":`card-header`,class:t(o(a)(`gap-1 rounded-t-xl px-4 group-data-[size=sm]/card:px-3 [.border-b]:pb-4 group-data-[size=sm]/card:[.border-b]:pb-3 group/card-header @container/card-header grid auto-rows-min items-start has-data-[slot=card-action]:grid-cols-[1fr_auto] has-data-[slot=card-description]:grid-rows-[auto_auto]`,s.class))},[i(e.$slots,`default`)],2))}}),c=e({__name:`CardTitle`,props:{class:{type:[Boolean,null,String,Object,Array]}},setup(e){let s=e;return(e,c)=>(r(),n(`div`,{"data-slot":`card-title`,class:t(o(a)(`text-base leading-snug font-medium group-data-[size=sm]/card:text-sm cn-font-heading`,s.class))},[i(e.$slots,`default`)],2))}});export{s as n,c as t};
+import{$ as e,Vt as t,X as n,dt as r,mt as i,r as a,zt as o}from"./button-m0I0MyCI.js";var s=e({__name:`CardHeader`,props:{class:{type:[Boolean,null,String,Object,Array]}},setup(e){let s=e;return(e,c)=>(r(),n(`div`,{"data-slot":`card-header`,class:t(o(a)(`gap-1 rounded-t-xl px-4 group-data-[size=sm]/card:px-3 [.border-b]:pb-4 group-data-[size=sm]/card:[.border-b]:pb-3 group/card-header @container/card-header grid auto-rows-min items-start has-data-[slot=card-action]:grid-cols-[1fr_auto] has-data-[slot=card-description]:grid-rows-[auto_auto]`,s.class))},[i(e.$slots,`default`)],2))}}),c=e({__name:`CardTitle`,props:{class:{type:[Boolean,null,String,Object,Array]}},setup(e){let s=e;return(e,c)=>(r(),n(`div`,{"data-slot":`card-title`,class:t(o(a)(`text-base leading-snug font-medium group-data-[size=sm]/card:text-sm cn-font-heading`,s.class))},[i(e.$slots,`default`)],2))}});export{s as n,c as t};