@jsonstudio/llms 0.6.375 → 0.6.467

package/dist/servertool/engine.js

@@ -41,12 +41,53 @@ export async function runServerToolOrchestration(options) {
     const followupBody = followup.body && typeof followup.body === 'object'
         ? followup.body
         : engineResult.finalChatResponse;
+    const decorated = decorateFinalChatWithServerToolContext(followupBody, engineResult.execution);
     return {
-        chat: followupBody,
+        chat: decorated,
         executed: true,
         flowId: engineResult.execution.flowId
     };
 }
+function decorateFinalChatWithServerToolContext(chat, execution) {
+    if (!execution || !execution.context) {
+        return chat;
+    }
+    // 目前仅对 web_search flow 附加原文摘要，避免影响其它 ServerTool。
+    if (execution.flowId !== 'web_search_flow') {
+        return chat;
+    }
+    const ctx = execution.context;
+    const web = ctx.web_search;
+    const summary = web && typeof web.summary === 'string' && web.summary.trim().length
+        ? web.summary.trim()
+        : '';
+    if (!summary) {
+        return chat;
+    }
+    const engineId = web && typeof web.engineId === 'string' && web.engineId.trim().length
+        ? web.engineId.trim()
+        : undefined;
+    const label = engineId
+        ? `【web_search 原文 | engine: ${engineId}】`
+        : '【web_search 原文】';
+    const cloned = JSON.parse(JSON.stringify(chat));
+    const choices = Array.isArray(cloned.choices) ? cloned.choices : [];
+    if (!choices.length) {
+        return cloned;
+    }
+    const first = choices[0] && typeof choices[0] === 'object' ? choices[0] : null;
+    if (!first || !first.message || typeof first.message !== 'object') {
+        return cloned;
+    }
+    const message = first.message;
+    const baseContent = typeof message.content === 'string' ? message.content : '';
+    const suffix = `${label}\n${summary}`;
+    message.content =
+        baseContent && baseContent.trim().length
+            ? `${baseContent}\n\n${suffix}`
+            : suffix;
+    return cloned;
+}
 function resolveRouteHint(adapterContext, flowId) {
     const rawRoute = adapterContext.routeId;
     const routeId = typeof rawRoute === 'string' && rawRoute.trim() ? rawRoute.trim() : '';

package/dist/servertool/handlers/web-search.js

@@ -62,7 +62,14 @@ const handler = async (ctx) => {
                 payload: followupPayload,
                 metadata: buildFollowupMetadata(ctx.adapterContext, 'web_search')
             }
-            : undefined
+            : undefined,
+        context: {
+            web_search: {
+                engineId: chosenEngine.id,
+                providerKey: chosenEngine.providerKey,
+                summary: chosenResult.summary
+            }
+        }
     };
     return {
         chatResponse: patched,
@@ -89,7 +96,9 @@ function getWebSearchConfig(ctx) {
     const enginesRaw = Array.isArray(record.engines) ? record.engines : [];
     const engines = [];
     for (const entry of enginesRaw) {
-        const obj = entry && typeof entry === 'object' && !Array.isArray(entry) ? entry : null;
+        const obj = entry && typeof entry === 'object' && !Array.isArray(entry)
+            ? entry
+            : null;
         if (!obj)
             continue;
         const id = typeof obj.id === 'string' && obj.id.trim() ? obj.id.trim() : undefined;
@@ -104,12 +113,26 @@ function getWebSearchConfig(ctx) {
             (obj.serverTools &&
                 typeof obj.serverTools === 'object' &&
                 obj.serverTools.enabled === false);
+        let searchEngineList;
+        const rawSearchList = obj.searchEngineList;
+        if (Array.isArray(rawSearchList)) {
+            const normalizedList = [];
+            for (const item of rawSearchList) {
+                if (typeof item === 'string' && item.trim().length) {
+                    normalizedList.push(item.trim());
+                }
+            }
+            if (normalizedList.length) {
+                searchEngineList = normalizedList;
+            }
+        }
         engines.push({
             id,
             providerKey,
             description: typeof obj.description === 'string' && obj.description.trim() ? obj.description.trim() : undefined,
             default: obj.default === true,
-            ...(serverToolsDisabled ? { serverToolsDisabled: true } : {})
+            ...(serverToolsDisabled ? { serverToolsDisabled: true } : {}),
+            ...(searchEngineList ? { searchEngineList } : {})
         });
     }
     if (!engines.length) {
@@ -179,6 +202,10 @@ function isGeminiWebSearchEngine(engine) {
         key.startsWith('antigravity.') ||
         key.startsWith('gemini.'));
 }
+function isIflowWebSearchEngine(engine) {
+    const key = engine.providerKey.toLowerCase();
+    return key.startsWith('iflow.');
+}
 function normalizeResultCount(value) {
     if (typeof value === 'number' && Number.isFinite(value)) {
         const normalized = Math.trunc(value);
@@ -197,7 +224,22 @@ async function executeWebSearchBackend(args) {
     try {
         logServerToolWebSearch(engine, ctx.options.requestId, query);
         const requestSuffix = `:web_search:${engine.id}`;
-        if (ctx.options.reenterPipeline) {
+        // 对于 iFlow，直接通过 providerInvoker 调用 /chat/retrieve，
+        // 即使 reenterPipeline 可用，也不走 Chat 模型 + tools。
+        if (isIflowWebSearchEngine(engine) && ctx.options.providerInvoker) {
+            const backendResult = await executeIflowWebSearchViaProvider({
+                ctx,
+                engine,
+                query,
+                recency,
+                count: args.resultCount,
+                requestSuffix
+            });
+            summary = backendResult.summary;
+            hits = backendResult.hits;
+            ok = backendResult.ok;
+        }
+        else if (ctx.options.reenterPipeline) {
             const payload = buildWebSearchReenterPayload(engine, query, recency, args.resultCount);
             const followup = await ctx.options.reenterPipeline({
                 entryEndpoint: '/v1/chat/completions',
@@ -384,6 +426,117 @@ async function executeWebSearchViaProvider(args) {
     }
     return extractTextFromChatLike(providerResponse);
 }
+async function executeIflowWebSearchViaProvider(args) {
+    const { ctx, engine, query, count, requestSuffix } = args;
+    if (!ctx.options.providerInvoker) {
+        return {
+            summary: '',
+            hits: [],
+            ok: false
+        };
+    }
+    const searchEngineList = Array.isArray(engine.searchEngineList) && engine.searchEngineList.length
+        ? engine.searchEngineList
+        : ['GOOGLE', 'BING', 'SCHOLAR', 'AIPGC', 'PDF'];
+    const searchBody = {
+        query,
+        history: {},
+        userId: 2,
+        userIp: '42.120.74.197',
+        appCode: 'SEARCH_CHATBOT',
+        chatId: Date.now(),
+        phase: 'UNIFY',
+        enableQueryRewrite: false,
+        enableRetrievalSecurity: false,
+        enableIntention: false,
+        searchEngineList
+    };
+    let providerKey = engine.providerKey;
+    try {
+        const adapter = ctx.adapterContext && typeof ctx.adapterContext === 'object'
+            ? ctx.adapterContext
+            : null;
+        const target = adapter && adapter.target && typeof adapter.target === 'object'
+            ? adapter.target
+            : null;
+        const targetProviderKey = target && typeof target.providerKey === 'string' && target.providerKey.trim()
+            ? target.providerKey.trim()
+            : undefined;
+        if (targetProviderKey) {
+            providerKey = targetProviderKey;
+        }
+    }
+    catch {
+        // best-effort: fallback to engine.providerKey
+    }
+    const payload = {
+        data: searchBody,
+        metadata: {
+            entryEndpoint: '/chat/retrieve',
+            iflowWebSearch: true,
+            routeName: 'web_search'
+        }
+    };
+    const backend = await ctx.options.providerInvoker({
+        providerKey,
+        providerType: undefined,
+        modelId: undefined,
+        providerProtocol: ctx.options.providerProtocol,
+        payload,
+        entryEndpoint: '/v1/chat/retrieve',
+        requestId: `${ctx.options.requestId}${requestSuffix}`,
+        routeHint: 'web_search'
+    });
+    const providerResponse = backend.providerResponse && typeof backend.providerResponse === 'object'
+        ? backend.providerResponse
+        : null;
+    if (!providerResponse) {
+        return {
+            summary: '',
+            hits: [],
+            ok: false
+        };
+    }
+    const container = providerResponse;
+    const rawHits = Array.isArray(container.data) ? container.data : [];
+    const hits = [];
+    for (const item of rawHits) {
+        if (!item || typeof item !== 'object' || Array.isArray(item))
+            continue;
+        const record = item;
+        const link = typeof record.url === 'string' && record.url.trim() ? record.url.trim() : '';
+        if (!link)
+            continue;
+        const title = typeof record.title === 'string' && record.title.trim() ? record.title.trim() : undefined;
+        const publishDate = typeof record.time === 'string' && record.time.trim() ? record.time.trim() : undefined;
+        const content = typeof record.abstractInfo === 'string' && record.abstractInfo.trim()
+            ? record.abstractInfo.trim()
+            : undefined;
+        hits.push({
+            title,
+            link,
+            publish_date: publishDate,
+            content
+        });
+        if (hits.length >= count) {
+            break;
+        }
+    }
+    let summary = '';
+    if (typeof container.message === 'string' && container.message.trim()) {
+        summary = container.message.trim();
+    }
+    if (!summary && hits.length) {
+        summary = formatHitsSummary(hits);
+    }
+    const successField = container.success;
+    const ok = typeof successField === 'boolean' ? successField : hits.length > 0;
+    return {
+        summary,
+        hits,
+        ok
+    };
+}
 function injectWebSearchToolResult(base, toolCall, engine, query, backendResult) {
     const cloned = cloneJson(base);
     const existingOutputs = Array.isArray(cloned.tool_outputs)

package/dist/servertool/types.d.ts

@@ -57,6 +57,12 @@ export interface ServerToolFollowupPlan {
 export interface ServerToolExecution {
     flowId: string;
     followup?: ServerToolFollowupPlan;
+    /**
+     * Optional tool-specific context for the execution result.
+     * For example, web_search handler may attach { web_search: { engineId, providerKey, summary } }
+     * so that orchestration layer can decorate final Chat response without touching host code.
+     */
+    context?: JsonObject;
 }
 /**
  * ServerSideToolEngineResult：ServerTool 引擎出参。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsonstudio/llms",
-  "version": "0.6.375",
+  "version": "0.6.467",
   "type": "module",
   "main": "dist/index.js",
   "module": "dist/index.js",