Merge branch 'master' into opt/win-ssache

scripts/check-native-shells.mjs

@@ -85,14 +85,18 @@ const aiGameCreatorViteConfigSource = fs.readFileSync(
 // - contract：纯源码 / 契约 / 清单断言，不需要任何构建产物。
 // - shells：微信壳、Expo 移动壳、Tauri 桌面壳与 H5 HostBridge 的现役运行时门禁。
 // - agc-web：AI 游戏创作壳的前端门禁（typecheck 与壳内测试，不触碰 Cargo）。
-// - agc-rust：AI 游戏创作壳的 Rust 门禁（共享 / 平台 crate 测试、串行壳测试和
-//   会用 `src-tauri/Cargo.toml` spawn `cargo` 的 agent-run smoke）。
+// - agc-rust-crates：AGC 壳依赖的共享 / 平台 crate 测试（server-rs workspace 加两个
+//   无锁独立 crate），只需 server-rs 侧的依赖预热。
+// - agc-rust-shell：AGC 壳自身的 Rust 门禁（bin target 单测按名单分片并行、片内保持
+//   `--test-threads=1`）与会用 `src-tauri/Cargo.toml` spawn `cargo run` 的 agent-run
+//   smoke，只需 AGC 壳自己的依赖预热。
 // - release：发布构建 smoke 和依赖发布产物的落盘断言。
 const nativeShellGateGroups = [
   'contract',
   'shells',
   'agc-web',
-  'agc-rust',
+  'agc-rust-crates',
+  'agc-rust-shell',
   'release',
 ];
 const requestedNativeShellGroups = readRequestedNativeShellGroups(
@@ -2310,8 +2314,9 @@ const steps = [
   },
   // AI 游戏创作壳原先一步串完 typecheck、壳内测试、共享 / 平台 crate 测试和
   // 串行壳测试，CI 因此只有一条 10 分钟以上的长尾。这里按同一组命令切成
-  // web 与 rust 两段，顺序与 `npm run ai-game-creator-shell:check` 完全一致，
-  // 但允许 CI 并行执行；本地全量运行仍然是 web -> rust -> smoke 原顺序。
+  // web、rust-crates、rust-shell 三段，顺序与 `npm run ai-game-creator-shell:check`
+  // 完全一致，但允许 CI 把三段放进不同的 job 并行执行；本地全量运行仍然是
+  // web -> rust(crates -> shell) -> smoke 原顺序。
   {
     group: 'agc-web',
     label: 'ai-game-creator-shell-check-web',
@@ -2319,15 +2324,21 @@ const steps = [
     args: ['run', 'ai-game-creator-shell:check:web'],
   },
   {
-    group: 'agc-rust',
-    label: 'ai-game-creator-shell-check-rust',
+    group: 'agc-rust-crates',
+    label: 'ai-game-creator-shell-check-rust-crates',
     command: npmCommand,
-    args: ['run', 'ai-game-creator-shell:check:rust'],
+    args: ['run', 'ai-game-creator-shell:check:rust:crates'],
   },
-  // agent-run smoke 会用 `src-tauri/Cargo.toml` spawn `cargo`，因此与 Rust 段同组，
-  // 保证它落在已经预热 AGC Cargo 依赖的 job 里。
   {
-    group: 'agc-rust',
+    group: 'agc-rust-shell',
+    label: 'ai-game-creator-shell-check-rust-shell',
+    command: npmCommand,
+    args: ['run', 'ai-game-creator-shell:check:rust:shell'],
+  },
+  // agent-run smoke 会用 `src-tauri/Cargo.toml` spawn `cargo run`，因此与壳测试同组，
+  // 保证它落在已经预热 AGC 壳 Cargo 依赖的 job 里。
+  {
+    group: 'agc-rust-shell',
     label: 'ai-game-creator-shell-agent-run-smoke',
     command: npmCommand,
     args: ['run', 'ai-game-creator-shell:agent-run:smoke'],

scripts/project-ci-workflow.test.ts

@@ -42,8 +42,18 @@ const jobNames = [
   'native-shell-tests',
   'ai-game-creator-shell-web-tests',
   'ai-game-creator-shell-rust-tests',
+  'ai-game-creator-shell-rust-crates',
 ] as const;
 
+// 这两个 job 是纯 cargo 门禁：AGC 壳的 Rust 套件与 agent-run smoke 只用 cargo 与
+// node 内建模块（smoke 脚本只 import `node:*`），crate 级测试只跑 cargo 命令，
+// 都不需要 node_modules。省掉两份 `npm ci`（各 1~3 分钟）是把客户端 Rust 关键路径
+// 压到 7 分钟以内的前提，因此这里显式允许它们不装 npm 依赖。
+const jobsWithoutNpmInstall: readonly string[] = [
+  'ai-game-creator-shell-rust-tests',
+  'ai-game-creator-shell-rust-crates',
+];
+
 const rootPackageJson = JSON.parse(
   readFileSync(resolve(process.cwd(), 'package.json'), 'utf8'),
 ) as { scripts?: Record<string, string> };
@@ -58,7 +68,8 @@ const nativeShellGateGroupScripts = {
   contract: 'npm run check:native-shells:contract',
   shells: 'npm run check:native-shells:shells',
   'agc-web': 'npm run check:native-shells:agc-web',
-  'agc-rust': 'npm run check:native-shells:agc-rust',
+  'agc-rust-crates': 'npm run check:native-shells:agc-rust-crates',
+  'agc-rust-shell': 'npm run check:native-shells:agc-rust-shell',
   release: 'npm run check:native-shells:release',
 } as const;
 
@@ -130,6 +141,10 @@ describe('project CI workflow', () => {
 
       expect(checkout).toBeGreaterThanOrEqual(0);
       expect(validateImage).toBeGreaterThan(checkout);
+      if (jobsWithoutNpmInstall.includes(jobName)) {
+        expect(installDependencies).toBe(-1);
+        continue;
+      }
       expect(installDependencies).toBeGreaterThan(validateImage);
     }
 
@@ -160,8 +175,12 @@ describe('project CI workflow', () => {
     );
   });
 
-  it('retries the single root workspace clean install in every job as a bounded whole command', () => {
+  it('retries the single root workspace clean install in every job that needs node_modules', () => {
     for (const jobName of jobNames) {
+      if (jobsWithoutNpmInstall.includes(jobName)) {
+        expect(jobSection(jobName)).not.toContain('ci-npm-ci-with-retry.sh');
+        continue;
+      }
       const install = stepSection(jobName, 'Install npm dependencies');
       expect(install).toContain('bash scripts/ci-npm-ci-with-retry.sh');
       expect(install).not.toContain('--prefix');
@@ -381,36 +400,75 @@ describe('project CI workflow', () => {
     expect(workflow).not.toMatch(/^ {8}run: npm run check:native-shells$/mu);
   });
 
-  it('splits the AI game creator shell gates into web and Rust jobs', () => {
+  it('splits the AI game creator shell gates into web, shell shard, and shared crate jobs', () => {
     const webJob = jobSection('ai-game-creator-shell-web-tests');
     expect(webJob).toContain('run: npm run check:native-shells:agc-web');
     expect(webJob).not.toContain('cargo fetch');
 
     const rustJob = jobSection('ai-game-creator-shell-rust-tests');
-    expect(rustJob).toContain('run: npm run check:native-shells:agc-rust');
-    expect(rustJob).toContain('server-rs/Cargo.toml');
+    expect(rustJob).toContain(
+      'run: npm run check:native-shells:agc-rust-shell',
+    );
     expect(rustJob).toContain(
       'apps/ai-game-creator-shell/src-tauri/Cargo.toml',
     );
     expect(rustJob).toContain('cargo fetch --locked');
+    // 壳 job 只预热 AGC 壳自己那份锁定依赖：server-rs 那份归 crate 级 job。
+    expect(rustJob).not.toContain('server-rs/Cargo.toml');
 
-    // 拆开的 web / rust 两段必须还是原 `ai-game-creator-shell:check` 的同一条命令序列。
+    const cratesJob = jobSection('ai-game-creator-shell-rust-crates');
+    expect(cratesJob).toContain(
+      'run: npm run check:native-shells:agc-rust-crates',
+    );
+    expect(cratesJob).toContain('server-rs/Cargo.toml');
+    expect(cratesJob).toContain('cargo fetch --locked');
+
+    // 拆开的 web / rust 两段必须还是原 `ai-game-creator-shell:check` 的同一条命令序列，
+    // rust 段再拆成 crate 级与壳分片两段后在聚合脚本里保持同序。
     expect(rootPackageJson.scripts?.['ai-game-creator-shell:check']).toBe(
       'npm run ai-game-creator-shell:check:web && npm run ai-game-creator-shell:check:rust && npm run ai-game-creator-shell:agent-run:smoke',
     );
     expect(rootPackageJson.scripts?.['ai-game-creator-shell:check:web']).toBe(
       'npm run ai-game-creator-shell:typecheck && npm run test -- apps/ai-game-creator-shell/tests',
     );
-    expect(
-      rootPackageJson.scripts?.['ai-game-creator-shell:check:rust'],
-    ).toContain(
-      'cargo test --locked --manifest-path apps/ai-game-creator-shell/src-tauri/Cargo.toml -- --test-threads=1',
+    expect(rootPackageJson.scripts?.['ai-game-creator-shell:check:rust']).toBe(
+      'npm run ai-game-creator-shell:check:rust:crates && npm run ai-game-creator-shell:check:rust:shell',
     );
+    expect(
+      rootPackageJson.scripts?.['ai-game-creator-shell:check:rust:crates'],
+    ).toContain(
+      'cargo test --locked -p shared-contracts --manifest-path server-rs/Cargo.toml game_creation_app',
+    );
+    expect(
+      rootPackageJson.scripts?.['ai-game-creator-shell:check:rust:shell'],
+    ).toBe(
+      'node apps/ai-game-creator-shell/scripts/run-rust-shell-test-shards.mjs --shards=4',
+    );
+    // 整套用例不再作为一条 `cargo test -- --test-threads=1` 命令串行跑：CI 与本地都走
+    // 分片运行器，片内串行、片间并行。
+    expect(workflow).not.toContain('-- --test-threads=1');
   });
 
-  it('prefetches the excluded standalone Rust crates before the AI game creator shell Rust gates', () => {
+  it('keeps the shell shard runner exhaustive over discovered tests', () => {
+    const shardRunner = readFileSync(
+      resolve(
+        process.cwd(),
+        'apps/ai-game-creator-shell/scripts/run-rust-shell-test-shards.mjs',
+      ),
+      'utf8',
+    );
+    // 分片必须对 `--list` 的全集做覆盖与互斥校验，否则改分片规则会静默漏跑门禁。
+    expect(shardRunner).toContain('function assertShardsCoverEveryTest(');
+    expect(shardRunner).toContain('must be exhaustive');
+    expect(shardRunner).toContain('must be disjoint');
+    expect(shardRunner).toContain("'--test-threads=1'");
+    expect(shardRunner).toContain('TMPDIR: shardTmpDirectory');
+    expect(shardRunner).toContain("'--exact'");
+  });
+
+  it('prefetches the excluded standalone Rust crates before the shared crate gates', () => {
     const standaloneStep = stepSection(
-      'ai-game-creator-shell-rust-tests',
+      'ai-game-creator-shell-rust-crates',
       'Prepare standalone Rust crate dependencies',
     );
     for (const manifest of [
@@ -424,11 +482,11 @@ describe('project CI workflow', () => {
     expect(standaloneStep).toContain('cargo fetch \\');
     expect(standaloneStep).not.toContain('cargo fetch --locked');
 
-    const rustJob = jobSection('ai-game-creator-shell-rust-tests');
+    const cratesJob = jobSection('ai-game-creator-shell-rust-crates');
     expect(
-      rustJob.indexOf('Prepare standalone Rust crate dependencies'),
+      cratesJob.indexOf('Prepare standalone Rust crate dependencies'),
     ).toBeLessThan(
-      rustJob.indexOf('run: npm run check:native-shells:agc-rust'),
+      cratesJob.indexOf('run: npm run check:native-shells:agc-rust-crates'),
     );
   });
 });