@jsonstudio/llms 0.6.230 → 0.6.375

package/dist/conversion/hub/pipeline/compat/compat-pipeline-executor.js

@@ -11,6 +11,9 @@ import { writeCompatSnapshot } from '../../../compat/actions/snapshot.js';
 import { applyQwenRequestTransform, applyQwenResponseTransform } from '../../../compat/actions/qwen-transform.js';
 import { extractGlmToolMarkup } from '../../../compat/actions/glm-tool-extraction.js';
 import { applyGlmWebSearchRequestTransform } from '../../../compat/actions/glm-web-search.js';
+import { applyGeminiWebSearchCompat } from '../../../compat/actions/gemini-web-search.js';
+import { applyGlmImageContentTransform } from '../../../compat/actions/glm-image-content.js';
+import { applyGlmVisionPromptTransform } from '../../../compat/actions/glm-vision-prompt.js';
 const RATE_LIMIT_ERROR = 'ERR_COMPAT_RATE_LIMIT_DETECTED';
 const INTERNAL_STATE = Symbol('compat.internal_state');
 export function runRequestCompatPipeline(profileId, payload, options) {
@@ -163,6 +166,21 @@ function applyMapping(root, mapping, state) {
                 replaceRoot(root, applyGlmWebSearchRequestTransform(root));
             }
             break;
+        case 'gemini_web_search_request':
+            if (state.direction === 'request') {
+                replaceRoot(root, applyGeminiWebSearchCompat(root, state.adapterContext));
+            }
+            break;
+        case 'glm_image_content':
+            if (state.direction === 'request') {
+                replaceRoot(root, applyGlmImageContentTransform(root));
+            }
+            break;
+        case 'glm_vision_prompt':
+            if (state.direction === 'request') {
+                replaceRoot(root, applyGlmVisionPromptTransform(root));
+            }
+            break;
         default:
             break;
     }

package/dist/conversion/hub/pipeline/compat/compat-types.d.ts

@@ -100,6 +100,12 @@ export type MappingInstruction = {
     action: 'qwen_response_transform';
 } | {
     action: 'glm_web_search_request';
+} | {
+    action: 'glm_image_content';
+} | {
+    action: 'glm_vision_prompt';
+} | {
+    action: 'gemini_web_search_request';
 };
 export type FilterInstruction = {
     action: 'rate_limit_text';

package/dist/conversion/hub/pipeline/hub-pipeline.js

@@ -120,6 +120,9 @@ export class HubPipeline {
         const responsesResume = normalizedMeta && typeof normalizedMeta.responsesResume === 'object'
             ? normalizedMeta.responsesResume
             : undefined;
+        const stdMetadata = workingRequest?.metadata;
+        const serverToolRequired = stdMetadata?.webSearchEnabled === true ||
+            stdMetadata?.serverToolRequired === true;
         const metadataInput = {
             requestId: normalized.id,
             entryEndpoint: normalized.entryEndpoint,
@@ -129,7 +132,8 @@ export class HubPipeline {
             providerProtocol: normalized.providerProtocol,
             routeHint: normalized.routeHint,
             stage: normalized.stage,
-            responsesResume: responsesResume
+            responsesResume: responsesResume,
+            ...(serverToolRequired ? { serverToolRequired: true } : {})
         };
         const routing = runReqProcessStage2RouteSelect({
             routerEngine: this.routerEngine,
@@ -230,8 +234,25 @@ export class HubPipeline {
                 }
             });
         }
+        // 为响应侧 servertool/web_search 提供一次性 Chat 请求快照，便于在 Hub 内部实现
+        // 第三跳（将工具结果注入消息历史后重新调用主模型）。
+        let capturedChatRequest;
+        if (normalized.processMode !== 'passthrough') {
+            try {
+                capturedChatRequest = JSON.parse(JSON.stringify({
+                    model: workingRequest.model,
+                    messages: workingRequest.messages,
+                    tools: workingRequest.tools,
+                    parameters: workingRequest.parameters
+                }));
+            }
+            catch {
+                capturedChatRequest = undefined;
+            }
+        }
         const metadata = {
             ...normalized.metadata,
+            ...(capturedChatRequest ? { capturedChatRequest } : {}),
             entryEndpoint: normalized.entryEndpoint,
             providerProtocol: outboundProtocol,
             stream: normalized.stream,
@@ -351,6 +372,12 @@ export class HubPipeline {
         if (typeof metadata.assignedModelId === 'string') {
             adapterContext.modelId = metadata.assignedModelId;
         }
+        // 将 serverToolFollowup 等 ServerTool 相关标记从 normalized.metadata 透传到 AdapterContext，
+        // 便于响应侧的 convertProviderResponse 正确识别“二跳/内部跳转”并跳过 servertool 编排。
+        if (Object.prototype.hasOwnProperty.call(metadata, 'serverToolFollowup')) {
+            adapterContext.serverToolFollowup = metadata
+                .serverToolFollowup;
+        }
         if (target?.compatibilityProfile && typeof target.compatibilityProfile === 'string') {
             adapterContext.compatibilityProfile = target.compatibilityProfile;
         }

package/dist/conversion/hub/pipeline/target-utils.js

@@ -9,6 +9,12 @@ export function applyTargetMetadata(metadata, target, routeName, originalModel)
     metadata.providerType = target.providerType;
     metadata.modelId = target.modelId;
     metadata.processMode = target.processMode || 'chat';
+    if (target.forceWebSearch === true) {
+        metadata.forceWebSearch = true;
+    }
+    if (target.forceVision === true) {
+        metadata.forceVision = true;
+    }
     if (target.responsesConfig?.toolCallIdStyle) {
         metadata.toolCallIdStyle = target.responsesConfig.toolCallIdStyle;
     }

package/dist/conversion/hub/process/chat-process.js

@@ -1,5 +1,6 @@
 import { runChatRequestToolFilters } from '../../shared/tool-filter-pipeline.js';
 import { ToolGovernanceEngine } from '../tool-governance/index.js';
+import { detectLastAssistantToolCategory } from '../../../router/virtual-router/tool-signals.js';
 const toolGovernanceEngine = new ToolGovernanceEngine();
 export async function runHubChatProcess(options) {
     const startTime = Date.now();
@@ -71,6 +72,14 @@ async function applyRequestToolGovernance(request, context) {
             governanceTimestamp: Date.now()
         }
     };
+    if (containsImageAttachment(merged.messages)) {
+        if (!merged.metadata) {
+            merged.metadata = {
+                originalEndpoint: request.metadata?.originalEndpoint ?? '/v1/chat/completions'
+            };
+        }
+        merged.metadata.hasImageAttachment = true;
+    }
     if (typeof inboundStreamIntent === 'boolean') {
         merged.metadata = {
             ...merged.metadata,
@@ -196,6 +205,34 @@ function castSingleTool(tool) {
         }
     };
 }
+function containsImageAttachment(messages) {
+    if (!Array.isArray(messages)) {
+        return false;
+    }
+    for (const message of messages) {
+        if (!message || typeof message !== 'object') {
+            continue;
+        }
+        const content = message.content;
+        if (!Array.isArray(content)) {
+            continue;
+        }
+        for (const part of content) {
+            if (!part || typeof part !== 'object') {
+                continue;
+            }
+            const typeValue = part.type;
+            if (typeof typeValue !== 'string') {
+                continue;
+            }
+            const normalized = typeValue.toLowerCase();
+            if (normalized.includes('image')) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
 function castCustomTool(tool) {
     if (!isRecord(tool)) {
         return null;
@@ -277,15 +314,34 @@ function isRecord(value) {
     return !!value && typeof value === 'object' && !Array.isArray(value);
 }
 function maybeInjectWebSearchTool(request, metadata) {
+    // ServerTool 二/三跳（serverToolFollowup=true）不再注入 web_search 工具，
+    // 以避免在 web_search 流程内部形成循环命中。
+    if (metadata.serverToolFollowup === true) {
+        return request;
+    }
     const rawConfig = metadata.webSearch;
     if (!rawConfig || !Array.isArray(rawConfig.engines) || rawConfig.engines.length === 0) {
         return request;
     }
-    const injectPolicy = (rawConfig.injectPolicy === 'always' || rawConfig.injectPolicy === 'selective')
+    const injectPolicy = rawConfig.injectPolicy === 'always' || rawConfig.injectPolicy === 'selective'
         ? rawConfig.injectPolicy
         : 'selective';
-    if (injectPolicy === 'selective' && !detectWebSearchIntent(request)) {
-        return request;
+    if (injectPolicy === 'selective') {
+        const hasExplicitIntent = detectWebSearchIntent(request);
+        if (!hasExplicitIntent) {
+            // 当最近一条用户消息没有明显的“联网搜索”关键词时，
+            // 如果上一轮 assistant 的工具调用已经属于搜索类（如 web_search），
+            // 则仍然视为 web_search 续写场景，强制注入 web_search 工具，
+            // 以便在后续路由中按 servertool 逻辑跳过不适配的 Provider（例如 serverToolsDisabled 的 crs）。
+            const assistantMessages = Array.isArray(request.messages)
+                ? request.messages.filter((msg) => msg && msg.role === 'assistant')
+                : [];
+            const lastTool = detectLastAssistantToolCategory(assistantMessages);
+            const hasSearchToolContext = lastTool?.category === 'search';
+            if (!hasSearchToolContext) {
+                return request;
+            }
+        }
     }
     const existingTools = Array.isArray(request.tools) ? request.tools : [];
     const hasWebSearch = existingTools.some((tool) => {
@@ -297,7 +353,7 @@ function maybeInjectWebSearchTool(request, metadata) {
     if (hasWebSearch) {
         return request;
     }
-    const engines = rawConfig.engines.filter((engine) => typeof engine?.id === 'string' && !!engine.id.trim());
+    const engines = rawConfig.engines.filter((engine) => typeof engine?.id === 'string' && !!engine.id.trim() && !engine.serverToolsDisabled);
     if (!engines.length) {
         return request;
     }
@@ -311,19 +367,14 @@ function maybeInjectWebSearchTool(request, metadata) {
         return desc ? `${id}: ${desc}` : id;
     })
         .join('; ');
-    const hasMultipleEngines = engineIds.length > 1;
     const parameters = {
         type: 'object',
         properties: {
-            ...(hasMultipleEngines
-                ? {
-                    engine: {
-                        type: 'string',
-                        enum: engineIds,
-                        description: engineDescriptions
-                    }
-                }
-                : {}),
+            engine: {
+                type: 'string',
+                enum: engineIds,
+                description: engineDescriptions
+            },
             query: {
                 type: 'string',
                 description: 'Search query or user question.'
@@ -340,7 +391,9 @@ function maybeInjectWebSearchTool(request, metadata) {
                 description: 'Number of results to retrieve.'
             }
         },
-        required: ['query'],
+        // 对于 Responses 内建 web_search，required 需要覆盖 properties 中的所有字段，
+        // 否则上游会报 "required is required to be supplied and to be an array including every key in properties"。
+        required: ['engine', 'query', 'recency', 'count'],
         additionalProperties: false
     };
     const webSearchTool = {
@@ -367,11 +420,40 @@ function detectWebSearchIntent(request) {
     if (!messages.length) {
         return false;
     }
-    const last = messages[messages.length - 1];
-    if (!last || last.role !== 'user') {
+    // 从末尾向前找到最近一条 user 消息，忽略 tool / assistant 的工具调用轮次，
+    // 以便在 Responses / 多轮工具调用场景下仍然根据“最近一条用户输入”判断意图。
+    let lastUser;
+    for (let idx = messages.length - 1; idx >= 0; idx -= 1) {
+        const candidate = messages[idx];
+        if (candidate && candidate.role === 'user') {
+            lastUser = candidate;
+            break;
+        }
+    }
+    if (!lastUser) {
         return false;
     }
-    const content = typeof last.content === 'string' ? last.content : '';
+    // 支持多模态 content：既可能是纯文本字符串，也可能是带 image_url 的分段数组。
+    let content = '';
+    if (typeof lastUser.content === 'string') {
+        content = lastUser.content;
+    }
+    else if (Array.isArray(lastUser.content)) {
+        const parts = lastUser.content;
+        const texts = [];
+        for (const part of parts) {
+            if (typeof part === 'string') {
+                texts.push(part);
+            }
+            else if (part && typeof part === 'object') {
+                const maybeText = part.text;
+                if (typeof maybeText === 'string' && maybeText.trim()) {
+                    texts.push(maybeText);
+                }
+            }
+        }
+        content = texts.join('\n');
+    }
     if (!content) {
         return false;
     }

package/dist/conversion/hub/response/provider-response.d.ts

@@ -2,7 +2,7 @@ import { Readable } from 'node:stream';
 import type { AdapterContext } from '../types/chat-envelope.js';
 import type { JsonObject } from '../types/json.js';
 import type { StageRecorder } from '../format-adapters/index.js';
-import type { ProviderInvoker } from './server-side-tools.js';
+import type { ProviderInvoker } from '../../../servertool/types.js';
 type ProviderProtocol = 'openai-chat' | 'openai-responses' | 'anthropic-messages' | 'gemini-chat';
 export interface ProviderResponseConversionOptions {
     providerProtocol: ProviderProtocol;
@@ -12,6 +12,18 @@ export interface ProviderResponseConversionOptions {
     wantsStream: boolean;
     stageRecorder?: StageRecorder;
     providerInvoker?: ProviderInvoker;
+    /**
+     * 可选：由 Host 注入的二次请求入口。Server-side 工具在需要发起
+     * followup 请求（例如 web_search 二跳）时，可以通过该回调将构造
+     * 好的请求体交给 Host，由 Host 走完整 HubPipeline + VirtualRouter
+     * 再返回最终客户端响应形状。
+     */
+    reenterPipeline?: (options: {
+        entryEndpoint: string;
+        requestId: string;
+        body: JsonObject;
+        metadata?: JsonObject;
+    }) => Promise<ProviderResponseConversionResult>;
 }
 export interface ProviderResponseConversionResult {
     body?: JsonObject;

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

@@ -1,3 +1,4 @@
+import { recordStage } from '../pipeline/stages/utils.js';
 import { ChatFormatAdapter } from '../format-adapters/chat-format-adapter.js';
 import { ResponsesFormatAdapter } from '../format-adapters/responses-format-adapter.js';
 import { AnthropicFormatAdapter } from '../format-adapters/anthropic-format-adapter.js';
@@ -12,45 +13,36 @@ import { runRespProcessStage2Finalize } from '../pipeline/stages/resp_process/re
 import { runRespOutboundStage1ClientRemap } from '../pipeline/stages/resp_outbound/resp_outbound_stage1_client_remap/index.js';
 import { runRespOutboundStage2SseStream } from '../pipeline/stages/resp_outbound/resp_outbound_stage2_sse_stream/index.js';
 import { recordResponsesResponse } from '../../shared/responses-conversation-store.js';
-import { runServerSideToolEngine } from './server-side-tools.js';
-function resolveChatReasoningMode(entryEndpoint) {
-    const envRaw = (process.env.ROUTECODEX_CHAT_REASONING_MODE || process.env.RCC_CHAT_REASONING_MODE || '').trim().toLowerCase();
-    const map = {
-        keep: 'keep',
-        drop: 'drop',
-        discard: 'drop',
-        text: 'append_to_content',
-        append: 'append_to_content',
-        append_text: 'append_to_content',
-        append_to_content: 'append_to_content'
-    };
-    if (envRaw && map[envRaw]) {
-        return map[envRaw];
-    }
-    return 'keep';
-}
+import { runServerToolOrchestration } from '../../../servertool/engine.js';
 const PROVIDER_RESPONSE_REGISTRY = {
     'openai-chat': {
-        protocol: 'openai-chat',
         createFormatAdapter: () => new ChatFormatAdapter(),
         createMapper: () => new OpenAIChatResponseMapper()
     },
     'openai-responses': {
-        protocol: 'openai-responses',
         createFormatAdapter: () => new ResponsesFormatAdapter(),
         createMapper: () => new ResponsesResponseMapper()
     },
     'anthropic-messages': {
-        protocol: 'anthropic-messages',
         createFormatAdapter: () => new AnthropicFormatAdapter(),
         createMapper: () => new AnthropicResponseMapper()
     },
     'gemini-chat': {
-        protocol: 'gemini-chat',
         createFormatAdapter: () => new GeminiFormatAdapter(),
         createMapper: () => new GeminiResponseMapper()
     }
 };
+function isServerToolFollowup(context) {
+    const raw = context.serverToolFollowup;
+    if (raw === true) {
+        return true;
+    }
+    if (typeof raw === 'string') {
+        const v = raw.trim().toLowerCase();
+        return v === '1' || v === 'true';
+    }
+    return false;
+}
 function resolveClientProtocol(entryEndpoint) {
     const lowered = (entryEndpoint || '').toLowerCase();
     if (lowered.includes('/v1/responses'))
@@ -86,8 +78,28 @@ function applyModelOverride(payload, model) {
         /* ignore */
     }
 }
+function resolveChatReasoningMode(_entryEndpoint) {
+    // 当前保持默认策略：保留 reasoning_content 字段，不做额外拼接或删除。
+    return 'keep';
+}
 export async function convertProviderResponse(options) {
     const clientProtocol = resolveClientProtocol(options.entryEndpoint);
+    const hasServerToolSupport = Boolean(options.providerInvoker) || Boolean(options.reenterPipeline);
+    const skipServerTools = isServerToolFollowup(options.context) || !hasServerToolSupport;
+    // 对于由 server-side 工具触发的内部跳转（二跳/三跳），统一禁用 SSE 聚合输出，
+    // 始终返回完整的 ChatCompletion JSON，便于在 llms 内部直接解析，而不是拿到
+    // __sse_responses 可读流。
+    const wantsStream = isServerToolFollowup(options.context) ? 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 plan = PROVIDER_RESPONSE_REGISTRY[options.providerProtocol];
     if (!plan) {
@@ -97,7 +109,7 @@ export async function convertProviderResponse(options) {
         providerProtocol: options.providerProtocol,
         payload: options.providerResponse,
         adapterContext: options.context,
-        wantsStream: options.wantsStream,
+        wantsStream,
         stageRecorder: options.stageRecorder
     });
     const formatAdapter = plan.createFormatAdapter();
@@ -138,18 +150,55 @@ export async function convertProviderResponse(options) {
         mapper,
         stageRecorder: options.stageRecorder
     });
-    // Server-side tool orchestration hook (web_search, etc.).
-    const serverSideResult = await runServerSideToolEngine({
-        chatResponse,
-        adapterContext: options.context,
-        entryEndpoint: options.entryEndpoint,
-        requestId: options.context.requestId,
-        providerProtocol: options.providerProtocol,
-        providerInvoker: options.providerInvoker
-    });
-    const chatForGovernance = serverSideResult.finalChatResponse;
+    // 记录语义映射后的 ChatCompletion，便于回放 server-side 工具流程。
+    recordStage(options.stageRecorder, 'resp_inbound_stage3_semantic_map.chat', chatResponse);
+    // 检查是否需要进行 ServerTool 编排
+    // 使用新的 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,
+            requestId: options.context.requestId,
+            entryEndpoint: options.entryEndpoint,
+            providerProtocol: options.providerProtocol,
+            providerInvoker: options.providerInvoker,
+            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;
+        }
+        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 */
+            }
+        }
+    }
+    // 如果没有执行 servertool，继续原来的处理流程
     const governanceResult = await runRespProcessStage1ToolGovernance({
-        payload: chatForGovernance,
+        payload: effectiveChatResponse,
         entryEndpoint: options.entryEndpoint,
         requestId: options.context.requestId,
         clientProtocol,
@@ -159,7 +208,7 @@ export async function convertProviderResponse(options) {
         payload: governanceResult.governedPayload,
         entryEndpoint: options.entryEndpoint,
         requestId: options.context.requestId,
-        wantsStream: options.wantsStream,
+        wantsStream,
         reasoningMode: resolveChatReasoningMode(options.entryEndpoint),
         stageRecorder: options.stageRecorder
     });
@@ -176,7 +225,7 @@ export async function convertProviderResponse(options) {
         clientPayload,
         clientProtocol,
         requestId: options.context.requestId,
-        wantsStream: options.wantsStream,
+        wantsStream,
         stageRecorder: options.stageRecorder
     });
     if (outbound.stream) {

package/dist/conversion/hub/response/server-side-tools.js

@@ -32,7 +32,28 @@ function extractToolCalls(chatResponse) {
     return calls;
 }
 function extractTextFromChatLike(payload) {
-    const choices = getArray(payload.choices);
+    // 1) 解包常见包装层：data / response 节点
+    let current = payload;
+    const visited = new Set();
+    while (current && typeof current === 'object' && !Array.isArray(current) && !visited.has(current)) {
+        visited.add(current);
+        if (Array.isArray(current.choices) || Array.isArray(current.output)) {
+            break;
+        }
+        const data = current.data;
+        if (data && typeof data === 'object' && !Array.isArray(data)) {
+            current = data;
+            continue;
+        }
+        const response = current.response;
+        if (response && typeof response === 'object' && !Array.isArray(response)) {
+            current = response;
+            continue;
+        }
+        break;
+    }
+    // 2) 优先从 choices[].message.content 提取（OpenAI/GLM 兼容）
+    const choices = getArray(current.choices);
     if (!choices.length)
         return '';
     const first = asObject(choices[0]);
@@ -43,7 +64,7 @@ function extractTextFromChatLike(payload) {
         return '';
     const content = message.content;
     if (typeof content === 'string')
-        return content;
+        return content.trim();
     const parts = getArray(content);
     const texts = [];
     for (const part of parts) {
@@ -55,9 +76,45 @@ function extractTextFromChatLike(payload) {
             if (typeof record.text === 'string') {
                 texts.push(record.text);
             }
+            else if (typeof record.content === 'string') {
+                texts.push(record.content);
+            }
+        }
+    }
+    const joinedFromChoices = texts.join('\n').trim();
+    if (joinedFromChoices) {
+        return joinedFromChoices;
+    }
+    // 3) 回退：从 output[].content[] 中提取（部分 Responses/自定义后端）
+    const output = current.output;
+    if (Array.isArray(output)) {
+        const altTexts = [];
+        for (const entry of output) {
+            if (!entry || typeof entry !== 'object')
+                continue;
+            const blocks = entry.content;
+            const blockArray = Array.isArray(blocks) ? blocks : [];
+            for (const block of blockArray) {
+                if (!block || typeof block !== 'object')
+                    continue;
+                const record = block;
+                if (typeof record.text === 'string') {
+                    altTexts.push(record.text);
+                }
+                else if (typeof record.output_text === 'string') {
+                    altTexts.push(record.output_text);
+                }
+                else if (typeof record.content === 'string') {
+                    altTexts.push(record.content);
+                }
+            }
+        }
+        const joined = altTexts.join('\n').trim();
+        if (joined) {
+            return joined;
         }
     }
-    return texts.join('\n').trim();
+    return '';
 }
 function getWebSearchConfig(ctx) {
     const raw = ctx.webSearch;
@@ -131,7 +188,7 @@ function resolveEnvServerSideToolsEnabled() {
         return false;
     if (raw === '1' || raw === 'true' || raw === 'yes')
         return true;
-    if (raw === 'web_search' || raw === 'websearch')
+    if (raw === 'web_search')
         return true;
     return false;
 }