1

src/components/puzzle-result/PuzzleResultView.test.tsx

@@ -589,6 +589,45 @@ describe('PuzzleResultView', () => {
     });
   });
 
+  test('uses the saved level picture reference when regenerating a level image', () => {
+    const onExecuteAction = vi.fn();
+    const session = createSession({
+      draft: {
+        ...createSession().draft!,
+        levels: [
+          {
+            ...createSession().draft!.levels![0]!,
+            pictureReference: '/generated-puzzle-assets/history/saved-reference.png',
+          },
+        ],
+      },
+    });
+
+    render(
+      <PuzzleResultView
+        session={session}
+        onBack={() => {}}
+        onExecuteAction={onExecuteAction}
+      />,
+    );
+
+    fireEvent.click(screen.getByText('雨夜猫街'));
+    fireEvent.click(screen.getByRole('button', { name: /重新生成画面/u }));
+    fireEvent.click(
+      within(screen.getByRole('dialog', { name: '确认消耗光点' })).getByRole(
+        'button',
+        { name: '确定' },
+      ),
+    );
+
+    expect(onExecuteAction).toHaveBeenCalledWith(
+      expect.objectContaining({
+        action: 'generate_puzzle_images',
+        referenceImageSrc: '/generated-puzzle-assets/history/saved-reference.png',
+      }),
+    );
+  });
+
   test('passes the selected image model when regenerating a level image', () => {
     const onExecuteAction = vi.fn();
 

src/components/puzzle-result/PuzzleResultView.tsx

@@ -637,6 +637,8 @@ function PuzzleLevelDetailDialog({
   );
   const formalImageSrc = resolveLevelFormalImageSrc(level);
   const hasFormalImage = Boolean(formalImageSrc);
+  const effectiveReferenceImageSrc =
+    referenceImageSrc.trim() || level.pictureReference?.trim() || '';
   const isGenerationProgressVisible = isGenerationProgressActive;
   const generationSecondsLeft = isBusy
     ? Math.max(generationCountdown, 1)
@@ -722,7 +724,7 @@ function PuzzleLevelDetailDialog({
     onGenerate(
       level.levelId,
       level.pictureDescription.trim() || undefined,
-      referenceImageSrc || undefined,
+      effectiveReferenceImageSrc || undefined,
       imageModel,
     );
   };
@@ -829,11 +831,11 @@ function PuzzleLevelDetailDialog({
                 />
                 <label
                   className={`absolute bottom-3 right-3 inline-flex h-10 w-10 cursor-pointer items-center justify-center rounded-full border border-amber-300/70 bg-white/96 text-amber-700 shadow-sm transition hover:bg-amber-50 ${isBusy ? 'cursor-not-allowed opacity-55' : ''}`}
-                  title={referenceImageSrc ? '更换参考图' : '添加参考图'}
+                  title={effectiveReferenceImageSrc ? '更换参考图' : '添加参考图'}
                 >
                   <ImagePlus className="h-4 w-4" />
                   <span className="sr-only">
-                    {referenceImageSrc ? '更换参考图' : '添加参考图'}
+                    {effectiveReferenceImageSrc ? '更换参考图' : '添加参考图'}
                   </span>
                   <input
                     type="file"
@@ -861,11 +863,11 @@ function PuzzleLevelDetailDialog({
                 aria-label="图面参考"
               />
 
-              {referenceImageSrc ? (
+              {effectiveReferenceImageSrc ? (
                 <div className="mt-3 flex items-center gap-3 rounded-[1rem] border border-[var(--platform-subpanel-border)] bg-white/72 px-3 py-3">
                   <div className="h-14 w-14 overflow-hidden rounded-[0.9rem] bg-[var(--platform-subpanel-fill)]">
                     <ResolvedAssetImage
-                      src={referenceImageSrc}
+                      src={effectiveReferenceImageSrc}
                       alt="拼图参考图"
                       className="h-full w-full object-cover"
                     />
@@ -882,6 +884,7 @@ function PuzzleLevelDetailDialog({
                       setReferenceImageSrc('');
                       setReferenceImageLabel('');
                       setReferenceImageError(null);
+                      onLevelChange({ ...level, pictureReference: null });
                     }}
                     className="platform-icon-button h-9 w-9"
                     aria-label="移除参考图"