Merge branch 'codex/profile-mobile-ui-reference'

2026-05-25 01:41:05 +08:00
parent 5d3e2ac111 50a0d6f982
commit 30cf8abbf7
74 changed files with 5512 additions and 1090 deletions
--- a/src/services/miniGameDraftGenerationProgress.test.ts
+++ b/src/services/miniGameDraftGenerationProgress.test.ts
@@ -36,12 +36,15 @@ describe('miniGameDraftGenerationProgress', () => {
    expect(progress?.steps[0]?.detail).toBe(
      '建立可恢复草稿，整理首关描述与关卡结构，约 8 秒。',
    );
-    expect(progress?.estimatedRemainingMs).toBe(296_500);
-    expect(progress?.overallProgress).toBeGreaterThan(0);
+    expect(progress?.steps[2]?.detail).toBe(
+      '调用 gpt-image-2 生成 1:1 拼图首图，预计 4 分钟。',
+    );
+    expect(progress?.estimatedRemainingMs).toBe(446_500);
+    expect(progress?.overallProgress).toBe(0);
    expect(progress?.steps[0]?.completed).toBeGreaterThan(0);
  });

-  test('puzzle draft generation advances steps across the current asset pipeline', () => {
+  test('puzzle draft generation starts total progress from zero', () => {
    const state: MiniGameDraftGenerationState = {
      kind: 'puzzle',
      phase: 'compile',
@@ -51,42 +54,81 @@ describe('miniGameDraftGenerationProgress', () => {
      error: null,
    };

-    const imageProgress = buildMiniGameDraftGenerationProgress(state, 26_000);
-    const uiProgress = buildMiniGameDraftGenerationProgress(state, 206_000);
-    const writeBackProgress = buildMiniGameDraftGenerationProgress(
-      state,
-      296_000,
-    );
+    const progress = buildMiniGameDraftGenerationProgress(state, 1000);

-    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-assets');
-    expect(writeBackProgress?.phaseId).toBe('puzzle-select-image');
-    expect(writeBackProgress?.estimatedRemainingMs).toBe(3_000);
-    expect(writeBackProgress?.steps[4]?.status).toBe('completed');
-    expect(writeBackProgress?.steps[5]?.status).toBe('active');
+    expect(progress?.overallProgress).toBe(0);
+    expect(progress?.completedWeight).toBe(0);
+    expect(progress?.estimatedRemainingMs).toBe(448_000);
+    expect(progress?.steps[0]?.completed).toBe(0);
  });

-  test('puzzle write-back step turns completed once rounded progress reaches 100%', () => {
+  test('puzzle draft generation total progress advances after startup', () => {
    const state: MiniGameDraftGenerationState = {
      kind: 'puzzle',
      phase: 'compile',
+      startedAtMs: 1000,
+      completedAssetCount: 0,
+      totalAssetCount: 0,
+      error: null,
+    };
+
+    const progress = buildMiniGameDraftGenerationProgress(state, 7000);
+
+    expect(progress?.overallProgress).toBeGreaterThan(0);
+    expect(progress?.overallProgress).toBeLessThan(88);
+    expect(progress?.phaseId).toBe('compile');
+  });
+
+  test('puzzle draft generation keeps current step until real progress advances it', () => {
+    const state: MiniGameDraftGenerationState = {
+      kind: 'puzzle',
+      phase: 'compile',
+      startedAtMs: 1000,
+      completedAssetCount: 0,
+      totalAssetCount: 0,
+      error: null,
+    };
+
+    const longRunningProgress = buildMiniGameDraftGenerationProgress(
+      state,
+      296_000,
+    );
+    const progressedState: MiniGameDraftGenerationState = {
+      ...state,
+      phase: 'puzzle-cover-image',
+    };
+    const realProgress = buildMiniGameDraftGenerationProgress(
+      progressedState,
+      296_000,
+    );
+
+    expect(longRunningProgress?.phaseId).toBe('compile');
+    expect(longRunningProgress?.steps[0]?.status).toBe('active');
+    expect(longRunningProgress?.steps[1]?.status).toBe('pending');
+    expect(longRunningProgress?.overallProgress).toBeLessThanOrEqual(98);
+    expect(longRunningProgress?.overallProgress).toBeGreaterThan(40);
+    expect(realProgress?.phaseId).toBe('puzzle-cover-image');
+    expect(realProgress?.steps[1]?.status).toBe('completed');
+    expect(realProgress?.steps[2]?.status).toBe('active');
+  });
+
+  test('puzzle write-back step stays active until the generation action finishes', () => {
+    const state: MiniGameDraftGenerationState = {
+      kind: 'puzzle',
+      phase: 'puzzle-select-image',
      startedAtMs: 1_000,
      completedAssetCount: 0,
      totalAssetCount: 0,
      error: null,
    };

-    const progress = buildMiniGameDraftGenerationProgress(state, 298_950);
+    const progress = buildMiniGameDraftGenerationProgress(state, 448_950);

    expect(progress?.phaseId).toBe('puzzle-select-image');
    expect(progress?.overallProgress).toBe(98);
    expect(progress?.estimatedRemainingMs).toBe(50);
-    expect(progress?.steps[5]?.completed).toBe(1);
-    expect(progress?.steps[5]?.status).toBe('completed');
+    expect(progress?.steps[5]?.completed).toBe(0.98);
+    expect(progress?.steps[5]?.status).toBe('active');
  });

  test('puzzle direct upload generation skips the first image generation step', () => {
@@ -112,14 +154,14 @@ describe('miniGameDraftGenerationProgress', () => {
      '生成UI与背景',
      '写入正式草稿',
    ]);
-    expect(progress?.phaseId).toBe('puzzle-level-scene');
+    expect(progress?.phaseId).toBe('compile');
    expect(progress?.steps[2]?.detail).toContain('直接使用上传图作为参考');
    expect(progress?.estimatedRemainingMs).toBe(189_000);
-    expect(writeBackProgress?.phaseId).toBe('puzzle-select-image');
+    expect(writeBackProgress?.phaseId).toBe('compile');
    expect(writeBackProgress?.estimatedRemainingMs).toBe(3_000);
  });

-  test('puzzle draft generation keeps moving without claiming completion before response', () => {
+  test('puzzle draft generation does not advance or claim completion before response', () => {
    const state: MiniGameDraftGenerationState = {
      kind: 'puzzle',
      phase: 'compile',
@@ -129,18 +171,88 @@ describe('miniGameDraftGenerationProgress', () => {
      error: null,
    };

-    const progress = buildMiniGameDraftGenerationProgress(state, 480_000);
+    const progress = buildMiniGameDraftGenerationProgress(state, 630_000);

-    expect(progress?.phaseId).toBe('puzzle-select-image');
-    expect(progress?.overallProgress).toBe(98);
+    expect(progress?.phaseId).toBe('compile');
+    expect(progress?.overallProgress).toBeLessThan(88);
+    expect(progress?.overallProgress).toBeGreaterThan(80);
    expect(progress?.estimatedRemainingMs).toBe(0);
-    expect(progress?.steps[5]?.completed).toBe(1);
-    expect(progress?.steps[5]?.status).toBe('completed');
-    expect(progress?.steps.every((step) => step.status === 'completed')).toBe(
+    expect(progress?.steps[0]?.status).toBe('active');
+    expect(progress?.steps[0]?.completed).toBe(0.98);
+    expect(progress?.steps.slice(1).every((step) => step.status === 'pending')).toBe(
      true,
    );
  });

+  test('puzzle draft generation advances steps from backend progress percent only', () => {
+    const state: MiniGameDraftGenerationState = {
+      kind: 'puzzle',
+      phase: 'compile',
+      startedAtMs: 1_000,
+      completedAssetCount: 0,
+      totalAssetCount: 0,
+      error: null,
+      metadata: {
+        puzzleAiRedraw: true,
+        puzzleProgressPercent: 88,
+      } as MiniGameDraftGenerationState['metadata'],
+    };
+
+    const imageProgress = buildMiniGameDraftGenerationProgress(state, 120_000);
+    const uiProgress = buildMiniGameDraftGenerationProgress(
+      {
+        ...state,
+        metadata: {
+          puzzleAiRedraw: true,
+          puzzleProgressPercent: 94,
+        } as MiniGameDraftGenerationState['metadata'],
+      },
+      230_000,
+    );
+    const writeProgress = buildMiniGameDraftGenerationProgress(
+      {
+        ...state,
+        metadata: {
+          puzzleAiRedraw: true,
+          puzzleProgressPercent: 96,
+        } as MiniGameDraftGenerationState['metadata'],
+      },
+      260_000,
+    );
+
+    expect(imageProgress?.phaseId).toBe('puzzle-cover-image');
+    expect(imageProgress?.steps[2]?.status).toBe('active');
+    expect(imageProgress?.steps[3]?.status).toBe('pending');
+    expect(uiProgress?.phaseId).toBe('puzzle-ui-assets');
+    expect(uiProgress?.steps[4]?.status).toBe('active');
+    expect(uiProgress?.steps[5]?.status).toBe('pending');
+    expect(writeProgress?.phaseId).toBe('puzzle-select-image');
+    expect(writeProgress?.steps[5]?.status).toBe('active');
+  });
+
+  test('puzzle backend milestone starts fake progress from the current step entry time', () => {
+    const state: MiniGameDraftGenerationState = {
+      kind: 'puzzle',
+      phase: 'compile',
+      startedAtMs: 1_000,
+      completedAssetCount: 0,
+      totalAssetCount: 0,
+      error: null,
+      metadata: {
+        puzzleAiRedraw: true,
+        puzzleProgressPercent: 88,
+        puzzleActivePhaseId: 'puzzle-cover-image',
+        puzzleActiveStepStartedAtMs: 120_000,
+      } as MiniGameDraftGenerationState['metadata'],
+    };
+
+    const progress = buildMiniGameDraftGenerationProgress(state, 121_000);
+
+    expect(progress?.phaseId).toBe('puzzle-cover-image');
+    expect(progress?.steps[2]?.status).toBe('active');
+    expect(progress?.steps[2]?.completed).toBeLessThan(0.02);
+  });
+
  test('puzzle ready copy points to result page work info completion', () => {
    const state: MiniGameDraftGenerationState = {
      kind: 'puzzle',
@@ -268,6 +380,19 @@ describe('miniGameDraftGenerationProgress', () => {
    );
  });

+  test('match3d draft generation starts total progress from zero', () => {
+    const state = createMiniGameDraftGenerationState('match3d');
+
+    const progress = buildMiniGameDraftGenerationProgress(
+      state,
+      state.startedAtMs,
+    );
+
+    expect(progress?.overallProgress).toBe(0);
+    expect(progress?.completedWeight).toBe(0);
+    expect(progress?.steps[0]?.completed).toBe(0);
+  });
+
  test('match3d draft generation keeps backend observed asset phase', () => {
    const state = {
      ...createMiniGameDraftGenerationState('match3d'),