合并主分支

解决合并冲突

src/components/image-editor/ImageCanvasEditorModel.test.ts

@@ -1531,6 +1531,31 @@ describe('ImageCanvasEditorModel', () => {
     });
   });
 
+  it('restores scene generation dialog fields', () => {
+    expect(
+      hydrateCanvasGenerationDialog({
+        id: 'generation-dialog-scene',
+        mode: 'scene',
+        prompt: '海边车站',
+        status: 'idle',
+        sceneStylePreset: 'custom',
+        sceneCustomStyle: '90年代复古像素风',
+        imageModel: 'gemini-3.1-flash-image-preview',
+        aspectRatio: '16:9',
+        imageSize: '1K',
+      }),
+    ).toMatchObject({
+      id: 'generation-dialog-scene',
+      mode: 'scene',
+      prompt: '海边车站',
+      sceneStylePreset: 'custom',
+      sceneCustomStyle: '90年代复古像素风',
+      imageModel: 'gemini-3.1-flash-image-preview',
+      aspectRatio: '16:9',
+      imageSize: '1K',
+    });
+  });
+
   it('keeps the operation ledger out of the layout and restores it from the local ledger', () => {
     const dialogId = 'dialog-perfect-pixel-round-trip';
     const operation = buildPerfectPixelOperation(dialogId);