@jsonstudio/rcc 0.89.168 → 0.89.524

package/{dist/providers/compat/filters → node_modules/@jsonstudio/llms/dist/conversion/compat/actions}/universal-shape-filter.d.ts

@@ -1,6 +1,14 @@
-import type { UnknownObject } from '../../../modules/pipeline/types/common-types.js';
-import type { CompatibilityContext } from '../compatibility-interface.js';
-type FilterConfig = {
+import type { AdapterContext } from '../../hub/types/chat-envelope.js';
+import type { JsonObject } from '../../hub/types/json.js';
+type RequestMessagesRule = {
+    when?: {
+        role?: 'system' | 'user' | 'assistant' | 'tool';
+        hasToolCalls?: boolean;
+    };
+    action: 'drop' | 'keep' | 'set';
+    set?: Record<string, unknown>;
+};
+export interface FilterConfig {
     request: {
         allowTopLevel: string[];
         messages: {
@@ -16,14 +24,7 @@ type FilterConfig = {
         assistantToolCalls?: {
             functionArgumentsType?: 'object' | 'string';
         };
-        messagesRules?: Array<{
-            when?: {
-                role?: 'system' | 'user' | 'assistant' | 'tool';
-                hasToolCalls?: boolean;
-            };
-            action: 'drop' | 'keep' | 'set';
-            set?: Record<string, unknown>;
-        }>;
+        messagesRules?: RequestMessagesRule[];
     };
     response: {
         allowTopLevel: string[];
@@ -46,22 +47,16 @@ type FilterConfig = {
             allow: string[];
         };
     };
-};
+}
 export declare class UniversalShapeFilter {
-    private cfg;
-    private readonly configPath?;
-    private readonly inlineConfig?;
-    constructor(options?: {
-        configPath?: string;
-        config?: FilterConfig;
-    });
-    initialize(): Promise<void>;
+    private readonly cfg;
+    constructor(config: FilterConfig);
+    applyRequestFilter(payload: JsonObject): JsonObject;
+    applyResponseFilter(payload: JsonObject, ctx?: AdapterContext): JsonObject;
     private shallowPick;
     private toObjectArgs;
     private toStringArgs;
     private normalizeToolContent;
-    applyRequestFilter(payload: UnknownObject): Promise<UnknownObject>;
-    applyResponseFilter(payload: UnknownObject, _ctx?: CompatibilityContext): Promise<UnknownObject>;
     private normalizeRequestMessages;
     private normalizeSingleMessage;
     private normalizeAssistantToolCalls;

package/{dist/providers/compat/filters → node_modules/@jsonstudio/llms/dist/conversion/compat/actions}/universal-shape-filter.js

@@ -1,5 +1,3 @@
-import * as fs from 'fs/promises';
-import * as path from 'path';
 const DEFAULT_TOOL_OUTPUT = 'Command succeeded (no output).';
 function isRecord(value) {
     return typeof value === 'object' && value !== null && !Array.isArray(value);
@@ -14,55 +12,43 @@ function hasArrayItems(value) {
     return Array.isArray(value) && value.length > 0;
 }
 export class UniversalShapeFilter {
-    cfg = null;
-    configPath;
-    inlineConfig;
-    constructor(options = {}) {
-        this.configPath = options.configPath;
-        this.inlineConfig = options.config;
+    cfg;
+    constructor(config) {
+        this.cfg = config;
     }
-    async initialize() {
-        if (this.inlineConfig) {
-            this.cfg = this.inlineConfig;
-            return;
-        }
-        const file = this.configPath ? (path.isAbsolute(this.configPath) ? this.configPath : path.join(process.cwd(), this.configPath)) : '';
-        if (file) {
-            try {
-                const text = await fs.readFile(file, 'utf-8');
-                this.cfg = JSON.parse(text);
-                return;
-            }
-            catch { /* fallthrough to default */ }
-        }
-        this.cfg = {
-            request: {
-                allowTopLevel: ['model', 'messages', 'stream', 'thinking', 'do_sample', 'temperature', 'top_p', 'max_tokens', 'tool_stream', 'tools', 'tool_choice', 'stop', 'response_format', 'request_id', 'user_id'],
-                messages: { allowedRoles: ['system', 'user', 'assistant', 'tool'], assistantWithToolCallsContentNull: true, toolContentStringify: true },
-                tools: { normalize: true, forceToolChoiceAuto: true },
-                assistantToolCalls: { functionArgumentsType: 'string' } // 修复：默认使用string格式而不是object
-            },
-            response: {
-                // 保留 Responses 协议关键字段，避免在合成/转换前被丢弃
-                allowTopLevel: [
-                    'id', 'request_id', 'created', 'model',
-                    'choices', 'usage', 'video_result', 'web_search', 'content_filter',
-                    // Responses 专有/常见：
-                    'required_action', 'output', 'output_text', 'status'
-                ],
-                choices: {
-                    required: true,
-                    message: {
-                        allow: ['role', 'content', 'reasoning_content', 'audio', 'tool_calls'],
-                        roleDefault: 'assistant',
-                        contentNullWhenToolCalls: true,
-                        tool_calls: { function: { nameRequired: true, argumentsType: 'string' } }
-                    },
-                    finish_reason: ['stop', 'tool_calls', 'length', 'sensitive', 'network_error']
-                },
-                usage: { allow: ['prompt_tokens', 'completion_tokens', 'prompt_tokens_details', 'total_tokens'] }
+    applyRequestFilter(payload) {
+        const cfg = this.cfg;
+        const allow = new Set(cfg.request.allowTopLevel);
+        const src = toRecord(payload);
+        const out = {};
+        for (const key of Object.keys(src)) {
+            if (allow.has(key)) {
+                out[key] = src[key];
             }
-        };
+        }
+        const normalizedMessages = this.normalizeRequestMessages(out.messages, cfg.request);
+        out.messages = normalizedMessages;
+        this.normalizeTools(out, cfg.request);
+        this.cleanupToolChoice(out);
+        return out;
+    }
+    applyResponseFilter(payload, ctx) {
+        const envFlag = String(process.env.RCC_COMPAT_FILTER_OFF_RESPONSES || '1').toLowerCase();
+        const envBypass = !(envFlag === '0' || envFlag === 'false' || envFlag === 'off');
+        const entryEndpoint = ctx?.entryEndpoint ?? ctx?.endpoint;
+        const entry = typeof entryEndpoint === 'string' ? entryEndpoint.toLowerCase() : '';
+        if (entry === '/v1/responses' || envBypass) {
+            return payload;
+        }
+        const cfg = this.cfg;
+        const src = toRecord(payload);
+        const out = this.shallowPick(src, cfg.response.allowTopLevel);
+        const choices = Array.isArray(src.choices) ? src.choices : [];
+        out.choices = choices.map((choice, idx) => this.normalizeResponseChoice(choice, idx, cfg.response));
+        if (src.usage && typeof src.usage === 'object') {
+            out.usage = this.shallowPick(src.usage, cfg.response.usage?.allow || []);
+        }
+        return out;
     }
     shallowPick(obj, allow) {
         if (!isRecord(obj)) {
@@ -119,51 +105,6 @@ export class UniversalShapeFilter {
             return DEFAULT_TOOL_OUTPUT;
         }
     }
-    async applyRequestFilter(payload) {
-        const cfg = this.cfg;
-        const allow = new Set(cfg.request.allowTopLevel);
-        const src = toRecord(payload);
-        const out = {};
-        for (const key of Object.keys(src)) {
-            if (allow.has(key)) {
-                out[key] = src[key];
-            }
-        }
-        const normalizedMessages = this.normalizeRequestMessages(out.messages, cfg.request);
-        out.messages = normalizedMessages;
-        this.normalizeTools(out, cfg.request);
-        this.cleanupToolChoice(out);
-        return out;
-    }
-    async applyResponseFilter(payload, _ctx) {
-        // Bypass shape filtering by default to keep system running; can be turned off via env.
-        // Default: RCC_COMPAT_FILTER_OFF_RESPONSES is treated as ON unless explicitly set to 0/false/off.
-        const envFlag = String(process.env.RCC_COMPAT_FILTER_OFF_RESPONSES || '1').toLowerCase();
-        const envBypass = !(envFlag === '0' || envFlag === 'false' || envFlag === 'off');
-        try {
-            const ctx = _ctx;
-            const entryEndpoint = typeof ctx?.entryEndpoint === 'string' ? ctx.entryEndpoint : undefined;
-            const fallbackEndpoint = typeof ctx?.endpoint === 'string' ? ctx.endpoint : undefined;
-            const entry = String(entryEndpoint ?? fallbackEndpoint ?? '').toLowerCase();
-            if (entry === '/v1/responses' || envBypass) {
-                return payload;
-            }
-        }
-        catch {
-            if (envBypass) {
-                return payload;
-            }
-        }
-        const cfg = this.cfg;
-        const src = toRecord(payload);
-        const out = this.shallowPick(src, cfg.response.allowTopLevel);
-        const choices = Array.isArray(src.choices) ? src.choices : [];
-        out.choices = choices.map((choice, idx) => this.normalizeResponseChoice(choice, idx, cfg.response));
-        if (src.usage && typeof src.usage === 'object') {
-            out.usage = this.shallowPick(src.usage, cfg.response.usage?.allow || []);
-        }
-        return out;
-    }
     normalizeRequestMessages(messages, requestCfg) {
         const entries = toArray(messages);
         const normalized = entries.map(entry => this.normalizeSingleMessage(entry, requestCfg));
@@ -186,6 +127,17 @@ export class UniversalShapeFilter {
                 normalized.tool_call_id = msg.tool_call_id;
             }
         }
+        else if (Array.isArray(msg.content)) {
+            normalized.content = msg.content.map((part) => {
+                if (typeof part === 'string') {
+                    return part;
+                }
+                if (isRecord(part)) {
+                    return { ...part };
+                }
+                return part;
+            });
+        }
         else {
             normalized.content = (msg.content !== null && msg.content !== undefined) ? String(msg.content) : '';
         }
@@ -435,12 +387,7 @@ export class UniversalShapeFilter {
             if (typeof tc.id === 'string') {
                 normalized.id = tc.id;
             }
-            if (tc.mcp) {
-                const existing = isRecord(normalized._glm) ? normalized._glm : {};
-                normalized._glm = { ...existing, mcp: tc.mcp };
-            }
             return normalized;
         });
     }
 }
-//# sourceMappingURL=universal-shape-filter.js.map

package/node_modules/@jsonstudio/llms/dist/conversion/compat/profiles/chat-gemini.json

@@ -0,0 +1,17 @@
+{
+  "id": "chat:gemini",
+  "protocol": "gemini-chat",
+  "request": {
+    "mappings": [
+      { "action": "snapshot", "phase": "compat-pre" },
+      {
+        "action": "gemini_web_search_request"
+      },
+      { "action": "snapshot", "phase": "compat-post" }
+    ]
+  },
+  "response": {
+    "mappings": []
+  }
+}
+

package/node_modules/@jsonstudio/llms/dist/conversion/compat/profiles/chat-glm.json

@@ -1,17 +1,200 @@
 {
-    "id": "chat:glm",
-    "protocol": "openai-chat",
-    "direction": "request",
+  "id": "chat:glm",
+  "protocol": "openai-chat",
+  "request": {
     "mappings": [
-        {
-            "action": "rename",
-            "from": "response_format",
-            "to": "metadata.generation.response_format"
-        },
-        {
-            "action": "remove",
-            "path": "metadata.clientModelId"
+      { "action": "snapshot", "phase": "compat-pre" },
+      { "action": "dto_unwrap" },
+      {
+        "action": "glm_image_content"
+      },
+      {
+        "action": "glm_vision_prompt"
+      },
+      {
+        "action": "rename",
+        "from": "response_format",
+        "to": "metadata.generation.response_format"
+      },
+      {
+        "action": "remove",
+        "path": "metadata.clientModelId"
+      },
+      {
+        "action": "shape_filter",
+        "target": "request",
+        "config": {
+          "request": {
+            "allowTopLevel": [
+              "model", "messages", "stream", "thinking", "do_sample", "temperature", "top_p",
+              "max_tokens", "tools", "tool_choice", "stop", "response_format", "web_search"
+            ],
+            "messages": {
+              "allowedRoles": ["system", "user", "assistant", "tool"],
+              "assistantWithToolCallsContentNull": true,
+              "toolContentStringify": false
+            },
+            "messagesRules": [],
+            "tools": {
+              "normalize": false,
+              "forceToolChoiceAuto": true
+            },
+            "assistantToolCalls": { "functionArgumentsType": "string" }
+          },
+          "response": {
+            "allowTopLevel": [
+              "id", "request_id", "created", "model",
+              "choices", "usage", "video_result", "web_search", "content_filter",
+              "required_action", "output", "output_text", "status"
+            ],
+            "choices": {
+              "required": true,
+              "message": {
+                "allow": ["role", "content", "reasoning_content", "audio", "tool_calls"],
+                "roleDefault": "assistant",
+                "contentNullWhenToolCalls": true,
+                "tool_calls": { "function": { "nameRequired": true, "argumentsType": "string" } }
+              },
+              "finish_reason": ["stop", "tool_calls", "length", "sensitive", "network_error"]
+            },
+            "usage": { "allow": ["prompt_tokens", "completion_tokens", "prompt_tokens_details", "total_tokens"] }
+          }
         }
-    ],
-    "filters": []
+      },
+      {
+        "action": "apply_rules",
+        "config": {
+          "tools": {
+            "function": {
+              "removeKeys": ["strict", "json_schema"]
+            }
+          },
+          "messages": {
+            "assistantToolCalls": {
+              "function": {
+                "removeKeys": ["strict"]
+              }
+            }
+          },
+          "topLevel": {
+            "conditional": [
+              { "when": { "tools": "empty" }, "remove": ["tool_choice"] }
+            ]
+          }
+        }
+      },
+      {
+        "action": "field_map",
+        "direction": "incoming",
+        "config": [
+          { "sourcePath": "usage.prompt_tokens", "targetPath": "usage.input_tokens", "type": "number" },
+          { "sourcePath": "usage.completion_tokens", "targetPath": "usage.output_tokens", "type": "number" },
+          { "sourcePath": "created", "targetPath": "created_at", "type": "number" },
+          { "sourcePath": "request_id", "targetPath": "request_id", "type": "string" },
+          { "sourcePath": "model", "targetPath": "model", "type": "string", "transform": "normalizeModelName" },
+          {
+            "sourcePath": "choices[*].message.tool_calls[*].function.arguments",
+            "targetPath": "choices[*].message.tool_calls[*].function.arguments",
+            "type": "string"
+          }
+        ]
+      },
+      { "action": "tool_schema_sanitize", "mode": "glm_shell" },
+      {
+        "action": "glm_web_search_request"
+      },
+      {
+        "action": "auto_thinking",
+        "config": {
+          "modelPrefixes": ["glm-4.7", "glm-4.6", "glm-4.5", "glm-z1"],
+          "excludePrefixes": ["glm-4.6v"]
+        }
+      },
+      { "action": "snapshot", "phase": "compat-post" },
+      { "action": "dto_rewrap" }
+    ]
+  },
+  "response": {
+    "mappings": [
+      { "action": "snapshot", "phase": "compat-pre" },
+      { "action": "dto_unwrap" },
+      {
+        "action": "resp_blacklist",
+        "config": {
+          "paths": ["usage.prompt_tokens_details.cached_tokens"],
+          "keepCritical": true
+        }
+      },
+      {
+        "action": "shape_filter",
+        "target": "response",
+        "config": {
+          "request": {
+            "allowTopLevel": [
+              "model", "messages", "stream", "thinking", "do_sample", "temperature", "top_p",
+              "max_tokens", "tools", "tool_choice", "stop", "response_format"
+            ],
+            "messages": {
+              "allowedRoles": ["system", "user", "assistant", "tool"],
+              "assistantWithToolCallsContentNull": true,
+              "toolContentStringify": false
+            },
+            "messagesRules": [],
+            "tools": {
+              "normalize": false,
+              "forceToolChoiceAuto": true
+            },
+            "assistantToolCalls": { "functionArgumentsType": "string" }
+          },
+          "response": {
+            "allowTopLevel": [
+              "id", "request_id", "created", "model",
+              "choices", "usage", "video_result", "web_search", "content_filter",
+              "required_action", "output", "output_text", "status"
+            ],
+            "choices": {
+              "required": true,
+              "message": {
+                "allow": ["role", "content", "reasoning_content", "audio", "tool_calls"],
+                "roleDefault": "assistant",
+                "contentNullWhenToolCalls": true,
+                "tool_calls": { "function": { "nameRequired": true, "argumentsType": "string" } }
+              },
+              "finish_reason": ["stop", "tool_calls", "length", "sensitive", "network_error"]
+            },
+            "usage": { "allow": ["prompt_tokens", "completion_tokens", "prompt_tokens_details", "total_tokens"] }
+          }
+        }
+      },
+      {
+        "action": "field_map",
+        "direction": "outgoing",
+        "config": [
+          { "sourcePath": "usage.input_tokens", "targetPath": "usage.prompt_tokens", "type": "number" },
+          { "sourcePath": "usage.output_tokens", "targetPath": "usage.completion_tokens", "type": "number" },
+          { "sourcePath": "usage.total_input_tokens", "targetPath": "usage.prompt_tokens", "type": "number" },
+          { "sourcePath": "usage.total_output_tokens", "targetPath": "usage.completion_tokens", "type": "number" },
+          { "sourcePath": "created_at", "targetPath": "created", "type": "number" },
+          { "sourcePath": "request_id", "targetPath": "request_id", "type": "string" },
+          {
+            "sourcePath": "choices[*].finish_reason",
+            "targetPath": "choices[*].finish_reason",
+            "type": "string",
+            "transform": "normalizeFinishReason"
+          },
+          {
+            "sourcePath": "choices[*].message.tool_calls[*].function.arguments",
+            "targetPath": "choices[*].message.tool_calls[*].function.arguments",
+            "type": "string"
+          }
+        ]
+      },
+      { "action": "tool_schema_sanitize", "mode": "glm_shell" },
+      { "action": "response_normalize" },
+      { "action": "extract_glm_tool_markup" },
+      { "action": "response_validate" },
+      { "action": "snapshot", "phase": "compat-post" },
+      { "action": "dto_rewrap" }
+    ]
+  }
 }