@jsonstudio/llms 0.6.1739 → 0.6.1890

package/dist/conversion/hub/response/provider-response.js

@@ -302,16 +302,6 @@ export async function convertProviderResponse(options) {
     // 始终返回完整的 ChatCompletion JSON，便于在 llms 内部直接解析，而不是拿到
     // __sse_responses 可读流。
     const wantsStream = isFollowup ? false : options.wantsStream;
-    try {
-        // eslint-disable-next-line no-console
-        console.log(`\x1b[38;5;33m[servertool][orchestrator][debug] requestId=${options.context.requestId} ` +
-            `protocol=${options.providerProtocol} endpoint=${options.entryEndpoint} ` +
-            `skipServerTools=${skipServerTools} hasInvoker=${Boolean(options.providerInvoker)} ` +
-            `hasReenter=${Boolean(options.reenterPipeline)}\x1b[0m`);
-    }
-    catch {
-        /* logging best-effort */
-    }
     const displayModel = extractDisplayModel(options.context);
     const clientFacingRequestId = extractClientFacingRequestId(options.context) ?? options.context.requestId;
     const plan = PROVIDER_RESPONSE_REGISTRY[options.providerProtocol];
@@ -387,14 +377,6 @@ export async function convertProviderResponse(options) {
     // 使用新的 ChatEnvelope 级别的 servertool 实现
     let effectiveChatResponse = chatResponse;
     if (!skipServerTools && options.reenterPipeline) {
-        try {
-            // eslint-disable-next-line no-console
-            console.log(`\x1b[38;5;33m[servertool][orchestrator] start requestId=${options.context.requestId} ` +
-                `protocol=${options.providerProtocol} endpoint=${options.entryEndpoint}\x1b[0m`);
-        }
-        catch {
-            /* logging best-effort */
-        }
         const orchestration = await runServerToolOrchestration({
             chat: chatResponse,
             adapterContext: options.context,
@@ -406,15 +388,6 @@ export async function convertProviderResponse(options) {
             reenterPipeline: options.reenterPipeline
         });
         if (orchestration.executed) {
-            const flowLabel = orchestration.flowId ?? 'servertool_flow';
-            try {
-                // eslint-disable-next-line no-console
-                console.log(`\x1b[38;5;33m[servertool][orchestrator] completed requestId=${options.context.requestId} ` +
-                    `mode=${flowLabel}\x1b[0m`);
-            }
-            catch {
-                /* logging best-effort */
-            }
             effectiveChatResponse = orchestration.chat;
             recordStage(options.stageRecorder, 'chat_process.resp.stage5.servertool_orchestration', {
                 executed: true,
@@ -424,14 +397,6 @@ export async function convertProviderResponse(options) {
             });
         }
         else {
-            try {
-                // eslint-disable-next-line no-console
-                console.log(`\x1b[38;5;33m[servertool][orchestrator] skipped requestId=${options.context.requestId} ` +
-                    'reason=no_servertool_match\x1b[0m');
-            }
-            catch {
-                /* logging best-effort */
-            }
             recordStage(options.stageRecorder, 'chat_process.resp.stage5.servertool_orchestration', {
                 executed: false,
                 inputShape: detectProviderResponseShape(chatResponse)

package/dist/conversion/responses/responses-openai-bridge.d.ts

@@ -10,6 +10,8 @@ export interface ResponsesRequestContext extends Unknown {
     input?: BridgeInputItem[];
     include?: unknown;
     store?: unknown;
+    serviceTier?: unknown;
+    truncation?: unknown;
     toolChoice?: unknown;
     parallelToolCalls?: boolean;
     metadata?: JsonObject;

package/dist/conversion/responses/responses-openai-bridge.js

@@ -12,6 +12,7 @@ import { normalizeMessageReasoningTools } from '../shared/reasoning-tool-normali
 import { createBridgeActionState, runBridgeActionPipeline } from '../shared/bridge-actions.js';
 import { resolveBridgePolicy, resolvePolicyActions } from '../shared/bridge-policies.js';
 import { buildResponsesOutputFromChat } from '../shared/responses-output-builder.js';
+import { consumeResponsesPayloadSnapshot, consumeResponsesPassthrough } from '../shared/responses-reasoning-registry.js';
 function isObject(v) {
     return !!v && typeof v === 'object' && !Array.isArray(v);
 }
@@ -50,11 +51,39 @@ function filterBridgeInputForUpstream(input, options) {
 export function captureResponsesContext(payload, dto) {
     const preservedInput = cloneBridgeEntries(payload.input);
     ensureBridgeInstructions(payload);
+    const inheritedParameters = payload.parameters && typeof payload.parameters === 'object'
+        ? { ...payload.parameters }
+        : {};
+    const topLevelParameterKeys = [
+        'temperature',
+        'top_p',
+        'max_tokens',
+        'max_output_tokens',
+        'seed',
+        'logit_bias',
+        'user',
+        'parallel_tool_calls',
+        'tool_choice',
+        'response_format',
+        'service_tier',
+        'truncation',
+        'include',
+        'store',
+        'prompt_cache_key',
+        'reasoning'
+    ];
+    for (const key of topLevelParameterKeys) {
+        if (payload[key] !== undefined && inheritedParameters[key] === undefined) {
+            inheritedParameters[key] = payload[key];
+        }
+    }
     const context = {
         requestId: dto?.route?.requestId,
         input: preservedInput,
         include: payload.include,
         store: payload.store,
+        serviceTier: payload.service_tier,
+        truncation: payload.truncation,
         toolChoice: payload.tool_choice,
         parallelToolCalls: typeof payload.parallel_tool_calls === 'boolean' ? payload.parallel_tool_calls : undefined,
         metadata: (payload.metadata && typeof payload.metadata === 'object') ? payload.metadata : undefined,
@@ -62,8 +91,8 @@ export function captureResponsesContext(payload, dto) {
         stream: typeof payload.stream === 'boolean' ? payload.stream : undefined,
         isChatPayload: Array.isArray(payload.messages)
     };
-    if (payload.parameters && typeof payload.parameters === 'object') {
-        context.parameters = { ...payload.parameters };
+    if (Object.keys(inheritedParameters).length) {
+        context.parameters = inheritedParameters;
     }
     if (typeof payload.instructions === 'string' && payload.instructions.trim().length) {
         context.systemInstruction = payload.instructions;
@@ -331,11 +360,14 @@ export function buildResponsesRequestFromChat(payload, ctx, extras) {
         out.tools = mergedTools;
     }
     const passthroughKeys = [
+        'temperature',
         'tool_choice',
         'parallel_tool_calls',
         'response_format',
         'user',
         'top_p',
+        'prompt_cache_key',
+        'reasoning',
         'logit_bias',
         'seed'
     ];
@@ -473,6 +505,18 @@ export function buildResponsesRequestFromChat(payload, ctx, extras) {
     else if (metadataExtraFields?.response_format !== undefined && out.response_format === undefined) {
         out.response_format = metadataExtraFields.response_format;
     }
+    if (ctx?.serviceTier !== undefined && out.service_tier === undefined) {
+        out.service_tier = ctx.serviceTier;
+    }
+    else if (metadataExtraFields?.service_tier !== undefined && out.service_tier === undefined) {
+        out.service_tier = metadataExtraFields.service_tier;
+    }
+    if (ctx?.truncation !== undefined && out.truncation === undefined) {
+        out.truncation = ctx.truncation;
+    }
+    else if (metadataExtraFields?.truncation !== undefined && out.truncation === undefined) {
+        out.truncation = metadataExtraFields.truncation;
+    }
     if (ctx?.metadata && Object.keys(ctx.metadata).length) {
         out.metadata = { ...ctx.metadata };
     }
@@ -498,6 +542,12 @@ export function buildResponsesRequestFromChat(payload, ctx, extras) {
             'parallel_tool_calls',
             'tool_choice',
             'response_format',
+            'service_tier',
+            'truncation',
+            'include',
+            'store',
+            'prompt_cache_key',
+            'reasoning',
             'stream'
         ]);
         // Back-compat: StandardizedRequest uses max_tokens; map it to Responses max_output_tokens.
@@ -575,6 +625,95 @@ function extractMetadataExtraFields(metadata) {
 function isPlainObject(value) {
     return Boolean(value && typeof value === 'object' && !Array.isArray(value));
 }
+function deepCloneRecord(value) {
+    try {
+        const structuredCloneImpl = globalThis.structuredClone;
+        if (typeof structuredCloneImpl === 'function') {
+            return structuredCloneImpl(value);
+        }
+    }
+    catch {
+        // ignore structuredClone failures
+    }
+    try {
+        return JSON.parse(JSON.stringify(value));
+    }
+    catch {
+        return { ...value };
+    }
+}
+function isMissingResponseField(value) {
+    if (value === undefined || value === null) {
+        return true;
+    }
+    if (Array.isArray(value)) {
+        return value.length === 0;
+    }
+    return false;
+}
+function mergeResponseOutputItems(baseOutput, sourceOutput) {
+    if (!Array.isArray(baseOutput) || !Array.isArray(sourceOutput)) {
+        return baseOutput;
+    }
+    const sourceById = new Map();
+    sourceOutput.forEach((entry) => {
+        if (!entry || typeof entry !== 'object' || Array.isArray(entry)) {
+            return;
+        }
+        const id = typeof entry.id === 'string' ? entry.id.trim() : '';
+        if (!id.length) {
+            return;
+        }
+        sourceById.set(id, entry);
+    });
+    return baseOutput.map((entry, index) => {
+        if (!entry || typeof entry !== 'object' || Array.isArray(entry)) {
+            return entry;
+        }
+        const baseItem = deepCloneRecord(entry);
+        const baseId = typeof baseItem.id === 'string' ? String(baseItem.id).trim() : '';
+        let sourceItem;
+        if (baseId.length) {
+            sourceItem = sourceById.get(baseId);
+        }
+        if (!sourceItem) {
+            const candidate = sourceOutput[index];
+            if (candidate && typeof candidate === 'object' && !Array.isArray(candidate)) {
+                sourceItem = candidate;
+            }
+        }
+        if (!sourceItem) {
+            return baseItem;
+        }
+        if (isMissingResponseField(baseItem.content) && sourceItem.content !== undefined) {
+            baseItem.content = deepCloneRecord({ value: sourceItem.content }).value;
+        }
+        if (isMissingResponseField(baseItem.summary) && sourceItem.summary !== undefined) {
+            baseItem.summary = deepCloneRecord({ value: sourceItem.summary }).value;
+        }
+        return baseItem;
+    });
+}
+function mergeResponseTopLevelFields(options) {
+    const merged = deepCloneRecord(options.base);
+    const source = options.source;
+    const sourceWins = options.sourceWinsKeys ?? [];
+    for (const key of sourceWins) {
+        if (source[key] !== undefined) {
+            merged[key] = deepCloneRecord({ value: source[key] }).value;
+        }
+    }
+    const passthroughKeys = ['metadata', 'temperature', 'top_p', 'prompt_cache_key', 'reasoning'];
+    for (const key of passthroughKeys) {
+        if (source[key] !== undefined && merged[key] === undefined) {
+            merged[key] = deepCloneRecord({ value: source[key] }).value;
+        }
+    }
+    if (merged.output !== undefined && source.output !== undefined) {
+        merged.output = mergeResponseOutputItems(merged.output, source.output);
+    }
+    return merged;
+}
 export function buildResponsesPayloadFromChat(payload, context) {
     if (!payload || typeof payload !== 'object')
         return payload;
@@ -584,6 +723,11 @@ export function buildResponsesPayloadFromChat(payload, context) {
     if (response.object === 'response' && Array.isArray(response.output)) {
         return response;
     }
+    const snapshotLookupKey = resolveSnapshotLookupKey(response, context);
+    const snapshotPayload = snapshotLookupKey ? consumeResponsesPayloadSnapshot(snapshotLookupKey) : undefined;
+    const passthroughPayload = snapshotLookupKey ? consumeResponsesPassthrough(snapshotLookupKey) : undefined;
+    const sourceForRetention = (passthroughPayload && typeof passthroughPayload === 'object' ? passthroughPayload : undefined) ??
+        (snapshotPayload && typeof snapshotPayload === 'object' ? snapshotPayload : undefined);
     const hasChoicesArray = Array.isArray(response.choices);
     const choicesLength = hasChoicesArray ? response.choices.length : 0;
     // Graceful fallback for provider payloads that do not contain a valid
@@ -634,10 +778,17 @@ export function buildResponsesPayloadFromChat(payload, context) {
         else if (typeof context?.requestId === 'string') {
             out.request_id = context.requestId;
         }
-        if (out.metadata) {
-            stripInternalToolingMetadata(out.metadata);
+        const mergedFallback = sourceForRetention && typeof sourceForRetention === 'object'
+            ? mergeResponseTopLevelFields({
+                base: out,
+                source: sourceForRetention,
+                sourceWinsKeys: ['metadata', 'temperature', 'top_p', 'prompt_cache_key', 'reasoning']
+            })
+            : out;
+        if (mergedFallback.metadata) {
+            stripInternalToolingMetadata(mergedFallback.metadata);
         }
-        return out;
+        return mergedFallback;
     }
     const canonical = canonicalizeChatResponseTools(response);
     const choices = Array.isArray(canonical?.choices) ? canonical.choices : [];
@@ -742,10 +893,17 @@ export function buildResponsesPayloadFromChat(payload, context) {
     else if (typeof context?.requestId === 'string') {
         out.request_id = context.requestId;
     }
-    if (out.metadata) {
-        stripInternalToolingMetadata(out.metadata);
+    const merged = sourceForRetention && typeof sourceForRetention === 'object'
+        ? mergeResponseTopLevelFields({
+            base: out,
+            source: sourceForRetention,
+            sourceWinsKeys: ['metadata', 'temperature', 'top_p', 'prompt_cache_key', 'reasoning']
+        })
+        : out;
+    if (merged.metadata) {
+        stripInternalToolingMetadata(merged.metadata);
     }
-    return out;
+    return merged;
 }
 function normalizeResponsesToolCallArgumentsForClient(responsesPayload, context) {
     const toolsRaw = Array.isArray(context?.toolsRaw) ? context?.toolsRaw : [];

package/dist/conversion/shared/anthropic-message-utils.js

@@ -182,7 +182,8 @@ const ANTHROPIC_TOP_LEVEL_FIELDS = new Set([
     'max_output_tokens',
     'metadata',
     'stream',
-    'tool_choice'
+    'tool_choice',
+    'thinking'
 ]);
 export function normalizeAnthropicToolName(value) {
     if (typeof value !== 'string') {
@@ -951,6 +952,14 @@ export function buildAnthropicRequestFromOpenAIChat(chatReq) {
     if (normalizedToolChoice !== undefined) {
         out.tool_choice = normalizedToolChoice;
     }
+    if (requestBody.thinking !== undefined) {
+        try {
+            out.thinking = JSON.parse(JSON.stringify(requestBody.thinking));
+        }
+        catch {
+            out.thinking = requestBody.thinking;
+        }
+    }
     try {
         if (requestBody.metadata && typeof requestBody.metadata === 'object') {
             out.metadata = JSON.parse(JSON.stringify(requestBody.metadata));

package/dist/conversion/shared/protocol-field-allowlists.d.ts

@@ -1,7 +1,7 @@
 export declare const OPENAI_CHAT_ALLOWED_FIELDS: readonly ["messages", "tools", "tool_outputs", "model", "temperature", "top_p", "top_k", "max_tokens", "frequency_penalty", "presence_penalty", "logit_bias", "response_format", "parallel_tool_calls", "tool_choice", "seed", "user", "metadata", "stop", "stop_sequences", "stream"];
 export declare const ANTHROPIC_ALLOWED_FIELDS: readonly ["model", "messages", "tools", "system", "stop_sequences", "temperature", "top_p", "top_k", "max_tokens", "max_output_tokens", "metadata", "stream", "tool_choice"];
-export declare const OPENAI_RESPONSES_ALLOWED_FIELDS: readonly ["id", "object", "created_at", "model", "status", "input", "instructions", "output", "output_text", "required_action", "response_id", "previous_response_id", "tool_outputs", "tools", "metadata", "include", "store", "user", "response_format", "temperature", "top_p", "top_k", "max_tokens", "max_output_tokens", "logit_bias", "seed", "parallel_tool_calls", "tool_choice", "stream", "instructions_is_raw"];
+export declare const OPENAI_RESPONSES_ALLOWED_FIELDS: readonly ["id", "object", "created_at", "model", "status", "input", "instructions", "output", "output_text", "required_action", "response_id", "previous_response_id", "tool_outputs", "tools", "metadata", "include", "store", "user", "response_format", "temperature", "top_p", "top_k", "max_tokens", "max_output_tokens", "logit_bias", "seed", "parallel_tool_calls", "tool_choice", "prompt_cache_key", "reasoning", "stream", "instructions_is_raw"];
 export declare const GEMINI_ALLOWED_FIELDS: readonly ["model", "contents", "systemInstruction", "system_instruction", "generationConfig", "generation_config", "safetySettings", "safety_settings", "metadata", "toolConfig", "tool_config", "tools", "tool_choice", "parallelToolCalls", "parallel_tool_calls", "responseMimeType", "response_mime_type", "stopSequences", "stop_sequences", "cachedContent", "prompt", "response", "candidates", "usageMetadata", "responseMetadata", "promptFeedback", "modelVersion", "client", "user", "stream"];
-export declare const OPENAI_RESPONSES_PARAMETERS_WRAPPER_ALLOW_KEYS: readonly ["temperature", "top_p", "max_output_tokens", "seed", "logit_bias", "user", "parallel_tool_calls", "tool_choice", "response_format", "stream", "stop", "stop_sequences", "modalities", "top_k"];
+export declare const OPENAI_RESPONSES_PARAMETERS_WRAPPER_ALLOW_KEYS: readonly ["temperature", "top_p", "max_output_tokens", "seed", "logit_bias", "user", "parallel_tool_calls", "tool_choice", "response_format", "prompt_cache_key", "reasoning", "stream", "stop", "stop_sequences", "modalities", "top_k"];
 export declare const OPENAI_CHAT_PARAMETERS_WRAPPER_ALLOW_KEYS: readonly ["temperature", "top_p", "top_k", "max_tokens", "frequency_penalty", "presence_penalty", "logit_bias", "seed", "user", "parallel_tool_calls", "tool_choice", "response_format", "stream", "stop", "stop_sequences"];
 export declare const ANTHROPIC_PARAMETERS_WRAPPER_ALLOW_KEYS: readonly ["stop_sequences", "temperature", "top_p", "top_k", "max_tokens", "max_output_tokens", "metadata", "stream", "tool_choice"];

package/dist/conversion/shared/protocol-field-allowlists.js

@@ -64,6 +64,8 @@ export const OPENAI_RESPONSES_ALLOWED_FIELDS = [
     'seed',
     'parallel_tool_calls',
     'tool_choice',
+    'prompt_cache_key',
+    'reasoning',
     'stream',
     'instructions_is_raw'
 ];
@@ -109,6 +111,8 @@ export const OPENAI_RESPONSES_PARAMETERS_WRAPPER_ALLOW_KEYS = [
     'parallel_tool_calls',
     'tool_choice',
     'response_format',
+    'prompt_cache_key',
+    'reasoning',
     'stream',
     'stop',
     'stop_sequences',

package/dist/conversion/shared/tool-governor.js

@@ -13,6 +13,100 @@ function isTruthyEnv(value) {
     const v = typeof value === 'string' ? value.trim().toLowerCase() : '';
     return v === '1' || v === 'true' || v === 'yes' || v === 'on';
 }
+function isApplyPatchPayloadCandidate(value) {
+    if (typeof value !== 'string')
+        return false;
+    const text = value.trim();
+    if (!text)
+        return false;
+    return (text.startsWith('*** Begin Patch') ||
+        text.startsWith('*** Update File:') ||
+        text.startsWith('*** Add File:') ||
+        text.startsWith('*** Delete File:') ||
+        text.startsWith('--- a/') ||
+        text.startsWith('--- '));
+}
+function extractApplyPatchPayloadFromExecArgs(rawArgs) {
+    const argsStr = repairArgumentsToString(rawArgs);
+    let parsed;
+    try {
+        parsed = JSON.parse(argsStr);
+    }
+    catch {
+        parsed = parseLenient(argsStr);
+    }
+    if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+        return null;
+    }
+    const obj = parsed;
+    const commandValue = obj.command ?? obj.cmd;
+    if (Array.isArray(commandValue)) {
+        const tokens = commandValue.map((entry) => (typeof entry === 'string' ? entry : String(entry ?? '')));
+        if (!tokens.length)
+            return null;
+        const commandToken = tokens[0]?.trim().toLowerCase() || '';
+        const isApplyPatchCommand = commandToken === 'apply_patch' || commandToken.endsWith('/apply_patch') || commandToken.endsWith('\\apply_patch');
+        if (!isApplyPatchCommand) {
+            return null;
+        }
+        const patchText = tokens.slice(1).join('\n').trim();
+        return isApplyPatchPayloadCandidate(patchText) ? patchText : null;
+    }
+    if (typeof commandValue === 'string') {
+        const raw = commandValue.trim();
+        if (!raw)
+            return null;
+        if (!raw.toLowerCase().startsWith('apply_patch'))
+            return null;
+        const patchText = raw.slice('apply_patch'.length).trim();
+        return isApplyPatchPayloadCandidate(patchText) ? patchText : null;
+    }
+    return null;
+}
+function rewriteExecCommandApplyPatchCall(fn) {
+    if (!fn)
+        return false;
+    const currentName = typeof fn.name === 'string' ? String(fn.name).trim().toLowerCase() : '';
+    if (currentName !== 'exec_command')
+        return false;
+    const patch = extractApplyPatchPayloadFromExecArgs(fn.arguments);
+    if (!patch)
+        return false;
+    fn.name = 'apply_patch';
+    fn.arguments = JSON.stringify({ patch, input: '' });
+    return true;
+}
+const NESTED_APPLY_PATCH_POLICY_MARKER = '[Codex NestedApplyPatch Policy]';
+function buildNestedApplyPatchPolicyNotice(rewriteCount) {
+    const count = Number.isFinite(rewriteCount) && rewriteCount > 0 ? Math.floor(rewriteCount) : 0;
+    return [
+        NESTED_APPLY_PATCH_POLICY_MARKER,
+        'Forbidden usage detected: apply_patch must NEVER be called via exec_command or shell (detected=' + count + ').',
+        'The call was auto-rewritten to apply_patch for compatibility this turn.',
+        'Next action rule: call apply_patch directly; do not nest apply_patch inside exec_command/shell.',
+        '禁止通过 exec_command/shell 嵌套调用 apply_patch；本轮已自动改写，后续必须直接调用 apply_patch。'
+    ].join('\n');
+}
+function injectNestedApplyPatchPolicyNotice(messages, rewriteCount) {
+    if (!Array.isArray(messages) || rewriteCount <= 0) {
+        return;
+    }
+    const exists = messages.some((entry) => {
+        if (!entry || typeof entry !== 'object')
+            return false;
+        if (entry.role !== 'system')
+            return false;
+        const content = typeof entry.content === 'string' ? String(entry.content) : '';
+        return content.includes(NESTED_APPLY_PATCH_POLICY_MARKER);
+    });
+    if (exists) {
+        return;
+    }
+    messages.push({
+        role: 'system',
+        content: buildNestedApplyPatchPolicyNotice(rewriteCount)
+    });
+}
 function tryWriteSnapshot(options, stage, data) {
     try {
         // 仅在 verbose 级别保存快照（环境变量）
@@ -238,6 +332,7 @@ export function normalizeApplyPatchToolCallsOnResponse(chat) {
             for (const tc of tcs) {
                 try {
                     const fn = tc && tc.function ? tc.function : undefined;
+                    rewriteExecCommandApplyPatchCall(fn);
                     const name = typeof fn?.name === 'string' ? String(fn.name).trim().toLowerCase() : '';
                     if (name !== 'apply_patch')
                         continue;
@@ -301,6 +396,7 @@ function normalizeSpecialToolCallsOnRequest(request) {
         if (lastAssistantIndex === -1) {
             return out;
         }
+        let rewrittenNestedApplyPatchCount = 0;
         for (let i = 0; i < messages.length; i += 1) {
             const msg = messages[i];
             if (!msg || typeof msg !== 'object')
@@ -313,6 +409,9 @@ function normalizeSpecialToolCallsOnRequest(request) {
             for (const tc of tcs) {
                 try {
                     const fn = tc && tc.function ? tc.function : undefined;
+                    if (rewriteExecCommandApplyPatchCall(fn)) {
+                        rewrittenNestedApplyPatchCount += 1;
+                    }
                     const name = typeof fn?.name === 'string' ? String(fn.name).trim().toLowerCase() : '';
                     const rawArgs = fn?.arguments;
                     // apply_patch 兼容：统一生成 { patch, input }
@@ -372,6 +471,9 @@ function normalizeSpecialToolCallsOnRequest(request) {
                 }
             }
         }
+        if (rewrittenNestedApplyPatchCount > 0) {
+            injectNestedApplyPatchPolicyNotice(messages, rewrittenNestedApplyPatchCount);
+        }
         return out;
     }
     catch {

package/dist/guidance/index.js

@@ -71,6 +71,17 @@ function buildApplyPatchGuidanceText() {
     ].join('\n');
     return { marker, text };
 }
+function augmentExecCommand(fn) {
+    const marker = '[Codex ExecCommand Guidance]';
+    const guidance = [
+        marker,
+        'FORBIDDEN: Do NOT call apply_patch via exec_command/shell. Use apply_patch tool directly.',
+        'If you need to edit files, call apply_patch with patch text only.',
+        'exec_command is only for shell commands that are NOT apply_patch.',
+        '禁止通过 exec_command/shell 嵌套调用 apply_patch；修改文件必须直接调用 apply_patch 工具。'
+    ].join('\n');
+    fn.description = appendOnce(fn.description, guidance, marker);
+}
 function augmentShell(fn) {
     const marker = '[Codex Shell Guidance]';
     const guidance = [
@@ -184,6 +195,8 @@ export function augmentOpenAITools(tools) {
             try {
                 if (n === 'shell')
                     augmentShell(fn);
+                else if (n === 'exec_command')
+                    augmentExecCommand(fn);
                 else if (n === 'apply_patch') {
                     const { marker, text } = buildApplyPatchGuidanceText();
                     fn.description = appendOnce(fn.description, text, marker);
@@ -219,6 +232,9 @@ export function augmentAnthropicTools(tools) {
         if (name) {
             const n = name.trim();
             try {
+                if (n === 'exec_command') {
+                    augmentExecCommand(copy);
+                }
                 if (n === 'apply_patch') {
                     schema.properties.patch = {
                         type: 'string',
@@ -269,6 +285,7 @@ export function buildSystemToolGuidance() {
     lines.push(bullet('function.arguments must be a single JSON string. / arguments 必须是单个 JSON 字符串。'));
     lines.push(bullet('shell: Place ALL intent into the command argv array only; do not invent extra keys. / shell 所有意图写入 command 数组，不要添加额外键名。'));
     lines.push(bullet('File writes are FORBIDDEN via shell (no redirection, no here-doc, no sed -i, no ed -s, no tee). Use apply_patch ONLY. / 通过 shell 写文件一律禁止（不得使用重定向、heredoc、sed -i、ed -s、tee）；必须使用 apply_patch。'));
+    lines.push(bullet('NEVER wrap apply_patch inside exec_command/shell. Direct apply_patch tool call only. / 严禁在 exec_command/shell 中嵌套 apply_patch，必须直接调用 apply_patch。'));
     lines.push(bullet('apply_patch: Before writing, always read the target file first and compute changes against the latest content using appropriate tools. / apply_patch 在写入前必须先通过合适的工具读取目标文件最新内容，并基于该内容生成变更。'));
     lines.push(bullet('apply_patch: Send patch text only. Supported formats: "*** Begin Patch" OR GNU unified diff. "*** Update File" never implicitly creates files—use "*** Add File:" (or /dev/null diff). / apply_patch：仅发送补丁文本，支持 "*** Begin Patch" 或 GNU diff；"*** Update File" 不会隐式创建文件。'));
     lines.push(bullet('apply_patch: For a given file, prefer one contiguous change block per call; if you need to touch non-adjacent regions, split them into multiple apply_patch calls. / apply_patch 修改同一文件时尽量只提交一段连续补丁，多个不相邻位置请拆成多次调用。'));

package/dist/router/virtual-router/bootstrap.js

@@ -1,5 +1,5 @@
 import { DEFAULT_MODEL_CONTEXT_TOKENS, VirtualRouterError, VirtualRouterErrorCode } from './types.js';
-import { scanOAuthTokenFiles } from './token-file-scanner.js';
+import { scanDeepSeekAccountTokenFiles, scanOAuthTokenFiles } from './token-file-scanner.js';
 const DEFAULT_CLASSIFIER = {
     longContextThresholdTokens: 180000,
     thinkingKeywords: ['think step', 'analysis', 'reasoning', '仔细分析', '深度思考'],
@@ -196,6 +196,7 @@ function buildProviderRuntimeEntries(providers) {
                 modelStreaming: normalizedProvider.modelStreaming,
                 modelContextTokens: normalizedProvider.modelContextTokens,
                 defaultContextTokens: normalizedProvider.defaultContextTokens,
+                ...(normalizedProvider.deepseek ? { deepseek: normalizedProvider.deepseek } : {}),
                 ...(normalizedProvider.serverToolsDisabled ? { serverToolsDisabled: true } : {})
             };
         }
@@ -304,6 +305,7 @@ function buildProviderProfiles(targetKeys, runtimeEntries) {
             responsesConfig: runtime.responsesConfig,
             streaming: streamingPref,
             maxContextTokens: contextTokens,
+            ...(runtime.deepseek ? { deepseek: runtime.deepseek } : {}),
             ...(runtime.serverToolsDisabled ? { serverToolsDisabled: true } : {})
         };
         targetRuntime[targetKey] = {
@@ -526,6 +528,7 @@ function normalizeProvider(providerId, raw) {
     const streaming = resolveProviderStreamingPreference(provider, responsesNode);
     const modelStreaming = normalizeModelStreaming(provider);
     const { modelContextTokens, defaultContextTokens } = normalizeModelContextTokens(provider);
+    const deepseek = normalizeDeepSeekOptions(provider);
     const serverToolsDisabled = provider.serverToolsDisabled === true ||
         (typeof provider.serverToolsDisabled === 'string' &&
             provider.serverToolsDisabled.trim().toLowerCase() === 'true') ||
@@ -545,6 +548,7 @@ function normalizeProvider(providerId, raw) {
         modelStreaming,
         modelContextTokens,
         defaultContextTokens,
+        ...(deepseek ? { deepseek } : {}),
         ...(serverToolsDisabled ? { serverToolsDisabled: true } : {})
     };
 }
@@ -631,6 +635,31 @@ function normalizeModelContextTokens(provider) {
         defaultContextTokens: defaultCandidate
     };
 }
+function normalizeDeepSeekOptions(provider) {
+    const direct = asRecord(provider.deepseek);
+    const ext = asRecord(asRecord(provider.extensions)?.deepseek);
+    const source = Object.keys(direct).length ? direct : ext;
+    if (!source || !Object.keys(source).length) {
+        return undefined;
+    }
+    const strictToolRequired = typeof source.strictToolRequired === 'boolean'
+        ? source.strictToolRequired
+        : typeof source.strictToolRequired === 'string'
+            ? source.strictToolRequired.trim().toLowerCase() === 'true'
+            : undefined;
+    const textToolFallback = typeof source.textToolFallback === 'boolean'
+        ? source.textToolFallback
+        : typeof source.textToolFallback === 'string'
+            ? source.textToolFallback.trim().toLowerCase() === 'true'
+            : undefined;
+    if (strictToolRequired === undefined && textToolFallback === undefined) {
+        return undefined;
+    }
+    return {
+        ...(strictToolRequired !== undefined ? { strictToolRequired } : {}),
+        ...(textToolFallback !== undefined ? { textToolFallback } : {})
+    };
+}
 function resolveStreamingPreference(model) {
     return (coerceStreamingPreference(model.streaming) ??
         coerceStreamingPreference(model.stream) ??
@@ -1029,6 +1058,22 @@ function extractProviderAuthEntries(providerId, raw) {
             }
         }
     }
+    // DeepSeek account 多 token 自动扫描：
+    // - 仅在未显式声明多 key 时触发；
+    // - 从 ~/.routecodex/auth/deepseek-account-*.json 自动发现多个账号；
+    // - alias 直接取文件名后缀，路由目标 deepseek-web.<model> 会自动扩展到所有 alias。
+    const baseRawType = String(baseTypeInfo.raw ?? baseTypeSource ?? '').trim().toLowerCase();
+    if (baseType === 'apiKey' && baseRawType === 'deepseek-account' && !hasExplicitEntries) {
+        const tokenFiles = scanDeepSeekAccountTokenFiles();
+        for (const match of tokenFiles) {
+            const authConfig = {
+                ...defaults,
+                type: baseTypeSource ?? 'deepseek-account',
+                tokenFile: match.filePath
+            };
+            pushEntry(match.alias, authConfig);
+        }
+    }
     if (!entries.length) {
         const fallbackExtras = {
             value: readOptionalString(auth.value),