@jsonstudio/llms 0.6.2125 → 0.6.2172

package/dist/conversion/compat/actions/deepseek-web-response.js

@@ -651,17 +651,41 @@ function normalizeFunctionResultsMarkupText(value) {
         changed: true
     };
 }
+function normalizeCommentaryMarkupText(value) {
+    const capturedCommentary = [];
+    let changed = false;
+    const stripped = value.replace(/<\s*commentary\s*>([\s\S]*?)<\s*\/\s*commentary\s*>/gi, (_match, inner) => {
+        changed = true;
+        const text = typeof inner === 'string' ? inner.trim() : '';
+        if (text.length) {
+            capturedCommentary.push(text);
+        }
+        return '';
+    });
+    if (!changed) {
+        return { text: value, changed: false };
+    }
+    const collapsed = stripped.replace(/\n{3,}/g, '\n\n').trim();
+    if (collapsed.length) {
+        return { text: collapsed, changed: true };
+    }
+    return {
+        text: capturedCommentary.join('\n\n').trim(),
+        changed: true
+    };
+}
 function harvestFunctionResultsMarkup(message) {
     let harvested = false;
     const apply = (input) => {
         if (typeof input !== 'string') {
             return undefined;
         }
-        const normalized = normalizeFunctionResultsMarkupText(input);
-        if (normalized.changed) {
+        const functionResultsNormalized = normalizeFunctionResultsMarkupText(input);
+        if (functionResultsNormalized.changed) {
             harvested = true;
         }
-        return normalized.text;
+        const commentaryNormalized = normalizeCommentaryMarkupText(functionResultsNormalized.text);
+        return commentaryNormalized.text;
     };
     if (typeof message.content === 'string') {
         const next = apply(message.content);

package/dist/conversion/compat/actions/strip-orphan-function-calls-tag.js

@@ -1,7 +1,7 @@
 function isRecord(value) {
     return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
 }
-const ORPHAN_TAG_RE = /^\s*(?:[•*+-]\s*)?<\/?\s*function_calls\s*\/?\s*>\s*$/i;
+const ORPHAN_TAG_RE = /^\s*(?:[•*+-]\s*)?(?:<\/?\s*function_calls\s*\/?\s*>|<\/\s*(?:parameter|function|tool_call)\s*>)\s*$/i;
 function stripOrphanTagLines(text) {
     const raw = String(text ?? '');
     if (!raw)

package/dist/conversion/hub/pipeline/stages/resp_process/resp_process_stage1_tool_governance/index.js

@@ -2,6 +2,7 @@ import { runChatResponseToolFilters } from '../../../../../shared/tool-filter-pi
 import { normalizeApplyPatchToolCallsOnResponse } from '../../../../../shared/tool-governor.js';
 import { buildChatResponseFromResponses } from '../../../../../shared/responses-response-utils.js';
 import { normalizeAssistantTextToToolCalls } from '../../../../../shared/text-markup-normalizer.js';
+import { stripOrphanFunctionCallsTag } from '../../../../../compat/actions/strip-orphan-function-calls-tag.js';
 import { ToolGovernanceEngine } from '../../../../tool-governance/index.js';
 import { recordStage } from '../../../stages/utils.js';
 const toolGovernanceEngine = new ToolGovernanceEngine();
@@ -92,14 +93,19 @@ function maybeHarvestEmptyToolCallsFromJsonContent(payload) {
     }
     return payload;
 }
+function sanitizeResponseShapeBeforeGovernance(payload) {
+    return stripOrphanFunctionCallsTag(payload);
+}
 export async function runRespProcessStage1ToolGovernance(options) {
     const canonicalInput = coerceToCanonicalChatCompletion(options.payload);
-    maybeHarvestEmptyToolCallsFromJsonContent(canonicalInput);
+    const shapeSanitizedInput = sanitizeResponseShapeBeforeGovernance(canonicalInput);
+    maybeHarvestEmptyToolCallsFromJsonContent(shapeSanitizedInput);
     recordStage(options.stageRecorder, 'chat_process.resp.stage6.canonicalize_chat_completion', {
         converted: canonicalInput !== options.payload,
-        canonicalPayload: canonicalInput
+        shapeSanitized: shapeSanitizedInput !== canonicalInput,
+        canonicalPayload: shapeSanitizedInput
     });
-    const filtered = await runChatResponseToolFilters(canonicalInput, {
+    const filtered = await runChatResponseToolFilters(shapeSanitizedInput, {
         entryEndpoint: options.entryEndpoint,
         requestId: options.requestId,
         profile: 'openai-chat'

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

@@ -8,6 +8,7 @@ import { clearClockSession, parseDueAtMs, resolveClockConfig, reserveDueTasksFor
 import { logClock } from '../../../servertool/clock/log.js';
 import { logContinueExecution } from '../../../servertool/continue-execution/log.js';
 import { buildTimeTagLine, getClockTimeSnapshot } from '../../../servertool/clock/ntp.js';
+import { resolveClockSessionScope } from '../../../servertool/clock/session-scope.js';
 import { clearPendingServerToolInjection, loadPendingServerToolInjection } from '../../../servertool/pending-session.js';
 import { loadRoutingInstructionStateSync } from '../../../router/virtual-router/sticky-session-store.js';
 import { isJsonObject } from '../types/json.js';
@@ -941,8 +942,10 @@ function appendDirectiveToUserContent(content, directive) {
     return next;
 }
 function resolveSessionIdForClock(metadata, request) {
-    const candidate = readString(metadata.sessionId) ?? readString(request.metadata?.sessionId);
-    return candidate && candidate.trim() ? candidate.trim() : null;
+    const requestMetadata = request.metadata && typeof request.metadata === 'object' && !Array.isArray(request.metadata)
+        ? request.metadata
+        : null;
+    return resolveClockSessionScope(metadata, requestMetadata);
 }
 function stripClockClearDirectiveFromText(text) {
     const pattern = /<\*\*\s*clock\s*:\s*clear\s*\*\*>/gi;
@@ -1279,7 +1282,7 @@ async function maybeInjectClockRemindersAndApplyDirectives(request, metadata, re
                 markerToolMessages = markerToolMessages.concat(buildClockMarkerScheduleMessages(requestId, index, marker, {
                     ok: false,
                     action: 'schedule',
-                    message: 'clock requires sessionId (x-session-id header or metadata.sessionId).'
+                    message: 'clock requires session scope (sessionId/conversationId or clockDaemonId).'
                 }));
                 continue;
             }
@@ -1613,26 +1616,20 @@ function detectWebSearchIntent(request) {
     if (!messages.length) {
         return { hasIntent: false, googlePreferred: false };
     }
-    // 从末尾向前找到最近一条 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) {
+    // 仅使用“当前请求最后一条消息且角色为 user”的文本判断 web_search 意图：
+    // - 不读取系统提示词（system/developer）。
+    // - 不读取历史 user 消息（避免历史上下文误触发）。
+    const lastMessage = messages[messages.length - 1];
+    if (!lastMessage || lastMessage.role !== 'user') {
         return { hasIntent: false, googlePreferred: false };
     }
     // 支持多模态 content：既可能是纯文本字符串，也可能是带 image_url 的分段数组。
     let content = '';
-    if (typeof lastUser.content === 'string') {
-        content = lastUser.content;
+    if (typeof lastMessage.content === 'string') {
+        content = lastMessage.content;
     }
-    else if (Array.isArray(lastUser.content)) {
-        const parts = lastUser.content;
+    else if (Array.isArray(lastMessage.content)) {
+        const parts = lastMessage.content;
         const texts = [];
         for (const part of parts) {
             if (typeof part === 'string') {

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

@@ -205,6 +205,7 @@ function appendLocalImageBlockOnLatestUserInput(messages, context) {
             }
         }
     }
+    const unreadableImageNotices = [];
     for (const imagePath of imagePaths) {
         let dataUrl = '';
         try {
@@ -213,21 +214,21 @@ function appendLocalImageBlockOnLatestUserInput(messages, context) {
         catch (error) {
             const reason = error instanceof Error
                 ? `${error.code ?? 'READ_FAILED'}: ${error.message}`
-                : String(error);
-            throw new ProviderProtocolError('Failed to load local image path from latest user input', {
-                code: 'MALFORMED_REQUEST',
-                protocol: 'openai-responses',
-                providerType: 'responses',
-                details: {
-                    context: 'buildChatRequestFromResponses.localImagePathAutoload',
-                    requestId: context.requestId,
-                    path: imagePath,
-                    reason
-                }
-            });
+                : String(error ?? 'READ_FAILED');
+            unreadableImageNotices.push(`[local_image_unreadable] 文件不可读，已跳过该图片路径: ${imagePath} (${reason})`);
+            continue;
         }
         normalizedContent.push({ type: 'image_url', image_url: { url: dataUrl } });
     }
+    if (unreadableImageNotices.length) {
+        normalizedContent.push({
+            type: 'text',
+            text: unreadableImageNotices.join('\n')
+        });
+    }
+    if (!messageHasImageContent(normalizedContent) && !unreadableImageNotices.length) {
+        return;
+    }
     latestUserMessage.content = normalizedContent;
 }
 // NOTE: 自修复提示已移除（统一标准：不做模糊兜底）。

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

@@ -60,8 +60,8 @@ function collectText(value) {
     }
     return '';
 }
-function extractImageBlocksFromContent(content) {
-    const images = [];
+function extractMediaBlocksFromContent(content) {
+    const media = [];
     const visit = (value) => {
         if (!value)
             return;
@@ -75,14 +75,27 @@ function extractImageBlocksFromContent(content) {
         }
         const record = value;
         const typeValue = typeof record.type === 'string' ? record.type.toLowerCase() : '';
+        let kind = null;
         if (typeValue === 'image' || typeValue === 'image_url' || typeValue === 'input_image') {
+            kind = 'image';
+        }
+        else if (typeValue === 'video' || typeValue === 'video_url' || typeValue === 'input_video') {
+            kind = 'video';
+        }
+        else if (record.video_url !== undefined) {
+            kind = 'video';
+        }
+        else if (record.image_url !== undefined) {
+            kind = 'image';
+        }
+        if (kind) {
             let url = '';
-            const imageUrl = record.image_url;
-            if (typeof imageUrl === 'string') {
-                url = imageUrl;
+            const mediaUrl = kind === 'video' ? record.video_url : record.image_url;
+            if (typeof mediaUrl === 'string') {
+                url = mediaUrl;
             }
-            else if (imageUrl && typeof imageUrl === 'object' && typeof imageUrl.url === 'string') {
-                url = imageUrl.url;
+            else if (mediaUrl && typeof mediaUrl === 'object' && typeof mediaUrl.url === 'string') {
+                url = mediaUrl.url;
             }
             else if (typeof record.url === 'string') {
                 url = record.url;
@@ -96,13 +109,13 @@ function extractImageBlocksFromContent(content) {
             const trimmed = url.trim();
             if (trimmed.length) {
                 let detail;
-                if (imageUrl && typeof imageUrl === 'object' && typeof imageUrl.detail === 'string') {
-                    detail = imageUrl.detail.trim() || undefined;
+                if (mediaUrl && typeof mediaUrl === 'object' && typeof mediaUrl.detail === 'string') {
+                    detail = mediaUrl.detail.trim() || undefined;
                 }
                 else if (typeof record.detail === 'string') {
                     detail = record.detail.trim() || undefined;
                 }
-                images.push({ url: trimmed, detail });
+                media.push({ kind, url: trimmed, detail });
             }
             return;
         }
@@ -111,7 +124,7 @@ function extractImageBlocksFromContent(content) {
         }
     };
     visit(content);
-    return images;
+    return media;
 }
 function extractUserTextFromEntry(entry) {
     if (!entry || typeof entry !== 'object')
@@ -141,7 +154,7 @@ export function convertMessagesToBridgeInput(options) {
         const role = coerceBridgeRole(m.role || 'user');
         const content = m.content;
         const collectedText = collectText(content);
-        const imageBlocks = extractImageBlocksFromContent(content);
+        const mediaBlocks = extractMediaBlocksFromContent(content);
         const text = role === 'system' ? collectedText : collectedText.trim();
         if (role === 'system') {
             if (collectedText && collectedText.length) {
@@ -218,20 +231,26 @@ export function convertMessagesToBridgeInput(options) {
             }
             continue;
         }
-        if (typeof text === 'string' || imageBlocks.length) {
+        if (typeof text === 'string' || mediaBlocks.length) {
             const tRole = role === 'assistant' ? 'output_text' : 'input_text';
             const blocks = [];
             if (typeof text === 'string' && text.length) {
                 blocks.push({ type: tRole, text });
             }
-            for (const img of imageBlocks) {
-                const block = {
-                    type: 'input_image',
-                    image_url: img.url
-                };
-                if (img.detail) {
-                    block.detail = img.detail;
+            for (const media of mediaBlocks) {
+                const block = media.kind === 'video'
+                    ? {
+                        type: 'input_video',
+                        video_url: media.url
+                    }
+                    : {
+                        type: 'input_image',
+                        image_url: media.url
+                    };
+                if (media.detail) {
+                    block.detail = media.detail;
                 }
+                ;
                 blocks.push(block);
             }
             if (blocks.length) {
@@ -324,7 +343,7 @@ function processMessageBlocks(blocks, normalizeFunctionName, tools, toolNameById
     const toolMessages = [];
     let currentLastCall = lastToolCallId;
     const reasoningSegments = [];
-    const images = [];
+    const mediaBlocks = [];
     for (const block of blocks) {
         if (!block || typeof block !== 'object')
             continue;
@@ -347,17 +366,45 @@ function processMessageBlocks(blocks, normalizeFunctionName, tools, toolNameById
                 toolMessages.push(tm);
             currentLastCall = nested.lastCallId;
             reasoningSegments.push(...nested.reasoningSegments);
-            if (nested.images.length)
-                images.push(...nested.images);
+            if (nested.mediaBlocks.length)
+                mediaBlocks.push(...nested.mediaBlocks);
+            continue;
+        }
+        if (type === 'input_image' || type === 'image' || type === 'image_url') {
+            let url = '';
+            if (typeof block.image_url === 'string') {
+                url = block.image_url.trim();
+            }
+            else if (block.image_url && typeof block.image_url.url === 'string') {
+                url = block.image_url.url.trim();
+            }
+            else if (typeof block.url === 'string') {
+                url = block.url.trim();
+            }
+            if (url) {
+                const detail = typeof block.detail === 'string' && block.detail.trim()
+                    ? block.detail.trim()
+                    : undefined;
+                mediaBlocks.push({ kind: 'image', url, detail });
+            }
             continue;
         }
-        if (type === 'input_image') {
-            const url = typeof block.image_url === 'string' ? block.image_url.trim() : '';
+        if (type === 'input_video' || type === 'video' || type === 'video_url') {
+            let url = '';
+            if (typeof block.video_url === 'string') {
+                url = block.video_url.trim();
+            }
+            else if (block.video_url && typeof block.video_url.url === 'string') {
+                url = block.video_url.url.trim();
+            }
+            else if (typeof block.url === 'string') {
+                url = block.url.trim();
+            }
             if (url) {
                 const detail = typeof block.detail === 'string' && block.detail.trim()
                     ? block.detail.trim()
                     : undefined;
-                images.push({ url, detail });
+                mediaBlocks.push({ kind: 'video', url, detail });
             }
             continue;
         }
@@ -421,7 +468,7 @@ function processMessageBlocks(blocks, normalizeFunctionName, tools, toolNameById
         }
     }
     const text = textParts.length ? textParts.join('\n').trim() : null;
-    return { text, images, toolCalls, toolMessages, lastCallId: currentLastCall, reasoningSegments };
+    return { text, mediaBlocks, toolCalls, toolMessages, lastCallId: currentLastCall, reasoningSegments };
 }
 export function convertBridgeInputToChatMessages(options) {
     const { input, tools, normalizeFunctionName, toolResultFallbackText } = options;
@@ -547,17 +594,20 @@ export function convertBridgeInputToChatMessages(options) {
             for (const msg of nested.toolMessages)
                 messages.push(msg);
             const normalizedRole = coerceBridgeRole((explicit.role ?? entry.role) || 'user');
-            if (nested.images.length) {
+            if (nested.mediaBlocks.length) {
                 const contentBlocks = [];
                 if (typeof nested.text === 'string' && nested.text.trim().length) {
                     contentBlocks.push({ type: 'text', text: nested.text });
                 }
-                for (const img of nested.images) {
-                    const imgBlock = { type: 'image_url', image_url: { url: img.url } };
-                    if (img.detail) {
-                        imgBlock.image_url.detail = img.detail;
+                for (const media of nested.mediaBlocks) {
+                    const mediaBlock = media.kind === 'video'
+                        ? { type: 'video_url', video_url: { url: media.url } }
+                        : { type: 'image_url', image_url: { url: media.url } };
+                    if (media.detail) {
+                        const key = media.kind === 'video' ? 'video_url' : 'image_url';
+                        mediaBlock[key].detail = media.detail;
                     }
-                    contentBlocks.push(imgBlock);
+                    contentBlocks.push(mediaBlock);
                 }
                 const msg = {
                     role: normalizedRole,
@@ -590,17 +640,20 @@ export function convertBridgeInputToChatMessages(options) {
             for (const msg of nested.toolMessages)
                 messages.push(msg);
             const normalizedRole = coerceBridgeRole(entry.role || 'user');
-            if (nested.images.length) {
+            if (nested.mediaBlocks.length) {
                 const contentBlocks = [];
                 if (typeof nested.text === 'string' && nested.text.trim().length) {
                     contentBlocks.push({ type: 'text', text: nested.text });
                 }
-                for (const img of nested.images) {
-                    const imgBlock = { type: 'image_url', image_url: { url: img.url } };
-                    if (img.detail) {
-                        imgBlock.image_url.detail = img.detail;
+                for (const media of nested.mediaBlocks) {
+                    const mediaBlock = media.kind === 'video'
+                        ? { type: 'video_url', video_url: { url: media.url } }
+                        : { type: 'image_url', image_url: { url: media.url } };
+                    if (media.detail) {
+                        const key = media.kind === 'video' ? 'video_url' : 'image_url';
+                        mediaBlock[key].detail = media.detail;
                     }
-                    contentBlocks.push(imgBlock);
+                    contentBlocks.push(mediaBlock);
                 }
                 const msg = {
                     role: normalizedRole,

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

@@ -114,13 +114,15 @@ function detectWebSearchIntent(text) {
         return false;
     }
     const normalized = text.toLowerCase();
+    if (isNegativeWebSearchContext(normalized, text)) {
+        return false;
+    }
     const directKeywords = [
         'web search',
         'web_search',
         'websearch',
         'search the web',
         'internet search',
-        'search online',
         '搜索网页',
         '联网搜索',
         '上网搜索',
@@ -133,21 +135,43 @@ function detectWebSearchIntent(text) {
         return true;
     }
     const enVerb = ['search', 'find', 'lookup', 'look up', 'google'];
-    const enNoun = ['web', 'internet', 'online', 'news', 'latest', 'today'];
+    const enNoun = ['web', 'internet', 'online', 'google', 'bing'];
     const hasEnVerb = enVerb.some((keyword) => normalized.includes(keyword));
     const hasEnNoun = enNoun.some((keyword) => normalized.includes(keyword));
     if (hasEnVerb && hasEnNoun) {
         return true;
     }
-    const zhVerb = ['搜索', '查找', '查询', '搜'];
-    const zhNoun = ['网络', '联网', '网页', '新闻', '资讯', '实时', '最新', '今天'];
+    const zhVerb = ['搜索', '查找', '搜', '上网查', '上网搜', '联网查', '联网搜'];
+    const zhNoun = ['网络', '联网', '网页', '网上', '互联网', '谷歌', '百度'];
     const hasZhVerb = zhVerb.some((keyword) => text.includes(keyword));
     const hasZhNoun = zhNoun.some((keyword) => text.includes(keyword));
-    if (text.includes('上网') || (hasZhVerb && hasZhNoun)) {
+    if ((text.includes('上网') || text.includes('联网')) && (text.includes('搜') || text.includes('查'))) {
+        return true;
+    }
+    if (hasZhVerb && hasZhNoun) {
         return true;
     }
     return false;
 }
+function isNegativeWebSearchContext(normalized, originalText) {
+    const englishPatterns = [
+        /prefer\s+resources?\s+over\s+web[\s_-]?search/u,
+        /prefer[\s\S]{0,40}web[\s_-]?search/u,
+        /do\s+not[\s\S]{0,20}web[\s_-]?search/u,
+        /don't[\s\S]{0,20}web[\s_-]?search/u,
+        /without[\s\S]{0,20}web[\s_-]?search/u,
+        /cannot[\s\S]{0,20}web[\s_-]?search/u
+    ];
+    if (englishPatterns.some((pattern) => pattern.test(normalized))) {
+        return true;
+    }
+    const chinesePatterns = [
+        /不能.{0,20}(上网|联网|web[_ -]?search|搜索网页)/u,
+        /不要.{0,20}(上网|联网|web[_ -]?search|搜索网页)/u,
+        /避免.{0,20}(上网|联网|web[_ -]?search|搜索网页)/u
+    ];
+    return chinesePatterns.some((pattern) => pattern.test(originalText));
+}
 function normalizeList(source, fallback) {
     if (!source || source.length === 0) {
         return fallback;