From c12daf4cf4793900e0c98de6362a90378d44953f Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Fri, 15 May 2026 03:01:09 +0530
Subject: [PATCH 01/73] Add undo/redo support for export settings

---
 src/components/VideoEditor.tsx | 52 +++++++++++++++++++--
 src/hooks/useVideoEditor.ts    | 83 +++++++++++++++++++++++++++++++---
 2 files changed, 123 insertions(+), 12 deletions(-)

diff --git a/src/components/VideoEditor.tsx b/src/components/VideoEditor.tsx
index 7f4ce60e..4ad0f315 100644
--- a/src/components/VideoEditor.tsx
+++ b/src/components/VideoEditor.tsx
@@ -44,10 +44,22 @@ function Section({ icon, title, children, delay = 0 }: SectionProps) {
 
 export default function VideoEditor() {
   const {
-    file, duration, recipe, status, progress,
-    result, error, updateRecipe,
-    handleFileSelect, handleExport, reset,
-  } = useVideoEditor();
+  file,
+  duration,
+  recipe,
+  status,
+  progress,
+  result,
+  error,
+  updateRecipe,
+  undo,
+  redo,
+  canUndo,
+  canRedo,
+  handleFileSelect,
+  handleExport,
+  reset,
+} = useVideoEditor();
 
   const isProcessing = status === "loading-engine" || status === "exporting";
 
@@ -141,7 +153,37 @@ export default function VideoEditor() {
                 <FramingControl recipe={recipe} onChange={updateRecipe} />
               </Section>
             </div>
-
+            <div className="flex gap-3">
+              <button
+                type="button"
+                onClick={undo}
+                disabled={!canUndo || isProcessing}
+                className={cn(
+                  "flex-1 py-3 rounded-xl border transition-all duration-200",
+                  "font-heading text-xs uppercase tracking-widest",
+                  canUndo && !isProcessing
+                    ? "border-[var(--border)] bg-[var(--surface)] hover:border-film-500 hover:text-film-600"
+                    : "border-[var(--border)] text-[var(--muted)] cursor-not-allowed opacity-50"
+                )}
+              >
+                Undo
+              </button>
+
+              <button
+                type="button"
+                onClick={redo}
+                disabled={!canRedo || isProcessing}
+                className={cn(
+                  "flex-1 py-3 rounded-xl border transition-all duration-200",
+                  "font-heading text-xs uppercase tracking-widest",
+                  canRedo && !isProcessing
+                    ? "border-[var(--border)] bg-[var(--surface)] hover:border-film-500 hover:text-film-600"
+                    : "border-[var(--border)] text-[var(--muted)] cursor-not-allowed opacity-50"
+                )}
+              >
+                Redo
+              </button>
+            </div>
             <button
               type="button"
               onClick={handleExport}
diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index e118be77..c9ac7548 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -11,11 +11,14 @@ function getVideoDuration(file: File): Promise<number> {
     const video = document.createElement("video");
     video.preload = "metadata";
     const url = URL.createObjectURL(file);
+
     video.src = url;
+
     video.onloadedmetadata = () => {
       URL.revokeObjectURL(url);
       resolve(isFinite(video.duration) ? video.duration : 0);
     };
+
     video.onerror = () => {
       URL.revokeObjectURL(url);
       resolve(0);
@@ -26,22 +29,59 @@ function getVideoDuration(file: File): Promise<number> {
 export function useVideoEditor() {
   const [file, setFile] = useState<File | null>(null);
   const [duration, setDuration] = useState<number>(0);
-  const [recipe, setRecipe] = useState<EditRecipe>(DEFAULT_RECIPE);
+
+  const [history, setHistory] = useState<EditRecipe[]>([DEFAULT_RECIPE]);
+  const [historyIndex, setHistoryIndex] = useState(0);
+
   const [status, setStatus] = useState<ExportStatus>("idle");
   const [progress, setProgress] = useState(0);
   const [result, setResult] = useState<ExportResult | null>(null);
   const [error, setError] = useState<string | null>(null);
 
+  const recipe = history[historyIndex];
+
   const updateRecipe = useCallback((patch: Partial<EditRecipe>) => {
-    setRecipe((prev) => ({ ...prev, ...patch }));
+    setHistory((prevHistory) => {
+      const trimmedHistory = prevHistory.slice(0, historyIndex + 1);
+
+      const newRecipe = {
+        ...trimmedHistory[historyIndex],
+        ...patch,
+      };
+
+      const updatedHistory = [...trimmedHistory, newRecipe];
+
+      return updatedHistory.length > 20
+        ? updatedHistory.slice(-20)
+        : updatedHistory;
+    });
+
+    setHistoryIndex((prev) => Math.min(prev + 1, 19));
+  }, [historyIndex]);
+
+  const undo = useCallback(() => {
+    setHistoryIndex((prev) => Math.max(0, prev - 1));
   }, []);
 
+  const redo = useCallback(() => {
+    setHistoryIndex((prev) => Math.min(history.length - 1, prev + 1));
+  }, [history.length]);
+
   const handleFileSelect = useCallback(async (selectedFile: File) => {
     setFile(selectedFile);
     setResult(null);
     setStatus("idle");
     setError(null);
-    setRecipe((prev) => ({ ...prev, trimStart: 0, trimEnd: null }));
+
+    setHistory([
+      {
+        ...DEFAULT_RECIPE,
+        trimStart: 0,
+        trimEnd: null,
+      },
+    ]);
+
+    setHistoryIndex(0);
 
     const dur = await getVideoDuration(selectedFile);
     setDuration(dur);
@@ -60,6 +100,7 @@ export function useVideoEditor() {
       setStatus("exporting");
 
       const exportResult = await exportVideo(ffmpeg, file, recipe, setProgress);
+
       setResult(exportResult);
       setStatus("done");
     } catch (err) {
@@ -75,6 +116,7 @@ export function useVideoEditor() {
     } else {
       document.title = DEFAULT_TITLE;
     }
+
     return () => {
       document.title = DEFAULT_TITLE;
     };
@@ -82,13 +124,34 @@ export function useVideoEditor() {
 
   useEffect(() => {
     const handleKeydown = (e: KeyboardEvent) => {
+      const isModifier = e.ctrlKey || e.metaKey;
+
       if (
-        (e.ctrlKey || e.metaKey) &&
+        isModifier &&
         e.key === "Enter" &&
         file &&
         status === "idle"
       ) {
+        e.preventDefault();
         handleExport();
+        return;
+      }
+
+      if (isModifier && e.key.toLowerCase() === "z" && !e.shiftKey) {
+        e.preventDefault();
+        undo();
+        return;
+      }
+
+      if (
+        isModifier &&
+        (
+          (e.key.toLowerCase() === "z" && e.shiftKey) ||
+          e.key.toLowerCase() === "y"
+        )
+      ) {
+        e.preventDefault();
+        redo();
       }
     };
 
@@ -97,11 +160,13 @@ export function useVideoEditor() {
     return () => {
       document.removeEventListener("keydown", handleKeydown);
     };
-  }, [file, status, handleExport]);
+  }, [file, status, handleExport, undo, redo]);
+
   const reset = useCallback(() => {
     setFile(null);
     setDuration(0);
-    setRecipe(DEFAULT_RECIPE);
+    setHistory([DEFAULT_RECIPE]);
+    setHistoryIndex(0);
     setStatus("idle");
     setProgress(0);
     setResult(null);
@@ -117,8 +182,12 @@ export function useVideoEditor() {
     result,
     error,
     updateRecipe,
+    undo,
+    redo,
+    canUndo: historyIndex > 0,
+    canRedo: historyIndex < history.length - 1,
     handleFileSelect,
     handleExport,
     reset,
   };
-}
+}
\ No newline at end of file

From e9a40c87984b05855cb8d20f621429867ffc7f4c Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Sat, 16 May 2026 13:29:01 +0530
Subject: [PATCH 02/73] getting prev merge

---
 src/hooks/useVideoEditor.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index c517ee98..5e636d4c 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -298,8 +298,6 @@ export function useVideoEditor() {
     canRedo: historyIndex < history.length - 1,
     handleFileSelect,
     handleExport,
-    cancelExport,
     reset,
-    resetSettings,
   };
 }
\ No newline at end of file

From 58d2928ee547be434f0020b858d89c7b4135c8b3 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Fri, 15 May 2026 03:01:09 +0530
Subject: [PATCH 03/73] Add undo/redo support for export settings

---
 src/components/VideoEditor.tsx | 52 ++++++++++++++++++--
 src/hooks/useVideoEditor.ts    | 87 ++++++++++++++++++++++++++++++----
 2 files changed, 126 insertions(+), 13 deletions(-)

diff --git a/src/components/VideoEditor.tsx b/src/components/VideoEditor.tsx
index d9650b54..d47bb787 100644
--- a/src/components/VideoEditor.tsx
+++ b/src/components/VideoEditor.tsx
@@ -44,10 +44,24 @@ function Section({ icon, title, children, delay = 0 }: SectionProps) {
 
 export default function VideoEditor() {
   const {
-    file, duration, recipe, status, progress,
-    result, error, updateRecipe,
-    handleFileSelect, handleExport, cancelExport, reset, resetSettings,
-  } = useVideoEditor();
+  file,
+  duration,
+  recipe,
+  status,
+  progress,
+  result,
+  error,
+  updateRecipe,
+  undo,
+  redo,
+  canUndo,
+  canRedo,
+  handleFileSelect,
+  handleExport,
+  cancelExport,
+  reset,
+  resetSettings,
+} = useVideoEditor();
 
   
   const isProcessing = status === "loading-engine" || status === "exporting";
@@ -269,7 +283,37 @@ export default function VideoEditor() {
                 </button>
               </div>
             </div>
+            <div className="flex gap-3">
+              <button
+                type="button"
+                onClick={undo}
+                disabled={!canUndo || isProcessing}
+                className={cn(
+                  "flex-1 py-3 rounded-xl border transition-all duration-200",
+                  "font-heading text-xs uppercase tracking-widest",
+                  canUndo && !isProcessing
+                    ? "border-[var(--border)] bg-[var(--surface)] hover:border-film-500 hover:text-film-600"
+                    : "border-[var(--border)] text-[var(--muted)] cursor-not-allowed opacity-50"
+                )}
+              >
+                Undo
+              </button>
 
+              <button
+                type="button"
+                onClick={redo}
+                disabled={!canRedo || isProcessing}
+                className={cn(
+                  "flex-1 py-3 rounded-xl border transition-all duration-200",
+                  "font-heading text-xs uppercase tracking-widest",
+                  canRedo && !isProcessing
+                    ? "border-[var(--border)] bg-[var(--surface)] hover:border-film-500 hover:text-film-600"
+                    : "border-[var(--border)] text-[var(--muted)] cursor-not-allowed opacity-50"
+                )}
+              >
+                Redo
+              </button>
+            </div>
             <button
               type="button"
               onClick={handleExport}
diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index b8a5bf82..eafde711 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -12,11 +12,14 @@ function getVideoDuration(file: File): Promise<number> {
     const video = document.createElement("video");
     video.preload = "metadata";
     const url = URL.createObjectURL(file);
+
     video.src = url;
+
     video.onloadedmetadata = () => {
       URL.revokeObjectURL(url);
       resolve(isFinite(video.duration) ? video.duration : 0);
     };
+
     video.onerror = () => {
       URL.revokeObjectURL(url);
       reject(new Error("Failed to load video metadata. The file may be corrupt or simply not a video."));
@@ -52,7 +55,10 @@ function verifyMagicBytes(file: File): Promise<boolean> {
 export function useVideoEditor() {
   const [file, setFile] = useState<File | null>(null);
   const [duration, setDuration] = useState<number>(0);
-  const [recipe, setRecipe] = useState<EditRecipe>(DEFAULT_RECIPE);
+
+  const [history, setHistory] = useState<EditRecipe[]>([DEFAULT_RECIPE]);
+  const [historyIndex, setHistoryIndex] = useState(0);
+
   const [status, setStatus] = useState<ExportStatus>("idle");
   const [progress, setProgress] = useState(0);
   const [result, setResult] = useState<ExportResult | null>(null);
@@ -60,16 +66,51 @@ export function useVideoEditor() {
   const exportAbortControllerRef = useRef<AbortController | null>(null);
   const exportCancelledRef = useRef(false);
 
+  const recipe = history[historyIndex];
+
   const updateRecipe = useCallback((patch: Partial<EditRecipe>) => {
-    setRecipe((prev) => ({ ...prev, ...patch }));
+    setHistory((prevHistory) => {
+      const trimmedHistory = prevHistory.slice(0, historyIndex + 1);
+
+      const newRecipe = {
+        ...trimmedHistory[historyIndex],
+        ...patch,
+      };
+
+      const updatedHistory = [...trimmedHistory, newRecipe];
+
+      return updatedHistory.length > 20
+        ? updatedHistory.slice(-20)
+        : updatedHistory;
+    });
+
+    setHistoryIndex((prev) => Math.min(prev + 1, 19));
+  }, [historyIndex]);
+
+  const undo = useCallback(() => {
+    setHistoryIndex((prev) => Math.max(0, prev - 1));
   }, []);
 
+  const redo = useCallback(() => {
+    setHistoryIndex((prev) => Math.min(history.length - 1, prev + 1));
+  }, [history.length]);
+
   const handleFileSelect = useCallback(async (selectedFile: File) => {
     setResult(null);
     setStatus("idle");
     setError(null);
     setFile(null);
 
+    setHistory([
+      {
+        ...DEFAULT_RECIPE,
+        trimStart: 0,
+        trimEnd: null,
+      },
+    ]);
+
+    setHistoryIndex(0);
+
     // LAYER 1: Extension check
     const validExtensions = ['.mp4', '.mov', '.avi', '.webm', '.mkv'];
     const name = selectedFile.name.toLowerCase();
@@ -99,8 +140,9 @@ export function useVideoEditor() {
       const dur = await getVideoDuration(selectedFile);
       setDuration(dur);
       setFile(selectedFile);
-      setRecipe((prev) => ({ ...prev, trimStart: 0, trimEnd: null }));
-    } catch (err) {
+      
+      
+    }catch(err){
       setError(`Layer 4 Validation Failed: ${err instanceof Error ? err.message : "Unknown error"}`);
       setStatus("error");
     }
@@ -158,6 +200,7 @@ export function useVideoEditor() {
     } else {
       document.title = DEFAULT_TITLE;
     }
+
     return () => {
       document.title = DEFAULT_TITLE;
     };
@@ -165,13 +208,34 @@ export function useVideoEditor() {
 
   useEffect(() => {
     const handleKeydown = (e: KeyboardEvent) => {
+      const isModifier = e.ctrlKey || e.metaKey;
+
       if (
-        (e.ctrlKey || e.metaKey) &&
+        isModifier &&
         e.key === "Enter" &&
         file &&
         status === "idle"
       ) {
+        e.preventDefault();
         handleExport();
+        return;
+      }
+
+      if (isModifier && e.key.toLowerCase() === "z" && !e.shiftKey) {
+        e.preventDefault();
+        undo();
+        return;
+      }
+
+      if (
+        isModifier &&
+        (
+          (e.key.toLowerCase() === "z" && e.shiftKey) ||
+          e.key.toLowerCase() === "y"
+        )
+      ) {
+        e.preventDefault();
+        redo();
       }
     };
 
@@ -180,7 +244,7 @@ export function useVideoEditor() {
     return () => {
       document.removeEventListener("keydown", handleKeydown);
     };
-  }, [file, status, handleExport]);
+  }, [file, status, handleExport,undo, redo]);
 
   const cancelExport = useCallback(() => {
     exportCancelledRef.current = true;
@@ -193,13 +257,14 @@ export function useVideoEditor() {
   }, []);
 
   const resetSettings = useCallback(() => {
-    setRecipe(DEFAULT_RECIPE);
+    updateRecipe(DEFAULT_RECIPE);
   }, []);
 
   const reset = useCallback(() => {
     setFile(null);
     setDuration(0);
-    setRecipe(DEFAULT_RECIPE);
+    setHistory([DEFAULT_RECIPE]);
+    setHistoryIndex(0);
     setStatus("idle");
     setProgress(0);
     setResult(null);
@@ -230,10 +295,14 @@ export function useVideoEditor() {
     result,
     error,
     updateRecipe,
+    undo,
+    redo,
+    canUndo: historyIndex > 0,
+    canRedo: historyIndex < history.length - 1,
     handleFileSelect,
     handleExport,
     cancelExport,
     reset,
     resetSettings,
   };
-}
+}
\ No newline at end of file

From 6bdc15bdcc07787fd04f21a3510c32dce4f273b8 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Sat, 16 May 2026 13:29:01 +0530
Subject: [PATCH 04/73] getting prev merge

---
 src/hooks/useVideoEditor.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index eafde711..8c087e93 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -301,8 +301,6 @@ export function useVideoEditor() {
     canRedo: historyIndex < history.length - 1,
     handleFileSelect,
     handleExport,
-    cancelExport,
     reset,
-    resetSettings,
   };
 }
\ No newline at end of file

From e104115bc7c984c7d443ae5f78d76cd7189955ee Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Sat, 16 May 2026 13:53:45 +0530
Subject: [PATCH 05/73] staged changes

---
 src/components/VideoEditor.tsx | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/components/VideoEditor.tsx b/src/components/VideoEditor.tsx
index d47bb787..19fe1361 100644
--- a/src/components/VideoEditor.tsx
+++ b/src/components/VideoEditor.tsx
@@ -58,9 +58,7 @@ export default function VideoEditor() {
   canRedo,
   handleFileSelect,
   handleExport,
-  cancelExport,
   reset,
-  resetSettings,
 } = useVideoEditor();
 
   
@@ -68,7 +66,7 @@ export default function VideoEditor() {
 
   return (
     <div className="min-h-screen relative flex flex-col" style={{ background: "var(--bg)" }}>
-      <ExportOverlay status={status} progress={progress} onCancel={cancelExport} />
+      <ExportOverlay status={status} progress={progress} />
 
       <div className="max-w-6xl mx-auto px-4 py-8 pb-6 flex-1 w-full">
 
@@ -273,15 +271,6 @@ export default function VideoEditor() {
                 <FramingControl recipe={recipe} onChange={updateRecipe} />
               </Section>
 
-              <div className="pt-2 flex justify-end">
-                <button
-                  type="button"
-                  onClick={resetSettings}
-                  className="text-[9px] font-heading font-bold uppercase tracking-widest text-[var(--muted)] hover:text-film-600 transition-all opacity-60 hover:opacity-100"
-                >
-                  Reset all settings
-                </button>
-              </div>
             </div>
             <div className="flex gap-3">
               <button

From 36a75caa92f40a74073481f59941396715e41bdc Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Fri, 15 May 2026 03:01:09 +0530
Subject: [PATCH 06/73] Add undo/redo support for export settings

---
 src/components/VideoEditor.tsx | 52 +++++++++++++++++++--
 src/hooks/useVideoEditor.ts    | 85 ++++++++++++++++++++++++++++++----
 2 files changed, 124 insertions(+), 13 deletions(-)

diff --git a/src/components/VideoEditor.tsx b/src/components/VideoEditor.tsx
index d9650b54..d47bb787 100644
--- a/src/components/VideoEditor.tsx
+++ b/src/components/VideoEditor.tsx
@@ -44,10 +44,24 @@ function Section({ icon, title, children, delay = 0 }: SectionProps) {
 
 export default function VideoEditor() {
   const {
-    file, duration, recipe, status, progress,
-    result, error, updateRecipe,
-    handleFileSelect, handleExport, cancelExport, reset, resetSettings,
-  } = useVideoEditor();
+  file,
+  duration,
+  recipe,
+  status,
+  progress,
+  result,
+  error,
+  updateRecipe,
+  undo,
+  redo,
+  canUndo,
+  canRedo,
+  handleFileSelect,
+  handleExport,
+  cancelExport,
+  reset,
+  resetSettings,
+} = useVideoEditor();
 
   
   const isProcessing = status === "loading-engine" || status === "exporting";
@@ -269,7 +283,37 @@ export default function VideoEditor() {
                 </button>
               </div>
             </div>
+            <div className="flex gap-3">
+              <button
+                type="button"
+                onClick={undo}
+                disabled={!canUndo || isProcessing}
+                className={cn(
+                  "flex-1 py-3 rounded-xl border transition-all duration-200",
+                  "font-heading text-xs uppercase tracking-widest",
+                  canUndo && !isProcessing
+                    ? "border-[var(--border)] bg-[var(--surface)] hover:border-film-500 hover:text-film-600"
+                    : "border-[var(--border)] text-[var(--muted)] cursor-not-allowed opacity-50"
+                )}
+              >
+                Undo
+              </button>
 
+              <button
+                type="button"
+                onClick={redo}
+                disabled={!canRedo || isProcessing}
+                className={cn(
+                  "flex-1 py-3 rounded-xl border transition-all duration-200",
+                  "font-heading text-xs uppercase tracking-widest",
+                  canRedo && !isProcessing
+                    ? "border-[var(--border)] bg-[var(--surface)] hover:border-film-500 hover:text-film-600"
+                    : "border-[var(--border)] text-[var(--muted)] cursor-not-allowed opacity-50"
+                )}
+              >
+                Redo
+              </button>
+            </div>
             <button
               type="button"
               onClick={handleExport}
diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index 04f84093..6b372951 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -20,6 +20,7 @@ export function extractMetadata(file: File): Promise<{ width: number; height: nu
       });
       URL.revokeObjectURL(url);
     };
+
     video.onerror = () => {
       URL.revokeObjectURL(url);
       reject(new Error('Failed to load video metadata'));
@@ -56,7 +57,10 @@ function verifyMagicBytes(file: File): Promise<boolean> {
 export function useVideoEditor() {
   const [file, setFile] = useState<File | null>(null);
   const [duration, setDuration] = useState<number>(0);
-  const [recipe, setRecipe] = useState<EditRecipe>(DEFAULT_RECIPE);
+
+  const [history, setHistory] = useState<EditRecipe[]>([DEFAULT_RECIPE]);
+  const [historyIndex, setHistoryIndex] = useState(0);
+
   const [status, setStatus] = useState<ExportStatus>("idle");
   const [progress, setProgress] = useState(0);
   const [result, setResult] = useState<ExportResult | null>(null);
@@ -64,16 +68,51 @@ export function useVideoEditor() {
   const exportAbortControllerRef = useRef<AbortController | null>(null);
   const exportCancelledRef = useRef(false);
 
+  const recipe = history[historyIndex];
+
   const updateRecipe = useCallback((patch: Partial<EditRecipe>) => {
-    setRecipe((prev) => ({ ...prev, ...patch }));
+    setHistory((prevHistory) => {
+      const trimmedHistory = prevHistory.slice(0, historyIndex + 1);
+
+      const newRecipe = {
+        ...trimmedHistory[historyIndex],
+        ...patch,
+      };
+
+      const updatedHistory = [...trimmedHistory, newRecipe];
+
+      return updatedHistory.length > 20
+        ? updatedHistory.slice(-20)
+        : updatedHistory;
+    });
+
+    setHistoryIndex((prev) => Math.min(prev + 1, 19));
+  }, [historyIndex]);
+
+  const undo = useCallback(() => {
+    setHistoryIndex((prev) => Math.max(0, prev - 1));
   }, []);
 
+  const redo = useCallback(() => {
+    setHistoryIndex((prev) => Math.min(history.length - 1, prev + 1));
+  }, [history.length]);
+
   const handleFileSelect = useCallback(async (selectedFile: File) => {
     setResult(null);
     setStatus("idle");
     setError(null);
     setFile(null);
 
+    setHistory([
+      {
+        ...DEFAULT_RECIPE,
+        trimStart: 0,
+        trimEnd: null,
+      },
+    ]);
+
+    setHistoryIndex(0);
+
     // LAYER 1: Extension check
     const validExtensions = ['.mp4', '.mov', '.avi', '.webm', '.mkv'];
     const name = selectedFile.name.toLowerCase();
@@ -103,8 +142,9 @@ export function useVideoEditor() {
       const { duration: dur } = await extractMetadata(selectedFile);
       setDuration(dur);
       setFile(selectedFile);
-      setRecipe((prev) => ({ ...prev, trimStart: 0, trimEnd: null }));
-    } catch (err) {
+      
+      
+    }catch(err){
       setError(`Layer 4 Validation Failed: ${err instanceof Error ? err.message : "Unknown error"}`);
       setStatus("error");
     }
@@ -162,6 +202,7 @@ export function useVideoEditor() {
     } else {
       document.title = DEFAULT_TITLE;
     }
+
     return () => {
       document.title = DEFAULT_TITLE;
     };
@@ -169,13 +210,34 @@ export function useVideoEditor() {
 
   useEffect(() => {
     const handleKeydown = (e: KeyboardEvent) => {
+      const isModifier = e.ctrlKey || e.metaKey;
+
       if (
-        (e.ctrlKey || e.metaKey) &&
+        isModifier &&
         e.key === "Enter" &&
         file &&
         status === "idle"
       ) {
+        e.preventDefault();
         handleExport();
+        return;
+      }
+
+      if (isModifier && e.key.toLowerCase() === "z" && !e.shiftKey) {
+        e.preventDefault();
+        undo();
+        return;
+      }
+
+      if (
+        isModifier &&
+        (
+          (e.key.toLowerCase() === "z" && e.shiftKey) ||
+          e.key.toLowerCase() === "y"
+        )
+      ) {
+        e.preventDefault();
+        redo();
       }
     };
 
@@ -184,7 +246,7 @@ export function useVideoEditor() {
     return () => {
       document.removeEventListener("keydown", handleKeydown);
     };
-  }, [file, status, handleExport]);
+  }, [file, status, handleExport,undo, redo]);
 
   const cancelExport = useCallback(() => {
     exportCancelledRef.current = true;
@@ -197,13 +259,14 @@ export function useVideoEditor() {
   }, []);
 
   const resetSettings = useCallback(() => {
-    setRecipe(DEFAULT_RECIPE);
+    updateRecipe(DEFAULT_RECIPE);
   }, []);
 
   const reset = useCallback(() => {
     setFile(null);
     setDuration(0);
-    setRecipe(DEFAULT_RECIPE);
+    setHistory([DEFAULT_RECIPE]);
+    setHistoryIndex(0);
     setStatus("idle");
     setProgress(0);
     setResult(null);
@@ -234,10 +297,14 @@ export function useVideoEditor() {
     result,
     error,
     updateRecipe,
+    undo,
+    redo,
+    canUndo: historyIndex > 0,
+    canRedo: historyIndex < history.length - 1,
     handleFileSelect,
     handleExport,
     cancelExport,
     reset,
     resetSettings,
   };
-}
+}
\ No newline at end of file

From d99238f40644fca3d08a0dcc91982e12730064f0 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Sat, 16 May 2026 13:29:01 +0530
Subject: [PATCH 07/73] getting prev merge

---
 src/hooks/useVideoEditor.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index 6b372951..a33481de 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -303,8 +303,6 @@ export function useVideoEditor() {
     canRedo: historyIndex < history.length - 1,
     handleFileSelect,
     handleExport,
-    cancelExport,
     reset,
-    resetSettings,
   };
 }
\ No newline at end of file

From b3b2b2bf3f483d739ba8be1493505707d29ccb54 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Sat, 16 May 2026 13:53:45 +0530
Subject: [PATCH 08/73] staged changes

---
 src/components/VideoEditor.tsx | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/components/VideoEditor.tsx b/src/components/VideoEditor.tsx
index d47bb787..19fe1361 100644
--- a/src/components/VideoEditor.tsx
+++ b/src/components/VideoEditor.tsx
@@ -58,9 +58,7 @@ export default function VideoEditor() {
   canRedo,
   handleFileSelect,
   handleExport,
-  cancelExport,
   reset,
-  resetSettings,
 } = useVideoEditor();
 
   
@@ -68,7 +66,7 @@ export default function VideoEditor() {
 
   return (
     <div className="min-h-screen relative flex flex-col" style={{ background: "var(--bg)" }}>
-      <ExportOverlay status={status} progress={progress} onCancel={cancelExport} />
+      <ExportOverlay status={status} progress={progress} />
 
       <div className="max-w-6xl mx-auto px-4 py-8 pb-6 flex-1 w-full">
 
@@ -273,15 +271,6 @@ export default function VideoEditor() {
                 <FramingControl recipe={recipe} onChange={updateRecipe} />
               </Section>
 
-              <div className="pt-2 flex justify-end">
-                <button
-                  type="button"
-                  onClick={resetSettings}
-                  className="text-[9px] font-heading font-bold uppercase tracking-widest text-[var(--muted)] hover:text-film-600 transition-all opacity-60 hover:opacity-100"
-                >
-                  Reset all settings
-                </button>
-              </div>
             </div>
             <div className="flex gap-3">
               <button

From 92e03ce7e431cad9fdd4e88d759dd2eb68ad96bb Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Fri, 15 May 2026 03:01:09 +0530
Subject: [PATCH 09/73] Add undo/redo support for export settings

---
 src/hooks/useVideoEditor.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index a33481de..32f82862 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -70,6 +70,7 @@ export function useVideoEditor() {
 
   const recipe = history[historyIndex];
 
+
   const updateRecipe = useCallback((patch: Partial<EditRecipe>) => {
     setHistory((prevHistory) => {
       const trimmedHistory = prevHistory.slice(0, historyIndex + 1);
@@ -113,6 +114,16 @@ export function useVideoEditor() {
 
     setHistoryIndex(0);
 
+    setHistory([
+      {
+        ...DEFAULT_RECIPE,
+        trimStart: 0,
+        trimEnd: null,
+      },
+    ]);
+
+    setHistoryIndex(0);
+
     // LAYER 1: Extension check
     const validExtensions = ['.mp4', '.mov', '.avi', '.webm', '.mkv'];
     const name = selectedFile.name.toLowerCase();

From 2736f0ff6d7cbd5d334b111cf2cb8d1d8ab1b104 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Fri, 15 May 2026 03:01:09 +0530
Subject: [PATCH 10/73] Add undo/redo support for export settings

---
 src/components/VideoEditor.tsx | 52 +++++++++++++++++++--
 src/hooks/useVideoEditor.ts    | 85 ++++++++++++++++++++++++++++++----
 2 files changed, 124 insertions(+), 13 deletions(-)

diff --git a/src/components/VideoEditor.tsx b/src/components/VideoEditor.tsx
index 3452b723..1b806a31 100644
--- a/src/components/VideoEditor.tsx
+++ b/src/components/VideoEditor.tsx
@@ -45,10 +45,24 @@ function Section({ icon, title, children, delay = 0 }: SectionProps) {
 
 export default function VideoEditor() {
   const {
-    file, duration, recipe, status, progress,
-    result, error, updateRecipe,
-    handleFileSelect, handleExport, cancelExport, reset, resetSettings,
-  } = useVideoEditor();
+  file,
+  duration,
+  recipe,
+  status,
+  progress,
+  result,
+  error,
+  updateRecipe,
+  undo,
+  redo,
+  canUndo,
+  canRedo,
+  handleFileSelect,
+  handleExport,
+  cancelExport,
+  reset,
+  resetSettings,
+} = useVideoEditor();
 
   
   const isProcessing = status === "loading-engine" || status === "exporting";
@@ -273,7 +287,37 @@ export default function VideoEditor() {
                 </button>
               </div>
             </div>
+            <div className="flex gap-3">
+              <button
+                type="button"
+                onClick={undo}
+                disabled={!canUndo || isProcessing}
+                className={cn(
+                  "flex-1 py-3 rounded-xl border transition-all duration-200",
+                  "font-heading text-xs uppercase tracking-widest",
+                  canUndo && !isProcessing
+                    ? "border-[var(--border)] bg-[var(--surface)] hover:border-film-500 hover:text-film-600"
+                    : "border-[var(--border)] text-[var(--muted)] cursor-not-allowed opacity-50"
+                )}
+              >
+                Undo
+              </button>
 
+              <button
+                type="button"
+                onClick={redo}
+                disabled={!canRedo || isProcessing}
+                className={cn(
+                  "flex-1 py-3 rounded-xl border transition-all duration-200",
+                  "font-heading text-xs uppercase tracking-widest",
+                  canRedo && !isProcessing
+                    ? "border-[var(--border)] bg-[var(--surface)] hover:border-film-500 hover:text-film-600"
+                    : "border-[var(--border)] text-[var(--muted)] cursor-not-allowed opacity-50"
+                )}
+              >
+                Redo
+              </button>
+            </div>
             <button
               type="button"
               onClick={handleExport}
diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index a1f3f6b5..585e5029 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -20,6 +20,7 @@ export function extractMetadata(file: File): Promise<{ width: number; height: nu
       });
       URL.revokeObjectURL(url);
     };
+
     video.onerror = () => {
       URL.revokeObjectURL(url);
       reject(new Error('Failed to load video metadata'));
@@ -56,7 +57,10 @@ function verifyMagicBytes(file: File): Promise<boolean> {
 export function useVideoEditor() {
   const [file, setFile] = useState<File | null>(null);
   const [duration, setDuration] = useState<number>(0);
-  const [recipe, setRecipe] = useState<EditRecipe>(DEFAULT_RECIPE);
+
+  const [history, setHistory] = useState<EditRecipe[]>([DEFAULT_RECIPE]);
+  const [historyIndex, setHistoryIndex] = useState(0);
+
   const [status, setStatus] = useState<ExportStatus>("idle");
   const [progress, setProgress] = useState(0);
   const [result, setResult] = useState<ExportResult | null>(null);
@@ -64,16 +68,51 @@ export function useVideoEditor() {
   const exportAbortControllerRef = useRef<AbortController | null>(null);
   const exportCancelledRef = useRef(false);
 
+  const recipe = history[historyIndex];
+
   const updateRecipe = useCallback((patch: Partial<EditRecipe>) => {
-    setRecipe((prev) => ({ ...prev, ...patch }));
+    setHistory((prevHistory) => {
+      const trimmedHistory = prevHistory.slice(0, historyIndex + 1);
+
+      const newRecipe = {
+        ...trimmedHistory[historyIndex],
+        ...patch,
+      };
+
+      const updatedHistory = [...trimmedHistory, newRecipe];
+
+      return updatedHistory.length > 20
+        ? updatedHistory.slice(-20)
+        : updatedHistory;
+    });
+
+    setHistoryIndex((prev) => Math.min(prev + 1, 19));
+  }, [historyIndex]);
+
+  const undo = useCallback(() => {
+    setHistoryIndex((prev) => Math.max(0, prev - 1));
   }, []);
 
+  const redo = useCallback(() => {
+    setHistoryIndex((prev) => Math.min(history.length - 1, prev + 1));
+  }, [history.length]);
+
   const handleFileSelect = useCallback(async (selectedFile: File) => {
     setResult(null);
     setStatus("idle");
     setError(null);
     setFile(null);
 
+    setHistory([
+      {
+        ...DEFAULT_RECIPE,
+        trimStart: 0,
+        trimEnd: null,
+      },
+    ]);
+
+    setHistoryIndex(0);
+
     // LAYER 1: Extension check
     const validExtensions = ['.mp4', '.mov', '.avi', '.webm', '.mkv'];
     const name = selectedFile.name.toLowerCase();
@@ -103,8 +142,9 @@ export function useVideoEditor() {
       const { duration: dur } = await extractMetadata(selectedFile);
       setDuration(dur);
       setFile(selectedFile);
-      setRecipe((prev) => ({ ...prev, trimStart: 0, trimEnd: null }));
-    } catch (err) {
+      
+      
+    }catch(err){
       setError(`Layer 4 Validation Failed: ${err instanceof Error ? err.message : "Unknown error"}`);
       setStatus("error");
     }
@@ -166,6 +206,7 @@ export function useVideoEditor() {
     } else {
       document.title = DEFAULT_TITLE;
     }
+
     return () => {
       document.title = DEFAULT_TITLE;
     };
@@ -173,14 +214,35 @@ export function useVideoEditor() {
 
   useEffect(() => {
     const handleKeydown = (e: KeyboardEvent) => {
+      const isModifier = e.ctrlKey || e.metaKey;
+
       if (
-        (e.ctrlKey || e.metaKey) &&
+        isModifier &&
         e.key === "Enter" &&
         file &&
         status !== "loading-engine" &&
         status !== "exporting"
       ) {
+        e.preventDefault();
         handleExport();
+        return;
+      }
+
+      if (isModifier && e.key.toLowerCase() === "z" && !e.shiftKey) {
+        e.preventDefault();
+        undo();
+        return;
+      }
+
+      if (
+        isModifier &&
+        (
+          (e.key.toLowerCase() === "z" && e.shiftKey) ||
+          e.key.toLowerCase() === "y"
+        )
+      ) {
+        e.preventDefault();
+        redo();
       }
     };
 
@@ -189,7 +251,7 @@ export function useVideoEditor() {
     return () => {
       document.removeEventListener("keydown", handleKeydown);
     };
-  }, [file, status, handleExport]);
+  }, [file, status, handleExport,undo, redo]);
 
   const cancelExport = useCallback(() => {
     exportCancelledRef.current = true;
@@ -202,14 +264,15 @@ export function useVideoEditor() {
   }, []);
 
   const resetSettings = useCallback(() => {
-    setRecipe(DEFAULT_RECIPE);
+    updateRecipe(DEFAULT_RECIPE);
   }, []);
 
   const reset = useCallback(() => {
     if (result?.blobUrl) URL.revokeObjectURL(result.blobUrl);
     setFile(null);
     setDuration(0);
-    setRecipe(DEFAULT_RECIPE);
+    setHistory([DEFAULT_RECIPE]);
+    setHistoryIndex(0);
     setStatus("idle");
     setProgress(0);
     setResult(null);
@@ -240,10 +303,14 @@ export function useVideoEditor() {
     result,
     error,
     updateRecipe,
+    undo,
+    redo,
+    canUndo: historyIndex > 0,
+    canRedo: historyIndex < history.length - 1,
     handleFileSelect,
     handleExport,
     cancelExport,
     reset,
     resetSettings,
   };
-}
+}
\ No newline at end of file

From abf355f82e57da331a4317c01122b11682f69bcb Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Sat, 16 May 2026 13:29:01 +0530
Subject: [PATCH 11/73] getting prev merge

---
 src/hooks/useVideoEditor.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index 585e5029..ca4253f9 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -309,8 +309,6 @@ export function useVideoEditor() {
     canRedo: historyIndex < history.length - 1,
     handleFileSelect,
     handleExport,
-    cancelExport,
     reset,
-    resetSettings,
   };
 }
\ No newline at end of file

From 37aec1dac0b35b7eee554842a0b3b0133d9d9346 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Sat, 16 May 2026 13:53:45 +0530
Subject: [PATCH 12/73] staged changes

---
 src/components/VideoEditor.tsx | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/components/VideoEditor.tsx b/src/components/VideoEditor.tsx
index 1b806a31..21546fa1 100644
--- a/src/components/VideoEditor.tsx
+++ b/src/components/VideoEditor.tsx
@@ -59,9 +59,7 @@ export default function VideoEditor() {
   canRedo,
   handleFileSelect,
   handleExport,
-  cancelExport,
   reset,
-  resetSettings,
 } = useVideoEditor();
 
   
@@ -69,7 +67,7 @@ export default function VideoEditor() {
 
   return (
     <div className="min-h-screen relative flex flex-col" style={{ background: "var(--bg)" }}>
-      <ExportOverlay status={status} progress={progress} onCancel={cancelExport} />
+      <ExportOverlay status={status} progress={progress} />
 
       <div className="max-w-6xl mx-auto px-4 py-8 pb-6 flex-1 w-full">
 
@@ -277,15 +275,6 @@ export default function VideoEditor() {
                 <FramingControl recipe={recipe} onChange={updateRecipe} />
               </Section>
 
-              <div className="pt-2 flex justify-end">
-                <button
-                  type="button"
-                  onClick={resetSettings}
-                  className="text-[9px] font-heading font-bold uppercase tracking-widest text-[var(--muted)] hover:text-film-600 transition-all opacity-60 hover:opacity-100"
-                >
-                  Reset all settings
-                </button>
-              </div>
             </div>
             <div className="flex gap-3">
               <button

From c9e9e9bdc2948766eb1bdbb36fe0e0ea37505aaf Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Fri, 15 May 2026 03:01:09 +0530
Subject: [PATCH 13/73] Add undo/redo support for export settings

---
 src/hooks/useVideoEditor.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index ca4253f9..500a0a40 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -70,6 +70,7 @@ export function useVideoEditor() {
 
   const recipe = history[historyIndex];
 
+
   const updateRecipe = useCallback((patch: Partial<EditRecipe>) => {
     setHistory((prevHistory) => {
       const trimmedHistory = prevHistory.slice(0, historyIndex + 1);
@@ -113,6 +114,16 @@ export function useVideoEditor() {
 
     setHistoryIndex(0);
 
+    setHistory([
+      {
+        ...DEFAULT_RECIPE,
+        trimStart: 0,
+        trimEnd: null,
+      },
+    ]);
+
+    setHistoryIndex(0);
+
     // LAYER 1: Extension check
     const validExtensions = ['.mp4', '.mov', '.avi', '.webm', '.mkv'];
     const name = selectedFile.name.toLowerCase();

From 0e24944fc5a64a75b47c3db03872b1123f4cac1e Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Sat, 16 May 2026 17:21:43 +0530
Subject: [PATCH 14/73] readding cancleExport and restSetting

---
 src/components/VideoEditor.tsx | 2 ++
 src/hooks/useVideoEditor.ts    | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/VideoEditor.tsx b/src/components/VideoEditor.tsx
index 21546fa1..2931f547 100644
--- a/src/components/VideoEditor.tsx
+++ b/src/components/VideoEditor.tsx
@@ -59,7 +59,9 @@ export default function VideoEditor() {
   canRedo,
   handleFileSelect,
   handleExport,
+  cancelExport,
   reset,
+  resetSettings,
 } = useVideoEditor();
 
   
diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index 500a0a40..ffe26c9a 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -12,6 +12,9 @@ export function extractMetadata(file: File): Promise<{ width: number; height: nu
     const url = URL.createObjectURL(file);
     const video = document.createElement('video');
     video.preload = 'metadata';
+
+    video.src = url;
+
     video.onloadedmetadata = () => {
       resolve({
         width: video.videoWidth,
@@ -70,7 +73,6 @@ export function useVideoEditor() {
 
   const recipe = history[historyIndex];
 
-
   const updateRecipe = useCallback((patch: Partial<EditRecipe>) => {
     setHistory((prevHistory) => {
       const trimmedHistory = prevHistory.slice(0, historyIndex + 1);
@@ -321,5 +323,7 @@ export function useVideoEditor() {
     handleFileSelect,
     handleExport,
     reset,
+    cancelExport,
+    resetSettings
   };
 }
\ No newline at end of file

From 26aa6dd3a44cef8880e77ee8c8471dbfa27fb28e Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Sat, 16 May 2026 13:53:45 +0530
Subject: [PATCH 15/73] staged changes

---
 src/components/VideoEditor.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/VideoEditor.tsx b/src/components/VideoEditor.tsx
index 2931f547..21546fa1 100644
--- a/src/components/VideoEditor.tsx
+++ b/src/components/VideoEditor.tsx
@@ -59,9 +59,7 @@ export default function VideoEditor() {
   canRedo,
   handleFileSelect,
   handleExport,
-  cancelExport,
   reset,
-  resetSettings,
 } = useVideoEditor();
 
   

From 911e540dbd01a94ded9c3f0e9cf988458e831f17 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Fri, 15 May 2026 03:01:09 +0530
Subject: [PATCH 16/73] Add undo/redo support for export settings

---
 src/hooks/useVideoEditor.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index ffe26c9a..c7393aba 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -126,6 +126,16 @@ export function useVideoEditor() {
 
     setHistoryIndex(0);
 
+    setHistory([
+      {
+        ...DEFAULT_RECIPE,
+        trimStart: 0,
+        trimEnd: null,
+      },
+    ]);
+
+    setHistoryIndex(0);
+
     // LAYER 1: Extension check
     const validExtensions = ['.mp4', '.mov', '.avi', '.webm', '.mkv'];
     const name = selectedFile.name.toLowerCase();

From 032313ed132646573a8f0ccd99afd6f0c66845ad Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Fri, 15 May 2026 03:01:09 +0530
Subject: [PATCH 17/73] Add undo/redo support for export settings

---
 src/components/VideoEditor.tsx | 32 ++++++++++++-
 src/hooks/useVideoEditor.ts    | 85 ++++++++++++++++++++++++++++++----
 2 files changed, 107 insertions(+), 10 deletions(-)

diff --git a/src/components/VideoEditor.tsx b/src/components/VideoEditor.tsx
index 47dcc1d7..50796ed6 100644
--- a/src/components/VideoEditor.tsx
+++ b/src/components/VideoEditor.tsx
@@ -47,7 +47,7 @@ export default function VideoEditor() {
   const {
     file, duration, recipe, status, progress,
     result, error, updateRecipe,
-    handleFileSelect, handleExport, cancelExport, reset, resetSettings,
+    handleFileSelect, handleExport, cancelExport, reset, resetSettings,undo,redo,canUndo,canRedo,
   } = useVideoEditor();
   const [copied, setCopied] = useState(false);
 
@@ -292,7 +292,37 @@ export default function VideoEditor() {
                 </button>
               </div>
             </div>
+            <div className="flex gap-3">
+              <button
+                type="button"
+                onClick={undo}
+                disabled={!canUndo || isProcessing}
+                className={cn(
+                  "flex-1 py-3 rounded-xl border transition-all duration-200",
+                  "font-heading text-xs uppercase tracking-widest",
+                  canUndo && !isProcessing
+                    ? "border-[var(--border)] bg-[var(--surface)] hover:border-film-500 hover:text-film-600"
+                    : "border-[var(--border)] text-[var(--muted)] cursor-not-allowed opacity-50"
+                )}
+              >
+                Undo
+              </button>
 
+              <button
+                type="button"
+                onClick={redo}
+                disabled={!canRedo || isProcessing}
+                className={cn(
+                  "flex-1 py-3 rounded-xl border transition-all duration-200",
+                  "font-heading text-xs uppercase tracking-widest",
+                  canRedo && !isProcessing
+                    ? "border-[var(--border)] bg-[var(--surface)] hover:border-film-500 hover:text-film-600"
+                    : "border-[var(--border)] text-[var(--muted)] cursor-not-allowed opacity-50"
+                )}
+              >
+                Redo
+              </button>
+            </div>
             <button
               type="button"
               onClick={handleExport}
diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index 83eb11ff..3bbba1fe 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -20,6 +20,7 @@ export function extractMetadata(file: File): Promise<{ width: number; height: nu
       });
       URL.revokeObjectURL(url);
     };
+
     video.onerror = () => {
       URL.revokeObjectURL(url);
       reject(new Error('Failed to load video metadata'));
@@ -56,7 +57,10 @@ function verifyMagicBytes(file: File): Promise<boolean> {
 export function useVideoEditor() {
   const [file, setFile] = useState<File | null>(null);
   const [duration, setDuration] = useState<number>(0);
-  const [recipe, setRecipe] = useState<EditRecipe>(DEFAULT_RECIPE);
+
+  const [history, setHistory] = useState<EditRecipe[]>([DEFAULT_RECIPE]);
+  const [historyIndex, setHistoryIndex] = useState(0);
+
   const [status, setStatus] = useState<ExportStatus>("idle");
   const [progress, setProgress] = useState(0);
   const [result, setResult] = useState<ExportResult | null>(null);
@@ -64,16 +68,51 @@ export function useVideoEditor() {
   const exportAbortControllerRef = useRef<AbortController | null>(null);
   const exportCancelledRef = useRef(false);
 
+  const recipe = history[historyIndex];
+
   const updateRecipe = useCallback((patch: Partial<EditRecipe>) => {
-    setRecipe((prev) => ({ ...prev, ...patch }));
+    setHistory((prevHistory) => {
+      const trimmedHistory = prevHistory.slice(0, historyIndex + 1);
+
+      const newRecipe = {
+        ...trimmedHistory[historyIndex],
+        ...patch,
+      };
+
+      const updatedHistory = [...trimmedHistory, newRecipe];
+
+      return updatedHistory.length > 20
+        ? updatedHistory.slice(-20)
+        : updatedHistory;
+    });
+
+    setHistoryIndex((prev) => Math.min(prev + 1, 19));
+  }, [historyIndex]);
+
+  const undo = useCallback(() => {
+    setHistoryIndex((prev) => Math.max(0, prev - 1));
   }, []);
 
+  const redo = useCallback(() => {
+    setHistoryIndex((prev) => Math.min(history.length - 1, prev + 1));
+  }, [history.length]);
+
   const handleFileSelect = useCallback(async (selectedFile: File) => {
     setResult(null);
     setStatus("idle");
     setError(null);
     setFile(null);
 
+    setHistory([
+      {
+        ...DEFAULT_RECIPE,
+        trimStart: 0,
+        trimEnd: null,
+      },
+    ]);
+
+    setHistoryIndex(0);
+
     // LAYER 1: Extension check
     const validExtensions = ['.mp4', '.mov', '.avi', '.webm', '.mkv'];
     const filename = selectedFile.name.toLowerCase();
@@ -103,8 +142,9 @@ export function useVideoEditor() {
       const { duration: dur } = await extractMetadata(selectedFile);
       setDuration(dur);
       setFile(selectedFile);
-      setRecipe((prev) => ({ ...prev, trimStart: 0, trimEnd: null }));
-    } catch (err) {
+      
+      
+    }catch(err){
       setError(`Layer 4 Validation Failed: ${err instanceof Error ? err.message : "Unknown error"}`);
       setStatus("error");
     }
@@ -171,6 +211,7 @@ export function useVideoEditor() {
     } else {
       document.title = DEFAULT_TITLE;
     }
+
     return () => {
       document.title = DEFAULT_TITLE;
     };
@@ -178,14 +219,35 @@ export function useVideoEditor() {
 
   useEffect(() => {
     const handleKeydown = (e: KeyboardEvent) => {
+      const isModifier = e.ctrlKey || e.metaKey;
+
       if (
-        (e.ctrlKey || e.metaKey) &&
+        isModifier &&
         e.key === "Enter" &&
         file &&
         status !== "loading-engine" &&
         status !== "exporting"
       ) {
+        e.preventDefault();
         handleExport();
+        return;
+      }
+
+      if (isModifier && e.key.toLowerCase() === "z" && !e.shiftKey) {
+        e.preventDefault();
+        undo();
+        return;
+      }
+
+      if (
+        isModifier &&
+        (
+          (e.key.toLowerCase() === "z" && e.shiftKey) ||
+          e.key.toLowerCase() === "y"
+        )
+      ) {
+        e.preventDefault();
+        redo();
       }
     };
 
@@ -194,7 +256,7 @@ export function useVideoEditor() {
     return () => {
       document.removeEventListener("keydown", handleKeydown);
     };
-  }, [file, status, handleExport]);
+  }, [file, status, handleExport,undo, redo]);
 
   const cancelExport = useCallback(() => {
     exportCancelledRef.current = true;
@@ -207,14 +269,15 @@ export function useVideoEditor() {
   }, []);
 
   const resetSettings = useCallback(() => {
-    setRecipe(DEFAULT_RECIPE);
+    updateRecipe(DEFAULT_RECIPE);
   }, []);
 
   const reset = useCallback(() => {
     if (result?.blobUrl) URL.revokeObjectURL(result.blobUrl);
     setFile(null);
     setDuration(0);
-    setRecipe(DEFAULT_RECIPE);
+    setHistory([DEFAULT_RECIPE]);
+    setHistoryIndex(0);
     setStatus("idle");
     setProgress(0);
     setResult(null);
@@ -245,10 +308,14 @@ export function useVideoEditor() {
     result,
     error,
     updateRecipe,
+    undo,
+    redo,
+    canUndo: historyIndex > 0,
+    canRedo: historyIndex < history.length - 1,
     handleFileSelect,
     handleExport,
     cancelExport,
     reset,
     resetSettings,
   };
-}
+}
\ No newline at end of file

From c5307565fb4287bdd7b2c8de3be6f59eb4386df3 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Sat, 16 May 2026 13:29:01 +0530
Subject: [PATCH 18/73] getting prev merge

---
 src/hooks/useVideoEditor.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index 3bbba1fe..9aee26c9 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -314,8 +314,6 @@ export function useVideoEditor() {
     canRedo: historyIndex < history.length - 1,
     handleFileSelect,
     handleExport,
-    cancelExport,
     reset,
-    resetSettings,
   };
 }
\ No newline at end of file

From c2d455e0da2e769455c4e54aadc7aab96d48e852 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Sun, 17 May 2026 00:55:24 +0530
Subject: [PATCH 19/73] fix merge

---
 src/hooks/useVideoEditor.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index 9aee26c9..9356a47c 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -315,5 +315,7 @@ export function useVideoEditor() {
     handleFileSelect,
     handleExport,
     reset,
+    cancelExport,
+    resetSettings,
   };
 }
\ No newline at end of file

From 879d356abab7584c75f6e88539ba40be6b6cd7e9 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Fri, 15 May 2026 03:01:09 +0530
Subject: [PATCH 20/73] Add undo/redo support for export settings

---
 src/hooks/useVideoEditor.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index 9356a47c..a37128e4 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -70,6 +70,7 @@ export function useVideoEditor() {
 
   const recipe = history[historyIndex];
 
+
   const updateRecipe = useCallback((patch: Partial<EditRecipe>) => {
     setHistory((prevHistory) => {
       const trimmedHistory = prevHistory.slice(0, historyIndex + 1);
@@ -113,6 +114,16 @@ export function useVideoEditor() {
 
     setHistoryIndex(0);
 
+    setHistory([
+      {
+        ...DEFAULT_RECIPE,
+        trimStart: 0,
+        trimEnd: null,
+      },
+    ]);
+
+    setHistoryIndex(0);
+
     // LAYER 1: Extension check
     const validExtensions = ['.mp4', '.mov', '.avi', '.webm', '.mkv'];
     const filename = selectedFile.name.toLowerCase();

From a5d1fab263a225a32856b1234bc9c5e79ba78985 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Sat, 16 May 2026 17:21:43 +0530
Subject: [PATCH 21/73] readding cancleExport and restSetting

---
 src/components/VideoEditor.tsx | 23 ++++++++++++++++++-----
 src/hooks/useVideoEditor.ts    |  6 ++++--
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/components/VideoEditor.tsx b/src/components/VideoEditor.tsx
index 50796ed6..0d500fb3 100644
--- a/src/components/VideoEditor.tsx
+++ b/src/components/VideoEditor.tsx
@@ -45,11 +45,24 @@ function Section({ icon, title, children, delay = 0 }: SectionProps) {
 
 export default function VideoEditor() {
   const {
-    file, duration, recipe, status, progress,
-    result, error, updateRecipe,
-    handleFileSelect, handleExport, cancelExport, reset, resetSettings,undo,redo,canUndo,canRedo,
-  } = useVideoEditor();
-  const [copied, setCopied] = useState(false);
+  file,
+  duration,
+  recipe,
+  status,
+  progress,
+  result,
+  error,
+  updateRecipe,
+  undo,
+  redo,
+  canUndo,
+  canRedo,
+  handleFileSelect,
+  handleExport,
+  cancelExport,
+  reset,
+  resetSettings,
+} = useVideoEditor();
 
   
   const isProcessing = status === "loading-engine" || status === "exporting";
diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index a37128e4..52c87700 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -12,6 +12,9 @@ export function extractMetadata(file: File): Promise<{ width: number; height: nu
     const url = URL.createObjectURL(file);
     const video = document.createElement('video');
     video.preload = 'metadata';
+
+    video.src = url;
+
     video.onloadedmetadata = () => {
       resolve({
         width: video.videoWidth,
@@ -70,7 +73,6 @@ export function useVideoEditor() {
 
   const recipe = history[historyIndex];
 
-
   const updateRecipe = useCallback((patch: Partial<EditRecipe>) => {
     setHistory((prevHistory) => {
       const trimmedHistory = prevHistory.slice(0, historyIndex + 1);
@@ -327,6 +329,6 @@ export function useVideoEditor() {
     handleExport,
     reset,
     cancelExport,
-    resetSettings,
+    resetSettings
   };
 }
\ No newline at end of file

From 255d5019aef2086c4f84634041a7f9ee6955d7c1 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Sat, 16 May 2026 13:53:45 +0530
Subject: [PATCH 22/73] staged changes

---
 src/components/VideoEditor.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/VideoEditor.tsx b/src/components/VideoEditor.tsx
index 0d500fb3..a935802d 100644
--- a/src/components/VideoEditor.tsx
+++ b/src/components/VideoEditor.tsx
@@ -59,9 +59,7 @@ export default function VideoEditor() {
   canRedo,
   handleFileSelect,
   handleExport,
-  cancelExport,
   reset,
-  resetSettings,
 } = useVideoEditor();
 
   

From bc34e51e2e559b3afb4d8283eab4a25233f479f3 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Fri, 15 May 2026 03:01:09 +0530
Subject: [PATCH 23/73] Add undo/redo support for export settings

---
 src/hooks/useVideoEditor.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index 52c87700..4dd81865 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -126,6 +126,16 @@ export function useVideoEditor() {
 
     setHistoryIndex(0);
 
+    setHistory([
+      {
+        ...DEFAULT_RECIPE,
+        trimStart: 0,
+        trimEnd: null,
+      },
+    ]);
+
+    setHistoryIndex(0);
+
     // LAYER 1: Extension check
     const validExtensions = ['.mp4', '.mov', '.avi', '.webm', '.mkv'];
     const filename = selectedFile.name.toLowerCase();

From aa8a9b42ea29005a10da83696357c66717a3abe1 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Fri, 15 May 2026 03:01:09 +0530
Subject: [PATCH 24/73] Add undo/redo support for export settings

---
 src/components/VideoEditor.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/VideoEditor.tsx b/src/components/VideoEditor.tsx
index a935802d..0d500fb3 100644
--- a/src/components/VideoEditor.tsx
+++ b/src/components/VideoEditor.tsx
@@ -59,7 +59,9 @@ export default function VideoEditor() {
   canRedo,
   handleFileSelect,
   handleExport,
+  cancelExport,
   reset,
+  resetSettings,
 } = useVideoEditor();
 
   

From 453f0670a37aecba245baf565966e04ad699d032 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Sat, 16 May 2026 13:53:45 +0530
Subject: [PATCH 25/73] staged changes

---
 src/components/VideoEditor.tsx | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/components/VideoEditor.tsx b/src/components/VideoEditor.tsx
index 0d500fb3..99f5f1bb 100644
--- a/src/components/VideoEditor.tsx
+++ b/src/components/VideoEditor.tsx
@@ -59,9 +59,7 @@ export default function VideoEditor() {
   canRedo,
   handleFileSelect,
   handleExport,
-  cancelExport,
   reset,
-  resetSettings,
 } = useVideoEditor();
 
   
@@ -69,7 +67,7 @@ export default function VideoEditor() {
 
   return (
     <div className="min-h-screen relative flex flex-col" style={{ background: "var(--bg)" }}>
-      <ExportOverlay status={status} progress={progress} onCancel={cancelExport} />
+      <ExportOverlay status={status} progress={progress} />
 
       <div aria-live="polite" aria-atomic="true" className="sr-only">
         {status === 'exporting' && `Exporting video: ${progress}%`}
@@ -295,15 +293,6 @@ export default function VideoEditor() {
                 <FramingControl recipe={recipe} onChange={updateRecipe} />
               </Section>
 
-              <div className="pt-2 flex justify-end">
-                <button
-                  type="button"
-                  onClick={resetSettings}
-                  className="text-[9px] font-heading font-bold uppercase tracking-widest text-[var(--muted)] hover:text-film-600 transition-all opacity-60 hover:opacity-100"
-                >
-                  Reset all settings
-                </button>
-              </div>
             </div>
             <div className="flex gap-3">
               <button

From 9dc88ae6e5505070d648527013c8b2978ba756e9 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Fri, 15 May 2026 03:01:09 +0530
Subject: [PATCH 26/73] Add undo/redo support for export settings

---
 src/hooks/useVideoEditor.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index 4dd81865..0e8cda13 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -73,6 +73,7 @@ export function useVideoEditor() {
 
   const recipe = history[historyIndex];
 
+
   const updateRecipe = useCallback((patch: Partial<EditRecipe>) => {
     setHistory((prevHistory) => {
       const trimmedHistory = prevHistory.slice(0, historyIndex + 1);

From f7aa71c3803f6d48be3e63c2ea7258df1fe84722 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Fri, 15 May 2026 03:01:09 +0530
Subject: [PATCH 27/73] Add undo/redo support for export settings

---
 src/components/VideoEditor.tsx | 2 ++
 src/hooks/useVideoEditor.ts    | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/VideoEditor.tsx b/src/components/VideoEditor.tsx
index 99f5f1bb..b6e694ad 100644
--- a/src/components/VideoEditor.tsx
+++ b/src/components/VideoEditor.tsx
@@ -59,7 +59,9 @@ export default function VideoEditor() {
   canRedo,
   handleFileSelect,
   handleExport,
+  cancelExport,
   reset,
+  resetSettings,
 } = useVideoEditor();
 
   
diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index 0e8cda13..4dd81865 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -73,7 +73,6 @@ export function useVideoEditor() {
 
   const recipe = history[historyIndex];
 
-
   const updateRecipe = useCallback((patch: Partial<EditRecipe>) => {
     setHistory((prevHistory) => {
       const trimmedHistory = prevHistory.slice(0, historyIndex + 1);

From 54c7cef6a4810813d2bc581bc04adaa8f53c4fa5 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Sat, 16 May 2026 13:53:45 +0530
Subject: [PATCH 28/73] staged changes

---
 src/components/VideoEditor.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/VideoEditor.tsx b/src/components/VideoEditor.tsx
index b6e694ad..99f5f1bb 100644
--- a/src/components/VideoEditor.tsx
+++ b/src/components/VideoEditor.tsx
@@ -59,9 +59,7 @@ export default function VideoEditor() {
   canRedo,
   handleFileSelect,
   handleExport,
-  cancelExport,
   reset,
-  resetSettings,
 } = useVideoEditor();
 
   

From 57b3e49837c9a342ba993c40aabe944903da36cf Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Fri, 15 May 2026 03:01:09 +0530
Subject: [PATCH 29/73] Add undo/redo support for export settings

---
 src/hooks/useVideoEditor.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index 4dd81865..f1c43b68 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -136,6 +136,16 @@ export function useVideoEditor() {
 
     setHistoryIndex(0);
 
+    setHistory([
+      {
+        ...DEFAULT_RECIPE,
+        trimStart: 0,
+        trimEnd: null,
+      },
+    ]);
+
+    setHistoryIndex(0);
+
     // LAYER 1: Extension check
     const validExtensions = ['.mp4', '.mov', '.avi', '.webm', '.mkv'];
     const filename = selectedFile.name.toLowerCase();

From 859ffc0e544a924cb586bc641b5dbe4d9fcc2cc8 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Sun, 17 May 2026 12:37:57 +0530
Subject: [PATCH 30/73] removing errors

---
 src/components/VideoEditor.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/VideoEditor.tsx b/src/components/VideoEditor.tsx
index 4facab62..6e397dda 100644
--- a/src/components/VideoEditor.tsx
+++ b/src/components/VideoEditor.tsx
@@ -64,7 +64,7 @@ export default function VideoEditor() {
   resetSettings,
 } = useVideoEditor();
 
-  
+  const [copied, setCopied] = useState(false);
   const isProcessing = status === "loading-engine" || status === "exporting";
 
   return (

From 1b1f37e8ac69fbd761719cd4db78e7544c655100 Mon Sep 17 00:00:00 2001
From: Siddheshwar Salunke <hackengr19@gmail.com>
Date: Mon, 18 May 2026 01:11:47 +0530
Subject: [PATCH 31/73] Remove resetSettings function from useVideoEditor

Removed resetSettings function that updates the recipe.
---
 src/hooks/useVideoEditor.ts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index cd1daf06..4d17dca3 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -331,9 +331,6 @@ export function useVideoEditor() {
     setError(null);
   }, []);
 
-  const resetSettings = useCallback(() => {
-    updateRecipe(DEFAULT_RECIPE);
-  }, []);
 
   const reset = useCallback(() => {
     if (result?.blobUrl) URL.revokeObjectURL(result.blobUrl);
@@ -382,4 +379,4 @@ export function useVideoEditor() {
     cancelExport,
     resetSettings
   };
-}
\ No newline at end of file
+}

From 30b6e16b28699112f2908f4b807e56fe4300c71d Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Mon, 18 May 2026 01:20:49 +0530
Subject: [PATCH 32/73] merges

---
 src/components/VideoEditor.tsx |  34 +++++++++-
 src/hooks/useVideoEditor.ts    | 117 ++++++++++++++++++++++++++++++---
 2 files changed, 139 insertions(+), 12 deletions(-)

diff --git a/src/components/VideoEditor.tsx b/src/components/VideoEditor.tsx
index a1ca4cf1..984373a4 100644
--- a/src/components/VideoEditor.tsx
+++ b/src/components/VideoEditor.tsx
@@ -46,8 +46,8 @@ function Section({ icon, title, children, delay = 0 }: SectionProps) {
 export default function VideoEditor() {
   const {
     file, duration, recipe, status, progress,
-    result, error, updateRecipe,
-    handleFileSelect,fileError, handleExport, cancelExport, reset, resetSettings,
+    result, error, updateRecipe,fileError,
+    handleFileSelect, handleExport, cancelExport, reset, resetSettings,undo,redo,canUndo,canRedo,
   } = useVideoEditor();
   const [copied, setCopied] = useState(false);
   const downloadRef = useRef<HTMLDivElement>(null);
@@ -310,7 +310,37 @@ export default function VideoEditor() {
                 </button>
               </div>
             </div>
+            <div className="flex gap-3">
+              <button
+                type="button"
+                onClick={undo}
+                disabled={!canUndo || isProcessing}
+                className={cn(
+                  "flex-1 py-3 rounded-xl border transition-all duration-200",
+                  "font-heading text-xs uppercase tracking-widest",
+                  canUndo && !isProcessing
+                    ? "border-[var(--border)] bg-[var(--surface)] hover:border-film-500 hover:text-film-600"
+                    : "border-[var(--border)] text-[var(--muted)] cursor-not-allowed opacity-50"
+                )}
+              >
+                Undo
+              </button>
 
+              <button
+                type="button"
+                onClick={redo}
+                disabled={!canRedo || isProcessing}
+                className={cn(
+                  "flex-1 py-3 rounded-xl border transition-all duration-200",
+                  "font-heading text-xs uppercase tracking-widest",
+                  canRedo && !isProcessing
+                    ? "border-[var(--border)] bg-[var(--surface)] hover:border-film-500 hover:text-film-600"
+                    : "border-[var(--border)] text-[var(--muted)] cursor-not-allowed opacity-50"
+                )}
+              >
+                Redo
+              </button>
+            </div>
             <button
               type="button"
               onClick={handleExport}
diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index 0d929f45..0664907a 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -26,6 +26,7 @@ export function extractMetadata(file: File): Promise<{ width: number; height: nu
       });
       URL.revokeObjectURL(url);
     };
+
     video.onerror = () => {
       clearTimeout(timeout)
       URL.revokeObjectURL(url);
@@ -63,7 +64,10 @@ function verifyMagicBytes(file: File): Promise<boolean> {
 export function useVideoEditor() {
   const [file, setFile] = useState<File | null>(null);
   const [duration, setDuration] = useState<number>(0);
-  const [recipe, setRecipe] = useState<EditRecipe>(DEFAULT_RECIPE);
+
+  const [history, setHistory] = useState<EditRecipe[]>([DEFAULT_RECIPE]);
+  const [historyIndex, setHistoryIndex] = useState(0);
+
   const [status, setStatus] = useState<ExportStatus>("idle");
   const [progress, setProgress] = useState(0);
   const [result, setResult] = useState<ExportResult | null>(null);
@@ -72,10 +76,35 @@ export function useVideoEditor() {
   const exportAbortControllerRef = useRef<AbortController | null>(null);
   const exportCancelledRef = useRef(false);
 
+  const recipe = history[historyIndex];
+
   const updateRecipe = useCallback((patch: Partial<EditRecipe>) => {
-    setRecipe((prev) => ({ ...prev, ...patch }));
+    setHistory((prevHistory) => {
+      const trimmedHistory = prevHistory.slice(0, historyIndex + 1);
+
+      const newRecipe = {
+        ...trimmedHistory[historyIndex],
+        ...patch,
+      };
+
+      const updatedHistory = [...trimmedHistory, newRecipe];
+
+      return updatedHistory.length > 20
+        ? updatedHistory.slice(-20)
+        : updatedHistory;
+    });
+
+    setHistoryIndex((prev) => Math.min(prev + 1, 19));
+  }, [historyIndex]);
+
+  const undo = useCallback(() => {
+    setHistoryIndex((prev) => Math.max(0, prev - 1));
   }, []);
 
+  const redo = useCallback(() => {
+    setHistoryIndex((prev) => Math.min(history.length - 1, prev + 1));
+  }, [history.length]);
+
   const handleFileSelect = useCallback(async (selectedFile: File) => {
     setResult(null);
     setStatus("idle");
@@ -95,6 +124,46 @@ export function useVideoEditor() {
       return;
     }
 
+    setHistory([
+      {
+        ...DEFAULT_RECIPE,
+        trimStart: 0,
+        trimEnd: null,
+      },
+    ]);
+
+    setHistoryIndex(0);
+
+    setHistory([
+      {
+        ...DEFAULT_RECIPE,
+        trimStart: 0,
+        trimEnd: null,
+      },
+    ]);
+
+    setHistoryIndex(0);
+
+    setHistory([
+      {
+        ...DEFAULT_RECIPE,
+        trimStart: 0,
+        trimEnd: null,
+      },
+    ]);
+
+    setHistoryIndex(0);
+
+    setHistory([
+      {
+        ...DEFAULT_RECIPE,
+        trimStart: 0,
+        trimEnd: null,
+      },
+    ]);
+
+    setHistoryIndex(0);
+
     // LAYER 1: Extension check
     const validExtensions = ['.mp4', '.mov', '.avi', '.webm', '.mkv'];
     const filename = selectedFile.name.toLowerCase();
@@ -124,8 +193,9 @@ export function useVideoEditor() {
       const { duration: dur } = await extractMetadata(selectedFile);
       setDuration(dur);
       setFile(selectedFile);
-      setRecipe((prev) => ({ ...prev, trimStart: 0, trimEnd: null }));
-    } catch (err) {
+      
+      
+    }catch(err){
       setError(`Layer 4 Validation Failed: ${err instanceof Error ? err.message : "Unknown error"}`);
       setStatus("error");
     }
@@ -192,6 +262,7 @@ export function useVideoEditor() {
     } else {
       document.title = DEFAULT_TITLE;
     }
+
     return () => {
       document.title = DEFAULT_TITLE;
     };
@@ -199,14 +270,35 @@ export function useVideoEditor() {
 
   useEffect(() => {
     const handleKeydown = (e: KeyboardEvent) => {
+      const isModifier = e.ctrlKey || e.metaKey;
+
       if (
-        (e.ctrlKey || e.metaKey) &&
+        isModifier &&
         e.key === "Enter" &&
         file &&
         status !== "loading-engine" &&
         status !== "exporting"
       ) {
+        e.preventDefault();
         handleExport();
+        return;
+      }
+
+      if (isModifier && e.key.toLowerCase() === "z" && !e.shiftKey) {
+        e.preventDefault();
+        undo();
+        return;
+      }
+
+      if (
+        isModifier &&
+        (
+          (e.key.toLowerCase() === "z" && e.shiftKey) ||
+          e.key.toLowerCase() === "y"
+        )
+      ) {
+        e.preventDefault();
+        redo();
       }
     };
 
@@ -215,7 +307,7 @@ export function useVideoEditor() {
     return () => {
       document.removeEventListener("keydown", handleKeydown);
     };
-  }, [file, status, handleExport]);
+  }, [file, status, handleExport,undo, redo]);
 
   useEffect(()=>{
     return ()=>{
@@ -226,7 +318,7 @@ export function useVideoEditor() {
    },[result?.blobUrl])
 
   const resetSettings = useCallback(() => {
-    setRecipe(DEFAULT_RECIPE);
+    updateRecipe(DEFAULT_RECIPE);
   }, []);
 
   const cancelExport = useCallback(() => {
@@ -244,7 +336,8 @@ export function useVideoEditor() {
     if (result?.blobUrl) URL.revokeObjectURL(result.blobUrl);
     setFile(null);
     setDuration(0);
-    setRecipe(DEFAULT_RECIPE);
+    setHistory([DEFAULT_RECIPE]);
+    setHistoryIndex(0);
     setStatus("idle");
     setProgress(0);
     setResult(null);
@@ -275,11 +368,15 @@ export function useVideoEditor() {
     result,
     error,
     updateRecipe,
+    undo,
+    redo,
+    canUndo: historyIndex > 0,
+    canRedo: historyIndex < history.length - 1,
     handleFileSelect,
     fileError,
     handleExport,
-    cancelExport,
     reset,
-    resetSettings,
+    cancelExport,
+    resetSettings
   };
 }

From fba8536e010c6b5ad2038e72c9f260c98b010317 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Sun, 17 May 2026 00:55:24 +0530
Subject: [PATCH 33/73] fix merge

---
 src/hooks/useVideoEditor.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index 0664907a..33ba940b 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -377,6 +377,6 @@ export function useVideoEditor() {
     handleExport,
     reset,
     cancelExport,
-    resetSettings
+    resetSettings,
   };
 }

From 037747e438244a125b376a982f290c34aa1360d1 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Fri, 15 May 2026 03:01:09 +0530
Subject: [PATCH 34/73] Add undo/redo support for export settings

---
 src/hooks/useVideoEditor.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index 33ba940b..0fa6b48c 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -78,6 +78,7 @@ export function useVideoEditor() {
 
   const recipe = history[historyIndex];
 
+
   const updateRecipe = useCallback((patch: Partial<EditRecipe>) => {
     setHistory((prevHistory) => {
       const trimmedHistory = prevHistory.slice(0, historyIndex + 1);
@@ -164,6 +165,16 @@ export function useVideoEditor() {
 
     setHistoryIndex(0);
 
+    setHistory([
+      {
+        ...DEFAULT_RECIPE,
+        trimStart: 0,
+        trimEnd: null,
+      },
+    ]);
+
+    setHistoryIndex(0);
+
     // LAYER 1: Extension check
     const validExtensions = ['.mp4', '.mov', '.avi', '.webm', '.mkv'];
     const filename = selectedFile.name.toLowerCase();

From 9204aa5728f308b3f5b078d31abdd8c8fd41553d Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Sat, 16 May 2026 17:21:43 +0530
Subject: [PATCH 35/73] readding cancleExport and restSetting

---
 src/hooks/useVideoEditor.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index 0fa6b48c..6a8404fc 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -78,7 +78,6 @@ export function useVideoEditor() {
 
   const recipe = history[historyIndex];
 
-
   const updateRecipe = useCallback((patch: Partial<EditRecipe>) => {
     setHistory((prevHistory) => {
       const trimmedHistory = prevHistory.slice(0, historyIndex + 1);
@@ -388,6 +387,6 @@ export function useVideoEditor() {
     handleExport,
     reset,
     cancelExport,
-    resetSettings,
+    resetSettings
   };
 }

From 94e5b83d320065916d1fbc6592681c69b426527c Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Fri, 15 May 2026 03:01:09 +0530
Subject: [PATCH 36/73] Add undo/redo support for export settings

---
 src/hooks/useVideoEditor.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index 6a8404fc..fa710b92 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -174,6 +174,16 @@ export function useVideoEditor() {
 
     setHistoryIndex(0);
 
+    setHistory([
+      {
+        ...DEFAULT_RECIPE,
+        trimStart: 0,
+        trimEnd: null,
+      },
+    ]);
+
+    setHistoryIndex(0);
+
     // LAYER 1: Extension check
     const validExtensions = ['.mp4', '.mov', '.avi', '.webm', '.mkv'];
     const filename = selectedFile.name.toLowerCase();

From 451548fa4fa4d787aa2c1e6cec3fd85adce83921 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Sat, 16 May 2026 13:53:45 +0530
Subject: [PATCH 37/73] staged changes

---
 src/components/VideoEditor.tsx | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/components/VideoEditor.tsx b/src/components/VideoEditor.tsx
index 984373a4..3aa4f93a 100644
--- a/src/components/VideoEditor.tsx
+++ b/src/components/VideoEditor.tsx
@@ -66,7 +66,7 @@ export default function VideoEditor() {
 
   return (
     <div className="min-h-screen relative flex flex-col" style={{ background: "var(--bg)" }}>
-      <ExportOverlay status={status} progress={progress} onCancel={cancelExport} />
+      <ExportOverlay status={status} progress={progress} />
 
       <div aria-live="polite" aria-atomic="true" className="sr-only">
         {status === "exporting" && `Exporting video: ${progress}%`}
@@ -300,15 +300,6 @@ export default function VideoEditor() {
                 <FramingControl recipe={recipe} onChange={updateRecipe} />
               </Section>
 
-              <div className="pt-2 flex justify-end">
-                <button
-                  type="button"
-                  onClick={resetSettings}
-                  className="text-[9px] font-heading font-bold uppercase tracking-widest text-[var(--muted)] hover:text-film-600 transition-all opacity-60 hover:opacity-100"
-                >
-                  Reset all settings
-                </button>
-              </div>
             </div>
             <div className="flex gap-3">
               <button

From b1627f3284725903cff607c636b0a62814687653 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Fri, 15 May 2026 03:01:09 +0530
Subject: [PATCH 38/73] Add undo/redo support for export settings

---
 src/hooks/useVideoEditor.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index fa710b92..5c526c7a 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -78,6 +78,7 @@ export function useVideoEditor() {
 
   const recipe = history[historyIndex];
 
+
   const updateRecipe = useCallback((patch: Partial<EditRecipe>) => {
     setHistory((prevHistory) => {
       const trimmedHistory = prevHistory.slice(0, historyIndex + 1);

From b559fecc5a2bcbab40837c345c9b8e02432bb157 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Fri, 15 May 2026 03:01:09 +0530
Subject: [PATCH 39/73] Add undo/redo support for export settings

---
 src/hooks/useVideoEditor.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index 5c526c7a..fa710b92 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -78,7 +78,6 @@ export function useVideoEditor() {
 
   const recipe = history[historyIndex];
 
-
   const updateRecipe = useCallback((patch: Partial<EditRecipe>) => {
     setHistory((prevHistory) => {
       const trimmedHistory = prevHistory.slice(0, historyIndex + 1);

From 3ae2540661755058936c6c0d788061baff92631a Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Fri, 15 May 2026 03:01:09 +0530
Subject: [PATCH 40/73] Add undo/redo support for export settings

---
 src/hooks/useVideoEditor.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index fa710b92..2c352d56 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -184,6 +184,16 @@ export function useVideoEditor() {
 
     setHistoryIndex(0);
 
+    setHistory([
+      {
+        ...DEFAULT_RECIPE,
+        trimStart: 0,
+        trimEnd: null,
+      },
+    ]);
+
+    setHistoryIndex(0);
+
     // LAYER 1: Extension check
     const validExtensions = ['.mp4', '.mov', '.avi', '.webm', '.mkv'];
     const filename = selectedFile.name.toLowerCase();

From 30c2a543b4df8c052b61fb8c52c9839b570b9beb Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Fri, 15 May 2026 03:01:09 +0530
Subject: [PATCH 41/73] Add undo/redo support for export settings

---
 src/hooks/useVideoEditor.ts | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index 2c352d56..a1685a69 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -194,6 +194,16 @@ export function useVideoEditor() {
 
     setHistoryIndex(0);
 
+    setHistory([
+      {
+        ...DEFAULT_RECIPE,
+        trimStart: 0,
+        trimEnd: null,
+      },
+    ]);
+
+    setHistoryIndex(0);
+
     // LAYER 1: Extension check
     const validExtensions = ['.mp4', '.mov', '.avi', '.webm', '.mkv'];
     const filename = selectedFile.name.toLowerCase();
@@ -361,7 +371,6 @@ export function useVideoEditor() {
     setError(null);
   }, []);
 
-
   const reset = useCallback(() => {
     if (result?.blobUrl) URL.revokeObjectURL(result.blobUrl);
     setFile(null);
@@ -409,4 +418,4 @@ export function useVideoEditor() {
     cancelExport,
     resetSettings
   };
-}
+}
\ No newline at end of file

From 4501445c6ab221cd6b8ff6fbbca191dffb5c8e43 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Fri, 15 May 2026 03:01:09 +0530
Subject: [PATCH 42/73] Add undo/redo support for export settings

---
 src/hooks/useVideoEditor.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index a1685a69..87d21125 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -78,6 +78,7 @@ export function useVideoEditor() {
 
   const recipe = history[historyIndex];
 
+
   const updateRecipe = useCallback((patch: Partial<EditRecipe>) => {
     setHistory((prevHistory) => {
       const trimmedHistory = prevHistory.slice(0, historyIndex + 1);
@@ -204,6 +205,16 @@ export function useVideoEditor() {
 
     setHistoryIndex(0);
 
+    setHistory([
+      {
+        ...DEFAULT_RECIPE,
+        trimStart: 0,
+        trimEnd: null,
+      },
+    ]);
+
+    setHistoryIndex(0);
+
     // LAYER 1: Extension check
     const validExtensions = ['.mp4', '.mov', '.avi', '.webm', '.mkv'];
     const filename = selectedFile.name.toLowerCase();

From 7d36cf6a54f71a07c76ae66e8788cfbbf1e3bc8f Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Sat, 16 May 2026 17:21:43 +0530
Subject: [PATCH 43/73] readding cancleExport and restSetting

---
 src/hooks/useVideoEditor.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index 87d21125..9b9241cf 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -78,7 +78,6 @@ export function useVideoEditor() {
 
   const recipe = history[historyIndex];
 
-
   const updateRecipe = useCallback((patch: Partial<EditRecipe>) => {
     setHistory((prevHistory) => {
       const trimmedHistory = prevHistory.slice(0, historyIndex + 1);

From 39b4a150cdfab05b79985c6b31a9d0854d767f7a Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Fri, 15 May 2026 03:01:09 +0530
Subject: [PATCH 44/73] Add undo/redo support for export settings

---
 src/hooks/useVideoEditor.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index 9b9241cf..3c8eafce 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -214,6 +214,16 @@ export function useVideoEditor() {
 
     setHistoryIndex(0);
 
+    setHistory([
+      {
+        ...DEFAULT_RECIPE,
+        trimStart: 0,
+        trimEnd: null,
+      },
+    ]);
+
+    setHistoryIndex(0);
+
     // LAYER 1: Extension check
     const validExtensions = ['.mp4', '.mov', '.avi', '.webm', '.mkv'];
     const filename = selectedFile.name.toLowerCase();

From 1abcbe87f40d0aa8910b6f9f07af4ea16dd32879 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Fri, 15 May 2026 03:01:09 +0530
Subject: [PATCH 45/73] Add undo/redo support for export settings

---
 src/hooks/useVideoEditor.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index 3c8eafce..246b63de 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -224,6 +224,16 @@ export function useVideoEditor() {
 
     setHistoryIndex(0);
 
+    setHistory([
+      {
+        ...DEFAULT_RECIPE,
+        trimStart: 0,
+        trimEnd: null,
+      },
+    ]);
+
+    setHistoryIndex(0);
+
     // LAYER 1: Extension check
     const validExtensions = ['.mp4', '.mov', '.avi', '.webm', '.mkv'];
     const filename = selectedFile.name.toLowerCase();

From d4c107997e4ab9abf1552954fbfac78252a00799 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Fri, 15 May 2026 03:01:09 +0530
Subject: [PATCH 46/73] Add undo/redo support for export settings

---
 src/hooks/useVideoEditor.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index 246b63de..7b36bfb5 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -78,6 +78,7 @@ export function useVideoEditor() {
 
   const recipe = history[historyIndex];
 
+
   const updateRecipe = useCallback((patch: Partial<EditRecipe>) => {
     setHistory((prevHistory) => {
       const trimmedHistory = prevHistory.slice(0, historyIndex + 1);
@@ -234,6 +235,16 @@ export function useVideoEditor() {
 
     setHistoryIndex(0);
 
+    setHistory([
+      {
+        ...DEFAULT_RECIPE,
+        trimStart: 0,
+        trimEnd: null,
+      },
+    ]);
+
+    setHistoryIndex(0);
+
     // LAYER 1: Extension check
     const validExtensions = ['.mp4', '.mov', '.avi', '.webm', '.mkv'];
     const filename = selectedFile.name.toLowerCase();

From 89929b2f09747c3ffe01239def77544bccb96fef Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Fri, 15 May 2026 03:01:09 +0530
Subject: [PATCH 47/73] Add undo/redo support for export settings

---
 src/hooks/useVideoEditor.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index 7b36bfb5..f1b16507 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -78,7 +78,6 @@ export function useVideoEditor() {
 
   const recipe = history[historyIndex];
 
-
   const updateRecipe = useCallback((patch: Partial<EditRecipe>) => {
     setHistory((prevHistory) => {
       const trimmedHistory = prevHistory.slice(0, historyIndex + 1);
@@ -245,6 +244,16 @@ export function useVideoEditor() {
 
     setHistoryIndex(0);
 
+    setHistory([
+      {
+        ...DEFAULT_RECIPE,
+        trimStart: 0,
+        trimEnd: null,
+      },
+    ]);
+
+    setHistoryIndex(0);
+
     // LAYER 1: Extension check
     const validExtensions = ['.mp4', '.mov', '.avi', '.webm', '.mkv'];
     const filename = selectedFile.name.toLowerCase();

From 441e5ed2c606ced34592a243153b7c2072a7ed28 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Fri, 15 May 2026 03:01:09 +0530
Subject: [PATCH 48/73] Add undo/redo support for export settings

---
 src/hooks/useVideoEditor.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index f1b16507..5e032a2b 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -115,6 +115,16 @@ export function useVideoEditor() {
     return;
   }
 
+    setHistory([
+      {
+        ...DEFAULT_RECIPE,
+        trimStart: 0,
+        trimEnd: null,
+      },
+    ]);
+
+    setHistoryIndex(0);
+
   setFileError("");
 
     // LAYER 0: Size check

From 4e8faea37df353f8e8731b55a313e821d3a0749f Mon Sep 17 00:00:00 2001
From: Siddheshwar Salunke <hackengr19@gmail.com>
Date: Mon, 18 May 2026 01:11:47 +0530
Subject: [PATCH 49/73] Remove resetSettings function from useVideoEditor

Removed resetSettings function that updates the recipe.
---
 src/hooks/useVideoEditor.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index 5e032a2b..e29939ef 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -478,4 +478,4 @@ export function useVideoEditor() {
     cancelExport,
     resetSettings
   };
-}
\ No newline at end of file
+}

From 887d7fd0c78c2293c724d585b6b0ec6636118b43 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Mon, 18 May 2026 08:47:13 +0530
Subject: [PATCH 50/73] added cancExport

---
 src/components/VideoEditor.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/VideoEditor.tsx b/src/components/VideoEditor.tsx
index bf0ea0a9..f2b45c02 100644
--- a/src/components/VideoEditor.tsx
+++ b/src/components/VideoEditor.tsx
@@ -66,7 +66,7 @@ export default function VideoEditor() {
 
   return (
     <div className="min-h-screen relative flex flex-col" style={{ background: "var(--bg)" }}>
-      <ExportOverlay status={status} progress={progress} />
+      <ExportOverlay status={status} progress={progress} onCancel={cancelExport}/>
 
       <div aria-live="polite" aria-atomic="true" className="sr-only">
         {status === "exporting" && `Exporting video: ${progress}%`}

From 4087dcc006342229136672568d7e79c4706c68a6 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Mon, 18 May 2026 23:36:49 +0530
Subject: [PATCH 51/73] removed duplicate sethistory

---
 src/hooks/useVideoEditor.ts | 130 ------------------------------------
 1 file changed, 130 deletions(-)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index c167cb1d..efbc68be 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -135,136 +135,6 @@ export function useVideoEditor() {
       return;
     }
 
-    setHistory([
-      {
-        ...DEFAULT_RECIPE,
-        trimStart: 0,
-        trimEnd: null,
-      },
-    ]);
-
-    setHistoryIndex(0);
-
-    setHistory([
-      {
-        ...DEFAULT_RECIPE,
-        trimStart: 0,
-        trimEnd: null,
-      },
-    ]);
-
-    setHistoryIndex(0);
-
-    setHistory([
-      {
-        ...DEFAULT_RECIPE,
-        trimStart: 0,
-        trimEnd: null,
-      },
-    ]);
-
-    setHistoryIndex(0);
-
-    setHistory([
-      {
-        ...DEFAULT_RECIPE,
-        trimStart: 0,
-        trimEnd: null,
-      },
-    ]);
-
-    setHistoryIndex(0);
-
-    setHistory([
-      {
-        ...DEFAULT_RECIPE,
-        trimStart: 0,
-        trimEnd: null,
-      },
-    ]);
-
-    setHistoryIndex(0);
-
-    setHistory([
-      {
-        ...DEFAULT_RECIPE,
-        trimStart: 0,
-        trimEnd: null,
-      },
-    ]);
-
-    setHistoryIndex(0);
-
-    setHistory([
-      {
-        ...DEFAULT_RECIPE,
-        trimStart: 0,
-        trimEnd: null,
-      },
-    ]);
-
-    setHistoryIndex(0);
-
-    setHistory([
-      {
-        ...DEFAULT_RECIPE,
-        trimStart: 0,
-        trimEnd: null,
-      },
-    ]);
-
-    setHistoryIndex(0);
-
-    setHistory([
-      {
-        ...DEFAULT_RECIPE,
-        trimStart: 0,
-        trimEnd: null,
-      },
-    ]);
-
-    setHistoryIndex(0);
-
-    setHistory([
-      {
-        ...DEFAULT_RECIPE,
-        trimStart: 0,
-        trimEnd: null,
-      },
-    ]);
-
-    setHistoryIndex(0);
-
-    setHistory([
-      {
-        ...DEFAULT_RECIPE,
-        trimStart: 0,
-        trimEnd: null,
-      },
-    ]);
-
-    setHistoryIndex(0);
-
-    setHistory([
-      {
-        ...DEFAULT_RECIPE,
-        trimStart: 0,
-        trimEnd: null,
-      },
-    ]);
-
-    setHistoryIndex(0);
-
-    setHistory([
-      {
-        ...DEFAULT_RECIPE,
-        trimStart: 0,
-        trimEnd: null,
-      },
-    ]);
-
-    setHistoryIndex(0);
-
     // LAYER 1: Extension check
     const validExtensions = ['.mp4', '.mov', '.avi', '.webm', '.mkv'];
     const filename = selectedFile.name.toLowerCase();

From d055827b23ecd7d79ab7f740ac7f55ad0d16bedd Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Mon, 18 May 2026 23:43:54 +0530
Subject: [PATCH 52/73] "resolving error"

---
 src/hooks/useVideoEditor.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index 393ae772..72689ef4 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -142,7 +142,6 @@ export function useVideoEditor() {
   const exportCancelledRef = useRef(false);
   const videoRef = useRef<HTMLVideoElement>(null);
 
-  const recipe = history[historyIndex];
   const [musicFile, setMusicFile] = useState<File | null>(null);
   const [musicVolume, setMusicVolume] = useState(70);
   const [originalAudioVolume, setOriginalAudioVolume] = useState(40);

From 09b1ba7f100302ff9604538df71cd3ee2cca207e Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Mon, 18 May 2026 01:20:49 +0530
Subject: [PATCH 53/73] merges

---
 src/components/VideoEditor.tsx | 31 ++++++++++++++++
 src/hooks/useVideoEditor.ts    | 66 ++++++++++++++++++++++++++++++----
 2 files changed, 91 insertions(+), 6 deletions(-)

diff --git a/src/components/VideoEditor.tsx b/src/components/VideoEditor.tsx
index f89872d5..b597c41b 100644
--- a/src/components/VideoEditor.tsx
+++ b/src/components/VideoEditor.tsx
@@ -53,6 +53,7 @@ export default function VideoEditor() {
    file, duration, recipe, status, progress,
     result, error, updateRecipe,
     handleFileSelect, fileError, handleExport, cancelExport, reset, resetSettings,
+    undo,redo,canUndo,canRedo,
     videoRef,
     seekTo,
     overlayFile, setOverlayFile,
@@ -342,7 +343,37 @@ export default function VideoEditor() {
                 </button>
               </div>
             </div>
+            <div className="flex gap-3">
+              <button
+                type="button"
+                onClick={undo}
+                disabled={!canUndo || isProcessing}
+                className={cn(
+                  "flex-1 py-3 rounded-xl border transition-all duration-200",
+                  "font-heading text-xs uppercase tracking-widest",
+                  canUndo && !isProcessing
+                    ? "border-[var(--border)] bg-[var(--surface)] hover:border-film-500 hover:text-film-600"
+                    : "border-[var(--border)] text-[var(--muted)] cursor-not-allowed opacity-50"
+                )}
+              >
+                Undo
+              </button>
 
+              <button
+                type="button"
+                onClick={redo}
+                disabled={!canRedo || isProcessing}
+                className={cn(
+                  "flex-1 py-3 rounded-xl border transition-all duration-200",
+                  "font-heading text-xs uppercase tracking-widest",
+                  canRedo && !isProcessing
+                    ? "border-[var(--border)] bg-[var(--surface)] hover:border-film-500 hover:text-film-600"
+                    : "border-[var(--border)] text-[var(--muted)] cursor-not-allowed opacity-50"
+                )}
+              >
+                Redo
+              </button>
+            </div>
             <button
               id="export-button"
               type="button"
diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index a2283128..57cd42d4 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -28,6 +28,7 @@ export function extractMetadata(file: File): Promise<{ width: number; height: nu
       });
       URL.revokeObjectURL(url);
     };
+
     video.onerror = () => {
       clearTimeout(timeout)
       URL.revokeObjectURL(url);
@@ -128,6 +129,10 @@ export function useVideoEditor() {
       typeof window !== "undefined" &&
       localStorage.getItem("soundOnCompletion") === "true",
   });
+
+  const [history, setHistory] = useState<EditRecipe[]>([DEFAULT_RECIPE]);
+  const [historyIndex, setHistoryIndex] = useState(0);
+
   const [status, setStatus] = useState<ExportStatus>("idle");
   const [progress, setProgress] = useState(0);
   const [result, setResult] = useState<ExportResult | null>(null);
@@ -148,7 +153,26 @@ export function useVideoEditor() {
   const [overlayOpacity, setOverlayOpacity] = useState(100);
 
   const updateRecipe = useCallback((patch: Partial<EditRecipe>) => {
-    setRecipe((prev) => ({ ...prev, ...patch }));
+    setHistory((prevHistory) => {
+      const trimmedHistory = prevHistory.slice(0, historyIndex + 1);
+
+      const newRecipe = {
+        ...trimmedHistory[historyIndex],
+        ...patch,
+      };
+
+      const updatedHistory = [...trimmedHistory, newRecipe];
+
+      return updatedHistory.length > 20
+        ? updatedHistory.slice(-20)
+        : updatedHistory;
+    });
+
+    setHistoryIndex((prev) => Math.min(prev + 1, 19));
+  }, [historyIndex]);
+
+  const undo = useCallback(() => {
+    setHistoryIndex((prev) => Math.max(0, prev - 1));
   }, []);
 
   useEffect(() => {
@@ -188,6 +212,9 @@ export function useVideoEditor() {
     if (!videoMetadata) return null;
     return getPresetById(suggestPreset(videoMetadata.width, videoMetadata.height)) ?? null;
   }, [videoMetadata]);
+  const redo = useCallback(() => {
+    setHistoryIndex((prev) => Math.min(history.length - 1, prev + 1));
+  }, [history.length]);
 
   const handleFileSelect = useCallback(async (selectedFile: File) => {
     setResult(null);
@@ -340,6 +367,7 @@ export function useVideoEditor() {
     } else {
       document.title = DEFAULT_TITLE;
     }
+
     return () => {
       document.title = DEFAULT_TITLE;
     };
@@ -363,14 +391,35 @@ export function useVideoEditor() {
   
   useEffect(() => {
     const handleKeydown = (e: KeyboardEvent) => {
+      const isModifier = e.ctrlKey || e.metaKey;
+
       if (
-        (e.ctrlKey || e.metaKey) &&
+        isModifier &&
         e.key === "Enter" &&
         file &&
         status !== "loading-engine" &&
         status !== "exporting"
       ) {
+        e.preventDefault();
         handleExport();
+        return;
+      }
+
+      if (isModifier && e.key.toLowerCase() === "z" && !e.shiftKey) {
+        e.preventDefault();
+        undo();
+        return;
+      }
+
+      if (
+        isModifier &&
+        (
+          (e.key.toLowerCase() === "z" && e.shiftKey) ||
+          e.key.toLowerCase() === "y"
+        )
+      ) {
+        e.preventDefault();
+        redo();
       }
     };
 
@@ -378,7 +427,7 @@ export function useVideoEditor() {
     return () => {
       document.removeEventListener("keydown", handleKeydown);
     };
-  }, [file, status, handleExport]);
+  }, [file, status, handleExport,undo, redo]);
 
   useEffect(()=>{
     return ()=>{
@@ -389,7 +438,7 @@ export function useVideoEditor() {
    },[result?.blobUrl])
 
   const resetSettings = useCallback(() => {
-    setRecipe(DEFAULT_RECIPE);
+    updateRecipe(DEFAULT_RECIPE);
   }, []);
 
   const cancelExport = useCallback(() => {
@@ -408,7 +457,8 @@ export function useVideoEditor() {
     setFile(null);
     setVideoMetadata(null);
     setDuration(0);
-    setRecipe(DEFAULT_RECIPE);
+    setHistory([DEFAULT_RECIPE]);
+    setHistoryIndex(0);
     setStatus("idle");
     setProgress(0);
     setResult(null);
@@ -449,10 +499,13 @@ export function useVideoEditor() {
     videoRef,
     seekTo,
     updateRecipe,
+    undo,
+    redo,
+    canUndo: historyIndex > 0,
+    canRedo: historyIndex < history.length - 1,
     handleFileSelect,
     fileError,
     handleExport,
-    cancelExport,
     reset,
     resetSettings,
     musicFile,
@@ -472,5 +525,6 @@ export function useVideoEditor() {
     overlayOpacity,
     setOverlayOpacity,
     recommendedPreset,
+    cancelExport,
   };
 }
\ No newline at end of file

From 92e8b079d946ef7b8dce34c00aa4cfa9ea7d5714 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Fri, 15 May 2026 03:01:09 +0530
Subject: [PATCH 54/73] Add undo/redo support for export settings

---
 src/hooks/useVideoEditor.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index 57cd42d4..a9f47e6f 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -152,6 +152,7 @@ export function useVideoEditor() {
   const [overlaySize, setOverlaySize] = useState(150);
   const [overlayOpacity, setOverlayOpacity] = useState(100);
 
+
   const updateRecipe = useCallback((patch: Partial<EditRecipe>) => {
     setHistory((prevHistory) => {
       const trimmedHistory = prevHistory.slice(0, historyIndex + 1);

From 72c718ac6a7d7698a4a22bbbc30c1e036e9bcedf Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Sat, 16 May 2026 17:21:43 +0530
Subject: [PATCH 55/73] readding cancleExport and restSetting

---
 src/hooks/useVideoEditor.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index a9f47e6f..57cd42d4 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -152,7 +152,6 @@ export function useVideoEditor() {
   const [overlaySize, setOverlaySize] = useState(150);
   const [overlayOpacity, setOverlayOpacity] = useState(100);
 
-
   const updateRecipe = useCallback((patch: Partial<EditRecipe>) => {
     setHistory((prevHistory) => {
       const trimmedHistory = prevHistory.slice(0, historyIndex + 1);

From 973f623e841fb9d774d5814ffb498bf5dfe22685 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Sat, 16 May 2026 13:53:45 +0530
Subject: [PATCH 56/73] staged changes

---
 src/components/VideoEditor.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/VideoEditor.tsx b/src/components/VideoEditor.tsx
index b597c41b..bcdf7cb5 100644
--- a/src/components/VideoEditor.tsx
+++ b/src/components/VideoEditor.tsx
@@ -90,7 +90,7 @@ export default function VideoEditor() {
 
   return (
     <div className="min-h-screen relative flex flex-col" style={{ background: "var(--bg)" }}>
-      <ExportOverlay status={status} progress={progress} onCancel={cancelExport} />
+      <ExportOverlay status={status} progress={progress} />
       <OnboardingTour />
 
       <div aria-live="polite" aria-atomic="true" className="sr-only">

From 0db8175520545f9c93a3dff5c6df4b62e319f3a6 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Fri, 15 May 2026 03:01:09 +0530
Subject: [PATCH 57/73] Add undo/redo support for export settings

---
 src/hooks/useVideoEditor.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index 57cd42d4..a9f47e6f 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -152,6 +152,7 @@ export function useVideoEditor() {
   const [overlaySize, setOverlaySize] = useState(150);
   const [overlayOpacity, setOverlayOpacity] = useState(100);
 
+
   const updateRecipe = useCallback((patch: Partial<EditRecipe>) => {
     setHistory((prevHistory) => {
       const trimmedHistory = prevHistory.slice(0, historyIndex + 1);

From 06beb2a091d8451f21dee344f9ffcc69b3722cf8 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Fri, 15 May 2026 03:01:09 +0530
Subject: [PATCH 58/73] Add undo/redo support for export settings

---
 src/hooks/useVideoEditor.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index a9f47e6f..57cd42d4 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -152,7 +152,6 @@ export function useVideoEditor() {
   const [overlaySize, setOverlaySize] = useState(150);
   const [overlayOpacity, setOverlayOpacity] = useState(100);
 
-
   const updateRecipe = useCallback((patch: Partial<EditRecipe>) => {
     setHistory((prevHistory) => {
       const trimmedHistory = prevHistory.slice(0, historyIndex + 1);

From 9a7264692201553fbdf9f945d3a9f24bba2ae944 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Fri, 15 May 2026 03:01:09 +0530
Subject: [PATCH 59/73] Add undo/redo support for export settings

---
 src/hooks/useVideoEditor.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index 57cd42d4..ae71b339 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -451,7 +451,6 @@ export function useVideoEditor() {
     setError(null);
   }, []);
 
-
   const reset = useCallback(() => {
     if (result?.blobUrl) URL.revokeObjectURL(result.blobUrl);
     setFile(null);

From a11d21a887b57180206f0846e07705c405f0a5e7 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Fri, 15 May 2026 03:01:09 +0530
Subject: [PATCH 60/73] Add undo/redo support for export settings

---
 src/hooks/useVideoEditor.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index ae71b339..421fdb23 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -152,6 +152,7 @@ export function useVideoEditor() {
   const [overlaySize, setOverlaySize] = useState(150);
   const [overlayOpacity, setOverlayOpacity] = useState(100);
 
+
   const updateRecipe = useCallback((patch: Partial<EditRecipe>) => {
     setHistory((prevHistory) => {
       const trimmedHistory = prevHistory.slice(0, historyIndex + 1);

From e15021a2fd3a6bee93f3b6e4eb2f5414ee50deac Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Sat, 16 May 2026 17:21:43 +0530
Subject: [PATCH 61/73] readding cancleExport and restSetting

---
 src/hooks/useVideoEditor.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index 421fdb23..ae71b339 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -152,7 +152,6 @@ export function useVideoEditor() {
   const [overlaySize, setOverlaySize] = useState(150);
   const [overlayOpacity, setOverlayOpacity] = useState(100);
 
-
   const updateRecipe = useCallback((patch: Partial<EditRecipe>) => {
     setHistory((prevHistory) => {
       const trimmedHistory = prevHistory.slice(0, historyIndex + 1);

From 7b031958710e89e5e7ed0f67dee001568a427634 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Fri, 15 May 2026 03:01:09 +0530
Subject: [PATCH 62/73] Add undo/redo support for export settings

---
 src/hooks/useVideoEditor.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index ae71b339..421fdb23 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -152,6 +152,7 @@ export function useVideoEditor() {
   const [overlaySize, setOverlaySize] = useState(150);
   const [overlayOpacity, setOverlayOpacity] = useState(100);
 
+
   const updateRecipe = useCallback((patch: Partial<EditRecipe>) => {
     setHistory((prevHistory) => {
       const trimmedHistory = prevHistory.slice(0, historyIndex + 1);

From 3f67c279d7a9701c0dd756a4f5c618efe9ab54ad Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Fri, 15 May 2026 03:01:09 +0530
Subject: [PATCH 63/73] Add undo/redo support for export settings

---
 src/hooks/useVideoEditor.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index 421fdb23..ae71b339 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -152,7 +152,6 @@ export function useVideoEditor() {
   const [overlaySize, setOverlaySize] = useState(150);
   const [overlayOpacity, setOverlayOpacity] = useState(100);
 
-
   const updateRecipe = useCallback((patch: Partial<EditRecipe>) => {
     setHistory((prevHistory) => {
       const trimmedHistory = prevHistory.slice(0, historyIndex + 1);

From 0c39c533ca88c769cf14d70337a744a6f8fdeb2d Mon Sep 17 00:00:00 2001
From: Siddheshwar Salunke <hackengr19@gmail.com>
Date: Mon, 18 May 2026 01:11:47 +0530
Subject: [PATCH 64/73] Remove resetSettings function from useVideoEditor

Removed resetSettings function that updates the recipe.
---
 src/hooks/useVideoEditor.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index ae71b339..d3cbeb22 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -526,4 +526,4 @@ export function useVideoEditor() {
     recommendedPreset,
     cancelExport,
   };
-}
\ No newline at end of file
+}

From 86121c85eccca0e4856ff28bfdfa70c7f7c70294 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Fri, 15 May 2026 03:01:09 +0530
Subject: [PATCH 65/73] Add undo/redo support for export settings

---
 src/hooks/useVideoEditor.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index d3cbeb22..ae71b339 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -526,4 +526,4 @@ export function useVideoEditor() {
     recommendedPreset,
     cancelExport,
   };
-}
+}
\ No newline at end of file

From 9bc90b569d1dc49e88b7bf6aad19e375fff87553 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Fri, 15 May 2026 03:01:09 +0530
Subject: [PATCH 66/73] Add undo/redo support for export settings

---
 src/hooks/useVideoEditor.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index ae71b339..421fdb23 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -152,6 +152,7 @@ export function useVideoEditor() {
   const [overlaySize, setOverlaySize] = useState(150);
   const [overlayOpacity, setOverlayOpacity] = useState(100);
 
+
   const updateRecipe = useCallback((patch: Partial<EditRecipe>) => {
     setHistory((prevHistory) => {
       const trimmedHistory = prevHistory.slice(0, historyIndex + 1);

From 934929065695409bc63d37cf8cf665987a051888 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Sat, 16 May 2026 17:21:43 +0530
Subject: [PATCH 67/73] readding cancleExport and restSetting

---
 src/hooks/useVideoEditor.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index 421fdb23..ae71b339 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -152,7 +152,6 @@ export function useVideoEditor() {
   const [overlaySize, setOverlaySize] = useState(150);
   const [overlayOpacity, setOverlayOpacity] = useState(100);
 
-
   const updateRecipe = useCallback((patch: Partial<EditRecipe>) => {
     setHistory((prevHistory) => {
       const trimmedHistory = prevHistory.slice(0, historyIndex + 1);

From e20f4185cdb8cf89b206478d787a0a1cbba82d8d Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Fri, 15 May 2026 03:01:09 +0530
Subject: [PATCH 68/73] Add undo/redo support for export settings

---
 src/hooks/useVideoEditor.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index ae71b339..421fdb23 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -152,6 +152,7 @@ export function useVideoEditor() {
   const [overlaySize, setOverlaySize] = useState(150);
   const [overlayOpacity, setOverlayOpacity] = useState(100);
 
+
   const updateRecipe = useCallback((patch: Partial<EditRecipe>) => {
     setHistory((prevHistory) => {
       const trimmedHistory = prevHistory.slice(0, historyIndex + 1);

From 552506ed0029a4bf74e42640ba2d4d862cd4c577 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Fri, 15 May 2026 03:01:09 +0530
Subject: [PATCH 69/73] Add undo/redo support for export settings

---
 src/hooks/useVideoEditor.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index 421fdb23..ae71b339 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -152,7 +152,6 @@ export function useVideoEditor() {
   const [overlaySize, setOverlaySize] = useState(150);
   const [overlayOpacity, setOverlayOpacity] = useState(100);
 
-
   const updateRecipe = useCallback((patch: Partial<EditRecipe>) => {
     setHistory((prevHistory) => {
       const trimmedHistory = prevHistory.slice(0, historyIndex + 1);

From e0bf07a70c5301153bcc3e1dde8ca568a901e629 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Fri, 15 May 2026 03:01:09 +0530
Subject: [PATCH 70/73] Add undo/redo support for export settings

---
 src/hooks/useVideoEditor.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index ae71b339..421fdb23 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -152,6 +152,7 @@ export function useVideoEditor() {
   const [overlaySize, setOverlaySize] = useState(150);
   const [overlayOpacity, setOverlayOpacity] = useState(100);
 
+
   const updateRecipe = useCallback((patch: Partial<EditRecipe>) => {
     setHistory((prevHistory) => {
       const trimmedHistory = prevHistory.slice(0, historyIndex + 1);

From 45c724f4b898726c5f425eeb44ee0f71fef36bc1 Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Fri, 15 May 2026 03:01:09 +0530
Subject: [PATCH 71/73] Add undo/redo support for export settings

---
 src/hooks/useVideoEditor.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index 421fdb23..a817c09b 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -153,6 +153,7 @@ export function useVideoEditor() {
   const [overlayOpacity, setOverlayOpacity] = useState(100);
 
 
+
   const updateRecipe = useCallback((patch: Partial<EditRecipe>) => {
     setHistory((prevHistory) => {
       const trimmedHistory = prevHistory.slice(0, historyIndex + 1);

From 086d4eeb291a9dd9e5de9a94b6a5fc0b160fd34e Mon Sep 17 00:00:00 2001
From: Siddheshwar Salunke <hackengr19@gmail.com>
Date: Mon, 18 May 2026 01:11:47 +0530
Subject: [PATCH 72/73] Remove resetSettings function from useVideoEditor

Removed resetSettings function that updates the recipe.
---
 src/hooks/useVideoEditor.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index a817c09b..d9629c2d 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -528,4 +528,4 @@ export function useVideoEditor() {
     recommendedPreset,
     cancelExport,
   };
-}
\ No newline at end of file
+}

From 347741834078de4fdd4adb43d97bdb71bf3764ed Mon Sep 17 00:00:00 2001
From: sid <hackengr19@gmail.com>
Date: Tue, 19 May 2026 15:39:08 +0530
Subject: [PATCH 73/73] added setrecipe again

---
 src/hooks/useVideoEditor.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/hooks/useVideoEditor.ts b/src/hooks/useVideoEditor.ts
index d9629c2d..491e8d4b 100644
--- a/src/hooks/useVideoEditor.ts
+++ b/src/hooks/useVideoEditor.ts
@@ -218,6 +218,10 @@ export function useVideoEditor() {
     setHistoryIndex((prev) => Math.min(history.length - 1, prev + 1));
   }, [history.length]);
 
+  useEffect(() => {
+    setRecipe(history[historyIndex]);
+  }, [historyIndex, history]);
+
   const handleFileSelect = useCallback(async (selectedFile: File) => {
     setResult(null);
     setStatus("idle");