@jsonstudio/rcc 0.90.367 → 0.90.429

package/scripts/pack-mode.mjs

@@ -24,7 +24,8 @@ if (!args.name || !args.bin) {
 const pkgPath = path.join(projectRoot, 'package.json');
 const backupPath = pkgPath + '.bak.pack';
 const ensureScriptPath = path.join(projectRoot, 'scripts', 'ensure-llmswitch-mode.mjs');
-const localCorePkgPath = path.join(projectRoot, 'sharedmodule', 'llmswitch-core', 'package.json');
+const llmsPath = path.join(projectRoot, 'node_modules', '@jsonstudio', 'llms');
+const localLlmsPkgPath = path.join(projectRoot, 'sharedmodule', 'llmswitch-core', 'package.json');
 
 function runEnsureMode(mode) {
   const env = { ...process.env, BUILD_MODE: mode };
@@ -34,17 +35,30 @@ function runEnsureMode(mode) {
   }
 }
 
-function readLocalCoreRuntimeDependencies() {
-  const raw = fs.readFileSync(localCorePkgPath, 'utf-8');
-  const pkg = JSON.parse(raw);
-  return { ...(pkg.dependencies || {}) };
+function isSymlink(p) {
+  try {
+    return fs.lstatSync(p).isSymbolicLink();
+  } catch {
+    return false;
+  }
+}
+
+function readLocalLlmsVersion() {
+  try {
+    const pkg = JSON.parse(fs.readFileSync(localLlmsPkgPath, 'utf-8'));
+    return String(pkg.version || '').trim();
+  } catch {
+    return '';
+  }
 }
 
 const isDevPkg = args.name === 'routecodex';
 const isRcc = args.name === 'rcc' || args.name === '@jsonstudio/rcc';
 const isRccx = args.name === '@jsonstudio/rccx';
 
+let hadDevLink = false;
 if (!isRccx) {
+  hadDevLink = isSymlink(llmsPath);
   runEnsureMode('release');
 }
 
@@ -65,6 +79,14 @@ try {
   if (isDevPkg || isRcc) {
     mutated.bundledDependencies = [];
     mutated.bundleDependencies = [];
+    const llmsOverride = String(process.env.RCC_LLMS_VERSION || process.env.ROUTECODEX_PACK_LLMS_VERSION || '').trim();
+    const localLlmsVersion = readLocalLlmsVersion();
+    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}`);
+    }
     const deps = {
       ...(original.dependencies || {})
     };
@@ -72,14 +94,11 @@ try {
     if (isRcc && deps['@jsonstudio/rcc']) {
       delete deps['@jsonstudio/rcc'];
     }
-    if (isRcc) {
-      const localCoreDeps = readLocalCoreRuntimeDependencies();
-      Object.assign(deps, localCoreDeps);
-    }
     mutated.dependencies = {
       ...deps,
       ajv: original.dependencies?.ajv || '^8.17.1',
-      zod: original.dependencies?.zod || '^3.23.8'
+      zod: original.dependencies?.zod || '^3.23.8',
+      '@jsonstudio/llms': llmsVersion
     };
     // Ensure rcc ships bundled docs (copied to ~/.routecodex/docs by `rcc init`).
     if (isRcc) {
@@ -90,19 +109,23 @@ try {
       if (!baseFiles.includes('configsamples/')) {
         baseFiles.push('configsamples/');
       }
-      if (!baseFiles.includes('vendor/')) {
-        baseFiles.push('vendor/');
-      }
       mutated.files = baseFiles;
     }
   } else if (isRccx) {
-    // rccx: wasm-backed core，直接依赖 llms-engine。
+    // rccx: wasm-backed llms 核心，通过 npm alias 将 @jsonstudio/llms 指向 wasm 引擎包。
     mutated.bundledDependencies = [];
     mutated.bundleDependencies = [];
 
     const deps = { ...(original.dependencies || {}) };
+    // 移除原有 TS 版 llms 直连依赖
+    if (deps['@jsonstudio/llms']) {
+      delete deps['@jsonstudio/llms'];
+    }
+    // 推断 wasm 引擎版本，若未声明则使用本地 llms-engine 缺省版本
     const engineVersion = deps['@jsonstudio/llms-engine'] || '^0.3.0';
     deps['@jsonstudio/llms-engine'] = engineVersion;
+    // 通过 npm alias 保持 import 形状不变
+    deps['@jsonstudio/llms'] = `npm:@jsonstudio/llms-engine@${engineVersion}`;
     deps.ajv = deps.ajv || '^8.17.1';
     deps.zod = deps.zod || '^3.23.8';
 
@@ -119,11 +142,11 @@ try {
   // restore
   fs.writeFileSync(pkgPath, fs.readFileSync(backupPath, 'utf-8'));
   fs.unlinkSync(backupPath);
-  if (!isRccx) {
+  if (hadDevLink) {
     try {
       runEnsureMode('dev');
     } catch (err) {
-      console.warn('[pack-mode] failed to restore dev llms state:', err);
+      console.warn('[pack-mode] failed to restore dev llms link:', err);
     }
   }
 }

package/scripts/pack-rcc.mjs

@@ -9,6 +9,18 @@ const PROJECT_ROOT = path.resolve(__dirname, '..');
 
 const pkgPath = path.join(PROJECT_ROOT, 'package.json');
 const PACK_SCRIPT = path.join(PROJECT_ROOT, 'scripts', 'pack-mode.mjs');
+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 = {};
+  for (let i = 2; i < argv.length; i++) {
+    const a = argv[i];
+    if (a === '--llms-tgz') { out.llmsTgz = argv[++i]; continue; }
+    if (a === '--llms-version') { out.llmsVersion = argv[++i]; continue; }
+  }
+  return out;
+}
 
 function run(command, args, options = {}) {
   const res = spawnSync(command, args, { stdio: 'inherit', ...options });
@@ -17,18 +29,57 @@ function run(command, args, options = {}) {
   }
 }
 
+function isSymlink(p) {
+  try {
+    return fs.lstatSync(p).isSymbolicLink();
+  } catch {
+    return false;
+  }
+}
+
+function exists(p) {
+  try {
+    fs.accessSync(p);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 try {
-  // 1) release 模式构建 dist。统一使用本地 sharedmodule/llmswitch-core 作为真源。
+  const args = parseArgs(process.argv);
+  const llmsTgz = String(args.llmsTgz || process.env.RCC_LLMS_TGZ || '').trim();
+  const llmsVersion = String(
+    args.llmsVersion ||
+    process.env.RCC_LLMS_VERSION ||
+    (exists(localLlmsPkgPath) ? JSON.parse(fs.readFileSync(localLlmsPkgPath, 'utf-8')).version : '')
+  ).trim();
+
+  const hadDevLink = isSymlink(llmsPath);
+
+  // Optional: preinstall @jsonstudio/llms from a local tarball so release-mode build does not need npm registry access.
+  if (llmsTgz) {
+    if (!exists(llmsTgz)) {
+      throw new Error(`--llms-tgz not found: ${llmsTgz}`);
+    }
+    if (hadDevLink) {
+      // Unlink dev symlink so we can install the release package under node_modules.
+      run(process.execPath, [path.join(PROJECT_ROOT, 'scripts', 'link-llmswitch.mjs'), 'unlink'], { cwd: PROJECT_ROOT });
+    }
+    run('npm', ['install', '--no-audit', '--no-fund', '--no-save', llmsTgz], { cwd: PROJECT_ROOT });
+  }
+
+  // 1) release 模式构建 dist。若存在本地 sharedmodule/llmswitch-core，则 release 也以其为唯一真源。
   run('npm', ['run', 'build:min'], {
     cwd: PROJECT_ROOT,
-    env: { ...process.env, BUILD_MODE: 'release' }
+    env: { ...process.env, BUILD_MODE: 'release', ...(llmsVersion ? { RCC_LLMS_VERSION: llmsVersion } : {}) }
   });
 
-  // 2) 通过 pack-mode 生成 rcc tarball。
+  // 2) 通过 pack-mode 生成 rcc tarball（内部会临时切换 package.json.name/bin，并同步 llms 版本声明）
   run(
     process.execPath,
     [PACK_SCRIPT, '--name', '@jsonstudio/rcc', '--bin', 'rcc'],
-    { cwd: PROJECT_ROOT }
+    { cwd: PROJECT_ROOT, env: { ...process.env, ...(llmsVersion ? { RCC_LLMS_VERSION: llmsVersion } : {}) } }
   );
 
   const updatedPkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
@@ -41,6 +92,14 @@ try {
   }
 
   console.log(`[pack-rcc] ✅ tarball ready: ${tarballPath}`);
+
+  // 3) pack 结束后恢复 dev 模式。
+  if (hadDevLink) {
+    run('npm', ['run', 'llmswitch:ensure'], {
+      cwd: PROJECT_ROOT,
+      env: { ...process.env, BUILD_MODE: 'dev' }
+    });
+  }
 } catch (err) {
   console.error('[pack-rcc] failed:', err instanceof Error ? err.message : String(err));
   process.exit(1);

package/scripts/publish-rcc.mjs

@@ -8,6 +8,27 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url));
 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 = {};
+  for (let i = 2; i < argv.length; i++) {
+    const a = argv[i];
+    if (a === '--llms-tgz') { out.llmsTgz = argv[++i]; continue; }
+    if (a === '--llms-version') { out.llmsVersion = argv[++i]; continue; }
+  }
+  return out;
+}
+
+function exists(p) {
+  try {
+    fs.accessSync(p);
+    return true;
+  } catch {
+    return false;
+  }
+}
 
 function run(command, args, options = {}) {
   const res = spawnSync(command, args, { stdio: 'inherit', ...options });
@@ -17,17 +38,43 @@ function run(command, args, options = {}) {
 }
 
 try {
-  // 1) 使用 release 模式构建 dist。统一使用本地 sharedmodule/llmswitch-core 作为真源。
+  const args = parseArgs(process.argv);
+  const llmsTgz = String(args.llmsTgz || process.env.RCC_LLMS_TGZ || '').trim();
+  const llmsVersion = String(
+    args.llmsVersion ||
+    process.env.RCC_LLMS_VERSION ||
+    (exists(localLlmsPkgPath) ? JSON.parse(fs.readFileSync(localLlmsPkgPath, 'utf-8')).version : '')
+  ).trim();
+
+  const hadDevLink = (() => {
+    try {
+      return fs.lstatSync(llmsPath).isSymbolicLink();
+    } catch {
+      return false;
+    }
+  })();
+
+  if (llmsTgz) {
+    if (!exists(llmsTgz)) {
+      throw new Error(`--llms-tgz not found: ${llmsTgz}`);
+    }
+    if (hadDevLink) {
+      run(process.execPath, [path.join(PROJECT_ROOT, 'scripts', 'link-llmswitch.mjs'), 'unlink'], { cwd: PROJECT_ROOT });
+    }
+    run('npm', ['install', '--no-audit', '--no-fund', '--no-save', llmsTgz], { cwd: PROJECT_ROOT });
+  }
+
+  // 1) 使用 release 模式构建 dist。若存在本地 sharedmodule/llmswitch-core，则 release 也以其为唯一真源。
   run('npm', ['run', 'build:min'], {
     cwd: PROJECT_ROOT,
-    env: { ...process.env, BUILD_MODE: 'release' }
+    env: { ...process.env, BUILD_MODE: 'release', ...(llmsVersion ? { RCC_LLMS_VERSION: llmsVersion } : {}) }
   });
 
-  // 2) 通过 pack-mode 生成 rcc tarball。
+  // 2) 通过 pack-mode 生成 rcc tarball（内部会临时切换 package.json.name/bin，并同步 llms 版本声明）
   run(
     process.execPath,
     [PACK_SCRIPT, '--name', '@jsonstudio/rcc', '--bin', 'rcc'],
-    { cwd: PROJECT_ROOT }
+    { cwd: PROJECT_ROOT, env: { ...process.env, ...(llmsVersion ? { RCC_LLMS_VERSION: llmsVersion } : {}) } }
   );
 
   // 构建过程中版本号可能被 bump（gen-build-info 会 auto-bump），因此需要在 pack 之后重新读取版本号
@@ -42,6 +89,14 @@ try {
 
   // 3) 发布 npm 包
   run('npm', ['publish', tarballName], { cwd: PROJECT_ROOT });
+
+  // 4) 发布结束后恢复 dev 模式（routecodex 约定始终为 dev CLI；rcc 发布时才切 release）。
+  if (hadDevLink) {
+    run('npm', ['run', 'llmswitch:ensure'], {
+      cwd: PROJECT_ROOT,
+      env: { ...process.env, BUILD_MODE: 'dev' }
+    });
+  }
 } catch (err) {
   console.error('[publish-rcc] failed:', err.message);
   process.exit(1);

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/tests/blackbox-rcc-vs-routecodex-antigravity.mjs

@@ -2,7 +2,7 @@
 /**
  * Black-box parity test:
  * - Always validate RouteCodex behavior against Antigravity-Manager invariants.
- * - Optionally compare against rcc release (off by default) because rcc bundles vendored llmswitch-core
+ * - Optionally compare against rcc release (off by default) because rcc bundles a published @jsonstudio/llms
  *   which may intentionally lag behind dev during incident response.
  * - Both point to a local mock Cloud Code Assist (v1internal) upstream.
  * - Assert:
@@ -805,7 +805,7 @@ async function main() {
       try {
         const candidate = path.join(
           process.cwd(),
-          'node_modules/@jsonstudio/rcc/vendor/llmswitch-core/dist/conversion/compat/antigravity-session-signature.js'
+          'node_modules/@jsonstudio/rcc/node_modules/@jsonstudio/llms/dist/conversion/compat/antigravity-session-signature.js'
         );
         return fs.existsSync(candidate);
       } catch {

package/scripts/vendor-core.mjs

@@ -10,32 +10,18 @@ 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 legacyScopedVendorDir = path.join(root, 'vendor', '@jsonstudio', 'llms');
-  const scopedVendorDir = path.join(root, 'vendor', 'llmswitch-core');
+  const scopedVendorDir = path.join(root, 'vendor', '@jsonstudio', 'llms');
 
   const hasLocalSharedDist = await exists(sharedDist);
 
   // 当本地 sharedmodule/llmswitch-core 存在时，dev/release 都以它为唯一真源。
+  // 仅在 release 且本地 sharedmodule 缺失时，才允许退回 npm-installed @jsonstudio/llms。
   if (!hasLocalSharedDist && mode === 'dev') {
     console.error('[vendor-core] ERROR: 未找到 sharedmodule/llmswitch-core/dist (BUILD_MODE=dev)');
     console.error('[vendor-core] 请先进入 sharedmodule/llmswitch-core 并运行 `npm run build`。');
@@ -46,27 +32,20 @@ async function main() {
     await rmrf(legacyVendorDir);
     console.log('[vendor-core] removed legacy vendor/rcc-llmswitch-core directory');
   }
-  if (await exists(legacyScopedVendorDir)) {
-    await rmrf(legacyScopedVendorDir);
-    console.log('[vendor-core] removed legacy vendor/@jsonstudio/llms directory');
-  }
   if (await exists(scopedVendorDir)) {
     await rmrf(scopedVendorDir);
-    console.log('[vendor-core] removed legacy vendor/llmswitch-core directory');
+    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/llmswitch-core');
-  } 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).');
   }
 }