@jsonstudio/rcc 0.89.3 → 0.89.164

package/node_modules/@jsonstudio/llms/dist/tools/tool-registry.js

@@ -95,11 +95,12 @@ export function validateToolCall(name, argsString) {
     const rawArgs = tryParseJson(typeof argsString === 'string' ? argsString : '{}');
     switch (normalizedName) {
         case 'apply_patch': {
-            const patch = asString(rawArgs.patch);
+            const input = asString(rawArgs.input);
+            const patch = asString(rawArgs.patch) ?? input;
             if (!patch) {
-                return { ok: false, reason: 'missing_patch' };
+                return { ok: false, reason: 'missing_input' };
             }
-            return { ok: true, normalizedArgs: toJson({ patch }) };
+            return { ok: true, normalizedArgs: toJson({ input: patch, patch }) };
         }
         case 'shell': {
             const rawCommand = rawArgs.command;

package/node_modules/@jsonstudio/llms/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@jsonstudio/llms",
-  "version": "0.6.002",
+  "version": "0.6.104",
   "type": "module",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
-    "build": "tsc -p tsconfig.json",
-    "build:dev": "tsc -p tsconfig.json",
+    "build": "node scripts/bump-version.mjs && tsc -p tsconfig.json && node scripts/tools/copy-compat-profiles.mjs",
+    "build:dev": "node scripts/bump-version.mjs && tsc -p tsconfig.json && node scripts/tools/copy-compat-profiles.mjs",
     "lint": "eslint --no-eslintrc -c .eslintrc.json src --ext .ts --no-cache",
     "lint:fix": "eslint --no-eslintrc -c .eslintrc.json src --ext .ts --no-cache --fix",
     "postbuild": "node scripts/tests/run-matrix-ci.mjs",

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@jsonstudio/rcc",
-  "version": "0.89.3",
-  "description": "Multi-provider OpenAI proxy server with anthropic/responses/chat support",
+  "version": "0.89.164",
+  "description": "Multi-provider OpenAI proxy server with anthropic/responses/chat support (dev)",
   "type": "module",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "bin": {
-    "rcc": "./dist/cli.js"
+    "rcc": "dist/cli.js"
   },
   "exports": {
     ".": {
@@ -31,9 +31,9 @@
     "node": ">=20 <26"
   },
   "scripts": {
-    "build": "node scripts/build-core.mjs && node scripts/vendor-core.mjs && npm run clean && node scripts/gen-build-info.mjs && tsc && node scripts/copy-compat-assets.mjs && node scripts/copy-modules-config.mjs",
-    "build:dev": "npm run clean && node scripts/build-core.mjs && node scripts/gen-build-info.mjs && tsc && node scripts/copy-compat-assets.mjs && chmod +x dist/cli.js || true && npm run verify:e2e-toolcall",
-    "build:min": "node scripts/build-core.mjs && node scripts/vendor-core.mjs && npm run clean && node scripts/gen-build-info.mjs && tsc && node scripts/copy-compat-configs.mjs",
+    "build": "npm run llmswitch:ensure && node scripts/build-core.mjs && node scripts/vendor-core.mjs && npm run clean && node scripts/gen-build-info.mjs && tsc && node scripts/copy-compat-assets.mjs && node scripts/copy-modules-config.mjs",
+    "build:dev": "BUILD_MODE=dev npm run build && npm run verify:e2e-toolcall && npm run install:global",
+    "build:min": "npm run llmswitch:ensure && node scripts/build-core.mjs && node scripts/vendor-core.mjs && npm run clean && node scripts/gen-build-info.mjs && tsc && node scripts/copy-compat-assets.mjs && node scripts/copy-modules-config.mjs",
     "prepack": "echo skip-prepack",
     "postbuild": "chmod +x dist/cli.js || true",
     "build:watch": "tsc --watch",
@@ -76,6 +76,7 @@
     "debug:responses:lmstudio:text": "tsx tools/responses-debug-client/src/index.ts --file tools/responses-debug-client/payloads/lmstudio-text.json --baseURL ${LMSTUDIO_BASEURL:-http://127.0.0.1:1234/v1}",
     "debug:responses:lmstudio:tool": "tsx tools/responses-debug-client/src/index.ts --file tools/responses-debug-client/payloads/lmstudio-tool.json --baseURL ${LMSTUDIO_BASEURL:-http://127.0.0.1:1234/v1}",
     "capture:responses:lmstudio": "node scripts/capture-responses-sse.mjs --file tools/responses-debug-client/payloads/lmstudio-tool.json",
+    "llmswitch:ensure": "node scripts/ensure-llmswitch-mode.mjs",
     "llmswitch:link": "node scripts/link-llmswitch.mjs",
     "llmswitch:unlink": "node scripts/link-llmswitch.mjs unlink",
     "dry-run:responses-provider": "node scripts/tests/responses-provider-dry-run.mjs",
@@ -88,8 +89,8 @@
     "config:update:providers": "node scripts/update-config-providers.mjs",
     "models:update": "node scripts/update-models.mjs",
     "models:update:qwen": "node scripts/update-models.mjs --provider qwen-provider --write",
-    "config:use-local": "node scripts/switch-config-deps.mjs local && npm i",
-    "config:use-published": "node scripts/switch-config-deps.mjs published && npm i",
+    "config:use-local": "BUILD_MODE=dev npm run llmswitch:ensure",
+    "config:use-published": "BUILD_MODE=release npm run llmswitch:ensure",
     "test:modelscope": "node scripts/test-modelscope.mjs",
     "security:audit": "npm audit --audit-level high",
     "security:check": "npx audit-ci --config ./audit-ci.json",
@@ -116,13 +117,14 @@
     "test:v2:protocol": "node tests/v2/dist/protocol-conversion-test.js",
     "test:comprehensive": "node scripts/v2-consistency/comprehensive-consistency-test.mjs",
     "test:golden": "node scripts/tests/golden-provider-cycle.mjs",
+    "sync:ci-goldens": "node scripts/tools/sync-ci-goldens.mjs",
     "mock:extract": "node scripts/mock-provider/extract.mjs",
     "mock:validate": "node scripts/mock-provider/validate.mjs",
     "mock:clean": "node scripts/mock-provider/clean.mjs"
   },
   "dependencies": {
     "@anthropic-ai/sdk": "^0.65.0",
-    "@jsonstudio/llms": "^0.6.2",
+    "@jsonstudio/llms": "^0.6.104",
     "@lmstudio/sdk": "^1.5.0",
     "@radix-ui/react-switch": "^1.2.6",
     "@types/socket.io": "^3.0.1",

package/scripts/analyze-routing-classifier.mjs

@@ -0,0 +1,166 @@
+#!/usr/bin/env node
+import fs from 'node:fs/promises';
+import path from 'node:path';
+import os from 'node:os';
+import { fileURLToPath } from 'node:url';
+
+const suffix = '_req_process_tool_filters_request_pre.json';
+const DEFAULT_SAMPLE_ROOT = path.join(os.homedir(), '.routecodex', 'codex-samples');
+const DEFAULT_LIMIT = 400;
+const args = process.argv.slice(2);
+let sampleRoot = DEFAULT_SAMPLE_ROOT;
+let limit = DEFAULT_LIMIT;
+
+for (let i = 0; i < args.length; i += 1) {
+  const arg = args[i];
+  if (!arg) continue;
+  if (arg === '--limit' && i + 1 < args.length) {
+    limit = Number(args[i + 1]) || DEFAULT_LIMIT;
+    i += 1;
+  } else if (arg.startsWith('--')) {
+    continue;
+  } else if (sampleRoot === DEFAULT_SAMPLE_ROOT) {
+    sampleRoot = path.resolve(arg);
+  }
+}
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const ROOT = process.cwd();
+
+const ENDPOINT_MAP = {
+  'openai-chat': '/v1/chat/completions',
+  'openai-responses': '/v1/responses',
+  'anthropic-messages': '/v1/messages'
+};
+
+async function loadClassifierModules() {
+  const featuresPath = path.join(ROOT, 'sharedmodule', 'llmswitch-core', 'dist', 'router', 'virtual-router', 'features.js');
+  const classifierPath = path.join(ROOT, 'sharedmodule', 'llmswitch-core', 'dist', 'router', 'virtual-router', 'classifier.js');
+  const { buildRoutingFeatures } = await import('file://' + featuresPath);
+  const { RoutingClassifier } = await import('file://' + classifierPath);
+  return { buildRoutingFeatures, RoutingClassifier };
+}
+
+async function loadClassifierConfig() {
+  const modulesPath = path.join(ROOT, 'config', 'modules.json');
+  const raw = await fs.readFile(modulesPath, 'utf8');
+  const json = JSON.parse(raw);
+  const cfg =
+    json?.virtualrouter?.config?.classificationConfig ||
+    json?.modules?.virtualrouter?.config?.classificationConfig ||
+    {};
+  return cfg || {};
+}
+
+async function listCandidateFiles(dir) {
+  const entries = await fs.readdir(dir, { withFileTypes: true });
+  const files = [];
+  for (const entry of entries) {
+    const full = path.join(dir, entry.name);
+    if (entry.isDirectory()) {
+      files.push(...(await listCandidateFiles(full)));
+    } else if (entry.isFile() && entry.name.endsWith(suffix)) {
+      files.push(full);
+    }
+  }
+  return files;
+}
+
+function requestKey(filePath) {
+  const base = path.basename(filePath);
+  const match = base.match(/^(req_\d+_[^_]+)/);
+  return match ? match[1] : base;
+}
+
+function inferEndpoint(filePath) {
+  const parts = filePath.split(path.sep);
+  for (const part of parts) {
+    if (ENDPOINT_MAP[part]) return ENDPOINT_MAP[part];
+  }
+  return '/v1/responses';
+}
+
+function buildMetadata(reqId, endpoint) {
+  return {
+    requestId: reqId,
+    entryEndpoint: endpoint,
+    processMode: 'chat',
+    stream: false,
+    direction: 'request'
+  };
+}
+
+async function main() {
+  const { buildRoutingFeatures, RoutingClassifier } = await loadClassifierModules();
+  const classifierConfig = await loadClassifierConfig();
+  const classifier = new RoutingClassifier(classifierConfig);
+
+  const protocols = await fs.readdir(sampleRoot, { withFileTypes: true });
+  const files = [];
+  for (const proto of protocols) {
+    if (!proto.isDirectory()) continue;
+    const dir = path.join(sampleRoot, proto.name);
+    files.push(...(await listCandidateFiles(dir)));
+  }
+  files.sort((a, b) => a.localeCompare(b));
+
+  let processedFiles = files;
+  if (limit && files.length > limit) {
+    processedFiles = files.slice(-limit);
+  }
+
+  const seen = new Set();
+  const stats = new Map();
+  const diagnostics = [];
+
+  for (const filePath of processedFiles) {
+    const key = requestKey(filePath);
+    if (seen.has(key)) continue;
+    seen.add(key);
+    let payload;
+    try {
+      const raw = await fs.readFile(filePath, 'utf8');
+      payload = JSON.parse(raw);
+    } catch (err) {
+      diagnostics.push({ file: filePath, error: err.message || String(err) });
+      continue;
+    }
+    if (!payload || typeof payload !== 'object') continue;
+    const endpoint = inferEndpoint(filePath);
+    const metadata = buildMetadata(key, endpoint);
+    let features;
+    try {
+      features = buildRoutingFeatures(payload, metadata);
+    } catch (err) {
+      diagnostics.push({ file: filePath, error: err.message || String(err), stage: 'features' });
+      continue;
+    }
+    let classification;
+    try {
+      classification = classifier.classify(features);
+    } catch (err) {
+      diagnostics.push({ file: filePath, error: err.message || String(err), stage: 'classify' });
+      continue;
+    }
+    const route = classification?.routeName || 'unknown';
+    stats.set(route, (stats.get(route) || 0) + 1);
+  }
+
+  const total = Array.from(stats.values()).reduce((sum, count) => sum + count, 0);
+  const summary = Array.from(stats.entries())
+    .map(([route, count]) => ({ route, count, ratio: total ? count / total : 0 }))
+    .sort((a, b) => b.count - a.count);
+
+  console.log(
+    JSON.stringify(
+      { sampleRoot, configuredLimit: limit, evaluatedSamples: processedFiles.length, totalSamples: total, summary, diagnostics },
+      null,
+      2
+    )
+  );
+}
+
+main().catch((err) => {
+  console.error('Failed to analyze routing classifier:', err);
+  process.exit(1);
+});

package/scripts/analyze-routing-samples.mjs

@@ -0,0 +1,216 @@
+#!/usr/bin/env node
+/**
+ * Analyze Codex sample requests collected under ~/.routecodex/codex-samples
+ * and summarize the last assistant tool calls observed in inbound requests.
+ *
+ * Usage:
+ *   node scripts/analyze-routing-samples.mjs [--limit N] [--root DIR] [--protocols list]
+ *     --limit      Number of most recent samples to scan per protocol (default: 200)
+ *     --root       Override sample root (default: ~/.routecodex/codex-samples)
+ *     --protocols  Comma-separated list of protocol folders to include
+ */
+import { execSync } from 'node:child_process';
+import { promises as fs } from 'node:fs';
+import path from 'node:path';
+import os from 'node:os';
+
+const args = process.argv.slice(2);
+const options = {
+  limit: 200,
+  root: path.join(os.homedir(), '.routecodex', 'codex-samples'),
+  protocols: null,
+};
+for (let i = 0; i < args.length; i += 1) {
+  const arg = args[i];
+  if (arg === '--limit' && i + 1 < args.length) {
+    options.limit = Number(args[i + 1]);
+    i += 1;
+  } else if (arg === '--root' && i + 1 < args.length) {
+    options.root = path.resolve(args[i + 1]);
+    i += 1;
+  } else if (arg === '--protocols' && i + 1 < args.length) {
+    options.protocols = args[i + 1].split(',').map((s) => s.trim()).filter(Boolean);
+    i += 1;
+  }
+}
+
+const STAGE_SUFFIX = '_req_process_tool_filters_request_pre.json';
+
+function listProtocols(dir) {
+  return fs.readdir(dir, { withFileTypes: true })
+    .then((entries) => entries.filter((e) => e.isDirectory()).map((e) => e.name))
+    .catch(() => []);
+}
+
+function listStageFiles(dir) {
+  try {
+    const out = execSync(`rg --files "${dir}" -g "*${STAGE_SUFFIX}"`, { stdio: ['ignore', 'pipe', 'ignore'] })
+      .toString()
+      .trim();
+    if (!out) return [];
+    return out.split('\n').filter(Boolean);
+  } catch (err) {
+    if (err?.status === 1 && (!err.stdout || err.stdout.length === 0)) return [];
+    throw err;
+  }
+}
+
+function extractTimestamp(filePath) {
+  const base = path.basename(filePath);
+  const m = base.match(/req_(\d+)_/);
+  if (!m) return 0;
+  return Number(m[1]);
+}
+
+function extractRequestId(filePath) {
+  const base = path.basename(filePath);
+  const m = base.match(/^(req_\d+_[^_]+)/);
+  return m ? m[1] : base;
+}
+
+function safeText(content) {
+  if (typeof content === 'string') return content;
+  if (Array.isArray(content)) {
+    return content.map((part) => {
+      if (!part) return '';
+      if (typeof part === 'string') return part;
+      if (typeof part === 'object') {
+        if (typeof part.text === 'string') return part.text;
+        if (Array.isArray(part.text)) return part.text.join(' ');
+        if (typeof part.content === 'string') return part.content;
+      }
+      return '';
+    }).join(' ');
+  }
+  if (content && typeof content === 'object' && typeof content.text === 'string') {
+    return content.text;
+  }
+  return '';
+}
+
+function lastAssistantToolCalls(messages) {
+  if (!Array.isArray(messages) || messages.length === 0) return [];
+  for (let i = messages.length - 1; i >= 0; i -= 1) {
+    const msg = messages[i];
+    if (msg?.role !== 'assistant') continue;
+    const calls = Array.isArray(msg.tool_calls) ? msg.tool_calls : null;
+    if (calls && calls.length) {
+      return calls
+        .map((call) => {
+          const name = call?.function?.name || call?.name;
+          if (!name) return null;
+          const args = typeof call?.function?.arguments === 'string' ? call.function.arguments : undefined;
+          return { name, arguments: args };
+        })
+        .filter(Boolean);
+    }
+  }
+  return [];
+}
+
+function lastUserText(messages) {
+  if (!Array.isArray(messages) || messages.length === 0) return '';
+  for (let i = messages.length - 1; i >= 0; i -= 1) {
+    const msg = messages[i];
+    if (msg?.role === 'user') {
+      return safeText(msg.content).slice(0, 400);
+    }
+  }
+  return '';
+}
+
+async function main() {
+  const protocols = options.protocols || await listProtocols(options.root);
+  const perProtocol = new Map();
+  const files = [];
+  for (const proto of protocols) {
+    const dir = path.join(options.root, proto);
+    const list = listStageFiles(dir);
+    if (list.length === 0) continue;
+    const sorted = list
+      .map((filePath) => ({ filePath, ts: extractTimestamp(filePath) }))
+      .sort((a, b) => b.ts - a.ts)
+      .slice(0, options.limit);
+    perProtocol.set(proto, sorted.length);
+    files.push(...sorted.map((item) => ({ ...item, proto })));
+  }
+
+  const toolCounts = new Map();
+  const toolExamples = new Map();
+  let withAssistantTools = 0;
+  for (const { filePath, proto } of files) {
+    let payload;
+    try {
+      const raw = await fs.readFile(filePath, 'utf8');
+      payload = JSON.parse(raw);
+    } catch {
+      continue;
+    }
+    const messages = Array.isArray(payload?.messages) ? payload.messages : [];
+    const calls = lastAssistantToolCalls(messages);
+    if (calls.length) {
+      withAssistantTools += 1;
+      const snippet = lastUserText(messages);
+      const reqId = extractRequestId(filePath);
+      for (const call of calls) {
+        const canonical = canonicalizeToolName(call.name);
+        const parsedArguments = parseArguments(call.arguments);
+        toolCounts.set(canonical, (toolCounts.get(canonical) || 0) + 1);
+        if (!toolExamples.has(canonical)) {
+          toolExamples.set(canonical, []);
+        }
+        const collection = toolExamples.get(canonical);
+        if (collection.length < 3) {
+          collection.push({
+            reqId,
+            proto,
+            snippet,
+            rawName: call.name,
+            command: parsedArguments?.command || parsedArguments?.input?.command
+          });
+        }
+      }
+    }
+  }
+
+  const histogram = Array.from(toolCounts.entries())
+    .sort((a, b) => b[1] - a[1])
+    .map(([name, count]) => ({ name, count, examples: toolExamples.get(name) || [] }));
+
+  const summary = {
+    sampleRoot: options.root,
+    perProtocolCounts: Object.fromEntries(perProtocol),
+    totalSamples: files.length,
+    requestsWithAssistantTool: withAssistantTools,
+    uniqueTools: histogram.length,
+    toolHistogram: histogram,
+  };
+
+  console.log(JSON.stringify(summary, null, 2));
+}
+
+function canonicalizeToolName(name) {
+  if (!name) return '';
+  const trimmed = name.trim();
+  const marker = trimmed.indexOf('arg_key');
+  if (marker > 0) {
+    return trimmed.slice(0, marker);
+  }
+  return trimmed;
+}
+
+function parseArguments(argumentString) {
+  if (typeof argumentString !== 'string' || !argumentString.trim()) {
+    return undefined;
+  }
+  try {
+    return JSON.parse(argumentString);
+  } catch {
+    return undefined;
+  }
+}
+
+main().catch((err) => {
+  console.error('Failed to analyze samples:', err);
+  process.exit(1);
+});

package/scripts/analyze-thinking-keywords.mjs

@@ -10,6 +10,7 @@
 import fs from 'fs/promises';
 import os from 'os';
 import path from 'path';
+import { DEFAULT_THINKING_KEYWORDS } from '@jsonstudio/llms';
 
 const HOME = os.homedir();
 const CHAT_DIR = path.join(HOME, '.routecodex', 'codex-samples', 'openai-chat');
@@ -85,8 +86,10 @@ function extractUserText(request, endpoint, protocolMapping) {
 
 async function main() {
   const classificationConfig = await loadClassificationConfigFromModules();
-  const thinkingKeywords = (classificationConfig.thinkingKeywords || []).map((s) =>
-    String(s || '').toLowerCase()
+  const thinkingKeywords = mergeKeywordLists(
+    DEFAULT_THINKING_KEYWORDS,
+    classificationConfig.thinkingKeywords,
+    classificationConfig.keywordInjections?.thinking
   );
   const protocolMapping = classificationConfig.protocolMapping || {};
 
@@ -167,3 +170,15 @@ main().catch((err) => {
   process.exit(1);
 });
 
+function mergeKeywordLists(...lists) {
+  const set = new Set();
+  for (const list of lists) {
+    if (!Array.isArray(list)) continue;
+    for (const item of list) {
+      if (!item) continue;
+      const lowered = String(item).toLowerCase();
+      if (lowered) set.add(lowered);
+    }
+  }
+  return Array.from(set);
+}

package/scripts/build-core.mjs

@@ -5,6 +5,8 @@ import path from 'node:path';
 
 const root = process.cwd();
 const skip = String(process.env.ROUTECODEX_SKIP_CORE_BUILD || process.env.SKIP_CORE_BUILD || '').trim().toLowerCase();
+const buildModeRaw = String(process.env.BUILD_MODE || process.env.RCC_BUILD_MODE || 'release').toLowerCase();
+const buildMode = buildModeRaw === 'dev' ? 'dev' : 'release';
 const tsc = path.join(root, 'node_modules', 'typescript', 'bin', 'tsc');
 const proj = path.join(root, 'sharedmodule', 'llmswitch-core', 'tsconfig.json');
 const coreRoot = path.join(root, 'sharedmodule', 'llmswitch-core');
@@ -77,6 +79,12 @@ if (!fs.existsSync(proj)) {
   process.exit(0);
 }
 
+// 标准流程：release 构建必须依赖 npm 包（@jsonstudio/llms），禁止编译本地 sharedmodule。
+if (buildMode !== 'dev') {
+  console.log('[build-core] BUILD_MODE=release: skip local llmswitch-core build (use npm @jsonstudio/llms)');
+  process.exit(0);
+}
+
 // Allow skip via env or if dist already present
 if (skip === '1' || skip === 'true' || skip === 'yes') {
   console.log('[build-core] skip requested by env (ROUTECODEX_SKIP_CORE_BUILD/SKIP_CORE_BUILD)');