Merge remote-tracking branch 'origin/master' into codex/wooden-fish-template

src/services/miniGameDraftGenerationProgress.test.ts

@@ -27,15 +27,16 @@ describe('miniGameDraftGenerationProgress', () => {
     expect(progress?.steps.map((step) => step.label)).toEqual([
       '编译首关草稿',
       '生成关卡名称',
-      '并行生成素材',
-      '校验背景资源',
+      '生成拼图首图',
+      '生成关卡画面',
+      '生成UI与背景',
       '写入正式草稿',
     ]);
     expect(progress?.phaseLabel).toBe('编译首关草稿');
     expect(progress?.steps[0]?.detail).toBe(
-      '读取画面描述，建立可编辑草稿与首关结构。',
+      '建立可恢复草稿，整理首关描述与关卡结构，约 8 秒。',
     );
-    expect(progress?.estimatedRemainingMs).toBe(298_500);
+    expect(progress?.estimatedRemainingMs).toBe(296_500);
     expect(progress?.overallProgress).toBeGreaterThan(0);
     expect(progress?.steps[0]?.completed).toBeGreaterThan(0);
   });
@@ -51,22 +52,52 @@ describe('miniGameDraftGenerationProgress', () => {
     };
 
     const imageProgress = buildMiniGameDraftGenerationProgress(state, 26_000);
-    const uiProgress = buildMiniGameDraftGenerationProgress(state, 282_000);
+    const uiProgress = buildMiniGameDraftGenerationProgress(state, 206_000);
     const writeBackProgress = buildMiniGameDraftGenerationProgress(
       state,
       296_000,
     );
 
-    expect(imageProgress?.phaseId).toBe('puzzle-images');
-    expect(imageProgress?.estimatedRemainingMs).toBe(275_000);
+    expect(imageProgress?.phaseId).toBe('puzzle-cover-image');
+    expect(imageProgress?.estimatedRemainingMs).toBe(273_000);
     expect(imageProgress?.steps[1]?.status).toBe('completed');
     expect(imageProgress?.steps[2]?.status).toBe('active');
     expect(imageProgress?.steps[2]?.completed).toBeGreaterThan(0);
-    expect(uiProgress?.phaseId).toBe('puzzle-ui-background');
+    expect(uiProgress?.phaseId).toBe('puzzle-ui-assets');
     expect(writeBackProgress?.phaseId).toBe('puzzle-select-image');
-    expect(writeBackProgress?.estimatedRemainingMs).toBe(5_000);
-    expect(writeBackProgress?.steps[3]?.status).toBe('completed');
-    expect(writeBackProgress?.steps[4]?.status).toBe('active');
+    expect(writeBackProgress?.estimatedRemainingMs).toBe(3_000);
+    expect(writeBackProgress?.steps[4]?.status).toBe('completed');
+    expect(writeBackProgress?.steps[5]?.status).toBe('active');
+  });
+
+  test('puzzle direct upload generation skips the first image generation step', () => {
+    const state: MiniGameDraftGenerationState = {
+      kind: 'puzzle',
+      phase: 'compile',
+      startedAtMs: 1_000,
+      completedAssetCount: 0,
+      totalAssetCount: 0,
+      error: null,
+      metadata: {
+        puzzleAiRedraw: false,
+      },
+    };
+
+    const progress = buildMiniGameDraftGenerationProgress(state, 20_000);
+    const writeBackProgress = buildMiniGameDraftGenerationProgress(state, 206_000);
+
+    expect(progress?.steps.map((step) => step.label)).toEqual([
+      '编译首关草稿',
+      '生成关卡名称',
+      '生成关卡画面',
+      '生成UI与背景',
+      '写入正式草稿',
+    ]);
+    expect(progress?.phaseId).toBe('puzzle-level-scene');
+    expect(progress?.steps[2]?.detail).toContain('直接使用上传图作为参考');
+    expect(progress?.estimatedRemainingMs).toBe(189_000);
+    expect(writeBackProgress?.phaseId).toBe('puzzle-select-image');
+    expect(writeBackProgress?.estimatedRemainingMs).toBe(3_000);
   });
 
   test('puzzle draft generation keeps moving without claiming completion before response', () => {
@@ -79,12 +110,12 @@ describe('miniGameDraftGenerationProgress', () => {
       error: null,
     };
 
-    const progress = buildMiniGameDraftGenerationProgress(state, 360_000);
+    const progress = buildMiniGameDraftGenerationProgress(state, 480_000);
 
     expect(progress?.phaseId).toBe('puzzle-select-image');
     expect(progress?.overallProgress).toBe(98);
     expect(progress?.estimatedRemainingMs).toBe(0);
-    expect(progress?.steps[4]?.completed).toBe(1);
+    expect(progress?.steps[5]?.completed).toBe(1);
   });
 
   test('puzzle ready copy points to result page work info completion', () => {
@@ -112,7 +143,7 @@ describe('miniGameDraftGenerationProgress', () => {
       finishedAtMs: 151_000,
       completedAssetCount: 0,
       totalAssetCount: 0,
-      error: 'VectorEngine 图片编辑请求超时',
+      error: 'VectorEngine 图片生成请求超时',
     };
 
     const progress = buildMiniGameDraftGenerationProgress(state, 500_000);
@@ -178,7 +209,7 @@ describe('miniGameDraftGenerationProgress', () => {
     );
   });
 
-  test('match3d draft generation exposes item sheet and image asset steps', () => {
+  test('match3d draft generation exposes level scene derived asset steps', () => {
     const state = createMiniGameDraftGenerationState('match3d');
 
     const progress = buildMiniGameDraftGenerationProgress(
@@ -189,17 +220,14 @@ describe('miniGameDraftGenerationProgress', () => {
     expect(progress?.steps.map((step) => step.id)).toEqual([
       'match3d-work-title',
       'match3d-item-names',
-      'match3d-background-prompt',
-      'match3d-material-sheet',
-      'match3d-slice-images',
-      'match3d-upload-images',
-      'match3d-generate-views',
-      'match3d-background-image',
+      'match3d-level-scene',
+      'match3d-derived-assets',
+      'match3d-parse-spritesheet',
       'match3d-write-draft',
     ]);
-    expect(progress?.phaseId).toBe('match3d-material-sheet');
-    expect(progress?.phaseLabel).toBe('分批生成素材图');
-    expect(progress?.estimatedRemainingMs).toBe(480_000);
+    expect(progress?.phaseId).toBe('match3d-level-scene');
+    expect(progress?.phaseLabel).toBe('生成关卡整图');
+    expect(progress?.estimatedRemainingMs).toBe(430_000);
   });
 
   test('match3d draft generation starts from title generation', () => {
@@ -230,26 +258,26 @@ describe('miniGameDraftGenerationProgress', () => {
       state.startedAtMs + 20_000,
     );
 
-    expect(progress?.phaseId).toBe('match3d-generate-views');
-    expect(progress?.steps[6]?.detail).toContain('五视角图片');
-    expect(progress?.steps[6]?.completed).toBe(1);
-    expect(progress?.steps[6]?.total).toBe(3);
+    expect(progress?.phaseId).toBe('match3d-parse-spritesheet');
+    expect(progress?.steps[4]?.detail).toContain('解析 20 个物品');
+    expect(progress?.steps[4]?.completed).toBe(1);
+    expect(progress?.steps[4]?.total).toBe(3);
   });
 
   test('match3d draft generation reaches background image and writeback phases', () => {
     const state = createMiniGameDraftGenerationState('match3d');
 
-    const backgroundProgress = buildMiniGameDraftGenerationProgress(
+    const derivedProgress = buildMiniGameDraftGenerationProgress(
       state,
-      state.startedAtMs + 400_000,
+      state.startedAtMs + 150_000,
     );
     const writeProgress = buildMiniGameDraftGenerationProgress(
       state,
-      state.startedAtMs + 500_000,
+      state.startedAtMs + 460_000,
     );
 
-    expect(backgroundProgress?.phaseId).toBe('match3d-background-image');
-    expect(backgroundProgress?.phaseLabel).toBe('生成UI背景');
+    expect(derivedProgress?.phaseId).toBe('match3d-derived-assets');
+    expect(derivedProgress?.phaseLabel).toBe('生成三张派生图');
     expect(writeProgress?.phaseId).toBe('match3d-write-draft');
     expect(writeProgress?.phaseLabel).toBe('写入草稿页');
   });
@@ -270,8 +298,8 @@ describe('miniGameDraftGenerationProgress', () => {
       },
       {
         id: 'match3d-items',
-        label: '物品数量',
-        value: '25 件',
+        label: '素材数量',
+        value: '20 种素材',
       },
     ]);
   });