@jsonstudio/llms 0.4.5 → 0.6.0

package/dist/conversion/shared/tool-filter-pipeline.js

@@ -1,5 +1,6 @@
 import { FilterEngine } from '../../filters/index.js';
 import { loadFieldMapConfig } from '../../filters/utils/fieldmap-loader.js';
+import { createSnapshotWriter } from './snapshot-utils.js';
 export async function runChatRequestToolFilters(chatRequest, options = {}) {
     const reqCtxBase = {
         requestId: options.requestId ?? `req_${Date.now()}`,
@@ -10,15 +11,35 @@ export async function runChatRequestToolFilters(chatRequest, options = {}) {
         toolFilterHints: options.toolFilterHints,
         debug: { emit: () => { } }
     };
+    const snapshot = createSnapshotWriter({
+        requestId: reqCtxBase.requestId,
+        endpoint: reqCtxBase.endpoint,
+        folderHint: 'openai-chat'
+    });
+    const recordStage = (stage, payload) => {
+        if (!snapshot)
+            return;
+        snapshot(stage, payload);
+    };
+    recordStage('req_process_tool_filters_input', chatRequest);
     const engine = new FilterEngine();
-    try {
-        const { RequestToolListFilter } = await import('../../filters/index.js');
-        engine.registerFilter(new RequestToolListFilter());
+    const profile = (reqCtxBase.profile || '').toLowerCase();
+    const endpoint = (reqCtxBase.endpoint || '').toLowerCase();
+    const isAnthropic = profile === 'anthropic-messages' || endpoint.includes('/v1/messages');
+    if (!isAnthropic) {
+        try {
+            const { RequestToolListFilter } = await import('../../filters/index.js');
+            engine.registerFilter(new RequestToolListFilter());
+        }
+        catch {
+            /* optional */
+        }
     }
-    catch { /* optional */ }
     const { RequestToolCallsStringifyFilter, RequestToolChoicePolicyFilter, RequestStreamingToNonStreamingFilter } = await import('../../filters/index.js');
     engine.registerFilter(new RequestToolCallsStringifyFilter());
-    engine.registerFilter(new RequestToolChoicePolicyFilter());
+    if (!isAnthropic) {
+        engine.registerFilter(new RequestToolChoicePolicyFilter());
+    }
     engine.registerFilter(new RequestStreamingToNonStreamingFilter());
     try {
         const cfg = await loadFieldMapConfig('openai-openai.fieldmap.json');
@@ -33,8 +54,12 @@ export async function runChatRequestToolFilters(chatRequest, options = {}) {
     }
     catch { /* ignore */ }
     let staged = await engine.run('request_pre', chatRequest, reqCtxBase);
+    recordStage('req_process_tool_filters_request_pre', staged);
     staged = await engine.run('request_map', staged, reqCtxBase);
+    recordStage('req_process_tool_filters_request_map', staged);
     staged = await engine.run('request_post', staged, reqCtxBase);
+    recordStage('req_process_tool_filters_request_post', staged);
+    recordStage('req_process_tool_filters_output', staged);
     return staged;
 }
 export async function runChatResponseToolFilters(chatJson, options = {}) {
@@ -45,6 +70,17 @@ export async function runChatResponseToolFilters(chatJson, options = {}) {
         profile: options.profile || 'openai-chat',
         debug: { emit: () => { } }
     };
+    const snapshot = createSnapshotWriter({
+        requestId: resCtxBase.requestId,
+        endpoint: resCtxBase.endpoint,
+        folderHint: 'openai-chat'
+    });
+    const recordStage = (stage, payload) => {
+        if (!snapshot)
+            return;
+        snapshot(stage, payload);
+    };
+    recordStage('resp_process_tool_filters_input', chatJson);
     const engine = new FilterEngine();
     const { ResponseToolTextCanonicalizeFilter, ResponseToolArgumentsStringifyFilter, ResponseFinishInvariantsFilter } = await import('../../filters/index.js');
     engine.registerFilter(new ResponseToolTextCanonicalizeFilter());
@@ -73,7 +109,11 @@ export async function runChatResponseToolFilters(chatJson, options = {}) {
     }
     catch { /* ignore */ }
     let staged = await engine.run('response_pre', chatJson, resCtxBase);
+    recordStage('resp_process_tool_filters_response_pre', staged);
     staged = await engine.run('response_map', staged, resCtxBase);
+    recordStage('resp_process_tool_filters_response_map', staged);
     staged = await engine.run('response_post', staged, resCtxBase);
+    recordStage('resp_process_tool_filters_response_post', staged);
+    recordStage('resp_process_tool_filters_output', staged);
     return staged;
 }

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

@@ -1,5 +1,8 @@
 // Unified tool governance API (标准)
 // Centralizes tool augmentation, guidance injection/refinement, and textual→tool_calls canonicalization
+// canonicalizer 按需加载（避免在请求侧仅注入时引入不必要的模块）
+// enforceChatBudget: 为避免在请求侧引入多余依赖，这里提供最小实现（保留形状，不裁剪）。
+import { augmentOpenAITools } from '../../guidance/index.js';
 function isObject(v) { return !!v && typeof v === 'object' && !Array.isArray(v); }
 // Note: tool schema strict augmentation removed per alignment
 function enforceChatBudget(chat, _modelId) { return chat; }
@@ -63,6 +66,8 @@ export function processChatRequestTools(request, opts) {
                     t.function = { ...fn, parameters: {} };
                 }
             }
+            // 严格化工具 schema（apply_patch/shell/MCP 等）保持在唯一治理点，避免重复注入
+            out.tools = augmentOpenAITools(tools);
         }
     }
     catch { /* best-effort: 保持原样 */ }

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

@@ -32,8 +32,8 @@ function pickToolName(candidates, options) {
     return undefined;
 }
 function resolveToolDescription(candidate) {
-    if (typeof candidate === 'string' && candidate.trim().length) {
-        return candidate.trim();
+    if (typeof candidate === 'string') {
+        return candidate;
     }
     return undefined;
 }
@@ -121,6 +121,17 @@ export function chatToolToBridgeDefinition(rawTool, options) {
     if (strict !== undefined) {
         responseShape.strict = strict;
     }
+    const fnOut = { name };
+    if (description !== undefined) {
+        fnOut.description = description;
+    }
+    if (parameters !== undefined) {
+        fnOut.parameters = parameters;
+    }
+    if (strict !== undefined) {
+        fnOut.strict = strict;
+    }
+    responseShape.function = fnOut;
     return responseShape;
 }
 export function mapChatToolsToBridge(rawTools, options) {

package/dist/filters/special/request-tool-choice-policy.js

@@ -11,8 +11,10 @@ export class RequestToolChoicePolicyFilter {
             const out = JSON.parse(JSON.stringify(input || {}));
             const tools = Array.isArray(out.tools) ? out.tools : [];
             if (tools.length > 0) {
-                if (out.tool_choice == null)
+                const hasOwn = Object.prototype.hasOwnProperty.call(out, 'tool_choice');
+                if (!hasOwn || out.tool_choice === undefined) {
                     out.tool_choice = 'auto';
+                }
             }
             else {
                 if (Object.prototype.hasOwnProperty.call(out, 'tool_choice'))

package/dist/filters/special/request-tool-list-filter.d.ts

@@ -0,0 +1,11 @@
+import type { Filter, FilterContext, FilterResult, JsonObject } from '../types.js';
+/**
+ * RequestToolListFilter (request_pre)
+ * - Generic tool-list filter/augment hook
+ * - Currently only handles MCP tools with phase-based exposure
+ */
+export declare class RequestToolListFilter implements Filter<JsonObject> {
+    readonly name = "request_tool_list_filter";
+    readonly stage: FilterContext['stage'];
+    apply(input: JsonObject, ctx: FilterContext): FilterResult<JsonObject>;
+}

package/dist/filters/special/request-tool-list-filter.js

@@ -94,15 +94,21 @@ function removeToolByName(tools, name) {
 export class RequestToolListFilter {
     name = 'request_tool_list_filter';
     stage = 'request_pre';
-    apply(input) {
+    apply(input, ctx) {
         try {
             const out = JSON.parse(JSON.stringify(input || {}));
-            const tools = Array.isArray(out.tools) ? out.tools : [];
-            if (!tools.length)
-                return { ok: true, data: out };
+            const hadIncomingTools = Array.isArray(out.tools);
+            const tools = hadIncomingTools ? out.tools : [];
+            if (!hadIncomingTools) {
+                out.tools = tools;
+            }
             const mode = envMode();
-            if (mode === 'off')
+            if (mode === 'off') {
+                if (!hadIncomingTools && tools.length === 0) {
+                    delete out.tools;
+                }
                 return { ok: true, data: out };
+            }
             const messages = Array.isArray(out.messages) ? out.messages : [];
             const servers = new Set();
             for (const s of getEnvServers())
@@ -137,14 +143,21 @@ export class RequestToolListFilter {
                 required: ['server', 'uri'],
                 additionalProperties: false
             };
+            const profileKey = String(ctx?.profile || '').toLowerCase();
+            const endpointKey = String(ctx?.endpoint || '').toLowerCase();
+            const prefersLegacyListDescription = profileKey.includes('anthropic') ||
+                endpointKey.includes('/v1/messages');
+            const listDescription = prefersLegacyListDescription
+                ? 'List resources from an MCP server.'
+                : 'List resources from a given MCP server (arguments.server = server label).';
             if (mode === 'all') {
-                ensureFunctionTool(tools, 'list_mcp_resources', 'List resources from an MCP server.', listResParams);
+                ensureFunctionTool(tools, 'list_mcp_resources', listDescription, listResParams);
                 ensureFunctionTool(tools, 'list_mcp_resource_templates', 'List resource templates from MCP servers.', listTplParams);
                 ensureFunctionTool(tools, 'read_mcp_resource', 'Read a specific MCP resource.', readResParamsBase);
             }
             else {
                 // phase
-                ensureFunctionTool(tools, 'list_mcp_resources', 'List resources from an MCP server.', listResParams);
+                ensureFunctionTool(tools, 'list_mcp_resources', listDescription, listResParams);
                 ensureFunctionTool(tools, 'list_mcp_resource_templates', 'List resource templates from MCP servers.', listTplParams);
                 // read is only exposed when we have known servers
                 if (knownServers.length > 0) {

package/dist/sse/shared/responses-output-normalizer.js

@@ -13,9 +13,8 @@ export function normalizeResponsesMessageItem(item, options) {
         const extras = Array.isArray(additionalReasoning) ? additionalReasoning : [additionalReasoning];
         for (const entry of extras) {
             if (typeof entry === 'string') {
-                const trimmed = entry.trim();
-                if (trimmed.length) {
-                    reasoningChunks.push(trimmed);
+                if (entry.length) {
+                    reasoningChunks.push(entry);
                 }
             }
         }
@@ -41,5 +40,7 @@ export function normalizeResponsesMessageItem(item, options) {
 }
 export function expandResponsesMessageItem(item, options) {
     const { message, reasoning } = normalizeResponsesMessageItem(item, options);
-    return reasoning ? [message, reasoning] : [message];
+    // Responses upstream (legacy + CCR) emitted reasoning segments before the final assistant message.
+    // Preserve that ordering so roundtrip comparisons against provider snapshots remain identical.
+    return reasoning ? [reasoning, message] : [message];
 }

package/package.json

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