8 files changed, 384 insertions, 0 deletions
diff --git a/apps/web/src/commands/scene/create-scene.ts b/apps/web/src/commands/scene/create-scene.ts
new file mode 100644
index 00000000..b554fe90
--- /dev/null
+++ b/apps/web/src/commands/scene/create-scene.ts
@@ -0,0 +1,41 @@
+import { Command, type CommandResult } from "@/commands/base-command";
+import { EditorCore } from "@/core";
+import type { TScene } from "@/timeline";
+import { buildDefaultScene } from "@/timeline/scenes";
+
+export class CreateSceneCommand extends Command {
+	private savedScenes: TScene[] | null = null;
+	private createdScene: TScene | null = null;
+
+	constructor(
+		private name: string,
+		private isMain: boolean = false,
+	) {
+		super();
+	}
+
+	execute(): CommandResult | undefined {
+		const editor = EditorCore.getInstance();
+		this.savedScenes = [...editor.scenes.getScenes()];
+
+		this.createdScene = buildDefaultScene({
+			name: this.name,
+			isMain: this.isMain,
+		});
+
+		const updatedScenes = [...this.savedScenes, this.createdScene];
+		editor.scenes.setScenes({ scenes: updatedScenes });
+		return undefined;
+	}
+
+	undo(): void {
+		if (this.savedScenes) {
+			const editor = EditorCore.getInstance();
+			editor.scenes.setScenes({ scenes: this.savedScenes });
+		}
+	}
+
+	getSceneId(): string {
+		return this.createdScene?.id ?? "";
+	}
+}
diff --git a/apps/web/src/commands/scene/delete-scene.ts b/apps/web/src/commands/scene/delete-scene.ts
new file mode 100644
index 00000000..92de518f
--- /dev/null
+++ b/apps/web/src/commands/scene/delete-scene.ts
@@ -0,0 +1,59 @@
+import { Command, type CommandResult } from "@/commands/base-command";
+import { EditorCore } from "@/core";
+import type { TScene } from "@/timeline";
+import { canDeleteScene, getFallbackSceneAfterDelete } from "@/timeline/scenes";
+
+export class DeleteSceneCommand extends Command {
+	private savedScenes: TScene[] | null = null;
+	private savedActiveSceneId: string | null = null;
+	private deletedScene: TScene | null = null;
+
+	constructor(private sceneId: string) {
+		super();
+	}
+
+	execute(): CommandResult | undefined {
+		const editor = EditorCore.getInstance();
+		const scenes = editor.scenes.getScenes();
+		const activeScene = editor.scenes.getActiveScene();
+
+		this.savedScenes = [...scenes];
+		this.savedActiveSceneId = activeScene?.id ?? null;
+
+		this.deletedScene = scenes.find((s) => s.id === this.sceneId) ?? null;
+
+		if (!this.deletedScene) {
+			console.error("Scene not found:", this.sceneId);
+			return;
+		}
+
+		const { canDelete, reason } = canDeleteScene({ scene: this.deletedScene });
+		if (!canDelete) {
+			console.error("Cannot delete scene:", reason);
+			return;
+		}
+
+		const updatedScenes = scenes.filter((s) => s.id !== this.sceneId);
+
+		const newActiveScene = getFallbackSceneAfterDelete({
+			scenes: updatedScenes,
+			deletedSceneId: this.sceneId,
+			currentSceneId: activeScene?.id ?? null,
+		});
+
+		editor.scenes.setScenes({
+			scenes: updatedScenes,
+			activeSceneId: newActiveScene?.id,
+		});
+	}
+
+	undo(): void {
+		if (this.savedScenes && this.deletedScene) {
+			const editor = EditorCore.getInstance();
+			editor.scenes.setScenes({
+				scenes: this.savedScenes,
+				activeSceneId: this.savedActiveSceneId ?? undefined,
+			});
+		}
+	}
+}
diff --git a/apps/web/src/commands/scene/index.ts b/apps/web/src/commands/scene/index.ts
new file mode 100644
index 00000000..2b843c99
--- /dev/null
+++ b/apps/web/src/commands/scene/index.ts
@@ -0,0 +1,7 @@
+export { CreateSceneCommand } from "./create-scene";
+export { DeleteSceneCommand } from "./delete-scene";
+export { RenameSceneCommand } from "./rename-scene";
+export { ToggleBookmarkCommand } from "./toggle-bookmark";
+export { RemoveBookmarkCommand } from "./remove-bookmark";
+export { UpdateBookmarkCommand } from "./update-bookmark";
+export { MoveBookmarkCommand } from "./move-bookmark";
diff --git a/apps/web/src/commands/scene/move-bookmark.ts b/apps/web/src/commands/scene/move-bookmark.ts
new file mode 100644
index 00000000..a1624eb0
--- /dev/null
+++ b/apps/web/src/commands/scene/move-bookmark.ts
@@ -0,0 +1,59 @@
+import { Command, type CommandResult } from "@/commands/base-command";
+import { EditorCore } from "@/core";
+import type { TScene } from "@/timeline";
+import { updateSceneInArray } from "@/timeline/scenes";
+import { getFrameTime, moveBookmarkInArray } from "@/timeline/bookmarks/index";
+
+export class MoveBookmarkCommand extends Command {
+	private savedScenes: TScene[] | null = null;
+
+	constructor(
+		private fromTime: number,
+		private toTime: number,
+	) {
+		super();
+	}
+
+	execute(): CommandResult | undefined {
+		const editor = EditorCore.getInstance();
+		const activeScene = editor.scenes.getActiveScene();
+		const activeProject = editor.project.getActive();
+
+		if (!activeScene || !activeProject) {
+			return;
+		}
+
+		const scenes = editor.scenes.getScenes();
+		this.savedScenes = [...scenes];
+
+		const fromFrameTime = getFrameTime({
+			time: this.fromTime,
+			fps: activeProject.settings.fps,
+		});
+		const toFrameTime = getFrameTime({
+			time: this.toTime,
+			fps: activeProject.settings.fps,
+		});
+
+		const updatedBookmarks = moveBookmarkInArray({
+			bookmarks: activeScene.bookmarks,
+			fromTime: fromFrameTime,
+			toTime: toFrameTime,
+		});
+
+		const updatedScenes = updateSceneInArray({
+			scenes,
+			sceneId: activeScene.id,
+			updates: { bookmarks: updatedBookmarks },
+		});
+
+		editor.scenes.setScenes({ scenes: updatedScenes });
+	}
+
+	undo(): void {
+		if (this.savedScenes) {
+			const editor = EditorCore.getInstance();
+			editor.scenes.setScenes({ scenes: this.savedScenes });
+		}
+	}
+}
diff --git a/apps/web/src/commands/scene/remove-bookmark.ts b/apps/web/src/commands/scene/remove-bookmark.ts
new file mode 100644
index 00000000..ea592556
--- /dev/null
+++ b/apps/web/src/commands/scene/remove-bookmark.ts
@@ -0,0 +1,59 @@
+import { Command, type CommandResult } from "@/commands/base-command";
+import { EditorCore } from "@/core";
+import type { TScene } from "@/timeline";
+import { updateSceneInArray } from "@/timeline/scenes";
+import {
+	getFrameTime,
+	removeBookmarkFromArray,
+} from "@/timeline/bookmarks/index";
+
+export class RemoveBookmarkCommand extends Command {
+	private savedScenes: TScene[] | null = null;
+	private frameTime: number = 0;
+
+	constructor(private time: number) {
+		super();
+	}
+
+	execute(): CommandResult | undefined {
+		const editor = EditorCore.getInstance();
+		const activeScene = editor.scenes.getActiveScene();
+		const activeProject = editor.project.getActive();
+
+		if (!activeScene || !activeProject) {
+			return;
+		}
+
+		const scenes = editor.scenes.getScenes();
+		this.savedScenes = [...scenes];
+
+		this.frameTime = getFrameTime({
+			time: this.time,
+			fps: activeProject.settings.fps,
+		});
+
+		const updatedBookmarks = removeBookmarkFromArray({
+			bookmarks: activeScene.bookmarks,
+			frameTime: this.frameTime,
+		});
+
+		if (updatedBookmarks.length === activeScene.bookmarks.length) {
+			return;
+		}
+
+		const updatedScenes = updateSceneInArray({
+			scenes,
+			sceneId: activeScene.id,
+			updates: { bookmarks: updatedBookmarks },
+		});
+
+		editor.scenes.setScenes({ scenes: updatedScenes });
+	}
+
+	undo(): void {
+		if (this.savedScenes) {
+			const editor = EditorCore.getInstance();
+			editor.scenes.setScenes({ scenes: this.savedScenes });
+		}
+	}
+}
diff --git a/apps/web/src/commands/scene/rename-scene.ts b/apps/web/src/commands/scene/rename-scene.ts
new file mode 100644
index 00000000..19d6bfd8
--- /dev/null
+++ b/apps/web/src/commands/scene/rename-scene.ts
@@ -0,0 +1,46 @@
+import { Command, type CommandResult } from "@/commands/base-command";
+import { EditorCore } from "@/core";
+import type { TScene } from "@/timeline";
+import { updateSceneInArray } from "@/timeline/scenes";
+
+export class RenameSceneCommand extends Command {
+	private savedScenes: TScene[] | null = null;
+	private previousName: string | null = null;
+
+	constructor(
+		private sceneId: string,
+		private newName: string,
+	) {
+		super();
+	}
+
+	execute(): CommandResult | undefined {
+		const editor = EditorCore.getInstance();
+		const scenes = editor.scenes.getScenes();
+
+		this.savedScenes = [...scenes];
+
+		const scene = scenes.find((s) => s.id === this.sceneId);
+		if (!scene) {
+			console.error("Scene not found:", this.sceneId);
+			return;
+		}
+
+		this.previousName = scene.name;
+
+		const updatedScenes = updateSceneInArray({
+			scenes,
+			sceneId: this.sceneId,
+			updates: { name: this.newName, updatedAt: new Date() },
+		});
+
+		editor.scenes.setScenes({ scenes: updatedScenes });
+	}
+
+	undo(): void {
+		if (this.savedScenes && this.previousName !== null) {
+			const editor = EditorCore.getInstance();
+			editor.scenes.setScenes({ scenes: this.savedScenes });
+		}
+	}
+}
diff --git a/apps/web/src/commands/scene/toggle-bookmark.ts b/apps/web/src/commands/scene/toggle-bookmark.ts
new file mode 100644
index 00000000..4193c76e
--- /dev/null
+++ b/apps/web/src/commands/scene/toggle-bookmark.ts
@@ -0,0 +1,55 @@
+import { Command, type CommandResult } from "@/commands/base-command";
+import { EditorCore } from "@/core";
+import type { TScene } from "@/timeline";
+import { updateSceneInArray } from "@/timeline/scenes";
+import {
+	getFrameTime,
+	toggleBookmarkInArray,
+} from "@/timeline/bookmarks/index";
+
+export class ToggleBookmarkCommand extends Command {
+	private savedScenes: TScene[] | null = null;
+	private frameTime: number = 0;
+
+	constructor(private time: number) {
+		super();
+	}
+
+	execute(): CommandResult | undefined {
+		const editor = EditorCore.getInstance();
+		const activeScene = editor.scenes.getActiveScene();
+		const activeProject = editor.project.getActive();
+
+		if (!activeScene || !activeProject) {
+			return;
+		}
+
+		const scenes = editor.scenes.getScenes();
+		this.savedScenes = [...scenes];
+
+		this.frameTime = getFrameTime({
+			time: this.time,
+			fps: activeProject.settings.fps,
+		});
+
+		const updatedBookmarks = toggleBookmarkInArray({
+			bookmarks: activeScene.bookmarks,
+			frameTime: this.frameTime,
+		});
+
+		const updatedScenes = updateSceneInArray({
+			scenes,
+			sceneId: activeScene.id,
+			updates: { bookmarks: updatedBookmarks },
+		});
+
+		editor.scenes.setScenes({ scenes: updatedScenes });
+	}
+
+	undo(): void {
+		if (this.savedScenes) {
+			const editor = EditorCore.getInstance();
+			editor.scenes.setScenes({ scenes: this.savedScenes });
+		}
+	}
+}
diff --git a/apps/web/src/commands/scene/update-bookmark.ts b/apps/web/src/commands/scene/update-bookmark.ts
new file mode 100644
index 00000000..0d6a0193
--- /dev/null
+++ b/apps/web/src/commands/scene/update-bookmark.ts
@@ -0,0 +1,58 @@
+import { Command, type CommandResult } from "@/commands/base-command";
+import { EditorCore } from "@/core";
+import type { Bookmark, TScene } from "@/timeline";
+import { updateSceneInArray } from "@/timeline/scenes";
+import {
+	getFrameTime,
+	updateBookmarkInArray,
+} from "@/timeline/bookmarks/index";
+
+export class UpdateBookmarkCommand extends Command {
+	private savedScenes: TScene[] | null = null;
+
+	constructor(
+		private time: number,
+		private updates: Partial<Omit<Bookmark, "time">>,
+	) {
+		super();
+	}
+
+	execute(): CommandResult | undefined {
+		const editor = EditorCore.getInstance();
+		const activeScene = editor.scenes.getActiveScene();
+		const activeProject = editor.project.getActive();
+
+		if (!activeScene || !activeProject) {
+			return;
+		}
+
+		const scenes = editor.scenes.getScenes();
+		this.savedScenes = [...scenes];
+
+		const frameTime = getFrameTime({
+			time: this.time,
+			fps: activeProject.settings.fps,
+		});
+
+		const updatedBookmarks = updateBookmarkInArray({
+			bookmarks: activeScene.bookmarks,
+			frameTime,
+			updates: this.updates,
+		});
+
+		const updatedScenes = updateSceneInArray({
+			scenes,
+			sceneId: activeScene.id,
+			updates: { bookmarks: updatedBookmarks },
+		});
+
+		editor.scenes.setScenes({ scenes: updatedScenes });
+	}
+
+	undo(): void {
+		if (this.savedScenes) {
+			const editor = EditorCore.getInstance();
+			editor.scenes.setScenes({ scenes: this.savedScenes });
+		}
+	}
+}