@jsonstudio/rcc 0.90.252 → 0.90.323

package/scripts/build-core.mjs

@@ -92,13 +92,8 @@ 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
+// 有本地 sharedmodule/llmswitch-core 时，无论 dev/release 都以本地源码为唯一构建真源。
+// 仅当 sharedmodule 缺失时，release 才允许退回 npm 包。
 if (skip === '1' || skip === 'true' || skip === 'yes') {
   console.log('[build-core] skip requested by env (ROUTECODEX_SKIP_CORE_BUILD/SKIP_CORE_BUILD)');
   process.exit(0);

package/scripts/ensure-llmswitch-mode.mjs

@@ -88,7 +88,13 @@ function ensureReleasePackage() {
   console.log('[llmswitch:ensure] release package ok: using npm-installed @jsonstudio/llms');
 }
 
-if (mode === 'dev') {
+if (exists(sharedCoreDir)) {
+  const banner = mode === 'dev'
+    ? '[llmswitch:ensure] BUILD_MODE=dev: prefer local sharedmodule/llmswitch-core'
+    : '[llmswitch:ensure] BUILD_MODE=release but local sharedmodule/llmswitch-core exists; prefer local core';
+  console.log(banner);
+  ensureDevLink();
+} else if (mode === 'dev') {
   ensureDevLink();
 } else {
   ensureReleasePackage();

package/scripts/pack-mode.mjs

@@ -25,6 +25,7 @@ const pkgPath = path.join(projectRoot, 'package.json');
 const backupPath = pkgPath + '.bak.pack';
 const ensureScriptPath = path.join(projectRoot, 'scripts', 'ensure-llmswitch-mode.mjs');
 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 };
@@ -42,6 +43,15 @@ function isSymlink(p) {
   }
 }
 
+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';
@@ -70,7 +80,10 @@ try {
     mutated.bundledDependencies = [];
     mutated.bundleDependencies = [];
     const llmsOverride = String(process.env.RCC_LLMS_VERSION || process.env.ROUTECODEX_PACK_LLMS_VERSION || '').trim();
-    const llmsVersion = (isRcc && llmsOverride) ? llmsOverride : (original.dependencies?.['@jsonstudio/llms'] || '^0.6.230');
+    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}`);
     }

package/scripts/pack-rcc.mjs

@@ -10,6 +10,7 @@ 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 = {};
@@ -48,7 +49,11 @@ function exists(p) {
 try {
   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 || '').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);
 
@@ -64,13 +69,13 @@ try {
     run('npm', ['install', '--no-audit', '--no-fund', '--no-save', llmsTgz], { cwd: PROJECT_ROOT });
   }
 
-  // 1) release 模式构建 dist（依赖 npm 上的 @jsonstudio/llms）
+  // 1) release 模式构建 dist。若存在本地 sharedmodule/llmswitch-core，则 release 也以其为唯一真源。
   run('npm', ['run', 'build:min'], {
     cwd: PROJECT_ROOT,
     env: { ...process.env, BUILD_MODE: 'release', ...(llmsVersion ? { RCC_LLMS_VERSION: llmsVersion } : {}) }
   });
 
-  // 2) 通过 pack-mode 生成 rcc tarball（内部会临时切换 package.json.name/bin 并确保 llms 为 release 包）
+  // 2) 通过 pack-mode 生成 rcc tarball（内部会临时切换 package.json.name/bin，并同步 llms 版本声明）
   run(
     process.execPath,
     [PACK_SCRIPT, '--name', '@jsonstudio/rcc', '--bin', 'rcc'],
@@ -88,7 +93,7 @@ try {
 
   console.log(`[pack-rcc] ✅ tarball ready: ${tarballPath}`);
 
-  // 3) pack 结束后恢复 dev 模式（routecodex 约定始终为 dev CLI；rcc 打包时才切 release）。
+  // 3) pack 结束后恢复 dev 模式。
   if (hadDevLink) {
     run('npm', ['run', 'llmswitch:ensure'], {
       cwd: PROJECT_ROOT,

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,7 +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 llmsVersion = String(args.llmsVersion || process.env.RCC_LLMS_VERSION || '').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 {
@@ -59,13 +64,13 @@ try {
     run('npm', ['install', '--no-audit', '--no-fund', '--no-save', llmsTgz], { cwd: PROJECT_ROOT });
   }
 
-  // 1) 使用 release 模式构建 dist（依赖 npm 上的 @jsonstudio/llms）
+  // 1) 使用 release 模式构建 dist。若存在本地 sharedmodule/llmswitch-core，则 release 也以其为唯一真源。
   run('npm', ['run', 'build:min'], {
     cwd: PROJECT_ROOT,
     env: { ...process.env, BUILD_MODE: 'release', ...(llmsVersion ? { RCC_LLMS_VERSION: llmsVersion } : {}) }
   });
 
-  // 2) 通过 pack-mode 生成 rcc tarball（内部会临时切换 package.json.name/bin 并确保 llms 为 release 包）
+  // 2) 通过 pack-mode 生成 rcc tarball（内部会临时切换 package.json.name/bin，并同步 llms 版本声明）
   run(
     process.execPath,
     [PACK_SCRIPT, '--name', '@jsonstudio/rcc', '--bin', 'rcc'],

package/scripts/vendor-core.mjs

@@ -18,11 +18,11 @@ async function main() {
   const legacyVendorDir = path.join(root, 'vendor', 'rcc-llmswitch-core');
   const scopedVendorDir = path.join(root, 'vendor', '@jsonstudio', 'llms');
 
-  // In release mode we rely on npm-installed `@jsonstudio/llms`, so the local sharedmodule dist
-  // is optional and must not block CI (where sharedmodule often doesn't exist).
-  // In dev mode, `node_modules/@jsonstudio/llms` is typically symlinked to sharedmodule/llmswitch-core,
-  // so we keep a hard requirement for the dist output.
-  if (mode === 'dev' && !await exists(sharedDist)) {
+  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`。');
     process.exit(2);
@@ -37,10 +37,15 @@ async function main() {
     console.log('[vendor-core] removed legacy vendor/@jsonstudio/llms directory');
   }
 
-  if (mode === 'dev') {
+  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: using npm-installed @jsonstudio/llms (no vendor copy).');
+    console.log('[vendor-core] BUILD_MODE=release without local sharedmodule: using npm-installed @jsonstudio/llms (no vendor copy).');
   }
 }