address PR #153 review feedback

src/components/launch/LaunchWindow.tsx

@@ -71,7 +71,7 @@ export function LaunchWindow() {
   const openVideoFile = async () => {
     const result = await window.electronAPI.openVideoFilePicker();
     
-    if (result.cancelled) {
+    if (result.canceled) {
       return;
     }
     

src/components/video-editor/VideoEditor.tsx

@@ -10,6 +10,15 @@ import PlaybackControls from "./PlaybackControls";
 import TimelineEditor from "./timeline/TimelineEditor";
 import { SettingsPanel } from "./SettingsPanel";
 import { ExportDialog } from "./ExportDialog";
+import {
+  WALLPAPER_PATHS,
+  createProjectData,
+  deriveNextId,
+  fromFileUrl,
+  normalizeProjectEditor,
+  toFileUrl,
+  validateProjectData,
+} from "./projectPersistence";
 
 import type { Span } from "dnd-timeline";
 import {
@@ -29,37 +38,9 @@ import {
   type FigureData,
 } from "./types";
 import { VideoExporter, GifExporter, type ExportProgress, type ExportQuality, type ExportSettings, type ExportFormat, type GifFrameRate, type GifSizePreset, GIF_SIZE_PRESETS, calculateOutputDimensions } from "@/lib/exporter";
-import { ASPECT_RATIOS, type AspectRatio, getAspectRatioValue } from "@/utils/aspectRatioUtils";
+import { type AspectRatio, getAspectRatioValue } from "@/utils/aspectRatioUtils";
 import { getAssetPath } from "@/lib/assetPath";
 
-const WALLPAPER_COUNT = 18;
-const WALLPAPER_PATHS = Array.from({ length: WALLPAPER_COUNT }, (_, i) => `/wallpapers/wallpaper${i + 1}.jpg`);
-
-const PROJECT_VERSION = 1;
-
-interface EditorProjectData {
-  version: number;
-  videoPath: string;
-  editor: {
-    wallpaper: string;
-    shadowIntensity: number;
-    showBlur: boolean;
-    motionBlurEnabled: boolean;
-    borderRadius: number;
-    padding: number;
-    cropRegion: CropRegion;
-    zoomRegions: ZoomRegion[];
-    trimRegions: TrimRegion[];
-    annotationRegions: AnnotationRegion[];
-    aspectRatio: AspectRatio;
-    exportQuality: ExportQuality;
-    exportFormat: ExportFormat;
-    gifFrameRate: GifFrameRate;
-    gifLoop: boolean;
-    gifSizePreset: GifSizePreset;
-  };
-}
-
 export default function VideoEditor() {
   const [videoPath, setVideoPath] = useState<string | null>(null);
   const [videoSourcePath, setVideoSourcePath] = useState<string | null>(null);
@@ -100,208 +81,92 @@ export default function VideoEditor() {
   const nextAnnotationZIndexRef = useRef(1); // Track z-index for stacking order
   const exporterRef = useRef<VideoExporter | null>(null);
 
-  // Helper to convert file path to proper file:// URL
-  const toFileUrl = (filePath: string): string => {
-    // Normalize path separators to forward slashes
-    const normalized = filePath.replace(/\\/g, '/');
-    
-    // Check if it's a Windows absolute path (e.g., C:/Users/...)
-    if (normalized.match(/^[a-zA-Z]:/)) {
-      const fileUrl = `file:///${normalized}`;
-      return fileUrl;
+  const applyLoadedProject = useCallback(async (candidate: unknown, path?: string | null) => {
+    if (!validateProjectData(candidate)) {
+      return false;
     }
-    
-    // Unix-style absolute path
-    const fileUrl = `file://${normalized}`;
-    return fileUrl;
-  };
 
-  const fromFileUrl = (fileUrl: string): string => {
-    if (!fileUrl.startsWith('file://')) {
-      return fileUrl;
-    }
+    const project = candidate;
+    const sourcePath = project.videoPath;
+    const normalizedEditor = normalizeProjectEditor(project.editor);
 
     try {
-      const url = new URL(fileUrl);
-      return decodeURIComponent(url.pathname);
+      videoPlaybackRef.current?.pause();
     } catch {
-      return fileUrl.replace(/^file:\/\//, '');
+      // no-op
     }
-  };
+    setIsPlaying(false);
+    setCurrentTime(0);
+    setDuration(0);
 
-  const deriveNextId = (prefix: string, ids: string[]): number => {
-    const max = ids.reduce((acc, id) => {
-      const match = id.match(new RegExp(`^${prefix}-(\\d+)$`));
-      if (!match) return acc;
-      const value = Number(match[1]);
-      return Number.isFinite(value) ? Math.max(acc, value) : acc;
-    }, 0);
-    return max + 1;
-  };
+    setError(null);
+    setVideoSourcePath(sourcePath);
+    setVideoPath(toFileUrl(sourcePath));
+    setCurrentProjectPath(path ?? null);
 
-  const isFiniteNumber = (value: unknown): value is number => (
-    typeof value === 'number' && Number.isFinite(value)
-  );
+    setWallpaper(normalizedEditor.wallpaper);
+    setShadowIntensity(normalizedEditor.shadowIntensity);
+    setShowBlur(normalizedEditor.showBlur);
+    setMotionBlurEnabled(normalizedEditor.motionBlurEnabled);
+    setBorderRadius(normalizedEditor.borderRadius);
+    setPadding(normalizedEditor.padding);
+    setCropRegion(normalizedEditor.cropRegion);
+    setZoomRegions(normalizedEditor.zoomRegions);
+    setTrimRegions(normalizedEditor.trimRegions);
+    setAnnotationRegions(normalizedEditor.annotationRegions);
+    setAspectRatio(normalizedEditor.aspectRatio);
+    setExportQuality(normalizedEditor.exportQuality);
+    setExportFormat(normalizedEditor.exportFormat);
+    setGifFrameRate(normalizedEditor.gifFrameRate);
+    setGifLoop(normalizedEditor.gifLoop);
+    setGifSizePreset(normalizedEditor.gifSizePreset);
 
-  const clamp = (value: number, min: number, max: number) => Math.min(max, Math.max(min, value));
+    setSelectedZoomId(null);
+    setSelectedTrimId(null);
+    setSelectedAnnotationId(null);
+
+    nextZoomIdRef.current = deriveNextId("zoom", normalizedEditor.zoomRegions.map((region) => region.id));
+    nextTrimIdRef.current = deriveNextId("trim", normalizedEditor.trimRegions.map((region) => region.id));
+    nextAnnotationIdRef.current = deriveNextId(
+      "annotation",
+      normalizedEditor.annotationRegions.map((region) => region.id),
+    );
+    nextAnnotationZIndexRef.current =
+      normalizedEditor.annotationRegions.reduce((max, region) => Math.max(max, region.zIndex), 0) + 1;
 
-  const validateProjectData = (candidate: unknown): candidate is EditorProjectData => {
-    if (!candidate || typeof candidate !== 'object') return false;
-    const project = candidate as Partial<EditorProjectData>;
-    if (typeof project.version !== 'number') return false;
-    if (typeof project.videoPath !== 'string' || !project.videoPath) return false;
-    if (!project.editor || typeof project.editor !== 'object') return false;
     return true;
-  };
-
-  const normalizeProjectEditor = (editor: Partial<EditorProjectData['editor']>): EditorProjectData['editor'] => {
-    const validAspectRatios = new Set<AspectRatio>(ASPECT_RATIOS);
-
-    const normalizedZoomRegions: ZoomRegion[] = Array.isArray(editor.zoomRegions)
-      ? editor.zoomRegions
-          .filter((region): region is ZoomRegion => Boolean(region && typeof region.id === 'string'))
-          .map((region) => {
-            const rawStart = isFiniteNumber(region.startMs) ? Math.round(region.startMs) : 0;
-            const rawEnd = isFiniteNumber(region.endMs) ? Math.round(region.endMs) : rawStart + 1000;
-            const startMs = Math.max(0, Math.min(rawStart, rawEnd));
-            const endMs = Math.max(startMs + 1, rawEnd);
-
-            return {
-              id: region.id,
-              startMs,
-              endMs,
-              depth: [1, 2, 3, 4, 5, 6].includes(region.depth) ? region.depth : DEFAULT_ZOOM_DEPTH,
-              focus: {
-                cx: clamp(isFiniteNumber(region.focus?.cx) ? region.focus.cx : 0.5, 0, 1),
-                cy: clamp(isFiniteNumber(region.focus?.cy) ? region.focus.cy : 0.5, 0, 1),
-              },
-            };
-          })
-      : [];
-
-    const normalizedTrimRegions: TrimRegion[] = Array.isArray(editor.trimRegions)
-      ? editor.trimRegions
-          .filter((region): region is TrimRegion => Boolean(region && typeof region.id === 'string'))
-          .map((region) => {
-            const rawStart = isFiniteNumber(region.startMs) ? Math.round(region.startMs) : 0;
-            const rawEnd = isFiniteNumber(region.endMs) ? Math.round(region.endMs) : rawStart + 1000;
-            const startMs = Math.max(0, Math.min(rawStart, rawEnd));
-            const endMs = Math.max(startMs + 1, rawEnd);
-            return {
-              id: region.id,
-              startMs,
-              endMs,
-            };
-          })
-      : [];
-
-    const normalizedAnnotationRegions: AnnotationRegion[] = Array.isArray(editor.annotationRegions)
-      ? editor.annotationRegions
-          .filter((region): region is AnnotationRegion => Boolean(region && typeof region.id === 'string'))
-          .map((region, index) => {
-            const rawStart = isFiniteNumber(region.startMs) ? Math.round(region.startMs) : 0;
-            const rawEnd = isFiniteNumber(region.endMs) ? Math.round(region.endMs) : rawStart + 1000;
-            const startMs = Math.max(0, Math.min(rawStart, rawEnd));
-            const endMs = Math.max(startMs + 1, rawEnd);
-
-            return {
-              id: region.id,
-              startMs,
-              endMs,
-              type: region.type === 'image' || region.type === 'figure' ? region.type : 'text',
-              content: typeof region.content === 'string' ? region.content : '',
-              textContent: typeof region.textContent === 'string' ? region.textContent : undefined,
-              imageContent: typeof region.imageContent === 'string' ? region.imageContent : undefined,
-              position: {
-                x: clamp(isFiniteNumber(region.position?.x) ? region.position.x : DEFAULT_ANNOTATION_POSITION.x, 0, 100),
-                y: clamp(isFiniteNumber(region.position?.y) ? region.position.y : DEFAULT_ANNOTATION_POSITION.y, 0, 100),
-              },
-              size: {
-                width: clamp(isFiniteNumber(region.size?.width) ? region.size.width : DEFAULT_ANNOTATION_SIZE.width, 1, 200),
-                height: clamp(isFiniteNumber(region.size?.height) ? region.size.height : DEFAULT_ANNOTATION_SIZE.height, 1, 200),
-              },
-              style: {
-                ...DEFAULT_ANNOTATION_STYLE,
-                ...(region.style && typeof region.style === 'object' ? region.style : {}),
-              },
-              zIndex: isFiniteNumber(region.zIndex) ? region.zIndex : index + 1,
-              figureData: region.figureData
-                ? {
-                    ...DEFAULT_FIGURE_DATA,
-                    ...region.figureData,
-                  }
-                : undefined,
-            };
-          })
-      : [];
-
-    const rawCropX = isFiniteNumber(editor.cropRegion?.x) ? editor.cropRegion.x : DEFAULT_CROP_REGION.x;
-    const rawCropY = isFiniteNumber(editor.cropRegion?.y) ? editor.cropRegion.y : DEFAULT_CROP_REGION.y;
-    const rawCropWidth = isFiniteNumber(editor.cropRegion?.width) ? editor.cropRegion.width : DEFAULT_CROP_REGION.width;
-    const rawCropHeight = isFiniteNumber(editor.cropRegion?.height) ? editor.cropRegion.height : DEFAULT_CROP_REGION.height;
-
-    const cropX = clamp(rawCropX, 0, 1);
-    const cropY = clamp(rawCropY, 0, 1);
-    const cropWidth = clamp(rawCropWidth, 0.01, 1 - cropX);
-    const cropHeight = clamp(rawCropHeight, 0.01, 1 - cropY);
-
-    return {
-      wallpaper: typeof editor.wallpaper === 'string' ? editor.wallpaper : WALLPAPER_PATHS[0],
-      shadowIntensity: typeof editor.shadowIntensity === 'number' ? editor.shadowIntensity : 0,
-      showBlur: typeof editor.showBlur === 'boolean' ? editor.showBlur : false,
-      motionBlurEnabled: typeof editor.motionBlurEnabled === 'boolean' ? editor.motionBlurEnabled : false,
-      borderRadius: typeof editor.borderRadius === 'number' ? editor.borderRadius : 0,
-      padding: isFiniteNumber(editor.padding) ? clamp(editor.padding, 0, 100) : 50,
-      cropRegion: {
-        x: cropX,
-        y: cropY,
-        width: cropWidth,
-        height: cropHeight,
-      },
-      zoomRegions: normalizedZoomRegions,
-      trimRegions: normalizedTrimRegions,
-      annotationRegions: normalizedAnnotationRegions,
-      aspectRatio:
-        editor.aspectRatio && validAspectRatios.has(editor.aspectRatio)
-          ? editor.aspectRatio
-          : '16:9',
-      exportQuality:
-        editor.exportQuality === 'medium' || editor.exportQuality === 'source'
-          ? editor.exportQuality
-          : 'good',
-      exportFormat: editor.exportFormat === 'gif' ? 'gif' : 'mp4',
-      gifFrameRate:
-        editor.gifFrameRate === 15 || editor.gifFrameRate === 20 || editor.gifFrameRate === 25 || editor.gifFrameRate === 30
-          ? editor.gifFrameRate
-          : 15,
-      gifLoop: typeof editor.gifLoop === 'boolean' ? editor.gifLoop : true,
-      gifSizePreset:
-        editor.gifSizePreset === 'medium' || editor.gifSizePreset === 'large' || editor.gifSizePreset === 'original'
-          ? editor.gifSizePreset
-          : 'medium',
-    };
-  };
+  }, []);
 
   useEffect(() => {
-    async function loadVideo() {
+    async function loadInitialData() {
       try {
+        const currentProjectResult = await window.electronAPI.loadCurrentProjectFile();
+        if (currentProjectResult.success && currentProjectResult.project) {
+          const restored = await applyLoadedProject(
+            currentProjectResult.project,
+            currentProjectResult.path ?? null,
+          );
+          if (restored) {
+            return;
+          }
+        }
+
         const result = await window.electronAPI.getCurrentVideoPath();
-        
         if (result.success && result.path) {
-          const videoUrl = toFileUrl(result.path);
           setVideoSourcePath(result.path);
-          setVideoPath(videoUrl);
+          setVideoPath(toFileUrl(result.path));
         } else {
-          setError('No video to load. Please record or select a video.');
+          setError("No video to load. Please record or select a video.");
         }
       } catch (err) {
-        setError('Error loading video: ' + String(err));
+        setError("Error loading video: " + String(err));
       } finally {
         setLoading(false);
       }
     }
-    loadVideo();
-  }, []);
+
+    loadInitialData();
+  }, [applyLoadedProject]);
 
   const saveProject = useCallback(async (forceSaveAs: boolean) => {
     if (!videoPath) {
@@ -315,28 +180,24 @@ export default function VideoEditor() {
       return;
     }
 
-    const projectData: EditorProjectData = {
-      version: PROJECT_VERSION,
-      videoPath: sourcePath,
-      editor: {
-        wallpaper,
-        shadowIntensity,
-        showBlur,
-        motionBlurEnabled,
-        borderRadius,
-        padding,
-        cropRegion,
-        zoomRegions,
-        trimRegions,
-        annotationRegions,
-        aspectRatio,
-        exportQuality,
-        exportFormat,
-        gifFrameRate,
-        gifLoop,
-        gifSizePreset,
-      },
-    };
+    const projectData = createProjectData(sourcePath, {
+      wallpaper,
+      shadowIntensity,
+      showBlur,
+      motionBlurEnabled,
+      borderRadius,
+      padding,
+      cropRegion,
+      zoomRegions,
+      trimRegions,
+      annotationRegions,
+      aspectRatio,
+      exportQuality,
+      exportFormat,
+      gifFrameRate,
+      gifLoop,
+      gifSizePreset,
+    });
 
     const fileNameBase = sourcePath.split(/[\\/]/).pop()?.replace(/\.[^.]+$/, '') || `project-${Date.now()}`;
     const result = await window.electronAPI.saveProjectFile(
@@ -345,8 +206,8 @@ export default function VideoEditor() {
       forceSaveAs ? undefined : currentProjectPath ?? undefined,
     );
 
-    if (result.cancelled) {
-      toast.info('Project save cancelled');
+    if (result.canceled) {
+      toast.info("Project save canceled");
       return;
     }
 
@@ -393,7 +254,7 @@ export default function VideoEditor() {
   const handleLoadProject = useCallback(async () => {
     const result = await window.electronAPI.loadProjectFile();
 
-    if (result.cancelled) {
+    if (result.canceled) {
       return;
     }
 
@@ -402,67 +263,14 @@ export default function VideoEditor() {
       return;
     }
 
-    if (!validateProjectData(result.project)) {
+    const restored = await applyLoadedProject(result.project, result.path ?? null);
+    if (!restored) {
       toast.error('Invalid project file format');
       return;
     }
 
-    const project = result.project;
-    const sourcePath = project.videoPath;
-    const normalizedEditor = normalizeProjectEditor(project.editor);
-
-    try {
-      videoPlaybackRef.current?.pause();
-    } catch {
-      // no-op
-    }
-    setIsPlaying(false);
-    setCurrentTime(0);
-    setDuration(0);
-
-    try {
-      await window.electronAPI.setCurrentVideoPath(sourcePath);
-    } catch (error) {
-      console.warn('Unable to update current video path:', error);
-    }
-
-    const nextVideoPath = toFileUrl(sourcePath);
-    setError(null);
-    setVideoSourcePath(sourcePath);
-    setVideoPath(nextVideoPath);
-    setCurrentProjectPath(result.path ?? null);
-
-    setWallpaper(normalizedEditor.wallpaper);
-    setShadowIntensity(normalizedEditor.shadowIntensity);
-    setShowBlur(normalizedEditor.showBlur);
-    setMotionBlurEnabled(normalizedEditor.motionBlurEnabled);
-    setBorderRadius(normalizedEditor.borderRadius);
-    setPadding(normalizedEditor.padding);
-    setCropRegion(normalizedEditor.cropRegion);
-    setZoomRegions(normalizedEditor.zoomRegions);
-    setTrimRegions(normalizedEditor.trimRegions);
-    setAnnotationRegions(normalizedEditor.annotationRegions);
-    setAspectRatio(normalizedEditor.aspectRatio);
-    setExportQuality(normalizedEditor.exportQuality);
-    setExportFormat(normalizedEditor.exportFormat);
-    setGifFrameRate(normalizedEditor.gifFrameRate);
-    setGifLoop(normalizedEditor.gifLoop);
-    setGifSizePreset(normalizedEditor.gifSizePreset);
-
-    setSelectedZoomId(null);
-    setSelectedTrimId(null);
-    setSelectedAnnotationId(null);
-
-    nextZoomIdRef.current = deriveNextId('zoom', normalizedEditor.zoomRegions.map((region) => region.id));
-    nextTrimIdRef.current = deriveNextId('trim', normalizedEditor.trimRegions.map((region) => region.id));
-    nextAnnotationIdRef.current = deriveNextId('annotation', normalizedEditor.annotationRegions.map((region) => region.id));
-    nextAnnotationZIndexRef.current = normalizedEditor.annotationRegions.reduce(
-      (max, region) => Math.max(max, region.zIndex),
-      0,
-    ) + 1;
-
     toast.success(`Project loaded from ${result.path}`);
-  }, []);
+  }, [applyLoadedProject]);
 
   useEffect(() => {
     const removeLoadListener = window.electronAPI.onMenuLoadProject(handleLoadProject);
@@ -875,8 +683,8 @@ export default function VideoEditor() {
 
           const saveResult = await window.electronAPI.saveExportedVideo(arrayBuffer, fileName);
 
-          if (saveResult.cancelled) {
-            toast.info('Export cancelled');
+          if (saveResult.canceled) {
+            toast.info('Export canceled');
           } else if (saveResult.success) {
             toast.success(`GIF exported successfully to ${saveResult.path}`);
           } else {
@@ -1000,8 +808,8 @@ export default function VideoEditor() {
 
           const saveResult = await window.electronAPI.saveExportedVideo(arrayBuffer, fileName);
 
-          if (saveResult.cancelled) {
-            toast.info('Export cancelled');
+          if (saveResult.canceled) {
+            toast.info('Export canceled');
           } else if (saveResult.success) {
             toast.success(`Video exported successfully to ${saveResult.path}`);
           } else {
@@ -1071,7 +879,7 @@ export default function VideoEditor() {
   const handleCancelExport = useCallback(() => {
     if (exporterRef.current) {
       exporterRef.current.cancel();
-      toast.info('Export cancelled');
+      toast.info('Export canceled');
       setShowExportDialog(false);
       setIsExporting(false);
       setExportProgress(null);
@@ -1273,4 +1081,4 @@ export default function VideoEditor() {
       />
     </div>
   );
-}
+}

src/components/video-editor/projectPersistence.ts

@@ -0,0 +1,247 @@
+import { ASPECT_RATIOS, type AspectRatio } from "@/utils/aspectRatioUtils";
+import type { ExportFormat, ExportQuality, GifFrameRate, GifSizePreset } from "@/lib/exporter";
+import {
+  DEFAULT_ANNOTATION_POSITION,
+  DEFAULT_ANNOTATION_SIZE,
+  DEFAULT_ANNOTATION_STYLE,
+  DEFAULT_CROP_REGION,
+  DEFAULT_FIGURE_DATA,
+  DEFAULT_ZOOM_DEPTH,
+  type AnnotationRegion,
+  type CropRegion,
+  type TrimRegion,
+  type ZoomRegion,
+} from "./types";
+
+const WALLPAPER_COUNT = 18;
+
+export const WALLPAPER_PATHS = Array.from(
+  { length: WALLPAPER_COUNT },
+  (_, i) => `/wallpapers/wallpaper${i + 1}.jpg`,
+);
+
+export const PROJECT_VERSION = 1;
+
+export interface ProjectEditorState {
+  wallpaper: string;
+  shadowIntensity: number;
+  showBlur: boolean;
+  motionBlurEnabled: boolean;
+  borderRadius: number;
+  padding: number;
+  cropRegion: CropRegion;
+  zoomRegions: ZoomRegion[];
+  trimRegions: TrimRegion[];
+  annotationRegions: AnnotationRegion[];
+  aspectRatio: AspectRatio;
+  exportQuality: ExportQuality;
+  exportFormat: ExportFormat;
+  gifFrameRate: GifFrameRate;
+  gifLoop: boolean;
+  gifSizePreset: GifSizePreset;
+}
+
+export interface EditorProjectData {
+  version: number;
+  videoPath: string;
+  editor: ProjectEditorState;
+}
+
+function isFiniteNumber(value: unknown): value is number {
+  return typeof value === "number" && Number.isFinite(value);
+}
+
+function clamp(value: number, min: number, max: number) {
+  return Math.min(max, Math.max(min, value));
+}
+
+export function toFileUrl(filePath: string): string {
+  const normalized = filePath.replace(/\\/g, "/");
+  if (normalized.match(/^[a-zA-Z]:/)) {
+    return `file:///${normalized}`;
+  }
+  return `file://${normalized}`;
+}
+
+export function fromFileUrl(fileUrl: string): string {
+  if (!fileUrl.startsWith("file://")) {
+    return fileUrl;
+  }
+
+  try {
+    const url = new URL(fileUrl);
+    return decodeURIComponent(url.pathname);
+  } catch {
+    return fileUrl.replace(/^file:\/\//, "");
+  }
+}
+
+export function deriveNextId(prefix: string, ids: string[]): number {
+  const max = ids.reduce((acc, id) => {
+    const match = id.match(new RegExp(`^${prefix}-(\\d+)$`));
+    if (!match) return acc;
+    const value = Number(match[1]);
+    return Number.isFinite(value) ? Math.max(acc, value) : acc;
+  }, 0);
+  return max + 1;
+}
+
+export function validateProjectData(candidate: unknown): candidate is EditorProjectData {
+  if (!candidate || typeof candidate !== "object") return false;
+  const project = candidate as Partial<EditorProjectData>;
+  if (typeof project.version !== "number") return false;
+  if (typeof project.videoPath !== "string" || !project.videoPath) return false;
+  if (!project.editor || typeof project.editor !== "object") return false;
+  return true;
+}
+
+export function normalizeProjectEditor(editor: Partial<ProjectEditorState>): ProjectEditorState {
+  const validAspectRatios = new Set<AspectRatio>(ASPECT_RATIOS);
+
+  const normalizedZoomRegions: ZoomRegion[] = Array.isArray(editor.zoomRegions)
+    ? editor.zoomRegions
+        .filter((region): region is ZoomRegion => Boolean(region && typeof region.id === "string"))
+        .map((region) => {
+          const rawStart = isFiniteNumber(region.startMs) ? Math.round(region.startMs) : 0;
+          const rawEnd = isFiniteNumber(region.endMs) ? Math.round(region.endMs) : rawStart + 1000;
+          const startMs = Math.max(0, Math.min(rawStart, rawEnd));
+          const endMs = Math.max(startMs + 1, rawEnd);
+
+          return {
+            id: region.id,
+            startMs,
+            endMs,
+            depth: [1, 2, 3, 4, 5, 6].includes(region.depth) ? region.depth : DEFAULT_ZOOM_DEPTH,
+            focus: {
+              cx: clamp(isFiniteNumber(region.focus?.cx) ? region.focus.cx : 0.5, 0, 1),
+              cy: clamp(isFiniteNumber(region.focus?.cy) ? region.focus.cy : 0.5, 0, 1),
+            },
+          };
+        })
+    : [];
+
+  const normalizedTrimRegions: TrimRegion[] = Array.isArray(editor.trimRegions)
+    ? editor.trimRegions
+        .filter((region): region is TrimRegion => Boolean(region && typeof region.id === "string"))
+        .map((region) => {
+          const rawStart = isFiniteNumber(region.startMs) ? Math.round(region.startMs) : 0;
+          const rawEnd = isFiniteNumber(region.endMs) ? Math.round(region.endMs) : rawStart + 1000;
+          const startMs = Math.max(0, Math.min(rawStart, rawEnd));
+          const endMs = Math.max(startMs + 1, rawEnd);
+          return {
+            id: region.id,
+            startMs,
+            endMs,
+          };
+        })
+    : [];
+
+  const normalizedAnnotationRegions: AnnotationRegion[] = Array.isArray(editor.annotationRegions)
+    ? editor.annotationRegions
+        .filter((region): region is AnnotationRegion => Boolean(region && typeof region.id === "string"))
+        .map((region, index) => {
+          const rawStart = isFiniteNumber(region.startMs) ? Math.round(region.startMs) : 0;
+          const rawEnd = isFiniteNumber(region.endMs) ? Math.round(region.endMs) : rawStart + 1000;
+          const startMs = Math.max(0, Math.min(rawStart, rawEnd));
+          const endMs = Math.max(startMs + 1, rawEnd);
+
+          return {
+            id: region.id,
+            startMs,
+            endMs,
+            type: region.type === "image" || region.type === "figure" ? region.type : "text",
+            content: typeof region.content === "string" ? region.content : "",
+            textContent: typeof region.textContent === "string" ? region.textContent : undefined,
+            imageContent: typeof region.imageContent === "string" ? region.imageContent : undefined,
+            position: {
+              x: clamp(
+                isFiniteNumber(region.position?.x) ? region.position.x : DEFAULT_ANNOTATION_POSITION.x,
+                0,
+                100,
+              ),
+              y: clamp(
+                isFiniteNumber(region.position?.y) ? region.position.y : DEFAULT_ANNOTATION_POSITION.y,
+                0,
+                100,
+              ),
+            },
+            size: {
+              width: clamp(
+                isFiniteNumber(region.size?.width) ? region.size.width : DEFAULT_ANNOTATION_SIZE.width,
+                1,
+                200,
+              ),
+              height: clamp(
+                isFiniteNumber(region.size?.height) ? region.size.height : DEFAULT_ANNOTATION_SIZE.height,
+                1,
+                200,
+              ),
+            },
+            style: {
+              ...DEFAULT_ANNOTATION_STYLE,
+              ...(region.style && typeof region.style === "object" ? region.style : {}),
+            },
+            zIndex: isFiniteNumber(region.zIndex) ? region.zIndex : index + 1,
+            figureData: region.figureData
+              ? {
+                  ...DEFAULT_FIGURE_DATA,
+                  ...region.figureData,
+                }
+              : undefined,
+          };
+        })
+    : [];
+
+  const rawCropX = isFiniteNumber(editor.cropRegion?.x) ? editor.cropRegion.x : DEFAULT_CROP_REGION.x;
+  const rawCropY = isFiniteNumber(editor.cropRegion?.y) ? editor.cropRegion.y : DEFAULT_CROP_REGION.y;
+  const rawCropWidth = isFiniteNumber(editor.cropRegion?.width) ? editor.cropRegion.width : DEFAULT_CROP_REGION.width;
+  const rawCropHeight = isFiniteNumber(editor.cropRegion?.height)
+    ? editor.cropRegion.height
+    : DEFAULT_CROP_REGION.height;
+
+  const cropX = clamp(rawCropX, 0, 1);
+  const cropY = clamp(rawCropY, 0, 1);
+  const cropWidth = clamp(rawCropWidth, 0.01, 1 - cropX);
+  const cropHeight = clamp(rawCropHeight, 0.01, 1 - cropY);
+
+  return {
+    wallpaper: typeof editor.wallpaper === "string" ? editor.wallpaper : WALLPAPER_PATHS[0],
+    shadowIntensity: typeof editor.shadowIntensity === "number" ? editor.shadowIntensity : 0,
+    showBlur: typeof editor.showBlur === "boolean" ? editor.showBlur : false,
+    motionBlurEnabled: typeof editor.motionBlurEnabled === "boolean" ? editor.motionBlurEnabled : false,
+    borderRadius: typeof editor.borderRadius === "number" ? editor.borderRadius : 0,
+    padding: isFiniteNumber(editor.padding) ? clamp(editor.padding, 0, 100) : 50,
+    cropRegion: {
+      x: cropX,
+      y: cropY,
+      width: cropWidth,
+      height: cropHeight,
+    },
+    zoomRegions: normalizedZoomRegions,
+    trimRegions: normalizedTrimRegions,
+    annotationRegions: normalizedAnnotationRegions,
+    aspectRatio: editor.aspectRatio && validAspectRatios.has(editor.aspectRatio) ? editor.aspectRatio : "16:9",
+    exportQuality: editor.exportQuality === "medium" || editor.exportQuality === "source" ? editor.exportQuality : "good",
+    exportFormat: editor.exportFormat === "gif" ? "gif" : "mp4",
+    gifFrameRate:
+      editor.gifFrameRate === 15 ||
+      editor.gifFrameRate === 20 ||
+      editor.gifFrameRate === 25 ||
+      editor.gifFrameRate === 30
+        ? editor.gifFrameRate
+        : 15,
+    gifLoop: typeof editor.gifLoop === "boolean" ? editor.gifLoop : true,
+    gifSizePreset:
+      editor.gifSizePreset === "medium" || editor.gifSizePreset === "large" || editor.gifSizePreset === "original"
+        ? editor.gifSizePreset
+        : "medium",
+  };
+}
+
+export function createProjectData(videoPath: string, editor: ProjectEditorState): EditorProjectData {
+  return {
+    version: PROJECT_VERSION,
+    videoPath,
+    editor,
+  };
+}