Merge branch 'codex/editor-asset-metadata-migration' into codex/editor-asset-library

# Conflicts: # docs/project-memory/shared-memory/decision-log.md # server-rs/crates/api-server/src/editor_project.rs # src/components/image-editor/ImageCanvasEditorModel.ts # src/components/image-editor/ImageCanvasEditorView.test-utils.ts # src/components/image-editor/ImageCanvasEditorView.tsx # src/components/image-editor/useImageCanvasGenerationSubmissionWorkflow.ts # src/services/image-editor/editorProjectClient.test.ts
2026-06-19 16:55:41 +08:00
parent 9bb8ca8dfa e644d7c99f
commit 4821fb90df
31 changed files with 1586 additions and 224 deletions
@@ -266,6 +266,8 @@ export function setupImageCanvasEditorViewTestLifecycle({
      width: input.width,
      height: input.height,
      sourceType: input.sourceType,
+      assetKind: input.assetKind,
+      generationInputs: input.generationInputs,
      durationSeconds: input.durationSeconds,
    }));
    createEditorAssetFolderMock.mockResolvedValue({