@jsonstudio/rcc 0.90.364 → 0.90.429

package/scripts/ci/repo-sanity.mjs

@@ -66,37 +66,41 @@ function isForbiddenTrackedPath(p) {
 
 function checkRootLayout() {
   // Fixed top-level layout. Adding new root entries requires an explicit policy change.
-  const allowed = new Set([
-    'eslint.config.js',
-    '.beads',
-    '.github',
-    '.gitattributes',
-    '.gitignore',
-    'AGENTS.md',
-    'README.md',
-    'MEMORY.md',
-    'config',
-    'configsamples',
-    'dist',
-    'docs',
-    'jest.config.js',
-    'memory',
-    'node_modules',
-    'package',
-    'package-lock.json',
-    'package.json',
-    'rcc',
-    'samples',
-    'scripts',
-    'sharedmodule',
-    'src',
-    'task.md',
-    'tests',
-    'tmp',
-    'tsconfig.jest.json',
-    'tsconfig.json',
-    'vendor',
-  ]);
+ const allowed = new Set([
+   'eslint.config.js',
+   '.beads',
+   '.github',
+   '.gitattributes',
+   '.gitignore',
+   'AGENTS.md',
+   'README.md',
+   'MEMORY.md',
+   'config',
+   'configsamples',
+   'dist',
+   'docs',
+   'jest.config.js',
+   'memory',
+   'node_modules',
+   'package',
+   'package-lock.json',
+   'package.json',
+   'rcc',
+   'samples',
+   'scripts',
+   'sharedmodule',
+   'src',
+   'task.md',
+   'tests',
+   'tmp',
+   'tsconfig.jest.json',
+   'tsconfig.json',
+   'vendor',
+   'CACHE.md',
+   'botpy.log',
+   'clock.md',
+   'models',
+ ]);
 
   const rootEntries = listRootEntries();
   const unexpected = rootEntries.filter((name) => !allowed.has(name));

package/scripts/install-release.sh

@@ -94,7 +94,7 @@ verify_server_request() {
   elif command -v timeout >/dev/null 2>&1; then
     TIMEOUT_BIN="timeout"
   fi
-  local VERIFY_CMD=(node scripts/install-verify.mjs --launcher cli --cli-binary rcc --config "$VERIFY_CONFIG")
+  local VERIFY_CMD=(node scripts/install-verify.mjs --launcher cli --cli-binary rcc --mode responses --config "$VERIFY_CONFIG")
   echo ""
   echo "🧪 验证 release 安装的端到端工具链路..."
   if [ ! -f "$VERIFY_CONFIG" ]; then

package/scripts/install-verify.mjs

@@ -29,6 +29,7 @@ const state = {
 };
 let shuttingDown = false;
 let responsesSseParser = null;
+let requestAuthHeaderValue = 'Bearer install-verify';
 
 const manualSamples = {
   responses: path.join(repoRoot, 'scripts', 'verification', 'samples', 'openai-responses-list-local-files.json'),
@@ -40,6 +41,25 @@ function clonePayload(payload) {
   return JSON.parse(JSON.stringify(payload));
 }
 
+function normalizeString(value) {
+  return typeof value === 'string' ? value.trim() : '';
+}
+
+function resolveConfigSecret(value) {
+  const trimmed = normalizeString(value);
+  if (!trimmed) {
+    return '';
+  }
+  const envMatch = trimmed.match(/^\$\{([A-Z0-9_]+)\}$/i);
+  if (envMatch) {
+    return normalizeString(process.env[envMatch[1]]);
+  }
+  if (/^[A-Z][A-Z0-9_]+$/.test(trimmed)) {
+    return normalizeString(process.env[trimmed]) || trimmed;
+  }
+  return trimmed;
+}
+
 function loadManualSample(kind) {
   const filePath = manualSamples[kind];
   if (!filePath) {
@@ -426,12 +446,72 @@ function resolveHost(host) {
 }
 
 function resolveModel(config) {
+  const extractModelFromTarget = (target) => {
+    if (typeof target !== 'string') return '';
+    const normalized = target.trim();
+    if (!normalized) return '';
+    if (!normalized.includes('.')) return normalized;
+    const [, ...rest] = normalized.split('.');
+    const modelPart = rest.join('.');
+    return modelPart ? modelPart.split('__')[0] : '';
+  };
+
+  const resolveModelFromRouteEntry = (entry) => {
+    if (!entry) return '';
+    if (typeof entry === 'string') {
+      return extractModelFromTarget(entry);
+    }
+    if (typeof entry !== 'object') {
+      return '';
+    }
+    const directTarget =
+      (typeof entry.routeTarget === 'string' && entry.routeTarget) ||
+      (typeof entry.providerKey === 'string' && entry.providerKey) ||
+      (typeof entry.target === 'string' && entry.target);
+    const directModel = extractModelFromTarget(directTarget);
+    if (directModel) {
+      return directModel;
+    }
+    const weights = entry?.loadBalancing?.weights;
+    if (weights && typeof weights === 'object') {
+      for (const key of Object.keys(weights)) {
+        const weightedModel = extractModelFromTarget(key);
+        if (weightedModel) {
+          return weightedModel;
+        }
+      }
+    }
+    const targets = Array.isArray(entry?.targets) ? entry.targets : [];
+    for (const target of targets) {
+      const targetModel = resolveModelFromRouteEntry(target);
+      if (targetModel) {
+        return targetModel;
+      }
+    }
+    return '';
+  };
+
   try {
     const firstRoute = config?.virtualrouter?.routing?.default?.[0];
-    if (typeof firstRoute === 'string' && firstRoute.includes('.')) {
-      const [, ...rest] = firstRoute.split('.');
-      const modelPart = rest.join('.');
-      if (modelPart) return modelPart.split('__')[0];
+    const legacyModel = resolveModelFromRouteEntry(firstRoute);
+    if (legacyModel) {
+      return legacyModel;
+    }
+  } catch { /* ignore */ }
+  try {
+    const groups = config?.virtualrouter?.routingPolicyGroups;
+    const activeGroupId =
+      typeof config?.virtualrouter?.activeRoutingPolicyGroup === 'string' &&
+      config.virtualrouter.activeRoutingPolicyGroup.trim().length
+        ? config.virtualrouter.activeRoutingPolicyGroup.trim()
+        : '';
+    const group =
+      (activeGroupId && groups && typeof groups === 'object' ? groups[activeGroupId] : undefined) ||
+      (groups && typeof groups === 'object' ? groups[Object.keys(groups)[0]] : undefined);
+    const firstRoute = group?.routing?.default?.[0];
+    const v2Model = resolveModelFromRouteEntry(firstRoute);
+    if (v2Model) {
+      return v2Model;
     }
   } catch { /* ignore */ }
   try {
@@ -457,6 +537,17 @@ function detectPortPids(port) {
   }
 }
 
+function findAvailablePort(startPort) {
+  const base = Number.isInteger(startPort) && startPort > 0 ? startPort : 5520;
+  for (let offset = 0; offset < 64; offset += 1) {
+    const candidate = base + offset;
+    if (detectPortPids(candidate).length === 0) {
+      return candidate;
+    }
+  }
+  throw new Error(`无法找到可用验证端口（起始端口=${base}）`);
+}
+
 async function waitForHealth(baseUrl, timeoutMs) {
   const deadline = Date.now() + timeoutMs;
   let lastMessage = '';
@@ -612,7 +703,7 @@ async function postJson(url, body, timeoutMs, extraHeaders = {}) {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',
-        Authorization: 'Bearer install-verify',
+        Authorization: requestAuthHeaderValue,
         ...extraHeaders
       },
       body: JSON.stringify(body),
@@ -638,7 +729,7 @@ async function postSseRequest(url, body, timeoutMs, extraHeaders = {}) {
       headers: {
         'Content-Type': 'application/json',
         Accept: 'text/event-stream',
-        Authorization: 'Bearer install-verify',
+        Authorization: requestAuthHeaderValue,
         ...extraHeaders
       },
       body: JSON.stringify(body),
@@ -900,13 +991,21 @@ async function main() {
   console.log(`🧪 使用配置: ${configPath}`);
 
   const config = readJson(configPath);
-  const port = Number(config?.httpserver?.port ?? config?.server?.port ?? 5520);
+  const configuredApiKey = resolveConfigSecret(
+    config?.server?.apikey ?? config?.httpserver?.apikey ?? config?.apikey
+  );
+  requestAuthHeaderValue = configuredApiKey ? `Bearer ${configuredApiKey}` : 'Bearer install-verify';
+  const configuredPortRaw =
+    process.env.ROUTECODEX_INSTALL_VERIFY_PORT ||
+    process.env.RCC_INSTALL_VERIFY_PORT ||
+    config?.httpserver?.port ||
+    config?.server?.port ||
+    5520;
+  const configuredPort = Number(configuredPortRaw);
+  let port = Number.isInteger(configuredPort) && configuredPort > 0 ? configuredPort : 5520;
   const host = resolveHost(config?.httpserver?.host ?? config?.server?.host ?? '127.0.0.1');
-  const baseUrl = `http://${host}:${port}`;
-  state.baseUrl = baseUrl;
 
   const model = resolveModel(config);
-  console.log(`🔁 模型: ${model}, 端口: ${port}`);
   const buildRestartOnly = (() => {
     const raw = String(process.env.ROUTECODEX_BUILD_RESTART_ONLY ?? process.env.RCC_BUILD_RESTART_ONLY ?? '').trim().toLowerCase();
     return raw === '1' || raw === 'true' || raw === 'yes' || raw === 'on';
@@ -915,8 +1014,13 @@ async function main() {
   const listeners = detectPortPids(port);
   const reuseExistingServer = buildRestartOnly && listeners.length > 0;
   if (listeners.length && !reuseExistingServer) {
-    throw new Error(`端口 ${port} 已被使用 (PID: ${listeners.join(', ')}). 请先停止正在运行的 RouteCodex 实例再重试。`);
+    const originalPort = port;
+    port = findAvailablePort(port + 1);
+    console.log(`⚠️ 端口 ${originalPort} 已被占用 (PID: ${listeners.join(', ')})，改用临时验证端口 ${port}`);
   }
+  const baseUrl = `http://${host}:${port}`;
+  state.baseUrl = baseUrl;
+  console.log(`🔁 模型: ${model}, 端口: ${port}`);
   if (reuseExistingServer) {
     console.log(`ℹ build-restart-only: 检测到已运行服务 (PID: ${listeners.join(', ')})，复用现有实例进行验证。`);
   }
@@ -930,9 +1034,11 @@ async function main() {
   let cwd = repoRoot;
   if (launcher === 'cli') {
     command = cliBinary || 'routecodex';
-    commandArgs = ['start', '--config', configPath, '--exclusive'];
+    commandArgs = ['start', '--config', configPath, '--port', String(port), '--exclusive'];
     cwd = process.cwd();
     env.ROUTECODEX_CONFIG = configPath;
+    env.ROUTECODEX_PORT = String(port);
+    env.RCC_PORT = String(port);
   } else {
     command = process.execPath;
     commandArgs = [path.join(repoRoot, 'dist', 'index.js')];

package/scripts/pack-mode.mjs

@@ -81,10 +81,9 @@ try {
     mutated.bundleDependencies = [];
     const llmsOverride = String(process.env.RCC_LLMS_VERSION || process.env.ROUTECODEX_PACK_LLMS_VERSION || '').trim();
     const localLlmsVersion = readLocalLlmsVersion();
-    const declaredLlmsVersion = String(original.dependencies?.['@jsonstudio/llms'] || '').trim();
-    const llmsVersion = isRcc
-      ? (llmsOverride || localLlmsVersion || declaredLlmsVersion || '^0.6.230')
-      : (localLlmsVersion || declaredLlmsVersion || '^0.6.230');
+    const llmsVersion = (isRcc && llmsOverride)
+      ? llmsOverride
+      : (localLlmsVersion || original.dependencies?.['@jsonstudio/llms'] || '^0.6.230');
     if (isRcc && llmsOverride) {
       console.log(`[pack-mode] using RCC_LLMS_VERSION override: @jsonstudio/llms=${llmsVersion}`);
     }
@@ -95,14 +94,11 @@ try {
     if (isRcc && deps['@jsonstudio/rcc']) {
       delete deps['@jsonstudio/rcc'];
     }
-    if (isRcc && deps['@jsonstudio/llms']) {
-      delete deps['@jsonstudio/llms'];
-    }
     mutated.dependencies = {
       ...deps,
       ajv: original.dependencies?.ajv || '^8.17.1',
       zod: original.dependencies?.zod || '^3.23.8',
-      ...(isRcc ? {} : { '@jsonstudio/llms': llmsVersion })
+      '@jsonstudio/llms': llmsVersion
     };
     // Ensure rcc ships bundled docs (copied to ~/.routecodex/docs by `rcc init`).
     if (isRcc) {
@@ -113,9 +109,6 @@ try {
       if (!baseFiles.includes('configsamples/')) {
         baseFiles.push('configsamples/');
       }
-      if (!baseFiles.includes('vendor/')) {
-        baseFiles.push('vendor/');
-      }
       mutated.files = baseFiles;
     }
   } else if (isRccx) {

package/scripts/publish-rcc.mjs

@@ -9,6 +9,7 @@ const PROJECT_ROOT = path.resolve(__dirname, '..');
 const PACK_SCRIPT = path.join(PROJECT_ROOT, 'scripts', 'pack-mode.mjs');
 const pkgPath = path.join(PROJECT_ROOT, 'package.json');
 const llmsPath = path.join(PROJECT_ROOT, 'node_modules', '@jsonstudio', 'llms');
+const localLlmsPkgPath = path.join(PROJECT_ROOT, 'sharedmodule', 'llmswitch-core', 'package.json');
 
 function parseArgs(argv) {
   const out = {};
@@ -39,12 +40,11 @@ function run(command, args, options = {}) {
 try {
   const args = parseArgs(process.argv);
   const llmsTgz = String(args.llmsTgz || process.env.RCC_LLMS_TGZ || '').trim();
-  const llmsVersionOverride = String(
+  const llmsVersion = String(
     args.llmsVersion ||
     process.env.RCC_LLMS_VERSION ||
-    ''
+    (exists(localLlmsPkgPath) ? JSON.parse(fs.readFileSync(localLlmsPkgPath, 'utf-8')).version : '')
   ).trim();
-  const llmsVersion = llmsVersionOverride;
 
   const hadDevLink = (() => {
     try {

package/scripts/snapshot-inspect.mjs

@@ -71,25 +71,6 @@ async function readJson(p) {
   } catch { return null; }
 }
 
-async function walkJsonFiles(rootDir) {
-  const out = [];
-  async function visit(dir) {
-    const entries = await fs.readdir(dir, { withFileTypes: true });
-    for (const entry of entries) {
-      const fullPath = path.join(dir, entry.name);
-      if (entry.isDirectory()) {
-        await visit(fullPath);
-        continue;
-      }
-      if (entry.isFile() && entry.name.endsWith('.json')) {
-        out.push(fullPath);
-      }
-    }
-  }
-  await visit(rootDir);
-  return out;
-}
-
 async function main() {
   const args = parseArgs(process.argv);
   if (args.help || !args.rid) {
@@ -99,7 +80,7 @@ async function main() {
   }
 
   const HOME = process.env.HOME || process.env.USERPROFILE || '';
-  const root = path.join(HOME, '.rcc', 'codex-samples');
+  const root = path.join(HOME, '.routecodex', 'codex-samples');
   const endpoints = args.endpoint ? [args.endpoint] : ['openai-responses','openai-chat','anthropic-messages'];
   let baseDir = null;
   for (const ep of endpoints) {
@@ -112,16 +93,16 @@ async function main() {
   }
 
   const rid = args.rid;
-  const allJsonFiles = await walkJsonFiles(baseDir);
-  const matchedFiles = allJsonFiles.filter((filePath) => filePath.includes(rid)).sort();
+  const entries = await fs.readdir(baseDir);
+  const matchedFiles = entries.filter(name => name.includes(rid)).sort();
   if (!matchedFiles.length) {
     console.error('No snapshots found for RID:', rid, 'under', baseDir);
     process.exit(3);
   }
 
   const records = [];
-  for (const p of matchedFiles) {
-    const name = path.relative(baseDir, p);
+  for (const name of matchedFiles) {
+    const p = path.join(baseDir, name);
     const obj = await readJson(p);
     if (!obj) continue;
     const payload = unwrapPayload(obj);

package/scripts/vendor-core.mjs

@@ -10,25 +10,11 @@ async function rmrf(p) {
   try { await fsp.rm(p, { recursive: true, force: true }); } catch { /* ignore */ }
 }
 
-async function ensureDir(p) {
-  await fsp.mkdir(p, { recursive: true });
-}
-
-async function copyIfExists(src, dest) {
-  if (!(await exists(src))) {
-    return;
-  }
-  await ensureDir(path.dirname(dest));
-  await fsp.cp(src, dest, { recursive: true, force: true });
-}
-
 async function main() {
   const root = process.cwd();
   const rawMode = String(process.env.BUILD_MODE || process.env.RCC_BUILD_MODE || 'release').toLowerCase();
   const mode = rawMode === 'dev' ? 'dev' : 'release';
   const sharedDist = path.join(root, 'sharedmodule', 'llmswitch-core', 'dist');
-  const sharedPkg = path.join(root, 'sharedmodule', 'llmswitch-core', 'package.json');
-  const sharedReadme = path.join(root, 'sharedmodule', 'llmswitch-core', 'README.md');
   const legacyVendorDir = path.join(root, 'vendor', 'rcc-llmswitch-core');
   const scopedVendorDir = path.join(root, 'vendor', '@jsonstudio', 'llms');
 
@@ -51,18 +37,15 @@ async function main() {
     console.log('[vendor-core] removed legacy vendor/@jsonstudio/llms directory');
   }
 
-  if (hasLocalSharedDist && mode === 'release') {
-    await ensureDir(scopedVendorDir);
-    await copyIfExists(sharedDist, path.join(scopedVendorDir, 'dist'));
-    await copyIfExists(sharedPkg, path.join(scopedVendorDir, 'package.json'));
-    await copyIfExists(sharedReadme, path.join(scopedVendorDir, 'README.md'));
-    console.log('[vendor-core] BUILD_MODE=release: vendored local sharedmodule/llmswitch-core -> vendor/@jsonstudio/llms');
-  } else if (hasLocalSharedDist) {
-    console.log('[vendor-core] BUILD_MODE=dev: direct-use local sharedmodule/llmswitch-core/dist (no vendor copy).');
+  if (hasLocalSharedDist) {
+    const banner = mode === 'dev'
+      ? '[vendor-core] BUILD_MODE=dev: direct-use local sharedmodule/llmswitch-core/dist (no vendor copy).'
+      : '[vendor-core] BUILD_MODE=release with local sharedmodule/llmswitch-core/dist: direct-use local core (no vendor copy).';
+    console.log(banner);
   } else if (mode === 'dev') {
     console.log('[vendor-core] sharedmodule/llmswitch-core/dist 将被直接引用，已停止生成 vendor 副本。');
   } else {
-    console.log('[vendor-core] BUILD_MODE=release without local sharedmodule: no local vendored core generated.');
+    console.log('[vendor-core] BUILD_MODE=release without local sharedmodule: using npm-installed @jsonstudio/llms (no vendor copy).');
   }
 }