llm-simple-router 0.9.29 → 0.9.31

package/dist/config/model-context.js

@@ -102,9 +102,19 @@ export function parseModels(raw) {
             const obj = item;
             if (!obj || !obj.name)
                 return null;
+            /** 旧 patch ID 到新 patch ID 的运行时迁移映射 */
+            const PATCH_ID_MIGRATION = {
+                thinking_param: "thinking_consistency",
+                thinking_blocks: "thinking_consistency",
+                non_ds_tools: "thinking_consistency",
+                cache_control: "thinking_consistency",
+            };
+            const rawPatches = (obj.patches ?? []).map(normalizePatchName);
+            const migrated = rawPatches.map(p => PATCH_ID_MIGRATION[p] ?? p);
+            const patches = [...new Set(migrated)];
             const result = {
                 name: obj.name,
-                patches: (obj.patches ?? []).map(normalizePatchName),
+                patches,
             };
             if (obj.stream_timeout_ms != null)
                 result.stream_timeout_ms = obj.stream_timeout_ms;

package/dist/db/migrations/042_simplify_tool_error_logs.sql

@@ -0,0 +1,27 @@
+-- 042_simplify_tool_error_logs.sql
+-- 精简 tool_error_logs：去掉 tool_input / error_content 大字段，
+-- 改为通过 request_log_id + tool_use_id 从 request_logs 回溯完整数据。
+-- SQLite 不支持 DROP COLUMN（需 3.35+），重建表。
+
+DROP TABLE IF EXISTS tool_error_logs;
+
+CREATE TABLE tool_error_logs (
+  id TEXT PRIMARY KEY,
+  request_log_id TEXT REFERENCES request_logs(id) ON DELETE SET NULL,
+  tool_use_id TEXT NOT NULL,
+  provider_id TEXT NOT NULL,
+  backend_model TEXT NOT NULL,
+  client_agent_type TEXT NOT NULL DEFAULT 'unknown'
+    CHECK(client_agent_type IN ('claude-code', 'pi', 'unknown')),
+  tool_name TEXT NOT NULL,
+  router_key_id TEXT,
+  session_id TEXT,
+  created_at TEXT NOT NULL DEFAULT (datetime('now'))
+);
+
+CREATE INDEX idx_tool_error_logs_time
+  ON tool_error_logs(created_at);
+CREATE INDEX idx_tool_error_logs_provider
+  ON tool_error_logs(provider_id, created_at);
+CREATE INDEX idx_tool_error_logs_tool
+  ON tool_error_logs(tool_name);

package/dist/proxy/handler/proxy-handler-utils.d.ts

@@ -6,8 +6,6 @@ export type ClientAgentType = "claude-code" | "pi" | "unknown";
 export interface FailedToolResult {
     toolName: string;
     toolUseId: string | undefined;
-    toolInput: string | undefined;
-    errorContent: string;
 }
 /**
  * 根据请求头识别客户端类型。
@@ -22,7 +20,8 @@ export declare function detectClientAgentType(headers: RawHeaders): ClientAgentT
  * 避免重复记录前轮请求已记录的 tool 失败。
  *
  * 通过向前扫描 assistant 消息中的 tool_use 块
- * 关联对应的 tool_name 和 tool_input。
+ * 关联对应的 tool_name。完整 input/error 内容通过
+ * request_log_id + tool_use_id 从 request_logs 回溯。
  */
 export declare function extractFailedToolResults(body: Record<string, unknown>): FailedToolResult[];
 /** 从 TransportResult 中提取最终 HTTP status code */

package/dist/proxy/handler/proxy-handler-utils.js

@@ -21,13 +21,14 @@ export function detectClientAgentType(headers) {
  * 避免重复记录前轮请求已记录的 tool 失败。
  *
  * 通过向前扫描 assistant 消息中的 tool_use 块
- * 关联对应的 tool_name 和 tool_input。
+ * 关联对应的 tool_name。完整 input/error 内容通过
+ * request_log_id + tool_use_id 从 request_logs 回溯。
  */
 export function extractFailedToolResults(body) {
     const messages = body.messages;
     if (!messages || messages.length === 0)
         return [];
-    // 第一步：向后往前找最后一个包含 tool_result 的 user 消息
+    // 第一步：从后往前找最后一个包含 tool_result 的 user 消息
     let lastUserIndex = -1;
     const resultBlocks = [];
     for (let i = messages.length - 1; i >= 0; i--) {
@@ -48,7 +49,7 @@ export function extractFailedToolResults(body) {
     }
     if (lastUserIndex < 0)
         return [];
-    // 第二步：在整个 messages 中建立 tool_use_id → { name, input } 映射
+    // 第二步：建立 tool_use_id → tool_name 映射
     const toolUseMap = new Map();
     for (let i = 0; i < lastUserIndex; i++) {
         const msg = messages[i];
@@ -57,8 +58,7 @@ export function extractFailedToolResults(body) {
         const content = Array.isArray(msg.content) ? msg.content : [];
         for (const block of content) {
             if (block.type === "tool_use" && block.id) {
-                const inputText = block.input ? JSON.stringify(block.input) : "";
-                toolUseMap.set(block.id, { name: block.name ?? "unknown", input: inputText });
+                toolUseMap.set(block.id, block.name ?? "unknown");
             }
         }
     }
@@ -67,17 +67,11 @@ export function extractFailedToolResults(body) {
     for (const block of resultBlocks) {
         if (block.is_error !== true)
             continue;
-        const toolUse = block.tool_use_id && typeof block.tool_use_id === "string"
-            ? toolUseMap.get(block.tool_use_id)
-            : undefined;
-        const errorContent = typeof block.content === "string"
-            ? block.content
-            : JSON.stringify(block.content ?? "");
+        const toolUseId = block.tool_use_id && typeof block.tool_use_id === "string"
+            ? block.tool_use_id : undefined;
         failures.push({
-            toolName: toolUse?.name ?? "unknown",
-            toolUseId: block.tool_use_id,
-            toolInput: toolUse?.input,
-            errorContent,
+            toolName: toolUseId ? (toolUseMap.get(toolUseId) ?? "unknown") : "unknown",
+            toolUseId,
         });
     }
     return failures;

package/dist/proxy/handler/proxy-handler.js

@@ -24,7 +24,7 @@ const HTTP_ERROR_THRESHOLD = 400;
 const MAX_LOG_FIELD_LENGTH = 80;
 const UPSTREAM_ERROR_STATUS = 502;
 const TIER2_LOOP_THRESHOLD = 2;
-function rejectAndReply(reply, params, error, errorMessage, providerId) {
+function rejectAndReply(reply, params, error, errorMessage, providerId, afterLog) {
     insertRejectedLog({
         db: params.db, logId: params.logId, apiType: params.apiType, model: params.model,
         statusCode: error.statusCode, errorMessage, startTime: params.startTime,
@@ -35,6 +35,10 @@ function rejectAndReply(reply, params, error, errorMessage, providerId) {
         sessionId: params.sessionId, pipelineSnapshot: params.pipelineSnapshot,
         matcher: params.matcher, logFileWriter: params.logFileWriter,
     });
+    try {
+        afterLog?.();
+    }
+    catch { /* tool error log 写入失败不影响响应 */ } // eslint-disable-line taste/no-silent-catch
     return reply.code(error.statusCode).send(error.body);
 }
 import { getConfig } from "../../config/index.js";
@@ -127,6 +131,14 @@ async function executeFailoverLoop(ctx) {
     const excludeTargets = [];
     let rootLogId = null;
     let toolErrorsLogged = false;
+    let pendingToolErrors = null;
+    /** request_logs 写入后调用，将 pending 的 tool error logs 安全写入 DB */
+    const flushToolErrors = (providerId, model, reqLogId) => {
+        if (!pendingToolErrors)
+            return;
+        logToolErrors(pendingToolErrors, { db: deps.db, providerId, backendModel: model, clientAgentType: detectClientAgentType(request.headers), requestLogId: reqLogId, routerKeyId: request.routerKey?.id ?? null, sessionId });
+        pendingToolErrors = null;
+    };
     // TransformCoordinator 无状态，只需创建一次
     const coordinator = new TransformCoordinator();
     const enhancementConfig = loadEnhancementConfig(deps.db);
@@ -180,21 +192,14 @@ async function executeFailoverLoop(ctx) {
         if (!provider || !provider.is_active) {
             return rejectAndReply(reply, rCtx, errors.providerUnavailable(), `Provider '${resolved.provider_id}' unavailable`, resolved.provider_id);
         }
-        // 工具错误日志记录 — 首次迭代时执行，记录本轮请求中的 is_error tool_result
+        // 工具错误日志：首次迭代时提取 failures，延迟到 request_logs 写入后再记录
+        // 避免 request_log_id 外键引用尚未存在的 request_logs 记录
         if (enhancementConfig.tool_error_logging_enabled && !toolErrorsLogged) {
             toolErrorsLogged = true;
             const failures = extractFailedToolResults(pipelineBody);
             if (failures.length > 0) {
                 request.log.info({ failures: failures.length, sessionId }, "Tool error results detected");
-                logToolErrors(failures, {
-                    db: deps.db,
-                    providerId: resolved.provider_id,
-                    backendModel: resolved.backend_model ?? effectiveModel,
-                    clientAgentType: detectClientAgentType(cliHdrs),
-                    requestLogId: logId,
-                    routerKeyId,
-                    sessionId,
-                });
+                pendingToolErrors = failures;
             }
         }
         // --- 溢出重定向：上下文超出时切换到更大模型（必须在 transform 之前，确保使用正确的 api_type） ---
@@ -252,7 +257,7 @@ async function executeFailoverLoop(ctx) {
         iterationSnapshot.add({ stage: "provider_patch", types: patchMeta.types });
         const encryptionKey = getSetting(deps.db, "encryption_key");
         if (!encryptionKey) {
-            return rejectAndReply(reply, rCtx, errors.providerUnavailable(), `Encryption key not configured`, provider.id);
+            return rejectAndReply(reply, rCtx, errors.providerUnavailable(), `Encryption key not configured`, provider.id, () => flushToolErrors(provider.id, resolved.backend_model ?? effectiveModel, logId));
         }
         const apiKey = decrypt(provider.api_key, encryptionKey);
         options?.beforeSendProxy?.(patchedBody, isStream);
@@ -316,6 +321,8 @@ async function executeFailoverLoop(ctx) {
                 matcher, logFileWriter,
             }, resilienceResult.attempts, resilienceResult.result, startTime);
             collectTransportMetrics(deps.db, apiType, resilienceResult.result, isStream, lastLogId, provider.id, resolved.backend_model, request, routerKeyId, getTransportStatusCode(resilienceResult.result));
+            // request_logs 已写入，安全写入 pending tool error logs
+            flushToolErrors(resolved.provider_id, resolved.backend_model ?? effectiveModel, lastLogId);
             // Stream timeout: send 408 error with API-specific body to client
             if (resilienceResult.result.kind === "stream_abort" && resilienceResult.result.timeoutContext) {
                 const { modelId, providerId } = resilienceResult.result.timeoutContext;
@@ -389,14 +396,16 @@ async function executeFailoverLoop(ctx) {
                     }, e.attempts, fakeResult, startTime);
                 }
                 request.log.debug({ logId, action: "provider_switch", targetProviderId: e.targetProviderId });
+                // request_logs 已写入（logResilienceResult），flush pending tool errors
+                flushToolErrors(resolved.provider_id, resolved.backend_model ?? effectiveModel, logId);
                 excludeTargets.push(resolved);
                 continue;
             }
             if (e instanceof SemaphoreQueueFullError) {
-                return rejectAndReply(reply, rCtx, errors.concurrencyQueueFull(provider.id), `Concurrency queue full for provider '${provider.id}'`, provider.id);
+                return rejectAndReply(reply, rCtx, errors.concurrencyQueueFull(provider.id), `Concurrency queue full for provider '${provider.id}'`, provider.id, () => flushToolErrors(provider.id, resolved.backend_model ?? effectiveModel, logId));
             }
             if (e instanceof SemaphoreTimeoutError) {
-                return rejectAndReply(reply, rCtx, errors.concurrencyTimeout(provider.id, e.timeoutMs), `Concurrency wait timeout for provider '${provider.id}' (${e.timeoutMs}ms)`, provider.id);
+                return rejectAndReply(reply, rCtx, errors.concurrencyTimeout(provider.id, e.timeoutMs), `Concurrency wait timeout for provider '${provider.id}' (${e.timeoutMs}ms)`, provider.id, () => flushToolErrors(provider.id, resolved.backend_model ?? effectiveModel, logId));
             }
             const errMsg = e instanceof Error ? e.message : String(e);
             request.log.debug({ logId, error: errMsg, action: "upstream_error" });
@@ -412,6 +421,8 @@ async function executeFailoverLoop(ctx) {
             }, (matcher || logFileWriter) ? {
                 matcher, logFileWriter, responseBody: null,
             } : undefined);
+            // request_logs 已写入，flush pending tool errors
+            flushToolErrors(provider.id, resolved.backend_model ?? effectiveModel, logId);
             const err = errors.upstreamConnectionFailed();
             return reply.code(err.statusCode).send(err.body);
         }

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

@@ -2,18 +2,6 @@
  * 按序执行所有 DeepSeek 特定补丁。
  *
  * Patch 在格式转换之后执行，body 已经是 provider 的 api_type 格式。
- * DeepSeek 的 api_type 为 openai，但 Anthropic 端点也受支持，
- * 因此按 apiType 分发不同的 patch 流程。
- *
- * Anthropic 格式执行顺序：
- *   1. patchThinkingParam — 注入 thinking 参数
- *   2. stripCacheControl — 剥离 cache_control
- *   3. patchMissingThinkingBlocks — 补 thinking block
- *   4. patchOrphanToolResults — 清理孤儿 tool_result
- *
- * OpenAI 格式执行顺序（参考 docs/deepseek-patch-investigation.md §5.5）：
- *   1. patchThinkingParam — 检测历史 reasoning_content，注入 thinking 参数
- *   2. patchNonDeepSeekToolMessages — 将非 DeepSeek 生成的 tool_calls 降级为 text
- *   3. patchOrphanToolResultsOA — 处理孤儿 tool 消息
+ * thinking-consistency 是统一的 thinking 一致性处理，内部按 apiType 自动分发。
  */
 export declare function applyDeepSeekPatches(body: Record<string, unknown>, apiType: "openai" | "openai-responses" | "anthropic"): void;

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

@@ -1,36 +1,17 @@
-import { patchThinkingParam } from "./patch-thinking-param.js";
-import { stripCacheControl } from "./patch-cache-control.js";
-import { patchMissingThinkingBlocks } from "./patch-thinking-blocks.js";
-import { patchNonDeepSeekToolMessages } from "./patch-non-deepseek-tools.js";
+import { patchThinkingConsistency } from "./patch-thinking.js";
 import { patchOrphanToolResults, patchOrphanToolResultsOA } from "./patch-orphan-tool-results.js";
 /**
  * 按序执行所有 DeepSeek 特定补丁。
  *
  * Patch 在格式转换之后执行，body 已经是 provider 的 api_type 格式。
- * DeepSeek 的 api_type 为 openai，但 Anthropic 端点也受支持，
- * 因此按 apiType 分发不同的 patch 流程。
- *
- * Anthropic 格式执行顺序：
- *   1. patchThinkingParam — 注入 thinking 参数
- *   2. stripCacheControl — 剥离 cache_control
- *   3. patchMissingThinkingBlocks — 补 thinking block
- *   4. patchOrphanToolResults — 清理孤儿 tool_result
- *
- * OpenAI 格式执行顺序（参考 docs/deepseek-patch-investigation.md §5.5）：
- *   1. patchThinkingParam — 检测历史 reasoning_content，注入 thinking 参数
- *   2. patchNonDeepSeekToolMessages — 将非 DeepSeek 生成的 tool_calls 降级为 text
- *   3. patchOrphanToolResultsOA — 处理孤儿 tool 消息
+ * thinking-consistency 是统一的 thinking 一致性处理，内部按 apiType 自动分发。
  */
 export function applyDeepSeekPatches(body, apiType) {
+    patchThinkingConsistency(body, apiType);
     if (apiType === "anthropic") {
-        patchThinkingParam(body, apiType);
-        stripCacheControl(body);
-        patchMissingThinkingBlocks(body);
         patchOrphanToolResults(body);
     }
     else {
-        patchThinkingParam(body, apiType);
-        patchNonDeepSeekToolMessages(body);
         patchOrphanToolResultsOA(body);
     }
 }

package/dist/proxy/patch/deepseek/patch-thinking.d.ts

@@ -0,0 +1,44 @@
+/**
+ * 统一的 DeepSeek thinking 一致性处理。
+ *
+ * 解决的问题：DeepSeek thinking 模式激活后，要求历史 assistant 消息携带 thinking 信息。
+ * 跨模型切换（如 GLM → DeepSeek）或 DeepSeek 自身某些轮次未返回 thinking 时，
+ * 历史中会出现"有 tool_calls 但无 thinking"的 assistant 消息。
+ *
+ * 策略（借鉴 pi coding-agent）：补空值，不降级消息。
+ * - OpenAI 格式：补 reasoning_content = ""
+ * - Anthropic 格式：补 thinking block（含 signature）
+ *
+ * 参考：pi-mono/packages/ai/src/providers/openai-completions.ts
+ *   requiresReasoningContentOnAssistantMessages 配置
+ */
+/**
+ * 注入 thinking 参数。
+ * DeepSeek 开启 thinking 后，后续请求必须显式传 thinking 参数。
+ * 客户端可能在后续轮次省略此参数，检测历史自动补上。
+ */
+declare function injectThinkingParam(body: Record<string, unknown>, apiType: "openai" | "openai-responses" | "anthropic"): void;
+/**
+ * Anthropic 格式：补空 thinking block。
+ * DeepSeek thinking 模式下含 tool_use 的 assistant 消息必须携带 thinking 块。
+ */
+declare function patchMissingThinkingBlocks(body: Record<string, unknown>): void;
+/**
+ * OpenAI 格式：给缺 reasoning_content 的 assistant 消息补空字符串。
+ *
+ * 借鉴 pi coding-agent 的 requiresReasoningContentOnAssistantMessages 策略：
+ * 不判断"谁生成的"，不降级 tool_calls，只补空值。
+ * 补空字符串足以通过 DeepSeek 校验，且不会导致模型忽略 tool_calls（
+ * 那是 Anthropic 端点补空 thinking block 的问题，OpenAI 端点无此副作用）。
+ */
+declare function patchMissingReasoningContent(body: Record<string, unknown>): void;
+/**
+ * 统一的 thinking 一致性入口。
+ */
+export declare function patchThinkingConsistency(body: Record<string, unknown>, apiType: "openai" | "openai-responses" | "anthropic"): void;
+export declare const _internals: {
+    injectThinkingParam: typeof injectThinkingParam;
+    patchMissingThinkingBlocks: typeof patchMissingThinkingBlocks;
+    patchMissingReasoningContent: typeof patchMissingReasoningContent;
+};
+export {};

package/dist/proxy/patch/deepseek/patch-thinking.js

@@ -0,0 +1,153 @@
+/**
+ * 统一的 DeepSeek thinking 一致性处理。
+ *
+ * 解决的问题：DeepSeek thinking 模式激活后，要求历史 assistant 消息携带 thinking 信息。
+ * 跨模型切换（如 GLM → DeepSeek）或 DeepSeek 自身某些轮次未返回 thinking 时，
+ * 历史中会出现"有 tool_calls 但无 thinking"的 assistant 消息。
+ *
+ * 策略（借鉴 pi coding-agent）：补空值，不降级消息。
+ * - OpenAI 格式：补 reasoning_content = ""
+ * - Anthropic 格式：补 thinking block（含 signature）
+ *
+ * 参考：pi-mono/packages/ai/src/providers/openai-completions.ts
+ *   requiresReasoningContentOnAssistantMessages 配置
+ */
+/**
+ * 注入 thinking 参数。
+ * DeepSeek 开启 thinking 后，后续请求必须显式传 thinking 参数。
+ * 客户端可能在后续轮次省略此参数，检测历史自动补上。
+ */
+function injectThinkingParam(body, apiType) {
+    if (body.thinking)
+        return;
+    const messages = body.messages;
+    if (!messages)
+        return;
+    const hasThinking = messages.some(msg => {
+        if (msg.role !== "assistant")
+            return false;
+        if (apiType === "openai") {
+            return msg.reasoning_content !== undefined;
+        }
+        return Array.isArray(msg.content) &&
+            msg.content
+                .some(b => b?.type === "thinking");
+    });
+    if (!hasThinking)
+        return;
+    if (apiType === "openai") {
+        body.thinking = { type: "enabled" };
+    }
+    else {
+        body.thinking = { type: "enabled", budget_tokens: 10000 };
+    }
+}
+/**
+ * DeepSeek Anthropic 端点不支持 cache_control，剥离以避免报错。
+ */
+function stripCacheControl(body) {
+    if (Array.isArray(body.system)) {
+        for (const block of body.system) {
+            delete block.cache_control;
+        }
+    }
+    const messages = body.messages;
+    if (!messages)
+        return;
+    for (const msg of messages) {
+        if (Array.isArray(msg.content)) {
+            for (const block of msg.content) {
+                delete block.cache_control;
+            }
+        }
+    }
+    if (Array.isArray(body.tools)) {
+        for (const tool of body.tools) {
+            delete tool.cache_control;
+        }
+    }
+}
+/**
+ * Anthropic 格式：补空 thinking block。
+ * DeepSeek thinking 模式下含 tool_use 的 assistant 消息必须携带 thinking 块。
+ */
+function patchMissingThinkingBlocks(body) {
+    if (!body.messages)
+        return;
+    const messages = body.messages;
+    const thinkingActive = !!body.thinking || messages.some((msg) => msg.role === "assistant" && Array.isArray(msg.content)
+        && msg.content.some((b) => b && typeof b === "object" && b.type === "thinking"));
+    if (!thinkingActive)
+        return;
+    const needsSignature = detectSignatureUsage(messages);
+    for (const msg of messages) {
+        if (msg.role !== "assistant" || !Array.isArray(msg.content))
+            continue;
+        const blocks = msg.content;
+        const thinkingIdx = blocks.findIndex((b) => b && typeof b === "object" && b.type === "thinking");
+        if (thinkingIdx === -1) {
+            const emptyThinking = { type: "thinking", thinking: "" };
+            if (needsSignature)
+                emptyThinking.signature = "";
+            blocks.unshift(emptyThinking);
+        }
+        else if (thinkingIdx > 0) {
+            const [thinkingBlock] = blocks.splice(thinkingIdx, 1);
+            blocks.unshift(thinkingBlock);
+        }
+    }
+}
+function detectSignatureUsage(messages) {
+    for (const msg of messages) {
+        if (msg.role !== "assistant" || !Array.isArray(msg.content))
+            continue;
+        for (const b of msg.content) {
+            if (b && typeof b === "object" && b.type === "thinking") {
+                return "signature" in b;
+            }
+        }
+    }
+    return true;
+}
+/**
+ * OpenAI 格式：给缺 reasoning_content 的 assistant 消息补空字符串。
+ *
+ * 借鉴 pi coding-agent 的 requiresReasoningContentOnAssistantMessages 策略：
+ * 不判断"谁生成的"，不降级 tool_calls，只补空值。
+ * 补空字符串足以通过 DeepSeek 校验，且不会导致模型忽略 tool_calls（
+ * 那是 Anthropic 端点补空 thinking block 的问题，OpenAI 端点无此副作用）。
+ */
+function patchMissingReasoningContent(body) {
+    if (!body.thinking && !body.reasoning)
+        return;
+    const messages = body.messages;
+    if (!messages)
+        return;
+    for (const msg of messages) {
+        if (msg.role === "assistant"
+            && msg.tool_calls
+            && msg.tool_calls.length > 0
+            && msg.reasoning_content === undefined) {
+            msg.reasoning_content = "";
+        }
+    }
+}
+/**
+ * 统一的 thinking 一致性入口。
+ */
+export function patchThinkingConsistency(body, apiType) {
+    injectThinkingParam(body, apiType);
+    if (apiType === "anthropic") {
+        stripCacheControl(body);
+        patchMissingThinkingBlocks(body);
+    }
+    else {
+        patchMissingReasoningContent(body);
+    }
+}
+// 导出内部函数供测试使用
+export const _internals = {
+    injectThinkingParam,
+    patchMissingThinkingBlocks,
+    patchMissingReasoningContent,
+};

package/dist/proxy/patch/index.js

@@ -28,16 +28,14 @@ export function applyProviderPatches(body, provider) {
                 patchDeveloperRole(ensureCloned());
                 patches.push("developer_role");
             }
-            // DeepSeek Anthropic 补丁
-            const dsAnthropicPatches = ["thinking-param", "cache-control", "thinking-blocks", "orphan-tool-results"];
-            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 => hasPatch(modelPatches, p)) && provider.api_type === "openai") {
-                applyDeepSeekPatches(ensureCloned(), "openai");
+            // DeepSeek 补丁：新旧 patch ID 都能触发，内部按 apiType 自动分发
+            const dsPatches = [
+                "thinking-consistency", "thinking-param", "thinking-blocks",
+                "non-ds-tools", "cache-control",
+                "orphan-tool-results", "orphan-tool-results-oa",
+            ];
+            if (dsPatches.some(p => hasPatch(modelPatches, p))) {
+                applyDeepSeekPatches(ensureCloned(), provider.api_type);
                 patches.push("deepseek");
             }
             return { body: patched ?? body, meta: { types: patches } };

package/dist/proxy/tool-error-logger.d.ts

@@ -11,6 +11,8 @@ export interface ToolErrorLogContext {
 }
 /**
  * 将失败的 tool_result 批量写入 tool_error_logs 表。
- * 每条失败记录独立一行。
+ * 每条失败记录独立一行。只存索引字段，
+ * 完整 tool_input / error_content 通过
+ * request_log_id + tool_use_id 从 request_logs 回溯。
  */
 export declare function logToolErrors(failures: FailedToolResult[], ctx: ToolErrorLogContext): void;

package/dist/proxy/tool-error-logger.js

@@ -1,20 +1,20 @@
 import { randomUUID } from "crypto";
 /**
  * 将失败的 tool_result 批量写入 tool_error_logs 表。
- * 每条失败记录独立一行。
+ * 每条失败记录独立一行。只存索引字段，
+ * 完整 tool_input / error_content 通过
+ * request_log_id + tool_use_id 从 request_logs 回溯。
  */
 export function logToolErrors(failures, ctx) {
     if (failures.length === 0)
         return;
     const stmt = ctx.db.prepare(`
     INSERT INTO tool_error_logs
-      (id, request_log_id, provider_id, backend_model, client_agent_type,
-       tool_name, tool_use_id, tool_input, error_content,
-       router_key_id, session_id, created_at)
+      (id, request_log_id, tool_use_id, provider_id, backend_model,
+       client_agent_type, tool_name, router_key_id, session_id, created_at)
     VALUES
-      (@id, @request_log_id, @provider_id, @backend_model, @client_agent_type,
-       @tool_name, @tool_use_id, @tool_input, @error_content,
-       @router_key_id, @session_id, @created_at)
+      (@id, @request_log_id, @tool_use_id, @provider_id, @backend_model,
+       @client_agent_type, @tool_name, @router_key_id, @session_id, @created_at)
   `);
     const now = new Date().toISOString();
     const insertMany = ctx.db.transaction(() => {
@@ -22,13 +22,11 @@ export function logToolErrors(failures, ctx) {
             stmt.run({
                 id: randomUUID(),
                 request_log_id: ctx.requestLogId,
+                tool_use_id: f.toolUseId ?? "unknown",
                 provider_id: ctx.providerId,
                 backend_model: ctx.backendModel,
                 client_agent_type: ctx.clientAgentType,
                 tool_name: f.toolName,
-                tool_use_id: f.toolUseId ?? null,
-                tool_input: f.toolInput ?? null,
-                error_content: f.errorContent,
                 router_key_id: ctx.routerKeyId,
                 session_id: ctx.sessionId ?? null,
                 created_at: now,

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

@@ -191,7 +191,7 @@ export function convertMessagesAnt2OA(system, messages) {
             const toolBlocks = content.filter(b => b.type === "tool_use");
             const oaiMsg = { role: "assistant" };
             // thinking → reasoning_content（保留 DeepSeek 原生思考信息，
-            // 避免 A→O 转换后被 patchNonDeepSeekToolMessages 误判为非 DeepSeek 消息）
+            // 便于 patchThinkingConsistency 判断 thinking 模式是否激活）
             const thinkingBlocks = content.filter(b => b.type === "thinking");
             if (thinkingBlocks.length > 0) {
                 oaiMsg.reasoning_content = thinkingBlocks.map(b => b.thinking ?? "").join("");

package/frontend-dist/assets/{CardContent-B7Q1YCsK.js → CardContent-Rx3Yzr25.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-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};
+import{$ as e,Vt as t,X as n,dt as r,mt as i,r as a,zt as o}from"./button-CRqhqXwT.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-C5Bsezde.js → CardTitle-BfXABzCk.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-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};
+import{$ as e,Vt as t,X as n,dt as r,mt as i,r as a,zt as o}from"./button-CRqhqXwT.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};

package/frontend-dist/assets/{Checkbox-wJzvSjuY.js → Checkbox-CaCKbLQP.js}

@@ -1 +1 @@
-import{$ as e,H as t,Ht as n,J as r,K as i,Q as a,U as o,Y as s,dt as c,gt as l,i as u,m as d,mt as f,o as p,ot as m,r as h,tt as g,wt as _,x as v,zt as y}from"./button-m0I0MyCI.js";import{t as b}from"./VisuallyHiddenInput-CbZDCpY7.js";import{t as x}from"./RovingFocusItem-WInkGN79.js";import{B as S,G as C,H as w,L as T,Y as E,nt as D,q as O}from"./index-CjaxcyJj.js";function k(e,t){return C(e)?!1:Array.isArray(e)?e.some(e=>E(e,t)):E(e,t)}var[A,j]=O(`CheckboxGroupRoot`);function M(e){return e===`indeterminate`}function N(e){return M(e)?`indeterminate`:e?`checked`:`unchecked`}var[P,F]=O(`CheckboxRoot`),I=e({inheritAttrs:!1,__name:`CheckboxRoot`,props:{defaultValue:{type:null,required:!1},modelValue:{type:null,required:!1,default:void 0},disabled:{type:Boolean,required:!1},value:{type:null,required:!1,default:`on`},id:{type:String,required:!1},trueValue:{type:null,required:!1,default:()=>!0},falseValue:{type:null,required:!1,default:()=>!1},asChild:{type:Boolean,required:!1},as:{type:null,required:!1,default:`button`},name:{type:String,required:!1},required:{type:Boolean,required:!1}},emits:[`update:modelValue`],setup(e,{emit:n}){let a=e,h=n,{forwardRef:g,currentElement:v}=p(),S=A(null),T=d(a,`modelValue`,h,{defaultValue:a.defaultValue??a.falseValue,passive:a.modelValue===void 0}),D=i(()=>S?.disabled.value||a.disabled),O=i(()=>E(T.value,a.trueValue)),j=i(()=>C(S?.modelValue.value)?T.value===`indeterminate`?`indeterminate`:O.value:k(S.modelValue.value,a.value));function P(){if(C(S?.modelValue.value))T.value===`indeterminate`?T.value=a.trueValue:T.value=O.value?a.falseValue:a.trueValue;else{let e=[...S.modelValue.value||[]];if(k(e,a.value)){let t=e.findIndex(e=>E(e,a.value));e.splice(t,1)}else e.push(a.value);S.modelValue.value=e}}let I=w(v),L=i(()=>a.id&&v.value?document.querySelector(`[for="${a.id}"]`)?.innerText:void 0);return F({disabled:D,state:j}),(e,n)=>(c(),r(l(y(S)?.rovingFocus.value?y(x):y(u)),m(e.$attrs,{id:e.id,ref:y(g),role:`checkbox`,"as-child":e.asChild,as:e.as,type:e.as===`button`?`button`:void 0,"aria-checked":y(M)(j.value)?`mixed`:j.value,"aria-required":e.required,"aria-label":e.$attrs[`aria-label`]||L.value,"data-state":y(N)(j.value),"data-disabled":D.value?``:void 0,disabled:D.value,focusable:y(S)?.rovingFocus.value?!D.value:void 0,onKeydown:t(o(()=>{},[`prevent`]),[`enter`]),onClick:P}),{default:_(()=>[f(e.$slots,`default`,{modelValue:y(T),state:j.value}),y(I)&&e.name&&!y(S)?(c(),r(y(b),{key:0,type:`checkbox`,checked:!!j.value,name:e.name,value:e.value,disabled:D.value,required:e.required},null,8,[`checked`,`name`,`value`,`disabled`,`required`])):s(`v-if`,!0)]),_:3},16,[`id`,`as-child`,`as`,`type`,`aria-checked`,`aria-required`,`aria-label`,`data-state`,`data-disabled`,`disabled`,`focusable`,`onKeydown`]))}}),L=e({__name:`CheckboxIndicator`,props:{forceMount:{type:Boolean,required:!1},asChild:{type:Boolean,required:!1},as:{type:null,required:!1,default:`span`}},setup(e){let{forwardRef:t}=p(),n=P();return(e,i)=>(c(),r(y(T),{present:e.forceMount||y(M)(y(n).state.value)||y(n).state.value===!0},{default:_(()=>[a(y(u),m({ref:y(t),"data-state":y(N)(y(n).state.value),"data-disabled":y(n).disabled.value?``:void 0,style:{pointerEvents:`none`},"as-child":e.asChild,as:e.as},e.$attrs),{default:_(()=>[f(e.$slots,`default`)]),_:3},16,[`data-state`,`data-disabled`,`as-child`,`as`])]),_:3},8,[`present`]))}}),R=e({__name:`Checkbox`,props:{defaultValue:{},modelValue:{},disabled:{type:Boolean},value:{},id:{},trueValue:{},falseValue:{},asChild:{type:Boolean},as:{},name:{},required:{type:Boolean},class:{type:[Boolean,null,String,Object,Array]}},emits:[`update:modelValue`],setup(e,{emit:t}){let i=e,o=t,s=S(v(i,`class`),o);return(e,t)=>(c(),r(y(I),m({"data-slot":`checkbox`},y(s),{class:y(h)(`border-input dark:bg-input/30 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground dark:data-[state=checked]:bg-primary data-[state=checked]:border-primary aria-invalid:aria-checked:border-primary aria-invalid:border-destructive dark:aria-invalid:border-destructive/50 focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 flex size-4 items-center justify-center rounded-md border transition-colors group-has-disabled/field:opacity-50 focus-visible:ring-3 aria-invalid:ring-3 peer relative shrink-0 outline-none after:absolute after:-inset-x-3 after:-inset-y-2 disabled:cursor-not-allowed disabled:opacity-50`,i.class)}),{default:_(t=>[a(y(L),{"data-slot":`checkbox-indicator`,class:`[&>svg]:size-3.5 grid place-content-center text-current transition-none`},{default:_(()=>[f(e.$slots,`default`,n(g(t)),()=>[a(y(D))])]),_:2},1024)]),_:3},16,[`class`]))}});export{R as t};
+import{$ as e,H as t,Ht as n,J as r,K as i,Q as a,U as o,Y as s,dt as c,gt as l,i as u,m as d,mt as f,o as p,ot as m,r as h,tt as g,wt as _,x as v,zt as y}from"./button-CRqhqXwT.js";import{t as b}from"./VisuallyHiddenInput-5jJ6xPkS.js";import{t as x}from"./RovingFocusItem-BcFr0scT.js";import{B as S,G as C,H as w,L as T,Y as E,nt as D,q as O}from"./index-CwvbWlRW.js";function k(e,t){return C(e)?!1:Array.isArray(e)?e.some(e=>E(e,t)):E(e,t)}var[A,j]=O(`CheckboxGroupRoot`);function M(e){return e===`indeterminate`}function N(e){return M(e)?`indeterminate`:e?`checked`:`unchecked`}var[P,F]=O(`CheckboxRoot`),I=e({inheritAttrs:!1,__name:`CheckboxRoot`,props:{defaultValue:{type:null,required:!1},modelValue:{type:null,required:!1,default:void 0},disabled:{type:Boolean,required:!1},value:{type:null,required:!1,default:`on`},id:{type:String,required:!1},trueValue:{type:null,required:!1,default:()=>!0},falseValue:{type:null,required:!1,default:()=>!1},asChild:{type:Boolean,required:!1},as:{type:null,required:!1,default:`button`},name:{type:String,required:!1},required:{type:Boolean,required:!1}},emits:[`update:modelValue`],setup(e,{emit:n}){let a=e,h=n,{forwardRef:g,currentElement:v}=p(),S=A(null),T=d(a,`modelValue`,h,{defaultValue:a.defaultValue??a.falseValue,passive:a.modelValue===void 0}),D=i(()=>S?.disabled.value||a.disabled),O=i(()=>E(T.value,a.trueValue)),j=i(()=>C(S?.modelValue.value)?T.value===`indeterminate`?`indeterminate`:O.value:k(S.modelValue.value,a.value));function P(){if(C(S?.modelValue.value))T.value===`indeterminate`?T.value=a.trueValue:T.value=O.value?a.falseValue:a.trueValue;else{let e=[...S.modelValue.value||[]];if(k(e,a.value)){let t=e.findIndex(e=>E(e,a.value));e.splice(t,1)}else e.push(a.value);S.modelValue.value=e}}let I=w(v),L=i(()=>a.id&&v.value?document.querySelector(`[for="${a.id}"]`)?.innerText:void 0);return F({disabled:D,state:j}),(e,n)=>(c(),r(l(y(S)?.rovingFocus.value?y(x):y(u)),m(e.$attrs,{id:e.id,ref:y(g),role:`checkbox`,"as-child":e.asChild,as:e.as,type:e.as===`button`?`button`:void 0,"aria-checked":y(M)(j.value)?`mixed`:j.value,"aria-required":e.required,"aria-label":e.$attrs[`aria-label`]||L.value,"data-state":y(N)(j.value),"data-disabled":D.value?``:void 0,disabled:D.value,focusable:y(S)?.rovingFocus.value?!D.value:void 0,onKeydown:t(o(()=>{},[`prevent`]),[`enter`]),onClick:P}),{default:_(()=>[f(e.$slots,`default`,{modelValue:y(T),state:j.value}),y(I)&&e.name&&!y(S)?(c(),r(y(b),{key:0,type:`checkbox`,checked:!!j.value,name:e.name,value:e.value,disabled:D.value,required:e.required},null,8,[`checked`,`name`,`value`,`disabled`,`required`])):s(`v-if`,!0)]),_:3},16,[`id`,`as-child`,`as`,`type`,`aria-checked`,`aria-required`,`aria-label`,`data-state`,`data-disabled`,`disabled`,`focusable`,`onKeydown`]))}}),L=e({__name:`CheckboxIndicator`,props:{forceMount:{type:Boolean,required:!1},asChild:{type:Boolean,required:!1},as:{type:null,required:!1,default:`span`}},setup(e){let{forwardRef:t}=p(),n=P();return(e,i)=>(c(),r(y(T),{present:e.forceMount||y(M)(y(n).state.value)||y(n).state.value===!0},{default:_(()=>[a(y(u),m({ref:y(t),"data-state":y(N)(y(n).state.value),"data-disabled":y(n).disabled.value?``:void 0,style:{pointerEvents:`none`},"as-child":e.asChild,as:e.as},e.$attrs),{default:_(()=>[f(e.$slots,`default`)]),_:3},16,[`data-state`,`data-disabled`,`as-child`,`as`])]),_:3},8,[`present`]))}}),R=e({__name:`Checkbox`,props:{defaultValue:{},modelValue:{},disabled:{type:Boolean},value:{},id:{},trueValue:{},falseValue:{},asChild:{type:Boolean},as:{},name:{},required:{type:Boolean},class:{type:[Boolean,null,String,Object,Array]}},emits:[`update:modelValue`],setup(e,{emit:t}){let i=e,o=t,s=S(v(i,`class`),o);return(e,t)=>(c(),r(y(I),m({"data-slot":`checkbox`},y(s),{class:y(h)(`border-input dark:bg-input/30 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground dark:data-[state=checked]:bg-primary data-[state=checked]:border-primary aria-invalid:aria-checked:border-primary aria-invalid:border-destructive dark:aria-invalid:border-destructive/50 focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 flex size-4 items-center justify-center rounded-md border transition-colors group-has-disabled/field:opacity-50 focus-visible:ring-3 aria-invalid:ring-3 peer relative shrink-0 outline-none after:absolute after:-inset-x-3 after:-inset-y-2 disabled:cursor-not-allowed disabled:opacity-50`,i.class)}),{default:_(t=>[a(y(L),{"data-slot":`checkbox-indicator`,class:`[&>svg]:size-3.5 grid place-content-center text-current transition-none`},{default:_(()=>[f(e.$slots,`default`,n(g(t)),()=>[a(y(D))])]),_:2},1024)]),_:3},16,[`class`]))}});export{R as t};

package/frontend-dist/assets/{CollapsibleContent-B5pPNqRd.js → CollapsibleContent-C3p4dMa-.js}

@@ -1 +1 @@
-import{$ as e,Ht as t,J as n,K as r,Lt as i,Mt as a,Q as o,Y as s,d as c,dt as l,i as u,lt as d,m as f,mt as p,o as m,ot as h,st as g,tt as _,wt as v,xt as y,zt as b}from"./button-m0I0MyCI.js";import{B as x,L as S,q as C,z as w}from"./index-CjaxcyJj.js";var[T,E]=C(`CollapsibleRoot`),D=e({__name:`CollapsibleRoot`,props:{defaultOpen:{type:Boolean,required:!1,default:!1},open:{type:Boolean,required:!1,default:void 0},disabled:{type:Boolean,required:!1},unmountOnHide:{type:Boolean,required:!1,default:!0},asChild:{type:Boolean,required:!1},as:{type:null,required:!1}},emits:[`update:open`],setup(e,{expose:t,emit:r}){let a=e,o=f(a,`open`,r,{defaultValue:a.defaultOpen,passive:a.open===void 0}),{disabled:s,unmountOnHide:c}=i(a);return E({contentId:``,disabled:s,open:o,unmountOnHide:c,onOpenToggle:()=>{s.value||(o.value=!o.value)}}),t({open:o}),m(),(e,t)=>(l(),n(b(u),{as:e.as,"as-child":a.asChild,"data-state":b(o)?`open`:`closed`,"data-disabled":b(s)?``:void 0},{default:v(()=>[p(e.$slots,`default`,{open:b(o)})]),_:3},8,[`as`,`as-child`,`data-state`,`data-disabled`]))}}),O=e({inheritAttrs:!1,__name:`CollapsibleContent`,props:{forceMount:{type:Boolean,required:!1},asChild:{type:Boolean,required:!1},as:{type:null,required:!1}},emits:[`contentFound`],setup(e,{emit:t}){let i=e,f=t,_=T();_.contentId||=w(void 0,`reka-collapsible-content`);let x=a(),{forwardRef:C,currentElement:E}=m(),D=a(0),O=a(0),k=r(()=>_.open.value),A=a(k.value),j=a();y(()=>[k.value,x.value?.present],async()=>{await g();let e=E.value;if(!e)return;j.value=j.value||{transitionDuration:e.style.transitionDuration,animationName:e.style.animationName},e.style.transitionDuration=`0s`,e.style.animationName=`none`;let t=e.getBoundingClientRect();O.value=t.height,D.value=t.width,A.value||(e.style.transitionDuration=j.value.transitionDuration,e.style.animationName=j.value.animationName)},{immediate:!0});let M=r(()=>A.value&&_.open.value);return d(()=>{requestAnimationFrame(()=>{A.value=!1})}),c(E,`beforematch`,e=>{requestAnimationFrame(()=>{_.onOpenToggle(),f(`contentFound`)})}),(e,t)=>(l(),n(b(S),{ref_key:`presentRef`,ref:x,present:e.forceMount||b(_).open.value,"force-mount":!0},{default:v(({present:t})=>[o(b(u),h(e.$attrs,{id:b(_).contentId,ref:b(C),"as-child":i.asChild,as:e.as,hidden:t?void 0:b(_).unmountOnHide.value?``:`until-found`,"data-state":M.value?void 0:b(_).open.value?`open`:`closed`,"data-disabled":b(_).disabled?.value?``:void 0,style:{"--reka-collapsible-content-height":`${O.value}px`,"--reka-collapsible-content-width":`${D.value}px`}}),{default:v(()=>[!b(_).unmountOnHide.value||t?p(e.$slots,`default`,{key:0}):s(`v-if`,!0)]),_:2},1040,[`id`,`as-child`,`as`,`hidden`,`data-state`,`data-disabled`,`style`])]),_:3},8,[`present`]))}}),k=e({__name:`Collapsible`,props:{defaultOpen:{type:Boolean},open:{type:Boolean},disabled:{type:Boolean},unmountOnHide:{type:Boolean},asChild:{type:Boolean},as:{}},emits:[`update:open`],setup(e,{emit:r}){let i=x(e,r);return(e,r)=>(l(),n(b(D),h({"data-slot":`collapsible`},b(i)),{default:v(n=>[p(e.$slots,`default`,t(_(n)))]),_:3},16))}}),A=e({__name:`CollapsibleContent`,props:{forceMount:{type:Boolean},asChild:{type:Boolean},as:{}},setup(e){let t=e;return(e,r)=>(l(),n(b(O),h({"data-slot":`collapsible-content`},t),{default:v(()=>[p(e.$slots,`default`)]),_:3},16))}});export{k as n,T as r,A as t};
+import{$ as e,Ht as t,J as n,K as r,Lt as i,Mt as a,Q as o,Y as s,d as c,dt as l,i as u,lt as d,m as f,mt as p,o as m,ot as h,st as g,tt as _,wt as v,xt as y,zt as b}from"./button-CRqhqXwT.js";import{B as x,L as S,q as C,z as w}from"./index-CwvbWlRW.js";var[T,E]=C(`CollapsibleRoot`),D=e({__name:`CollapsibleRoot`,props:{defaultOpen:{type:Boolean,required:!1,default:!1},open:{type:Boolean,required:!1,default:void 0},disabled:{type:Boolean,required:!1},unmountOnHide:{type:Boolean,required:!1,default:!0},asChild:{type:Boolean,required:!1},as:{type:null,required:!1}},emits:[`update:open`],setup(e,{expose:t,emit:r}){let a=e,o=f(a,`open`,r,{defaultValue:a.defaultOpen,passive:a.open===void 0}),{disabled:s,unmountOnHide:c}=i(a);return E({contentId:``,disabled:s,open:o,unmountOnHide:c,onOpenToggle:()=>{s.value||(o.value=!o.value)}}),t({open:o}),m(),(e,t)=>(l(),n(b(u),{as:e.as,"as-child":a.asChild,"data-state":b(o)?`open`:`closed`,"data-disabled":b(s)?``:void 0},{default:v(()=>[p(e.$slots,`default`,{open:b(o)})]),_:3},8,[`as`,`as-child`,`data-state`,`data-disabled`]))}}),O=e({inheritAttrs:!1,__name:`CollapsibleContent`,props:{forceMount:{type:Boolean,required:!1},asChild:{type:Boolean,required:!1},as:{type:null,required:!1}},emits:[`contentFound`],setup(e,{emit:t}){let i=e,f=t,_=T();_.contentId||=w(void 0,`reka-collapsible-content`);let x=a(),{forwardRef:C,currentElement:E}=m(),D=a(0),O=a(0),k=r(()=>_.open.value),A=a(k.value),j=a();y(()=>[k.value,x.value?.present],async()=>{await g();let e=E.value;if(!e)return;j.value=j.value||{transitionDuration:e.style.transitionDuration,animationName:e.style.animationName},e.style.transitionDuration=`0s`,e.style.animationName=`none`;let t=e.getBoundingClientRect();O.value=t.height,D.value=t.width,A.value||(e.style.transitionDuration=j.value.transitionDuration,e.style.animationName=j.value.animationName)},{immediate:!0});let M=r(()=>A.value&&_.open.value);return d(()=>{requestAnimationFrame(()=>{A.value=!1})}),c(E,`beforematch`,e=>{requestAnimationFrame(()=>{_.onOpenToggle(),f(`contentFound`)})}),(e,t)=>(l(),n(b(S),{ref_key:`presentRef`,ref:x,present:e.forceMount||b(_).open.value,"force-mount":!0},{default:v(({present:t})=>[o(b(u),h(e.$attrs,{id:b(_).contentId,ref:b(C),"as-child":i.asChild,as:e.as,hidden:t?void 0:b(_).unmountOnHide.value?``:`until-found`,"data-state":M.value?void 0:b(_).open.value?`open`:`closed`,"data-disabled":b(_).disabled?.value?``:void 0,style:{"--reka-collapsible-content-height":`${O.value}px`,"--reka-collapsible-content-width":`${D.value}px`}}),{default:v(()=>[!b(_).unmountOnHide.value||t?p(e.$slots,`default`,{key:0}):s(`v-if`,!0)]),_:2},1040,[`id`,`as-child`,`as`,`hidden`,`data-state`,`data-disabled`,`style`])]),_:3},8,[`present`]))}}),k=e({__name:`Collapsible`,props:{defaultOpen:{type:Boolean},open:{type:Boolean},disabled:{type:Boolean},unmountOnHide:{type:Boolean},asChild:{type:Boolean},as:{}},emits:[`update:open`],setup(e,{emit:r}){let i=x(e,r);return(e,r)=>(l(),n(b(D),h({"data-slot":`collapsible`},b(i)),{default:v(n=>[p(e.$slots,`default`,t(_(n)))]),_:3},16))}}),A=e({__name:`CollapsibleContent`,props:{forceMount:{type:Boolean},asChild:{type:Boolean},as:{}},setup(e){let t=e;return(e,r)=>(l(),n(b(O),h({"data-slot":`collapsible-content`},t),{default:v(()=>[p(e.$slots,`default`)]),_:3},16))}});export{k as n,T as r,A as t};