From 1f15dc31a9a12f229a335405d8a88ae6d0a813a2 Mon Sep 17 00:00:00 2001
From: Richie McIlroy <33632126+richiemcilroy@users.noreply.github.com>
Date: Mon, 21 Sep 2026 11:46:11 +0100
Subject: [PATCH 01/74] feat: add Cap Pro Loom concierge migration

---
 apps/web/__tests__/unit/loom-csv.test.ts      |   25 +
 .../unit/loom-migration-state.test.ts         |   39 +
 apps/web/actions/loom-concierge.tsx           |  331 ++
 apps/web/actions/loom.ts                      |  429 +-
 .../dashboard/_components/Navbar/Items.tsx    |   25 +
 .../loom-migrations/LoomMigrationQueue.tsx    |  527 ++
 .../dashboard/admin/loom-migrations/page.tsx  |   17 +
 .../app/(org)/dashboard/import/ImportPage.tsx |   38 +-
 .../dashboard/import/loom/ImportLoomPage.tsx  |   61 +-
 .../migrations/loom/LoomMigrationPage.tsx     |  398 ++
 .../(org)/dashboard/migrations/loom/page.tsx  |   10 +
 apps/web/content/docs/migrating-to-cap.mdx    |   16 +-
 apps/web/lib/loom-concierge.ts                |  134 +
 apps/web/lib/loom-csv.ts                      |   72 +
 apps/web/lib/loom-migration-state.ts          |   80 +
 packages/database/emails/loom-migration.tsx   |   70 +
 .../migrations/0046_loom_concierge.sql        |   25 +
 .../migrations/meta/0046_snapshot.json        | 4735 +++++++++++++++++
 .../database/migrations/meta/_journal.json    |    7 +
 packages/database/schema.ts                   |   51 +
 20 files changed, 7031 insertions(+), 59 deletions(-)
 create mode 100644 apps/web/__tests__/unit/loom-csv.test.ts
 create mode 100644 apps/web/__tests__/unit/loom-migration-state.test.ts
 create mode 100644 apps/web/actions/loom-concierge.tsx
 create mode 100644 apps/web/app/(org)/dashboard/admin/loom-migrations/LoomMigrationQueue.tsx
 create mode 100644 apps/web/app/(org)/dashboard/admin/loom-migrations/page.tsx
 create mode 100644 apps/web/app/(org)/dashboard/migrations/loom/LoomMigrationPage.tsx
 create mode 100644 apps/web/app/(org)/dashboard/migrations/loom/page.tsx
 create mode 100644 apps/web/lib/loom-concierge.ts
 create mode 100644 apps/web/lib/loom-csv.ts
 create mode 100644 apps/web/lib/loom-migration-state.ts
 create mode 100644 packages/database/emails/loom-migration.tsx
 create mode 100644 packages/database/migrations/0046_loom_concierge.sql
 create mode 100644 packages/database/migrations/meta/0046_snapshot.json

diff --git a/apps/web/__tests__/unit/loom-csv.test.ts b/apps/web/__tests__/unit/loom-csv.test.ts
new file mode 100644
index 00000000000..5338285db28
--- /dev/null
+++ b/apps/web/__tests__/unit/loom-csv.test.ts
@@ -0,0 +1,25 @@
+import { describe, expect, it } from "vitest";
+import { parseConciergeLoomCsv } from "@/lib/loom-csv";
+
+describe("concierge Loom CSV", () => {
+	it("keeps quoted workspace names and source row numbers", () => {
+		const rows = parseConciergeLoomCsv(
+			"\uFEFFuser_email,space_name,loom_video_url\r\n" +
+				'owner@example.com,"Sales, Europe",https://www.loom.com/share/0123456789abcdef\r\n',
+		);
+		expect(rows).toEqual([
+			{
+				rowNumber: 2,
+				loomUrl: "https://www.loom.com/share/0123456789abcdef",
+				userEmail: "owner@example.com",
+				spaceName: "Sales, Europe",
+			},
+		]);
+	});
+
+	it("rejects a file without the mapping columns", () => {
+		expect(() => parseConciergeLoomCsv("url,email\nlink,person@x.com")).toThrow(
+			"loom_video_url and user_email",
+		);
+	});
+});
diff --git a/apps/web/__tests__/unit/loom-migration-state.test.ts b/apps/web/__tests__/unit/loom-migration-state.test.ts
new file mode 100644
index 00000000000..87b1f90a544
--- /dev/null
+++ b/apps/web/__tests__/unit/loom-migration-state.test.ts
@@ -0,0 +1,39 @@
+import { describe, expect, it } from "vitest";
+import { validateOperatorMigrationUpdate } from "@/lib/loom-migration-state";
+
+const base = {
+	currentStatus: "in_progress" as const,
+	nextStatus: "completed" as const,
+	message: "Migration finished",
+	verified: true,
+	expectedVideoCount: 12,
+	importedVideoCount: 12,
+};
+
+describe("Loom migration completion", () => {
+	it("requires a verified library and reconciled counts", () => {
+		expect(() =>
+			validateOperatorMigrationUpdate({ ...base, verified: false }),
+		).toThrow("Verify the migrated library");
+		expect(() =>
+			validateOperatorMigrationUpdate({ ...base, importedVideoCount: 11 }),
+		).toThrow("Reconcile the expected video count");
+		expect(() =>
+			validateOperatorMigrationUpdate({ ...base, expectedVideoCount: null }),
+		).toThrow("Enter the agreed source video count");
+	});
+
+	it("requires a useful message when Cap asks for information", () => {
+		expect(() =>
+			validateOperatorMigrationUpdate({
+				...base,
+				nextStatus: "needs_information",
+				message: "  ",
+			}),
+		).toThrow("Tell the customer");
+	});
+
+	it("accepts completion after verification", () => {
+		expect(validateOperatorMigrationUpdate(base)).toBe("Migration finished");
+	});
+});
diff --git a/apps/web/actions/loom-concierge.tsx b/apps/web/actions/loom-concierge.tsx
new file mode 100644
index 00000000000..b1a91d30f14
--- /dev/null
+++ b/apps/web/actions/loom-concierge.tsx
@@ -0,0 +1,331 @@
+"use server";
+
+import { db } from "@cap/database";
+import { sendEmail } from "@cap/database/emails/config";
+import {
+	LoomMigrationRequestEmail,
+	LoomMigrationStatusEmail,
+} from "@cap/database/emails/loom-migration";
+import { nanoId } from "@cap/database/helpers";
+import {
+	importedVideos,
+	loomMigrationRequests,
+	organizations,
+	users,
+	videoUploads,
+} from "@cap/database/schema";
+import { serverEnv } from "@cap/env";
+import type { Organisation } from "@cap/web-domain";
+import { and, eq, inArray, isNotNull } from "drizzle-orm";
+import { revalidatePath } from "next/cache";
+import {
+	getCustomerMigrationRequests,
+	getOperatorMigrationQueue,
+	requireCustomerMigrationAccess,
+	requireMigrationOperator,
+	requireProCustomerMigrationAccess,
+} from "@/lib/loom-concierge";
+import {
+	LOOM_MIGRATION_STATUS_LABELS,
+	type LoomMigrationStatus,
+	normalizeMigrationText,
+	validateOperatorMigrationUpdate,
+} from "@/lib/loom-migration-state";
+import { isOrganizationOwnerPro } from "@/lib/org-pro";
+
+const SUPPORT_EMAIL = "hello@cap.so";
+
+function affectedRows(result: unknown) {
+	if (Array.isArray(result)) {
+		return (
+			(result[0] as { affectedRows?: number } | undefined)?.affectedRows ?? 0
+		);
+	}
+	return (result as { affectedRows?: number } | undefined)?.affectedRows ?? 0;
+}
+
+function refreshMigrationPages() {
+	revalidatePath("/dashboard/migrations/loom");
+	revalidatePath("/dashboard/admin/loom-migrations");
+}
+
+async function findMigration(requestId: string) {
+	if (typeof requestId !== "string" || !/^[A-Za-z0-9_-]{15}$/.test(requestId)) {
+		throw new Error("Invalid migration request.");
+	}
+	const [request] = await db()
+		.select()
+		.from(loomMigrationRequests)
+		.where(eq(loomMigrationRequests.id, requestId))
+		.limit(1);
+	if (!request) throw new Error("Migration request not found.");
+	return request;
+}
+
+export async function getLoomMigrationDashboard(
+	organizationId: Organisation.OrganisationId,
+) {
+	await requireCustomerMigrationAccess(organizationId);
+	const [isPro, requests] = await Promise.all([
+		isOrganizationOwnerPro(organizationId),
+		getCustomerMigrationRequests(organizationId),
+	]);
+	return { isPro, requests };
+}
+
+export async function requestLoomMigration({
+	organizationId,
+	workspaceName,
+	note,
+}: {
+	organizationId: Organisation.OrganisationId;
+	workspaceName: string;
+	note: string;
+}) {
+	const user = await requireProCustomerMigrationAccess(organizationId);
+	const normalizedWorkspaceName = normalizeMigrationText(
+		workspaceName,
+		"Workspace name",
+		255,
+	);
+	const normalizedNote = normalizeMigrationText(note, "Note", 2000);
+	const [existing] = await db()
+		.select({ id: loomMigrationRequests.id })
+		.from(loomMigrationRequests)
+		.where(eq(loomMigrationRequests.activeOrganizationId, organizationId))
+		.limit(1);
+	if (existing) return { id: existing.id, alreadyRequested: true };
+
+	const id = nanoId();
+	try {
+		await db()
+			.insert(loomMigrationRequests)
+			.values({
+				id,
+				organizationId,
+				activeOrganizationId: organizationId,
+				requestedByUserId: user.id,
+				workspaceName: normalizedWorkspaceName || null,
+				customerNote: normalizedNote || null,
+			});
+	} catch (error) {
+		const [racedRequest] = await db()
+			.select({ id: loomMigrationRequests.id })
+			.from(loomMigrationRequests)
+			.where(eq(loomMigrationRequests.activeOrganizationId, organizationId))
+			.limit(1);
+		if (racedRequest) {
+			return { id: racedRequest.id, alreadyRequested: true };
+		}
+		throw error;
+	}
+
+	const [organization] = await db()
+		.select({ name: organizations.name })
+		.from(organizations)
+		.where(eq(organizations.id, organizationId))
+		.limit(1);
+	try {
+		const delivery = await sendEmail({
+			email: SUPPORT_EMAIL,
+			subject: `New Loom migration request: ${organization?.name ?? "Cap workspace"}`,
+			react: (
+				<LoomMigrationRequestEmail
+					organizationName={organization?.name ?? "Cap workspace"}
+					requesterEmail={user.email}
+					workspaceName={normalizedWorkspaceName || null}
+					queueUrl={`${serverEnv().WEB_URL}/dashboard/admin/loom-migrations`}
+				/>
+			),
+			idempotencyKey: `loom-migration-request-${id}`,
+		});
+		if (delivery?.error) {
+			console.error(
+				"Failed to send Loom migration request notice",
+				delivery.error,
+			);
+		}
+	} catch (error) {
+		console.error("Failed to send Loom migration request notice", error);
+	}
+
+	refreshMigrationPages();
+	return { id, alreadyRequested: false };
+}
+
+export async function confirmLoomMigrationInvite(requestId: string) {
+	const request = await findMigration(requestId);
+	await requireCustomerMigrationAccess(request.organizationId);
+	if (request.status === "completed") {
+		throw new Error("This migration is already complete.");
+	}
+	if (request.invitedAt) return;
+	const result = await db()
+		.update(loomMigrationRequests)
+		.set({ invitedAt: new Date(), updatedAt: new Date() })
+		.where(
+			and(
+				eq(loomMigrationRequests.id, requestId),
+				isNotNull(loomMigrationRequests.activeOrganizationId),
+			),
+		);
+	if (affectedRows(result) === 0) {
+		throw new Error("The migration request changed. Refresh and try again.");
+	}
+	refreshMigrationPages();
+}
+
+export async function answerLoomMigrationQuestion({
+	requestId,
+	answer,
+}: {
+	requestId: string;
+	answer: string;
+}) {
+	const request = await findMigration(requestId);
+	await requireCustomerMigrationAccess(request.organizationId);
+	const normalizedAnswer = normalizeMigrationText(answer, "Answer", 2000);
+	if (!normalizedAnswer)
+		throw new Error("Enter the information Cap asked for.");
+	const result = await db()
+		.update(loomMigrationRequests)
+		.set({
+			customerReply: normalizedAnswer,
+			status: "pending",
+			updatedAt: new Date(),
+		})
+		.where(
+			and(
+				eq(loomMigrationRequests.id, requestId),
+				eq(loomMigrationRequests.status, "needs_information"),
+			),
+		);
+	if (affectedRows(result) === 0) {
+		throw new Error("The migration request changed. Refresh and try again.");
+	}
+	refreshMigrationPages();
+}
+
+export async function getLoomMigrationOperatorQueue() {
+	return getOperatorMigrationQueue();
+}
+
+export async function updateLoomMigrationStatus({
+	requestId,
+	nextStatus,
+	message,
+	verified,
+	expectedVideoCount,
+	importedVideoCount,
+}: {
+	requestId: string;
+	nextStatus: LoomMigrationStatus;
+	message: string;
+	verified: boolean;
+	expectedVideoCount: number | null;
+	importedVideoCount: number;
+}) {
+	const operator = await requireMigrationOperator();
+	const request = await findMigration(requestId);
+	const normalizedMessage = validateOperatorMigrationUpdate({
+		currentStatus: request.status,
+		nextStatus,
+		message,
+		verified,
+		expectedVideoCount,
+		importedVideoCount,
+	});
+	if (
+		nextStatus === request.status &&
+		(normalizedMessage || null) === request.capMessage &&
+		expectedVideoCount === request.expectedVideoCount &&
+		importedVideoCount === request.importedVideoCount
+	) {
+		return;
+	}
+	if (nextStatus === "completed") {
+		const [unfinishedImport] = await db()
+			.select({ videoId: videoUploads.videoId })
+			.from(importedVideos)
+			.innerJoin(videoUploads, eq(videoUploads.videoId, importedVideos.id))
+			.where(
+				and(
+					eq(importedVideos.orgId, request.organizationId),
+					eq(importedVideos.source, "loom"),
+					inArray(videoUploads.phase, [
+						"uploading",
+						"processing",
+						"generating_thumbnail",
+						"error",
+					]),
+				),
+			)
+			.limit(1);
+		if (unfinishedImport) {
+			throw new Error(
+				"Loom imports are still processing or have errors. Resolve them before completion.",
+			);
+		}
+	}
+	const [organization] = await db()
+		.select({ name: organizations.name })
+		.from(organizations)
+		.where(eq(organizations.id, request.organizationId))
+		.limit(1);
+	const result = await db()
+		.update(loomMigrationRequests)
+		.set({
+			status: nextStatus,
+			capMessage: normalizedMessage || null,
+			expectedVideoCount,
+			importedVideoCount,
+			activeOrganizationId:
+				nextStatus === "completed" ? null : request.organizationId,
+			completedAt: nextStatus === "completed" ? new Date() : null,
+			lastOperatorUserId: operator.id,
+			lastOperatorAt: new Date(),
+			updatedAt: new Date(),
+		})
+		.where(
+			and(
+				eq(loomMigrationRequests.id, requestId),
+				eq(loomMigrationRequests.status, request.status),
+			),
+		);
+	if (affectedRows(result) === 0) {
+		throw new Error("The migration request changed. Refresh and try again.");
+	}
+
+	const [requester] = await db()
+		.select({ email: users.email })
+		.from(users)
+		.where(eq(users.id, request.requestedByUserId))
+		.limit(1);
+	if (requester) {
+		try {
+			const delivery = await sendEmail({
+				email: requester.email,
+				subject: `Loom migration: ${LOOM_MIGRATION_STATUS_LABELS[nextStatus]}`,
+				react: (
+					<LoomMigrationStatusEmail
+						organizationName={organization?.name ?? "your Cap workspace"}
+						statusLabel={LOOM_MIGRATION_STATUS_LABELS[nextStatus]}
+						message={normalizedMessage || null}
+						dashboardUrl={`${serverEnv().WEB_URL}/dashboard/migrations/loom`}
+					/>
+				),
+				replyTo: SUPPORT_EMAIL,
+				idempotencyKey: `loom-migration-status-${requestId}-${Date.now()}`,
+			});
+			if (delivery?.error) {
+				console.error(
+					"Failed to send Loom migration status notice",
+					delivery.error,
+				);
+			}
+		} catch (error) {
+			console.error("Failed to send Loom migration status notice", error);
+		}
+	}
+	refreshMigrationPages();
+}
diff --git a/apps/web/actions/loom.ts b/apps/web/actions/loom.ts
index b9e03dcecf9..7cb49e13fac 100644
--- a/apps/web/actions/loom.ts
+++ b/apps/web/actions/loom.ts
@@ -7,7 +7,9 @@ import { nanoId } from "@cap/database/helpers";
 import {
 	folders,
 	importedVideos,
+	loomMigrationRequests,
 	organizationMembers,
+	organizations,
 	sharedVideos,
 	spaceMembers,
 	spaces,
@@ -23,11 +25,12 @@ import {
 	type Organisation,
 	Space,
 	SpaceMemberId,
+	type Storage as StorageDomain,
 	type User,
 	Video,
 } from "@cap/web-domain";
-import { and, asc, eq, isNull } from "drizzle-orm";
-import { Option } from "effect";
+import { and, asc, eq, isNotNull, isNull, sql } from "drizzle-orm";
+import { Effect, Option, Schedule } from "effect";
 import { revalidatePath } from "next/cache";
 import { start } from "workflow/api";
 import {
@@ -36,10 +39,14 @@ import {
 	requireOrganizationSettingsManager,
 } from "@/actions/organization/authorization";
 import { requireSpaceManager } from "@/actions/organization/space-authorization";
+import { requireMigrationOperator } from "@/lib/loom-concierge";
 import type { LoomImportDestination } from "@/lib/loom-import-destination";
+import { isOrganizationOwnerPro } from "@/lib/org-pro";
 import { provisionOrganizationInvitee } from "@/lib/organization-provisioning";
 import { canManageOrganizationSettings } from "@/lib/permissions/roles";
 import { runPromise } from "@/lib/server";
+import { startVideoProcessingWorkflow } from "@/lib/video-processing";
+import { decodeStorageVideo } from "@/lib/video-storage";
 import { importLoomVideoWorkflow } from "@/workflows/import-loom-video";
 
 interface LoomUrlResponse {
@@ -97,10 +104,22 @@ const LOOM_CSV_LIMIT_ERROR = `CSV imports are limited to ${MAX_LOOM_CSV_ROWS} ro
 const LOOM_CSV_PERMISSION_ERROR =
 	"Only organization admins and owners can import Loom videos from a CSV.";
 
+function affectedRows(result: unknown) {
+	if (Array.isArray(result)) {
+		return (
+			(result[0] as { affectedRows?: number } | undefined)?.affectedRows ?? 0
+		);
+	}
+	return (result as { affectedRows?: number } | undefined)?.affectedRows ?? 0;
+}
+
 function extractLoomVideoId(url: string): string | null {
 	try {
 		const parsed = new URL(url);
-		if (!parsed.hostname.includes("loom.com")) {
+		if (
+			parsed.protocol !== "https:" ||
+			(parsed.hostname !== "loom.com" && !parsed.hostname.endsWith(".loom.com"))
+		) {
 			return null;
 		}
 
@@ -770,6 +789,18 @@ export async function importFromLoomCsv({
 		};
 	}
 
+	return processLoomCsvRows({ rows, orgId, actorId: user.id });
+}
+
+async function processLoomCsvRows({
+	rows,
+	orgId,
+	actorId,
+}: {
+	rows: LoomCsvImportRow[];
+	orgId: Organisation.OrganisationId;
+	actorId: User.UserId;
+}): Promise<LoomCsvImportResult> {
 	const inputRows = Array.isArray(rows) ? rows : [];
 	const normalizedRows = inputRows
 		.map((row, index) => ({
@@ -854,7 +885,7 @@ export async function importFromLoomCsv({
 				const provisionedMember = await provisionOrganizationInvitee({
 					organizationId: orgId,
 					email: row.userEmail,
-					invitedByUserId: user.id,
+					invitedByUserId: actorId,
 					role: "member",
 				});
 				member = {
@@ -886,14 +917,14 @@ export async function importFromLoomCsv({
 				try {
 					const space = await getOrCreateImportSpace({
 						orgId,
-						createdById: user.id,
+						createdById: actorId,
 						name: row.spaceName,
 						spaceCache,
 					});
 					await addImportedVideoToSpace({
 						videoId: result.videoId,
 						spaceId: space.id,
-						addedById: user.id,
+						addedById: actorId,
 					});
 					await addImportOwnerToSpace({
 						spaceId: space.id,
@@ -944,3 +975,389 @@ export async function importFromLoomCsv({
 		error: importedCount > 0 ? undefined : "No Loom videos were imported.",
 	};
 }
+
+export async function importFromLoomCsvForConcierge({
+	requestId,
+	rows,
+}: {
+	requestId: string;
+	rows: LoomCsvImportRow[];
+}): Promise<LoomCsvImportResult> {
+	const operator = await requireMigrationOperator();
+	if (typeof requestId !== "string" || !/^[A-Za-z0-9_-]{15}$/.test(requestId)) {
+		throw new Error("Invalid migration request.");
+	}
+	const [request] = await db()
+		.select({
+			organizationId: loomMigrationRequests.organizationId,
+			status: loomMigrationRequests.status,
+			ownerId: organizations.ownerId,
+		})
+		.from(loomMigrationRequests)
+		.innerJoin(
+			organizations,
+			eq(organizations.id, loomMigrationRequests.organizationId),
+		)
+		.where(
+			and(
+				eq(loomMigrationRequests.id, requestId),
+				isNotNull(loomMigrationRequests.activeOrganizationId),
+				isNull(organizations.tombstoneAt),
+			),
+		)
+		.limit(1);
+	if (!request || request.status === "completed") {
+		throw new Error("The migration request is no longer active.");
+	}
+	if (!(await isOrganizationOwnerPro(request.organizationId))) {
+		throw new Error("The destination workspace needs Cap Pro.");
+	}
+	const claimed = await db()
+		.update(loomMigrationRequests)
+		.set({
+			status: "in_progress",
+			lastOperatorUserId: operator.id,
+			lastOperatorAt: new Date(),
+			updatedAt: new Date(),
+		})
+		.where(
+			and(
+				eq(loomMigrationRequests.id, requestId),
+				isNotNull(loomMigrationRequests.activeOrganizationId),
+			),
+		);
+	if (affectedRows(claimed) === 0) {
+		throw new Error("The migration request changed. Refresh and try again.");
+	}
+	const result = await processLoomCsvRows({
+		rows,
+		orgId: request.organizationId,
+		actorId: request.ownerId,
+	});
+	if (result.importedCount > 0) {
+		const updated = await db()
+			.update(loomMigrationRequests)
+			.set({
+				queuedVideoCount: sql`${loomMigrationRequests.queuedVideoCount} + ${result.importedCount}`,
+				lastOperatorUserId: operator.id,
+				lastOperatorAt: new Date(),
+				updatedAt: new Date(),
+			})
+			.where(
+				and(
+					eq(loomMigrationRequests.id, requestId),
+					isNotNull(loomMigrationRequests.activeOrganizationId),
+				),
+			);
+		if (affectedRows(updated) === 0) {
+			throw new Error(
+				"The migration request changed after jobs started. Review them before retrying.",
+			);
+		}
+	}
+	revalidatePath("/dashboard/migrations/loom");
+	revalidatePath("/dashboard/admin/loom-migrations");
+	return result;
+}
+
+export async function createConciergeLoomFileUpload({
+	requestId,
+	loomUrl,
+	userEmail,
+	spaceName,
+	videoTitle,
+}: {
+	requestId: string;
+	loomUrl: string;
+	userEmail: string;
+	spaceName: string;
+	videoTitle: string;
+}): Promise<{
+	videoId: Video.VideoId;
+	uploadTarget: StorageDomain.UploadTarget;
+}> {
+	const operator = await requireMigrationOperator();
+	if (typeof requestId !== "string" || !/^[A-Za-z0-9_-]{15}$/.test(requestId)) {
+		throw new Error("Invalid migration request.");
+	}
+	const loomVideoId = extractLoomVideoId(loomUrl.trim());
+	if (!loomVideoId) throw new Error("Enter a valid Loom video URL.");
+	const normalizedEmail = normalizeImportEmail(userEmail);
+	if (!isValidImportEmail(normalizedEmail)) {
+		throw new Error("Enter a valid destination owner email.");
+	}
+	const normalizedSpaceName = normalizeImportSpaceName(spaceName);
+	if (!isValidImportSpaceName(normalizedSpaceName)) {
+		throw new Error("Space name is too long.");
+	}
+	const normalizedTitle = videoTitle.trim();
+	if (!normalizedTitle || normalizedTitle.length > 255) {
+		throw new Error("Enter a video title of 255 characters or fewer.");
+	}
+	const [request] = await db()
+		.select({
+			organizationId: loomMigrationRequests.organizationId,
+			ownerId: organizations.ownerId,
+		})
+		.from(loomMigrationRequests)
+		.innerJoin(
+			organizations,
+			eq(organizations.id, loomMigrationRequests.organizationId),
+		)
+		.where(
+			and(
+				eq(loomMigrationRequests.id, requestId),
+				isNotNull(loomMigrationRequests.activeOrganizationId),
+				isNull(organizations.tombstoneAt),
+			),
+		)
+		.limit(1);
+	if (!request) throw new Error("The migration request is no longer active.");
+	if (!(await isOrganizationOwnerPro(request.organizationId))) {
+		throw new Error("The destination workspace needs Cap Pro.");
+	}
+	const [existing] = await db()
+		.select({
+			id: importedVideos.id,
+			ownerId: videos.ownerId,
+			ownerEmail: users.email,
+			bucket: videos.bucket,
+			storageIntegrationId: videos.storageIntegrationId,
+			rawFileKey: videoUploads.rawFileKey,
+			phase: videoUploads.phase,
+			processingMessage: videoUploads.processingMessage,
+		})
+		.from(importedVideos)
+		.leftJoin(
+			videos,
+			and(
+				eq(videos.id, importedVideos.id),
+				eq(videos.orgId, importedVideos.orgId),
+			),
+		)
+		.leftJoin(users, eq(users.id, videos.ownerId))
+		.leftJoin(videoUploads, eq(videoUploads.videoId, importedVideos.id))
+		.where(
+			and(
+				eq(importedVideos.orgId, request.organizationId),
+				eq(importedVideos.source, "loom"),
+				eq(importedVideos.sourceId, loomVideoId),
+			),
+		)
+		.limit(1);
+	if (existing) {
+		if (
+			!existing.ownerId ||
+			!existing.ownerEmail ||
+			normalizeImportEmail(existing.ownerEmail) !== normalizedEmail ||
+			!existing.rawFileKey ||
+			(existing.phase !== "error" &&
+				(existing.phase !== "uploading" ||
+					existing.processingMessage !== "Uploading Loom video..."))
+		) {
+			throw new Error(
+				"This Loom video is already in the Cap import inventory.",
+			);
+		}
+		const retryUpload = await Storage.createUploadTargetForUser(
+			existing.ownerId,
+			existing.rawFileKey,
+			{
+				contentType: "video/mp4",
+				videoTitle: normalizedTitle,
+				method: "put",
+				fields: { "x-amz-meta-userid": existing.ownerId },
+			},
+			request.organizationId,
+		).pipe(runPromise);
+		if (
+			Option.getOrNull(retryUpload.bucketId) !== existing.bucket ||
+			Option.getOrNull(retryUpload.storageIntegrationId) !==
+				existing.storageIntegrationId
+		) {
+			throw new Error(
+				"The Cap storage destination changed. Review this upload before retrying.",
+			);
+		}
+		return {
+			videoId: Video.VideoId.make(existing.id),
+			uploadTarget: retryUpload.upload,
+		};
+	}
+	let member = await getOrganizationMemberByEmail(
+		request.organizationId,
+		normalizedEmail,
+	);
+	if (!member) {
+		const provisioned = await provisionOrganizationInvitee({
+			organizationId: request.organizationId,
+			email: normalizedEmail,
+			invitedByUserId: request.ownerId,
+			role: "member",
+		});
+		member = { userId: provisioned.userId, email: normalizedEmail };
+	}
+	const space = normalizedSpaceName
+		? await getOrCreateImportSpace({
+				orgId: request.organizationId,
+				createdById: request.ownerId,
+				name: normalizedSpaceName,
+				spaceCache: new Map(),
+			})
+		: null;
+	if (space) {
+		await addImportOwnerToSpace({ spaceId: space.id, userId: member.userId });
+	}
+	const videoId = Video.VideoId.make(nanoId());
+	const rawFileKey = `${member.userId}/${videoId}/raw-upload.mp4`;
+	const upload = await Storage.createUploadTargetForUser(
+		member.userId,
+		rawFileKey,
+		{
+			contentType: "video/mp4",
+			videoTitle: normalizedTitle,
+			method: "put",
+			fields: { "x-amz-meta-userid": member.userId },
+		},
+		request.organizationId,
+	).pipe(runPromise);
+	await db().transaction(async (tx) => {
+		await tx.insert(videos).values({
+			id: videoId,
+			name: normalizedTitle,
+			ownerId: member.userId,
+			orgId: request.organizationId,
+			source: { type: "webMP4" as const },
+			bucket: Option.getOrNull(upload.bucketId),
+			storageIntegrationId: Option.getOrNull(upload.storageIntegrationId),
+			public: serverEnv().CAP_VIDEOS_DEFAULT_PUBLIC,
+		});
+		await tx.insert(videoUploads).values({
+			videoId,
+			mode: "singlepart",
+			phase: "uploading",
+			processingProgress: 0,
+			processingMessage: "Uploading Loom video...",
+			rawFileKey,
+		});
+		await tx.insert(importedVideos).values({
+			id: videoId,
+			orgId: request.organizationId,
+			source: "loom",
+			sourceId: loomVideoId,
+		});
+		if (space) {
+			await tx.insert(spaceVideos).values({
+				id: nanoId(),
+				videoId,
+				spaceId: space.id,
+				addedById: request.ownerId,
+			});
+		}
+	});
+	await db()
+		.update(loomMigrationRequests)
+		.set({
+			status: "in_progress",
+			lastOperatorUserId: operator.id,
+			lastOperatorAt: new Date(),
+			updatedAt: new Date(),
+		})
+		.where(
+			and(
+				eq(loomMigrationRequests.id, requestId),
+				isNotNull(loomMigrationRequests.activeOrganizationId),
+			),
+		);
+	revalidatePath("/dashboard/admin/loom-migrations");
+	return { videoId, uploadTarget: upload.upload };
+}
+
+export async function finishConciergeLoomFileUpload({
+	requestId,
+	videoId,
+}: {
+	requestId: string;
+	videoId: Video.VideoId;
+}) {
+	const operator = await requireMigrationOperator();
+	if (typeof requestId !== "string" || !/^[A-Za-z0-9_-]{15}$/.test(requestId)) {
+		throw new Error("Invalid migration request.");
+	}
+	const [record] = await db()
+		.select({
+			video: videos,
+			rawFileKey: videoUploads.rawFileKey,
+			phase: videoUploads.phase,
+			processingMessage: videoUploads.processingMessage,
+		})
+		.from(videos)
+		.innerJoin(
+			importedVideos,
+			and(
+				eq(importedVideos.id, videos.id),
+				eq(importedVideos.orgId, videos.orgId),
+			),
+		)
+		.innerJoin(videoUploads, eq(videoUploads.videoId, videos.id))
+		.innerJoin(
+			loomMigrationRequests,
+			eq(loomMigrationRequests.organizationId, importedVideos.orgId),
+		)
+		.where(
+			and(
+				eq(videos.id, videoId),
+				eq(loomMigrationRequests.id, requestId),
+				eq(importedVideos.source, "loom"),
+				isNotNull(loomMigrationRequests.activeOrganizationId),
+			),
+		)
+		.limit(1);
+	if (
+		!record ||
+		!record.rawFileKey ||
+		(record.phase !== "error" &&
+			(record.phase !== "uploading" ||
+				record.processingMessage !== "Uploading Loom video..."))
+	) {
+		throw new Error("This Loom upload is no longer available.");
+	}
+	const [bucket] = await Storage.getAccessForVideo(
+		decodeStorageVideo(record.video),
+	).pipe(runPromise);
+	const head = await bucket
+		.headObject(record.rawFileKey)
+		.pipe(
+			Effect.retry({ times: 3, schedule: Schedule.exponential("100 millis") }),
+			runPromise,
+		);
+	if ((head.ContentLength ?? 0) <= 0)
+		throw new Error("The uploaded file is empty.");
+	const status = await startVideoProcessingWorkflow({
+		videoId,
+		userId: record.video.ownerId,
+		rawFileKey: record.rawFileKey,
+		bucketId: record.video.bucket,
+		processingMessage: "Processing Loom video...",
+		startFailureMessage: "Loom file processing could not start.",
+	});
+	if (status === "started") {
+		await db()
+			.update(loomMigrationRequests)
+			.set({
+				queuedVideoCount: sql`${loomMigrationRequests.queuedVideoCount} + 1`,
+				lastOperatorUserId: operator.id,
+				lastOperatorAt: new Date(),
+				updatedAt: new Date(),
+			})
+			.where(
+				and(
+					eq(loomMigrationRequests.id, requestId),
+					isNotNull(loomMigrationRequests.activeOrganizationId),
+				),
+			);
+	}
+	revalidatePath("/dashboard/migrations/loom");
+	revalidatePath("/dashboard/admin/loom-migrations");
+	return { status };
+}
diff --git a/apps/web/app/(org)/dashboard/_components/Navbar/Items.tsx b/apps/web/app/(org)/dashboard/_components/Navbar/Items.tsx
index e91138d70e5..d5d0ebfe639 100644
--- a/apps/web/app/(org)/dashboard/_components/Navbar/Items.tsx
+++ b/apps/web/app/(org)/dashboard/_components/Navbar/Items.tsx
@@ -46,6 +46,7 @@ import {
 	loomImportDestinationFromPathname,
 	loomImportPageHref,
 } from "@/lib/loom-import-destination";
+import { MESSENGER_ADMIN_EMAIL } from "@/lib/messenger/constants";
 import {
 	canViewOrganizationSettings,
 	getEffectiveOrganizationRole,
@@ -78,6 +79,9 @@ const AdminNavItems = ({ toggleMobileNav }: Props) => {
 	const showDeveloperDashboard =
 		buildEnv.NEXT_PUBLIC_IS_CAP &&
 		DEVELOPER_DASHBOARD_ALLOWED_EMAILS.includes(user.email);
+	const showMigrationQueue =
+		buildEnv.NEXT_PUBLIC_IS_CAP &&
+		user.email.toLowerCase() === MESSENGER_ADMIN_EMAIL;
 
 	const manageNavigation = [
 		{
@@ -107,6 +111,17 @@ const AdminNavItems = ({ toggleMobileNav }: Props) => {
 			icon: <ImportIcon />,
 			subNav: [],
 		},
+		...(buildEnv.NEXT_PUBLIC_IS_CAP
+			? [
+					{
+						name: "Loom Migration",
+						href: "/dashboard/migrations/loom",
+						adminOnly: true,
+						icon: <ImportIcon />,
+						subNav: [],
+					},
+				]
+			: []),
 		{
 			name: "Organization Settings",
 			href: `/dashboard/settings/organization`,
@@ -127,6 +142,16 @@ const AdminNavItems = ({ toggleMobileNav }: Props) => {
 					},
 				]
 			: []),
+		...(showMigrationQueue
+			? [
+					{
+						name: "Migration Queue",
+						href: "/dashboard/admin/loom-migrations",
+						icon: <ImportIcon />,
+						subNav: [],
+					},
+				]
+			: []),
 	];
 
 	const [dialogOpen, setDialogOpen] = useState(false);
diff --git a/apps/web/app/(org)/dashboard/admin/loom-migrations/LoomMigrationQueue.tsx b/apps/web/app/(org)/dashboard/admin/loom-migrations/LoomMigrationQueue.tsx
new file mode 100644
index 00000000000..d256a9aded3
--- /dev/null
+++ b/apps/web/app/(org)/dashboard/admin/loom-migrations/LoomMigrationQueue.tsx
@@ -0,0 +1,527 @@
+"use client";
+
+import { Button } from "@cap/ui";
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { LoaderCircle } from "lucide-react";
+import { useEffect, useState } from "react";
+import { toast } from "sonner";
+import {
+	createConciergeLoomFileUpload,
+	finishConciergeLoomFileUpload,
+	importFromLoomCsvForConcierge,
+	type LoomCsvImportRow,
+	type LoomCsvImportRowResult,
+} from "@/actions/loom";
+import {
+	getLoomMigrationOperatorQueue,
+	updateLoomMigrationStatus,
+} from "@/actions/loom-concierge";
+import type { OperatorLoomMigrationView } from "@/lib/loom-concierge";
+import { parseConciergeLoomCsv } from "@/lib/loom-csv";
+import {
+	LOOM_MIGRATION_STATUS_LABELS,
+	type LoomMigrationStatus,
+} from "@/lib/loom-migration-state";
+import { uploadWithTarget } from "@/utils/upload-target";
+
+const BATCH_SIZE = 10;
+const BATCH_DELAY_MS = 1500;
+
+function delay(ms: number) {
+	return new Promise<void>((resolve) => setTimeout(resolve, ms));
+}
+
+function QueueItem({ request }: { request: OperatorLoomMigrationView }) {
+	const queryClient = useQueryClient();
+	const [nextStatus, setNextStatus] = useState<LoomMigrationStatus>(
+		request.status,
+	);
+	const [message, setMessage] = useState(request.capMessage ?? "");
+	const [expectedVideoCount, setExpectedVideoCount] = useState(
+		request.expectedVideoCount?.toString() ?? "",
+	);
+	const [importedVideoCount, setImportedVideoCount] = useState(
+		request.importedVideoCount.toString(),
+	);
+	const [verified, setVerified] = useState(false);
+	const [csvRows, setCsvRows] = useState<LoomCsvImportRow[]>([]);
+	const [processedRows, setProcessedRows] = useState(0);
+	const [startedRows, setStartedRows] = useState(0);
+	const [failedRows, setFailedRows] = useState<LoomCsvImportRowResult[]>([]);
+	const [fileLoomUrl, setFileLoomUrl] = useState("");
+	const [fileOwnerEmail, setFileOwnerEmail] = useState("");
+	const [fileSpaceName, setFileSpaceName] = useState("");
+	const [fileTitle, setFileTitle] = useState("");
+	const [file, setFile] = useState<File | null>(null);
+	const [uploadPercent, setUploadPercent] = useState(0);
+
+	useEffect(() => {
+		setNextStatus(request.status);
+		setMessage(request.capMessage ?? "");
+		setExpectedVideoCount(request.expectedVideoCount?.toString() ?? "");
+		setImportedVideoCount(request.importedVideoCount.toString());
+		setVerified(false);
+	}, [
+		request.status,
+		request.capMessage,
+		request.expectedVideoCount,
+		request.importedVideoCount,
+	]);
+
+	const refresh = () =>
+		queryClient.invalidateQueries({ queryKey: ["loom-migration-queue"] });
+	const statusMutation = useMutation({
+		mutationFn: () =>
+			updateLoomMigrationStatus({
+				requestId: request.id,
+				nextStatus,
+				message,
+				verified,
+				expectedVideoCount:
+					expectedVideoCount.trim() === "" ? null : Number(expectedVideoCount),
+				importedVideoCount: Number(importedVideoCount),
+			}),
+		onSuccess: async () => {
+			await refresh();
+			toast.success("Migration status updated.");
+		},
+		onError: (error) => toast.error(error.message),
+	});
+	const importMutation = useMutation({
+		mutationFn: async () => {
+			if (csvRows.length === 0) throw new Error("Choose a Loom CSV first.");
+			setProcessedRows(0);
+			setStartedRows(0);
+			setFailedRows([]);
+			let started = 0;
+			const failures: LoomCsvImportRowResult[] = [];
+			for (let index = 0; index < csvRows.length; index += BATCH_SIZE) {
+				const batch = csvRows.slice(index, index + BATCH_SIZE);
+				const result = await importFromLoomCsvForConcierge({
+					requestId: request.id,
+					rows: batch,
+				});
+				started += result.importedCount;
+				failures.push(...result.results.filter((row) => !row.success));
+				setProcessedRows(index + batch.length);
+				setStartedRows(started);
+				setFailedRows([...failures]);
+				if (index + BATCH_SIZE < csvRows.length) await delay(BATCH_DELAY_MS);
+			}
+			return { started, failures };
+		},
+		onSuccess: async (result) => {
+			await refresh();
+			toast.success(
+				`${result.started} imports started. ${result.failures.length} rows need review. Wait for processing and reconcile the library before completion.`,
+			);
+		},
+		onError: async (error) => {
+			await refresh();
+			toast.error(
+				`${error.message} Check the rows already started before retrying.`,
+			);
+		},
+	});
+	const fileMutation = useMutation({
+		mutationFn: async () => {
+			if (!file || !fileLoomUrl.trim() || !fileOwnerEmail.trim()) {
+				throw new Error("Choose an MP4 file, Loom URL, and destination owner.");
+			}
+			if (!file.name.toLowerCase().endsWith(".mp4")) {
+				throw new Error("Choose an MP4 downloaded from Loom.");
+			}
+			if (file.size === 0) throw new Error("The MP4 file is empty.");
+			const prepared = await createConciergeLoomFileUpload({
+				requestId: request.id,
+				loomUrl: fileLoomUrl,
+				userEmail: fileOwnerEmail,
+				spaceName: fileSpaceName,
+				videoTitle: fileTitle.trim() || file.name.replace(/\.mp4$/i, ""),
+			});
+			setUploadPercent(0);
+			await uploadWithTarget({
+				target: prepared.uploadTarget,
+				body: file,
+				fileName: file.name,
+				onProgress: ({ loaded, total }) => {
+					if (total > 0) setUploadPercent(Math.round((loaded / total) * 100));
+				},
+			});
+			return finishConciergeLoomFileUpload({
+				requestId: request.id,
+				videoId: prepared.videoId,
+			});
+		},
+		onSuccess: async (result) => {
+			await refresh();
+			setFile(null);
+			setUploadPercent(0);
+			toast.success(
+				result.status === "started"
+					? "Loom file uploaded. Processing has started."
+					: "Loom file uploaded. Processing was already underway.",
+			);
+		},
+		onError: async (error) => {
+			await refresh();
+			toast.error(
+				`${error.message} The same Loom URL can be retried after checking its upload.`,
+			);
+		},
+	});
+
+	return (
+		<div className="rounded-xl border border-gray-4 bg-gray-1 p-5">
+			<div className="flex flex-wrap items-start justify-between gap-3">
+				<div>
+					<h2 className="text-lg font-medium text-gray-12">
+						{request.organizationName}
+					</h2>
+					<p className="mt-1 text-xs text-gray-10">
+						{request.requestedByEmail} · {request.organizationId} · Requested{" "}
+						{new Date(request.createdAt).toLocaleDateString()}
+					</p>
+				</div>
+				<span className="rounded-full bg-gray-3 px-3 py-1 text-xs text-gray-11">
+					{LOOM_MIGRATION_STATUS_LABELS[request.status]}
+				</span>
+			</div>
+			<div className="mt-4 grid gap-2 text-sm text-gray-11 sm:grid-cols-2">
+				<p>Loom workspace: {request.workspaceName || "Not provided"}</p>
+				<p>
+					Loom invite:{" "}
+					{request.invitedAt ? "Marked as sent" : "Waiting for customer"}
+				</p>
+				<p>Jobs started: {request.queuedVideoCount}</p>
+				<p>Verified videos: {request.importedVideoCount}</p>
+			</div>
+			{request.customerNote && (
+				<div className="mt-4 rounded-lg bg-gray-3 p-3 text-sm text-gray-11">
+					Customer note: {request.customerNote}
+				</div>
+			)}
+			{request.customerReply && (
+				<div className="mt-3 rounded-lg bg-blue-3 p-3 text-sm text-gray-11">
+					Latest customer answer: {request.customerReply}
+				</div>
+			)}
+
+			<div className="mt-5 border-t border-gray-4 pt-5">
+				<h3 className="font-medium text-gray-12">Import a mapped Loom CSV</h3>
+				<p className="mt-1 text-xs text-gray-10">
+					Use loom_video_url,user_email,space_name. The destination is this Cap
+					organization; imports run in batches of 10. Started jobs still need
+					terminal processing checks.
+				</p>
+				<label
+					className="mt-3 block text-sm text-gray-11"
+					htmlFor={`loom-csv-${request.id}`}
+				>
+					Loom CSV
+				</label>
+				<input
+					accept=".csv,text/csv"
+					className="mt-2 block w-full text-sm text-gray-11"
+					disabled={importMutation.isPending}
+					id={`loom-csv-${request.id}`}
+					onChange={async (event) => {
+						const file = event.target.files?.[0];
+						if (!file) return;
+						try {
+							setCsvRows(parseConciergeLoomCsv(await file.text()));
+							setProcessedRows(0);
+							setStartedRows(0);
+							setFailedRows([]);
+						} catch (error) {
+							setCsvRows([]);
+							toast.error(
+								error instanceof Error
+									? error.message
+									: "Could not read the CSV.",
+							);
+						}
+					}}
+					type="file"
+				/>
+				{csvRows.length > 0 && (
+					<p className="mt-2 text-xs text-gray-10">
+						{csvRows.length} rows ready. Review the source inventory and owner
+						mapping before import.
+					</p>
+				)}
+				<Button
+					className="mt-3"
+					disabled={importMutation.isPending || csvRows.length === 0}
+					onClick={() => importMutation.mutate()}
+					size="sm"
+					variant="dark"
+				>
+					{importMutation.isPending
+						? `Importing ${processedRows}/${csvRows.length}`
+						: "Start import"}
+				</Button>
+				{processedRows > 0 && (
+					<p className="mt-2 text-xs text-gray-10">
+						{startedRows} jobs started; {failedRows.length} rows failed to
+						start.
+					</p>
+				)}
+				{failedRows.length > 0 && (
+					<ul className="mt-3 max-h-48 list-inside list-disc overflow-y-auto text-xs text-red-11">
+						{failedRows.map((row) => (
+							<li key={row.rowNumber}>
+								Row {row.rowNumber}: {row.error || "Could not start import."}
+							</li>
+						))}
+					</ul>
+				)}
+			</div>
+
+			<form
+				className="mt-5 grid gap-3 border-t border-gray-4 pt-5"
+				onSubmit={(event) => {
+					event.preventDefault();
+					fileMutation.mutate();
+				}}
+			>
+				<h3 className="font-medium text-gray-12">
+					Upload a restricted Loom video
+				</h3>
+				<p className="text-xs text-gray-10">
+					Use this when the CSV import cannot download a video. Download an MP4
+					from Loom with an account that has permission, then map it to its Loom
+					link and Cap owner. Restricted Library videos may need explicit
+					access.
+				</p>
+				<div className="grid gap-3 sm:grid-cols-2">
+					<label
+						className="text-sm text-gray-11"
+						htmlFor={`loom-file-url-${request.id}`}
+					>
+						Loom video URL
+						<input
+							className="mt-1 w-full rounded-lg border border-gray-6 bg-gray-1 px-3 py-2 text-gray-12"
+							id={`loom-file-url-${request.id}`}
+							onChange={(event) => setFileLoomUrl(event.target.value)}
+							placeholder="https://www.loom.com/share/..."
+							type="url"
+							value={fileLoomUrl}
+						/>
+					</label>
+					<label
+						className="text-sm text-gray-11"
+						htmlFor={`loom-file-owner-${request.id}`}
+					>
+						Cap owner email
+						<input
+							className="mt-1 w-full rounded-lg border border-gray-6 bg-gray-1 px-3 py-2 text-gray-12"
+							id={`loom-file-owner-${request.id}`}
+							onChange={(event) => setFileOwnerEmail(event.target.value)}
+							type="email"
+							value={fileOwnerEmail}
+						/>
+					</label>
+					<label
+						className="text-sm text-gray-11"
+						htmlFor={`loom-file-space-${request.id}`}
+					>
+						Cap space (optional)
+						<input
+							className="mt-1 w-full rounded-lg border border-gray-6 bg-gray-1 px-3 py-2 text-gray-12"
+							id={`loom-file-space-${request.id}`}
+							onChange={(event) => setFileSpaceName(event.target.value)}
+							value={fileSpaceName}
+						/>
+					</label>
+					<label
+						className="text-sm text-gray-11"
+						htmlFor={`loom-file-title-${request.id}`}
+					>
+						Video title (defaults to file name)
+						<input
+							className="mt-1 w-full rounded-lg border border-gray-6 bg-gray-1 px-3 py-2 text-gray-12"
+							id={`loom-file-title-${request.id}`}
+							onChange={(event) => setFileTitle(event.target.value)}
+							value={fileTitle}
+						/>
+					</label>
+				</div>
+				<label
+					className="text-sm text-gray-11"
+					htmlFor={`loom-file-mp4-${request.id}`}
+				>
+					Downloaded Loom MP4
+					<input
+						accept=".mp4,video/mp4"
+						className="mt-1 block w-full text-gray-11"
+						id={`loom-file-mp4-${request.id}`}
+						onChange={(event) => setFile(event.target.files?.[0] ?? null)}
+						type="file"
+					/>
+				</label>
+				<Button
+					disabled={fileMutation.isPending || importMutation.isPending || !file}
+					size="sm"
+					type="submit"
+					variant="dark"
+				>
+					{fileMutation.isPending
+						? `Uploading ${uploadPercent}%`
+						: "Upload and process"}
+				</Button>
+			</form>
+
+			<form
+				className="mt-5 grid gap-4 border-t border-gray-4 pt-5"
+				onSubmit={(event) => {
+					event.preventDefault();
+					statusMutation.mutate();
+				}}
+			>
+				<h3 className="font-medium text-gray-12">Update customer status</h3>
+				<div className="grid gap-4 sm:grid-cols-3">
+					<div>
+						<label
+							className="block text-sm text-gray-11"
+							htmlFor={`loom-status-${request.id}`}
+						>
+							Status
+						</label>
+						<select
+							className="mt-2 w-full rounded-lg border border-gray-6 bg-gray-1 px-3 py-2 text-sm text-gray-12"
+							id={`loom-status-${request.id}`}
+							onChange={(event) =>
+								setNextStatus(event.target.value as LoomMigrationStatus)
+							}
+							value={nextStatus}
+						>
+							<option value="pending">Pending</option>
+							<option value="in_progress">In progress</option>
+							<option value="needs_information">Information needed</option>
+							<option value="completed">Migration complete</option>
+						</select>
+					</div>
+					<div>
+						<label
+							className="block text-sm text-gray-11"
+							htmlFor={`loom-expected-${request.id}`}
+						>
+							Expected videos
+						</label>
+						<input
+							className="mt-2 w-full rounded-lg border border-gray-6 bg-gray-1 px-3 py-2 text-sm text-gray-12"
+							id={`loom-expected-${request.id}`}
+							min={0}
+							onChange={(event) => setExpectedVideoCount(event.target.value)}
+							type="number"
+							value={expectedVideoCount}
+						/>
+					</div>
+					<div>
+						<label
+							className="block text-sm text-gray-11"
+							htmlFor={`loom-imported-${request.id}`}
+						>
+							Verified imported videos
+						</label>
+						<input
+							className="mt-2 w-full rounded-lg border border-gray-6 bg-gray-1 px-3 py-2 text-sm text-gray-12"
+							id={`loom-imported-${request.id}`}
+							min={0}
+							onChange={(event) => setImportedVideoCount(event.target.value)}
+							type="number"
+							value={importedVideoCount}
+						/>
+					</div>
+				</div>
+				<div>
+					<label
+						className="block text-sm text-gray-11"
+						htmlFor={`loom-message-${request.id}`}
+					>
+						Message to customer{" "}
+						{nextStatus === "needs_information" ? "(required)" : "(optional)"}
+					</label>
+					<textarea
+						className="mt-2 min-h-24 w-full rounded-lg border border-gray-6 bg-gray-1 p-3 text-sm text-gray-12"
+						id={`loom-message-${request.id}`}
+						maxLength={2000}
+						onChange={(event) => setMessage(event.target.value)}
+						value={message}
+					/>
+				</div>
+				{nextStatus === "completed" && (
+					<label className="flex items-start gap-2 text-sm text-gray-11">
+						<input
+							checked={verified}
+							className="mt-1"
+							onChange={(event) => setVerified(event.target.checked)}
+							type="checkbox"
+						/>
+						I checked terminal import results, the source and destination
+						counts, and a playback and ownership sample.
+					</label>
+				)}
+				<Button
+					disabled={
+						statusMutation.isPending ||
+						importMutation.isPending ||
+						fileMutation.isPending
+					}
+					size="sm"
+					type="submit"
+					variant="dark"
+				>
+					Save status
+				</Button>
+			</form>
+		</div>
+	);
+}
+
+export function LoomMigrationQueue() {
+	const queueQuery = useQuery({
+		queryKey: ["loom-migration-queue"],
+		queryFn: getLoomMigrationOperatorQueue,
+		refetchInterval: 20_000,
+	});
+	return (
+		<div className="flex w-full max-w-5xl flex-col gap-5">
+			<div>
+				<h1 className="text-2xl font-medium text-gray-12">
+					Loom migration queue
+				</h1>
+				<p className="mt-2 text-sm text-gray-10">
+					Process Cap Pro concierge requests, reconcile every import, and update
+					customers here.
+				</p>
+			</div>
+			{queueQuery.isPending && (
+				<p className="flex items-center gap-2 text-sm text-gray-10">
+					<LoaderCircle className="size-4 animate-spin" /> Loading requests…
+				</p>
+			)}
+			{queueQuery.isError && (
+				<div className="rounded-lg border border-red-7 bg-red-3 p-4 text-sm text-red-11">
+					Could not load the queue. {queueQuery.error.message}
+					<button
+						className="ml-2 underline"
+						onClick={() => queueQuery.refetch()}
+						type="button"
+					>
+						Try again
+					</button>
+				</div>
+			)}
+			{queueQuery.data?.length === 0 && (
+				<p className="rounded-xl border border-gray-4 bg-gray-1 p-5 text-sm text-gray-10">
+					No active Loom migration requests.
+				</p>
+			)}
+			{queueQuery.data?.map((request) => (
+				<QueueItem key={request.id} request={request} />
+			))}
+		</div>
+	);
+}
diff --git a/apps/web/app/(org)/dashboard/admin/loom-migrations/page.tsx b/apps/web/app/(org)/dashboard/admin/loom-migrations/page.tsx
new file mode 100644
index 00000000000..2dc9ff503ae
--- /dev/null
+++ b/apps/web/app/(org)/dashboard/admin/loom-migrations/page.tsx
@@ -0,0 +1,17 @@
+import type { Metadata } from "next";
+import { notFound } from "next/navigation";
+import { requireMigrationOperator } from "@/lib/loom-concierge";
+import { LoomMigrationQueue } from "./LoomMigrationQueue";
+
+export const metadata: Metadata = {
+	title: "Loom Migration Queue — Cap",
+};
+
+export default async function Page() {
+	try {
+		await requireMigrationOperator();
+	} catch {
+		notFound();
+	}
+	return <LoomMigrationQueue />;
+}
diff --git a/apps/web/app/(org)/dashboard/import/ImportPage.tsx b/apps/web/app/(org)/dashboard/import/ImportPage.tsx
index 9712a3af2ec..1cf0fe84795 100644
--- a/apps/web/app/(org)/dashboard/import/ImportPage.tsx
+++ b/apps/web/app/(org)/dashboard/import/ImportPage.tsx
@@ -1,18 +1,34 @@
 "use client";
 
-import { faUpload } from "@fortawesome/free-solid-svg-icons";
+import { buildEnv } from "@cap/env";
+import { faArrowsRotate, faUpload } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import Link from "next/link";
+import { useDashboardContext } from "@/app/(org)/dashboard/Contexts";
 import {
 	type LoomImportDestination,
 	loomImportPageHref,
 } from "@/lib/loom-import-destination";
+import {
+	canManageOrganizationSettings,
+	getEffectiveOrganizationRole,
+} from "@/lib/permissions/roles";
 
 export const ImportPage = ({
 	initialDestination = {},
 }: {
 	initialDestination?: LoomImportDestination;
 }) => {
+	const { user, activeOrganization } = useDashboardContext();
+	const currentMember = activeOrganization?.members.find(
+		(member) => member.userId === user.id,
+	);
+	const currentRole = getEffectiveOrganizationRole({
+		userId: user.id,
+		ownerId: activeOrganization?.organization.ownerId,
+		memberRole: currentMember?.role,
+	});
+	const canRequestMigration = canManageOrganizationSettings(currentRole);
 	return (
 		<div className="flex flex-col w-full h-full">
 			<div className="mb-8">
@@ -71,6 +87,26 @@ export const ImportPage = ({
 						</p>
 					</div>
 				</Link>
+				{buildEnv.NEXT_PUBLIC_IS_CAP && canRequestMigration && (
+					<Link
+						href="/dashboard/migrations/loom"
+						className="flex overflow-hidden relative flex-col w-full rounded-xl border transition-all duration-200 group border-gray-3 bg-gray-1 hover:border-blue-10 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-blue-8"
+					>
+						<div className="flex justify-center items-center w-full h-32 transition-colors duration-200 bg-gray-3 group-hover:bg-gray-4">
+							<div className="flex justify-center items-center rounded-full transition-all duration-200 size-14 bg-gray-1 text-gray-10 group-hover:text-gray-12 group-hover:scale-110">
+								<FontAwesomeIcon className="size-5" icon={faArrowsRotate} />
+							</div>
+						</div>
+						<div className="flex flex-col gap-1 p-4">
+							<p className="text-sm font-medium text-left text-gray-12">
+								Concierge Loom Migration
+							</p>
+							<p className="text-xs text-left text-gray-10">
+								Let Cap move your Loom workspace. Free with Cap Pro.
+							</p>
+						</div>
+					</Link>
+				)}
 			</div>
 		</div>
 	);
diff --git a/apps/web/app/(org)/dashboard/import/loom/ImportLoomPage.tsx b/apps/web/app/(org)/dashboard/import/loom/ImportLoomPage.tsx
index ebca8079829..8e5db52a251 100644
--- a/apps/web/app/(org)/dashboard/import/loom/ImportLoomPage.tsx
+++ b/apps/web/app/(org)/dashboard/import/loom/ImportLoomPage.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import { buildEnv } from "@cap/env";
 import {
 	Button,
 	Dialog,
@@ -55,6 +56,7 @@ import {
 } from "@/actions/loom";
 import { useDashboardContext } from "@/app/(org)/dashboard/Contexts";
 import { UpgradeModal } from "@/components/UpgradeModal";
+import { parseLoomCsvRecords } from "@/lib/loom-csv";
 import {
 	type LoomImportDestination,
 	loomImportDestinationHref,
@@ -132,57 +134,8 @@ function buildCsvImportResult(
 	};
 }
 
-function parseCsvRecords(text: string) {
-	const records: string[][] = [];
-	let field = "";
-	let row: string[] = [];
-	let inQuotes = false;
-	const input = text.replace(/^\uFEFF/, "");
-
-	for (let index = 0; index < input.length; index += 1) {
-		const char = input.charAt(index);
-		const next = input.charAt(index + 1);
-
-		if (char === '"') {
-			if (inQuotes && next === '"') {
-				field += '"';
-				index += 1;
-			} else {
-				inQuotes = !inQuotes;
-			}
-			continue;
-		}
-
-		if (char === "," && !inQuotes) {
-			row.push(field.trim());
-			field = "";
-			continue;
-		}
-
-		if ((char === "\n" || char === "\r") && !inQuotes) {
-			if (char === "\r" && next === "\n") index += 1;
-			row.push(field.trim());
-			if (row.some((cell) => cell.length > 0)) records.push(row);
-			row = [];
-			field = "";
-			continue;
-		}
-
-		field += char;
-	}
-
-	if (inQuotes) throw new Error("CSV has an unclosed quoted field.");
-
-	if (field.length > 0 || row.length > 0) {
-		row.push(field.trim());
-		if (row.some((cell) => cell.length > 0)) records.push(row);
-	}
-
-	return records;
-}
-
 function parseCsv(text: string, fileName: string): CsvData {
-	const records = parseCsvRecords(text);
+	const records = parseLoomCsvRecords(text);
 	const headers = records[0]?.map((header) => header.trim()) ?? [];
 	const rows = records
 		.slice(1)
@@ -601,6 +554,14 @@ export const ImportLoomPage = ({
 								? "Bring a single Loom video into Cap, or bulk import recordings for organization members and new users from a CSV."
 								: "Paste a Loom share link to bring it into Cap."}
 						</p>
+						{buildEnv.NEXT_PUBLIC_IS_CAP && canUseCsvImport && (
+							<Link
+								href="/dashboard/migrations/loom"
+								className="mt-2 inline-block text-sm text-blue-11 underline"
+							>
+								Want Cap to move your whole Loom workspace for you?
+							</Link>
+						)}
 					</div>
 				</div>
 			</div>
diff --git a/apps/web/app/(org)/dashboard/migrations/loom/LoomMigrationPage.tsx b/apps/web/app/(org)/dashboard/migrations/loom/LoomMigrationPage.tsx
new file mode 100644
index 00000000000..63129848ccf
--- /dev/null
+++ b/apps/web/app/(org)/dashboard/migrations/loom/LoomMigrationPage.tsx
@@ -0,0 +1,398 @@
+"use client";
+
+import { Button } from "@cap/ui";
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { CheckCircle2, CircleHelp, Clock3, LoaderCircle } from "lucide-react";
+import Link from "next/link";
+import { useId, useState } from "react";
+import { toast } from "sonner";
+import {
+	answerLoomMigrationQuestion,
+	confirmLoomMigrationInvite,
+	getLoomMigrationDashboard,
+	requestLoomMigration,
+} from "@/actions/loom-concierge";
+import { useDashboardContext } from "@/app/(org)/dashboard/Contexts";
+import type { LoomMigrationView } from "@/lib/loom-concierge";
+import {
+	LOOM_MIGRATION_STATUS_LABELS,
+	type LoomMigrationStatus,
+} from "@/lib/loom-migration-state";
+
+const STATUS_STYLE: Record<LoomMigrationStatus, string> = {
+	pending: "bg-amber-3 text-amber-11",
+	in_progress: "bg-blue-3 text-blue-11",
+	needs_information: "bg-orange-3 text-orange-11",
+	completed: "bg-green-3 text-green-11",
+};
+
+function MigrationStatus({ request }: { request: LoomMigrationView }) {
+	return (
+		<div className="rounded-xl border border-gray-4 bg-gray-1 p-5">
+			<div className="flex flex-wrap items-center justify-between gap-3">
+				<div>
+					<h2 className="text-lg font-medium text-gray-12">Your migration</h2>
+					<p className="mt-1 text-sm text-gray-10">
+						Requested on {new Date(request.createdAt).toLocaleDateString()}
+						{request.workspaceName ? ` for ${request.workspaceName}` : ""}
+					</p>
+				</div>
+				<span
+					className={`rounded-full px-3 py-1 text-xs font-medium ${STATUS_STYLE[request.status]}`}
+				>
+					{LOOM_MIGRATION_STATUS_LABELS[request.status]}
+				</span>
+			</div>
+			{request.status === "pending" && (
+				<p className="mt-4 text-sm text-gray-11">
+					Your request is in Cap’s queue. We’ll review your Loom workspace and
+					confirm the migration plan.
+				</p>
+			)}
+			{request.status === "in_progress" && (
+				<p className="mt-4 text-sm text-gray-11">
+					Cap is moving your videos. We’ll mark this complete after checking the
+					imported library.
+				</p>
+			)}
+			{request.status === "completed" && (
+				<div className="mt-4 flex items-start gap-3 text-sm text-gray-11">
+					<CheckCircle2 className="mt-0.5 size-4 shrink-0 text-green-11" />
+					<div>
+						<p>Your migration is complete.</p>
+						{request.expectedVideoCount !== null && (
+							<p className="mt-1">
+								{request.importedVideoCount} of {request.expectedVideoCount}{" "}
+								videos verified in Cap.
+							</p>
+						)}
+						<Link
+							className="mt-2 inline-block text-blue-11 underline"
+							href="/dashboard/caps"
+						>
+							View your Caps
+						</Link>
+					</div>
+				</div>
+			)}
+			{request.capMessage && (
+				<div className="mt-4 rounded-lg bg-gray-3 p-4 text-sm text-gray-12">
+					<p className="font-medium">Update from Cap</p>
+					<p className="mt-1 whitespace-pre-wrap">{request.capMessage}</p>
+				</div>
+			)}
+			{request.customerReply && (
+				<p className="mt-3 text-xs text-gray-10">
+					Your latest reply: {request.customerReply}
+				</p>
+			)}
+		</div>
+	);
+}
+
+export function LoomMigrationPage() {
+	const { activeOrganization, user } = useDashboardContext();
+	const organizationId = activeOrganization?.organization.id;
+	const queryClient = useQueryClient();
+	const [requestFormOpen, setRequestFormOpen] = useState(false);
+	const [workspaceName, setWorkspaceName] = useState("");
+	const [note, setNote] = useState("");
+	const [answer, setAnswer] = useState("");
+	const answerId = useId();
+	const workspaceNameId = useId();
+	const noteId = useId();
+
+	const migrationQuery = useQuery({
+		queryKey: ["loom-concierge", organizationId],
+		queryFn: () => {
+			if (!organizationId) throw new Error("Select a Cap workspace.");
+			return getLoomMigrationDashboard(organizationId);
+		},
+		enabled: Boolean(organizationId),
+		refetchInterval: 30_000,
+	});
+
+	const refresh = () =>
+		queryClient.invalidateQueries({
+			queryKey: ["loom-concierge", organizationId],
+		});
+	const requestMutation = useMutation({
+		mutationFn: () => {
+			if (!organizationId) throw new Error("Select a Cap workspace.");
+			return requestLoomMigration({ organizationId, workspaceName, note });
+		},
+		onSuccess: async (result) => {
+			await refresh();
+			setRequestFormOpen(false);
+			toast.success(
+				result.alreadyRequested
+					? "Your migration request is already in the queue."
+					: "Migration requested. Invite hello@cap.so in Loom next.",
+			);
+		},
+		onError: (error) => toast.error(error.message),
+	});
+	const inviteMutation = useMutation({
+		mutationFn: confirmLoomMigrationInvite,
+		onSuccess: async () => {
+			await refresh();
+			toast.success("Thanks. Cap can now review your Loom invite.");
+		},
+		onError: (error) => toast.error(error.message),
+	});
+	const answerMutation = useMutation({
+		mutationFn: answerLoomMigrationQuestion,
+		onSuccess: async () => {
+			setAnswer("");
+			await refresh();
+			toast.success("Your answer has been sent to Cap.");
+		},
+		onError: (error) => toast.error(error.message),
+	});
+
+	const requests = migrationQuery.data?.requests ?? [];
+	const activeRequest = requests.find(
+		(request) => request.status !== "completed",
+	);
+	const completedRequest = requests.find(
+		(request) => request.status === "completed",
+	);
+	const isPro = migrationQuery.data?.isPro ?? false;
+
+	return (
+		<div className="flex w-full max-w-5xl flex-col gap-6">
+			<div>
+				<p className="text-xs font-medium uppercase tracking-wide text-blue-11">
+					Switch from Loom
+				</p>
+				<h1 className="mt-2 text-2xl font-medium text-gray-12">
+					Move your Loom library to Cap
+				</h1>
+				<p className="mt-2 max-w-2xl text-sm text-gray-10">
+					Import it yourself, or let Cap handle the move. Concierge migration is
+					included with Cap Pro at no extra cost.
+				</p>
+			</div>
+
+			{!organizationId && (
+				<p className="rounded-lg border border-gray-4 bg-gray-1 p-4 text-sm text-gray-10">
+					Select a Cap workspace to request a Loom migration.
+				</p>
+			)}
+			{organizationId && migrationQuery.isPending && (
+				<div className="flex items-center gap-2 text-sm text-gray-10">
+					<LoaderCircle className="size-4 animate-spin" /> Loading your
+					migration…
+				</div>
+			)}
+			{migrationQuery.isError && (
+				<div className="rounded-lg border border-red-7 bg-red-3 p-4 text-sm text-red-11">
+					Could not load your migration. {migrationQuery.error.message}
+					<button
+						className="ml-2 underline"
+						onClick={() => migrationQuery.refetch()}
+						type="button"
+					>
+						Try again
+					</button>
+				</div>
+			)}
+
+			{activeRequest && <MigrationStatus request={activeRequest} />}
+			{!activeRequest && completedRequest && (
+				<MigrationStatus request={completedRequest} />
+			)}
+
+			{activeRequest && !activeRequest.invitedAt && (
+				<div className="rounded-xl border border-blue-6 bg-blue-2 p-5">
+					<div className="flex items-start gap-3">
+						<Clock3 className="mt-0.5 size-5 shrink-0 text-blue-11" />
+						<div>
+							<h2 className="font-medium text-gray-12">
+								One step left: invite Cap to Loom
+							</h2>
+							<p className="mt-2 text-sm text-gray-11">
+								In your Loom workspace settings, invite{" "}
+								<strong>hello@cap.so</strong> with video access and download
+								permission. Some private Library videos need access shared
+								separately. If we find any, we’ll ask you here. You can keep
+								using Loom until we confirm the migration is complete.
+							</p>
+							<a
+								className="mt-2 inline-block text-sm text-blue-11 underline"
+								href="https://support.atlassian.com/loom/docs/add-remove-and-manage-members-in-your-workspace/"
+								rel="noreferrer"
+								target="_blank"
+							>
+								Loom’s workspace invite steps
+							</a>
+							<Button
+								className="mt-4"
+								disabled={inviteMutation.isPending}
+								onClick={() => inviteMutation.mutate(activeRequest.id)}
+								size="sm"
+								variant="dark"
+							>
+								I sent the Loom invite
+							</Button>
+						</div>
+					</div>
+				</div>
+			)}
+			{activeRequest?.invitedAt && activeRequest.status !== "completed" && (
+				<p className="text-sm text-gray-10">
+					Loom invite marked as sent. Cap will take it from here.
+				</p>
+			)}
+			{activeRequest?.status === "needs_information" && (
+				<form
+					className="rounded-xl border border-orange-6 bg-orange-2 p-5"
+					onSubmit={(event) => {
+						event.preventDefault();
+						answerMutation.mutate({ requestId: activeRequest.id, answer });
+					}}
+				>
+					<div className="flex items-center gap-2 font-medium text-gray-12">
+						<CircleHelp className="size-5 text-orange-11" /> Cap needs a little
+						more information
+					</div>
+					<label className="mt-4 block text-sm text-gray-11" htmlFor={answerId}>
+						Your answer
+					</label>
+					<textarea
+						className="mt-2 min-h-24 w-full rounded-lg border border-gray-6 bg-gray-1 p-3 text-sm text-gray-12"
+						id={answerId}
+						maxLength={2000}
+						onChange={(event) => setAnswer(event.target.value)}
+						value={answer}
+					/>
+					<Button
+						disabled={answerMutation.isPending || !answer.trim()}
+						size="sm"
+						type="submit"
+						variant="dark"
+					>
+						Send answer
+					</Button>
+				</form>
+			)}
+
+			<div className="grid gap-5 md:grid-cols-2">
+				<div className="rounded-xl border border-gray-4 bg-gray-1 p-5">
+					<h2 className="text-lg font-medium text-gray-12">Do it yourself</h2>
+					<p className="mt-2 text-sm text-gray-10">
+						Best when you already have a list of Loom links and video owners.
+					</p>
+					<ol className="mt-4 list-inside list-decimal space-y-2 text-sm text-gray-11">
+						<li>
+							Prepare a CSV with loom_video_url and user_email. space_name is
+							optional.
+						</li>
+						<li>
+							Upload up to 500 videos per CSV and review the owner mapping.
+						</li>
+						<li>
+							Check the import results and your Cap library before leaving Loom.
+						</li>
+					</ol>
+					{user.isPro ? (
+						<Link
+							className="mt-5 inline-block rounded-lg bg-gray-12 px-4 py-2 text-sm text-gray-1"
+							href="/dashboard/import/loom?mode=csv"
+						>
+							Open CSV importer
+						</Link>
+					) : (
+						<p className="mt-5 text-sm text-gray-10">
+							The self-service importer requires your own Cap Pro account.
+						</p>
+					)}
+				</div>
+				<div className="rounded-xl border border-blue-6 bg-blue-2 p-5">
+					<div className="flex items-center justify-between gap-2">
+						<h2 className="text-lg font-medium text-gray-12">
+							Cap handles it for you
+						</h2>
+						<span className="rounded-full bg-blue-4 px-2 py-1 text-xs text-blue-11">
+							Free with Pro
+						</span>
+					</div>
+					<p className="mt-2 text-sm text-gray-11">
+						Request the migration and invite hello@cap.so to Loom. We’ll
+						inventory, move, and verify your videos. No CSV preparation needed.
+						If Loom restricts a video, we’ll ask for the specific access we
+						need.
+					</p>
+					{!migrationQuery.isPending && !migrationQuery.isError && !isPro && (
+						<div className="mt-5 text-sm text-gray-11">
+							Your organization owner needs Cap Pro to request this service.
+							<Link
+								className="ml-1 text-blue-11 underline"
+								href="/dashboard/settings/organization/billing"
+							>
+								View billing
+							</Link>
+						</div>
+					)}
+					{isPro && !activeRequest && !requestFormOpen && (
+						<Button
+							className="mt-5"
+							onClick={() => setRequestFormOpen(true)}
+							size="sm"
+							variant="dark"
+						>
+							Enable concierge migration
+						</Button>
+					)}
+					{isPro && !activeRequest && requestFormOpen && (
+						<form
+							className="mt-5 space-y-4"
+							onSubmit={(event) => {
+								event.preventDefault();
+								requestMutation.mutate();
+							}}
+						>
+							<div>
+								<label
+									className="text-sm text-gray-12"
+									htmlFor={workspaceNameId}
+								>
+									Loom workspace name{" "}
+									<span className="text-gray-10">(optional)</span>
+								</label>
+								<input
+									className="mt-2 w-full rounded-lg border border-gray-6 bg-gray-1 px-3 py-2 text-sm text-gray-12"
+									id={workspaceNameId}
+									maxLength={255}
+									onChange={(event) => setWorkspaceName(event.target.value)}
+									value={workspaceName}
+								/>
+							</div>
+							<div>
+								<label className="text-sm text-gray-12" htmlFor={noteId}>
+									Anything we should know?{" "}
+									<span className="text-gray-10">(optional)</span>
+								</label>
+								<textarea
+									className="mt-2 min-h-20 w-full rounded-lg border border-gray-6 bg-gray-1 p-3 text-sm text-gray-12"
+									id={noteId}
+									maxLength={2000}
+									onChange={(event) => setNote(event.target.value)}
+									value={note}
+								/>
+							</div>
+							<Button
+								disabled={requestMutation.isPending}
+								size="sm"
+								type="submit"
+								variant="dark"
+							>
+								Request migration
+							</Button>
+						</form>
+					)}
+				</div>
+			</div>
+		</div>
+	);
+}
diff --git a/apps/web/app/(org)/dashboard/migrations/loom/page.tsx b/apps/web/app/(org)/dashboard/migrations/loom/page.tsx
new file mode 100644
index 00000000000..bb06782ed70
--- /dev/null
+++ b/apps/web/app/(org)/dashboard/migrations/loom/page.tsx
@@ -0,0 +1,10 @@
+import type { Metadata } from "next";
+import { LoomMigrationPage } from "./LoomMigrationPage";
+
+export const metadata: Metadata = {
+	title: "Loom Migration — Cap",
+};
+
+export default function Page() {
+	return <LoomMigrationPage />;
+}
diff --git a/apps/web/content/docs/migrating-to-cap.mdx b/apps/web/content/docs/migrating-to-cap.mdx
index 50a99dedfe4..dcc74ca840e 100644
--- a/apps/web/content/docs/migrating-to-cap.mdx
+++ b/apps/web/content/docs/migrating-to-cap.mdx
@@ -14,9 +14,21 @@ A successful migration is not just a count of accepted URLs. It preserves owners
 |---------|------------------|
 | One Loom video | Paste the Loom URL in **Dashboard > Import > Loom** |
 | Up to 500 mapped videos | Use the organization CSV importer |
-| More than 500 videos or a complex hierarchy | Run controlled batches with an agent or contact [hello@cap.so](mailto:hello@cap.so) for a managed migration |
+| A library you want Cap to move for you | Request the free Cap Pro concierge migration in **Dashboard > Loom Migration** |
+| More than 500 videos or a complex hierarchy | Request concierge migration or run controlled batches with an agent |
 
-Loom import is a Cap Pro feature. Bulk CSV import is available to organization owners and admins.
+Loom import is a Cap Pro feature. Bulk CSV import is available to organization owners and admins. Concierge migration is included at no extra cost when the Cap organization owner has Pro.
+
+## Request concierge migration
+
+1. Open **Dashboard > Loom Migration** and select your Cap organization.
+2. Choose **Enable concierge migration**, then **Request migration**. The request enters Cap's queue as **Pending**.
+3. Invite [hello@cap.so](mailto:hello@cap.so) to your Loom workspace with access and download permission for the videos you want moved, then mark the invite as sent in Cap.
+4. Cap inventories the source, maps owners and spaces, imports in batches, and checks the destination. The dashboard shows **In progress** while this is underway.
+5. If a video needs separate access or another detail, the dashboard shows **Information needed** with Cap's exact request. Reply there so the migration can continue.
+6. Cap marks **Migration complete** only after the agreed source count and imported library are reconciled and checked. Keep Loom available until that confirmation.
+
+Loom workspace membership may not expose private Library videos automatically. An account without Loom download rights also cannot export every video. Cap will ask for specific access when the workspace invite does not cover a source video.
 
 ## Prepare the source inventory
 
diff --git a/apps/web/lib/loom-concierge.ts b/apps/web/lib/loom-concierge.ts
new file mode 100644
index 00000000000..a8f50bf2845
--- /dev/null
+++ b/apps/web/lib/loom-concierge.ts
@@ -0,0 +1,134 @@
+import "server-only";
+
+import { db } from "@cap/database";
+import { getCurrentUser } from "@cap/database/auth/session";
+import {
+	loomMigrationRequests,
+	organizations,
+	users,
+} from "@cap/database/schema";
+import { buildEnv } from "@cap/env";
+import type { Organisation } from "@cap/web-domain";
+import { and, asc, desc, eq, isNull, ne } from "drizzle-orm";
+import { requireOrganizationSettingsManager } from "@/actions/organization/authorization";
+import { MESSENGER_ADMIN_EMAIL } from "@/lib/messenger/constants";
+import { isOrganizationOwnerPro } from "@/lib/org-pro";
+import type { LoomMigrationStatus } from "./loom-migration-state";
+
+type MigrationRecord = typeof loomMigrationRequests.$inferSelect;
+
+export type LoomMigrationView = {
+	id: string;
+	organizationId: Organisation.OrganisationId;
+	status: LoomMigrationStatus;
+	workspaceName: string | null;
+	customerNote: string | null;
+	customerReply: string | null;
+	invitedAt: string | null;
+	capMessage: string | null;
+	expectedVideoCount: number | null;
+	importedVideoCount: number;
+	queuedVideoCount: number;
+	completedAt: string | null;
+	createdAt: string;
+	updatedAt: string;
+};
+
+export type OperatorLoomMigrationView = LoomMigrationView & {
+	organizationName: string;
+	requestedByEmail: string;
+};
+
+export function migrationToView(record: MigrationRecord): LoomMigrationView {
+	return {
+		id: record.id,
+		organizationId: record.organizationId,
+		status: record.status,
+		workspaceName: record.workspaceName,
+		customerNote: record.customerNote,
+		customerReply: record.customerReply,
+		invitedAt: record.invitedAt?.toISOString() ?? null,
+		capMessage: record.capMessage,
+		expectedVideoCount: record.expectedVideoCount,
+		importedVideoCount: record.importedVideoCount,
+		queuedVideoCount: record.queuedVideoCount,
+		completedAt: record.completedAt?.toISOString() ?? null,
+		createdAt: record.createdAt.toISOString(),
+		updatedAt: record.updatedAt.toISOString(),
+	};
+}
+
+export async function requireCustomerMigrationAccess(
+	organizationId: Organisation.OrganisationId,
+) {
+	const user = await getCurrentUser();
+	if (!user) throw new Error("Unauthorized");
+	await requireOrganizationSettingsManager(user.id, organizationId);
+	return user;
+}
+
+export async function requireProCustomerMigrationAccess(
+	organizationId: Organisation.OrganisationId,
+) {
+	const user = await requireCustomerMigrationAccess(organizationId);
+	if (!buildEnv.NEXT_PUBLIC_IS_CAP) {
+		throw new Error("Concierge migration is available on Cap Cloud.");
+	}
+	if (!(await isOrganizationOwnerPro(organizationId))) {
+		throw new Error("Concierge Loom migration requires Cap Pro.");
+	}
+	return user;
+}
+
+export async function requireMigrationOperator() {
+	const user = await getCurrentUser();
+	if (
+		!buildEnv.NEXT_PUBLIC_IS_CAP ||
+		!user ||
+		user.email.toLowerCase() !== MESSENGER_ADMIN_EMAIL
+	) {
+		throw new Error("Unauthorized");
+	}
+	return user;
+}
+
+export async function getCustomerMigrationRequests(
+	organizationId: Organisation.OrganisationId,
+) {
+	await requireCustomerMigrationAccess(organizationId);
+	const requests = await db()
+		.select()
+		.from(loomMigrationRequests)
+		.where(eq(loomMigrationRequests.organizationId, organizationId))
+		.orderBy(desc(loomMigrationRequests.createdAt))
+		.limit(20);
+	return requests.map(migrationToView);
+}
+
+export async function getOperatorMigrationQueue() {
+	await requireMigrationOperator();
+	const queue = await db()
+		.select({
+			request: loomMigrationRequests,
+			organizationName: organizations.name,
+			requestedByEmail: users.email,
+		})
+		.from(loomMigrationRequests)
+		.innerJoin(
+			organizations,
+			eq(organizations.id, loomMigrationRequests.organizationId),
+		)
+		.innerJoin(users, eq(users.id, loomMigrationRequests.requestedByUserId))
+		.where(
+			and(
+				ne(loomMigrationRequests.status, "completed"),
+				isNull(organizations.tombstoneAt),
+			),
+		)
+		.orderBy(asc(loomMigrationRequests.createdAt));
+	return queue.map((item) => ({
+		...migrationToView(item.request),
+		organizationName: item.organizationName,
+		requestedByEmail: item.requestedByEmail,
+	}));
+}
diff --git a/apps/web/lib/loom-csv.ts b/apps/web/lib/loom-csv.ts
new file mode 100644
index 00000000000..871eef779a5
--- /dev/null
+++ b/apps/web/lib/loom-csv.ts
@@ -0,0 +1,72 @@
+import type { LoomCsvImportRow } from "@/actions/loom";
+
+export function parseLoomCsvRecords(text: string) {
+	const records: string[][] = [];
+	let field = "";
+	let row: string[] = [];
+	let inQuotes = false;
+	const input = text.replace(/^\uFEFF/, "");
+
+	for (let index = 0; index < input.length; index += 1) {
+		const char = input.charAt(index);
+		const next = input.charAt(index + 1);
+
+		if (char === '"') {
+			if (inQuotes && next === '"') {
+				field += '"';
+				index += 1;
+			} else {
+				inQuotes = !inQuotes;
+			}
+			continue;
+		}
+
+		if (char === "," && !inQuotes) {
+			row.push(field.trim());
+			field = "";
+			continue;
+		}
+
+		if ((char === "\n" || char === "\r") && !inQuotes) {
+			if (char === "\r" && next === "\n") index += 1;
+			row.push(field.trim());
+			if (row.some((cell) => cell.length > 0)) records.push(row);
+			row = [];
+			field = "";
+			continue;
+		}
+
+		field += char;
+	}
+
+	if (inQuotes) throw new Error("CSV has an unclosed quoted field.");
+
+	if (field.length > 0 || row.length > 0) {
+		row.push(field.trim());
+		if (row.some((cell) => cell.length > 0)) records.push(row);
+	}
+
+	return records;
+}
+
+export function parseConciergeLoomCsv(text: string): LoomCsvImportRow[] {
+	const records = parseLoomCsvRecords(text);
+	const headers = records[0]?.map((value) => value.toLowerCase()) ?? [];
+	const loomUrlIndex = headers.indexOf("loom_video_url");
+	const userEmailIndex = headers.indexOf("user_email");
+	const spaceNameIndex = headers.indexOf("space_name");
+	if (loomUrlIndex < 0 || userEmailIndex < 0) {
+		throw new Error("CSV needs loom_video_url and user_email columns.");
+	}
+	const rows = records.slice(1).map((values, index) => ({
+		rowNumber: index + 2,
+		loomUrl: values[loomUrlIndex] ?? "",
+		userEmail: values[userEmailIndex] ?? "",
+		spaceName: spaceNameIndex < 0 ? undefined : values[spaceNameIndex],
+	}));
+	if (rows.length === 0) throw new Error("CSV has no video rows.");
+	if (rows.length > 500) {
+		throw new Error("Split the library into CSV files of up to 500 videos.");
+	}
+	return rows;
+}
diff --git a/apps/web/lib/loom-migration-state.ts b/apps/web/lib/loom-migration-state.ts
new file mode 100644
index 00000000000..1e2791df990
--- /dev/null
+++ b/apps/web/lib/loom-migration-state.ts
@@ -0,0 +1,80 @@
+export const LOOM_MIGRATION_STATUSES = [
+	"pending",
+	"in_progress",
+	"needs_information",
+	"completed",
+] as const;
+
+export type LoomMigrationStatus = (typeof LOOM_MIGRATION_STATUSES)[number];
+
+export const LOOM_MIGRATION_STATUS_LABELS: Record<LoomMigrationStatus, string> =
+	{
+		pending: "Pending",
+		in_progress: "In progress",
+		needs_information: "Information needed",
+		completed: "Migration complete",
+	};
+
+export function normalizeMigrationText(
+	value: string,
+	label: string,
+	maxLength: number,
+) {
+	if (typeof value !== "string") throw new Error(`${label} is invalid.`);
+	const normalized = value.trim().replace(/\s+/g, " ");
+	if (normalized.length > maxLength) {
+		throw new Error(`${label} must be ${maxLength} characters or fewer.`);
+	}
+	return normalized;
+}
+
+export function validateOperatorMigrationUpdate({
+	currentStatus,
+	nextStatus,
+	message,
+	verified,
+	expectedVideoCount,
+	importedVideoCount,
+}: {
+	currentStatus: LoomMigrationStatus;
+	nextStatus: LoomMigrationStatus;
+	message: string;
+	verified: boolean;
+	expectedVideoCount: number | null;
+	importedVideoCount: number;
+}) {
+	if (currentStatus === "completed") {
+		throw new Error("A completed migration cannot be changed.");
+	}
+	if (!LOOM_MIGRATION_STATUSES.includes(nextStatus)) {
+		throw new Error("Invalid migration status.");
+	}
+	const normalizedMessage = normalizeMigrationText(message, "Message", 2000);
+	if (nextStatus === "needs_information" && !normalizedMessage) {
+		throw new Error("Tell the customer what information you need.");
+	}
+	if (nextStatus === "completed" && !verified) {
+		throw new Error("Verify the migrated library before marking it complete.");
+	}
+	if (nextStatus === "completed" && expectedVideoCount === null) {
+		throw new Error("Enter the agreed source video count before completion.");
+	}
+	if (
+		!Number.isInteger(importedVideoCount) ||
+		importedVideoCount < 0 ||
+		(expectedVideoCount !== null &&
+			(!Number.isInteger(expectedVideoCount) ||
+				expectedVideoCount < 0 ||
+				importedVideoCount > expectedVideoCount))
+	) {
+		throw new Error("Enter valid video counts.");
+	}
+	if (
+		nextStatus === "completed" &&
+		expectedVideoCount !== null &&
+		importedVideoCount !== expectedVideoCount
+	) {
+		throw new Error("Reconcile the expected video count before completion.");
+	}
+	return normalizedMessage;
+}
diff --git a/packages/database/emails/loom-migration.tsx b/packages/database/emails/loom-migration.tsx
new file mode 100644
index 00000000000..f65ffdfaaff
--- /dev/null
+++ b/packages/database/emails/loom-migration.tsx
@@ -0,0 +1,70 @@
+import {
+	Body,
+	Container,
+	Head,
+	Heading,
+	Html,
+	Link,
+	Preview,
+	Text,
+} from "@react-email/components";
+
+export function LoomMigrationRequestEmail({
+	organizationName,
+	requesterEmail,
+	workspaceName,
+	queueUrl,
+}: {
+	organizationName: string;
+	requesterEmail: string;
+	workspaceName: string | null;
+	queueUrl: string;
+}) {
+	return (
+		<Html>
+			<Head />
+			<Preview>New Loom migration request from {organizationName}</Preview>
+			<Body className="bg-white font-sans">
+				<Container className="mx-auto my-10 max-w-[500px] px-6">
+					<Heading>New Loom migration request</Heading>
+					<Text>
+						{organizationName} requested a Cap Pro concierge migration.
+					</Text>
+					<Text>Requested by: {requesterEmail}</Text>
+					{workspaceName && <Text>Loom workspace: {workspaceName}</Text>}
+					<Link href={queueUrl}>Open the migration queue</Link>
+				</Container>
+			</Body>
+		</Html>
+	);
+}
+
+export function LoomMigrationStatusEmail({
+	organizationName,
+	statusLabel,
+	message,
+	dashboardUrl,
+}: {
+	organizationName: string;
+	statusLabel: string;
+	message: string | null;
+	dashboardUrl: string;
+}) {
+	return (
+		<Html>
+			<Head />
+			<Preview>Your Loom migration is {statusLabel.toLowerCase()}</Preview>
+			<Body className="bg-white font-sans">
+				<Container className="mx-auto my-10 max-w-[500px] px-6">
+					<Heading>Loom migration update</Heading>
+					<Text>
+						Your migration for {organizationName} is {statusLabel.toLowerCase()}
+						.
+					</Text>
+					{message && <Text>{message}</Text>}
+					<Link href={dashboardUrl}>View your migration</Link>
+				</Container>
+			</Body>
+		</Html>
+	);
+}
diff --git a/packages/database/migrations/0046_loom_concierge.sql b/packages/database/migrations/0046_loom_concierge.sql
new file mode 100644
index 00000000000..778f5ef9a7e
--- /dev/null
+++ b/packages/database/migrations/0046_loom_concierge.sql
@@ -0,0 +1,25 @@
+CREATE TABLE `loom_migration_requests` (
+	`id` varchar(15) NOT NULL,
+	`organizationId` varchar(15) NOT NULL,
+	`activeOrganizationId` varchar(15),
+	`requestedByUserId` varchar(15) NOT NULL,
+	`workspaceName` varchar(255),
+	`customerNote` text,
+	`customerReply` text,
+	`invitedAt` datetime,
+	`status` varchar(32) NOT NULL DEFAULT 'pending',
+	`capMessage` text,
+	`expectedVideoCount` int,
+	`importedVideoCount` int NOT NULL DEFAULT 0,
+	`queuedVideoCount` int NOT NULL DEFAULT 0,
+	`lastOperatorUserId` varchar(15),
+	`lastOperatorAt` datetime,
+	`completedAt` datetime,
+	`createdAt` datetime NOT NULL,
+	`updatedAt` datetime NOT NULL,
+	CONSTRAINT `loom_migration_requests_id` PRIMARY KEY(`id`),
+	CONSTRAINT `loom_migration_active_org_idx` UNIQUE(`activeOrganizationId`)
+);
+--> statement-breakpoint
+CREATE INDEX `loom_migration_org_created_idx` ON `loom_migration_requests` (`organizationId`,`createdAt`);--> statement-breakpoint
+CREATE INDEX `loom_migration_status_created_idx` ON `loom_migration_requests` (`status`,`createdAt`);
\ No newline at end of file
diff --git a/packages/database/migrations/meta/0046_snapshot.json b/packages/database/migrations/meta/0046_snapshot.json
new file mode 100644
index 00000000000..26dad24dff2
--- /dev/null
+++ b/packages/database/migrations/meta/0046_snapshot.json
@@ -0,0 +1,4735 @@
+{
+	"version": "5",
+	"dialect": "mysql",
+	"id": "e73cfec4-89dd-4fc2-9068-4a86b6e10171",
+	"prevId": "0d80e4e5-6d93-4d28-b235-bf1231baa7a9",
+	"tables": {
+		"accounts": {
+			"name": "accounts",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"type": {
+					"name": "type",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"provider": {
+					"name": "provider",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"providerAccountId": {
+					"name": "providerAccountId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"access_token": {
+					"name": "access_token",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"expires_in": {
+					"name": "expires_in",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"id_token": {
+					"name": "id_token",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"refresh_token": {
+					"name": "refresh_token",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"refresh_token_expires_in": {
+					"name": "refresh_token_expires_in",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"scope": {
+					"name": "scope",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"token_type": {
+					"name": "token_type",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				},
+				"tempColumn": {
+					"name": "tempColumn",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"user_id_idx": {
+					"name": "user_id_idx",
+					"columns": ["userId"],
+					"isUnique": false
+				},
+				"provider_account_id_idx": {
+					"name": "provider_account_id_idx",
+					"columns": ["providerAccountId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"accounts_id": {
+					"name": "accounts_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"agent_api_authorization_codes": {
+			"name": "agent_api_authorization_codes",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"codeHash": {
+					"name": "codeHash",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"codeChallenge": {
+					"name": "codeChallenge",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"redirectUri": {
+					"name": "redirectUri",
+					"type": "varchar(512)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"scopes": {
+					"name": "scopes",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"expiresAt": {
+					"name": "expiresAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"consumedAt": {
+					"name": "consumedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"code_hash_idx": {
+					"name": "code_hash_idx",
+					"columns": ["codeHash"],
+					"isUnique": true
+				},
+				"expires_at_idx": {
+					"name": "expires_at_idx",
+					"columns": ["expiresAt"],
+					"isUnique": false
+				},
+				"user_created_at_idx": {
+					"name": "user_created_at_idx",
+					"columns": ["userId", "createdAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"agent_api_authorization_codes_id": {
+					"name": "agent_api_authorization_codes_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"agent_api_idempotency": {
+			"name": "agent_api_idempotency",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"operation": {
+					"name": "operation",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"keyHash": {
+					"name": "keyHash",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"requestHash": {
+					"name": "requestHash",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"state": {
+					"name": "state",
+					"type": "varchar(16)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'pending'"
+				},
+				"statusCode": {
+					"name": "statusCode",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"response": {
+					"name": "response",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"expiresAt": {
+					"name": "expiresAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"user_operation_key_idx": {
+					"name": "user_operation_key_idx",
+					"columns": ["userId", "operation", "keyHash"],
+					"isUnique": true
+				},
+				"expires_at_idx": {
+					"name": "expires_at_idx",
+					"columns": ["expiresAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"agent_api_idempotency_id": {
+					"name": "agent_api_idempotency_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"agent_api_keys": {
+			"name": "agent_api_keys",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"tokenHash": {
+					"name": "tokenHash",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"name": {
+					"name": "name",
+					"type": "varchar(100)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'Cap CLI'"
+				},
+				"scopes": {
+					"name": "scopes",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"expiresAt": {
+					"name": "expiresAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"revokedAt": {
+					"name": "revokedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"lastUsedAt": {
+					"name": "lastUsedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"token_hash_idx": {
+					"name": "token_hash_idx",
+					"columns": ["tokenHash"],
+					"isUnique": true
+				},
+				"user_created_at_idx": {
+					"name": "user_created_at_idx",
+					"columns": ["userId", "createdAt"],
+					"isUnique": false
+				},
+				"expires_at_idx": {
+					"name": "expires_at_idx",
+					"columns": ["expiresAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"agent_api_keys_id": {
+					"name": "agent_api_keys_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"agent_api_operations": {
+			"name": "agent_api_operations",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"kind": {
+					"name": "kind",
+					"type": "varchar(32)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"resourceId": {
+					"name": "resourceId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"resultResourceId": {
+					"name": "resultResourceId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"state": {
+					"name": "state",
+					"type": "varchar(16)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'queued'"
+				},
+				"payload": {
+					"name": "payload",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"result": {
+					"name": "result",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"errorCode": {
+					"name": "errorCode",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"errorMessage": {
+					"name": "errorMessage",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				},
+				"completedAt": {
+					"name": "completedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"user_created_at_idx": {
+					"name": "user_created_at_idx",
+					"columns": ["userId", "createdAt"],
+					"isUnique": false
+				},
+				"state_updated_at_idx": {
+					"name": "state_updated_at_idx",
+					"columns": ["state", "updatedAt"],
+					"isUnique": false
+				},
+				"resource_id_idx": {
+					"name": "resource_id_idx",
+					"columns": ["resourceId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"agent_api_operations_id": {
+					"name": "agent_api_operations_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"auth_api_keys": {
+			"name": "auth_api_keys",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(36)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"source": {
+					"name": "source",
+					"type": "varchar(32)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'unknown'"
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"user_id_created_at_idx": {
+					"name": "user_id_created_at_idx",
+					"columns": ["userId", "createdAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"auth_api_keys_id": {
+					"name": "auth_api_keys_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"comments": {
+			"name": "comments",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"type": {
+					"name": "type",
+					"type": "varchar(6)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"content": {
+					"name": "content",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"timestamp": {
+					"name": "timestamp",
+					"type": "float",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"authorId": {
+					"name": "authorId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"videoId": {
+					"name": "videoId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				},
+				"parentCommentId": {
+					"name": "parentCommentId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"mediaKey": {
+					"name": "mediaKey",
+					"type": "varchar(512)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"mediaDuration": {
+					"name": "mediaDuration",
+					"type": "float",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"mediaMeta": {
+					"name": "mediaMeta",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"video_type_created_idx": {
+					"name": "video_type_created_idx",
+					"columns": ["videoId", "type", "createdAt", "id"],
+					"isUnique": false
+				},
+				"author_id_idx": {
+					"name": "author_id_idx",
+					"columns": ["authorId"],
+					"isUnique": false
+				},
+				"parent_comment_id_idx": {
+					"name": "parent_comment_id_idx",
+					"columns": ["parentCommentId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"comments_id": {
+					"name": "comments_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"developer_api_keys": {
+			"name": "developer_api_keys",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"appId": {
+					"name": "appId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"keyType": {
+					"name": "keyType",
+					"type": "varchar(8)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"keyPrefix": {
+					"name": "keyPrefix",
+					"type": "varchar(12)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"keyHash": {
+					"name": "keyHash",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"encryptedKey": {
+					"name": "encryptedKey",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"lastUsedAt": {
+					"name": "lastUsedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"revokedAt": {
+					"name": "revokedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"key_hash_idx": {
+					"name": "key_hash_idx",
+					"columns": ["keyHash"],
+					"isUnique": true
+				},
+				"app_key_type_idx": {
+					"name": "app_key_type_idx",
+					"columns": ["appId", "keyType"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {
+				"developer_api_keys_appId_developer_apps_id_fk": {
+					"name": "developer_api_keys_appId_developer_apps_id_fk",
+					"tableFrom": "developer_api_keys",
+					"tableTo": "developer_apps",
+					"columnsFrom": ["appId"],
+					"columnsTo": ["id"],
+					"onDelete": "no action",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"developer_api_keys_id": {
+					"name": "developer_api_keys_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"developer_app_domains": {
+			"name": "developer_app_domains",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"appId": {
+					"name": "appId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"domain": {
+					"name": "domain",
+					"type": "varchar(253)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {},
+			"foreignKeys": {
+				"developer_app_domains_appId_developer_apps_id_fk": {
+					"name": "developer_app_domains_appId_developer_apps_id_fk",
+					"tableFrom": "developer_app_domains",
+					"tableTo": "developer_apps",
+					"columnsFrom": ["appId"],
+					"columnsTo": ["id"],
+					"onDelete": "no action",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"developer_app_domains_id": {
+					"name": "developer_app_domains_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {
+				"app_domain_unique": {
+					"name": "app_domain_unique",
+					"columns": ["appId", "domain"]
+				}
+			},
+			"checkConstraint": {}
+		},
+		"developer_apps": {
+			"name": "developer_apps",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"ownerId": {
+					"name": "ownerId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"name": {
+					"name": "name",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"environment": {
+					"name": "environment",
+					"type": "varchar(16)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"logoUrl": {
+					"name": "logoUrl",
+					"type": "varchar(1024)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"deletedAt": {
+					"name": "deletedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"owner_deleted_idx": {
+					"name": "owner_deleted_idx",
+					"columns": ["ownerId", "deletedAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"developer_apps_id": {
+					"name": "developer_apps_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"developer_credit_accounts": {
+			"name": "developer_credit_accounts",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"appId": {
+					"name": "appId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"ownerId": {
+					"name": "ownerId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"balanceMicroCredits": {
+					"name": "balanceMicroCredits",
+					"type": "bigint unsigned",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"stripeCustomerId": {
+					"name": "stripeCustomerId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"stripePaymentMethodId": {
+					"name": "stripePaymentMethodId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"autoTopUpEnabled": {
+					"name": "autoTopUpEnabled",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": false
+				},
+				"autoTopUpThresholdMicroCredits": {
+					"name": "autoTopUpThresholdMicroCredits",
+					"type": "bigint unsigned",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"autoTopUpAmountCents": {
+					"name": "autoTopUpAmountCents",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"app_id_unique": {
+					"name": "app_id_unique",
+					"columns": ["appId"],
+					"isUnique": true
+				}
+			},
+			"foreignKeys": {
+				"developer_credit_accounts_appId_developer_apps_id_fk": {
+					"name": "developer_credit_accounts_appId_developer_apps_id_fk",
+					"tableFrom": "developer_credit_accounts",
+					"tableTo": "developer_apps",
+					"columnsFrom": ["appId"],
+					"columnsTo": ["id"],
+					"onDelete": "no action",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"developer_credit_accounts_id": {
+					"name": "developer_credit_accounts_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"developer_credit_transactions": {
+			"name": "developer_credit_transactions",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"accountId": {
+					"name": "accountId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"type": {
+					"name": "type",
+					"type": "varchar(16)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"amountMicroCredits": {
+					"name": "amountMicroCredits",
+					"type": "bigint",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"balanceAfterMicroCredits": {
+					"name": "balanceAfterMicroCredits",
+					"type": "bigint unsigned",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"referenceId": {
+					"name": "referenceId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"referenceType": {
+					"name": "referenceType",
+					"type": "varchar(32)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"metadata": {
+					"name": "metadata",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"account_type_created_idx": {
+					"name": "account_type_created_idx",
+					"columns": ["accountId", "type", "createdAt"],
+					"isUnique": false
+				},
+				"account_ref_dedup_idx": {
+					"name": "account_ref_dedup_idx",
+					"columns": ["accountId", "referenceId", "referenceType"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {
+				"dev_credit_txn_account_fk": {
+					"name": "dev_credit_txn_account_fk",
+					"tableFrom": "developer_credit_transactions",
+					"tableTo": "developer_credit_accounts",
+					"columnsFrom": ["accountId"],
+					"columnsTo": ["id"],
+					"onDelete": "no action",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"developer_credit_transactions_id": {
+					"name": "developer_credit_transactions_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"developer_daily_storage_snapshots": {
+			"name": "developer_daily_storage_snapshots",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"appId": {
+					"name": "appId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"snapshotDate": {
+					"name": "snapshotDate",
+					"type": "varchar(10)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"totalDurationMinutes": {
+					"name": "totalDurationMinutes",
+					"type": "float",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"videoCount": {
+					"name": "videoCount",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"microCreditsCharged": {
+					"name": "microCreditsCharged",
+					"type": "bigint unsigned",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"processedAt": {
+					"name": "processedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {},
+			"foreignKeys": {
+				"developer_daily_storage_snapshots_appId_developer_apps_id_fk": {
+					"name": "developer_daily_storage_snapshots_appId_developer_apps_id_fk",
+					"tableFrom": "developer_daily_storage_snapshots",
+					"tableTo": "developer_apps",
+					"columnsFrom": ["appId"],
+					"columnsTo": ["id"],
+					"onDelete": "no action",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"developer_daily_storage_snapshots_id": {
+					"name": "developer_daily_storage_snapshots_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {
+				"app_date_unique": {
+					"name": "app_date_unique",
+					"columns": ["appId", "snapshotDate"]
+				}
+			},
+			"checkConstraint": {}
+		},
+		"developer_videos": {
+			"name": "developer_videos",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"appId": {
+					"name": "appId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"externalUserId": {
+					"name": "externalUserId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"name": {
+					"name": "name",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'Untitled'"
+				},
+				"duration": {
+					"name": "duration",
+					"type": "float",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"width": {
+					"name": "width",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"height": {
+					"name": "height",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"fps": {
+					"name": "fps",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"s3Key": {
+					"name": "s3Key",
+					"type": "varchar(512)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"transcriptionStatus": {
+					"name": "transcriptionStatus",
+					"type": "varchar(16)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"metadata": {
+					"name": "metadata",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"deletedAt": {
+					"name": "deletedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"app_created_idx": {
+					"name": "app_created_idx",
+					"columns": ["appId", "createdAt"],
+					"isUnique": false
+				},
+				"app_user_idx": {
+					"name": "app_user_idx",
+					"columns": ["appId", "externalUserId"],
+					"isUnique": false
+				},
+				"app_deleted_idx": {
+					"name": "app_deleted_idx",
+					"columns": ["appId", "deletedAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {
+				"developer_videos_appId_developer_apps_id_fk": {
+					"name": "developer_videos_appId_developer_apps_id_fk",
+					"tableFrom": "developer_videos",
+					"tableTo": "developer_apps",
+					"columnsFrom": ["appId"],
+					"columnsTo": ["id"],
+					"onDelete": "no action",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"developer_videos_id": {
+					"name": "developer_videos_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"folders": {
+			"name": "folders",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"name": {
+					"name": "name",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"color": {
+					"name": "color",
+					"type": "varchar(16)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'normal'"
+				},
+				"public": {
+					"name": "public",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": false
+				},
+				"settings": {
+					"name": "settings",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"createdById": {
+					"name": "createdById",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"parentId": {
+					"name": "parentId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"spaceId": {
+					"name": "spaceId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"organization_id_idx": {
+					"name": "organization_id_idx",
+					"columns": ["organizationId"],
+					"isUnique": false
+				},
+				"created_by_id_idx": {
+					"name": "created_by_id_idx",
+					"columns": ["createdById"],
+					"isUnique": false
+				},
+				"parent_id_idx": {
+					"name": "parent_id_idx",
+					"columns": ["parentId"],
+					"isUnique": false
+				},
+				"space_id_idx": {
+					"name": "space_id_idx",
+					"columns": ["spaceId"],
+					"isUnique": false
+				},
+				"public_parent_id_idx": {
+					"name": "public_parent_id_idx",
+					"columns": ["public", "parentId"],
+					"isUnique": false
+				},
+				"public_space_parent_id_idx": {
+					"name": "public_space_parent_id_idx",
+					"columns": ["public", "spaceId", "parentId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"folders_id": {
+					"name": "folders_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"imported_videos": {
+			"name": "imported_videos",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"orgId": {
+					"name": "orgId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"source": {
+					"name": "source",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"source_id": {
+					"name": "source_id",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"id_idx": {
+					"name": "id_idx",
+					"columns": ["id"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"imported_videos_orgId_source_source_id_pk": {
+					"name": "imported_videos_orgId_source_source_id_pk",
+					"columns": ["orgId", "source", "source_id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"integration_installations": {
+			"name": "integration_installations",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"provider": {
+					"name": "provider",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"externalId": {
+					"name": "externalId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"displayName": {
+					"name": "displayName",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"installedByUserId": {
+					"name": "installedByUserId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"encryptedCredentials": {
+					"name": "encryptedCredentials",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"metadata": {
+					"name": "metadata",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"provider_external_id_idx": {
+					"name": "provider_external_id_idx",
+					"columns": ["provider", "externalId"],
+					"isUnique": true
+				},
+				"organization_provider_display_name_idx": {
+					"name": "organization_provider_display_name_idx",
+					"columns": ["organizationId", "provider", "displayName"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"integration_installations_id": {
+					"name": "integration_installations_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"loom_migration_requests": {
+			"name": "loom_migration_requests",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"activeOrganizationId": {
+					"name": "activeOrganizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"requestedByUserId": {
+					"name": "requestedByUserId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"workspaceName": {
+					"name": "workspaceName",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"customerNote": {
+					"name": "customerNote",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"customerReply": {
+					"name": "customerReply",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"invitedAt": {
+					"name": "invitedAt",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"status": {
+					"name": "status",
+					"type": "varchar(32)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'pending'"
+				},
+				"capMessage": {
+					"name": "capMessage",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"expectedVideoCount": {
+					"name": "expectedVideoCount",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"importedVideoCount": {
+					"name": "importedVideoCount",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"queuedVideoCount": {
+					"name": "queuedVideoCount",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"lastOperatorUserId": {
+					"name": "lastOperatorUserId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"lastOperatorAt": {
+					"name": "lastOperatorAt",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"completedAt": {
+					"name": "completedAt",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"loom_migration_active_org_idx": {
+					"name": "loom_migration_active_org_idx",
+					"columns": ["activeOrganizationId"],
+					"isUnique": true
+				},
+				"loom_migration_org_created_idx": {
+					"name": "loom_migration_org_created_idx",
+					"columns": ["organizationId", "createdAt"],
+					"isUnique": false
+				},
+				"loom_migration_status_created_idx": {
+					"name": "loom_migration_status_created_idx",
+					"columns": ["status", "createdAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"loom_migration_requests_id": {
+					"name": "loom_migration_requests_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"loops_sync_jobs": {
+			"name": "loops_sync_jobs",
+			"columns": {
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"revision": {
+					"name": "revision",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 1
+				},
+				"nextAttemptAt": {
+					"name": "nextAttemptAt",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"leaseToken": {
+					"name": "leaseToken",
+					"type": "varchar(36)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"leaseUntil": {
+					"name": "leaseUntil",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"failures": {
+					"name": "failures",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"lastError": {
+					"name": "lastError",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"profileHash": {
+					"name": "profileHash",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"teammateJoinedAt": {
+					"name": "teammateJoinedAt",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"syncedEmail": {
+					"name": "syncedEmail",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"lastSyncedAt": {
+					"name": "lastSyncedAt",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"loops_sync_due_idx": {
+					"name": "loops_sync_due_idx",
+					"columns": ["nextAttemptAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"loops_sync_jobs_userId": {
+					"name": "loops_sync_jobs_userId",
+					"columns": ["userId"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"media_processing_budgets": {
+			"name": "media_processing_budgets",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"reserved_bytes": {
+					"name": "reserved_bytes",
+					"type": "bigint unsigned",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"limit_bytes": {
+					"name": "limit_bytes",
+					"type": "bigint unsigned",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"expires_at": {
+					"name": "expires_at",
+					"type": "datetime(3)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"media_budget_expiry_idx": {
+					"name": "media_budget_expiry_idx",
+					"columns": ["expires_at"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"media_processing_budgets_id": {
+					"name": "media_processing_budgets_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"messenger_conversations": {
+			"name": "messenger_conversations",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"agent": {
+					"name": "agent",
+					"type": "varchar(32)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"mode": {
+					"name": "mode",
+					"type": "varchar(16)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'agent'"
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"anonymousId": {
+					"name": "anonymousId",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"takeoverByUserId": {
+					"name": "takeoverByUserId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"takeoverAt": {
+					"name": "takeoverAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				},
+				"lastMessageAt": {
+					"name": "lastMessageAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"user_last_message_idx": {
+					"name": "user_last_message_idx",
+					"columns": ["userId", "lastMessageAt"],
+					"isUnique": false
+				},
+				"anonymous_last_message_idx": {
+					"name": "anonymous_last_message_idx",
+					"columns": ["anonymousId", "lastMessageAt"],
+					"isUnique": false
+				},
+				"mode_last_message_idx": {
+					"name": "mode_last_message_idx",
+					"columns": ["mode", "lastMessageAt"],
+					"isUnique": false
+				},
+				"updated_at_idx": {
+					"name": "updated_at_idx",
+					"columns": ["updatedAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"messenger_conversations_id": {
+					"name": "messenger_conversations_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"messenger_messages": {
+			"name": "messenger_messages",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"conversationId": {
+					"name": "conversationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"role": {
+					"name": "role",
+					"type": "varchar(16)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"content": {
+					"name": "content",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"anonymousId": {
+					"name": "anonymousId",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"conversation_created_at_idx": {
+					"name": "conversation_created_at_idx",
+					"columns": ["conversationId", "createdAt"],
+					"isUnique": false
+				},
+				"role_created_at_idx": {
+					"name": "role_created_at_idx",
+					"columns": ["role", "createdAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {
+				"messenger_messages_conversationId_messenger_conversations_id_fk": {
+					"name": "messenger_messages_conversationId_messenger_conversations_id_fk",
+					"tableFrom": "messenger_messages",
+					"tableTo": "messenger_conversations",
+					"columnsFrom": ["conversationId"],
+					"columnsTo": ["id"],
+					"onDelete": "cascade",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"messenger_messages_id": {
+					"name": "messenger_messages_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"messenger_support_emails": {
+			"name": "messenger_support_emails",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"conversationId": {
+					"name": "conversationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userEmail": {
+					"name": "userEmail",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"subject": {
+					"name": "subject",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"message": {
+					"name": "message",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"support_email_user_created_at_idx": {
+					"name": "support_email_user_created_at_idx",
+					"columns": ["userId", "createdAt"],
+					"isUnique": false
+				},
+				"support_email_conversation_created_at_idx": {
+					"name": "support_email_conversation_created_at_idx",
+					"columns": ["conversationId", "createdAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {
+				"support_email_conversation_fk": {
+					"name": "support_email_conversation_fk",
+					"tableFrom": "messenger_support_emails",
+					"tableTo": "messenger_conversations",
+					"columnsFrom": ["conversationId"],
+					"columnsTo": ["id"],
+					"onDelete": "cascade",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"messenger_support_emails_id": {
+					"name": "messenger_support_emails_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"notifications": {
+			"name": "notifications",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"orgId": {
+					"name": "orgId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"recipientId": {
+					"name": "recipientId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"type": {
+					"name": "type",
+					"type": "varchar(16)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"data": {
+					"name": "data",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"videoId": {
+					"name": "videoId",
+					"type": "varchar(50)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"dedupKey": {
+					"name": "dedupKey",
+					"type": "varchar(128)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"readAt": {
+					"name": "readAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"org_id_idx": {
+					"name": "org_id_idx",
+					"columns": ["orgId"],
+					"isUnique": false
+				},
+				"type_idx": {
+					"name": "type_idx",
+					"columns": ["type"],
+					"isUnique": false
+				},
+				"read_at_idx": {
+					"name": "read_at_idx",
+					"columns": ["readAt"],
+					"isUnique": false
+				},
+				"created_at_idx": {
+					"name": "created_at_idx",
+					"columns": ["createdAt"],
+					"isUnique": false
+				},
+				"recipient_read_idx": {
+					"name": "recipient_read_idx",
+					"columns": ["recipientId", "readAt"],
+					"isUnique": false
+				},
+				"recipient_created_idx": {
+					"name": "recipient_created_idx",
+					"columns": ["recipientId", "createdAt"],
+					"isUnique": false
+				},
+				"dedup_key_idx": {
+					"name": "dedup_key_idx",
+					"columns": ["dedupKey"],
+					"isUnique": true
+				},
+				"type_recipient_created_idx": {
+					"name": "type_recipient_created_idx",
+					"columns": ["type", "recipientId", "createdAt"],
+					"isUnique": false
+				},
+				"type_recipient_video_created_idx": {
+					"name": "type_recipient_video_created_idx",
+					"columns": ["type", "recipientId", "videoId", "createdAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"notifications_id": {
+					"name": "notifications_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"organization_invites": {
+			"name": "organization_invites",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"invitedEmail": {
+					"name": "invitedEmail",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"invitedByUserId": {
+					"name": "invitedByUserId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"role": {
+					"name": "role",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"status": {
+					"name": "status",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'pending'"
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				},
+				"expiresAt": {
+					"name": "expiresAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"organization_id_idx": {
+					"name": "organization_id_idx",
+					"columns": ["organizationId"],
+					"isUnique": false
+				},
+				"invited_email_idx": {
+					"name": "invited_email_idx",
+					"columns": ["invitedEmail"],
+					"isUnique": false
+				},
+				"invited_by_user_id_idx": {
+					"name": "invited_by_user_id_idx",
+					"columns": ["invitedByUserId"],
+					"isUnique": false
+				},
+				"status_idx": {
+					"name": "status_idx",
+					"columns": ["status"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"organization_invites_id": {
+					"name": "organization_invites_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"organization_members": {
+			"name": "organization_members",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"role": {
+					"name": "role",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"hasProSeat": {
+					"name": "hasProSeat",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"organization_id_idx": {
+					"name": "organization_id_idx",
+					"columns": ["organizationId"],
+					"isUnique": false
+				},
+				"user_id_organization_id_idx": {
+					"name": "user_id_organization_id_idx",
+					"columns": ["userId", "organizationId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"organization_members_id": {
+					"name": "organization_members_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"organization_sso": {
+			"name": "organization_sso",
+			"columns": {
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"purchasedByUserId": {
+					"name": "purchasedByUserId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"stripeCustomerId": {
+					"name": "stripeCustomerId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"stripeSubscriptionId": {
+					"name": "stripeSubscriptionId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"stripePriceId": {
+					"name": "stripePriceId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"status": {
+					"name": "status",
+					"type": "varchar(32)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'unpaid'"
+				},
+				"paidThrough": {
+					"name": "paidThrough",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"currentPeriodEnd": {
+					"name": "currentPeriodEnd",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"cancelAtPeriodEnd": {
+					"name": "cancelAtPeriodEnd",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": false
+				},
+				"checkoutAttemptId": {
+					"name": "checkoutAttemptId",
+					"type": "varchar(36)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"checkoutCurrency": {
+					"name": "checkoutCurrency",
+					"type": "varchar(3)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"checkoutPriceId": {
+					"name": "checkoutPriceId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"checkoutSessionId": {
+					"name": "checkoutSessionId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"checkoutStartedAt": {
+					"name": "checkoutStartedAt",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"sso_stripe_subscription_id_idx": {
+					"name": "sso_stripe_subscription_id_idx",
+					"columns": ["stripeSubscriptionId"],
+					"isUnique": true
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"organization_sso_organizationId": {
+					"name": "organization_sso_organizationId",
+					"columns": ["organizationId"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"organizations": {
+			"name": "organizations",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"name": {
+					"name": "name",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"ownerId": {
+					"name": "ownerId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"metadata": {
+					"name": "metadata",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"tombstoneAt": {
+					"name": "tombstoneAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"allowedEmailDomain": {
+					"name": "allowedEmailDomain",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"customDomain": {
+					"name": "customDomain",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"domainVerified": {
+					"name": "domainVerified",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"settings": {
+					"name": "settings",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"iconUrl": {
+					"name": "iconUrl",
+					"type": "varchar(1024)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"shareableLinkIconUrl": {
+					"name": "shareableLinkIconUrl",
+					"type": "varchar(1024)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				},
+				"workosOrganizationId": {
+					"name": "workosOrganizationId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"workosConnectionId": {
+					"name": "workosConnectionId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"owner_id_tombstone_idx": {
+					"name": "owner_id_tombstone_idx",
+					"columns": ["ownerId", "tombstoneAt"],
+					"isUnique": false
+				},
+				"custom_domain_idx": {
+					"name": "custom_domain_idx",
+					"columns": ["customDomain"],
+					"isUnique": false
+				},
+				"workos_organization_id_idx": {
+					"name": "workos_organization_id_idx",
+					"columns": ["workosOrganizationId"],
+					"isUnique": true
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"organizations_id": {
+					"name": "organizations_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"s3_buckets": {
+			"name": "s3_buckets",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"ownerId": {
+					"name": "ownerId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"region": {
+					"name": "region",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"endpoint": {
+					"name": "endpoint",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"bucketName": {
+					"name": "bucketName",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"accessKeyId": {
+					"name": "accessKeyId",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"secretAccessKey": {
+					"name": "secretAccessKey",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"provider": {
+					"name": "provider",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "('aws')"
+				},
+				"active": {
+					"name": "active",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": true
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"owner_organization_idx": {
+					"name": "owner_organization_idx",
+					"columns": ["ownerId", "organizationId"],
+					"isUnique": false
+				},
+				"organization_id_idx": {
+					"name": "organization_id_idx",
+					"columns": ["organizationId"],
+					"isUnique": false
+				},
+				"organization_active_idx": {
+					"name": "organization_active_idx",
+					"columns": ["organizationId", "active", "updatedAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"s3_buckets_id": {
+					"name": "s3_buckets_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"sessions": {
+			"name": "sessions",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"sessionToken": {
+					"name": "sessionToken",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"expires": {
+					"name": "expires",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"created_at": {
+					"name": "created_at",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updated_at": {
+					"name": "updated_at",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"session_token_idx": {
+					"name": "session_token_idx",
+					"columns": ["sessionToken"],
+					"isUnique": true
+				},
+				"user_id_idx": {
+					"name": "user_id_idx",
+					"columns": ["userId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"sessions_id": {
+					"name": "sessions_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"shared_videos": {
+			"name": "shared_videos",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"videoId": {
+					"name": "videoId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"folderId": {
+					"name": "folderId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"sharedByUserId": {
+					"name": "sharedByUserId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"sharedAt": {
+					"name": "sharedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"folder_id_idx": {
+					"name": "folder_id_idx",
+					"columns": ["folderId"],
+					"isUnique": false
+				},
+				"organization_id_idx": {
+					"name": "organization_id_idx",
+					"columns": ["organizationId"],
+					"isUnique": false
+				},
+				"shared_by_user_id_idx": {
+					"name": "shared_by_user_id_idx",
+					"columns": ["sharedByUserId"],
+					"isUnique": false
+				},
+				"video_id_organization_id_idx": {
+					"name": "video_id_organization_id_idx",
+					"columns": ["videoId", "organizationId"],
+					"isUnique": false
+				},
+				"video_id_folder_id_idx": {
+					"name": "video_id_folder_id_idx",
+					"columns": ["videoId", "folderId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"shared_videos_id": {
+					"name": "shared_videos_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"signed_baas": {
+			"name": "signed_baas",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"status": {
+					"name": "status",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'pending'"
+				},
+				"stripeSubscriptionId": {
+					"name": "stripeSubscriptionId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"entityName": {
+					"name": "entityName",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"entityType": {
+					"name": "entityType",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"entityAddress": {
+					"name": "entityAddress",
+					"type": "varchar(500)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"signerName": {
+					"name": "signerName",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"signerTitle": {
+					"name": "signerTitle",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"noticesEmail": {
+					"name": "noticesEmail",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"signatureData": {
+					"name": "signatureData",
+					"type": "longtext",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"signedAt": {
+					"name": "signedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"emailSentAt": {
+					"name": "emailSentAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"signed_baa_organization_id_idx": {
+					"name": "signed_baa_organization_id_idx",
+					"columns": ["organizationId"],
+					"isUnique": true
+				},
+				"signed_baa_stripe_subscription_idx": {
+					"name": "signed_baa_stripe_subscription_idx",
+					"columns": ["stripeSubscriptionId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"signed_baas_id": {
+					"name": "signed_baas_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"space_members": {
+			"name": "space_members",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"spaceId": {
+					"name": "spaceId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"role": {
+					"name": "role",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'member'"
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"user_id_idx": {
+					"name": "user_id_idx",
+					"columns": ["userId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"space_members_id": {
+					"name": "space_members_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {
+				"space_id_user_id_unique": {
+					"name": "space_id_user_id_unique",
+					"columns": ["spaceId", "userId"]
+				}
+			},
+			"checkConstraint": {}
+		},
+		"space_videos": {
+			"name": "space_videos",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"spaceId": {
+					"name": "spaceId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"folderId": {
+					"name": "folderId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"videoId": {
+					"name": "videoId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"addedById": {
+					"name": "addedById",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"addedAt": {
+					"name": "addedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"folder_id_idx": {
+					"name": "folder_id_idx",
+					"columns": ["folderId"],
+					"isUnique": false
+				},
+				"video_id_idx": {
+					"name": "video_id_idx",
+					"columns": ["videoId"],
+					"isUnique": false
+				},
+				"added_by_id_idx": {
+					"name": "added_by_id_idx",
+					"columns": ["addedById"],
+					"isUnique": false
+				},
+				"space_id_video_id_idx": {
+					"name": "space_id_video_id_idx",
+					"columns": ["spaceId", "videoId"],
+					"isUnique": false
+				},
+				"space_id_folder_id_idx": {
+					"name": "space_id_folder_id_idx",
+					"columns": ["spaceId", "folderId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"space_videos_id": {
+					"name": "space_videos_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"spaces": {
+			"name": "spaces",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"primary": {
+					"name": "primary",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": false
+				},
+				"name": {
+					"name": "name",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"createdById": {
+					"name": "createdById",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"iconUrl": {
+					"name": "iconUrl",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"description": {
+					"name": "description",
+					"type": "varchar(1000)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"settings": {
+					"name": "settings",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"password": {
+					"name": "password",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				},
+				"privacy": {
+					"name": "privacy",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'Private'"
+				},
+				"public": {
+					"name": "public",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": false
+				}
+			},
+			"indexes": {
+				"organization_id_idx": {
+					"name": "organization_id_idx",
+					"columns": ["organizationId"],
+					"isUnique": false
+				},
+				"created_by_id_idx": {
+					"name": "created_by_id_idx",
+					"columns": ["createdById"],
+					"isUnique": false
+				},
+				"public_organization_id_idx": {
+					"name": "public_organization_id_idx",
+					"columns": ["public", "organizationId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"spaces_id": {
+					"name": "spaces_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"storage_integrations": {
+			"name": "storage_integrations",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"ownerId": {
+					"name": "ownerId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"provider": {
+					"name": "provider",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"displayName": {
+					"name": "displayName",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"status": {
+					"name": "status",
+					"type": "varchar(32)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'active'"
+				},
+				"active": {
+					"name": "active",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": false
+				},
+				"encryptedConfig": {
+					"name": "encryptedConfig",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"googleDriveAccessToken": {
+					"name": "googleDriveAccessToken",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"googleDriveAccessTokenExpiresAt": {
+					"name": "googleDriveAccessTokenExpiresAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"googleDriveTokenRefreshLeaseId": {
+					"name": "googleDriveTokenRefreshLeaseId",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"googleDriveTokenRefreshLeaseExpiresAt": {
+					"name": "googleDriveTokenRefreshLeaseExpiresAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"googleDriveStorageQuotaCache": {
+					"name": "googleDriveStorageQuotaCache",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"owner_provider_idx": {
+					"name": "owner_provider_idx",
+					"columns": ["ownerId", "provider"],
+					"isUnique": false
+				},
+				"owner_active_idx": {
+					"name": "owner_active_idx",
+					"columns": ["ownerId", "active"],
+					"isUnique": false
+				},
+				"organization_provider_idx": {
+					"name": "organization_provider_idx",
+					"columns": ["organizationId", "provider"],
+					"isUnique": false
+				},
+				"organization_active_idx": {
+					"name": "organization_active_idx",
+					"columns": ["organizationId", "active", "status"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"storage_integrations_id": {
+					"name": "storage_integrations_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"storage_objects": {
+			"name": "storage_objects",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"integrationId": {
+					"name": "integrationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"ownerId": {
+					"name": "ownerId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"videoId": {
+					"name": "videoId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"objectKey": {
+					"name": "objectKey",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"objectKeyHash": {
+					"name": "objectKeyHash",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"providerObjectId": {
+					"name": "providerObjectId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"uploadSessionUrl": {
+					"name": "uploadSessionUrl",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"uploadStatus": {
+					"name": "uploadStatus",
+					"type": "varchar(32)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'pending'"
+				},
+				"contentType": {
+					"name": "contentType",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"contentLength": {
+					"name": "contentLength",
+					"type": "bigint unsigned",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"metadata": {
+					"name": "metadata",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"integration_key_hash_idx": {
+					"name": "integration_key_hash_idx",
+					"columns": ["integrationId", "objectKeyHash"],
+					"isUnique": true
+				},
+				"integration_status_idx": {
+					"name": "integration_status_idx",
+					"columns": ["integrationId", "uploadStatus"],
+					"isUnique": false
+				},
+				"integration_object_key_prefix_idx": {
+					"name": "integration_object_key_prefix_idx",
+					"columns": ["integrationId", "`objectKey`(191)"],
+					"isUnique": false
+				},
+				"video_id_idx": {
+					"name": "video_id_idx",
+					"columns": ["videoId"],
+					"isUnique": false
+				},
+				"owner_id_idx": {
+					"name": "owner_id_idx",
+					"columns": ["ownerId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {
+				"storage_objects_integrationId_storage_integrations_id_fk": {
+					"name": "storage_objects_integrationId_storage_integrations_id_fk",
+					"tableFrom": "storage_objects",
+					"tableTo": "storage_integrations",
+					"columnsFrom": ["integrationId"],
+					"columnsTo": ["id"],
+					"onDelete": "restrict",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"storage_objects_id": {
+					"name": "storage_objects_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"users": {
+			"name": "users",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"name": {
+					"name": "name",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"lastName": {
+					"name": "lastName",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"email": {
+					"name": "email",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"emailVerified": {
+					"name": "emailVerified",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"image": {
+					"name": "image",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"stripeCustomerId": {
+					"name": "stripeCustomerId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"stripeSubscriptionId": {
+					"name": "stripeSubscriptionId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"thirdPartyStripeSubscriptionId": {
+					"name": "thirdPartyStripeSubscriptionId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"stripeSubscriptionStatus": {
+					"name": "stripeSubscriptionStatus",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"stripeSubscriptionPriceId": {
+					"name": "stripeSubscriptionPriceId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"preferences": {
+					"name": "preferences",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false,
+					"default": "('null')"
+				},
+				"activeOrganizationId": {
+					"name": "activeOrganizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"created_at": {
+					"name": "created_at",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updated_at": {
+					"name": "updated_at",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				},
+				"onboardingSteps": {
+					"name": "onboardingSteps",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"onboarding_completed_at": {
+					"name": "onboarding_completed_at",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"customBucket": {
+					"name": "customBucket",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"inviteQuota": {
+					"name": "inviteQuota",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 1
+				},
+				"defaultOrgId": {
+					"name": "defaultOrgId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"authSessionVersion": {
+					"name": "authSessionVersion",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"marketingOrigin": {
+					"name": "marketingOrigin",
+					"type": "varchar(20)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'unknown'"
+				}
+			},
+			"indexes": {
+				"email_idx": {
+					"name": "email_idx",
+					"columns": ["email"],
+					"isUnique": true
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"users_id": {
+					"name": "users_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"verification_tokens": {
+			"name": "verification_tokens",
+			"columns": {
+				"identifier": {
+					"name": "identifier",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"token": {
+					"name": "token",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"expires": {
+					"name": "expires",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"created_at": {
+					"name": "created_at",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updated_at": {
+					"name": "updated_at",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"verification_tokens_identifier": {
+					"name": "verification_tokens_identifier",
+					"columns": ["identifier"]
+				}
+			},
+			"uniqueConstraints": {
+				"verification_tokens_token_unique": {
+					"name": "verification_tokens_token_unique",
+					"columns": ["token"]
+				}
+			},
+			"checkConstraint": {}
+		},
+		"video_edits": {
+			"name": "video_edits",
+			"columns": {
+				"videoId": {
+					"name": "videoId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"sourceKey": {
+					"name": "sourceKey",
+					"type": "varchar(512)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"editSpec": {
+					"name": "editSpec",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {},
+			"foreignKeys": {
+				"video_edits_videoId_videos_id_fk": {
+					"name": "video_edits_videoId_videos_id_fk",
+					"tableFrom": "video_edits",
+					"tableTo": "videos",
+					"columnsFrom": ["videoId"],
+					"columnsTo": ["id"],
+					"onDelete": "cascade",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"video_edits_videoId": {
+					"name": "video_edits_videoId",
+					"columns": ["videoId"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"video_processing_jobs": {
+			"name": "video_processing_jobs",
+			"columns": {
+				"video_id": {
+					"name": "video_id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"owner_id": {
+					"name": "owner_id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"generation": {
+					"name": "generation",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"manifest_sha256": {
+					"name": "manifest_sha256",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"state": {
+					"name": "state",
+					"type": "varchar(32)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'committing'"
+				},
+				"attempt_id": {
+					"name": "attempt_id",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"attempt_count": {
+					"name": "attempt_count",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"lease_expires_at": {
+					"name": "lease_expires_at",
+					"type": "datetime(3)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"next_retry_at": {
+					"name": "next_retry_at",
+					"type": "datetime(3)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"workflow_run_id": {
+					"name": "workflow_run_id",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"remote_job_id": {
+					"name": "remote_job_id",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"source": {
+					"name": "source",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"verification": {
+					"name": "verification",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"output": {
+					"name": "output",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"error_code": {
+					"name": "error_code",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"error_message": {
+					"name": "error_message",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"created_at": {
+					"name": "created_at",
+					"type": "datetime(3)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"updated_at": {
+					"name": "updated_at",
+					"type": "datetime(3)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"processing_state_retry_video_idx": {
+					"name": "processing_state_retry_video_idx",
+					"columns": ["state", "next_retry_at", "video_id"],
+					"isUnique": false
+				},
+				"processing_state_lease_video_idx": {
+					"name": "processing_state_lease_video_idx",
+					"columns": ["state", "lease_expires_at", "video_id"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"video_processing_jobs_video_id": {
+					"name": "video_processing_jobs_video_id",
+					"columns": ["video_id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"video_uploads": {
+			"name": "video_uploads",
+			"columns": {
+				"video_id": {
+					"name": "video_id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"uploaded": {
+					"name": "uploaded",
+					"type": "bigint unsigned",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"total": {
+					"name": "total",
+					"type": "bigint unsigned",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"started_at": {
+					"name": "started_at",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updated_at": {
+					"name": "updated_at",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"mode": {
+					"name": "mode",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"phase": {
+					"name": "phase",
+					"type": "varchar(32)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'uploading'"
+				},
+				"processing_progress": {
+					"name": "processing_progress",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"processing_message": {
+					"name": "processing_message",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"processing_error": {
+					"name": "processing_error",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"raw_file_key": {
+					"name": "raw_file_key",
+					"type": "varchar(512)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"phase_updated_at_video_id_idx": {
+					"name": "phase_updated_at_video_id_idx",
+					"columns": ["phase", "updated_at", "video_id"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"video_uploads_video_id": {
+					"name": "video_uploads_video_id",
+					"columns": ["video_id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"videos": {
+			"name": "videos",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"ownerId": {
+					"name": "ownerId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"orgId": {
+					"name": "orgId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"name": {
+					"name": "name",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'My Video'"
+				},
+				"bucket": {
+					"name": "bucket",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"storageIntegrationId": {
+					"name": "storageIntegrationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"duration": {
+					"name": "duration",
+					"type": "float",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"width": {
+					"name": "width",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"height": {
+					"name": "height",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"fps": {
+					"name": "fps",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"metadata": {
+					"name": "metadata",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"public": {
+					"name": "public",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": true
+				},
+				"settings": {
+					"name": "settings",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"transcriptionStatus": {
+					"name": "transcriptionStatus",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"source": {
+					"name": "source",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "('{\"type\":\"MediaConvert\"}')"
+				},
+				"folderId": {
+					"name": "folderId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"effectiveCreatedAt": {
+					"name": "effectiveCreatedAt",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false,
+					"generated": {
+						"as": "COALESCE(\n          STR_TO_DATE(JSON_UNQUOTE(JSON_EXTRACT(`metadata`, '$.customCreatedAt')), '%Y-%m-%dT%H:%i:%s.%fZ'),\n          STR_TO_DATE(JSON_UNQUOTE(JSON_EXTRACT(`metadata`, '$.customCreatedAt')), '%Y-%m-%dT%H:%i:%sZ'),\n          `createdAt`\n        )",
+						"type": "stored"
+					}
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				},
+				"password": {
+					"name": "password",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"xStreamInfo": {
+					"name": "xStreamInfo",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"firstViewEmailSentAt": {
+					"name": "firstViewEmailSentAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"isScreenshot": {
+					"name": "isScreenshot",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": false
+				},
+				"awsRegion": {
+					"name": "awsRegion",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"awsBucket": {
+					"name": "awsBucket",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"videoStartTime": {
+					"name": "videoStartTime",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"audioStartTime": {
+					"name": "audioStartTime",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"jobId": {
+					"name": "jobId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"jobStatus": {
+					"name": "jobStatus",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"skipProcessing": {
+					"name": "skipProcessing",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": false
+				}
+			},
+			"indexes": {
+				"owner_id_idx": {
+					"name": "owner_id_idx",
+					"columns": ["ownerId"],
+					"isUnique": false
+				},
+				"is_public_idx": {
+					"name": "is_public_idx",
+					"columns": ["public"],
+					"isUnique": false
+				},
+				"folder_id_idx": {
+					"name": "folder_id_idx",
+					"columns": ["folderId"],
+					"isUnique": false
+				},
+				"storage_integration_id_idx": {
+					"name": "storage_integration_id_idx",
+					"columns": ["storageIntegrationId"],
+					"isUnique": false
+				},
+				"org_owner_folder_idx": {
+					"name": "org_owner_folder_idx",
+					"columns": ["orgId", "ownerId", "folderId"],
+					"isUnique": false
+				},
+				"org_effective_created_idx": {
+					"name": "org_effective_created_idx",
+					"columns": ["orgId", "effectiveCreatedAt"],
+					"isUnique": false
+				},
+				"screenshot_transcription_created_idx": {
+					"name": "screenshot_transcription_created_idx",
+					"columns": ["isScreenshot", "transcriptionStatus", "createdAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {
+				"videos_storageIntegrationId_storage_integrations_id_fk": {
+					"name": "videos_storageIntegrationId_storage_integrations_id_fk",
+					"tableFrom": "videos",
+					"tableTo": "storage_integrations",
+					"columnsFrom": ["storageIntegrationId"],
+					"columnsTo": ["id"],
+					"onDelete": "restrict",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"videos_id": {
+					"name": "videos_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		}
+	},
+	"views": {},
+	"_meta": {
+		"schemas": {},
+		"tables": {},
+		"columns": {}
+	},
+	"internal": {
+		"tables": {},
+		"indexes": {
+			"integration_object_key_prefix_idx": {
+				"columns": {
+					"`objectKey`(191)": {
+						"isExpression": true
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/packages/database/migrations/meta/_journal.json b/packages/database/migrations/meta/_journal.json
index 014bc42ce7d..d8e7a8780af 100644
--- a/packages/database/migrations/meta/_journal.json
+++ b/packages/database/migrations/meta/_journal.json
@@ -323,6 +323,13 @@
 			"when": 1789136779085,
 			"tag": "0045_steep_forge",
 			"breakpoints": true
+		},
+		{
+			"idx": 46,
+			"version": "5",
+			"when": 1789985586222,
+			"tag": "0046_loom_concierge",
+			"breakpoints": true
 		}
 	]
 }
diff --git a/packages/database/schema.ts b/packages/database/schema.ts
index 7df0825ede2..d91b21bf257 100644
--- a/packages/database/schema.ts
+++ b/packages/database/schema.ts
@@ -1548,6 +1548,57 @@ export const importedVideos = mysqlTable(
 	],
 );
 
+export const loomMigrationRequests = mysqlTable(
+	"loom_migration_requests",
+	{
+		id: nanoId("id").notNull().primaryKey(),
+		organizationId: nanoId("organizationId")
+			.notNull()
+			.$type<Organisation.OrganisationId>(),
+		activeOrganizationId: nanoIdNullable(
+			"activeOrganizationId",
+		).$type<Organisation.OrganisationId>(),
+		requestedByUserId: nanoId("requestedByUserId")
+			.notNull()
+			.$type<User.UserId>(),
+		workspaceName: varchar("workspaceName", { length: 255 }),
+		customerNote: text("customerNote"),
+		customerReply: text("customerReply"),
+		invitedAt: datetime("invitedAt", { mode: "date" }),
+		status: varchar("status", {
+			length: 32,
+			enum: ["pending", "in_progress", "needs_information", "completed"],
+		})
+			.notNull()
+			.default("pending"),
+		capMessage: text("capMessage"),
+		expectedVideoCount: int("expectedVideoCount"),
+		importedVideoCount: int("importedVideoCount").notNull().default(0),
+		queuedVideoCount: int("queuedVideoCount").notNull().default(0),
+		lastOperatorUserId:
+			nanoIdNullable("lastOperatorUserId").$type<User.UserId>(),
+		lastOperatorAt: datetime("lastOperatorAt", { mode: "date" }),
+		completedAt: datetime("completedAt", { mode: "date" }),
+		createdAt: datetime("createdAt", { mode: "date" })
+			.notNull()
+			.$defaultFn(() => new Date()),
+		updatedAt: datetime("updatedAt", { mode: "date" })
+			.notNull()
+			.$defaultFn(() => new Date()),
+	},
+	(table) => [
+		uniqueIndex("loom_migration_active_org_idx").on(table.activeOrganizationId),
+		index("loom_migration_org_created_idx").on(
+			table.organizationId,
+			table.createdAt,
+		),
+		index("loom_migration_status_created_idx").on(
+			table.status,
+			table.createdAt,
+		),
+	],
+);
+
 export const developerApps = mysqlTable(
 	"developer_apps",
 	{

From 8df6730293da54bdfac1ed34f653a0b8d19e7997 Mon Sep 17 00:00:00 2001
From: Richie McIlroy <33632126+richiemcilroy@users.noreply.github.com>
Date: Mon, 21 Sep 2026 11:52:20 +0100
Subject: [PATCH 02/74] fix: register Loom migration emails

---
 emails/CATALOG.md     |  7 +++++++
 emails/application.ts | 10 ++++++++++
 2 files changed, 17 insertions(+)

diff --git a/emails/CATALOG.md b/emails/CATALOG.md
index ccc962d4bae..4b8bc43a5a3 100644
--- a/emails/CATALOG.md
+++ b/emails/CATALOG.md
@@ -618,6 +618,7 @@ These are repository send paths and retained templates, not confirmation of prod
 | Messenger support notification | An eligible support conversation requests an email notification | Cap support; replies go to the user | [messenger-support-email](../packages/database/emails/messenger-support-email.tsx) |
 | Account deletion request notification | An account deletion request is submitted | Cap support; replies go to the requester | [messenger-support-email](../packages/database/emails/messenger-support-email.tsx) |
 | Mobile content report notification | A mobile content report is submitted | Cap support; replies go to the reporter | [messenger-support-email](../packages/database/emails/messenger-support-email.tsx) |
+| Concierge Loom migration | A Cap Pro organization requests migration or its status changes | Cap support for new requests; the requester for status updates | [loom-migration](../packages/database/emails/loom-migration.tsx) |
 | Legacy login link template | No current send call found in this checkout | None configured | [login-link](../packages/database/emails/login-link.tsx) |
 
 ### Login verification code
@@ -692,6 +693,12 @@ Deduplicated by report ID.
 
 Send source: [apps/web/lib/account-deletion-request.ts](../apps/web/lib/account-deletion-request.ts).
 
+### Concierge Loom migration
+
+The request stays in the dashboard even if email delivery fails.
+
+Send source: [apps/web/actions/loom-concierge.tsx](../apps/web/actions/loom-concierge.tsx).
+
 ### Legacy login link template
 
 Retained source template; current email login uses verification codes.
diff --git a/emails/application.ts b/emails/application.ts
index fed7fbd3f43..60fe3d64287 100644
--- a/emails/application.ts
+++ b/emails/application.ts
@@ -131,6 +131,16 @@ export const applicationEmails: ApplicationEmail[] = [
 		template: "messenger-support-email",
 		sources: ["apps/web/lib/account-deletion-request.ts"],
 	},
+	{
+		id: "loom-migration",
+		name: "Concierge Loom migration",
+		trigger: "A Cap Pro organization requests migration or its status changes",
+		recipients:
+			"Cap support for new requests; the requester for status updates",
+		notes: "The request stays in the dashboard even if email delivery fails.",
+		template: "loom-migration",
+		sources: ["apps/web/actions/loom-concierge.tsx"],
+	},
 	{
 		id: "login-link",
 		name: "Legacy login link template",

From 1b6cb9dd439ffe378539b651f2c42b7c4a56bb8f Mon Sep 17 00:00:00 2001
From: Richie McIlroy <33632126+richiemcilroy@users.noreply.github.com>
Date: Mon, 21 Sep 2026 12:01:09 +0100
Subject: [PATCH 03/74] fix: coordinate concierge import completion

---
 apps/web/actions/loom-concierge.tsx           |  20 +-
 apps/web/actions/loom.ts                      | 545 +++++++++---------
 .../loom-migrations/LoomMigrationQueue.tsx    |   4 +-
 apps/web/lib/loom-concierge.ts                |  67 ++-
 .../migrations/0046_loom_concierge.sql        |   9 +
 .../migrations/meta/0046_snapshot.json        |  52 +-
 .../database/migrations/meta/_journal.json    |   2 +-
 packages/database/schema.ts                   |  13 +
 8 files changed, 434 insertions(+), 278 deletions(-)

diff --git a/apps/web/actions/loom-concierge.tsx b/apps/web/actions/loom-concierge.tsx
index b1a91d30f14..65835952a30 100644
--- a/apps/web/actions/loom-concierge.tsx
+++ b/apps/web/actions/loom-concierge.tsx
@@ -8,7 +8,7 @@ import {
 } from "@cap/database/emails/loom-migration";
 import { nanoId } from "@cap/database/helpers";
 import {
-	importedVideos,
+	loomMigrationImports,
 	loomMigrationRequests,
 	organizations,
 	users,
@@ -246,12 +246,14 @@ export async function updateLoomMigrationStatus({
 	if (nextStatus === "completed") {
 		const [unfinishedImport] = await db()
 			.select({ videoId: videoUploads.videoId })
-			.from(importedVideos)
-			.innerJoin(videoUploads, eq(videoUploads.videoId, importedVideos.id))
+			.from(loomMigrationImports)
+			.innerJoin(
+				videoUploads,
+				eq(videoUploads.videoId, loomMigrationImports.videoId),
+			)
 			.where(
 				and(
-					eq(importedVideos.orgId, request.organizationId),
-					eq(importedVideos.source, "loom"),
+					eq(loomMigrationImports.requestId, requestId),
 					inArray(videoUploads.phase, [
 						"uploading",
 						"processing",
@@ -290,10 +292,16 @@ export async function updateLoomMigrationStatus({
 			and(
 				eq(loomMigrationRequests.id, requestId),
 				eq(loomMigrationRequests.status, request.status),
+				isNotNull(loomMigrationRequests.activeOrganizationId),
+				nextStatus === "completed"
+					? eq(loomMigrationRequests.activeImportCount, 0)
+					: undefined,
 			),
 		);
 	if (affectedRows(result) === 0) {
-		throw new Error("The migration request changed. Refresh and try again.");
+		throw new Error(
+			"The migration request changed or imports are starting. Refresh and try again.",
+		);
 	}
 
 	const [requester] = await db()
diff --git a/apps/web/actions/loom.ts b/apps/web/actions/loom.ts
index 7cb49e13fac..2083d85dc0d 100644
--- a/apps/web/actions/loom.ts
+++ b/apps/web/actions/loom.ts
@@ -7,6 +7,7 @@ import { nanoId } from "@cap/database/helpers";
 import {
 	folders,
 	importedVideos,
+	loomMigrationImports,
 	loomMigrationRequests,
 	organizationMembers,
 	organizations,
@@ -39,7 +40,11 @@ import {
 	requireOrganizationSettingsManager,
 } from "@/actions/organization/authorization";
 import { requireSpaceManager } from "@/actions/organization/space-authorization";
-import { requireMigrationOperator } from "@/lib/loom-concierge";
+import {
+	releaseConciergeImport,
+	requireMigrationOperator,
+	reserveConciergeImport,
+} from "@/lib/loom-concierge";
 import type { LoomImportDestination } from "@/lib/loom-import-destination";
 import { isOrganizationOwnerPro } from "@/lib/org-pro";
 import { provisionOrganizationInvitee } from "@/lib/organization-provisioning";
@@ -104,15 +109,6 @@ const LOOM_CSV_LIMIT_ERROR = `CSV imports are limited to ${MAX_LOOM_CSV_ROWS} ro
 const LOOM_CSV_PERMISSION_ERROR =
 	"Only organization admins and owners can import Loom videos from a CSV.";
 
-function affectedRows(result: unknown) {
-	if (Array.isArray(result)) {
-		return (
-			(result[0] as { affectedRows?: number } | undefined)?.affectedRows ?? 0
-		);
-	}
-	return (result as { affectedRows?: number } | undefined)?.affectedRows ?? 0;
-}
-
 function extractLoomVideoId(url: string): string | null {
 	try {
 		const parsed = new URL(url);
@@ -319,11 +315,13 @@ async function importLoomVideoForOwner({
 	orgId,
 	ownerId,
 	destination = {},
+	migrationRequestId,
 }: {
 	loomUrl: string;
 	orgId: Organisation.OrganisationId;
 	ownerId: User.UserId;
 	destination?: LoomImportDestination;
+	migrationRequestId?: string;
 }): Promise<LoomImportResult> {
 	const loomVideoId = extractLoomVideoId(loomUrl.trim());
 	if (!loomVideoId) {
@@ -442,6 +440,12 @@ async function importLoomVideoForOwner({
 			source: "loom",
 			sourceId: loomVideoId,
 		});
+		if (migrationRequestId) {
+			await tx.insert(loomMigrationImports).values({
+				videoId,
+				requestId: migrationRequestId,
+			});
+		}
 
 		if (destination.spaceId === orgId) {
 			await tx.insert(sharedVideos).values({
@@ -796,10 +800,12 @@ async function processLoomCsvRows({
 	rows,
 	orgId,
 	actorId,
+	migrationRequestId,
 }: {
 	rows: LoomCsvImportRow[];
 	orgId: Organisation.OrganisationId;
 	actorId: User.UserId;
+	migrationRequestId?: string;
 }): Promise<LoomCsvImportResult> {
 	const inputRows = Array.isArray(rows) ? rows : [];
 	const normalizedRows = inputRows
@@ -909,6 +915,7 @@ async function processLoomCsvRows({
 				loomUrl: row.loomUrl,
 				orgId,
 				ownerId: member.userId,
+				migrationRequestId,
 			});
 
 			let spaceName = row.spaceName || undefined;
@@ -1012,52 +1019,31 @@ export async function importFromLoomCsvForConcierge({
 	if (!(await isOrganizationOwnerPro(request.organizationId))) {
 		throw new Error("The destination workspace needs Cap Pro.");
 	}
-	const claimed = await db()
-		.update(loomMigrationRequests)
-		.set({
-			status: "in_progress",
-			lastOperatorUserId: operator.id,
-			lastOperatorAt: new Date(),
-			updatedAt: new Date(),
-		})
-		.where(
-			and(
-				eq(loomMigrationRequests.id, requestId),
-				isNotNull(loomMigrationRequests.activeOrganizationId),
-			),
-		);
-	if (affectedRows(claimed) === 0) {
-		throw new Error("The migration request changed. Refresh and try again.");
-	}
-	const result = await processLoomCsvRows({
-		rows,
-		orgId: request.organizationId,
-		actorId: request.ownerId,
-	});
-	if (result.importedCount > 0) {
-		const updated = await db()
-			.update(loomMigrationRequests)
-			.set({
-				queuedVideoCount: sql`${loomMigrationRequests.queuedVideoCount} + ${result.importedCount}`,
-				lastOperatorUserId: operator.id,
-				lastOperatorAt: new Date(),
-				updatedAt: new Date(),
-			})
-			.where(
-				and(
-					eq(loomMigrationRequests.id, requestId),
-					isNotNull(loomMigrationRequests.activeOrganizationId),
-				),
-			);
-		if (affectedRows(updated) === 0) {
-			throw new Error(
-				"The migration request changed after jobs started. Review them before retrying.",
-			);
+	await reserveConciergeImport(requestId, operator.id);
+	try {
+		const result = await processLoomCsvRows({
+			rows,
+			orgId: request.organizationId,
+			actorId: request.ownerId,
+			migrationRequestId: requestId,
+		});
+		if (result.importedCount > 0) {
+			await db()
+				.update(loomMigrationRequests)
+				.set({
+					queuedVideoCount: sql`${loomMigrationRequests.queuedVideoCount} + ${result.importedCount}`,
+					lastOperatorUserId: operator.id,
+					lastOperatorAt: new Date(),
+					updatedAt: new Date(),
+				})
+				.where(eq(loomMigrationRequests.id, requestId));
 		}
+		revalidatePath("/dashboard/migrations/loom");
+		revalidatePath("/dashboard/admin/loom-migrations");
+		return result;
+	} finally {
+		await releaseConciergeImport(requestId);
 	}
-	revalidatePath("/dashboard/migrations/loom");
-	revalidatePath("/dashboard/admin/loom-migrations");
-	return result;
 }
 
 export async function createConciergeLoomFileUpload({
@@ -1116,161 +1102,173 @@ export async function createConciergeLoomFileUpload({
 	if (!(await isOrganizationOwnerPro(request.organizationId))) {
 		throw new Error("The destination workspace needs Cap Pro.");
 	}
-	const [existing] = await db()
-		.select({
-			id: importedVideos.id,
-			ownerId: videos.ownerId,
-			ownerEmail: users.email,
-			bucket: videos.bucket,
-			storageIntegrationId: videos.storageIntegrationId,
-			rawFileKey: videoUploads.rawFileKey,
-			phase: videoUploads.phase,
-			processingMessage: videoUploads.processingMessage,
-		})
-		.from(importedVideos)
-		.leftJoin(
-			videos,
-			and(
-				eq(videos.id, importedVideos.id),
-				eq(videos.orgId, importedVideos.orgId),
-			),
-		)
-		.leftJoin(users, eq(users.id, videos.ownerId))
-		.leftJoin(videoUploads, eq(videoUploads.videoId, importedVideos.id))
-		.where(
-			and(
-				eq(importedVideos.orgId, request.organizationId),
-				eq(importedVideos.source, "loom"),
-				eq(importedVideos.sourceId, loomVideoId),
-			),
-		)
-		.limit(1);
-	if (existing) {
-		if (
-			!existing.ownerId ||
-			!existing.ownerEmail ||
-			normalizeImportEmail(existing.ownerEmail) !== normalizedEmail ||
-			!existing.rawFileKey ||
-			(existing.phase !== "error" &&
-				(existing.phase !== "uploading" ||
-					existing.processingMessage !== "Uploading Loom video..."))
-		) {
-			throw new Error(
-				"This Loom video is already in the Cap import inventory.",
-			);
+	await reserveConciergeImport(requestId, operator.id);
+	try {
+		const [existing] = await db()
+			.select({
+				id: importedVideos.id,
+				ownerId: videos.ownerId,
+				ownerEmail: users.email,
+				bucket: videos.bucket,
+				storageIntegrationId: videos.storageIntegrationId,
+				rawFileKey: videoUploads.rawFileKey,
+				phase: videoUploads.phase,
+				processingMessage: videoUploads.processingMessage,
+			})
+			.from(importedVideos)
+			.leftJoin(
+				videos,
+				and(
+					eq(videos.id, importedVideos.id),
+					eq(videos.orgId, importedVideos.orgId),
+				),
+			)
+			.leftJoin(users, eq(users.id, videos.ownerId))
+			.leftJoin(videoUploads, eq(videoUploads.videoId, importedVideos.id))
+			.where(
+				and(
+					eq(importedVideos.orgId, request.organizationId),
+					eq(importedVideos.source, "loom"),
+					eq(importedVideos.sourceId, loomVideoId),
+				),
+			)
+			.limit(1);
+		if (existing) {
+			if (
+				!existing.ownerId ||
+				!existing.ownerEmail ||
+				normalizeImportEmail(existing.ownerEmail) !== normalizedEmail ||
+				!existing.rawFileKey ||
+				(existing.phase !== "error" &&
+					(existing.phase !== "uploading" ||
+						existing.processingMessage !== "Uploading Loom video..."))
+			) {
+				throw new Error(
+					"This Loom video is already in the Cap import inventory.",
+				);
+			}
+			const retryUpload = await Storage.createUploadTargetForUser(
+				existing.ownerId,
+				existing.rawFileKey,
+				{
+					contentType: "video/mp4",
+					videoTitle: normalizedTitle,
+					method: "put",
+					fields: { "x-amz-meta-userid": existing.ownerId },
+				},
+				request.organizationId,
+			).pipe(runPromise);
+			if (
+				Option.getOrNull(retryUpload.bucketId) !== existing.bucket ||
+				Option.getOrNull(retryUpload.storageIntegrationId) !==
+					existing.storageIntegrationId
+			) {
+				throw new Error(
+					"The Cap storage destination changed. Review this upload before retrying.",
+				);
+			}
+			const [mapped] = await db()
+				.select({ requestId: loomMigrationImports.requestId })
+				.from(loomMigrationImports)
+				.where(
+					eq(loomMigrationImports.videoId, Video.VideoId.make(existing.id)),
+				)
+				.limit(1);
+			if (mapped && mapped.requestId !== requestId) {
+				throw new Error(
+					"This Loom import belongs to another migration request.",
+				);
+			}
+			if (!mapped) {
+				await db()
+					.insert(loomMigrationImports)
+					.values({
+						videoId: Video.VideoId.make(existing.id),
+						requestId,
+					});
+			}
+			return {
+				videoId: Video.VideoId.make(existing.id),
+				uploadTarget: retryUpload.upload,
+			};
+		}
+		let member = await getOrganizationMemberByEmail(
+			request.organizationId,
+			normalizedEmail,
+		);
+		if (!member) {
+			const provisioned = await provisionOrganizationInvitee({
+				organizationId: request.organizationId,
+				email: normalizedEmail,
+				invitedByUserId: request.ownerId,
+				role: "member",
+			});
+			member = { userId: provisioned.userId, email: normalizedEmail };
 		}
-		const retryUpload = await Storage.createUploadTargetForUser(
-			existing.ownerId,
-			existing.rawFileKey,
+		const space = normalizedSpaceName
+			? await getOrCreateImportSpace({
+					orgId: request.organizationId,
+					createdById: request.ownerId,
+					name: normalizedSpaceName,
+					spaceCache: new Map(),
+				})
+			: null;
+		if (space) {
+			await addImportOwnerToSpace({ spaceId: space.id, userId: member.userId });
+		}
+		const videoId = Video.VideoId.make(nanoId());
+		const rawFileKey = `${member.userId}/${videoId}/raw-upload.mp4`;
+		const upload = await Storage.createUploadTargetForUser(
+			member.userId,
+			rawFileKey,
 			{
 				contentType: "video/mp4",
 				videoTitle: normalizedTitle,
 				method: "put",
-				fields: { "x-amz-meta-userid": existing.ownerId },
+				fields: { "x-amz-meta-userid": member.userId },
 			},
 			request.organizationId,
 		).pipe(runPromise);
-		if (
-			Option.getOrNull(retryUpload.bucketId) !== existing.bucket ||
-			Option.getOrNull(retryUpload.storageIntegrationId) !==
-				existing.storageIntegrationId
-		) {
-			throw new Error(
-				"The Cap storage destination changed. Review this upload before retrying.",
-			);
-		}
-		return {
-			videoId: Video.VideoId.make(existing.id),
-			uploadTarget: retryUpload.upload,
-		};
-	}
-	let member = await getOrganizationMemberByEmail(
-		request.organizationId,
-		normalizedEmail,
-	);
-	if (!member) {
-		const provisioned = await provisionOrganizationInvitee({
-			organizationId: request.organizationId,
-			email: normalizedEmail,
-			invitedByUserId: request.ownerId,
-			role: "member",
-		});
-		member = { userId: provisioned.userId, email: normalizedEmail };
-	}
-	const space = normalizedSpaceName
-		? await getOrCreateImportSpace({
+		await db().transaction(async (tx) => {
+			await tx.insert(videos).values({
+				id: videoId,
+				name: normalizedTitle,
+				ownerId: member.userId,
 				orgId: request.organizationId,
-				createdById: request.ownerId,
-				name: normalizedSpaceName,
-				spaceCache: new Map(),
-			})
-		: null;
-	if (space) {
-		await addImportOwnerToSpace({ spaceId: space.id, userId: member.userId });
-	}
-	const videoId = Video.VideoId.make(nanoId());
-	const rawFileKey = `${member.userId}/${videoId}/raw-upload.mp4`;
-	const upload = await Storage.createUploadTargetForUser(
-		member.userId,
-		rawFileKey,
-		{
-			contentType: "video/mp4",
-			videoTitle: normalizedTitle,
-			method: "put",
-			fields: { "x-amz-meta-userid": member.userId },
-		},
-		request.organizationId,
-	).pipe(runPromise);
-	await db().transaction(async (tx) => {
-		await tx.insert(videos).values({
-			id: videoId,
-			name: normalizedTitle,
-			ownerId: member.userId,
-			orgId: request.organizationId,
-			source: { type: "webMP4" as const },
-			bucket: Option.getOrNull(upload.bucketId),
-			storageIntegrationId: Option.getOrNull(upload.storageIntegrationId),
-			public: serverEnv().CAP_VIDEOS_DEFAULT_PUBLIC,
-		});
-		await tx.insert(videoUploads).values({
-			videoId,
-			mode: "singlepart",
-			phase: "uploading",
-			processingProgress: 0,
-			processingMessage: "Uploading Loom video...",
-			rawFileKey,
-		});
-		await tx.insert(importedVideos).values({
-			id: videoId,
-			orgId: request.organizationId,
-			source: "loom",
-			sourceId: loomVideoId,
-		});
-		if (space) {
-			await tx.insert(spaceVideos).values({
-				id: nanoId(),
+				source: { type: "webMP4" as const },
+				bucket: Option.getOrNull(upload.bucketId),
+				storageIntegrationId: Option.getOrNull(upload.storageIntegrationId),
+				public: serverEnv().CAP_VIDEOS_DEFAULT_PUBLIC,
+			});
+			await tx.insert(videoUploads).values({
 				videoId,
-				spaceId: space.id,
-				addedById: request.ownerId,
+				mode: "singlepart",
+				phase: "uploading",
+				processingProgress: 0,
+				processingMessage: "Uploading Loom video...",
+				rawFileKey,
 			});
-		}
-	});
-	await db()
-		.update(loomMigrationRequests)
-		.set({
-			status: "in_progress",
-			lastOperatorUserId: operator.id,
-			lastOperatorAt: new Date(),
-			updatedAt: new Date(),
-		})
-		.where(
-			and(
-				eq(loomMigrationRequests.id, requestId),
-				isNotNull(loomMigrationRequests.activeOrganizationId),
-			),
-		);
-	revalidatePath("/dashboard/admin/loom-migrations");
-	return { videoId, uploadTarget: upload.upload };
+			await tx.insert(importedVideos).values({
+				id: videoId,
+				orgId: request.organizationId,
+				source: "loom",
+				sourceId: loomVideoId,
+			});
+			await tx.insert(loomMigrationImports).values({ videoId, requestId });
+			if (space) {
+				await tx.insert(spaceVideos).values({
+					id: nanoId(),
+					videoId,
+					spaceId: space.id,
+					addedById: request.ownerId,
+				});
+			}
+		});
+		revalidatePath("/dashboard/admin/loom-migrations");
+		return { videoId, uploadTarget: upload.upload };
+	} finally {
+		await releaseConciergeImport(requestId);
+	}
 }
 
 export async function finishConciergeLoomFileUpload({
@@ -1284,80 +1282,93 @@ export async function finishConciergeLoomFileUpload({
 	if (typeof requestId !== "string" || !/^[A-Za-z0-9_-]{15}$/.test(requestId)) {
 		throw new Error("Invalid migration request.");
 	}
-	const [record] = await db()
-		.select({
-			video: videos,
-			rawFileKey: videoUploads.rawFileKey,
-			phase: videoUploads.phase,
-			processingMessage: videoUploads.processingMessage,
-		})
-		.from(videos)
-		.innerJoin(
-			importedVideos,
-			and(
-				eq(importedVideos.id, videos.id),
-				eq(importedVideos.orgId, videos.orgId),
-			),
-		)
-		.innerJoin(videoUploads, eq(videoUploads.videoId, videos.id))
-		.innerJoin(
-			loomMigrationRequests,
-			eq(loomMigrationRequests.organizationId, importedVideos.orgId),
-		)
-		.where(
-			and(
-				eq(videos.id, videoId),
-				eq(loomMigrationRequests.id, requestId),
-				eq(importedVideos.source, "loom"),
-				isNotNull(loomMigrationRequests.activeOrganizationId),
-			),
-		)
-		.limit(1);
-	if (
-		!record ||
-		!record.rawFileKey ||
-		(record.phase !== "error" &&
-			(record.phase !== "uploading" ||
-				record.processingMessage !== "Uploading Loom video..."))
-	) {
-		throw new Error("This Loom upload is no longer available.");
-	}
-	const [bucket] = await Storage.getAccessForVideo(
-		decodeStorageVideo(record.video),
-	).pipe(runPromise);
-	const head = await bucket
-		.headObject(record.rawFileKey)
-		.pipe(
-			Effect.retry({ times: 3, schedule: Schedule.exponential("100 millis") }),
-			runPromise,
-		);
-	if ((head.ContentLength ?? 0) <= 0)
-		throw new Error("The uploaded file is empty.");
-	const status = await startVideoProcessingWorkflow({
-		videoId,
-		userId: record.video.ownerId,
-		rawFileKey: record.rawFileKey,
-		bucketId: record.video.bucket,
-		processingMessage: "Processing Loom video...",
-		startFailureMessage: "Loom file processing could not start.",
-	});
-	if (status === "started") {
-		await db()
-			.update(loomMigrationRequests)
-			.set({
-				queuedVideoCount: sql`${loomMigrationRequests.queuedVideoCount} + 1`,
-				lastOperatorUserId: operator.id,
-				lastOperatorAt: new Date(),
-				updatedAt: new Date(),
+	await reserveConciergeImport(requestId, operator.id);
+	try {
+		const [record] = await db()
+			.select({
+				video: videos,
+				rawFileKey: videoUploads.rawFileKey,
+				phase: videoUploads.phase,
+				processingMessage: videoUploads.processingMessage,
 			})
+			.from(videos)
+			.innerJoin(
+				importedVideos,
+				and(
+					eq(importedVideos.id, videos.id),
+					eq(importedVideos.orgId, videos.orgId),
+				),
+			)
+			.innerJoin(videoUploads, eq(videoUploads.videoId, videos.id))
+			.innerJoin(
+				loomMigrationImports,
+				eq(loomMigrationImports.videoId, videos.id),
+			)
+			.innerJoin(
+				loomMigrationRequests,
+				and(
+					eq(loomMigrationRequests.id, loomMigrationImports.requestId),
+					eq(loomMigrationRequests.organizationId, importedVideos.orgId),
+				),
+			)
 			.where(
 				and(
+					eq(videos.id, videoId),
 					eq(loomMigrationRequests.id, requestId),
+					eq(importedVideos.source, "loom"),
 					isNotNull(loomMigrationRequests.activeOrganizationId),
 				),
-			);
+			)
+			.limit(1);
+		if (
+			!record ||
+			!record.rawFileKey ||
+			(record.phase !== "error" &&
+				(record.phase !== "uploading" ||
+					record.processingMessage !== "Uploading Loom video..."))
+		) {
+			throw new Error("This Loom upload is no longer available.");
+		}
+		const [bucket] = await Storage.getAccessForVideo(
+			decodeStorageVideo(record.video),
+		).pipe(runPromise);
+		const head = await bucket.headObject(record.rawFileKey).pipe(
+			Effect.retry({
+				times: 3,
+				schedule: Schedule.exponential("100 millis"),
+			}),
+			runPromise,
+		);
+		if ((head.ContentLength ?? 0) <= 0)
+			throw new Error("The uploaded file is empty.");
+		const status = await startVideoProcessingWorkflow({
+			videoId,
+			userId: record.video.ownerId,
+			rawFileKey: record.rawFileKey,
+			bucketId: record.video.bucket,
+			processingMessage: "Processing Loom video...",
+			startFailureMessage: "Loom file processing could not start.",
+		});
+		if (status === "started") {
+			await db()
+				.update(loomMigrationRequests)
+				.set({
+					queuedVideoCount: sql`${loomMigrationRequests.queuedVideoCount} + 1`,
+					lastOperatorUserId: operator.id,
+					lastOperatorAt: new Date(),
+					updatedAt: new Date(),
+				})
+				.where(
+					and(
+						eq(loomMigrationRequests.id, requestId),
+						isNotNull(loomMigrationRequests.activeOrganizationId),
+					),
+				);
+		}
+		revalidatePath("/dashboard/migrations/loom");
+		revalidatePath("/dashboard/admin/loom-migrations");
+		return { status };
+	} finally {
+		await releaseConciergeImport(requestId);
 	}
-	revalidatePath("/dashboard/migrations/loom");
-	revalidatePath("/dashboard/admin/loom-migrations");
-	return { status };
 }
diff --git a/apps/web/app/(org)/dashboard/admin/loom-migrations/LoomMigrationQueue.tsx b/apps/web/app/(org)/dashboard/admin/loom-migrations/LoomMigrationQueue.tsx
index d256a9aded3..f1cf3806b42 100644
--- a/apps/web/app/(org)/dashboard/admin/loom-migrations/LoomMigrationQueue.tsx
+++ b/apps/web/app/(org)/dashboard/admin/loom-migrations/LoomMigrationQueue.tsx
@@ -195,6 +195,7 @@ function QueueItem({ request }: { request: OperatorLoomMigrationView }) {
 				</p>
 				<p>Jobs started: {request.queuedVideoCount}</p>
 				<p>Verified videos: {request.importedVideoCount}</p>
+				<p>Imports starting: {request.activeImportCount}</p>
 			</div>
 			{request.customerNote && (
 				<div className="mt-4 rounded-lg bg-gray-3 p-3 text-sm text-gray-11">
@@ -467,7 +468,8 @@ function QueueItem({ request }: { request: OperatorLoomMigrationView }) {
 					disabled={
 						statusMutation.isPending ||
 						importMutation.isPending ||
-						fileMutation.isPending
+						fileMutation.isPending ||
+						(nextStatus === "completed" && request.activeImportCount > 0)
 					}
 					size="sm"
 					type="submit"
diff --git a/apps/web/lib/loom-concierge.ts b/apps/web/lib/loom-concierge.ts
index a8f50bf2845..aed27433a37 100644
--- a/apps/web/lib/loom-concierge.ts
+++ b/apps/web/lib/loom-concierge.ts
@@ -8,8 +8,18 @@ import {
 	users,
 } from "@cap/database/schema";
 import { buildEnv } from "@cap/env";
-import type { Organisation } from "@cap/web-domain";
-import { and, asc, desc, eq, isNull, ne } from "drizzle-orm";
+import type { Organisation, User } from "@cap/web-domain";
+import {
+	and,
+	asc,
+	desc,
+	eq,
+	gt,
+	isNotNull,
+	isNull,
+	ne,
+	sql,
+} from "drizzle-orm";
 import { requireOrganizationSettingsManager } from "@/actions/organization/authorization";
 import { MESSENGER_ADMIN_EMAIL } from "@/lib/messenger/constants";
 import { isOrganizationOwnerPro } from "@/lib/org-pro";
@@ -29,6 +39,7 @@ export type LoomMigrationView = {
 	expectedVideoCount: number | null;
 	importedVideoCount: number;
 	queuedVideoCount: number;
+	activeImportCount: number;
 	completedAt: string | null;
 	createdAt: string;
 	updatedAt: string;
@@ -52,6 +63,7 @@ export function migrationToView(record: MigrationRecord): LoomMigrationView {
 		expectedVideoCount: record.expectedVideoCount,
 		importedVideoCount: record.importedVideoCount,
 		queuedVideoCount: record.queuedVideoCount,
+		activeImportCount: record.activeImportCount,
 		completedAt: record.completedAt?.toISOString() ?? null,
 		createdAt: record.createdAt.toISOString(),
 		updatedAt: record.updatedAt.toISOString(),
@@ -92,6 +104,57 @@ export async function requireMigrationOperator() {
 	return user;
 }
 
+function affectedRows(result: unknown) {
+	if (Array.isArray(result)) {
+		return (
+			(result[0] as { affectedRows?: number } | undefined)?.affectedRows ?? 0
+		);
+	}
+	return (result as { affectedRows?: number } | undefined)?.affectedRows ?? 0;
+}
+
+export async function reserveConciergeImport(
+	requestId: string,
+	operatorId: User.UserId,
+) {
+	const result = await db()
+		.update(loomMigrationRequests)
+		.set({
+			activeImportCount: sql`${loomMigrationRequests.activeImportCount} + 1`,
+			status: "in_progress",
+			lastOperatorUserId: operatorId,
+			lastOperatorAt: new Date(),
+			updatedAt: new Date(),
+		})
+		.where(
+			and(
+				eq(loomMigrationRequests.id, requestId),
+				isNotNull(loomMigrationRequests.activeOrganizationId),
+			),
+		);
+	if (affectedRows(result) === 0) {
+		throw new Error("The migration request changed. Refresh and try again.");
+	}
+}
+
+export async function releaseConciergeImport(requestId: string) {
+	const result = await db()
+		.update(loomMigrationRequests)
+		.set({
+			activeImportCount: sql`${loomMigrationRequests.activeImportCount} - 1`,
+			updatedAt: new Date(),
+		})
+		.where(
+			and(
+				eq(loomMigrationRequests.id, requestId),
+				gt(loomMigrationRequests.activeImportCount, 0),
+			),
+		);
+	if (affectedRows(result) === 0) {
+		throw new Error("Could not release the migration import reservation.");
+	}
+}
+
 export async function getCustomerMigrationRequests(
 	organizationId: Organisation.OrganisationId,
 ) {
diff --git a/packages/database/migrations/0046_loom_concierge.sql b/packages/database/migrations/0046_loom_concierge.sql
index 778f5ef9a7e..6e787e42967 100644
--- a/packages/database/migrations/0046_loom_concierge.sql
+++ b/packages/database/migrations/0046_loom_concierge.sql
@@ -1,3 +1,10 @@
+CREATE TABLE `loom_migration_imports` (
+	`videoId` varchar(15) NOT NULL,
+	`requestId` varchar(15) NOT NULL,
+	`createdAt` datetime NOT NULL,
+	CONSTRAINT `loom_migration_imports_videoId` PRIMARY KEY(`videoId`)
+);
+--> statement-breakpoint
 CREATE TABLE `loom_migration_requests` (
 	`id` varchar(15) NOT NULL,
 	`organizationId` varchar(15) NOT NULL,
@@ -12,6 +19,7 @@ CREATE TABLE `loom_migration_requests` (
 	`expectedVideoCount` int,
 	`importedVideoCount` int NOT NULL DEFAULT 0,
 	`queuedVideoCount` int NOT NULL DEFAULT 0,
+	`activeImportCount` int NOT NULL DEFAULT 0,
 	`lastOperatorUserId` varchar(15),
 	`lastOperatorAt` datetime,
 	`completedAt` datetime,
@@ -21,5 +29,6 @@ CREATE TABLE `loom_migration_requests` (
 	CONSTRAINT `loom_migration_active_org_idx` UNIQUE(`activeOrganizationId`)
 );
 --> statement-breakpoint
+CREATE INDEX `loom_migration_imports_request_idx` ON `loom_migration_imports` (`requestId`);--> statement-breakpoint
 CREATE INDEX `loom_migration_org_created_idx` ON `loom_migration_requests` (`organizationId`,`createdAt`);--> statement-breakpoint
 CREATE INDEX `loom_migration_status_created_idx` ON `loom_migration_requests` (`status`,`createdAt`);
\ No newline at end of file
diff --git a/packages/database/migrations/meta/0046_snapshot.json b/packages/database/migrations/meta/0046_snapshot.json
index 26dad24dff2..20273a73004 100644
--- a/packages/database/migrations/meta/0046_snapshot.json
+++ b/packages/database/migrations/meta/0046_snapshot.json
@@ -1,7 +1,7 @@
 {
 	"version": "5",
 	"dialect": "mysql",
-	"id": "e73cfec4-89dd-4fc2-9068-4a86b6e10171",
+	"id": "d78f7c74-5007-4c78-96c3-50bf45012ad1",
 	"prevId": "0d80e4e5-6d93-4d28-b235-bf1231baa7a9",
 	"tables": {
 		"accounts": {
@@ -1694,6 +1694,48 @@
 			"uniqueConstraints": {},
 			"checkConstraint": {}
 		},
+		"loom_migration_imports": {
+			"name": "loom_migration_imports",
+			"columns": {
+				"videoId": {
+					"name": "videoId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"requestId": {
+					"name": "requestId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"loom_migration_imports_request_idx": {
+					"name": "loom_migration_imports_request_idx",
+					"columns": ["requestId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"loom_migration_imports_videoId": {
+					"name": "loom_migration_imports_videoId",
+					"columns": ["videoId"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
 		"loom_migration_requests": {
 			"name": "loom_migration_requests",
 			"columns": {
@@ -1791,6 +1833,14 @@
 					"autoincrement": false,
 					"default": 0
 				},
+				"activeImportCount": {
+					"name": "activeImportCount",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
 				"lastOperatorUserId": {
 					"name": "lastOperatorUserId",
 					"type": "varchar(15)",
diff --git a/packages/database/migrations/meta/_journal.json b/packages/database/migrations/meta/_journal.json
index d8e7a8780af..49b1b749d03 100644
--- a/packages/database/migrations/meta/_journal.json
+++ b/packages/database/migrations/meta/_journal.json
@@ -327,7 +327,7 @@
 		{
 			"idx": 46,
 			"version": "5",
-			"when": 1789985586222,
+			"when": 1789988285195,
 			"tag": "0046_loom_concierge",
 			"breakpoints": true
 		}
diff --git a/packages/database/schema.ts b/packages/database/schema.ts
index d91b21bf257..7f6b03c5c82 100644
--- a/packages/database/schema.ts
+++ b/packages/database/schema.ts
@@ -1575,6 +1575,7 @@ export const loomMigrationRequests = mysqlTable(
 		expectedVideoCount: int("expectedVideoCount"),
 		importedVideoCount: int("importedVideoCount").notNull().default(0),
 		queuedVideoCount: int("queuedVideoCount").notNull().default(0),
+		activeImportCount: int("activeImportCount").notNull().default(0),
 		lastOperatorUserId:
 			nanoIdNullable("lastOperatorUserId").$type<User.UserId>(),
 		lastOperatorAt: datetime("lastOperatorAt", { mode: "date" }),
@@ -1599,6 +1600,18 @@ export const loomMigrationRequests = mysqlTable(
 	],
 );
 
+export const loomMigrationImports = mysqlTable(
+	"loom_migration_imports",
+	{
+		videoId: nanoId("videoId").notNull().primaryKey().$type<Video.VideoId>(),
+		requestId: nanoId("requestId").notNull(),
+		createdAt: datetime("createdAt", { mode: "date" })
+			.notNull()
+			.$defaultFn(() => new Date()),
+	},
+	(table) => [index("loom_migration_imports_request_idx").on(table.requestId)],
+);
+
 export const developerApps = mysqlTable(
 	"developer_apps",
 	{

From e9fb8511a280bd928ef7391624b8fe29608ddd01 Mon Sep 17 00:00:00 2001
From: Richie McIlroy <33632126+richiemcilroy@users.noreply.github.com>
Date: Mon, 21 Sep 2026 12:07:46 +0100
Subject: [PATCH 04/74] fix: cover Loom concierge link in importer fixture

---
 apps/web/__tests__/unit/loom-import-ui.test.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/apps/web/__tests__/unit/loom-import-ui.test.ts b/apps/web/__tests__/unit/loom-import-ui.test.ts
index d92f8e90913..d228ec466cd 100644
--- a/apps/web/__tests__/unit/loom-import-ui.test.ts
+++ b/apps/web/__tests__/unit/loom-import-ui.test.ts
@@ -96,6 +96,9 @@ vi.mock("next/link", () => ({
 	}: React.PropsWithChildren<Record<string, unknown>>) =>
 		React.createElement("a", props, children),
 }));
+vi.mock("@cap/env", () => ({
+	buildEnv: { NEXT_PUBLIC_IS_CAP: "true" },
+}));
 vi.mock("@/actions/loom", () => ({
 	getLoomImportFolders: mocks.folders,
 	importFromLoom: mocks.import,
@@ -186,6 +189,10 @@ describe("Loom importer component", () => {
 	it("shows the inherited subfolder and submits it then returns there", async () => {
 		await render({ folderId: Folder.FolderId.make("child") });
 		await ready();
+		expect(
+			container.querySelector('a[href="/dashboard/migrations/loom"]')
+				?.textContent,
+		).toContain("Want Cap to move your whole Loom workspace for you?");
 		expect(
 			getByRole(container, "combobox", { name: "Import to" }).textContent,
 		).toContain("My Caps / Course / Live Calls - Two");

From 52605264f5df12208a7b670e8dce4f6dc5e9360b Mon Sep 17 00:00:00 2001
From: Richie McIlroy <33632126+richiemcilroy@users.noreply.github.com>
Date: Mon, 21 Sep 2026 12:16:23 +0100
Subject: [PATCH 05/74] fix: recover interrupted Loom concierge imports

---
 apps/web/__tests__/unit/loom-csv.test.ts      |    4 +-
 .../web/__tests__/unit/loom-import-ui.test.ts |    5 +-
 apps/web/actions/loom-concierge.tsx           |   10 +-
 apps/web/actions/loom.ts                      |   90 +-
 apps/web/lib/loom-concierge.ts                |   44 +-
 apps/web/lib/loom-csv.ts                      |    7 +-
 .../migrations/0047_loom_concierge_lease.sql  |    2 +
 .../migrations/meta/0047_snapshot.json        | 4799 +++++++++++++++++
 .../database/migrations/meta/_journal.json    |    7 +
 packages/database/schema.ts                   |    4 +
 10 files changed, 4940 insertions(+), 32 deletions(-)
 create mode 100644 packages/database/migrations/0047_loom_concierge_lease.sql
 create mode 100644 packages/database/migrations/meta/0047_snapshot.json

diff --git a/apps/web/__tests__/unit/loom-csv.test.ts b/apps/web/__tests__/unit/loom-csv.test.ts
index 5338285db28..90d8db8f19e 100644
--- a/apps/web/__tests__/unit/loom-csv.test.ts
+++ b/apps/web/__tests__/unit/loom-csv.test.ts
@@ -5,7 +5,9 @@ describe("concierge Loom CSV", () => {
 	it("keeps quoted workspace names and source row numbers", () => {
 		const rows = parseConciergeLoomCsv(
 			"\uFEFFuser_email,space_name,loom_video_url\r\n" +
-				'owner@example.com,"Sales, Europe",https://www.loom.com/share/0123456789abcdef\r\n',
+				"owner@example.com," +
+				JSON.stringify("Sales, Europe") +
+				",https://www.loom.com/share/0123456789abcdef\r\n",
 		);
 		expect(rows).toEqual([
 			{
diff --git a/apps/web/__tests__/unit/loom-import-ui.test.ts b/apps/web/__tests__/unit/loom-import-ui.test.ts
index d228ec466cd..07fd55309d5 100644
--- a/apps/web/__tests__/unit/loom-import-ui.test.ts
+++ b/apps/web/__tests__/unit/loom-import-ui.test.ts
@@ -190,8 +190,9 @@ describe("Loom importer component", () => {
 		await render({ folderId: Folder.FolderId.make("child") });
 		await ready();
 		expect(
-			container.querySelector('a[href="/dashboard/migrations/loom"]')
-				?.textContent,
+			Array.from(container.querySelectorAll("a")).find(
+				(link) => link.getAttribute("href") === "/dashboard/migrations/loom",
+			)?.textContent,
 		).toContain("Want Cap to move your whole Loom workspace for you?");
 		expect(
 			getByRole(container, "combobox", { name: "Import to" }).textContent,
diff --git a/apps/web/actions/loom-concierge.tsx b/apps/web/actions/loom-concierge.tsx
index 65835952a30..007584ce806 100644
--- a/apps/web/actions/loom-concierge.tsx
+++ b/apps/web/actions/loom-concierge.tsx
@@ -16,7 +16,7 @@ import {
 } from "@cap/database/schema";
 import { serverEnv } from "@cap/env";
 import type { Organisation } from "@cap/web-domain";
-import { and, eq, inArray, isNotNull } from "drizzle-orm";
+import { and, eq, inArray, isNotNull, lte, or } from "drizzle-orm";
 import { revalidatePath } from "next/cache";
 import {
 	getCustomerMigrationRequests,
@@ -281,6 +281,9 @@ export async function updateLoomMigrationStatus({
 			capMessage: normalizedMessage || null,
 			expectedVideoCount,
 			importedVideoCount,
+			activeImportCount: nextStatus === "completed" ? 0 : undefined,
+			activeImportLeaseToken: nextStatus === "completed" ? null : undefined,
+			activeImportLeaseUntil: nextStatus === "completed" ? null : undefined,
 			activeOrganizationId:
 				nextStatus === "completed" ? null : request.organizationId,
 			completedAt: nextStatus === "completed" ? new Date() : null,
@@ -294,7 +297,10 @@ export async function updateLoomMigrationStatus({
 				eq(loomMigrationRequests.status, request.status),
 				isNotNull(loomMigrationRequests.activeOrganizationId),
 				nextStatus === "completed"
-					? eq(loomMigrationRequests.activeImportCount, 0)
+					? or(
+							eq(loomMigrationRequests.activeImportCount, 0),
+							lte(loomMigrationRequests.activeImportLeaseUntil, new Date()),
+						)
 					: undefined,
 			),
 		);
diff --git a/apps/web/actions/loom.ts b/apps/web/actions/loom.ts
index 2083d85dc0d..b85a1f0db00 100644
--- a/apps/web/actions/loom.ts
+++ b/apps/web/actions/loom.ts
@@ -316,12 +316,14 @@ async function importLoomVideoForOwner({
 	ownerId,
 	destination = {},
 	migrationRequestId,
+	migrationLeaseToken,
 }: {
 	loomUrl: string;
 	orgId: Organisation.OrganisationId;
 	ownerId: User.UserId;
 	destination?: LoomImportDestination;
 	migrationRequestId?: string;
+	migrationLeaseToken?: string;
 }): Promise<LoomImportResult> {
 	const loomVideoId = extractLoomVideoId(loomUrl.trim());
 	if (!loomVideoId) {
@@ -412,6 +414,27 @@ async function importLoomVideoForOwner({
 		`Loom Import - ${new Date().toLocaleDateString("en-US", { day: "numeric", month: "long", year: "numeric" })}`;
 
 	await db().transaction(async (tx) => {
+		if (migrationRequestId) {
+			const [reservation] = await tx
+				.select({
+					activeOrganizationId: loomMigrationRequests.activeOrganizationId,
+					leaseToken: loomMigrationRequests.activeImportLeaseToken,
+					leaseUntil: loomMigrationRequests.activeImportLeaseUntil,
+				})
+				.from(loomMigrationRequests)
+				.where(eq(loomMigrationRequests.id, migrationRequestId))
+				.limit(1)
+				.for("update");
+			if (
+				!migrationLeaseToken ||
+				!reservation?.activeOrganizationId ||
+				reservation.leaseToken !== migrationLeaseToken ||
+				!reservation.leaseUntil ||
+				reservation.leaseUntil <= new Date()
+			) {
+				throw new Error("The concierge import expired. Retry this video.");
+			}
+		}
 		await tx.insert(videos).values({
 			id: videoId,
 			name,
@@ -801,11 +824,13 @@ async function processLoomCsvRows({
 	orgId,
 	actorId,
 	migrationRequestId,
+	migrationLeaseToken,
 }: {
 	rows: LoomCsvImportRow[];
 	orgId: Organisation.OrganisationId;
 	actorId: User.UserId;
 	migrationRequestId?: string;
+	migrationLeaseToken?: string;
 }): Promise<LoomCsvImportResult> {
 	const inputRows = Array.isArray(rows) ? rows : [];
 	const normalizedRows = inputRows
@@ -916,6 +941,7 @@ async function processLoomCsvRows({
 				orgId,
 				ownerId: member.userId,
 				migrationRequestId,
+				migrationLeaseToken,
 			});
 
 			let spaceName = row.spaceName || undefined;
@@ -1019,13 +1045,14 @@ export async function importFromLoomCsvForConcierge({
 	if (!(await isOrganizationOwnerPro(request.organizationId))) {
 		throw new Error("The destination workspace needs Cap Pro.");
 	}
-	await reserveConciergeImport(requestId, operator.id);
+	const leaseToken = await reserveConciergeImport(requestId, operator.id);
 	try {
 		const result = await processLoomCsvRows({
 			rows,
 			orgId: request.organizationId,
 			actorId: request.ownerId,
 			migrationRequestId: requestId,
+			migrationLeaseToken: leaseToken,
 		});
 		if (result.importedCount > 0) {
 			await db()
@@ -1036,13 +1063,19 @@ export async function importFromLoomCsvForConcierge({
 					lastOperatorAt: new Date(),
 					updatedAt: new Date(),
 				})
-				.where(eq(loomMigrationRequests.id, requestId));
+				.where(
+					and(
+						eq(loomMigrationRequests.id, requestId),
+						eq(loomMigrationRequests.activeImportLeaseToken, leaseToken),
+						isNotNull(loomMigrationRequests.activeOrganizationId),
+					),
+				);
 		}
 		revalidatePath("/dashboard/migrations/loom");
 		revalidatePath("/dashboard/admin/loom-migrations");
 		return result;
 	} finally {
-		await releaseConciergeImport(requestId);
+		await releaseConciergeImport(requestId, leaseToken);
 	}
 }
 
@@ -1102,7 +1135,7 @@ export async function createConciergeLoomFileUpload({
 	if (!(await isOrganizationOwnerPro(request.organizationId))) {
 		throw new Error("The destination workspace needs Cap Pro.");
 	}
-	await reserveConciergeImport(requestId, operator.id);
+	const leaseToken = await reserveConciergeImport(requestId, operator.id);
 	try {
 		const [existing] = await db()
 			.select({
@@ -1180,12 +1213,30 @@ export async function createConciergeLoomFileUpload({
 				);
 			}
 			if (!mapped) {
-				await db()
-					.insert(loomMigrationImports)
-					.values({
+				await db().transaction(async (tx) => {
+					const [reservation] = await tx
+						.select({
+							activeOrganizationId: loomMigrationRequests.activeOrganizationId,
+							leaseToken: loomMigrationRequests.activeImportLeaseToken,
+							leaseUntil: loomMigrationRequests.activeImportLeaseUntil,
+						})
+						.from(loomMigrationRequests)
+						.where(eq(loomMigrationRequests.id, requestId))
+						.limit(1)
+						.for("update");
+					if (
+						!reservation?.activeOrganizationId ||
+						reservation.leaseToken !== leaseToken ||
+						!reservation.leaseUntil ||
+						reservation.leaseUntil <= new Date()
+					) {
+						throw new Error("The concierge import expired. Retry this video.");
+					}
+					await tx.insert(loomMigrationImports).values({
 						videoId: Video.VideoId.make(existing.id),
 						requestId,
 					});
+				});
 			}
 			return {
 				videoId: Video.VideoId.make(existing.id),
@@ -1230,6 +1281,24 @@ export async function createConciergeLoomFileUpload({
 			request.organizationId,
 		).pipe(runPromise);
 		await db().transaction(async (tx) => {
+			const [reservation] = await tx
+				.select({
+					activeOrganizationId: loomMigrationRequests.activeOrganizationId,
+					leaseToken: loomMigrationRequests.activeImportLeaseToken,
+					leaseUntil: loomMigrationRequests.activeImportLeaseUntil,
+				})
+				.from(loomMigrationRequests)
+				.where(eq(loomMigrationRequests.id, requestId))
+				.limit(1)
+				.for("update");
+			if (
+				!reservation?.activeOrganizationId ||
+				reservation.leaseToken !== leaseToken ||
+				!reservation.leaseUntil ||
+				reservation.leaseUntil <= new Date()
+			) {
+				throw new Error("The concierge import expired. Retry this video.");
+			}
 			await tx.insert(videos).values({
 				id: videoId,
 				name: normalizedTitle,
@@ -1267,7 +1336,7 @@ export async function createConciergeLoomFileUpload({
 		revalidatePath("/dashboard/admin/loom-migrations");
 		return { videoId, uploadTarget: upload.upload };
 	} finally {
-		await releaseConciergeImport(requestId);
+		await releaseConciergeImport(requestId, leaseToken);
 	}
 }
 
@@ -1282,7 +1351,7 @@ export async function finishConciergeLoomFileUpload({
 	if (typeof requestId !== "string" || !/^[A-Za-z0-9_-]{15}$/.test(requestId)) {
 		throw new Error("Invalid migration request.");
 	}
-	await reserveConciergeImport(requestId, operator.id);
+	const leaseToken = await reserveConciergeImport(requestId, operator.id);
 	try {
 		const [record] = await db()
 			.select({
@@ -1361,6 +1430,7 @@ export async function finishConciergeLoomFileUpload({
 				.where(
 					and(
 						eq(loomMigrationRequests.id, requestId),
+						eq(loomMigrationRequests.activeImportLeaseToken, leaseToken),
 						isNotNull(loomMigrationRequests.activeOrganizationId),
 					),
 				);
@@ -1369,6 +1439,6 @@ export async function finishConciergeLoomFileUpload({
 		revalidatePath("/dashboard/admin/loom-migrations");
 		return { status };
 	} finally {
-		await releaseConciergeImport(requestId);
+		await releaseConciergeImport(requestId, leaseToken);
 	}
 }
diff --git a/apps/web/lib/loom-concierge.ts b/apps/web/lib/loom-concierge.ts
index aed27433a37..0a9a01e5127 100644
--- a/apps/web/lib/loom-concierge.ts
+++ b/apps/web/lib/loom-concierge.ts
@@ -1,5 +1,6 @@
 import "server-only";
 
+import { randomUUID } from "node:crypto";
 import { db } from "@cap/database";
 import { getCurrentUser } from "@cap/database/auth/session";
 import {
@@ -14,11 +15,11 @@ import {
 	asc,
 	desc,
 	eq,
-	gt,
 	isNotNull,
 	isNull,
+	lte,
 	ne,
-	sql,
+	or,
 } from "drizzle-orm";
 import { requireOrganizationSettingsManager } from "@/actions/organization/authorization";
 import { MESSENGER_ADMIN_EMAIL } from "@/lib/messenger/constants";
@@ -26,6 +27,7 @@ import { isOrganizationOwnerPro } from "@/lib/org-pro";
 import type { LoomMigrationStatus } from "./loom-migration-state";
 
 type MigrationRecord = typeof loomMigrationRequests.$inferSelect;
+const IMPORT_LEASE_MS = 60 * 60 * 1000;
 
 export type LoomMigrationView = {
 	id: string;
@@ -63,7 +65,11 @@ export function migrationToView(record: MigrationRecord): LoomMigrationView {
 		expectedVideoCount: record.expectedVideoCount,
 		importedVideoCount: record.importedVideoCount,
 		queuedVideoCount: record.queuedVideoCount,
-		activeImportCount: record.activeImportCount,
+		activeImportCount:
+			record.activeImportLeaseUntil &&
+			record.activeImportLeaseUntil.getTime() <= Date.now()
+				? 0
+				: record.activeImportCount,
 		completedAt: record.completedAt?.toISOString() ?? null,
 		createdAt: record.createdAt.toISOString(),
 		updatedAt: record.updatedAt.toISOString(),
@@ -117,42 +123,52 @@ export async function reserveConciergeImport(
 	requestId: string,
 	operatorId: User.UserId,
 ) {
+	const token = randomUUID();
+	const now = new Date();
 	const result = await db()
 		.update(loomMigrationRequests)
 		.set({
-			activeImportCount: sql`${loomMigrationRequests.activeImportCount} + 1`,
+			activeImportCount: 1,
+			activeImportLeaseToken: token,
+			activeImportLeaseUntil: new Date(now.getTime() + IMPORT_LEASE_MS),
 			status: "in_progress",
 			lastOperatorUserId: operatorId,
-			lastOperatorAt: new Date(),
-			updatedAt: new Date(),
+			lastOperatorAt: now,
+			updatedAt: now,
 		})
 		.where(
 			and(
 				eq(loomMigrationRequests.id, requestId),
 				isNotNull(loomMigrationRequests.activeOrganizationId),
+				or(
+					eq(loomMigrationRequests.activeImportCount, 0),
+					lte(loomMigrationRequests.activeImportLeaseUntil, now),
+				),
 			),
 		);
 	if (affectedRows(result) === 0) {
-		throw new Error("The migration request changed. Refresh and try again.");
+		throw new Error(
+			"The migration request changed or another import is starting. Refresh and try again.",
+		);
 	}
+	return token;
 }
 
-export async function releaseConciergeImport(requestId: string) {
-	const result = await db()
+export async function releaseConciergeImport(requestId: string, token: string) {
+	await db()
 		.update(loomMigrationRequests)
 		.set({
-			activeImportCount: sql`${loomMigrationRequests.activeImportCount} - 1`,
+			activeImportCount: 0,
+			activeImportLeaseToken: null,
+			activeImportLeaseUntil: null,
 			updatedAt: new Date(),
 		})
 		.where(
 			and(
 				eq(loomMigrationRequests.id, requestId),
-				gt(loomMigrationRequests.activeImportCount, 0),
+				eq(loomMigrationRequests.activeImportLeaseToken, token),
 			),
 		);
-	if (affectedRows(result) === 0) {
-		throw new Error("Could not release the migration import reservation.");
-	}
 }
 
 export async function getCustomerMigrationRequests(
diff --git a/apps/web/lib/loom-csv.ts b/apps/web/lib/loom-csv.ts
index 871eef779a5..3aaea1f1968 100644
--- a/apps/web/lib/loom-csv.ts
+++ b/apps/web/lib/loom-csv.ts
@@ -6,14 +6,15 @@ export function parseLoomCsvRecords(text: string) {
 	let row: string[] = [];
 	let inQuotes = false;
 	const input = text.replace(/^\uFEFF/, "");
+	const quote = "\u0022";
 
 	for (let index = 0; index < input.length; index += 1) {
 		const char = input.charAt(index);
 		const next = input.charAt(index + 1);
 
-		if (char === '"') {
-			if (inQuotes && next === '"') {
-				field += '"';
+		if (char === quote) {
+			if (inQuotes && next === quote) {
+				field += quote;
 				index += 1;
 			} else {
 				inQuotes = !inQuotes;
diff --git a/packages/database/migrations/0047_loom_concierge_lease.sql b/packages/database/migrations/0047_loom_concierge_lease.sql
new file mode 100644
index 00000000000..982766242b9
--- /dev/null
+++ b/packages/database/migrations/0047_loom_concierge_lease.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `loom_migration_requests` ADD `activeImportLeaseToken` varchar(36);--> statement-breakpoint
+ALTER TABLE `loom_migration_requests` ADD `activeImportLeaseUntil` datetime;
\ No newline at end of file
diff --git a/packages/database/migrations/meta/0047_snapshot.json b/packages/database/migrations/meta/0047_snapshot.json
new file mode 100644
index 00000000000..2695577b69b
--- /dev/null
+++ b/packages/database/migrations/meta/0047_snapshot.json
@@ -0,0 +1,4799 @@
+{
+	"version": "5",
+	"dialect": "mysql",
+	"id": "1cd109bd-1e00-49c3-bbf3-97f0025e557c",
+	"prevId": "d78f7c74-5007-4c78-96c3-50bf45012ad1",
+	"tables": {
+		"accounts": {
+			"name": "accounts",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"type": {
+					"name": "type",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"provider": {
+					"name": "provider",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"providerAccountId": {
+					"name": "providerAccountId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"access_token": {
+					"name": "access_token",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"expires_in": {
+					"name": "expires_in",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"id_token": {
+					"name": "id_token",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"refresh_token": {
+					"name": "refresh_token",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"refresh_token_expires_in": {
+					"name": "refresh_token_expires_in",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"scope": {
+					"name": "scope",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"token_type": {
+					"name": "token_type",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				},
+				"tempColumn": {
+					"name": "tempColumn",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"user_id_idx": {
+					"name": "user_id_idx",
+					"columns": ["userId"],
+					"isUnique": false
+				},
+				"provider_account_id_idx": {
+					"name": "provider_account_id_idx",
+					"columns": ["providerAccountId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"accounts_id": {
+					"name": "accounts_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"agent_api_authorization_codes": {
+			"name": "agent_api_authorization_codes",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"codeHash": {
+					"name": "codeHash",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"codeChallenge": {
+					"name": "codeChallenge",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"redirectUri": {
+					"name": "redirectUri",
+					"type": "varchar(512)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"scopes": {
+					"name": "scopes",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"expiresAt": {
+					"name": "expiresAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"consumedAt": {
+					"name": "consumedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"code_hash_idx": {
+					"name": "code_hash_idx",
+					"columns": ["codeHash"],
+					"isUnique": true
+				},
+				"expires_at_idx": {
+					"name": "expires_at_idx",
+					"columns": ["expiresAt"],
+					"isUnique": false
+				},
+				"user_created_at_idx": {
+					"name": "user_created_at_idx",
+					"columns": ["userId", "createdAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"agent_api_authorization_codes_id": {
+					"name": "agent_api_authorization_codes_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"agent_api_idempotency": {
+			"name": "agent_api_idempotency",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"operation": {
+					"name": "operation",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"keyHash": {
+					"name": "keyHash",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"requestHash": {
+					"name": "requestHash",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"state": {
+					"name": "state",
+					"type": "varchar(16)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'pending'"
+				},
+				"statusCode": {
+					"name": "statusCode",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"response": {
+					"name": "response",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"expiresAt": {
+					"name": "expiresAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"user_operation_key_idx": {
+					"name": "user_operation_key_idx",
+					"columns": ["userId", "operation", "keyHash"],
+					"isUnique": true
+				},
+				"expires_at_idx": {
+					"name": "expires_at_idx",
+					"columns": ["expiresAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"agent_api_idempotency_id": {
+					"name": "agent_api_idempotency_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"agent_api_keys": {
+			"name": "agent_api_keys",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"tokenHash": {
+					"name": "tokenHash",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"name": {
+					"name": "name",
+					"type": "varchar(100)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'Cap CLI'"
+				},
+				"scopes": {
+					"name": "scopes",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"expiresAt": {
+					"name": "expiresAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"revokedAt": {
+					"name": "revokedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"lastUsedAt": {
+					"name": "lastUsedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"token_hash_idx": {
+					"name": "token_hash_idx",
+					"columns": ["tokenHash"],
+					"isUnique": true
+				},
+				"user_created_at_idx": {
+					"name": "user_created_at_idx",
+					"columns": ["userId", "createdAt"],
+					"isUnique": false
+				},
+				"expires_at_idx": {
+					"name": "expires_at_idx",
+					"columns": ["expiresAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"agent_api_keys_id": {
+					"name": "agent_api_keys_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"agent_api_operations": {
+			"name": "agent_api_operations",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"kind": {
+					"name": "kind",
+					"type": "varchar(32)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"resourceId": {
+					"name": "resourceId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"resultResourceId": {
+					"name": "resultResourceId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"state": {
+					"name": "state",
+					"type": "varchar(16)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'queued'"
+				},
+				"payload": {
+					"name": "payload",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"result": {
+					"name": "result",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"errorCode": {
+					"name": "errorCode",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"errorMessage": {
+					"name": "errorMessage",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				},
+				"completedAt": {
+					"name": "completedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"user_created_at_idx": {
+					"name": "user_created_at_idx",
+					"columns": ["userId", "createdAt"],
+					"isUnique": false
+				},
+				"state_updated_at_idx": {
+					"name": "state_updated_at_idx",
+					"columns": ["state", "updatedAt"],
+					"isUnique": false
+				},
+				"resource_id_idx": {
+					"name": "resource_id_idx",
+					"columns": ["resourceId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"agent_api_operations_id": {
+					"name": "agent_api_operations_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"auth_api_keys": {
+			"name": "auth_api_keys",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(36)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"source": {
+					"name": "source",
+					"type": "varchar(32)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'unknown'"
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"user_id_created_at_idx": {
+					"name": "user_id_created_at_idx",
+					"columns": ["userId", "createdAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"auth_api_keys_id": {
+					"name": "auth_api_keys_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"comments": {
+			"name": "comments",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"type": {
+					"name": "type",
+					"type": "varchar(6)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"content": {
+					"name": "content",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"timestamp": {
+					"name": "timestamp",
+					"type": "float",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"authorId": {
+					"name": "authorId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"videoId": {
+					"name": "videoId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				},
+				"parentCommentId": {
+					"name": "parentCommentId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"mediaKey": {
+					"name": "mediaKey",
+					"type": "varchar(512)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"mediaDuration": {
+					"name": "mediaDuration",
+					"type": "float",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"mediaMeta": {
+					"name": "mediaMeta",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"video_type_created_idx": {
+					"name": "video_type_created_idx",
+					"columns": ["videoId", "type", "createdAt", "id"],
+					"isUnique": false
+				},
+				"author_id_idx": {
+					"name": "author_id_idx",
+					"columns": ["authorId"],
+					"isUnique": false
+				},
+				"parent_comment_id_idx": {
+					"name": "parent_comment_id_idx",
+					"columns": ["parentCommentId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"comments_id": {
+					"name": "comments_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"developer_api_keys": {
+			"name": "developer_api_keys",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"appId": {
+					"name": "appId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"keyType": {
+					"name": "keyType",
+					"type": "varchar(8)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"keyPrefix": {
+					"name": "keyPrefix",
+					"type": "varchar(12)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"keyHash": {
+					"name": "keyHash",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"encryptedKey": {
+					"name": "encryptedKey",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"lastUsedAt": {
+					"name": "lastUsedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"revokedAt": {
+					"name": "revokedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"key_hash_idx": {
+					"name": "key_hash_idx",
+					"columns": ["keyHash"],
+					"isUnique": true
+				},
+				"app_key_type_idx": {
+					"name": "app_key_type_idx",
+					"columns": ["appId", "keyType"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {
+				"developer_api_keys_appId_developer_apps_id_fk": {
+					"name": "developer_api_keys_appId_developer_apps_id_fk",
+					"tableFrom": "developer_api_keys",
+					"tableTo": "developer_apps",
+					"columnsFrom": ["appId"],
+					"columnsTo": ["id"],
+					"onDelete": "no action",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"developer_api_keys_id": {
+					"name": "developer_api_keys_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"developer_app_domains": {
+			"name": "developer_app_domains",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"appId": {
+					"name": "appId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"domain": {
+					"name": "domain",
+					"type": "varchar(253)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {},
+			"foreignKeys": {
+				"developer_app_domains_appId_developer_apps_id_fk": {
+					"name": "developer_app_domains_appId_developer_apps_id_fk",
+					"tableFrom": "developer_app_domains",
+					"tableTo": "developer_apps",
+					"columnsFrom": ["appId"],
+					"columnsTo": ["id"],
+					"onDelete": "no action",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"developer_app_domains_id": {
+					"name": "developer_app_domains_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {
+				"app_domain_unique": {
+					"name": "app_domain_unique",
+					"columns": ["appId", "domain"]
+				}
+			},
+			"checkConstraint": {}
+		},
+		"developer_apps": {
+			"name": "developer_apps",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"ownerId": {
+					"name": "ownerId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"name": {
+					"name": "name",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"environment": {
+					"name": "environment",
+					"type": "varchar(16)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"logoUrl": {
+					"name": "logoUrl",
+					"type": "varchar(1024)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"deletedAt": {
+					"name": "deletedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"owner_deleted_idx": {
+					"name": "owner_deleted_idx",
+					"columns": ["ownerId", "deletedAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"developer_apps_id": {
+					"name": "developer_apps_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"developer_credit_accounts": {
+			"name": "developer_credit_accounts",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"appId": {
+					"name": "appId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"ownerId": {
+					"name": "ownerId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"balanceMicroCredits": {
+					"name": "balanceMicroCredits",
+					"type": "bigint unsigned",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"stripeCustomerId": {
+					"name": "stripeCustomerId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"stripePaymentMethodId": {
+					"name": "stripePaymentMethodId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"autoTopUpEnabled": {
+					"name": "autoTopUpEnabled",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": false
+				},
+				"autoTopUpThresholdMicroCredits": {
+					"name": "autoTopUpThresholdMicroCredits",
+					"type": "bigint unsigned",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"autoTopUpAmountCents": {
+					"name": "autoTopUpAmountCents",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"app_id_unique": {
+					"name": "app_id_unique",
+					"columns": ["appId"],
+					"isUnique": true
+				}
+			},
+			"foreignKeys": {
+				"developer_credit_accounts_appId_developer_apps_id_fk": {
+					"name": "developer_credit_accounts_appId_developer_apps_id_fk",
+					"tableFrom": "developer_credit_accounts",
+					"tableTo": "developer_apps",
+					"columnsFrom": ["appId"],
+					"columnsTo": ["id"],
+					"onDelete": "no action",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"developer_credit_accounts_id": {
+					"name": "developer_credit_accounts_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"developer_credit_transactions": {
+			"name": "developer_credit_transactions",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"accountId": {
+					"name": "accountId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"type": {
+					"name": "type",
+					"type": "varchar(16)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"amountMicroCredits": {
+					"name": "amountMicroCredits",
+					"type": "bigint",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"balanceAfterMicroCredits": {
+					"name": "balanceAfterMicroCredits",
+					"type": "bigint unsigned",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"referenceId": {
+					"name": "referenceId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"referenceType": {
+					"name": "referenceType",
+					"type": "varchar(32)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"metadata": {
+					"name": "metadata",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"account_type_created_idx": {
+					"name": "account_type_created_idx",
+					"columns": ["accountId", "type", "createdAt"],
+					"isUnique": false
+				},
+				"account_ref_dedup_idx": {
+					"name": "account_ref_dedup_idx",
+					"columns": ["accountId", "referenceId", "referenceType"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {
+				"dev_credit_txn_account_fk": {
+					"name": "dev_credit_txn_account_fk",
+					"tableFrom": "developer_credit_transactions",
+					"tableTo": "developer_credit_accounts",
+					"columnsFrom": ["accountId"],
+					"columnsTo": ["id"],
+					"onDelete": "no action",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"developer_credit_transactions_id": {
+					"name": "developer_credit_transactions_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"developer_daily_storage_snapshots": {
+			"name": "developer_daily_storage_snapshots",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"appId": {
+					"name": "appId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"snapshotDate": {
+					"name": "snapshotDate",
+					"type": "varchar(10)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"totalDurationMinutes": {
+					"name": "totalDurationMinutes",
+					"type": "float",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"videoCount": {
+					"name": "videoCount",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"microCreditsCharged": {
+					"name": "microCreditsCharged",
+					"type": "bigint unsigned",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"processedAt": {
+					"name": "processedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {},
+			"foreignKeys": {
+				"developer_daily_storage_snapshots_appId_developer_apps_id_fk": {
+					"name": "developer_daily_storage_snapshots_appId_developer_apps_id_fk",
+					"tableFrom": "developer_daily_storage_snapshots",
+					"tableTo": "developer_apps",
+					"columnsFrom": ["appId"],
+					"columnsTo": ["id"],
+					"onDelete": "no action",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"developer_daily_storage_snapshots_id": {
+					"name": "developer_daily_storage_snapshots_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {
+				"app_date_unique": {
+					"name": "app_date_unique",
+					"columns": ["appId", "snapshotDate"]
+				}
+			},
+			"checkConstraint": {}
+		},
+		"developer_videos": {
+			"name": "developer_videos",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"appId": {
+					"name": "appId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"externalUserId": {
+					"name": "externalUserId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"name": {
+					"name": "name",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'Untitled'"
+				},
+				"duration": {
+					"name": "duration",
+					"type": "float",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"width": {
+					"name": "width",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"height": {
+					"name": "height",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"fps": {
+					"name": "fps",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"s3Key": {
+					"name": "s3Key",
+					"type": "varchar(512)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"transcriptionStatus": {
+					"name": "transcriptionStatus",
+					"type": "varchar(16)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"metadata": {
+					"name": "metadata",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"deletedAt": {
+					"name": "deletedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"app_created_idx": {
+					"name": "app_created_idx",
+					"columns": ["appId", "createdAt"],
+					"isUnique": false
+				},
+				"app_user_idx": {
+					"name": "app_user_idx",
+					"columns": ["appId", "externalUserId"],
+					"isUnique": false
+				},
+				"app_deleted_idx": {
+					"name": "app_deleted_idx",
+					"columns": ["appId", "deletedAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {
+				"developer_videos_appId_developer_apps_id_fk": {
+					"name": "developer_videos_appId_developer_apps_id_fk",
+					"tableFrom": "developer_videos",
+					"tableTo": "developer_apps",
+					"columnsFrom": ["appId"],
+					"columnsTo": ["id"],
+					"onDelete": "no action",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"developer_videos_id": {
+					"name": "developer_videos_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"folders": {
+			"name": "folders",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"name": {
+					"name": "name",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"color": {
+					"name": "color",
+					"type": "varchar(16)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'normal'"
+				},
+				"public": {
+					"name": "public",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": false
+				},
+				"settings": {
+					"name": "settings",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"createdById": {
+					"name": "createdById",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"parentId": {
+					"name": "parentId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"spaceId": {
+					"name": "spaceId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"organization_id_idx": {
+					"name": "organization_id_idx",
+					"columns": ["organizationId"],
+					"isUnique": false
+				},
+				"created_by_id_idx": {
+					"name": "created_by_id_idx",
+					"columns": ["createdById"],
+					"isUnique": false
+				},
+				"parent_id_idx": {
+					"name": "parent_id_idx",
+					"columns": ["parentId"],
+					"isUnique": false
+				},
+				"space_id_idx": {
+					"name": "space_id_idx",
+					"columns": ["spaceId"],
+					"isUnique": false
+				},
+				"public_parent_id_idx": {
+					"name": "public_parent_id_idx",
+					"columns": ["public", "parentId"],
+					"isUnique": false
+				},
+				"public_space_parent_id_idx": {
+					"name": "public_space_parent_id_idx",
+					"columns": ["public", "spaceId", "parentId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"folders_id": {
+					"name": "folders_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"imported_videos": {
+			"name": "imported_videos",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"orgId": {
+					"name": "orgId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"source": {
+					"name": "source",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"source_id": {
+					"name": "source_id",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"id_idx": {
+					"name": "id_idx",
+					"columns": ["id"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"imported_videos_orgId_source_source_id_pk": {
+					"name": "imported_videos_orgId_source_source_id_pk",
+					"columns": ["orgId", "source", "source_id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"integration_installations": {
+			"name": "integration_installations",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"provider": {
+					"name": "provider",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"externalId": {
+					"name": "externalId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"displayName": {
+					"name": "displayName",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"installedByUserId": {
+					"name": "installedByUserId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"encryptedCredentials": {
+					"name": "encryptedCredentials",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"metadata": {
+					"name": "metadata",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"provider_external_id_idx": {
+					"name": "provider_external_id_idx",
+					"columns": ["provider", "externalId"],
+					"isUnique": true
+				},
+				"organization_provider_display_name_idx": {
+					"name": "organization_provider_display_name_idx",
+					"columns": ["organizationId", "provider", "displayName"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"integration_installations_id": {
+					"name": "integration_installations_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"loom_migration_imports": {
+			"name": "loom_migration_imports",
+			"columns": {
+				"videoId": {
+					"name": "videoId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"requestId": {
+					"name": "requestId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"loom_migration_imports_request_idx": {
+					"name": "loom_migration_imports_request_idx",
+					"columns": ["requestId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"loom_migration_imports_videoId": {
+					"name": "loom_migration_imports_videoId",
+					"columns": ["videoId"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"loom_migration_requests": {
+			"name": "loom_migration_requests",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"activeOrganizationId": {
+					"name": "activeOrganizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"requestedByUserId": {
+					"name": "requestedByUserId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"workspaceName": {
+					"name": "workspaceName",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"customerNote": {
+					"name": "customerNote",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"customerReply": {
+					"name": "customerReply",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"invitedAt": {
+					"name": "invitedAt",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"status": {
+					"name": "status",
+					"type": "varchar(32)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'pending'"
+				},
+				"capMessage": {
+					"name": "capMessage",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"expectedVideoCount": {
+					"name": "expectedVideoCount",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"importedVideoCount": {
+					"name": "importedVideoCount",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"queuedVideoCount": {
+					"name": "queuedVideoCount",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"activeImportCount": {
+					"name": "activeImportCount",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"activeImportLeaseToken": {
+					"name": "activeImportLeaseToken",
+					"type": "varchar(36)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"activeImportLeaseUntil": {
+					"name": "activeImportLeaseUntil",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"lastOperatorUserId": {
+					"name": "lastOperatorUserId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"lastOperatorAt": {
+					"name": "lastOperatorAt",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"completedAt": {
+					"name": "completedAt",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"loom_migration_active_org_idx": {
+					"name": "loom_migration_active_org_idx",
+					"columns": ["activeOrganizationId"],
+					"isUnique": true
+				},
+				"loom_migration_org_created_idx": {
+					"name": "loom_migration_org_created_idx",
+					"columns": ["organizationId", "createdAt"],
+					"isUnique": false
+				},
+				"loom_migration_status_created_idx": {
+					"name": "loom_migration_status_created_idx",
+					"columns": ["status", "createdAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"loom_migration_requests_id": {
+					"name": "loom_migration_requests_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"loops_sync_jobs": {
+			"name": "loops_sync_jobs",
+			"columns": {
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"revision": {
+					"name": "revision",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 1
+				},
+				"nextAttemptAt": {
+					"name": "nextAttemptAt",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"leaseToken": {
+					"name": "leaseToken",
+					"type": "varchar(36)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"leaseUntil": {
+					"name": "leaseUntil",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"failures": {
+					"name": "failures",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"lastError": {
+					"name": "lastError",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"profileHash": {
+					"name": "profileHash",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"teammateJoinedAt": {
+					"name": "teammateJoinedAt",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"syncedEmail": {
+					"name": "syncedEmail",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"lastSyncedAt": {
+					"name": "lastSyncedAt",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"loops_sync_due_idx": {
+					"name": "loops_sync_due_idx",
+					"columns": ["nextAttemptAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"loops_sync_jobs_userId": {
+					"name": "loops_sync_jobs_userId",
+					"columns": ["userId"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"media_processing_budgets": {
+			"name": "media_processing_budgets",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"reserved_bytes": {
+					"name": "reserved_bytes",
+					"type": "bigint unsigned",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"limit_bytes": {
+					"name": "limit_bytes",
+					"type": "bigint unsigned",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"expires_at": {
+					"name": "expires_at",
+					"type": "datetime(3)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"media_budget_expiry_idx": {
+					"name": "media_budget_expiry_idx",
+					"columns": ["expires_at"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"media_processing_budgets_id": {
+					"name": "media_processing_budgets_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"messenger_conversations": {
+			"name": "messenger_conversations",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"agent": {
+					"name": "agent",
+					"type": "varchar(32)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"mode": {
+					"name": "mode",
+					"type": "varchar(16)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'agent'"
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"anonymousId": {
+					"name": "anonymousId",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"takeoverByUserId": {
+					"name": "takeoverByUserId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"takeoverAt": {
+					"name": "takeoverAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				},
+				"lastMessageAt": {
+					"name": "lastMessageAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"user_last_message_idx": {
+					"name": "user_last_message_idx",
+					"columns": ["userId", "lastMessageAt"],
+					"isUnique": false
+				},
+				"anonymous_last_message_idx": {
+					"name": "anonymous_last_message_idx",
+					"columns": ["anonymousId", "lastMessageAt"],
+					"isUnique": false
+				},
+				"mode_last_message_idx": {
+					"name": "mode_last_message_idx",
+					"columns": ["mode", "lastMessageAt"],
+					"isUnique": false
+				},
+				"updated_at_idx": {
+					"name": "updated_at_idx",
+					"columns": ["updatedAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"messenger_conversations_id": {
+					"name": "messenger_conversations_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"messenger_messages": {
+			"name": "messenger_messages",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"conversationId": {
+					"name": "conversationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"role": {
+					"name": "role",
+					"type": "varchar(16)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"content": {
+					"name": "content",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"anonymousId": {
+					"name": "anonymousId",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"conversation_created_at_idx": {
+					"name": "conversation_created_at_idx",
+					"columns": ["conversationId", "createdAt"],
+					"isUnique": false
+				},
+				"role_created_at_idx": {
+					"name": "role_created_at_idx",
+					"columns": ["role", "createdAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {
+				"messenger_messages_conversationId_messenger_conversations_id_fk": {
+					"name": "messenger_messages_conversationId_messenger_conversations_id_fk",
+					"tableFrom": "messenger_messages",
+					"tableTo": "messenger_conversations",
+					"columnsFrom": ["conversationId"],
+					"columnsTo": ["id"],
+					"onDelete": "cascade",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"messenger_messages_id": {
+					"name": "messenger_messages_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"messenger_support_emails": {
+			"name": "messenger_support_emails",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"conversationId": {
+					"name": "conversationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userEmail": {
+					"name": "userEmail",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"subject": {
+					"name": "subject",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"message": {
+					"name": "message",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"support_email_user_created_at_idx": {
+					"name": "support_email_user_created_at_idx",
+					"columns": ["userId", "createdAt"],
+					"isUnique": false
+				},
+				"support_email_conversation_created_at_idx": {
+					"name": "support_email_conversation_created_at_idx",
+					"columns": ["conversationId", "createdAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {
+				"support_email_conversation_fk": {
+					"name": "support_email_conversation_fk",
+					"tableFrom": "messenger_support_emails",
+					"tableTo": "messenger_conversations",
+					"columnsFrom": ["conversationId"],
+					"columnsTo": ["id"],
+					"onDelete": "cascade",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"messenger_support_emails_id": {
+					"name": "messenger_support_emails_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"notifications": {
+			"name": "notifications",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"orgId": {
+					"name": "orgId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"recipientId": {
+					"name": "recipientId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"type": {
+					"name": "type",
+					"type": "varchar(16)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"data": {
+					"name": "data",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"videoId": {
+					"name": "videoId",
+					"type": "varchar(50)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"dedupKey": {
+					"name": "dedupKey",
+					"type": "varchar(128)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"readAt": {
+					"name": "readAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"org_id_idx": {
+					"name": "org_id_idx",
+					"columns": ["orgId"],
+					"isUnique": false
+				},
+				"type_idx": {
+					"name": "type_idx",
+					"columns": ["type"],
+					"isUnique": false
+				},
+				"read_at_idx": {
+					"name": "read_at_idx",
+					"columns": ["readAt"],
+					"isUnique": false
+				},
+				"created_at_idx": {
+					"name": "created_at_idx",
+					"columns": ["createdAt"],
+					"isUnique": false
+				},
+				"recipient_read_idx": {
+					"name": "recipient_read_idx",
+					"columns": ["recipientId", "readAt"],
+					"isUnique": false
+				},
+				"recipient_created_idx": {
+					"name": "recipient_created_idx",
+					"columns": ["recipientId", "createdAt"],
+					"isUnique": false
+				},
+				"dedup_key_idx": {
+					"name": "dedup_key_idx",
+					"columns": ["dedupKey"],
+					"isUnique": true
+				},
+				"type_recipient_created_idx": {
+					"name": "type_recipient_created_idx",
+					"columns": ["type", "recipientId", "createdAt"],
+					"isUnique": false
+				},
+				"type_recipient_video_created_idx": {
+					"name": "type_recipient_video_created_idx",
+					"columns": ["type", "recipientId", "videoId", "createdAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"notifications_id": {
+					"name": "notifications_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"organization_invites": {
+			"name": "organization_invites",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"invitedEmail": {
+					"name": "invitedEmail",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"invitedByUserId": {
+					"name": "invitedByUserId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"role": {
+					"name": "role",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"status": {
+					"name": "status",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'pending'"
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				},
+				"expiresAt": {
+					"name": "expiresAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"organization_id_idx": {
+					"name": "organization_id_idx",
+					"columns": ["organizationId"],
+					"isUnique": false
+				},
+				"invited_email_idx": {
+					"name": "invited_email_idx",
+					"columns": ["invitedEmail"],
+					"isUnique": false
+				},
+				"invited_by_user_id_idx": {
+					"name": "invited_by_user_id_idx",
+					"columns": ["invitedByUserId"],
+					"isUnique": false
+				},
+				"status_idx": {
+					"name": "status_idx",
+					"columns": ["status"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"organization_invites_id": {
+					"name": "organization_invites_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"organization_members": {
+			"name": "organization_members",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"role": {
+					"name": "role",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"hasProSeat": {
+					"name": "hasProSeat",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"organization_id_idx": {
+					"name": "organization_id_idx",
+					"columns": ["organizationId"],
+					"isUnique": false
+				},
+				"user_id_organization_id_idx": {
+					"name": "user_id_organization_id_idx",
+					"columns": ["userId", "organizationId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"organization_members_id": {
+					"name": "organization_members_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"organization_sso": {
+			"name": "organization_sso",
+			"columns": {
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"purchasedByUserId": {
+					"name": "purchasedByUserId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"stripeCustomerId": {
+					"name": "stripeCustomerId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"stripeSubscriptionId": {
+					"name": "stripeSubscriptionId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"stripePriceId": {
+					"name": "stripePriceId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"status": {
+					"name": "status",
+					"type": "varchar(32)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'unpaid'"
+				},
+				"paidThrough": {
+					"name": "paidThrough",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"currentPeriodEnd": {
+					"name": "currentPeriodEnd",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"cancelAtPeriodEnd": {
+					"name": "cancelAtPeriodEnd",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": false
+				},
+				"checkoutAttemptId": {
+					"name": "checkoutAttemptId",
+					"type": "varchar(36)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"checkoutCurrency": {
+					"name": "checkoutCurrency",
+					"type": "varchar(3)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"checkoutPriceId": {
+					"name": "checkoutPriceId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"checkoutSessionId": {
+					"name": "checkoutSessionId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"checkoutStartedAt": {
+					"name": "checkoutStartedAt",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"sso_stripe_subscription_id_idx": {
+					"name": "sso_stripe_subscription_id_idx",
+					"columns": ["stripeSubscriptionId"],
+					"isUnique": true
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"organization_sso_organizationId": {
+					"name": "organization_sso_organizationId",
+					"columns": ["organizationId"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"organizations": {
+			"name": "organizations",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"name": {
+					"name": "name",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"ownerId": {
+					"name": "ownerId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"metadata": {
+					"name": "metadata",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"tombstoneAt": {
+					"name": "tombstoneAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"allowedEmailDomain": {
+					"name": "allowedEmailDomain",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"customDomain": {
+					"name": "customDomain",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"domainVerified": {
+					"name": "domainVerified",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"settings": {
+					"name": "settings",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"iconUrl": {
+					"name": "iconUrl",
+					"type": "varchar(1024)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"shareableLinkIconUrl": {
+					"name": "shareableLinkIconUrl",
+					"type": "varchar(1024)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				},
+				"workosOrganizationId": {
+					"name": "workosOrganizationId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"workosConnectionId": {
+					"name": "workosConnectionId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"owner_id_tombstone_idx": {
+					"name": "owner_id_tombstone_idx",
+					"columns": ["ownerId", "tombstoneAt"],
+					"isUnique": false
+				},
+				"custom_domain_idx": {
+					"name": "custom_domain_idx",
+					"columns": ["customDomain"],
+					"isUnique": false
+				},
+				"workos_organization_id_idx": {
+					"name": "workos_organization_id_idx",
+					"columns": ["workosOrganizationId"],
+					"isUnique": true
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"organizations_id": {
+					"name": "organizations_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"s3_buckets": {
+			"name": "s3_buckets",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"ownerId": {
+					"name": "ownerId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"region": {
+					"name": "region",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"endpoint": {
+					"name": "endpoint",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"bucketName": {
+					"name": "bucketName",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"accessKeyId": {
+					"name": "accessKeyId",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"secretAccessKey": {
+					"name": "secretAccessKey",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"provider": {
+					"name": "provider",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "('aws')"
+				},
+				"active": {
+					"name": "active",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": true
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"owner_organization_idx": {
+					"name": "owner_organization_idx",
+					"columns": ["ownerId", "organizationId"],
+					"isUnique": false
+				},
+				"organization_id_idx": {
+					"name": "organization_id_idx",
+					"columns": ["organizationId"],
+					"isUnique": false
+				},
+				"organization_active_idx": {
+					"name": "organization_active_idx",
+					"columns": ["organizationId", "active", "updatedAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"s3_buckets_id": {
+					"name": "s3_buckets_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"sessions": {
+			"name": "sessions",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"sessionToken": {
+					"name": "sessionToken",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"expires": {
+					"name": "expires",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"created_at": {
+					"name": "created_at",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updated_at": {
+					"name": "updated_at",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"session_token_idx": {
+					"name": "session_token_idx",
+					"columns": ["sessionToken"],
+					"isUnique": true
+				},
+				"user_id_idx": {
+					"name": "user_id_idx",
+					"columns": ["userId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"sessions_id": {
+					"name": "sessions_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"shared_videos": {
+			"name": "shared_videos",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"videoId": {
+					"name": "videoId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"folderId": {
+					"name": "folderId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"sharedByUserId": {
+					"name": "sharedByUserId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"sharedAt": {
+					"name": "sharedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"folder_id_idx": {
+					"name": "folder_id_idx",
+					"columns": ["folderId"],
+					"isUnique": false
+				},
+				"organization_id_idx": {
+					"name": "organization_id_idx",
+					"columns": ["organizationId"],
+					"isUnique": false
+				},
+				"shared_by_user_id_idx": {
+					"name": "shared_by_user_id_idx",
+					"columns": ["sharedByUserId"],
+					"isUnique": false
+				},
+				"video_id_organization_id_idx": {
+					"name": "video_id_organization_id_idx",
+					"columns": ["videoId", "organizationId"],
+					"isUnique": false
+				},
+				"video_id_folder_id_idx": {
+					"name": "video_id_folder_id_idx",
+					"columns": ["videoId", "folderId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"shared_videos_id": {
+					"name": "shared_videos_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"signed_baas": {
+			"name": "signed_baas",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"status": {
+					"name": "status",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'pending'"
+				},
+				"stripeSubscriptionId": {
+					"name": "stripeSubscriptionId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"entityName": {
+					"name": "entityName",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"entityType": {
+					"name": "entityType",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"entityAddress": {
+					"name": "entityAddress",
+					"type": "varchar(500)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"signerName": {
+					"name": "signerName",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"signerTitle": {
+					"name": "signerTitle",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"noticesEmail": {
+					"name": "noticesEmail",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"signatureData": {
+					"name": "signatureData",
+					"type": "longtext",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"signedAt": {
+					"name": "signedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"emailSentAt": {
+					"name": "emailSentAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"signed_baa_organization_id_idx": {
+					"name": "signed_baa_organization_id_idx",
+					"columns": ["organizationId"],
+					"isUnique": true
+				},
+				"signed_baa_stripe_subscription_idx": {
+					"name": "signed_baa_stripe_subscription_idx",
+					"columns": ["stripeSubscriptionId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"signed_baas_id": {
+					"name": "signed_baas_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"space_members": {
+			"name": "space_members",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"spaceId": {
+					"name": "spaceId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"role": {
+					"name": "role",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'member'"
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"user_id_idx": {
+					"name": "user_id_idx",
+					"columns": ["userId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"space_members_id": {
+					"name": "space_members_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {
+				"space_id_user_id_unique": {
+					"name": "space_id_user_id_unique",
+					"columns": ["spaceId", "userId"]
+				}
+			},
+			"checkConstraint": {}
+		},
+		"space_videos": {
+			"name": "space_videos",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"spaceId": {
+					"name": "spaceId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"folderId": {
+					"name": "folderId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"videoId": {
+					"name": "videoId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"addedById": {
+					"name": "addedById",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"addedAt": {
+					"name": "addedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"folder_id_idx": {
+					"name": "folder_id_idx",
+					"columns": ["folderId"],
+					"isUnique": false
+				},
+				"video_id_idx": {
+					"name": "video_id_idx",
+					"columns": ["videoId"],
+					"isUnique": false
+				},
+				"added_by_id_idx": {
+					"name": "added_by_id_idx",
+					"columns": ["addedById"],
+					"isUnique": false
+				},
+				"space_id_video_id_idx": {
+					"name": "space_id_video_id_idx",
+					"columns": ["spaceId", "videoId"],
+					"isUnique": false
+				},
+				"space_id_folder_id_idx": {
+					"name": "space_id_folder_id_idx",
+					"columns": ["spaceId", "folderId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"space_videos_id": {
+					"name": "space_videos_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"spaces": {
+			"name": "spaces",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"primary": {
+					"name": "primary",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": false
+				},
+				"name": {
+					"name": "name",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"createdById": {
+					"name": "createdById",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"iconUrl": {
+					"name": "iconUrl",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"description": {
+					"name": "description",
+					"type": "varchar(1000)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"settings": {
+					"name": "settings",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"password": {
+					"name": "password",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				},
+				"privacy": {
+					"name": "privacy",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'Private'"
+				},
+				"public": {
+					"name": "public",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": false
+				}
+			},
+			"indexes": {
+				"organization_id_idx": {
+					"name": "organization_id_idx",
+					"columns": ["organizationId"],
+					"isUnique": false
+				},
+				"created_by_id_idx": {
+					"name": "created_by_id_idx",
+					"columns": ["createdById"],
+					"isUnique": false
+				},
+				"public_organization_id_idx": {
+					"name": "public_organization_id_idx",
+					"columns": ["public", "organizationId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"spaces_id": {
+					"name": "spaces_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"storage_integrations": {
+			"name": "storage_integrations",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"ownerId": {
+					"name": "ownerId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"provider": {
+					"name": "provider",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"displayName": {
+					"name": "displayName",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"status": {
+					"name": "status",
+					"type": "varchar(32)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'active'"
+				},
+				"active": {
+					"name": "active",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": false
+				},
+				"encryptedConfig": {
+					"name": "encryptedConfig",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"googleDriveAccessToken": {
+					"name": "googleDriveAccessToken",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"googleDriveAccessTokenExpiresAt": {
+					"name": "googleDriveAccessTokenExpiresAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"googleDriveTokenRefreshLeaseId": {
+					"name": "googleDriveTokenRefreshLeaseId",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"googleDriveTokenRefreshLeaseExpiresAt": {
+					"name": "googleDriveTokenRefreshLeaseExpiresAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"googleDriveStorageQuotaCache": {
+					"name": "googleDriveStorageQuotaCache",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"owner_provider_idx": {
+					"name": "owner_provider_idx",
+					"columns": ["ownerId", "provider"],
+					"isUnique": false
+				},
+				"owner_active_idx": {
+					"name": "owner_active_idx",
+					"columns": ["ownerId", "active"],
+					"isUnique": false
+				},
+				"organization_provider_idx": {
+					"name": "organization_provider_idx",
+					"columns": ["organizationId", "provider"],
+					"isUnique": false
+				},
+				"organization_active_idx": {
+					"name": "organization_active_idx",
+					"columns": ["organizationId", "active", "status"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"storage_integrations_id": {
+					"name": "storage_integrations_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"storage_objects": {
+			"name": "storage_objects",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"integrationId": {
+					"name": "integrationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"ownerId": {
+					"name": "ownerId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"videoId": {
+					"name": "videoId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"objectKey": {
+					"name": "objectKey",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"objectKeyHash": {
+					"name": "objectKeyHash",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"providerObjectId": {
+					"name": "providerObjectId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"uploadSessionUrl": {
+					"name": "uploadSessionUrl",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"uploadStatus": {
+					"name": "uploadStatus",
+					"type": "varchar(32)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'pending'"
+				},
+				"contentType": {
+					"name": "contentType",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"contentLength": {
+					"name": "contentLength",
+					"type": "bigint unsigned",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"metadata": {
+					"name": "metadata",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"integration_key_hash_idx": {
+					"name": "integration_key_hash_idx",
+					"columns": ["integrationId", "objectKeyHash"],
+					"isUnique": true
+				},
+				"integration_status_idx": {
+					"name": "integration_status_idx",
+					"columns": ["integrationId", "uploadStatus"],
+					"isUnique": false
+				},
+				"integration_object_key_prefix_idx": {
+					"name": "integration_object_key_prefix_idx",
+					"columns": ["integrationId", "`objectKey`(191)"],
+					"isUnique": false
+				},
+				"video_id_idx": {
+					"name": "video_id_idx",
+					"columns": ["videoId"],
+					"isUnique": false
+				},
+				"owner_id_idx": {
+					"name": "owner_id_idx",
+					"columns": ["ownerId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {
+				"storage_objects_integrationId_storage_integrations_id_fk": {
+					"name": "storage_objects_integrationId_storage_integrations_id_fk",
+					"tableFrom": "storage_objects",
+					"tableTo": "storage_integrations",
+					"columnsFrom": ["integrationId"],
+					"columnsTo": ["id"],
+					"onDelete": "restrict",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"storage_objects_id": {
+					"name": "storage_objects_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"users": {
+			"name": "users",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"name": {
+					"name": "name",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"lastName": {
+					"name": "lastName",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"email": {
+					"name": "email",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"emailVerified": {
+					"name": "emailVerified",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"image": {
+					"name": "image",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"stripeCustomerId": {
+					"name": "stripeCustomerId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"stripeSubscriptionId": {
+					"name": "stripeSubscriptionId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"thirdPartyStripeSubscriptionId": {
+					"name": "thirdPartyStripeSubscriptionId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"stripeSubscriptionStatus": {
+					"name": "stripeSubscriptionStatus",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"stripeSubscriptionPriceId": {
+					"name": "stripeSubscriptionPriceId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"preferences": {
+					"name": "preferences",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false,
+					"default": "('null')"
+				},
+				"activeOrganizationId": {
+					"name": "activeOrganizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"created_at": {
+					"name": "created_at",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updated_at": {
+					"name": "updated_at",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				},
+				"onboardingSteps": {
+					"name": "onboardingSteps",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"onboarding_completed_at": {
+					"name": "onboarding_completed_at",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"customBucket": {
+					"name": "customBucket",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"inviteQuota": {
+					"name": "inviteQuota",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 1
+				},
+				"defaultOrgId": {
+					"name": "defaultOrgId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"authSessionVersion": {
+					"name": "authSessionVersion",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"marketingOrigin": {
+					"name": "marketingOrigin",
+					"type": "varchar(20)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'unknown'"
+				}
+			},
+			"indexes": {
+				"email_idx": {
+					"name": "email_idx",
+					"columns": ["email"],
+					"isUnique": true
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"users_id": {
+					"name": "users_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"verification_tokens": {
+			"name": "verification_tokens",
+			"columns": {
+				"identifier": {
+					"name": "identifier",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"token": {
+					"name": "token",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"expires": {
+					"name": "expires",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"created_at": {
+					"name": "created_at",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updated_at": {
+					"name": "updated_at",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"verification_tokens_identifier": {
+					"name": "verification_tokens_identifier",
+					"columns": ["identifier"]
+				}
+			},
+			"uniqueConstraints": {
+				"verification_tokens_token_unique": {
+					"name": "verification_tokens_token_unique",
+					"columns": ["token"]
+				}
+			},
+			"checkConstraint": {}
+		},
+		"video_edits": {
+			"name": "video_edits",
+			"columns": {
+				"videoId": {
+					"name": "videoId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"sourceKey": {
+					"name": "sourceKey",
+					"type": "varchar(512)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"editSpec": {
+					"name": "editSpec",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {},
+			"foreignKeys": {
+				"video_edits_videoId_videos_id_fk": {
+					"name": "video_edits_videoId_videos_id_fk",
+					"tableFrom": "video_edits",
+					"tableTo": "videos",
+					"columnsFrom": ["videoId"],
+					"columnsTo": ["id"],
+					"onDelete": "cascade",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"video_edits_videoId": {
+					"name": "video_edits_videoId",
+					"columns": ["videoId"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"video_processing_jobs": {
+			"name": "video_processing_jobs",
+			"columns": {
+				"video_id": {
+					"name": "video_id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"owner_id": {
+					"name": "owner_id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"generation": {
+					"name": "generation",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"manifest_sha256": {
+					"name": "manifest_sha256",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"state": {
+					"name": "state",
+					"type": "varchar(32)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'committing'"
+				},
+				"attempt_id": {
+					"name": "attempt_id",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"attempt_count": {
+					"name": "attempt_count",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"lease_expires_at": {
+					"name": "lease_expires_at",
+					"type": "datetime(3)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"next_retry_at": {
+					"name": "next_retry_at",
+					"type": "datetime(3)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"workflow_run_id": {
+					"name": "workflow_run_id",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"remote_job_id": {
+					"name": "remote_job_id",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"source": {
+					"name": "source",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"verification": {
+					"name": "verification",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"output": {
+					"name": "output",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"error_code": {
+					"name": "error_code",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"error_message": {
+					"name": "error_message",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"created_at": {
+					"name": "created_at",
+					"type": "datetime(3)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"updated_at": {
+					"name": "updated_at",
+					"type": "datetime(3)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"processing_state_retry_video_idx": {
+					"name": "processing_state_retry_video_idx",
+					"columns": ["state", "next_retry_at", "video_id"],
+					"isUnique": false
+				},
+				"processing_state_lease_video_idx": {
+					"name": "processing_state_lease_video_idx",
+					"columns": ["state", "lease_expires_at", "video_id"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"video_processing_jobs_video_id": {
+					"name": "video_processing_jobs_video_id",
+					"columns": ["video_id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"video_uploads": {
+			"name": "video_uploads",
+			"columns": {
+				"video_id": {
+					"name": "video_id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"uploaded": {
+					"name": "uploaded",
+					"type": "bigint unsigned",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"total": {
+					"name": "total",
+					"type": "bigint unsigned",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"started_at": {
+					"name": "started_at",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updated_at": {
+					"name": "updated_at",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"mode": {
+					"name": "mode",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"phase": {
+					"name": "phase",
+					"type": "varchar(32)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'uploading'"
+				},
+				"processing_progress": {
+					"name": "processing_progress",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"processing_message": {
+					"name": "processing_message",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"processing_error": {
+					"name": "processing_error",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"raw_file_key": {
+					"name": "raw_file_key",
+					"type": "varchar(512)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"phase_updated_at_video_id_idx": {
+					"name": "phase_updated_at_video_id_idx",
+					"columns": ["phase", "updated_at", "video_id"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"video_uploads_video_id": {
+					"name": "video_uploads_video_id",
+					"columns": ["video_id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"videos": {
+			"name": "videos",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"ownerId": {
+					"name": "ownerId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"orgId": {
+					"name": "orgId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"name": {
+					"name": "name",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'My Video'"
+				},
+				"bucket": {
+					"name": "bucket",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"storageIntegrationId": {
+					"name": "storageIntegrationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"duration": {
+					"name": "duration",
+					"type": "float",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"width": {
+					"name": "width",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"height": {
+					"name": "height",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"fps": {
+					"name": "fps",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"metadata": {
+					"name": "metadata",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"public": {
+					"name": "public",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": true
+				},
+				"settings": {
+					"name": "settings",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"transcriptionStatus": {
+					"name": "transcriptionStatus",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"source": {
+					"name": "source",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "('{\"type\":\"MediaConvert\"}')"
+				},
+				"folderId": {
+					"name": "folderId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"effectiveCreatedAt": {
+					"name": "effectiveCreatedAt",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false,
+					"generated": {
+						"as": "COALESCE(\n          STR_TO_DATE(JSON_UNQUOTE(JSON_EXTRACT(`metadata`, '$.customCreatedAt')), '%Y-%m-%dT%H:%i:%s.%fZ'),\n          STR_TO_DATE(JSON_UNQUOTE(JSON_EXTRACT(`metadata`, '$.customCreatedAt')), '%Y-%m-%dT%H:%i:%sZ'),\n          `createdAt`\n        )",
+						"type": "stored"
+					}
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				},
+				"password": {
+					"name": "password",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"xStreamInfo": {
+					"name": "xStreamInfo",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"firstViewEmailSentAt": {
+					"name": "firstViewEmailSentAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"isScreenshot": {
+					"name": "isScreenshot",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": false
+				},
+				"awsRegion": {
+					"name": "awsRegion",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"awsBucket": {
+					"name": "awsBucket",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"videoStartTime": {
+					"name": "videoStartTime",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"audioStartTime": {
+					"name": "audioStartTime",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"jobId": {
+					"name": "jobId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"jobStatus": {
+					"name": "jobStatus",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"skipProcessing": {
+					"name": "skipProcessing",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": false
+				}
+			},
+			"indexes": {
+				"owner_id_idx": {
+					"name": "owner_id_idx",
+					"columns": ["ownerId"],
+					"isUnique": false
+				},
+				"is_public_idx": {
+					"name": "is_public_idx",
+					"columns": ["public"],
+					"isUnique": false
+				},
+				"folder_id_idx": {
+					"name": "folder_id_idx",
+					"columns": ["folderId"],
+					"isUnique": false
+				},
+				"storage_integration_id_idx": {
+					"name": "storage_integration_id_idx",
+					"columns": ["storageIntegrationId"],
+					"isUnique": false
+				},
+				"org_owner_folder_idx": {
+					"name": "org_owner_folder_idx",
+					"columns": ["orgId", "ownerId", "folderId"],
+					"isUnique": false
+				},
+				"org_effective_created_idx": {
+					"name": "org_effective_created_idx",
+					"columns": ["orgId", "effectiveCreatedAt"],
+					"isUnique": false
+				},
+				"screenshot_transcription_created_idx": {
+					"name": "screenshot_transcription_created_idx",
+					"columns": ["isScreenshot", "transcriptionStatus", "createdAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {
+				"videos_storageIntegrationId_storage_integrations_id_fk": {
+					"name": "videos_storageIntegrationId_storage_integrations_id_fk",
+					"tableFrom": "videos",
+					"tableTo": "storage_integrations",
+					"columnsFrom": ["storageIntegrationId"],
+					"columnsTo": ["id"],
+					"onDelete": "restrict",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"videos_id": {
+					"name": "videos_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		}
+	},
+	"views": {},
+	"_meta": {
+		"schemas": {},
+		"tables": {},
+		"columns": {}
+	},
+	"internal": {
+		"tables": {},
+		"indexes": {
+			"integration_object_key_prefix_idx": {
+				"columns": {
+					"`objectKey`(191)": {
+						"isExpression": true
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/packages/database/migrations/meta/_journal.json b/packages/database/migrations/meta/_journal.json
index 49b1b749d03..5cfeb35486d 100644
--- a/packages/database/migrations/meta/_journal.json
+++ b/packages/database/migrations/meta/_journal.json
@@ -330,6 +330,13 @@
 			"when": 1789988285195,
 			"tag": "0046_loom_concierge",
 			"breakpoints": true
+		},
+		{
+			"idx": 47,
+			"version": "5",
+			"when": 1789989245680,
+			"tag": "0047_loom_concierge_lease",
+			"breakpoints": true
 		}
 	]
 }
diff --git a/packages/database/schema.ts b/packages/database/schema.ts
index 7f6b03c5c82..1843316f436 100644
--- a/packages/database/schema.ts
+++ b/packages/database/schema.ts
@@ -1576,6 +1576,10 @@ export const loomMigrationRequests = mysqlTable(
 		importedVideoCount: int("importedVideoCount").notNull().default(0),
 		queuedVideoCount: int("queuedVideoCount").notNull().default(0),
 		activeImportCount: int("activeImportCount").notNull().default(0),
+		activeImportLeaseToken: varchar("activeImportLeaseToken", { length: 36 }),
+		activeImportLeaseUntil: datetime("activeImportLeaseUntil", {
+			mode: "date",
+		}),
 		lastOperatorUserId:
 			nanoIdNullable("lastOperatorUserId").$type<User.UserId>(),
 		lastOperatorAt: datetime("lastOperatorAt", { mode: "date" }),

From 0f4fe25ffc2ce34594656d745f0c23a66ebb2349 Mon Sep 17 00:00:00 2001
From: Richie McIlroy <33632126+richiemcilroy@users.noreply.github.com>
Date: Mon, 21 Sep 2026 12:19:27 +0100
Subject: [PATCH 06/74] fix: validate Loom video IDs in server requests

---
 apps/web/actions/loom.ts | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/apps/web/actions/loom.ts b/apps/web/actions/loom.ts
index b85a1f0db00..120aa93490b 100644
--- a/apps/web/actions/loom.ts
+++ b/apps/web/actions/loom.ts
@@ -108,6 +108,7 @@ const MAX_LOOM_SPACE_NAME_LENGTH = 255;
 const LOOM_CSV_LIMIT_ERROR = `CSV imports are limited to ${MAX_LOOM_CSV_ROWS} rows at a time. Contact support to raise this limit.`;
 const LOOM_CSV_PERMISSION_ERROR =
 	"Only organization admins and owners can import Loom videos from a CSV.";
+const LOOM_VIDEO_ID_PATTERN = /^[A-Za-z0-9_-]{10,64}$/;
 
 function extractLoomVideoId(url: string): string | null {
 	try {
@@ -122,11 +123,11 @@ function extractLoomVideoId(url: string): string | null {
 		const pathParts = parsed.pathname.split("/").filter(Boolean);
 		const id = pathParts[pathParts.length - 1] ?? null;
 
-		if (!id || id.length < 10) {
+		if (!id || !LOOM_VIDEO_ID_PATTERN.test(id)) {
 			return null;
 		}
 
-		return id.split("?")[0] ?? null;
+		return id;
 	} catch {
 		return null;
 	}
@@ -134,7 +135,7 @@ function extractLoomVideoId(url: string): string | null {
 
 async function fetchLoomEndpoint(
 	videoId: string,
-	endpoint: string,
+	endpoint: "transcoded-url" | "raw-url",
 	includeBody = true,
 ): Promise<string | null> {
 	try {
@@ -153,7 +154,7 @@ async function fetchLoomEndpoint(
 		}
 
 		const response = await fetch(
-			`https://www.loom.com/api/campaigns/sessions/${videoId}/${endpoint}`,
+			`https://www.loom.com/api/campaigns/sessions/${encodeURIComponent(videoId)}/${endpoint}`,
 			options,
 		);
 
@@ -215,7 +216,10 @@ function isDirectMp4Url(url: string): boolean {
 }
 
 async function getLoomDownloadUrl(loomVideoId: string): Promise<string | null> {
-	const requestVariants: Array<{ endpoint: string; includeBody: boolean }> = [
+	const requestVariants: Array<{
+		endpoint: "transcoded-url" | "raw-url";
+		includeBody: boolean;
+	}> = [
 		{ endpoint: "transcoded-url", includeBody: true },
 		{ endpoint: "raw-url", includeBody: true },
 		{ endpoint: "transcoded-url", includeBody: false },
@@ -241,7 +245,7 @@ async function fetchLoomOEmbed(
 ): Promise<{ duration?: number; width?: number; height?: number } | null> {
 	try {
 		const response = await fetch(
-			`https://www.loom.com/v1/oembed?url=https://www.loom.com/share/${loomVideoId}`,
+			`https://www.loom.com/v1/oembed?url=${encodeURIComponent(`https://www.loom.com/share/${loomVideoId}`)}`,
 			{ headers: { Accept: "application/json" } },
 		);
 		if (!response.ok) return null;

From 5b2bc8ad38c53514b0fcd9c73ca315dba79ad1ba Mon Sep 17 00:00:00 2001
From: Richie McIlroy <33632126+richiemcilroy@users.noreply.github.com>
Date: Mon, 21 Sep 2026 12:24:56 +0100
Subject: [PATCH 07/74] fix: account for long Loom concierge imports

---
 apps/web/actions/loom.ts                      | 65 +++++++++----------
 .../loom-migrations/LoomMigrationQueue.tsx    |  2 +-
 apps/web/lib/loom-concierge.ts                | 24 +++++++
 3 files changed, 56 insertions(+), 35 deletions(-)

diff --git a/apps/web/actions/loom.ts b/apps/web/actions/loom.ts
index 120aa93490b..a6ac424ab98 100644
--- a/apps/web/actions/loom.ts
+++ b/apps/web/actions/loom.ts
@@ -42,6 +42,7 @@ import {
 import { requireSpaceManager } from "@/actions/organization/space-authorization";
 import {
 	releaseConciergeImport,
+	renewConciergeImport,
 	requireMigrationOperator,
 	reserveConciergeImport,
 } from "@/lib/loom-concierge";
@@ -472,6 +473,13 @@ async function importLoomVideoForOwner({
 				videoId,
 				requestId: migrationRequestId,
 			});
+			await tx
+				.update(loomMigrationRequests)
+				.set({
+					queuedVideoCount: sql`${loomMigrationRequests.queuedVideoCount} + 1`,
+					updatedAt: new Date(),
+				})
+				.where(eq(loomMigrationRequests.id, migrationRequestId));
 		}
 
 		if (destination.spaceId === orgId) {
@@ -880,6 +888,12 @@ async function processLoomCsvRows({
 	const touchedSpaceIds = new Set<Space.SpaceIdOrOrganisationId>();
 
 	for (const row of normalizedRows) {
+		if (migrationRequestId) {
+			if (!migrationLeaseToken) {
+				throw new Error("The concierge import is missing its reservation.");
+			}
+			await renewConciergeImport(migrationRequestId, migrationLeaseToken);
+		}
 		if (!row.loomUrl) {
 			results.push({
 				rowNumber: row.rowNumber,
@@ -1049,6 +1063,9 @@ export async function importFromLoomCsvForConcierge({
 	if (!(await isOrganizationOwnerPro(request.organizationId))) {
 		throw new Error("The destination workspace needs Cap Pro.");
 	}
+	if (!Array.isArray(rows) || rows.length > 10) {
+		throw new Error("Concierge CSV imports run in batches of 10 videos.");
+	}
 	const leaseToken = await reserveConciergeImport(requestId, operator.id);
 	try {
 		const result = await processLoomCsvRows({
@@ -1058,23 +1075,6 @@ export async function importFromLoomCsvForConcierge({
 			migrationRequestId: requestId,
 			migrationLeaseToken: leaseToken,
 		});
-		if (result.importedCount > 0) {
-			await db()
-				.update(loomMigrationRequests)
-				.set({
-					queuedVideoCount: sql`${loomMigrationRequests.queuedVideoCount} + ${result.importedCount}`,
-					lastOperatorUserId: operator.id,
-					lastOperatorAt: new Date(),
-					updatedAt: new Date(),
-				})
-				.where(
-					and(
-						eq(loomMigrationRequests.id, requestId),
-						eq(loomMigrationRequests.activeImportLeaseToken, leaseToken),
-						isNotNull(loomMigrationRequests.activeOrganizationId),
-					),
-				);
-		}
 		revalidatePath("/dashboard/migrations/loom");
 		revalidatePath("/dashboard/admin/loom-migrations");
 		return result;
@@ -1240,6 +1240,13 @@ export async function createConciergeLoomFileUpload({
 						videoId: Video.VideoId.make(existing.id),
 						requestId,
 					});
+					await tx
+						.update(loomMigrationRequests)
+						.set({
+							queuedVideoCount: sql`${loomMigrationRequests.queuedVideoCount} + 1`,
+							updatedAt: new Date(),
+						})
+						.where(eq(loomMigrationRequests.id, requestId));
 				});
 			}
 			return {
@@ -1328,6 +1335,13 @@ export async function createConciergeLoomFileUpload({
 				sourceId: loomVideoId,
 			});
 			await tx.insert(loomMigrationImports).values({ videoId, requestId });
+			await tx
+				.update(loomMigrationRequests)
+				.set({
+					queuedVideoCount: sql`${loomMigrationRequests.queuedVideoCount} + 1`,
+					updatedAt: new Date(),
+				})
+				.where(eq(loomMigrationRequests.id, requestId));
 			if (space) {
 				await tx.insert(spaceVideos).values({
 					id: nanoId(),
@@ -1422,23 +1436,6 @@ export async function finishConciergeLoomFileUpload({
 			processingMessage: "Processing Loom video...",
 			startFailureMessage: "Loom file processing could not start.",
 		});
-		if (status === "started") {
-			await db()
-				.update(loomMigrationRequests)
-				.set({
-					queuedVideoCount: sql`${loomMigrationRequests.queuedVideoCount} + 1`,
-					lastOperatorUserId: operator.id,
-					lastOperatorAt: new Date(),
-					updatedAt: new Date(),
-				})
-				.where(
-					and(
-						eq(loomMigrationRequests.id, requestId),
-						eq(loomMigrationRequests.activeImportLeaseToken, leaseToken),
-						isNotNull(loomMigrationRequests.activeOrganizationId),
-					),
-				);
-		}
 		revalidatePath("/dashboard/migrations/loom");
 		revalidatePath("/dashboard/admin/loom-migrations");
 		return { status };
diff --git a/apps/web/app/(org)/dashboard/admin/loom-migrations/LoomMigrationQueue.tsx b/apps/web/app/(org)/dashboard/admin/loom-migrations/LoomMigrationQueue.tsx
index f1cf3806b42..34f6f5e2c42 100644
--- a/apps/web/app/(org)/dashboard/admin/loom-migrations/LoomMigrationQueue.tsx
+++ b/apps/web/app/(org)/dashboard/admin/loom-migrations/LoomMigrationQueue.tsx
@@ -193,7 +193,7 @@ function QueueItem({ request }: { request: OperatorLoomMigrationView }) {
 					Loom invite:{" "}
 					{request.invitedAt ? "Marked as sent" : "Waiting for customer"}
 				</p>
-				<p>Jobs started: {request.queuedVideoCount}</p>
+				<p>Videos queued: {request.queuedVideoCount}</p>
 				<p>Verified videos: {request.importedVideoCount}</p>
 				<p>Imports starting: {request.activeImportCount}</p>
 			</div>
diff --git a/apps/web/lib/loom-concierge.ts b/apps/web/lib/loom-concierge.ts
index 0a9a01e5127..7bd62cf691f 100644
--- a/apps/web/lib/loom-concierge.ts
+++ b/apps/web/lib/loom-concierge.ts
@@ -15,11 +15,13 @@ import {
 	asc,
 	desc,
 	eq,
+	gt,
 	isNotNull,
 	isNull,
 	lte,
 	ne,
 	or,
+	sql,
 } from "drizzle-orm";
 import { requireOrganizationSettingsManager } from "@/actions/organization/authorization";
 import { MESSENGER_ADMIN_EMAIL } from "@/lib/messenger/constants";
@@ -171,6 +173,28 @@ export async function releaseConciergeImport(requestId: string, token: string) {
 		);
 }
 
+export async function renewConciergeImport(requestId: string, token: string) {
+	const now = new Date();
+	const deadline = new Date(now.getTime() + IMPORT_LEASE_MS);
+	const result = await db()
+		.update(loomMigrationRequests)
+		.set({
+			activeImportLeaseUntil: sql`DATE_ADD(GREATEST(${loomMigrationRequests.activeImportLeaseUntil}, ${deadline}), INTERVAL 1 SECOND)`,
+			updatedAt: now,
+		})
+		.where(
+			and(
+				eq(loomMigrationRequests.id, requestId),
+				eq(loomMigrationRequests.activeImportLeaseToken, token),
+				gt(loomMigrationRequests.activeImportLeaseUntil, now),
+				isNotNull(loomMigrationRequests.activeOrganizationId),
+			),
+		);
+	if (affectedRows(result) === 0) {
+		throw new Error("The concierge import expired. Refresh and retry.");
+	}
+}
+
 export async function getCustomerMigrationRequests(
 	organizationId: Organisation.OrganisationId,
 ) {

From 1a285b2575e04e7191dcdcde0e1140795b198831 Mon Sep 17 00:00:00 2001
From: Abdeslam Yassine Agmar <abdeslamagmar@gmail.com>
Date: Tue, 13 Oct 2026 12:48:14 +0000
Subject: [PATCH 08/74] perf(desktop-gpui): add a timeline draw benchmark for
 the editor window

`CAP_GPUI_AUTO_TIMELINE_BENCH=1` times a synchronous `Window::draw` of the
editor the way `camera_bench` does for the camera bubble, after the
`CAP_GPUI_AUTO_EDITOR` project is open and its waveforms have landed. It
reports mean / p50 / p95 / max draw time for five scenarios: playback at
the default zoom, playback zoomed out to the whole clip, a paused hover
sweep, a zoomed-in following playback, and a clean draw with nothing
notified. The playing scenarios dirty the timeline through the production
`invalidate_playback_chrome`.

The draw-and-report helpers move out of `camera_bench` into `draw_bench`
so both benches share them.
---
 apps/desktop-gpui/src/app_windows.rs   |   1 +
 apps/desktop-gpui/src/camera_bench.rs  |  42 ++----
 apps/desktop-gpui/src/draw_bench.rs    |  25 ++++
 apps/desktop-gpui/src/editor_bench.rs  | 188 +++++++++++++++++++++++++
 apps/desktop-gpui/src/editor_window.rs |  24 +++-
 apps/desktop-gpui/src/main.rs          |   2 +
 6 files changed, 247 insertions(+), 35 deletions(-)
 create mode 100644 apps/desktop-gpui/src/draw_bench.rs
 create mode 100644 apps/desktop-gpui/src/editor_bench.rs

diff --git a/apps/desktop-gpui/src/app_windows.rs b/apps/desktop-gpui/src/app_windows.rs
index 563781960e8..63f4ce9f2c6 100644
--- a/apps/desktop-gpui/src/app_windows.rs
+++ b/apps/desktop-gpui/src/app_windows.rs
@@ -5345,6 +5345,7 @@ fn load_editor_project_candidate(
 
         drive_auto_sidebar(handle, cx).await;
         drive_auto_playback(path, handle, cx).await;
+        crate::editor_bench::run(handle, cx).await;
         drive_auto_export(handle, cx).await;
     })
     .detach();
diff --git a/apps/desktop-gpui/src/camera_bench.rs b/apps/desktop-gpui/src/camera_bench.rs
index 79b79d34319..9fb27fba982 100644
--- a/apps/desktop-gpui/src/camera_bench.rs
+++ b/apps/desktop-gpui/src/camera_bench.rs
@@ -16,7 +16,10 @@ use std::time::{Duration, Instant};
 
 use gpui::App;
 
-use crate::app_windows::{self, AppWindows};
+use crate::{
+    app_windows::{self, AppWindows},
+    draw_bench,
+};
 
 const FRAME_WIDTH: usize = 1280;
 const FRAME_HEIGHT: usize = 720;
@@ -43,7 +46,7 @@ pub fn run(cx: &mut App) {
             let frame = native_frame(&sources[index % sources.len()]);
             let delivered = cx.update(|cx| {
                 let delivered = app_windows::deliver_camera_frame(frame, cx);
-                let _ = draw_camera_window(handle, cx);
+                let _ = draw_bench::timed_draw(handle.into(), cx);
                 delivered
             });
             if !delivered {
@@ -58,7 +61,7 @@ pub fn run(cx: &mut App) {
             let frame = native_frame(&sources[index % sources.len()]);
             let elapsed = cx.update(|cx| {
                 app_windows::deliver_camera_frame(frame, cx);
-                draw_camera_window(handle, cx)
+                draw_bench::timed_draw(handle.into(), cx)
             });
             if let Some(elapsed) = elapsed {
                 draw_us.push(elapsed.as_secs_f64() * 1e6);
@@ -79,7 +82,7 @@ pub fn run(cx: &mut App) {
         let mut clean_us = Vec::with_capacity(MEASURED_FRAMES);
         for _ in 0..MEASURED_FRAMES {
             cx.background_executor().timer(interval).await;
-            let elapsed = cx.update(|cx| draw_camera_window(handle, cx));
+            let elapsed = cx.update(|cx| draw_bench::timed_draw(handle.into(), cx));
             if let Some(elapsed) = elapsed {
                 clean_us.push(elapsed.as_secs_f64() * 1e6);
             }
@@ -89,40 +92,13 @@ pub fn run(cx: &mut App) {
             "camera-bench: {} frames at {FPS}fps ({FRAME_WIDTH}x{FRAME_HEIGHT} 420v camera frames)",
             draw_us.len()
         );
-        report("frame draw", &mut draw_us);
-        report("clean draw", &mut clean_us);
+        draw_bench::report("camera-bench", "frame draw", &mut draw_us);
+        draw_bench::report("camera-bench", "clean draw", &mut clean_us);
         std::process::exit(0);
     })
     .detach();
 }
 
-fn report(label: &str, samples: &mut [f64]) {
-    samples.sort_by(|a, b| a.partial_cmp(b).expect("no NaN draw times"));
-    let mean = samples.iter().sum::<f64>() / samples.len() as f64;
-    let p50 = samples[samples.len() / 2];
-    let p95 = samples[(samples.len() as f64 * 0.95) as usize];
-    let max = samples[samples.len() - 1];
-    println!(
-        "camera-bench: {label} {mean:.1} mean / {p50:.1} p50 / {p95:.1} p95 / {max:.1} max us"
-    );
-}
-
-/// One synchronous `Window::draw`, timed. `AnyWindowHandle::update` passes the
-/// root as an unleased `AnyView`; the typed handle would lease the root entity
-/// that `draw()` re-renders.
-fn draw_camera_window(
-    handle: gpui::WindowHandle<crate::camera_window::CameraWindow>,
-    cx: &mut App,
-) -> Option<Duration> {
-    gpui::AnyWindowHandle::from(handle)
-        .update(cx, |_, window, cx| {
-            let started = Instant::now();
-            window.draw(cx).clear();
-            started.elapsed()
-        })
-        .ok()
-}
-
 fn native_frame(
     sample_buf: &cidre::arc::R<cidre::cm::SampleBuf>,
 ) -> cap_recording::NativeCameraFrame {
diff --git a/apps/desktop-gpui/src/draw_bench.rs b/apps/desktop-gpui/src/draw_bench.rs
new file mode 100644
index 00000000000..efbc8ae8a74
--- /dev/null
+++ b/apps/desktop-gpui/src/draw_bench.rs
@@ -0,0 +1,25 @@
+use std::time::{Duration, Instant};
+
+use gpui::{AnyWindowHandle, App};
+
+/// One synchronous `Window::draw`, timed. `AnyWindowHandle::update` passes the
+/// root as an unleased `AnyView`; the typed handle would lease the root entity
+/// that `draw()` re-renders.
+pub(crate) fn timed_draw(handle: AnyWindowHandle, cx: &mut App) -> Option<Duration> {
+    handle
+        .update(cx, |_, window, cx| {
+            let started = Instant::now();
+            window.draw(cx).clear();
+            started.elapsed()
+        })
+        .ok()
+}
+
+pub(crate) fn report(prefix: &str, label: &str, samples: &mut [f64]) {
+    samples.sort_by(|a, b| a.partial_cmp(b).expect("no NaN draw times"));
+    let mean = samples.iter().sum::<f64>() / samples.len() as f64;
+    let p50 = samples[samples.len() / 2];
+    let p95 = samples[(samples.len() as f64 * 0.95) as usize];
+    let max = samples[samples.len() - 1];
+    println!("{prefix}: {label} {mean:.1} mean / {p50:.1} p50 / {p95:.1} p95 / {max:.1} max us");
+}
diff --git a/apps/desktop-gpui/src/editor_bench.rs b/apps/desktop-gpui/src/editor_bench.rs
new file mode 100644
index 00000000000..a72196707cf
--- /dev/null
+++ b/apps/desktop-gpui/src/editor_bench.rs
@@ -0,0 +1,188 @@
+//! Needs a clip of at least 30 s so the `follow` scenario does not run off the
+//! end. Run from `apps/desktop-gpui`:
+//!   CAP_GPUI_AUTO_EDITOR=<studio .cap> CAP_GPUI_AUTO_TIMELINE_BENCH=1 \
+//!     CAP_GPUI_NO_MENUS=1 CAP_GPUI_NO_TRAY=1 CAP_GPUI_MUTE_AUDIO=1 \
+//!     cargo run --release
+
+use std::time::{Duration, Instant};
+
+use gpui::{AsyncApp, Context, Window, WindowHandle};
+
+use crate::{draw_bench, editor_timeline, editor_window::EditorWindow};
+
+const WARMUP_FRAMES: usize = 60;
+const MEASURED_FRAMES: usize = 300;
+const FRAME_INTERVAL: Duration = Duration::from_millis(16);
+const READY_POLL: Duration = Duration::from_millis(50);
+const READY_TIMEOUT: Duration = Duration::from_secs(30);
+const FOLLOW_ZOOM_SECS: f64 = 20.0;
+const FOLLOW_START_FRACTION: f64 = 0.82;
+
+#[derive(Clone, Copy)]
+enum Scenario {
+    Tick,
+    TickZoomedOut,
+    Hover,
+    Follow,
+    Clean,
+}
+
+impl Scenario {
+    fn label(self) -> &'static str {
+        match self {
+            Self::Tick => "tick",
+            Self::TickZoomedOut => "tick-zoomed-out",
+            Self::Hover => "hover",
+            Self::Follow => "follow",
+            Self::Clean => "clean",
+        }
+    }
+
+    fn prepare(self, view: &mut EditorWindow, window: &mut Window, cx: &mut Context<EditorWindow>) {
+        match self {
+            Self::Tick => {
+                if !view.playing {
+                    view.toggle_play(window, cx);
+                }
+            }
+            Self::TickZoomedOut => {
+                view.bench_zoom_to(view.total_duration(), cx);
+                if !view.playing {
+                    view.toggle_play(window, cx);
+                }
+            }
+            Self::Hover => {
+                if view.playing {
+                    view.stop_for_measurement(cx);
+                }
+                view.bench_zoom_to(view.total_duration(), cx);
+                view.seek_fraction(0., window, cx);
+            }
+            Self::Follow => {
+                if view.playing {
+                    view.stop_for_measurement(cx);
+                }
+                view.bench_zoom_to(FOLLOW_ZOOM_SECS, cx);
+                view.seek_fraction(FOLLOW_START_FRACTION, window, cx);
+                view.toggle_play(window, cx);
+            }
+            Self::Clean => {
+                if view.playing {
+                    view.stop_for_measurement(cx);
+                }
+                view.bench_zoom_to(view.total_duration(), cx);
+            }
+        }
+    }
+
+    fn step(
+        self,
+        iteration: usize,
+        view: &mut EditorWindow,
+        window: &mut Window,
+        cx: &mut Context<EditorWindow>,
+    ) {
+        match self {
+            Self::Tick | Self::TickZoomedOut | Self::Follow => {
+                view.invalidate_playback_chrome(window, cx)
+            }
+            Self::Hover => {
+                let viewport_width: f32 = window.viewport_size().width.into();
+                let fraction = iteration as f32 / (WARMUP_FRAMES + MEASURED_FRAMES) as f32;
+                let x = editor_timeline::content_left()
+                    + editor_timeline::content_width(viewport_width) * fraction;
+                view.timeline_hover(x, window, cx);
+            }
+            Self::Clean => {}
+        }
+    }
+}
+
+pub(crate) async fn run(handle: WindowHandle<EditorWindow>, cx: &mut AsyncApp) {
+    if !std::env::var("CAP_GPUI_AUTO_TIMELINE_BENCH").is_ok_and(|value| value == "1") {
+        return;
+    }
+
+    let started = Instant::now();
+    loop {
+        let ready = handle
+            .update(cx, |view, _, _| {
+                let (mic, system) = view.has_waveforms();
+                view.latest_frame.is_some() && (mic || system)
+            })
+            .unwrap_or(false);
+        if ready {
+            break;
+        }
+        if started.elapsed() > READY_TIMEOUT {
+            eprintln!(
+                "timeline-bench: no rendered frame and waveforms within {}s",
+                READY_TIMEOUT.as_secs()
+            );
+            std::process::exit(1);
+        }
+        cx.background_executor().timer(READY_POLL).await;
+    }
+
+    let Ok(header) = handle.update(cx, |view, window, _| {
+        let viewport_width: f32 = window.viewport_size().width.into();
+        let content_width = editor_timeline::content_width(viewport_width);
+        let (mic, system) = view.has_waveforms();
+        format!(
+            "timeline-bench: viewport {viewport_width:.0}px, content {content_width:.0}px, \
+             clip {:.1}s, mic {mic}, system {system}, target {} samples/path",
+            view.total_duration(),
+            editor_timeline::waveform_sample_count(f64::from(content_width)),
+        )
+    }) else {
+        eprintln!("timeline-bench: the editor window closed");
+        std::process::exit(1);
+    };
+    println!("{header}");
+
+    for scenario in [
+        Scenario::Tick,
+        Scenario::TickZoomedOut,
+        Scenario::Hover,
+        Scenario::Follow,
+        Scenario::Clean,
+    ] {
+        if handle
+            .update(cx, |view, window, cx| scenario.prepare(view, window, cx))
+            .is_err()
+        {
+            eprintln!("timeline-bench: the editor window closed");
+            std::process::exit(1);
+        }
+
+        let mut draw_us = Vec::with_capacity(MEASURED_FRAMES);
+        for iteration in 0..WARMUP_FRAMES + MEASURED_FRAMES {
+            cx.background_executor().timer(FRAME_INTERVAL).await;
+            let elapsed = cx.update(|cx| {
+                handle
+                    .update(cx, |view, window, cx| {
+                        scenario.step(iteration, view, window, cx)
+                    })
+                    .ok()?;
+                draw_bench::timed_draw(handle.into(), cx)
+            });
+            if iteration >= WARMUP_FRAMES
+                && let Some(elapsed) = elapsed
+            {
+                draw_us.push(elapsed.as_secs_f64() * 1e6);
+            }
+        }
+
+        if draw_us.len() < MEASURED_FRAMES {
+            eprintln!(
+                "timeline-bench: only {} of {MEASURED_FRAMES} {} draws completed",
+                draw_us.len(),
+                scenario.label()
+            );
+            std::process::exit(1);
+        }
+        draw_bench::report("timeline-bench", scenario.label(), &mut draw_us);
+    }
+
+    std::process::exit(0);
+}
diff --git a/apps/desktop-gpui/src/editor_window.rs b/apps/desktop-gpui/src/editor_window.rs
index 5270dcd1f30..7484cb3ce60 100644
--- a/apps/desktop-gpui/src/editor_window.rs
+++ b/apps/desktop-gpui/src/editor_window.rs
@@ -3298,6 +3298,22 @@ impl EditorWindow {
         self.stop_playback(cx);
     }
 
+    pub(crate) fn has_waveforms(&self) -> (bool, bool) {
+        let present = |tables: &[Arc<Vec<f32>>]| tables.iter().any(|peaks| !peaks.is_empty());
+        (
+            present(&self.timeline.mic_waveforms),
+            present(&self.timeline.system_waveforms),
+        )
+    }
+
+    pub(crate) fn bench_zoom_to(&mut self, seconds: f64, cx: &mut Context<Self>) {
+        let total = self.total_duration();
+        self.view
+            .transform
+            .update_zoom(seconds, self.playhead, total);
+        cx.notify();
+    }
+
     fn capture_playback_key(
         &mut self,
         event: &gpui::KeyDownEvent,
@@ -3741,7 +3757,11 @@ impl EditorWindow {
         cx.notify();
     }
 
-    fn invalidate_playback_chrome(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
+    pub(crate) fn invalidate_playback_chrome(
+        &mut self,
+        _window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
         self.timeline_view.update(cx, |_, cx| cx.notify());
         self.transport_controls.update(cx, |_, cx| cx.notify());
         // While playing, nothing else the parent renders reads the playhead:
@@ -3775,7 +3795,7 @@ impl EditorWindow {
     /// `onMouseMove` on the timeline container (`TL/index.tsx:1170-1188`):
     /// while paused, the pointer's time becomes `previewTime`; outside the
     /// content column, and at all times while playing, it is cleared.
-    fn timeline_hover(&mut self, x: f32, window: &mut Window, cx: &mut Context<Self>) {
+    pub(crate) fn timeline_hover(&mut self, x: f32, window: &mut Window, cx: &mut Context<Self>) {
         // `if (editorState.playing) return;` -- the handler bails *before* it
         // writes, so a preview time set while paused survives a play rather
         // than being cleared. The ghost is hidden by the render's own
diff --git a/apps/desktop-gpui/src/main.rs b/apps/desktop-gpui/src/main.rs
index 98a6b1b2b23..6ff3d707d68 100644
--- a/apps/desktop-gpui/src/main.rs
+++ b/apps/desktop-gpui/src/main.rs
@@ -19,7 +19,9 @@ mod deeplink;
 mod dev_restore;
 mod devices;
 mod diagnostics;
+mod draw_bench;
 mod editor_audio;
+mod editor_bench;
 mod editor_canvas;
 mod editor_clips;
 mod editor_color;

From c07fd65533145b20f90a65ad77419a6d112491e3 Mon Sep 17 00:00:00 2001
From: Abdeslam Yassine Agmar <abdeslamagmar@gmail.com>
Date: Tue, 13 Oct 2026 12:48:14 +0000
Subject: [PATCH 09/74] perf(desktop-gpui): cache tessellated timeline
 waveforms between repaints

The timeline repaints on every playhead tick during playback, and each
repaint rebuilt the mic and system waveform fills with lyon even when
their inputs had not changed. Zoomed out to a whole 180 s clip the two
fills tessellate to about 34,000 vertices, which cost the editor around
16 ms per draw on `main`, a full 60 Hz frame budget.

`waveform_path` now takes one `WaveformGeometry` value, which doubles as
the key of a `WaveformPaths` cache on `TimelineModel`: one slot per clip
segment and track, compared on every builder input with the peak table
matched by `Arc` identity, swept each render so only last frame's visible
paths are kept, and carried across `rebuild_timeline` like the waveforms.
The paint closure clones the stored path on a hit; colour, opacity, mask
and DPI scale are still applied by `paint_path` per paint. Once the view
follow-scrolls, the range changes every tick and the cache misses, so
scrolling playback costs what it did before.

Timeline draw benchmark, 180 s clip, 5 interleaved runs, median p50:
playing at the default zoom before the view follows 1.12 ms -> 0.70 ms,
playing zoomed out 15.7 ms -> 0.80 ms, paused hover zoomed out
16.1 ms -> 0.96 ms, scrolling playback (every draw misses)
1.39 ms -> 1.36 ms.
---
 apps/desktop-gpui/src/editor_bench.rs    |  26 +-
 apps/desktop-gpui/src/editor_timeline.rs | 464 ++++++++++++++++++++---
 apps/desktop-gpui/src/editor_window.rs   |   7 +
 3 files changed, 431 insertions(+), 66 deletions(-)

diff --git a/apps/desktop-gpui/src/editor_bench.rs b/apps/desktop-gpui/src/editor_bench.rs
index a72196707cf..c1c9c5f31fa 100644
--- a/apps/desktop-gpui/src/editor_bench.rs
+++ b/apps/desktop-gpui/src/editor_bench.rs
@@ -156,20 +156,33 @@ pub(crate) async fn run(handle: WindowHandle<EditorWindow>, cx: &mut AsyncApp) {
         }
 
         let mut draw_us = Vec::with_capacity(MEASURED_FRAMES);
+        let mut built = 0;
+        let mut reused = 0;
         for iteration in 0..WARMUP_FRAMES + MEASURED_FRAMES {
             cx.background_executor().timer(FRAME_INTERVAL).await;
             let elapsed = cx.update(|cx| {
-                handle
+                let before = handle
                     .update(cx, |view, window, cx| {
-                        scenario.step(iteration, view, window, cx)
+                        scenario.step(iteration, view, window, cx);
+                        view.waveform_cache_stats()
                     })
                     .ok()?;
-                draw_bench::timed_draw(handle.into(), cx)
+                let elapsed = draw_bench::timed_draw(handle.into(), cx)?;
+                let after = handle
+                    .update(cx, |view, _, _| view.waveform_cache_stats())
+                    .ok()?;
+                Some((
+                    elapsed,
+                    after.builds.saturating_sub(before.builds),
+                    after.hits.saturating_sub(before.hits),
+                ))
             });
             if iteration >= WARMUP_FRAMES
-                && let Some(elapsed) = elapsed
+                && let Some((elapsed, draw_built, draw_reused)) = elapsed
             {
                 draw_us.push(elapsed.as_secs_f64() * 1e6);
+                built += draw_built;
+                reused += draw_reused;
             }
         }
 
@@ -182,6 +195,11 @@ pub(crate) async fn run(handle: WindowHandle<EditorWindow>, cx: &mut AsyncApp) {
             std::process::exit(1);
         }
         draw_bench::report("timeline-bench", scenario.label(), &mut draw_us);
+        println!(
+            "timeline-bench: {} waveform paths built {built} / reused {reused} in {} timed draws",
+            scenario.label(),
+            draw_us.len()
+        );
     }
 
     std::process::exit(0);
diff --git a/apps/desktop-gpui/src/editor_timeline.rs b/apps/desktop-gpui/src/editor_timeline.rs
index 2313271d708..d4c97619835 100644
--- a/apps/desktop-gpui/src/editor_timeline.rs
+++ b/apps/desktop-gpui/src/editor_timeline.rs
@@ -31,7 +31,10 @@
 //!   A segment wider than the viewport has its true centre off screen, so
 //!   [`visible_box`] clamps it (`useSegmentVisibleBox`, `TL/Track.tsx:147-181`).
 
-use std::sync::Arc;
+use std::{
+    collections::HashMap,
+    sync::{Arc, Mutex},
+};
 
 mod playback_follow;
 
@@ -563,18 +566,18 @@ fn waveform_amplitude(peaks: &[f32], source_time: Option<f64>) -> f64 {
 /// it by `(canvasWidth, canvasHeight * scale)` after translating down by
 /// `canvasHeight * (1 - scale)` (`:285-290`); gpui has no path transform on
 /// `paint_path`, so the same maths is applied to each point as it is emitted.
-#[allow(clippy::too_many_arguments)]
-pub fn waveform_path(
-    peaks: &[f32],
-    range: (f64, f64),
-    target_samples: usize,
-    holds: &[(f64, f64)],
-    segment_start: f64,
-    origin: gpui::Point<Pixels>,
-    size: gpui::Size<Pixels>,
-    scale: f64,
-    clip_bounds: gpui::Bounds<Pixels>,
-) -> Option<gpui::Path<Pixels>> {
+pub fn waveform_path(geometry: &WaveformGeometry) -> Option<gpui::Path<Pixels>> {
+    let &WaveformGeometry {
+        ref peaks,
+        range,
+        target_samples,
+        ref holds,
+        source_start: segment_start,
+        origin,
+        size,
+        scale,
+        clip_bounds,
+    } = geometry;
     if peaks.is_empty() || scale <= 0. {
         return None;
     }
@@ -669,6 +672,129 @@ pub fn waveform_path(
     builder.build().ok()
 }
 
+/// Everything [`waveform_path`] reads, and the [`WaveformPaths`] key. The peak
+/// table is compared by pointer: an entry keeps a strong reference, so the
+/// allocation can't be reused while it is cached.
+#[derive(Debug, Clone)]
+pub struct WaveformGeometry {
+    pub peaks: Arc<Vec<f32>>,
+    pub range: (f64, f64),
+    pub target_samples: usize,
+    pub holds: Vec<(f64, f64)>,
+    pub source_start: f64,
+    pub origin: gpui::Point<Pixels>,
+    pub size: gpui::Size<Pixels>,
+    pub scale: f64,
+    pub clip_bounds: gpui::Bounds<Pixels>,
+}
+
+impl PartialEq for WaveformGeometry {
+    fn eq(&self, other: &Self) -> bool {
+        Arc::ptr_eq(&self.peaks, &other.peaks)
+            && self.range == other.range
+            && self.target_samples == other.target_samples
+            && self.holds == other.holds
+            && self.source_start == other.source_start
+            && self.origin == other.origin
+            && self.size == other.size
+            && self.scale == other.scale
+            && self.clip_bounds == other.clip_bounds
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub enum WaveformTrack {
+    Mic,
+    System,
+}
+
+/// Shared by every clone of the model, so a drag preview reuses the committed
+/// paths and an edit keeps the paths whose slot and geometry it left alone.
+#[derive(Default)]
+pub struct WaveformPaths(Mutex<WaveformPathsInner>);
+
+#[derive(Default)]
+struct WaveformPathsInner {
+    entries: HashMap<(usize, WaveformTrack), WaveformEntry>,
+    builds: u64,
+    hits: u64,
+}
+
+struct WaveformEntry {
+    geometry: WaveformGeometry,
+    path: gpui::Path<Pixels>,
+    painted: bool,
+}
+
+#[derive(Debug, Clone, Copy)]
+pub struct WaveformPathStats {
+    pub builds: u64,
+    pub hits: u64,
+}
+
+impl std::fmt::Debug for WaveformPaths {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self.0.try_lock() {
+            Ok(inner) => f
+                .debug_struct("WaveformPaths")
+                .field("entries", &inner.entries.len())
+                .field("builds", &inner.builds)
+                .field("hits", &inner.hits)
+                .finish(),
+            Err(_) => f.write_str("WaveformPaths(<locked>)"),
+        }
+    }
+}
+
+impl WaveformPaths {
+    fn inner(&self) -> std::sync::MutexGuard<'_, WaveformPathsInner> {
+        self.0
+            .lock()
+            .unwrap_or_else(|poisoned| poisoned.into_inner())
+    }
+
+    pub fn get_or_build(
+        &self,
+        slot: (usize, WaveformTrack),
+        geometry: WaveformGeometry,
+    ) -> Option<gpui::Path<Pixels>> {
+        let mut inner = self.inner();
+        if let Some(entry) = inner.entries.get_mut(&slot)
+            && entry.geometry == geometry
+        {
+            entry.painted = true;
+            let path = entry.path.clone();
+            inner.hits += 1;
+            return Some(path);
+        }
+        let path = waveform_path(&geometry)?;
+        inner.builds += 1;
+        inner.entries.insert(
+            slot,
+            WaveformEntry {
+                geometry,
+                path: path.clone(),
+                painted: true,
+            },
+        );
+        Some(path)
+    }
+
+    pub fn sweep(&self) {
+        self.inner()
+            .entries
+            .retain(|_, entry| std::mem::take(&mut entry.painted));
+    }
+
+    pub fn stats(&self) -> WaveformPathStats {
+        let inner = self.inner();
+        WaveformPathStats {
+            builds: inner.builds,
+            hits: inner.hits,
+        }
+    }
+}
+
 fn rounded_corner_inset(x: f64, width: f64, radius: f64) -> f64 {
     let distance = x.min(width - x).clamp(0., radius);
     if distance >= radius {
@@ -1063,6 +1189,7 @@ pub struct TimelineModel {
     /// (`TL/ClipTrack.tsx:713-730`).
     pub mic_waveforms: Vec<Arc<Vec<f32>>>,
     pub system_waveforms: Vec<Arc<Vec<f32>>>,
+    pub waveform_paths: Arc<WaveformPaths>,
     /// The span a live ghost trim is removing, in output time. Drawn as a gap
     /// with a red duration badge, the way Blip's ghost resize marks the cut.
     pub clip_ghost_gap: Option<(f64, f64)>,
@@ -1292,6 +1419,7 @@ impl TimelineModel {
             system_volume_db: config.audio.system_volume_db as f64,
             mic_waveforms: Vec::new(),
             system_waveforms: Vec::new(),
+            waveform_paths: Arc::default(),
             clip_ghost_gap: None,
         };
         model.rows = build_rows(
@@ -2025,6 +2153,7 @@ fn render_track_content(
             theme,
             model,
             row.kind,
+            index,
             segment,
             view,
             secs_per_pixel,
@@ -2444,6 +2573,7 @@ fn render_segment(
     theme: &Theme,
     model: &TimelineModel,
     kind: TrackKind,
+    index: usize,
     segment: &Segment,
     view: TimelineView,
     secs_per_pixel: f64,
@@ -2508,6 +2638,7 @@ fn render_segment(
         if segment.detail.shows_waveform() {
             fill = fill.child(render_waveform(
                 model,
+                index,
                 segment,
                 *recording_clip,
                 holds,
@@ -2999,6 +3130,7 @@ fn render_hold(
 #[allow(clippy::too_many_arguments)]
 fn render_waveform(
     model: &TimelineModel,
+    index: usize,
     segment: &Segment,
     recording_clip: u32,
     holds: &[(f64, f64)],
@@ -3041,6 +3173,7 @@ fn render_waveform(
     let full_width = width.max(1.) as f64;
     let wave_height = height.min(WAVEFORM_MAX_HEIGHT);
     let wave_color = waveform_color(color);
+    let paths = model.waveform_paths.clone();
 
     gpui::canvas(
         |bounds, _window, _cx| bounds,
@@ -3063,21 +3196,27 @@ fn render_waveform(
             let size = gpui::size(px(slice_width), px(wave_height));
             let samples = waveform_sample_count(slice_width as f64);
 
-            for (peaks, scale) in [(&mic, mic_scale), (&system, system_scale)] {
-                if let Some(path) = waveform_path(
-                    peaks,
-                    (visible_start, visible_end),
-                    samples,
-                    &holds,
-                    segment_start,
+            let clip_bounds = gpui::Bounds {
+                origin: gpui::point(bounds.origin.x, bounds.bottom() - px(height)),
+                size: gpui::size(px(width), px(height)),
+            };
+
+            for (track, peaks, scale) in [
+                (WaveformTrack::Mic, &mic, mic_scale),
+                (WaveformTrack::System, &system, system_scale),
+            ] {
+                let geometry = WaveformGeometry {
+                    peaks: peaks.clone(),
+                    range: (visible_start, visible_end),
+                    target_samples: samples,
+                    holds: holds.clone(),
+                    source_start: segment_start,
                     origin,
                     size,
                     scale,
-                    gpui::Bounds {
-                        origin: gpui::point(bounds.origin.x, bounds.bottom() - px(height)),
-                        size: gpui::size(px(width), px(height)),
-                    },
-                ) {
+                    clip_bounds,
+                };
+                if let Some(path) = paths.get_or_build((index, track), geometry) {
                     window.with_content_mask(Some(gpui::ContentMask { bounds }), |window| {
                         window.paint_path(path, wave_color)
                     });
@@ -4336,21 +4475,22 @@ mod tests {
         };
         let mut peaks = vec![-60.; 220];
         peaks[200..].fill(-30.);
+        let peaks = Arc::new(peaks);
+        let geometry = |scale| WaveformGeometry {
+            peaks: peaks.clone(),
+            range: (0., 2.),
+            target_samples: 400,
+            holds: Vec::new(),
+            source_start: 20.,
+            origin: gpui::point(px(0.), px(26.)),
+            size: gpui::size(px(200.), px(18.)),
+            scale,
+            clip_bounds: bounds,
+        };
         for volume in [0.25, 0.5, 1.0, 2.0] {
             for gain in [-15., 0.] {
                 let scale = gain_to_scale(gain) * volume;
-                let path = waveform_path(
-                    &peaks,
-                    (0., 2.),
-                    400,
-                    &[],
-                    20.,
-                    gpui::point(px(0.), px(26.)),
-                    gpui::size(px(200.), px(18.)),
-                    scale,
-                    bounds,
-                )
-                .unwrap();
+                let path = waveform_path(&geometry(scale)).unwrap();
                 let top = path
                     .vertices
                     .iter()
@@ -4364,20 +4504,7 @@ mod tests {
                 assert!((top - expected_top).abs() < 0.01, "{top} != {expected_top}");
             }
         }
-        assert!(
-            waveform_path(
-                &peaks,
-                (0., 2.),
-                400,
-                &[],
-                20.,
-                gpui::point(px(0.), px(26.)),
-                gpui::size(px(200.), px(18.)),
-                0.,
-                bounds,
-            )
-            .is_none()
-        );
+        assert!(waveform_path(&geometry(0.)).is_none());
     }
 
     #[test]
@@ -4425,6 +4552,219 @@ mod tests {
         assert!(waveform_peaks(&[], 1).is_empty());
     }
 
+    fn waveform_vertices(path: &gpui::Path<Pixels>) -> Vec<(f32, f32)> {
+        path.vertices
+            .iter()
+            .map(|vertex| {
+                (
+                    f32::from(vertex.xy_position.x),
+                    f32::from(vertex.xy_position.y),
+                )
+            })
+            .collect()
+    }
+
+    fn speech_like_peaks(len: usize, period: f32) -> Arc<Vec<f32>> {
+        Arc::new(
+            (0..len)
+                .map(|i| -40. + 30. * ((i as f32 / period).sin().abs()))
+                .collect(),
+        )
+    }
+
+    fn waveform_geometry(peaks: Arc<Vec<f32>>) -> WaveformGeometry {
+        WaveformGeometry {
+            peaks,
+            range: (0., 20.),
+            target_samples: 400,
+            holds: Vec::new(),
+            source_start: 5.,
+            origin: gpui::point(px(10.), px(26.)),
+            size: gpui::size(px(300.), px(18.)),
+            scale: 0.8,
+            clip_bounds: gpui::Bounds {
+                origin: gpui::point(px(10.), px(0.)),
+                size: gpui::size(px(300.), px(44.)),
+            },
+        }
+    }
+
+    #[test]
+    fn cached_waveform_matches_an_uncached_build_after_every_input_change() {
+        let paths = WaveformPaths::default();
+        let slot = (0, WaveformTrack::Mic);
+        let base = waveform_geometry(speech_like_peaks(300, 7.));
+        let first = paths.get_or_build(slot, base.clone()).unwrap();
+        let again = paths.get_or_build(slot, base.clone()).unwrap();
+        assert_eq!(waveform_vertices(&first), waveform_vertices(&again));
+        assert_eq!(paths.stats().builds, 1);
+        assert_eq!(paths.stats().hits, 1);
+
+        let same_contents_new_table = Arc::new((*base.peaks).clone());
+        let mutations: Vec<(&str, WaveformGeometry)> = vec![
+            (
+                "range",
+                WaveformGeometry {
+                    range: (2., 20.),
+                    ..base.clone()
+                },
+            ),
+            (
+                "samples",
+                WaveformGeometry {
+                    target_samples: 200,
+                    ..base.clone()
+                },
+            ),
+            (
+                "hold added",
+                WaveformGeometry {
+                    holds: vec![(4., 6.)],
+                    ..base.clone()
+                },
+            ),
+            (
+                "source start",
+                WaveformGeometry {
+                    source_start: 6.,
+                    ..base.clone()
+                },
+            ),
+            (
+                "origin",
+                WaveformGeometry {
+                    origin: gpui::point(px(12.), px(26.)),
+                    ..base.clone()
+                },
+            ),
+            (
+                "size",
+                WaveformGeometry {
+                    size: gpui::size(px(280.), px(18.)),
+                    ..base.clone()
+                },
+            ),
+            (
+                "scale",
+                WaveformGeometry {
+                    scale: 0.4,
+                    ..base.clone()
+                },
+            ),
+            (
+                "clip bounds",
+                WaveformGeometry {
+                    clip_bounds: gpui::Bounds {
+                        origin: gpui::point(px(10.), px(0.)),
+                        size: gpui::size(px(40.), px(44.)),
+                    },
+                    ..base.clone()
+                },
+            ),
+            (
+                "new table, new contents",
+                WaveformGeometry {
+                    peaks: speech_like_peaks(300, 3.),
+                    ..base.clone()
+                },
+            ),
+        ];
+        for (label, mutated) in mutations {
+            let paths = WaveformPaths::default();
+            paths.get_or_build(slot, base.clone()).unwrap();
+            let cached = paths.get_or_build(slot, mutated.clone()).unwrap();
+            let uncached = waveform_path(&mutated).unwrap();
+            assert_eq!(
+                waveform_vertices(&cached),
+                waveform_vertices(&uncached),
+                "{label}"
+            );
+            assert_eq!(paths.stats().builds, 2, "{label} must rebuild");
+            assert_ne!(
+                waveform_vertices(&cached),
+                waveform_vertices(&first),
+                "{label} must change the mesh"
+            );
+        }
+
+        let paths = WaveformPaths::default();
+        paths.get_or_build(slot, base.clone()).unwrap();
+        let rebuilt = paths
+            .get_or_build(
+                slot,
+                WaveformGeometry {
+                    peaks: same_contents_new_table,
+                    ..base
+                },
+            )
+            .unwrap();
+        assert_eq!(waveform_vertices(&rebuilt), waveform_vertices(&first));
+        assert_eq!(paths.stats().builds, 2);
+    }
+
+    #[test]
+    fn split_segments_from_one_recording_clip_keep_their_own_paths() {
+        let paths = WaveformPaths::default();
+        let peaks = speech_like_peaks(300, 7.);
+        let first_half = WaveformGeometry {
+            range: (0., 10.),
+            ..waveform_geometry(peaks.clone())
+        };
+        let second_half = WaveformGeometry {
+            source_start: 15.,
+            origin: gpui::point(px(320.), px(26.)),
+            ..waveform_geometry(peaks)
+        };
+        for _ in 0..4 {
+            let a = paths
+                .get_or_build((0, WaveformTrack::Mic), first_half.clone())
+                .unwrap();
+            let b = paths
+                .get_or_build((1, WaveformTrack::Mic), second_half.clone())
+                .unwrap();
+            assert_eq!(
+                waveform_vertices(&a),
+                waveform_vertices(&waveform_path(&first_half).unwrap())
+            );
+            assert_eq!(
+                waveform_vertices(&b),
+                waveform_vertices(&waveform_path(&second_half).unwrap())
+            );
+        }
+        assert_eq!(paths.stats().builds, 2);
+        assert_eq!(paths.stats().hits, 6);
+    }
+
+    #[test]
+    fn waveform_cache_keeps_only_paths_painted_last_frame() {
+        let paths = WaveformPaths::default();
+        let geometry = waveform_geometry(speech_like_peaks(300, 7.));
+        for index in 0..4 {
+            paths
+                .get_or_build((index, WaveformTrack::Mic), geometry.clone())
+                .unwrap();
+            paths
+                .get_or_build((index, WaveformTrack::System), geometry.clone())
+                .unwrap();
+        }
+        paths.sweep();
+        paths
+            .get_or_build((1, WaveformTrack::Mic), geometry.clone())
+            .unwrap();
+        paths.sweep();
+        let stats = paths.stats();
+        assert_eq!((stats.builds, stats.hits), (8, 1));
+
+        paths
+            .get_or_build((1, WaveformTrack::Mic), geometry.clone())
+            .unwrap();
+        paths
+            .get_or_build((0, WaveformTrack::Mic), geometry)
+            .unwrap();
+        let stats = paths.stats();
+        assert_eq!((stats.builds, stats.hits), (9, 2));
+    }
+
     #[test]
     fn waveform_mesh_stays_inside_real_clip_corners() {
         for width in [4., 16., 100., 10_000.] {
@@ -4436,17 +4776,17 @@ mod tests {
                 for gain in [0.1, 0.5, 1., 2.] {
                     let x = start / 10. * width as f64;
                     let span = (end - start) / 10. * width as f64;
-                    let path = waveform_path(
-                        &[-6.; 200],
-                        (start, end),
-                        200,
-                        &[],
-                        0.,
-                        gpui::point(px(50. + x as f32), px(56.)),
-                        gpui::size(px(span as f32), px(18.)),
-                        gain,
-                        bounds,
-                    )
+                    let path = waveform_path(&WaveformGeometry {
+                        peaks: Arc::new(vec![-6.; 200]),
+                        range: (start, end),
+                        target_samples: 200,
+                        holds: Vec::new(),
+                        source_start: 0.,
+                        origin: gpui::point(px(50. + x as f32), px(56.)),
+                        size: gpui::size(px(span as f32), px(18.)),
+                        scale: gain,
+                        clip_bounds: bounds,
+                    })
                     .unwrap();
                     assert!(!path.vertices.is_empty());
                     for vertex in &path.vertices {
diff --git a/apps/desktop-gpui/src/editor_window.rs b/apps/desktop-gpui/src/editor_window.rs
index 7484cb3ce60..211f8c857e9 100644
--- a/apps/desktop-gpui/src/editor_window.rs
+++ b/apps/desktop-gpui/src/editor_window.rs
@@ -2288,6 +2288,7 @@ impl EditorWindow {
         dismiss_indexed_sidebar_menu(&mut self.sidebar.menu);
         let mic = std::mem::take(&mut self.timeline.mic_waveforms);
         let system = std::mem::take(&mut self.timeline.system_waveforms);
+        let waveform_paths = self.timeline.waveform_paths.clone();
         self.timeline = TimelineModel::build_with_lanes(
             &self.project,
             self.has_camera,
@@ -2296,6 +2297,7 @@ impl EditorWindow {
         );
         self.timeline.mic_waveforms = mic;
         self.timeline.system_waveforms = system;
+        self.timeline.waveform_paths = waveform_paths;
         if self.timeline.total_duration > 0.0 {
             self.total = self.timeline.total_duration;
         }
@@ -3306,6 +3308,10 @@ impl EditorWindow {
         )
     }
 
+    pub(crate) fn waveform_cache_stats(&self) -> crate::editor_timeline::WaveformPathStats {
+        self.timeline.waveform_paths.stats()
+    }
+
     pub(crate) fn bench_zoom_to(&mut self, seconds: f64, cx: &mut Context<Self>) {
         let total = self.total_duration();
         self.view
@@ -10189,6 +10195,7 @@ impl EditorWindow {
         cx: &mut Context<Self>,
     ) -> impl IntoElement {
         let theme = self.theme;
+        self.timeline.waveform_paths.sweep();
         if !self.project_ready() {
             if self
                 .preparing_presentation

From 6810d187a527810b01bcab6b86fca30f538a188b Mon Sep 17 00:00:00 2001
From: Aviral Shukla <aviral.shukla2122000@gmail.com>
Date: Tue, 13 Oct 2026 20:43:52 +0530
Subject: [PATCH 10/74] feat(mask): implement blur scissor logic and optimise
 rendering pipeline

---
 crates/rendering/src/layers/mask.rs | 107 +++++++++++++++++++++++++++-
 1 file changed, 106 insertions(+), 1 deletion(-)

diff --git a/crates/rendering/src/layers/mask.rs b/crates/rendering/src/layers/mask.rs
index 2e36046ca4b..872d8a32bec 100644
--- a/crates/rendering/src/layers/mask.rs
+++ b/crates/rendering/src/layers/mask.rs
@@ -137,7 +137,7 @@ impl MaskLayer {
 
         pass.set_pipeline(config.render_pipeline);
         pass.set_bind_group(0, &bind_group, &[]);
-        pass.draw(0..3, 0..1);
+        config.uniforms.draw(&mut pass);
 
         drop(pass);
     }
@@ -165,6 +165,50 @@ impl Default for MaskUniforms {
 }
 
 impl MaskUniforms {
+    fn draw(&self, pass: &mut wgpu::RenderPass<'_>) {
+        if let Some(rect @ [left, top, width, height]) = self.blur_scissor() {
+            if width == 0 || height == 0 {
+                return;
+            }
+            if rect != [0, 0, self.output_size[0] as u32, self.output_size[1] as u32] {
+                pass.set_scissor_rect(left, top, width, height);
+            }
+        }
+        pass.draw(0..3, 0..1);
+    }
+
+    fn blur_scissor(&self) -> Option<[u32; 4]> {
+        let padding = match self.mode {
+            BLUR_HORIZONTAL_MODE => [2.0, self.effect_size.max(1.0) + 2.0],
+            BLUR_VERTICAL_MODE => [1.0, 1.0],
+            _ => return None,
+        };
+        if !self
+            .rect_center
+            .iter()
+            .chain(&self.rect_size)
+            .chain(&self.output_size)
+            .chain(std::iter::once(&self.effect_size))
+            .all(|value| value.is_finite())
+            || self.output_size.iter().any(|size| *size <= 0.0)
+        {
+            return None;
+        }
+
+        let bounds = std::array::from_fn::<_, 2, _>(|axis| {
+            let center = self.rect_center[axis] * self.output_size[axis];
+            let half_size = self.rect_size[axis] * self.output_size[axis] * 0.5;
+            let start = (center - half_size - padding[axis])
+                .floor()
+                .clamp(0.0, self.output_size[axis]) as u32;
+            let end = (center + half_size + padding[axis])
+                .ceil()
+                .clamp(0.0, self.output_size[axis]) as u32;
+            (start, end.saturating_sub(start))
+        });
+        Some([bounds[0].0, bounds[1].0, bounds[0].1, bounds[1].1])
+    }
+
     fn from_mask(mask: &PreparedMask, mode: u32) -> Self {
         Self {
             rect_center: [mask.center.x, mask.center.y],
@@ -324,3 +368,64 @@ impl MaskPipeline {
         })
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn uniforms(center: [f32; 2], size: [f32; 2], effect_size: f32, mode: u32) -> MaskUniforms {
+        MaskUniforms {
+            rect_center: center,
+            rect_size: size,
+            effect_size,
+            mode,
+            output_size: [1920.0, 1080.0],
+            ..Default::default()
+        }
+    }
+
+    #[test]
+    fn blur_scissor_bounds() {
+        let cases = [
+            ([0.5, 0.5], [0.1, 0.1], 12.0, [862, 472, 196, 136]),
+            ([0.5, 0.5], [0.5, 0.5], 24.0, [478, 244, 964, 592]),
+            ([0.5, 0.5], [1.0, 1.0], 12.0, [0, 0, 1920, 1080]),
+            ([0.02, 0.04], [0.1, 0.12], 8.0, [0, 0, 137, 118]),
+            ([-0.2, 0.5], [0.1, 0.1], 12.0, [0, 472, 0, 136]),
+            (
+                [0.3333, 0.6667],
+                [0.1234, 0.2345],
+                7.25,
+                [519, 584, 242, 272],
+            ),
+            ([0.5, 0.5], [0.1, 0.1], 0.25, [862, 483, 196, 114]),
+        ];
+
+        for (center, size, radius, expected) in cases {
+            assert_eq!(
+                uniforms(center, size, radius, BLUR_HORIZONTAL_MODE).blur_scissor(),
+                Some(expected)
+            );
+        }
+        assert_eq!(
+            uniforms([0.5, 0.5], [0.1, 0.1], 12.0, BLUR_VERTICAL_MODE).blur_scissor(),
+            Some([863, 485, 194, 110])
+        );
+    }
+
+    #[test]
+    fn blur_scissor_fallback() {
+        assert_eq!(
+            uniforms([0.5, 0.5], [0.1, 0.1], 12.0, PIXELATE_MODE).blur_scissor(),
+            None
+        );
+        assert_eq!(
+            uniforms([f32::NAN, 0.5], [0.1, 0.1], 12.0, BLUR_HORIZONTAL_MODE).blur_scissor(),
+            None
+        );
+
+        let mut zero_output = uniforms([0.5, 0.5], [0.1, 0.1], 12.0, BLUR_HORIZONTAL_MODE);
+        zero_output.output_size[0] = 0.0;
+        assert_eq!(zero_output.blur_scissor(), None);
+    }
+}

From 6a23daf53e3d8ee674993c4ebfcbc324bd3b18a7 Mon Sep 17 00:00:00 2001
From: Aviral Shukla <aviral.shukla2122000@gmail.com>
Date: Tue, 13 Oct 2026 21:00:38 +0530
Subject: [PATCH 11/74] test(mask): add blur scissor pixel tests and utility
 function

---
 crates/rendering/src/layers/mask.rs | 152 ++++++++++++++++++++++++++++
 1 file changed, 152 insertions(+)

diff --git a/crates/rendering/src/layers/mask.rs b/crates/rendering/src/layers/mask.rs
index 872d8a32bec..2d3a9dda7cb 100644
--- a/crates/rendering/src/layers/mask.rs
+++ b/crates/rendering/src/layers/mask.rs
@@ -428,4 +428,156 @@ mod tests {
         zero_output.output_size[0] = 0.0;
         assert_eq!(zero_output.blur_scissor(), None);
     }
+
+    #[test]
+    #[ignore = "requires a real WGPU adapter"]
+    fn blur_scissor_pixels() {
+        let adapter =
+            pollster::block_on(wgpu::Instance::default().request_adapter(&Default::default()))
+                .expect("GPU mask tests require a WGPU adapter");
+        assert_ne!(adapter.get_info().backend, wgpu::Backend::Noop);
+        let (device, queue) = pollster::block_on(adapter.request_device(&Default::default()))
+            .expect("request mask test device");
+        let layer = MaskLayer::new(&device);
+        let mask = |center, size| MaskUniforms {
+            feather: 0.01,
+            opacity: 1.0,
+            output_size: [128.0, 96.0],
+            ..uniforms(center, size, 12.0, BLUR_HORIZONTAL_MODE)
+        };
+        let cases = [
+            (
+                "fractional",
+                &[mask([0.3333, 0.6667], [0.1234, 0.2345])][..],
+            ),
+            ("edge-clipped", &[mask([0.02, 0.99], [0.13, 0.12])][..]),
+            (
+                "overlapping",
+                &[
+                    mask([0.47, 0.5], [0.28, 0.3]),
+                    mask([0.57, 0.55], [0.26, 0.24]),
+                ],
+            ),
+        ];
+        for (name, masks) in cases {
+            let expected = blur_pixels(&device, &queue, &layer, masks, false);
+            let actual = blur_pixels(&device, &queue, &layer, masks, true);
+            assert_eq!(actual, expected, "{name} pixels differ");
+        }
+    }
+
+    fn blur_pixels(
+        device: &wgpu::Device,
+        queue: &wgpu::Queue,
+        layer: &MaskLayer,
+        masks: &[MaskUniforms],
+        scissored: bool,
+    ) -> Vec<u8> {
+        let size = wgpu::Extent3d {
+            width: 128,
+            height: 96,
+            depth_or_array_layers: 1,
+        };
+        let texture = || {
+            device.create_texture(&wgpu::TextureDescriptor {
+                label: None,
+                size,
+                mip_level_count: 1,
+                sample_count: 1,
+                dimension: wgpu::TextureDimension::D2,
+                format: wgpu::TextureFormat::Rgba8Unorm,
+                usage: wgpu::TextureUsages::TEXTURE_BINDING
+                    | wgpu::TextureUsages::RENDER_ATTACHMENT
+                    | wgpu::TextureUsages::COPY_SRC
+                    | wgpu::TextureUsages::COPY_DST,
+                view_formats: &[],
+            })
+        };
+        let source = texture();
+        let scratch = texture();
+        let source_view = source.create_view(&Default::default());
+        let scratch_view = scratch.create_view(&Default::default());
+        let pixels = (0..size.width * size.height * 4)
+            .map(|index| (index * 37 % 251) as u8)
+            .collect::<Vec<_>>();
+        let layout = wgpu::TexelCopyBufferLayout {
+            offset: 0,
+            bytes_per_row: Some(size.width * 4),
+            rows_per_image: Some(size.height),
+        };
+        queue.write_texture(source.as_image_copy(), &pixels, layout, size);
+        let mut encoder = device.create_command_encoder(&Default::default());
+        for mask in masks {
+            for (source, target, pipeline, load, mode) in [
+                (
+                    &source_view,
+                    &scratch_view,
+                    &layer.pipeline.render_pipeline,
+                    wgpu::LoadOp::Clear(wgpu::Color::TRANSPARENT),
+                    BLUR_HORIZONTAL_MODE,
+                ),
+                (
+                    &scratch_view,
+                    &source_view,
+                    &layer.pipeline.blur_composite_pipeline,
+                    wgpu::LoadOp::Load,
+                    BLUR_VERTICAL_MODE,
+                ),
+            ] {
+                let uniforms = MaskUniforms { mode, ..*mask };
+                let uniform_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
+                    label: None,
+                    contents: bytemuck::bytes_of(&uniforms),
+                    usage: wgpu::BufferUsages::UNIFORM,
+                });
+                let bind_group =
+                    layer
+                        .pipeline
+                        .bind_group(device, &uniform_buffer, source, &layer.sampler);
+                let mut pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
+                    color_attachments: &[Some(wgpu::RenderPassColorAttachment {
+                        view: target,
+                        resolve_target: None,
+                        ops: wgpu::Operations {
+                            load,
+                            store: wgpu::StoreOp::Store,
+                        },
+                    })],
+                    ..Default::default()
+                });
+                pass.set_pipeline(pipeline);
+                pass.set_bind_group(0, &bind_group, &[]);
+                if scissored {
+                    uniforms.draw(&mut pass);
+                } else {
+                    pass.draw(0..3, 0..1);
+                }
+            }
+        }
+        let readback = device.create_buffer(&wgpu::BufferDescriptor {
+            label: None,
+            size: pixels.len() as u64,
+            usage: wgpu::BufferUsages::COPY_DST | wgpu::BufferUsages::MAP_READ,
+            mapped_at_creation: false,
+        });
+        encoder.copy_texture_to_buffer(
+            source.as_image_copy(),
+            wgpu::TexelCopyBufferInfo {
+                buffer: &readback,
+                layout,
+            },
+            size,
+        );
+        queue.submit([encoder.finish()]);
+        readback.slice(..).map_async(wgpu::MapMode::Read, |result| {
+            result.expect("map mask test pixels")
+        });
+        device
+            .poll(wgpu::PollType::Wait)
+            .expect("poll mask test device");
+        let result = readback.slice(..).get_mapped_range().to_vec();
+        readback.unmap();
+        assert!(result != pixels, "test mask must change pixels");
+        result
+    }
 }

From 7e14896825a0e60f0f5917168651779191521466 Mon Sep 17 00:00:00 2001
From: Aviral Shukla <aviral.shukla2122000@gmail.com>
Date: Tue, 13 Oct 2026 21:20:42 +0530
Subject: [PATCH 12/74] Add initial implementation for mask scissor
 benchmarking

---
 scripts/bench-mask-scissor/Cargo.toml |  12 ++
 scripts/bench-mask-scissor/src/lib.rs | 242 ++++++++++++++++++++++++++
 2 files changed, 254 insertions(+)
 create mode 100644 scripts/bench-mask-scissor/Cargo.toml
 create mode 100644 scripts/bench-mask-scissor/src/lib.rs

diff --git a/scripts/bench-mask-scissor/Cargo.toml b/scripts/bench-mask-scissor/Cargo.toml
new file mode 100644
index 00000000000..e0d3283ccd9
--- /dev/null
+++ b/scripts/bench-mask-scissor/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "bench-mask-scissor"
+version = "0.1.0"
+edition = "2024"
+publish = false
+
+[workspace]
+
+[dependencies]
+bytemuck = { version = "1.7", features = ["derive"] }
+pollster = "0.4.0"
+wgpu = { version = "25.0.0", features = ["wgpu-core"] }
\ No newline at end of file
diff --git a/scripts/bench-mask-scissor/src/lib.rs b/scripts/bench-mask-scissor/src/lib.rs
new file mode 100644
index 00000000000..4ea578e5621
--- /dev/null
+++ b/scripts/bench-mask-scissor/src/lib.rs
@@ -0,0 +1,242 @@
+pub enum MaskRenderMode {
+    Blur,
+    Pixelate,
+    Highlight,
+}
+
+pub struct XY<T> {
+    pub x: T,
+    pub y: T,
+}
+
+pub struct PreparedMask {
+    pub mode: MaskRenderMode,
+    pub center: XY<f32>,
+    pub size: XY<f32>,
+    pub feather: f32,
+    pub opacity: f32,
+    pub effect_size: f32,
+    pub darkness: f32,
+    pub output_size: XY<u32>,
+}
+
+pub struct RenderSession {
+    views: [wgpu::TextureView; 2],
+    current: usize,
+}
+
+impl RenderSession {
+    fn current_texture_view(&self) -> &wgpu::TextureView {
+        &self.views[self.current]
+    }
+
+    fn other_texture_view(&self) -> &wgpu::TextureView {
+        &self.views[1 - self.current]
+    }
+
+    fn swap_textures(&mut self) {
+        self.current = 1 - self.current;
+    }
+}
+
+pub mod mask {
+    include!(concat!(
+        env!("CARGO_MANIFEST_DIR"),
+        "/../../crates/rendering/src/layers/mask.rs"
+    ));
+
+    #[cfg(test)]
+    mod benchmark {
+        use super::*;
+
+        const WIDTH: u32 = 3840;
+        const HEIGHT: u32 = 2160;
+        const BATCH: u32 = 8;
+        const SAMPLES: usize = 21;
+
+        struct BlurPass {
+            uniforms: MaskUniforms,
+            bind_group: wgpu::BindGroup,
+        }
+
+        fn measure(
+            device: &wgpu::Device,
+            queue: &wgpu::Queue,
+            layer: &MaskLayer,
+            views: &[wgpu::TextureView; 2],
+            passes: &[[BlurPass; 2]],
+            scissored: bool,
+        ) -> f64 {
+            let mut encoder = device.create_command_encoder(&Default::default());
+            for _ in 0..BATCH {
+                for mask in passes {
+                    for (axis, config) in mask.iter().enumerate() {
+                        let mut pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
+                            color_attachments: &[Some(wgpu::RenderPassColorAttachment {
+                                view: &views[1 - axis],
+                                resolve_target: None,
+                                ops: wgpu::Operations {
+                                    load: if axis == 0 {
+                                        wgpu::LoadOp::Clear(wgpu::Color::TRANSPARENT)
+                                    } else {
+                                        wgpu::LoadOp::Load
+                                    },
+                                    store: wgpu::StoreOp::Store,
+                                },
+                            })],
+                            ..Default::default()
+                        });
+                        pass.set_pipeline(if axis == 0 {
+                            &layer.pipeline.render_pipeline
+                        } else {
+                            &layer.pipeline.blur_composite_pipeline
+                        });
+                        pass.set_bind_group(0, &config.bind_group, &[]);
+                        if scissored {
+                            config.uniforms.draw(&mut pass);
+                        } else {
+                            pass.draw(0..3, 0..1);
+                        }
+                    }
+                }
+            }
+            let commands = encoder.finish();
+            let started = std::time::Instant::now();
+            queue.submit([commands]);
+            device
+                .poll(wgpu::PollType::Wait)
+                .expect("poll benchmark GPU");
+            started.elapsed().as_secs_f64() * 1_000.0 / f64::from(BATCH)
+        }
+
+        #[test]
+        #[ignore = "requires a real GPU"]
+        fn blur_scissor_benchmark() {
+            let adapter =
+                pollster::block_on(wgpu::Instance::default().request_adapter(&Default::default()))
+                    .expect("request benchmark GPU adapter");
+            let info = adapter.get_info();
+            assert_ne!(info.backend, wgpu::Backend::Noop);
+            let (device, queue) = pollster::block_on(adapter.request_device(&Default::default()))
+                .expect("request benchmark GPU device");
+            let layer = MaskLayer::new(&device);
+            let size = wgpu::Extent3d {
+                width: WIDTH,
+                height: HEIGHT,
+                depth_or_array_layers: 1,
+            };
+            let textures: [_; 2] = std::array::from_fn(|_| {
+                device.create_texture(&wgpu::TextureDescriptor {
+                    label: None,
+                    size,
+                    mip_level_count: 1,
+                    sample_count: 1,
+                    dimension: wgpu::TextureDimension::D2,
+                    format: wgpu::TextureFormat::Rgba8Unorm,
+                    usage: wgpu::TextureUsages::TEXTURE_BINDING
+                        | wgpu::TextureUsages::RENDER_ATTACHMENT
+                        | wgpu::TextureUsages::COPY_DST,
+                    view_formats: &[],
+                })
+            });
+            let views = textures
+                .each_ref()
+                .map(|texture| texture.create_view(&Default::default()));
+            let pixels = (0..WIDTH * HEIGHT * 4)
+                .map(|index| (index * 37 % 251) as u8)
+                .collect::<Vec<_>>();
+            queue.write_texture(
+                textures[0].as_image_copy(),
+                &pixels,
+                wgpu::TexelCopyBufferLayout {
+                    offset: 0,
+                    bytes_per_row: Some(WIDTH * 4),
+                    rows_per_image: Some(HEIGHT),
+                },
+                size,
+            );
+            let mask = |center, size| MaskUniforms {
+                rect_center: center,
+                rect_size: size,
+                feather: 0.01,
+                opacity: 1.0,
+                effect_size: 12.0,
+                output_size: [WIDTH as f32, HEIGHT as f32],
+                ..Default::default()
+            };
+            let cases = [
+                ("Small", vec![mask([0.5, 0.5], [0.1, 0.1])]),
+                ("Medium", vec![mask([0.5, 0.5], [0.5, 0.5])]),
+                (
+                    "Overlapping",
+                    vec![
+                        mask([0.47, 0.5], [0.28, 0.3]),
+                        mask([0.57, 0.55], [0.26, 0.24]),
+                    ],
+                ),
+                ("Edge-clipped", vec![mask([0.02, 0.04], [0.1, 0.12])]),
+                ("Fullscreen", vec![mask([0.5, 0.5], [1.0, 1.0])]),
+            ];
+            println!(
+                "Adapter: {}, {:?}, {:?}; {}x{}; {SAMPLES} samples; batch {BATCH}; radius 12",
+                info.name, info.backend, info.device_type, WIDTH, HEIGHT
+            );
+            println!(
+                "Submission-to-GPU-completion time per mask sequence; not GPU-only timestamps."
+            );
+            println!("| Mask | Fullscreen ms | Scissored ms | Speedup |");
+            println!("| --- | ---: | ---: | ---: |");
+            for (name, masks) in cases {
+                let passes = masks
+                    .iter()
+                    .map(|mask| {
+                        std::array::from_fn(|axis| {
+                            let uniforms = MaskUniforms {
+                                mode: if axis == 0 {
+                                    BLUR_HORIZONTAL_MODE
+                                } else {
+                                    BLUR_VERTICAL_MODE
+                                },
+                                ..*mask
+                            };
+                            let buffer =
+                                device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
+                                    label: None,
+                                    contents: bytemuck::bytes_of(&uniforms),
+                                    usage: wgpu::BufferUsages::UNIFORM,
+                                });
+                            BlurPass {
+                                uniforms,
+                                bind_group: layer.pipeline.bind_group(
+                                    &device,
+                                    &buffer,
+                                    &views[axis],
+                                    &layer.sampler,
+                                ),
+                            }
+                        })
+                    })
+                    .collect::<Vec<_>>();
+                let run = |scissored| measure(&device, &queue, &layer, &views, &passes, scissored);
+                for _ in 0..3 {
+                    run(false);
+                    run(true);
+                }
+                let mut samples = [Vec::new(), Vec::new()];
+                for sample in 0..SAMPLES {
+                    for variant in [sample % 2, 1 - sample % 2] {
+                        samples[variant].push(run(variant == 1));
+                    }
+                }
+                let [fullscreen, scissored] = samples.map(|mut times| {
+                    times.sort_by(f64::total_cmp);
+                    times[SAMPLES / 2]
+                });
+                println!(
+                    "| {name} | {fullscreen:.2} | {scissored:.2} | {:.2}x |",
+                    fullscreen / scissored
+                );
+            }
+        }
+    }
+}

From d11c05f8957ed1659481cc6f3b61bc797e0b03b2 Mon Sep 17 00:00:00 2001
From: Wleeaf <ts.solidarity@gmail.com>
Date: Tue, 13 Oct 2026 22:51:06 +0300
Subject: [PATCH 13/74] perf(recording): blend the Linux Instant camera into
 the screen frame in place

The Linux Instant camera compositor converted every screen frame to RGBA and back, and rebuilt the camera overlay and its mask, just to blend a small camera rectangle. Blend directly into packed RGB screen frames, rebuild the overlay only when a new camera frame arrives, and compute the mask once. The old conversion path remains the fallback for other formats.
---
 .../src/instant_recording/linux_camera.rs     | 447 ++++++++++++++++--
 1 file changed, 401 insertions(+), 46 deletions(-)

diff --git a/crates/recording/src/instant_recording/linux_camera.rs b/crates/recording/src/instant_recording/linux_camera.rs
index 585e5971800..e87fc756e39 100644
--- a/crates/recording/src/instant_recording/linux_camera.rs
+++ b/crates/recording/src/instant_recording/linux_camera.rs
@@ -518,7 +518,7 @@ async fn prepare_camera_frames(
 ) -> anyhow::Result<(PreparedCameraFrames, cap_timestamp::Timestamps)> {
     presentation.validate(info.width, info.height)?;
     let first = receiver.first(&CancellationToken::new()).await?;
-    Compositor::new(info, presentation).camera_overlay(&first.inner)?;
+    Compositor::new(info, presentation).camera_overlay(&first.inner, 0)?;
     // Separate Instant audio is epoch-anchored; camera readiness must not become head silence.
     let timestamps = cap_timestamp::Timestamps::now();
     Ok((
@@ -705,6 +705,7 @@ fn compositor_thread(
     let result = futures::executor::block_on(async {
         let mut screen_rx = screen_rx.fuse();
         let mut latest_camera = first_camera;
+        let mut camera_generation = 0u64;
         let mut freshness_anchor = camera_freshness_anchor(&latest_camera, Instant::now());
         loop {
             enum Event {
@@ -732,17 +733,19 @@ fn compositor_thread(
                 Event::Stale => anyhow::bail!("Required camera stopped delivering fresh frames"),
                 Event::Camera(frame) => {
                     latest_camera = frame?;
+                    camera_generation += 1;
                     validate_camera_frame(&latest_camera, Instant::now())?;
                     freshness_anchor = camera_freshness_anchor(&latest_camera, Instant::now());
                 }
                 Event::Screen(Some(screen)) => {
                     if let Some(frame) = camera_rx.latest()? {
                         latest_camera = frame;
+                        camera_generation += 1;
                         freshness_anchor = camera_freshness_anchor(&latest_camera, Instant::now());
                     }
                     validate_camera_frame(&latest_camera, Instant::now())?;
                     let output = compositor
-                        .compose(&screen, &latest_camera)
+                        .compose(screen, &latest_camera, camera_generation)
                         .context("Required camera composition failed")?;
                     if stop_token.is_cancelled() {
                         break;
@@ -791,6 +794,8 @@ struct Compositor {
     screen_to_rgba: Option<RgbaConverter>,
     camera_to_rgba: Option<RgbaConverter>,
     rgba_to_screen: Option<RgbaConverter>,
+    camera_overlay: Option<(u64, ffmpeg::frame::Video)>,
+    camera_mask: Option<Vec<f64>>,
 }
 
 impl Compositor {
@@ -801,24 +806,62 @@ impl Compositor {
             screen_to_rgba: None,
             camera_to_rgba: None,
             rgba_to_screen: None,
+            camera_overlay: None,
+            camera_mask: None,
         }
     }
 
     fn compose(
+        &mut self,
+        mut screen: FFmpegVideoFrame,
+        camera: &FFmpegVideoFrame,
+        camera_generation: u64,
+    ) -> anyhow::Result<FFmpegVideoFrame> {
+        let Some(layout) = self.in_place_layout(&mut screen.inner) else {
+            return self.compose_converted(&screen, camera, camera_generation);
+        };
+        self.presentation
+            .validate(self.info.width, self.info.height)?;
+        let rect = self.presentation.rect;
+        let camera_overlay = self.camera_overlay(&camera.inner, camera_generation)?;
+        blend_rgba_into_packed(
+            &mut screen.inner,
+            layout,
+            camera_overlay,
+            rect.x as usize,
+            rect.y as usize,
+        )?;
+        Ok(screen)
+    }
+
+    fn in_place_layout(&self, screen: &mut ffmpeg::frame::Video) -> Option<PackedRgbLayout> {
+        if screen.format() != self.info.pixel_format
+            || screen.width() != self.info.width
+            || screen.height() != self.info.height
+        {
+            return None;
+        }
+        let layout = PackedRgbLayout::of(screen.format())?;
+        let writable = unsafe { ffmpeg::sys::av_frame_make_writable(screen.as_mut_ptr()) };
+        (writable >= 0).then_some(layout)
+    }
+
+    fn compose_converted(
         &mut self,
         screen: &FFmpegVideoFrame,
         camera: &FFmpegVideoFrame,
+        camera_generation: u64,
     ) -> anyhow::Result<FFmpegVideoFrame> {
-        let screen_rgba = self.convert_screen(&screen.inner)?;
+        let mut composed = self.convert_screen(&screen.inner)?;
         self.presentation
             .validate(self.info.width, self.info.height)?;
-        let camera_overlay = self.camera_overlay(&camera.inner)?;
-        let mut composed = screen_rgba;
+        let rect = self.presentation.rect;
+        let camera_overlay = self.camera_overlay(&camera.inner, camera_generation)?;
         blend_rgba(
             &mut composed,
-            &camera_overlay,
-            self.presentation.rect.x as usize,
-            self.presentation.rect.y as usize,
+            camera_overlay,
+            rect.x as usize,
+            rect.y as usize,
         )?;
         let mut output = self.convert_to_screen(&composed)?;
         output.set_pts(screen.inner.pts());
@@ -832,10 +875,28 @@ impl Compositor {
     fn camera_overlay(
         &mut self,
         input: &ffmpeg::frame::Video,
-    ) -> anyhow::Result<ffmpeg::frame::Video> {
-        let rect = self.presentation.rect;
-        let rgba = self.convert_camera(input, rect.width, rect.height)?;
-        crop_camera(&rgba, self.presentation)
+        camera_generation: u64,
+    ) -> anyhow::Result<&ffmpeg::frame::Video> {
+        let cached = self
+            .camera_overlay
+            .as_ref()
+            .is_some_and(|(generation, _)| *generation == camera_generation);
+        if !cached {
+            self.camera_overlay = None;
+            let rect = self.presentation.rect;
+            let rgba = self.convert_camera(input, rect.width, rect.height)?;
+            let presentation = self.presentation;
+            let mask = self
+                .camera_mask
+                .get_or_insert_with(|| camera_mask(presentation));
+            let overlay = crop_camera(&rgba, presentation, mask)?;
+            self.camera_overlay = Some((camera_generation, overlay));
+        }
+        Ok(&self
+            .camera_overlay
+            .as_ref()
+            .expect("camera overlay prepared")
+            .1)
     }
 
     fn convert_screen(
@@ -1021,9 +1082,29 @@ fn aspect_fill_dimensions(
     }
 }
 
+fn camera_mask(presentation: LinuxCameraPresentation) -> Vec<f64> {
+    let rect = presentation.rect;
+    let radius = presentation.radius();
+    if radius <= 0.0 {
+        return Vec::new();
+    }
+    let mut mask = Vec::with_capacity(rect.width as usize * rect.height as usize);
+    for y in 0..rect.height as usize {
+        for x in 0..rect.width as usize {
+            let px = x as f64 + 0.5;
+            let py = y as f64 + 0.5;
+            let dx = px - px.clamp(radius, f64::from(rect.width) - radius);
+            let dy = py - py.clamp(radius, f64::from(rect.height) - radius);
+            mask.push((radius + 0.5 - dx.hypot(dy)).clamp(0.0, 1.0));
+        }
+    }
+    mask
+}
+
 fn crop_camera(
     source: &ffmpeg::frame::Video,
     presentation: LinuxCameraPresentation,
+    mask: &[f64],
 ) -> anyhow::Result<ffmpeg::frame::Video> {
     let rect = presentation.rect;
     if source.format() != Pixel::RGBA
@@ -1041,7 +1122,6 @@ fn crop_camera(
     let output_stride = output.stride(0);
     let source_data = source.data(0);
     let output_data = output.data_mut(0);
-    let radius = presentation.radius();
     for y in 0..rect.height as usize {
         for x in 0..rect.width as usize {
             let source_x = crop_x
@@ -1059,12 +1139,7 @@ fn crop_camera(
                 .get_mut(output_offset..output_offset + 4)
                 .context("RGBA camera output layout is smaller than dimensions")?;
             destination.copy_from_slice(source_pixel);
-            if radius > 0.0 {
-                let px = x as f64 + 0.5;
-                let py = y as f64 + 0.5;
-                let dx = px - px.clamp(radius, f64::from(rect.width) - radius);
-                let dy = py - py.clamp(radius, f64::from(rect.height) - radius);
-                let coverage = (radius + 0.5 - dx.hypot(dy)).clamp(0.0, 1.0);
+            if let Some(&coverage) = mask.get(y * rect.width as usize + x) {
                 destination[3] = (f64::from(destination[3]) * coverage).round() as u8;
             }
         }
@@ -1117,6 +1192,93 @@ fn blend_rgba(
     Ok(())
 }
 
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+struct PackedRgbLayout {
+    bytes_per_pixel: usize,
+    red: usize,
+    green: usize,
+    blue: usize,
+    opaque: Option<usize>,
+}
+
+impl PackedRgbLayout {
+    fn of(format: Pixel) -> Option<Self> {
+        let four = |red, green, blue, opaque| Self {
+            bytes_per_pixel: 4,
+            red,
+            green,
+            blue,
+            opaque: Some(opaque),
+        };
+        let three = |red, green, blue| Self {
+            bytes_per_pixel: 3,
+            red,
+            green,
+            blue,
+            opaque: None,
+        };
+        match format {
+            Pixel::RGBA | Pixel::RGBZ => Some(four(0, 1, 2, 3)),
+            Pixel::BGRA | Pixel::BGRZ => Some(four(2, 1, 0, 3)),
+            Pixel::ARGB | Pixel::ZRGB => Some(four(1, 2, 3, 0)),
+            Pixel::ABGR | Pixel::ZBGR => Some(four(3, 2, 1, 0)),
+            Pixel::RGB24 => Some(three(0, 1, 2)),
+            Pixel::BGR24 => Some(three(2, 1, 0)),
+            _ => None,
+        }
+    }
+}
+
+fn blend_rgba_into_packed(
+    destination: &mut ffmpeg::frame::Video,
+    layout: PackedRgbLayout,
+    source: &ffmpeg::frame::Video,
+    x: usize,
+    y: usize,
+) -> anyhow::Result<()> {
+    if source.format() != Pixel::RGBA {
+        return Err(anyhow!("camera overlay must be RGBA"));
+    }
+    let source_width = source.width() as usize;
+    let source_height = source.height() as usize;
+    if x.saturating_add(source_width) > destination.width() as usize
+        || y.saturating_add(source_height) > destination.height() as usize
+    {
+        return Err(anyhow!("camera overlay exceeds screen frame"));
+    }
+    let bytes_per_pixel = layout.bytes_per_pixel;
+    let source_stride = source.stride(0);
+    let destination_stride = destination.stride(0);
+    let source_data = source.data(0);
+    let destination_data = destination.data_mut(0);
+    for row in 0..source_height {
+        let source_row = &source_data[row * source_stride..][..source_width * 4];
+        let destination_row = &mut destination_data
+            [(y + row) * destination_stride + x * bytes_per_pixel..]
+            [..source_width * bytes_per_pixel];
+        for (source_pixel, destination_pixel) in source_row
+            .chunks_exact(4)
+            .zip(destination_row.chunks_exact_mut(bytes_per_pixel))
+        {
+            let alpha = u16::from(source_pixel[3]);
+            let inverse_alpha = 255 - alpha;
+            for (channel, offset) in [layout.red, layout.green, layout.blue]
+                .into_iter()
+                .enumerate()
+            {
+                destination_pixel[offset] = ((u16::from(source_pixel[channel]) * alpha
+                    + u16::from(destination_pixel[offset]) * inverse_alpha
+                    + 127)
+                    / 255) as u8;
+            }
+            if let Some(opaque) = layout.opaque {
+                destination_pixel[opaque] = 255;
+            }
+        }
+    }
+    Ok(())
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -1318,7 +1480,7 @@ mod tests {
             VideoInfo::from_raw_ffmpeg(Pixel::RGBA, 2, 2, 30),
             presentation(2, 2),
         );
-        let overlay = compositor.camera_overlay(&converted.inner).unwrap();
+        let overlay = compositor.camera_overlay(&converted.inner, 0).unwrap();
         assert_eq!(overlay.format(), Pixel::RGBA);
         assert_eq!(&overlay.data(0)[..8], &[30, 20, 10, 255, 60, 50, 40, 255]);
         assert_eq!(
@@ -1684,7 +1846,7 @@ mod tests {
         let before = frame.data(0).to_vec();
         let mut request = presentation(4, 2);
         request.mirrored = true;
-        let output = crop_camera(&frame, request).unwrap();
+        let output = crop_camera(&frame, request, &camera_mask(request)).unwrap();
         assert_eq!(&output.data(0)[..4], &[3, 0, 3, 255]);
         assert_eq!(&output.data(0)[12..16], &[0, 0, 3, 255]);
         assert_eq!(frame.data(0), before);
@@ -1699,14 +1861,11 @@ mod tests {
             LinuxCameraShape::Round,
             LinuxCameraShape::RoundedRectangle { radius_pixels: 3 },
         ] {
-            let output = crop_camera(
-                &frame,
-                LinuxCameraPresentation {
-                    shape,
-                    ..presentation(8, 8)
-                },
-            )
-            .unwrap();
+            let request = LinuxCameraPresentation {
+                shape,
+                ..presentation(8, 8)
+            };
+            let output = crop_camera(&frame, request, &camera_mask(request)).unwrap();
             assert_eq!(output.data(0)[3], 0);
             assert_eq!(output.data(0)[output.stride(0) * 4 + 4 * 4 + 3], 255);
         }
@@ -1985,19 +2144,16 @@ mod tests {
         let stride = source.stride(0);
         let center = 2 * stride + 2 * 4;
         source.data_mut(0)[center..center + 4].copy_from_slice(&[1, 2, 3, 255]);
-        let cropped = crop_camera(
-            &source,
-            LinuxCameraPresentation {
-                rect: LinuxCameraRect {
-                    x: 0,
-                    y: 0,
-                    width: 2,
-                    height: 2,
-                },
-                ..LinuxCameraPresentation::default_for(2, 2)
+        let request = LinuxCameraPresentation {
+            rect: LinuxCameraRect {
+                x: 0,
+                y: 0,
+                width: 2,
+                height: 2,
             },
-        )
-        .expect("crop succeeds");
+            ..LinuxCameraPresentation::default_for(2, 2)
+        };
+        let cropped = crop_camera(&source, request, &camera_mask(request)).expect("crop succeeds");
         assert_eq!(
             &cropped.data(0)[cropped.stride(0)..cropped.stride(0) + 4],
             &[1, 2, 3, 255]
@@ -2005,7 +2161,7 @@ mod tests {
     }
 
     #[test]
-    fn compositor_converts_nv12_camera_without_mutating_screen_and_preserves_pts() {
+    fn compositor_converts_nv12_camera_without_mutating_shared_screen_and_preserves_pts() {
         ffmpeg::init().expect("FFmpeg initializes");
         let timestamp = Timestamp::Instant(Instant::now());
         let info = VideoInfo::from_raw_ffmpeg(ffmpeg::format::Pixel::BGRA, 8, 8, 30);
@@ -2031,10 +2187,11 @@ mod tests {
             info,
             LinuxCameraPresentation::default_for(info.width, info.height),
         );
+        let shared = shared_ref(&screen_frame.inner);
         let output = compositor
-            .compose(&screen_frame, &camera_frame)
+            .compose(screen_frame, &camera_frame, 0)
             .expect("composition succeeds");
-        assert_eq!(screen_frame.inner.data(0), original.as_slice());
+        assert_eq!(shared.data(0), original.as_slice());
         assert_eq!(camera_frame.inner.data(0), camera_before.0.as_slice());
         assert_eq!(camera_frame.inner.data(1), camera_before.1.as_slice());
         assert_eq!(output.inner.pts(), Some(1234));
@@ -2074,10 +2231,11 @@ mod tests {
             info,
             LinuxCameraPresentation::default_for(info.width, info.height),
         );
+        let shared = shared_ref(&screen_frame.inner);
         let output = compositor
-            .compose(&screen_frame, &camera_frame)
+            .compose(screen_frame, &camera_frame, 0)
             .expect("composition succeeds");
-        assert_eq!(screen_frame.inner.data(0), original_y.as_slice());
+        assert_eq!(shared.data(0), original_y.as_slice());
         assert_eq!(output.inner.format(), Pixel::NV12);
         assert_eq!(output.inner.pts(), Some(4321));
         assert_ne!(output.inner.data(0)[output.inner.stride(0) * 7 + 7], 16);
@@ -2090,4 +2248,201 @@ mod tests {
         let source = ffmpeg::frame::Video::new(ffmpeg::format::Pixel::RGBA, 2, 2);
         assert!(blend_rgba(&mut destination, &source, 1, 0).is_err());
     }
+
+    fn shared_ref(frame: &ffmpeg::frame::Video) -> ffmpeg::frame::Video {
+        let mut shared = ffmpeg::frame::Video::empty();
+        let result = unsafe { ffmpeg::sys::av_frame_ref(shared.as_mut_ptr(), frame.as_ptr()) };
+        assert!(result >= 0);
+        shared
+    }
+
+    fn pattern_frame(format: Pixel, width: u32, height: u32, seed: u32) -> ffmpeg::frame::Video {
+        let mut frame = ffmpeg::frame::Video::new(format, width, height);
+        let mut state = seed.wrapping_mul(2_654_435_761).wrapping_add(1);
+        for plane in 0..frame.planes() {
+            for byte in frame.data_mut(plane) {
+                state ^= state << 13;
+                state ^= state >> 17;
+                state ^= state << 5;
+                *byte = (state >> 24) as u8;
+            }
+        }
+        frame
+    }
+
+    fn copy_frame(frame: &ffmpeg::frame::Video) -> ffmpeg::frame::Video {
+        let mut copy = ffmpeg::frame::Video::new(frame.format(), frame.width(), frame.height());
+        for plane in 0..frame.planes() {
+            copy.data_mut(plane).copy_from_slice(frame.data(plane));
+        }
+        copy.set_pts(frame.pts());
+        copy
+    }
+
+    fn defined_bytes(frame: &ffmpeg::frame::Video) -> Vec<u8> {
+        let layout = PackedRgbLayout::of(frame.format()).unwrap();
+        let padding = match frame.format() {
+            Pixel::RGBZ | Pixel::BGRZ | Pixel::ZRGB | Pixel::ZBGR => layout.opaque,
+            _ => None,
+        };
+        let row_bytes = frame.width() as usize * layout.bytes_per_pixel;
+        frame
+            .data(0)
+            .chunks(frame.stride(0))
+            .take(frame.height() as usize)
+            .flat_map(|row| row[..row_bytes].chunks_exact(layout.bytes_per_pixel))
+            .flat_map(|pixel| {
+                pixel
+                    .iter()
+                    .enumerate()
+                    .map(move |(offset, &byte)| if Some(offset) == padding { 0 } else { byte })
+            })
+            .collect()
+    }
+
+    #[test]
+    fn in_place_composition_matches_converted_composition_for_packed_formats() {
+        ffmpeg::init().expect("FFmpeg initializes");
+        let timestamp = Timestamp::Instant(Instant::now());
+        let (width, height) = (37, 23);
+        for format in [
+            Pixel::BGRZ,
+            Pixel::RGBZ,
+            Pixel::ZRGB,
+            Pixel::ZBGR,
+            Pixel::BGRA,
+            Pixel::RGBA,
+            Pixel::ARGB,
+            Pixel::ABGR,
+            Pixel::RGB24,
+            Pixel::BGR24,
+        ] {
+            for (shape, mirrored) in [
+                (LinuxCameraShape::Round, false),
+                (LinuxCameraShape::Round, true),
+                (
+                    LinuxCameraShape::RoundedRectangle { radius_pixels: 3 },
+                    false,
+                ),
+            ] {
+                let info = VideoInfo::from_raw_ffmpeg(format, width, height, 30);
+                let presentation = LinuxCameraPresentation {
+                    rect: LinuxCameraRect {
+                        x: 19,
+                        y: 6,
+                        width: 15,
+                        height: 15,
+                    },
+                    shape,
+                    mirrored,
+                    effect: LinuxCameraEffect::None,
+                };
+                let mut screen = pattern_frame(format, width, height, 7);
+                screen.set_pts(Some(99));
+                let camera = FFmpegVideoFrame {
+                    inner: pattern_frame(Pixel::YUV420P, 32, 18, 11),
+                    timestamp,
+                };
+                let expected = Compositor::new(info, presentation)
+                    .compose_converted(
+                        &FFmpegVideoFrame {
+                            inner: copy_frame(&screen),
+                            timestamp,
+                        },
+                        &camera,
+                        0,
+                    )
+                    .expect("converted composition succeeds");
+                let mut compositor = Compositor::new(info, presentation);
+                let mut probe = copy_frame(&screen);
+                assert!(compositor.in_place_layout(&mut probe).is_some());
+                let actual = compositor
+                    .compose(
+                        FFmpegVideoFrame {
+                            inner: screen,
+                            timestamp,
+                        },
+                        &camera,
+                        0,
+                    )
+                    .expect("in-place composition succeeds");
+                assert_eq!(
+                    defined_bytes(&actual.inner),
+                    defined_bytes(&expected.inner),
+                    "{format:?} {shape:?} mirrored={mirrored}"
+                );
+                assert_eq!(actual.inner.pts(), Some(99));
+            }
+        }
+    }
+
+    #[test]
+    fn camera_overlay_is_reused_until_a_new_camera_frame_arrives() {
+        ffmpeg::init().expect("FFmpeg initializes");
+        let timestamp = Timestamp::Instant(Instant::now());
+        let info = VideoInfo::from_raw_ffmpeg(Pixel::BGRZ, 16, 16, 30);
+        let mut compositor = Compositor::new(info, LinuxCameraPresentation::default_for(16, 16));
+        let camera = |seed| FFmpegVideoFrame {
+            inner: pattern_frame(Pixel::RGBA, 8, 8, seed),
+            timestamp,
+        };
+        let screen = || FFmpegVideoFrame {
+            inner: pattern_frame(Pixel::BGRZ, 16, 16, 3),
+            timestamp,
+        };
+        let first = compositor.compose(screen(), &camera(1), 1).unwrap();
+        let reused = compositor.compose(screen(), &camera(2), 1).unwrap();
+        let refreshed = compositor.compose(screen(), &camera(2), 2).unwrap();
+        assert_eq!(first.inner.data(0), reused.inner.data(0));
+        assert_ne!(first.inner.data(0), refreshed.inner.data(0));
+    }
+
+    #[test]
+    #[ignore = "timing benchmark; run with --release --ignored --nocapture"]
+    fn compose_timing_benchmark() {
+        ffmpeg::init().expect("FFmpeg initializes");
+        let timestamp = Timestamp::Instant(Instant::now());
+        let camera = FFmpegVideoFrame {
+            inner: pattern_frame(Pixel::YUV420P, 1280, 720, 5),
+            timestamp,
+        };
+        let frames = 240u64;
+        for (width, height) in [(1920, 1080), (2560, 1440), (3840, 2160)] {
+            let info = VideoInfo::from_raw_ffmpeg(Pixel::BGRZ, width, height, 60);
+            let presentation = LinuxCameraPresentation {
+                shape: LinuxCameraShape::Round,
+                ..LinuxCameraPresentation::default_for(width, height)
+            };
+            let template = pattern_frame(Pixel::BGRZ, width, height, 9);
+            let run = |label: &str, converted: bool, camera_every: u64| {
+                let mut compositor = Compositor::new(info, presentation);
+                let mut times = Vec::new();
+                for index in 0..frames {
+                    let screen = FFmpegVideoFrame {
+                        inner: copy_frame(&template),
+                        timestamp,
+                    };
+                    let generation = index / camera_every;
+                    let started = Instant::now();
+                    let output = if converted {
+                        compositor.compose_converted(&screen, &camera, generation)
+                    } else {
+                        compositor.compose(screen, &camera, generation)
+                    };
+                    times.push(started.elapsed().as_secs_f64() * 1000.0);
+                    drop(output.unwrap());
+                }
+                times.sort_by(f64::total_cmp);
+                let mean = times.iter().sum::<f64>() / times.len() as f64;
+                println!(
+                    "{width}x{height} {label:<34} mean {mean:6.2} ms  p50 {:6.2} ms  p95 {:6.2} ms",
+                    times[times.len() / 2],
+                    times[times.len() * 95 / 100],
+                );
+            };
+            run("converted, new camera every frame", true, 1);
+            run("in place, new camera every frame", false, 1);
+            run("in place, 30 fps camera / 60 fps", false, 2);
+        }
+    }
 }

From 7a7ab587234f5d0bfc646b39051c92bcdab45cef Mon Sep 17 00:00:00 2001
From: flamboh <oliver.boorstein@gmail.com>
Date: Tue, 13 Oct 2026 17:24:29 -0700
Subject: [PATCH 14/74] perf(desktop-gpui): rebuild only changed screenshot
 privacy masks

---
 .../kernels/benchmarks/mask-cache/Cargo.lock  |  65 ++++
 .../kernels/benchmarks/mask-cache/Cargo.toml  |  22 ++
 .../kernels/benchmarks/mask-cache/README.md   |  60 ++++
 .../kernels/benchmarks/mask-cache/lib.rs      |   4 +
 .../screenshot-mask-cache-benchmark.rs        | 160 ++++++++++
 apps/desktop-gpui/kernels/src/lib.rs          |   1 +
 apps/desktop-gpui/kernels/src/mask_cache.rs   | 285 ++++++++++++++++++
 .../src/screenshot_annotations.rs             | 253 +++++++++-------
 apps/desktop-gpui/src/screenshot_editor.rs    |   6 +
 9 files changed, 750 insertions(+), 106 deletions(-)
 create mode 100644 apps/desktop-gpui/kernels/benchmarks/mask-cache/Cargo.lock
 create mode 100644 apps/desktop-gpui/kernels/benchmarks/mask-cache/Cargo.toml
 create mode 100644 apps/desktop-gpui/kernels/benchmarks/mask-cache/README.md
 create mode 100644 apps/desktop-gpui/kernels/benchmarks/mask-cache/lib.rs
 create mode 100644 apps/desktop-gpui/kernels/examples/screenshot-mask-cache-benchmark.rs
 create mode 100644 apps/desktop-gpui/kernels/src/mask_cache.rs

diff --git a/apps/desktop-gpui/kernels/benchmarks/mask-cache/Cargo.lock b/apps/desktop-gpui/kernels/benchmarks/mask-cache/Cargo.lock
new file mode 100644
index 00000000000..65c42077127
--- /dev/null
+++ b/apps/desktop-gpui/kernels/benchmarks/mask-cache/Cargo.lock
@@ -0,0 +1,65 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "autocfg"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
+
+[[package]]
+name = "bytemuck"
+version = "1.25.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95832e849adfb21180ccb6826a99da14e5d266ae5c2e668e1602cf234f153797"
+
+[[package]]
+name = "byteorder-lite"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
+
+[[package]]
+name = "cap-screenshot-mask-cache-benchmark"
+version = "0.1.0"
+dependencies = [
+ "image",
+]
+
+[[package]]
+name = "image"
+version = "0.25.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85ab80394333c02fe689eaf900ab500fbd0c2213da414687ebf995a65d5a6104"
+dependencies = [
+ "bytemuck",
+ "byteorder-lite",
+ "moxcms",
+ "num-traits",
+]
+
+[[package]]
+name = "moxcms"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb85c154ba489f01b25c0d36ae69a87e4a1c73a72631fc6c0eb6dde34a73e44b"
+dependencies = [
+ "num-traits",
+ "pxfm",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "pxfm"
+version = "0.1.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d55d956fa96f5ec02be2e13af0e20391a5aa83d6a074e3ad368959d0fab299ea"
diff --git a/apps/desktop-gpui/kernels/benchmarks/mask-cache/Cargo.toml b/apps/desktop-gpui/kernels/benchmarks/mask-cache/Cargo.toml
new file mode 100644
index 00000000000..bda064d8078
--- /dev/null
+++ b/apps/desktop-gpui/kernels/benchmarks/mask-cache/Cargo.toml
@@ -0,0 +1,22 @@
+[workspace]
+
+[package]
+name = "cap-screenshot-mask-cache-benchmark"
+version = "0.1.0"
+edition = "2024"
+publish = false
+
+[lib]
+name = "cap_gpui_kernels"
+path = "lib.rs"
+
+[[example]]
+name = "screenshot-mask-cache-benchmark"
+path = "../../examples/screenshot-mask-cache-benchmark.rs"
+
+[dependencies]
+image = { version = "=0.25.10", default-features = false }
+
+[profile.release]
+codegen-units = 1
+lto = "thin"
diff --git a/apps/desktop-gpui/kernels/benchmarks/mask-cache/README.md b/apps/desktop-gpui/kernels/benchmarks/mask-cache/README.md
new file mode 100644
index 00000000000..30fca7dabe6
--- /dev/null
+++ b/apps/desktop-gpui/kernels/benchmarks/mask-cache/README.md
@@ -0,0 +1,60 @@
+# Screenshot mask cache benchmark
+
+Run from the repository root:
+
+```sh
+cargo +stable run --locked --release \
+  --manifest-path apps/desktop-gpui/kernels/benchmarks/mask-cache/Cargo.toml \
+  --example screenshot-mask-cache-benchmark
+```
+
+This standalone package compiles the production `mask_cache.rs` and `screenshot.rs` directly. It requires Rust and the `image` crate, with a committed lockfile matching the desktop workspace's image/filter dependencies. It does not build GPUI, audio, FFmpeg, or platform libraries, and can run on Linux x86_64 as well as macOS arm64. The same example is also available through `cargo run -p cap-gpui-kernels --release --example screenshot-mask-cache-benchmark` in the desktop workspace, when its full dependency prerequisites are installed.
+
+The fixture is a deterministic, nonuniform 3840 × 2160 RGBA image with varying alpha. Each workload has 1, 4, 8, or 16 masks of 640 × 360 pixels at level 16, using either blur or pixelate. One mask moves one pixel per event; the others stay fixed. Each workload primes the cache, runs 12 warmup pairs, then measures 120 drag events. The old path filters every mask on every update. The new path calls the production cache diff and filters only changed masks. Both paths call the unchanged production `mask_filter`.
+
+Execution order alternates between old-first and new-first to reduce order bias. Every overlay's request and all of its output bytes are compared after every warmup and measured event, outside the timed intervals. A mismatch or unexpected filter-call count fails the run. Filter-call counts in the table cover the 120 measured events only; cache priming and warmup are excluded. The speedup is the ratio of means. The median is the average of the two middle samples.
+
+Timings include cache diffing, region extraction/filtering, image allocation, `Arc` ownership, and release of retired CPU images. Request/geometry construction and correctness comparisons are outside timing. The benchmark excludes GPUI image conversion, task scheduling/cancellation, GPU atlas uploads, painting, and screenshot export. It measures completed CPU preparation work, not pointer-event latency or application FPS. One mask is a control case: it has no reusable image during a drag. A replaced frame invalidates every mask and is not expected to benefit. Overlapping masks, deletion, reordering, style changes, frame/layout invalidation, and fractional/clipped rectangles are covered by the production module's unit tests.
+
+Run the portable tests and lint checks:
+
+```sh
+cargo +stable test --locked \
+  --manifest-path apps/desktop-gpui/kernels/benchmarks/mask-cache/Cargo.toml \
+  --all-targets
+cargo +stable clippy --locked \
+  --manifest-path apps/desktop-gpui/kernels/benchmarks/mask-cache/Cargo.toml \
+  --all-targets -- -D warnings
+```
+
+Run the release command at least twice on an otherwise idle machine. Keep the full output, CPU model, operating system, Rust version, and power mode with results. Compare both means and medians, including the one-mask control. Cross-architecture results should use the same lockfile and workload.
+
+## Recorded results
+
+Two consecutive release runs on Apple M4 Pro, macOS 27.2, Rust 1.97.0, battery power with automatic power mode, October 13, 2026. All overlay bytes matched after every event in both runs. These are CPU overlay-preparation measurements with the exclusions described above.
+
+Run 1:
+
+| Mode | Masks | Old mean ms | New mean ms | Old median ms | New median ms | Mean speedup | Old calls | New calls |
+| --- | ---: | ---: | ---: | ---: | ---: | ---: | ---: | ---: |
+| blur | 1 | 1.637 | 1.631 | 1.630 | 1.621 | 1.00x | 120 | 120 |
+| blur | 4 | 6.701 | 1.687 | 6.697 | 1.688 | 3.97x | 480 | 120 |
+| blur | 8 | 13.266 | 1.664 | 13.291 | 1.660 | 7.97x | 960 | 120 |
+| blur | 16 | 26.504 | 1.688 | 26.494 | 1.685 | 15.70x | 1920 | 120 |
+| pixelate | 1 | 0.805 | 0.812 | 0.804 | 0.804 | 0.99x | 120 | 120 |
+| pixelate | 4 | 3.310 | 0.828 | 3.306 | 0.826 | 4.00x | 480 | 120 |
+| pixelate | 8 | 6.938 | 0.900 | 6.956 | 0.902 | 7.71x | 960 | 120 |
+| pixelate | 16 | 13.723 | 0.911 | 13.605 | 0.878 | 15.07x | 1920 | 120 |
+
+Run 2:
+
+| Mode | Masks | Old mean ms | New mean ms | Old median ms | New median ms | Mean speedup | Old calls | New calls |
+| --- | ---: | ---: | ---: | ---: | ---: | ---: | ---: | ---: |
+| blur | 1 | 1.600 | 1.600 | 1.585 | 1.589 | 1.00x | 120 | 120 |
+| blur | 4 | 6.569 | 1.657 | 6.548 | 1.651 | 3.96x | 480 | 120 |
+| blur | 8 | 13.384 | 1.713 | 13.293 | 1.672 | 7.82x | 960 | 120 |
+| blur | 16 | 26.587 | 1.708 | 26.138 | 1.661 | 15.57x | 1920 | 120 |
+| pixelate | 1 | 0.790 | 0.789 | 0.791 | 0.791 | 1.00x | 120 | 120 |
+| pixelate | 4 | 3.252 | 0.812 | 3.234 | 0.809 | 4.00x | 480 | 120 |
+| pixelate | 8 | 6.749 | 0.862 | 6.664 | 0.857 | 7.83x | 960 | 120 |
+| pixelate | 16 | 13.750 | 0.888 | 13.766 | 0.883 | 15.48x | 1920 | 120 |
diff --git a/apps/desktop-gpui/kernels/benchmarks/mask-cache/lib.rs b/apps/desktop-gpui/kernels/benchmarks/mask-cache/lib.rs
new file mode 100644
index 00000000000..334cafd746a
--- /dev/null
+++ b/apps/desktop-gpui/kernels/benchmarks/mask-cache/lib.rs
@@ -0,0 +1,4 @@
+#[path = "../../src/mask_cache.rs"]
+pub mod mask_cache;
+#[path = "../../src/screenshot.rs"]
+pub mod screenshot;
diff --git a/apps/desktop-gpui/kernels/examples/screenshot-mask-cache-benchmark.rs b/apps/desktop-gpui/kernels/examples/screenshot-mask-cache-benchmark.rs
new file mode 100644
index 00000000000..9c1dc29afef
--- /dev/null
+++ b/apps/desktop-gpui/kernels/examples/screenshot-mask-cache-benchmark.rs
@@ -0,0 +1,160 @@
+use cap_gpui_kernels::mask_cache::{MaskEntry, MaskFrame, MaskRequest, mask_region, update_masks};
+use std::{hint::black_box, sync::Arc, time::Instant};
+
+const SIZE: (u32, u32) = (3840, 2160);
+const WARMUP: usize = 12;
+const EVENTS: usize = 120;
+type Overlay = MaskEntry<Arc<image::RgbaImage>>;
+
+fn requests(count: usize, pixelate: bool, event: usize) -> Vec<MaskRequest> {
+    let content = [0., 0., f64::from(SIZE.0), f64::from(SIZE.1)];
+    (0..count)
+        .map(|index| {
+            let x = 80. + (index % 4) as f64 * 720. + if index == 0 { event as f64 } else { 0. };
+            let y = 80. + (index / 4) as f64 * 440.;
+            MaskRequest {
+                id: index.to_string(),
+                frame: MaskFrame {
+                    revision: 1,
+                    size: SIZE,
+                    content: content.map(f64::to_bits),
+                    padding: 0_f64.to_bits(),
+                    crop: None,
+                },
+                region: mask_region([x, y, 640., 360.], content, SIZE).unwrap(),
+                pixelate,
+                level: 16_f64.to_bits(),
+            }
+        })
+        .collect()
+}
+
+fn rebuild_all(requests: &[MaskRequest], rgba: &[u8], calls: &mut usize) -> Vec<Overlay> {
+    requests
+        .iter()
+        .map(|request| {
+            *calls += 1;
+            MaskEntry {
+                request: request.clone(),
+                value: request.filter(rgba).map(Arc::new),
+            }
+        })
+        .collect()
+}
+
+fn cached(
+    previous: &[Overlay],
+    requests: &[MaskRequest],
+    rgba: &[u8],
+    calls: &mut usize,
+) -> Vec<Overlay> {
+    update_masks(previous, requests, |request| {
+        *calls += 1;
+        request.filter(rgba).map(Arc::new)
+    })
+}
+
+fn stats(samples: &mut [f64]) -> (f64, f64) {
+    samples.sort_by(f64::total_cmp);
+    (
+        samples.iter().sum::<f64>() / samples.len() as f64,
+        (samples[samples.len() / 2 - 1] + samples[samples.len() / 2]) / 2.,
+    )
+}
+
+fn main() {
+    let rgba: Vec<u8> = (0..SIZE.0 * SIZE.1)
+        .flat_map(|i| {
+            let x = i % SIZE.0;
+            let y = i / SIZE.0;
+            [
+                (x * 13 + y * 7) as u8,
+                (x * 3 + y * 17) as u8,
+                (x ^ (y * 11)) as u8,
+                (128 + (x * 5 + y * 3) % 128) as u8,
+            ]
+        })
+        .collect();
+    println!(
+        "Screenshot mask overlay preparation: {} / {}",
+        std::env::consts::OS,
+        std::env::consts::ARCH
+    );
+    println!(
+        "3840x2160 RGBA; 640x360 masks; level 16; {WARMUP} warmup pairs; {EVENTS} measured drag events"
+    );
+    println!(
+        "Alternating old/new execution order; warm cache; byte comparison after every event outside timing."
+    );
+    println!(
+        "Includes cache diff, filtering, Arc allocation and retired CPU image release. Excludes GPUI conversion, scheduling, atlas and painting."
+    );
+    println!(
+        "| Mode | Masks | Old mean ms | New mean ms | Old median ms | New median ms | Mean speedup | Old calls | New calls |"
+    );
+    println!("| --- | ---: | ---: | ---: | ---: | ---: | ---: | ---: | ---: |");
+    for pixelate in [false, true] {
+        for count in [1, 4, 8, 16] {
+            let initial = requests(count, pixelate, 0);
+            let mut old = rebuild_all(&initial, &rgba, &mut 0);
+            let mut new = cached(&[], &initial, &rgba, &mut 0);
+            let mut old_samples = Vec::with_capacity(EVENTS);
+            let mut new_samples = Vec::with_capacity(EVENTS);
+            let mut old_calls = 0;
+            let mut new_calls = 0;
+            for event in 1..=WARMUP + EVENTS {
+                let requests = requests(count, pixelate, event);
+                let mut run_old = || {
+                    let start = Instant::now();
+                    old = rebuild_all(black_box(&requests), black_box(&rgba), &mut old_calls);
+                    start.elapsed().as_secs_f64() * 1000.
+                };
+                let mut run_new = || {
+                    let start = Instant::now();
+                    new = cached(
+                        black_box(&new),
+                        black_box(&requests),
+                        black_box(&rgba),
+                        &mut new_calls,
+                    );
+                    start.elapsed().as_secs_f64() * 1000.
+                };
+                let (old_ms, new_ms) = if event % 2 == 0 {
+                    let new_ms = run_new();
+                    (run_old(), new_ms)
+                } else {
+                    let old_ms = run_old();
+                    (old_ms, run_new())
+                };
+                assert_eq!(old.len(), count);
+                assert_eq!(new.len(), count);
+                for (old, new) in old.iter().zip(&new) {
+                    assert_eq!(old.request, new.request);
+                    assert_eq!(
+                        old.value.as_ref().unwrap().as_raw(),
+                        new.value.as_ref().unwrap().as_raw(),
+                        "event {event}, mask {}",
+                        old.request.id
+                    );
+                }
+                if event <= WARMUP {
+                    old_calls = 0;
+                    new_calls = 0;
+                } else {
+                    old_samples.push(old_ms);
+                    new_samples.push(new_ms);
+                }
+            }
+            assert_eq!(old_calls, count * EVENTS);
+            assert_eq!(new_calls, EVENTS);
+            let (old_mean, old_median) = stats(&mut old_samples);
+            let (new_mean, new_median) = stats(&mut new_samples);
+            let mode = if pixelate { "pixelate" } else { "blur" };
+            println!(
+                "| {mode} | {count} | {old_mean:.3} | {new_mean:.3} | {old_median:.3} | {new_median:.3} | {:.2}x | {old_calls} | {new_calls} |",
+                old_mean / new_mean
+            );
+        }
+    }
+    println!("All overlay bytes matched at every warmup and measured event.");
+}
diff --git a/apps/desktop-gpui/kernels/src/lib.rs b/apps/desktop-gpui/kernels/src/lib.rs
index f35b4f5ede1..009db0e7ceb 100644
--- a/apps/desktop-gpui/kernels/src/lib.rs
+++ b/apps/desktop-gpui/kernels/src/lib.rs
@@ -1,5 +1,6 @@
 pub mod codec;
 pub mod frame;
+pub mod mask_cache;
 pub mod screenshot;
 pub mod texture;
 pub mod thumbnail;
diff --git a/apps/desktop-gpui/kernels/src/mask_cache.rs b/apps/desktop-gpui/kernels/src/mask_cache.rs
new file mode 100644
index 00000000000..9421b9a1ddd
--- /dev/null
+++ b/apps/desktop-gpui/kernels/src/mask_cache.rs
@@ -0,0 +1,285 @@
+use crate::screenshot::mask_filter;
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct MaskFrame {
+    pub revision: u64,
+    pub size: (u32, u32),
+    pub content: [u64; 4],
+    pub padding: u64,
+    pub crop: Option<[u32; 4]>,
+}
+
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct MaskRequest {
+    pub id: String,
+    pub frame: MaskFrame,
+    pub region: (u32, u32, u32, u32),
+    pub pixelate: bool,
+    pub level: u64,
+}
+
+impl MaskRequest {
+    pub fn filter(&self, rgba: &[u8]) -> Option<image::RgbaImage> {
+        mask_filter(
+            rgba,
+            self.frame.size.0,
+            self.frame.size.1,
+            self.region,
+            self.pixelate,
+            f64::from_bits(self.level),
+        )
+    }
+}
+
+#[derive(Clone)]
+pub struct MaskEntry<T> {
+    pub request: MaskRequest,
+    pub value: Option<T>,
+}
+
+#[derive(Debug, PartialEq, Eq)]
+pub struct MaskPlan {
+    pub reuse: Vec<Option<usize>>,
+    pub drop: Vec<usize>,
+}
+
+pub fn plan_masks<T>(previous: &[MaskEntry<T>], requests: &[MaskRequest]) -> MaskPlan {
+    let reuse: Vec<_> = requests
+        .iter()
+        .map(|request| previous.iter().position(|entry| entry.request == *request))
+        .collect();
+    let drop = (0..previous.len())
+        .filter(|index| !reuse.contains(&Some(*index)))
+        .collect();
+    MaskPlan { reuse, drop }
+}
+
+pub fn update_masks<T: Clone>(
+    previous: &[MaskEntry<T>],
+    requests: &[MaskRequest],
+    mut compute: impl FnMut(&MaskRequest) -> Option<T>,
+) -> Vec<MaskEntry<T>> {
+    let plan = plan_masks(previous, requests);
+    requests
+        .iter()
+        .zip(plan.reuse)
+        .map(|(request, reuse)| MaskEntry {
+            request: request.clone(),
+            value: match reuse {
+                Some(index) => previous[index].value.clone(),
+                None => compute(request),
+            },
+        })
+        .collect()
+}
+
+pub fn mask_region(
+    mask: [f64; 4],
+    content: [f64; 4],
+    frame: (u32, u32),
+) -> Option<(u32, u32, u32, u32)> {
+    let [x, y, width, height] = mask;
+    let [content_x, content_y, content_width, content_height] = content;
+    let left = content_x.max(x.min(x + width));
+    let top = content_y.max(y.min(y + height));
+    let right = (content_x + content_width).min(x.max(x + width));
+    let bottom = (content_y + content_height).min(y.max(y + height));
+    if right <= left || bottom <= top {
+        return None;
+    }
+    let x0 = (left.round().max(0.) as u32).min(frame.0);
+    let y0 = (top.round().max(0.) as u32).min(frame.1);
+    let x1 = (right.round().max(0.) as u32).min(frame.0);
+    let y1 = (bottom.round().max(0.) as u32).min(frame.1);
+    (x1 > x0 && y1 > y0).then(|| (x0, y0, x1 - x0, y1 - y0))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::sync::Arc;
+
+    fn requests(count: usize) -> Vec<MaskRequest> {
+        (0..count)
+            .map(|index| MaskRequest {
+                id: index.to_string(),
+                frame: MaskFrame {
+                    revision: 1,
+                    size: (64, 48),
+                    content: [0., 0., 64., 48.].map(f64::to_bits),
+                    padding: 0_f64.to_bits(),
+                    crop: None,
+                },
+                region: (index as u32 * 4, 4, 32, 24),
+                pixelate: false,
+                level: 16_f64.to_bits(),
+            })
+            .collect()
+    }
+
+    fn cached(requests: &[MaskRequest]) -> Vec<MaskEntry<Arc<String>>> {
+        update_masks(&[], requests, |request| Some(Arc::new(request.id.clone())))
+    }
+
+    #[test]
+    fn moving_one_mask_reuses_the_other_images() {
+        let mut requests = requests(4);
+        let previous = cached(&requests);
+        requests[1].region.0 += 1;
+        assert_eq!(
+            plan_masks(&previous, &requests),
+            MaskPlan {
+                reuse: vec![Some(0), None, Some(2), Some(3)],
+                drop: vec![1],
+            }
+        );
+        let mut calls = 0;
+        let next = update_masks(&previous, &requests, |request| {
+            calls += 1;
+            Some(Arc::new(request.id.clone()))
+        });
+        assert_eq!(calls, 1);
+        for index in [0, 2, 3] {
+            assert!(Arc::ptr_eq(
+                previous[index].value.as_ref().unwrap(),
+                next[index].value.as_ref().unwrap()
+            ));
+        }
+    }
+
+    #[test]
+    fn deleting_and_reordering_evicts_only_the_deleted_mask() {
+        let mut requests = requests(4);
+        let previous = cached(&requests);
+        requests.remove(1);
+        requests.reverse();
+        assert_eq!(
+            plan_masks(&previous, &requests),
+            MaskPlan {
+                reuse: vec![Some(3), Some(2), Some(0)],
+                drop: vec![1],
+            }
+        );
+        let next = update_masks(&previous, &requests, |_| panic!("unexpected filter"));
+        assert_eq!(
+            next.iter()
+                .map(|entry| entry.request.id.as_str())
+                .collect::<Vec<_>>(),
+            ["3", "2", "0"]
+        );
+        assert_eq!(plan_masks(&next, &[]).drop, [0, 1, 2]);
+    }
+
+    #[test]
+    fn new_and_changed_styles_are_computed() {
+        let mut requests = requests(4);
+        let previous = cached(&requests[..3]);
+        requests[0].pixelate = true;
+        requests[1].level = 20_f64.to_bits();
+        assert_eq!(
+            plan_masks(&previous, &requests),
+            MaskPlan {
+                reuse: vec![None, None, Some(2), None],
+                drop: vec![0, 1],
+            }
+        );
+    }
+
+    #[test]
+    fn frame_and_layout_changes_invalidate_every_mask() {
+        let original = requests(4);
+        let previous = cached(&original);
+        for change in 0..5 {
+            let mut requests = original.clone();
+            for request in &mut requests {
+                match change {
+                    0 => request.frame.revision += 1,
+                    1 => request.frame.size.0 += 1,
+                    2 => request.frame.content[0] = 0.25_f64.to_bits(),
+                    3 => request.frame.padding = 1_f64.to_bits(),
+                    _ => request.frame.crop = Some([1, 0, 64, 48]),
+                }
+            }
+            assert_eq!(
+                plan_masks(&previous, &requests),
+                MaskPlan {
+                    reuse: vec![None; 4],
+                    drop: vec![0, 1, 2, 3],
+                }
+            );
+        }
+    }
+
+    #[test]
+    fn identical_requests_reuse_even_a_failed_filter() {
+        let requests = requests(4);
+        let previous = update_masks::<Arc<String>>(&[], &requests, |_| None);
+        let next = update_masks(&previous, &requests, |_| panic!("unexpected filter"));
+        assert!(next.iter().all(|entry| entry.value.is_none()));
+        assert_eq!(plan_masks(&previous, &requests).drop, []);
+    }
+
+    #[test]
+    fn regions_round_after_clipping_and_normalize_negative_sizes() {
+        let content = [10.25, 8.75, 40.5, 30.5];
+        assert_eq!(
+            mask_region([-2.4, 1.2, 80., 60.], content, (48, 36)),
+            Some((10, 9, 38, 27))
+        );
+        assert_eq!(
+            mask_region([40.4, 30.4, -20.2, -10.2], content, (64, 48)),
+            Some((20, 20, 20, 10))
+        );
+        assert_eq!(mask_region([10.1, 10.1, 0.2, 0.2], content, (64, 48)), None);
+        assert_eq!(mask_region([60., 10., 10., 10.], content, (64, 48)), None);
+        assert_eq!(mask_region([0., 0., 20., 20.], content, (0, 0)), None);
+    }
+
+    #[test]
+    fn fractional_moves_with_the_same_filtered_pixels_reuse() {
+        let mut requests = requests(1);
+        let content = [0., 0., 64., 48.];
+        requests[0].region = mask_region([0.1, 4.1, 32., 24.], content, (64, 48)).unwrap();
+        let previous = cached(&requests);
+        requests[0].region = mask_region([0.2, 4.2, 32., 24.], content, (64, 48)).unwrap();
+        assert_eq!(plan_masks(&previous, &requests).reuse, [Some(0)]);
+        requests[0].region = mask_region([0.6, 4.2, 32., 24.], content, (64, 48)).unwrap();
+        assert_eq!(plan_masks(&previous, &requests).reuse, [None]);
+    }
+
+    #[test]
+    fn overlapping_masks_always_sample_the_unmodified_frame() {
+        let rgba: Vec<u8> = (0..64 * 48 * 4).map(|i| (i * 37 % 251) as u8).collect();
+        let mut requests = requests(4);
+        requests[1].pixelate = true;
+        let previous = update_masks(&[], &requests, |request| {
+            request.filter(&rgba).map(Arc::new)
+        });
+        requests[1].region.0 += 1;
+        requests.reverse();
+        let mut calls = 0;
+        let next = update_masks(&previous, &requests, |request| {
+            calls += 1;
+            request.filter(&rgba).map(Arc::new)
+        });
+        assert_eq!(calls, 1);
+        for entry in next {
+            let expected = mask_filter(
+                &rgba,
+                64,
+                48,
+                entry.request.region,
+                entry.request.pixelate,
+                16.,
+            )
+            .unwrap();
+            assert_eq!(entry.value.unwrap().as_ref(), &expected);
+        }
+    }
+
+    #[test]
+    fn invalid_buffers_do_not_produce_images() {
+        let request = requests(1).remove(0);
+        assert!(request.filter(&[0; 16]).is_none());
+    }
+}
diff --git a/apps/desktop-gpui/src/screenshot_annotations.rs b/apps/desktop-gpui/src/screenshot_annotations.rs
index 30118d7e579..1f69bdf4a56 100644
--- a/apps/desktop-gpui/src/screenshot_annotations.rs
+++ b/apps/desktop-gpui/src/screenshot_annotations.rs
@@ -25,10 +25,10 @@
 
 use std::cell::Cell;
 use std::collections::HashMap;
-use std::hash::{Hash as _, Hasher as _};
 use std::rc::Rc;
 use std::sync::Arc;
 
+use cap_gpui_kernels::mask_cache::{MaskEntry, MaskFrame, MaskRequest, update_masks};
 use cap_project::{Annotation, AnnotationType, AspectRatio, Crop, MaskType};
 use gpui::{
     AnyElement, App, AppContext as _, Bounds, Context, Corners, CursorStyle, Entity, FontWeight,
@@ -1201,11 +1201,8 @@ pub struct AnnotationState {
     /// The layers list's rows container, for the reorder drag's hit testing.
     list: BoundsCell,
     reorder: Option<Reorder>,
-    masks: Vec<MaskOverlay>,
-    /// The inputs the painted overlays were computed from, and the ones a
-    /// computation in flight is for.
-    mask_key: u64,
-    mask_pending: Option<u64>,
+    masks: Vec<MaskEntry<MaskOverlay>>,
+    mask_pending: Option<Vec<MaskRequest>>,
     mask_task: Option<gpui::Task<()>>,
 }
 
@@ -2241,88 +2238,86 @@ impl ScreenshotEditorWindow {
 
     // -- Mask overlays ---------------------------------------------------------
 
-    /// What the painted overlays were computed from: the frame, the image rect,
-    /// and every mask's geometry and style.
-    fn mask_key(&self) -> u64 {
-        let mut hasher = std::hash::DefaultHasher::new();
-        match &self.frame_rgba {
-            Some(rgba) => {
-                (Arc::as_ptr(rgba) as usize).hash(&mut hasher);
-                rgba.len().hash(&mut hasher);
-            }
-            None => 0usize.hash(&mut hasher),
+    fn mask_requests(&self) -> Vec<MaskRequest> {
+        if self.frame_rgba.is_none() {
+            return Vec::new();
         }
-        self.frame_size.0.to_bits().hash(&mut hasher);
-        self.frame_size.1.to_bits().hash(&mut hasher);
+        let size = (
+            self.frame_size.0.max(0.) as u32,
+            self.frame_size.1.max(0.) as u32,
+        );
         let rect = self.annotation_image_rect();
-        for value in [rect.x, rect.y, rect.width, rect.height] {
-            value.to_bits().hash(&mut hasher);
-        }
-        for annotation in &self.project.annotations {
-            if annotation.annotation_type != AnnotationType::Mask {
-                continue;
-            }
-            annotation.id.hash(&mut hasher);
-            for value in [
-                annotation.x,
-                annotation.y,
-                annotation.width,
-                annotation.height,
-                annotation.mask_level.unwrap_or(MASK_FALLBACK_LEVEL),
-            ] {
-                value.to_bits().hash(&mut hasher);
-            }
-            matches!(annotation.mask_type, Some(MaskType::Pixelate)).hash(&mut hasher);
-        }
-        hasher.finish()
+        let frame = MaskFrame {
+            revision: self.mask_frame_revision,
+            size,
+            content: [rect.x, rect.y, rect.width, rect.height].map(f64::to_bits),
+            padding: self.project.background.padding.to_bits(),
+            crop: self
+                .project
+                .background
+                .crop
+                .as_ref()
+                .map(|crop| [crop.position.x, crop.position.y, crop.size.x, crop.size.y]),
+        };
+        self.project
+            .annotations
+            .iter()
+            .filter_map(|mask| mask_request(mask, frame))
+            .collect()
     }
 
     /// `renderMaskOverlays` (`Preview.tsx:579-687`), off the main thread. The
     /// stale overlay keeps painting until the new one lands, so a drag never
     /// blocks on a resample.
     pub(crate) fn refresh_mask_overlays(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let key = self.mask_key();
-        if self.annotation_state.mask_key == key || self.annotation_state.mask_pending == Some(key)
-        {
+        let requests = self.mask_requests();
+        if self.annotation_state.mask_pending.as_ref() == Some(&requests) {
             return;
         }
+        self.annotation_state.mask_task = None;
+        self.annotation_state.mask_pending = None;
 
-        let masks: Vec<Annotation> = self
-            .project
-            .annotations
+        let retained: Vec<_> = requests
             .iter()
-            .filter(|annotation| annotation.annotation_type == AnnotationType::Mask)
-            .cloned()
+            .filter_map(|request| {
+                self.annotation_state
+                    .masks
+                    .iter()
+                    .find(|entry| entry.request.id == request.id)
+                    .cloned()
+            })
             .collect();
-        let frame = self.frame_rgba.clone();
-
-        let (Some(rgba), false) = (frame, masks.is_empty()) else {
-            self.drop_mask_overlays(window);
-            // Dropping the task matters as much as dropping the tiles: a
-            // resample still in flight would re-install the regions of a mask
-            // that has just been deleted, and stamp its key over this one.
-            self.annotation_state.mask_task = None;
-            self.annotation_state.mask_key = key;
-            self.annotation_state.mask_pending = None;
+        if !retained.iter().map(|entry| &entry.request.id).eq(self
+            .annotation_state
+            .masks
+            .iter()
+            .map(|entry| &entry.request.id))
+        {
+            self.install_mask_overlays(retained, window);
             cx.notify();
+        }
+        if self
+            .annotation_state
+            .masks
+            .iter()
+            .map(|entry| &entry.request)
+            .eq(requests.iter())
+        {
             return;
-        };
+        }
 
-        let size = (
-            self.frame_size.0.max(0.) as u32,
-            self.frame_size.1.max(0.) as u32,
-        );
-        let rect = self.annotation_image_rect();
-        self.annotation_state.mask_pending = Some(key);
+        let previous = self.annotation_state.masks.clone();
+        let Some(rgba) = self.frame_rgba.clone() else {
+            return;
+        };
+        self.annotation_state.mask_pending = Some(requests.clone());
         self.annotation_state.mask_task = Some(cx.spawn_in(window, async move |this, cx| {
             let overlays = cx
                 .background_executor()
-                .spawn(async move { build_mask_overlays(&rgba, size, &masks, rect) })
+                .spawn(async move { build_mask_overlays(&rgba, &previous, &requests) })
                 .await;
             this.update_in(cx, |this, window, cx| {
-                this.drop_mask_overlays(window);
-                this.annotation_state.masks = overlays;
-                this.annotation_state.mask_key = key;
+                this.install_mask_overlays(overlays, window);
                 this.annotation_state.mask_pending = None;
                 cx.notify();
                 // The masks may have moved on while this was in flight.
@@ -2332,11 +2327,22 @@ impl ScreenshotEditorWindow {
         }));
     }
 
-    /// Hand the atlas back the tiles the old overlays held.
-    fn drop_mask_overlays(&mut self, window: &mut Window) {
-        for overlay in self.annotation_state.masks.drain(..) {
-            let _ = window.drop_image(overlay.image);
+    fn install_mask_overlays(
+        &mut self,
+        overlays: Vec<MaskEntry<MaskOverlay>>,
+        window: &mut Window,
+    ) {
+        for previous in &self.annotation_state.masks {
+            if let Some(previous) = &previous.value
+                && !overlays
+                    .iter()
+                    .filter_map(|entry| entry.value.as_ref())
+                    .any(|next| Arc::ptr_eq(&previous.image, &next.image))
+            {
+                let _ = window.drop_image(previous.image.clone());
+            }
         }
+        self.annotation_state.masks = overlays;
     }
 }
 
@@ -2365,7 +2371,12 @@ impl ScreenshotEditorWindow {
         let paint = LayerPaint {
             annotations: self.project.annotations.clone(),
             temp,
-            masks: self.annotation_state.masks.clone(),
+            masks: self
+                .annotation_state
+                .masks
+                .iter()
+                .filter_map(|entry| entry.value.clone())
+                .collect(),
             selected: self.selected_annotation.clone(),
             editing: self
                 .annotation_state
@@ -3943,34 +3954,49 @@ fn checker_quarters(size: f32) -> Vec<AnyElement> {
 /// pixelate over a 4K screenshot is still not main-thread work.
 fn build_mask_overlays(
     rgba: &[u8],
-    size: (u32, u32),
-    masks: &[Annotation],
-    rect: Rect,
-) -> Vec<MaskOverlay> {
-    let mut overlays = Vec::new();
-    for mask in masks {
-        let Some((x0, y0, processed)) = masked_region_image(rgba, size, mask, rect) else {
-            continue;
-        };
-        overlays.push(MaskOverlay {
+    previous: &[MaskEntry<MaskOverlay>],
+    requests: &[MaskRequest],
+) -> Vec<MaskEntry<MaskOverlay>> {
+    update_masks(previous, requests, |request| {
+        let processed = request.filter(rgba)?;
+        Some(MaskOverlay {
             rect: Rect {
-                x: x0 as f64,
-                y: y0 as f64,
+                x: request.region.0 as f64,
+                y: request.region.1 as f64,
                 width: processed.width() as f64,
                 height: processed.height() as f64,
             },
             image: crate::library::rgba_to_render_image(processed),
-        });
+        })
+    })
+}
+
+fn mask_request(mask: &Annotation, frame: MaskFrame) -> Option<MaskRequest> {
+    if mask.annotation_type != AnnotationType::Mask {
+        return None;
     }
-    overlays
+    Some(MaskRequest {
+        id: mask.id.clone(),
+        region: cap_gpui_kernels::mask_cache::mask_region(
+            [mask.x, mask.y, mask.width, mask.height],
+            frame.content.map(f64::from_bits),
+            frame.size,
+        )?,
+        frame,
+        pixelate: mask.mask_type == Some(MaskType::Pixelate),
+        level: mask
+            .mask_level
+            .unwrap_or(MASK_FALLBACK_LEVEL)
+            .max(1.)
+            .to_bits(),
+    })
 }
 
 /// One mask's blurred or pixelated pixels, sampled from `rgba` (an unmodified
 /// copy of the frame) and returned with the region's top-left in frame
-/// coordinates. This is the single implementation of the two filters -- the
-/// preview's overlay tiles come through it, and so does the export's
-/// `applyMaskAnnotations` pass, which calls it with `rect` set to the whole
-/// canvas (`screenshotExport.ts:290-295` passes `{x:0,y:0,w,h}`).
+/// coordinates. The export's `applyMaskAnnotations` pass calls it with
+/// `rect` set to the whole canvas (`screenshotExport.ts:290-295` passes
+/// `{x:0,y:0,w,h}`).
 pub(crate) fn masked_region_image(
     rgba: &[u8],
     size: (u32, u32),
@@ -4003,18 +4029,11 @@ pub(crate) fn masked_region_image(
 /// One mask's region in whole frame pixels: its own rect, clipped to the
 /// screenshot's content rect and then to the frame.
 fn mask_region(mask: &Annotation, rect: Rect, frame: (u32, u32)) -> Option<(u32, u32, u32, u32)> {
-    let left = rect.x.max(mask.x.min(mask.x + mask.width));
-    let top = rect.y.max(mask.y.min(mask.y + mask.height));
-    let right = (rect.x + rect.width).min(mask.x.max(mask.x + mask.width));
-    let bottom = (rect.y + rect.height).min(mask.y.max(mask.y + mask.height));
-    if right <= left || bottom <= top {
-        return None;
-    }
-    let x0 = (left.round().max(0.) as u32).min(frame.0);
-    let y0 = (top.round().max(0.) as u32).min(frame.1);
-    let x1 = (right.round().max(0.) as u32).min(frame.0);
-    let y1 = (bottom.round().max(0.) as u32).min(frame.1);
-    (x1 > x0 && y1 > y0).then(|| (x0, y0, x1 - x0, y1 - y0))
+    cap_gpui_kernels::mask_cache::mask_region(
+        [mask.x, mask.y, mask.width, mask.height],
+        [rect.x, rect.y, rect.width, rect.height],
+        frame,
+    )
 }
 
 #[cfg(test)]
@@ -4523,10 +4542,21 @@ mod tests {
         pixelate.mask_type = Some(MaskType::Pixelate);
         pixelate.mask_level = Some(7.);
 
-        let overlays = build_mask_overlays(&rgba, frame, &[blur, pixelate], rect);
+        let input = MaskFrame {
+            revision: 1,
+            size: frame,
+            content: [rect.x, rect.y, rect.width, rect.height].map(f64::to_bits),
+            padding: 0_f64.to_bits(),
+            crop: None,
+        };
+        let requests: Vec<_> = [blur, pixelate]
+            .iter()
+            .filter_map(|mask| mask_request(mask, input))
+            .collect();
+        let overlays = build_mask_overlays(&rgba, &[], &requests);
         assert_eq!(overlays.len(), 2);
         assert_eq!(
-            overlays[0].rect,
+            overlays[0].value.as_ref().unwrap().rect,
             Rect {
                 x: 8.,
                 y: 8.,
@@ -4535,7 +4565,7 @@ mod tests {
             }
         );
         assert_eq!(
-            overlays[1].rect,
+            overlays[1].value.as_ref().unwrap().rect,
             Rect {
                 x: 40.,
                 y: 30.,
@@ -4546,7 +4576,18 @@ mod tests {
 
         // A frame buffer that does not match the size it was handed is not
         // sliced at all.
-        assert!(build_mask_overlays(&rgba[..16], frame, &[], rect).is_empty());
+        assert!(
+            build_mask_overlays(&rgba[..16], &[], &requests)
+                .iter()
+                .all(|entry| entry.value.is_none())
+        );
+        let reused = build_mask_overlays(&rgba, &overlays, &requests);
+        for (previous, next) in overlays.iter().zip(&reused) {
+            assert!(Arc::ptr_eq(
+                &previous.value.as_ref().unwrap().image,
+                &next.value.as_ref().unwrap().image
+            ));
+        }
     }
 
     /// A finished stroke stores fractions of its own box, so a later resize
diff --git a/apps/desktop-gpui/src/screenshot_editor.rs b/apps/desktop-gpui/src/screenshot_editor.rs
index 5d727399df5..f5f4175882e 100644
--- a/apps/desktop-gpui/src/screenshot_editor.rs
+++ b/apps/desktop-gpui/src/screenshot_editor.rs
@@ -917,6 +917,7 @@ pub struct ScreenshotEditorWindow {
     /// back to blur/pixelate mask regions (`:537-687`); the mask overlay
     /// resamples this instead of the atlas image.
     pub(crate) frame_rgba: Option<Arc<Vec<u8>>>,
+    pub(crate) mask_frame_revision: u64,
     pub(crate) frame_size: (f32, f32),
     /// `originalImageSize` -- the source PNG's dimensions, which the crop
     /// button gates on and the frame-space transform needs.
@@ -1001,6 +1002,7 @@ impl ScreenshotEditorWindow {
             export_status: ExportStatus::Idle,
             frame: None,
             frame_rgba: None,
+            mask_frame_revision: 0,
             frame_size: (1., 1.),
             image_size: None,
             previous_transform: None,
@@ -1130,6 +1132,10 @@ impl ScreenshotEditorWindow {
         self.rescale_annotations_for(next);
         self.frame_size = next;
         self.frame_rgba = Some(rgba);
+        self.mask_frame_revision = self
+            .mask_frame_revision
+            .checked_add(1)
+            .expect("frame revision");
         self.ready = true;
         if let Some(previous) = self.frame.replace(image) {
             let _ = window.drop_image(previous);

From 63593ed71a707e665996bf5d5f72c2d2c8215ac2 Mon Sep 17 00:00:00 2001
From: flamboh <oliver.boorstein@gmail.com>
Date: Tue, 13 Oct 2026 17:40:55 -0700
Subject: [PATCH 15/74] fix(desktop-gpui): retain duplicate-id screenshot masks
 safely

---
 .../screenshot-mask-cache-benchmark.rs        |  65 ++++++---
 apps/desktop-gpui/kernels/src/mask_cache.rs   | 134 +++++++++++++-----
 .../src/screenshot_annotations.rs             |  82 ++++++++---
 3 files changed, 204 insertions(+), 77 deletions(-)

diff --git a/apps/desktop-gpui/kernels/examples/screenshot-mask-cache-benchmark.rs b/apps/desktop-gpui/kernels/examples/screenshot-mask-cache-benchmark.rs
index 9c1dc29afef..0dfc358085f 100644
--- a/apps/desktop-gpui/kernels/examples/screenshot-mask-cache-benchmark.rs
+++ b/apps/desktop-gpui/kernels/examples/screenshot-mask-cache-benchmark.rs
@@ -4,7 +4,26 @@ use std::{hint::black_box, sync::Arc, time::Instant};
 const SIZE: (u32, u32) = (3840, 2160);
 const WARMUP: usize = 12;
 const EVENTS: usize = 120;
-type Overlay = MaskEntry<Arc<image::RgbaImage>>;
+#[derive(Clone)]
+struct Overlay {
+    rect: [f64; 4],
+    image: Arc<image::RgbaImage>,
+}
+
+type CachedOverlay = MaskEntry<Overlay>;
+
+fn overlay(request: &MaskRequest, rgba: &[u8]) -> Option<Overlay> {
+    let processed = request.filter(rgba)?;
+    Some(Overlay {
+        rect: [
+            f64::from(request.region.0),
+            f64::from(request.region.1),
+            f64::from(processed.width()),
+            f64::from(processed.height()),
+        ],
+        image: Arc::new(processed),
+    })
+}
 
 fn requests(count: usize, pixelate: bool, event: usize) -> Vec<MaskRequest> {
     let content = [0., 0., f64::from(SIZE.0), f64::from(SIZE.1)];
@@ -30,27 +49,25 @@ fn requests(count: usize, pixelate: bool, event: usize) -> Vec<MaskRequest> {
 }
 
 fn rebuild_all(requests: &[MaskRequest], rgba: &[u8], calls: &mut usize) -> Vec<Overlay> {
-    requests
-        .iter()
-        .map(|request| {
-            *calls += 1;
-            MaskEntry {
-                request: request.clone(),
-                value: request.filter(rgba).map(Arc::new),
-            }
-        })
-        .collect()
+    let mut overlays = Vec::new();
+    for request in requests {
+        *calls += 1;
+        if let Some(overlay) = overlay(request, rgba) {
+            overlays.push(overlay);
+        }
+    }
+    overlays
 }
 
 fn cached(
-    previous: &[Overlay],
+    previous: &[CachedOverlay],
     requests: &[MaskRequest],
     rgba: &[u8],
     calls: &mut usize,
-) -> Vec<Overlay> {
+) -> Vec<CachedOverlay> {
     update_masks(previous, requests, |request| {
         *calls += 1;
-        request.filter(rgba).map(Arc::new)
+        overlay(request, rgba)
     })
 }
 
@@ -84,7 +101,7 @@ fn main() {
         "3840x2160 RGBA; 640x360 masks; level 16; {WARMUP} warmup pairs; {EVENTS} measured drag events"
     );
     println!(
-        "Alternating old/new execution order; warm cache; byte comparison after every event outside timing."
+        "Alternating old/new execution order; warm cache; geometry and byte comparison after every event outside timing."
     );
     println!(
         "Includes cache diff, filtering, Arc allocation and retired CPU image release. Excludes GPUI conversion, scheduling, atlas and painting."
@@ -129,12 +146,20 @@ fn main() {
                 assert_eq!(old.len(), count);
                 assert_eq!(new.len(), count);
                 for (old, new) in old.iter().zip(&new) {
-                    assert_eq!(old.request, new.request);
+                    let expected_rect = [
+                        f64::from(new.request.region.0),
+                        f64::from(new.request.region.1),
+                        f64::from(new.request.region.2),
+                        f64::from(new.request.region.3),
+                    ];
+                    assert_eq!(old.rect, expected_rect);
+                    let new_overlay = new.value.as_ref().unwrap();
+                    assert_eq!(old.rect, new_overlay.rect);
                     assert_eq!(
-                        old.value.as_ref().unwrap().as_raw(),
-                        new.value.as_ref().unwrap().as_raw(),
+                        old.image.as_raw(),
+                        new_overlay.image.as_raw(),
                         "event {event}, mask {}",
-                        old.request.id
+                        new.request.id
                     );
                 }
                 if event <= WARMUP {
@@ -156,5 +181,5 @@ fn main() {
             );
         }
     }
-    println!("All overlay bytes matched at every warmup and measured event.");
+    println!("All overlay geometry and bytes matched at every warmup and measured event.");
 }
diff --git a/apps/desktop-gpui/kernels/src/mask_cache.rs b/apps/desktop-gpui/kernels/src/mask_cache.rs
index 9421b9a1ddd..958d09a8eca 100644
--- a/apps/desktop-gpui/kernels/src/mask_cache.rs
+++ b/apps/desktop-gpui/kernels/src/mask_cache.rs
@@ -1,4 +1,5 @@
 use crate::screenshot::mask_filter;
+use std::{collections::HashSet, hash::Hash};
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub struct MaskFrame {
@@ -37,21 +38,63 @@ pub struct MaskEntry<T> {
     pub value: Option<T>,
 }
 
-#[derive(Debug, PartialEq, Eq)]
-pub struct MaskPlan {
-    pub reuse: Vec<Option<usize>>,
-    pub drop: Vec<usize>,
+pub fn plan_masks<T>(previous: &[MaskEntry<T>], requests: &[MaskRequest]) -> Vec<Option<usize>> {
+    let mut used = vec![false; previous.len()];
+    requests
+        .iter()
+        .map(|request| {
+            let index = previous
+                .iter()
+                .enumerate()
+                .position(|(index, entry)| !used[index] && entry.request == *request)?;
+            used[index] = true;
+            Some(index)
+        })
+        .collect()
+}
+
+pub fn retain_masks<T: Clone>(
+    previous: &[MaskEntry<T>],
+    requests: &[MaskRequest],
+) -> Vec<MaskEntry<T>> {
+    let mut matches = plan_masks(previous, requests);
+    let mut used = vec![false; previous.len()];
+    for index in matches.iter().flatten() {
+        used[*index] = true;
+    }
+    for (request, matched) in requests.iter().zip(&mut matches) {
+        if matched.is_none()
+            && let Some(index) = previous
+                .iter()
+                .enumerate()
+                .position(|(index, entry)| !used[index] && entry.request.id == request.id)
+        {
+            used[index] = true;
+            *matched = Some(index);
+        }
+    }
+    matches
+        .into_iter()
+        .flatten()
+        .map(|index| previous[index].clone())
+        .collect()
 }
 
-pub fn plan_masks<T>(previous: &[MaskEntry<T>], requests: &[MaskRequest]) -> MaskPlan {
-    let reuse: Vec<_> = requests
+pub fn retired_mask_values<'a, T, K: Eq + Hash>(
+    previous: &'a [MaskEntry<T>],
+    next: &[MaskEntry<T>],
+    key: impl Fn(&T) -> K,
+) -> Vec<&'a T> {
+    let mut referenced: HashSet<_> = next
         .iter()
-        .map(|request| previous.iter().position(|entry| entry.request == *request))
-        .collect();
-    let drop = (0..previous.len())
-        .filter(|index| !reuse.contains(&Some(*index)))
+        .filter_map(|entry| entry.value.as_ref())
+        .map(&key)
         .collect();
-    MaskPlan { reuse, drop }
+    previous
+        .iter()
+        .filter_map(|entry| entry.value.as_ref())
+        .filter(|value| referenced.insert(key(value)))
+        .collect()
 }
 
 pub fn update_masks<T: Clone>(
@@ -62,7 +105,7 @@ pub fn update_masks<T: Clone>(
     let plan = plan_masks(previous, requests);
     requests
         .iter()
-        .zip(plan.reuse)
+        .zip(plan)
         .map(|(request, reuse)| MaskEntry {
             request: request.clone(),
             value: match reuse {
@@ -128,10 +171,7 @@ mod tests {
         requests[1].region.0 += 1;
         assert_eq!(
             plan_masks(&previous, &requests),
-            MaskPlan {
-                reuse: vec![Some(0), None, Some(2), Some(3)],
-                drop: vec![1],
-            }
+            vec![Some(0), None, Some(2), Some(3)]
         );
         let mut calls = 0;
         let next = update_masks(&previous, &requests, |request| {
@@ -155,10 +195,7 @@ mod tests {
         requests.reverse();
         assert_eq!(
             plan_masks(&previous, &requests),
-            MaskPlan {
-                reuse: vec![Some(3), Some(2), Some(0)],
-                drop: vec![1],
-            }
+            vec![Some(3), Some(2), Some(0)]
         );
         let next = update_masks(&previous, &requests, |_| panic!("unexpected filter"));
         assert_eq!(
@@ -167,7 +204,7 @@ mod tests {
                 .collect::<Vec<_>>(),
             ["3", "2", "0"]
         );
-        assert_eq!(plan_masks(&next, &[]).drop, [0, 1, 2]);
+        assert_eq!(retired_mask_values(&next, &[], Arc::as_ptr).len(), 3);
     }
 
     #[test]
@@ -178,10 +215,7 @@ mod tests {
         requests[1].level = 20_f64.to_bits();
         assert_eq!(
             plan_masks(&previous, &requests),
-            MaskPlan {
-                reuse: vec![None, None, Some(2), None],
-                drop: vec![0, 1],
-            }
+            vec![None, None, Some(2), None]
         );
     }
 
@@ -200,13 +234,7 @@ mod tests {
                     _ => request.frame.crop = Some([1, 0, 64, 48]),
                 }
             }
-            assert_eq!(
-                plan_masks(&previous, &requests),
-                MaskPlan {
-                    reuse: vec![None; 4],
-                    drop: vec![0, 1, 2, 3],
-                }
-            );
+            assert_eq!(plan_masks(&previous, &requests), vec![None; 4]);
         }
     }
 
@@ -216,7 +244,43 @@ mod tests {
         let previous = update_masks::<Arc<String>>(&[], &requests, |_| None);
         let next = update_masks(&previous, &requests, |_| panic!("unexpected filter"));
         assert!(next.iter().all(|entry| entry.value.is_none()));
-        assert_eq!(plan_masks(&previous, &requests).drop, []);
+        assert!(retired_mask_values(&previous, &next, Arc::as_ptr).is_empty());
+    }
+
+    #[test]
+    fn duplicate_ids_reserve_exact_matches_before_retaining_changed_masks() {
+        let mut requests = requests(3);
+        requests[1].id = requests[0].id.clone();
+        let previous = cached(&requests);
+        requests.swap(0, 1);
+        requests[0].region.0 += 1;
+        requests.pop();
+        let retained = retain_masks(&previous, &requests);
+        assert_eq!(retained[0].request, previous[1].request);
+        assert_eq!(retained[1].request, previous[0].request);
+        let retired = retired_mask_values(&previous, &retained, Arc::as_ptr);
+        assert_eq!(retired.len(), 1);
+        assert!(Arc::ptr_eq(retired[0], previous[2].value.as_ref().unwrap()));
+    }
+
+    #[test]
+    fn identical_duplicate_requests_use_each_previous_entry_once() {
+        let request = requests(1).remove(0);
+        let requests = vec![request; 3];
+        let previous = cached(&requests[..2]);
+        assert_eq!(plan_masks(&previous, &requests), [Some(0), Some(1), None]);
+        assert_eq!(retain_masks(&previous, &requests).len(), 2);
+    }
+
+    #[test]
+    fn retirement_preserves_shared_images_and_retires_them_only_once() {
+        let requests = requests(2);
+        let image = Arc::new("shared".to_string());
+        let previous = update_masks(&[], &requests, |_| Some(image.clone()));
+        assert!(retired_mask_values(&previous, &previous[1..], Arc::as_ptr).is_empty());
+        let retired = retired_mask_values(&previous, &[], Arc::as_ptr);
+        assert_eq!(retired.len(), 1);
+        assert!(Arc::ptr_eq(retired[0], &image));
     }
 
     #[test]
@@ -242,9 +306,9 @@ mod tests {
         requests[0].region = mask_region([0.1, 4.1, 32., 24.], content, (64, 48)).unwrap();
         let previous = cached(&requests);
         requests[0].region = mask_region([0.2, 4.2, 32., 24.], content, (64, 48)).unwrap();
-        assert_eq!(plan_masks(&previous, &requests).reuse, [Some(0)]);
+        assert_eq!(plan_masks(&previous, &requests), [Some(0)]);
         requests[0].region = mask_region([0.6, 4.2, 32., 24.], content, (64, 48)).unwrap();
-        assert_eq!(plan_masks(&previous, &requests).reuse, [None]);
+        assert_eq!(plan_masks(&previous, &requests), [None]);
     }
 
     #[test]
diff --git a/apps/desktop-gpui/src/screenshot_annotations.rs b/apps/desktop-gpui/src/screenshot_annotations.rs
index 1f69bdf4a56..484e14e3c67 100644
--- a/apps/desktop-gpui/src/screenshot_annotations.rs
+++ b/apps/desktop-gpui/src/screenshot_annotations.rs
@@ -28,7 +28,9 @@ use std::collections::HashMap;
 use std::rc::Rc;
 use std::sync::Arc;
 
-use cap_gpui_kernels::mask_cache::{MaskEntry, MaskFrame, MaskRequest, update_masks};
+use cap_gpui_kernels::mask_cache::{
+    MaskEntry, MaskFrame, MaskRequest, retain_masks, retired_mask_values, update_masks,
+};
 use cap_project::{Annotation, AnnotationType, AspectRatio, Crop, MaskType};
 use gpui::{
     AnyElement, App, AppContext as _, Bounds, Context, Corners, CursorStyle, Entity, FontWeight,
@@ -2277,21 +2279,12 @@ impl ScreenshotEditorWindow {
         self.annotation_state.mask_task = None;
         self.annotation_state.mask_pending = None;
 
-        let retained: Vec<_> = requests
-            .iter()
-            .filter_map(|request| {
-                self.annotation_state
-                    .masks
-                    .iter()
-                    .find(|entry| entry.request.id == request.id)
-                    .cloned()
-            })
-            .collect();
-        if !retained.iter().map(|entry| &entry.request.id).eq(self
+        let retained = retain_masks(&self.annotation_state.masks, &requests);
+        if !retained.iter().map(|entry| &entry.request).eq(self
             .annotation_state
             .masks
             .iter()
-            .map(|entry| &entry.request.id))
+            .map(|entry| &entry.request))
         {
             self.install_mask_overlays(retained, window);
             cx.notify();
@@ -2332,15 +2325,10 @@ impl ScreenshotEditorWindow {
         overlays: Vec<MaskEntry<MaskOverlay>>,
         window: &mut Window,
     ) {
-        for previous in &self.annotation_state.masks {
-            if let Some(previous) = &previous.value
-                && !overlays
-                    .iter()
-                    .filter_map(|entry| entry.value.as_ref())
-                    .any(|next| Arc::ptr_eq(&previous.image, &next.image))
-            {
-                let _ = window.drop_image(previous.image.clone());
-            }
+        for previous in retired_mask_values(&self.annotation_state.masks, &overlays, |overlay| {
+            Arc::as_ptr(&overlay.image)
+        }) {
+            let _ = window.drop_image(previous.image.clone());
         }
         self.annotation_state.masks = overlays;
     }
@@ -4590,6 +4578,56 @@ mod tests {
         }
     }
 
+    #[test]
+    fn duplicate_mask_ids_keep_both_regions_when_another_mask_is_deleted() {
+        let frame = MaskFrame {
+            revision: 1,
+            size: (64, 48),
+            content: [0., 0., 64., 48.].map(f64::to_bits),
+            padding: 0_f64.to_bits(),
+            crop: None,
+        };
+        let a = shape(AnnotationType::Mask, 0., 0., 16., 16.);
+        let b = shape(AnnotationType::Mask, 32., 24., 16., 16.);
+        let mut c = shape(AnnotationType::Mask, 48., 0., 16., 16.);
+        c.id = "unique".into();
+        assert_eq!(a.id, b.id);
+        let mut requests: Vec<_> = [a, b, c]
+            .iter()
+            .filter_map(|mask| mask_request(mask, frame))
+            .collect();
+        let rgba = vec![128; 64 * 48 * 4];
+        let previous = build_mask_overlays(&rgba, &[], &requests);
+        requests.pop();
+        for reorder in [false, true] {
+            if reorder {
+                requests.reverse();
+            }
+            let retained = retain_masks(&previous, &requests);
+            assert_eq!(retained.len(), 2);
+            for (entry, request) in retained.iter().zip(&requests) {
+                assert_eq!(&entry.request, request);
+                let overlay = entry.value.as_ref().unwrap();
+                assert_eq!(overlay.rect.x, f64::from(request.region.0));
+                assert_eq!(overlay.rect.y, f64::from(request.region.1));
+            }
+            let retired =
+                retired_mask_values(&previous, &retained, |overlay| Arc::as_ptr(&overlay.image));
+            assert_eq!(retired.len(), 1);
+            assert!(Arc::ptr_eq(
+                &retired[0].image,
+                &previous[2].value.as_ref().unwrap().image
+            ));
+            let rebuilt = build_mask_overlays(&rgba, &retained, &requests);
+            assert!(
+                retired_mask_values(&retained, &rebuilt, |overlay| {
+                    Arc::as_ptr(&overlay.image)
+                })
+                .is_empty()
+            );
+        }
+    }
+
     /// A finished stroke stores fractions of its own box, so a later resize
     /// carries the samples with it (`:449-453`, `:915-921`).
     #[test]

From a2b578c1223ffbd8b02f668a29f960d0a928f224 Mon Sep 17 00:00:00 2001
From: flamboh <oliver.boorstein@gmail.com>
Date: Tue, 13 Oct 2026 18:49:21 -0700
Subject: [PATCH 16/74] fix(desktop-gpui): coalesce screenshot mask overlay
 builds

---
 apps/desktop-gpui/kernels/src/mask_cache.rs   | 184 +++++++++++++++++-
 .../src/screenshot_annotations.rs             |  97 ++++++++-
 2 files changed, 268 insertions(+), 13 deletions(-)

diff --git a/apps/desktop-gpui/kernels/src/mask_cache.rs b/apps/desktop-gpui/kernels/src/mask_cache.rs
index 958d09a8eca..b9e3afdcf03 100644
--- a/apps/desktop-gpui/kernels/src/mask_cache.rs
+++ b/apps/desktop-gpui/kernels/src/mask_cache.rs
@@ -38,6 +38,42 @@ pub struct MaskEntry<T> {
     pub value: Option<T>,
 }
 
+pub fn should_cancel_mask_build(previous: &[MaskRequest], requests: &[MaskRequest]) -> bool {
+    let Some(first) = previous.first() else {
+        return true;
+    };
+    if previous
+        .iter()
+        .chain(requests)
+        .any(|request| request.frame != first.frame)
+    {
+        return true;
+    }
+    let mut used = vec![false; requests.len()];
+    previous.iter().any(|request| {
+        let duplicated = previous
+            .iter()
+            .filter(|other| other.id == request.id)
+            .count()
+            > 1
+            || requests
+                .iter()
+                .filter(|other| other.id == request.id)
+                .count()
+                > 1;
+        let matched = requests.iter().enumerate().position(|(index, next)| {
+            !used[index] && next.id == request.id && (!duplicated || next == request)
+        });
+        match matched {
+            Some(index) => {
+                used[index] = true;
+                false
+            }
+            None => true,
+        }
+    })
+}
+
 pub fn plan_masks<T>(previous: &[MaskEntry<T>], requests: &[MaskRequest]) -> Vec<Option<usize>> {
     let mut used = vec![false; previous.len()];
     requests
@@ -53,10 +89,7 @@ pub fn plan_masks<T>(previous: &[MaskEntry<T>], requests: &[MaskRequest]) -> Vec
         .collect()
 }
 
-pub fn retain_masks<T: Clone>(
-    previous: &[MaskEntry<T>],
-    requests: &[MaskRequest],
-) -> Vec<MaskEntry<T>> {
+fn match_masks<T>(previous: &[MaskEntry<T>], requests: &[MaskRequest]) -> Vec<Option<usize>> {
     let mut matches = plan_masks(previous, requests);
     let mut used = vec![false; previous.len()];
     for index in matches.iter().flatten() {
@@ -74,12 +107,38 @@ pub fn retain_masks<T: Clone>(
         }
     }
     matches
+}
+
+pub fn retain_masks<T: Clone>(
+    previous: &[MaskEntry<T>],
+    requests: &[MaskRequest],
+) -> Vec<MaskEntry<T>> {
+    match_masks(previous, requests)
         .into_iter()
         .flatten()
         .map(|index| previous[index].clone())
         .collect()
 }
 
+pub fn finish_mask_build<T: Clone>(
+    current: &[MaskEntry<T>],
+    completed: Vec<MaskEntry<T>>,
+) -> Vec<MaskEntry<T>> {
+    let requests: Vec<_> = completed
+        .iter()
+        .map(|entry| entry.request.clone())
+        .collect();
+    let matches = match_masks(current, &requests);
+    completed
+        .into_iter()
+        .zip(matches)
+        .map(|(entry, matched)| match matched {
+            Some(index) if current[index].request == entry.request => current[index].clone(),
+            _ => entry,
+        })
+        .collect()
+}
+
 pub fn retired_mask_values<'a, T, K: Eq + Hash>(
     previous: &'a [MaskEntry<T>],
     next: &[MaskEntry<T>],
@@ -164,6 +223,123 @@ mod tests {
         update_masks(&[], requests, |request| Some(Arc::new(request.id.clone())))
     }
 
+    #[test]
+    fn mask_build_keeps_moves_styles_additions_and_reorders() {
+        let original = requests(3);
+        for change in 0..5 {
+            let mut next = original.clone();
+            match change {
+                0 => next[0].region.0 += 1,
+                1 => next[0].level = 20_f64.to_bits(),
+                2 => next[0].pixelate = true,
+                3 => next.push(requests(4).pop().unwrap()),
+                _ => next.reverse(),
+            }
+            assert!(!should_cancel_mask_build(&original, &next));
+        }
+        assert!(!should_cancel_mask_build(&original, &original));
+    }
+
+    #[test]
+    fn mask_build_cancels_removals_even_when_another_mask_is_added() {
+        let original = requests(3);
+        assert!(should_cancel_mask_build(&original, &[]));
+        assert!(should_cancel_mask_build(&original, &original[1..]));
+        let mut next = original[1..].to_vec();
+        next.push(requests(4).pop().unwrap());
+        assert!(should_cancel_mask_build(&original, &next));
+    }
+
+    #[test]
+    fn mask_build_cancels_frame_and_layout_changes() {
+        let original = requests(2);
+        for change in 0..5 {
+            let mut next = original.clone();
+            for request in &mut next {
+                match change {
+                    0 => request.frame.revision += 1,
+                    1 => request.frame.size.0 += 1,
+                    2 => request.frame.content[0] = 0.25_f64.to_bits(),
+                    3 => request.frame.padding = 8_f64.to_bits(),
+                    _ => request.frame.crop = Some([0, 0, 32, 24]),
+                }
+            }
+            assert!(should_cancel_mask_build(&original, &next));
+        }
+    }
+
+    #[test]
+    fn mask_build_cancels_ambiguous_duplicate_changes_and_removals() {
+        let mut original = requests(2);
+        original[1].id = original[0].id.clone();
+        let mut next = original.clone();
+        next.reverse();
+        assert!(!should_cancel_mask_build(&original, &next));
+        next[0].region.0 += 1;
+        assert!(should_cancel_mask_build(&original, &next));
+        assert!(should_cancel_mask_build(&original, &original[..1]));
+        next[0] = requests(3).pop().unwrap();
+        assert!(should_cancel_mask_build(&original, &next));
+        let identical = vec![original[0].clone(); 2];
+        assert!(!should_cancel_mask_build(&identical, &identical));
+        assert!(should_cancel_mask_build(&identical, &identical[..1]));
+    }
+
+    #[test]
+    fn mask_build_checks_removal_against_the_latest_coalesced_request() {
+        let initial = requests(1);
+        let added = requests(2);
+        assert!(!should_cancel_mask_build(&initial, &added));
+        assert!(should_cancel_mask_build(&added, &initial));
+        assert!(!should_cancel_mask_build(&initial, &added));
+    }
+
+    #[test]
+    fn mask_build_cancels_inconsistent_frames_and_empty_builds() {
+        let original = requests(2);
+        let mut inconsistent = original.clone();
+        inconsistent[1].frame.revision += 1;
+        assert!(should_cancel_mask_build(&original, &inconsistent));
+        assert!(should_cancel_mask_build(&inconsistent, &original));
+        assert!(should_cancel_mask_build(&[], &original));
+    }
+
+    #[test]
+    fn completed_mask_build_matches_current_duplicates_before_retiring_images() {
+        let mut requests = requests(2);
+        requests[1].id = requests[0].id.clone();
+        let snapshot = cached(&requests);
+        let mut current = cached(&requests);
+        current.reverse();
+        let mut built_requests = requests.clone();
+        built_requests[0].region.0 += 1;
+        let completed = update_masks(&snapshot, &built_requests, |request| {
+            Some(Arc::new(request.id.clone()))
+        });
+        let changed = completed[0].value.clone().unwrap();
+        let installed = finish_mask_build(&current, completed);
+        assert!(Arc::ptr_eq(installed[0].value.as_ref().unwrap(), &changed));
+        assert!(Arc::ptr_eq(
+            installed[1].value.as_ref().unwrap(),
+            current[0].value.as_ref().unwrap()
+        ));
+        let retired = retired_mask_values(&current, &installed, Arc::as_ptr);
+        assert_eq!(retired.len(), 1);
+        assert!(Arc::ptr_eq(retired[0], current[1].value.as_ref().unwrap()));
+    }
+
+    #[test]
+    fn completed_mask_build_does_not_retire_shared_current_images() {
+        let requests = requests(2);
+        let image = Arc::new("shared".to_string());
+        let current = update_masks(&[], &requests, |_| Some(image.clone()));
+        let mut built_requests = requests.clone();
+        built_requests[0].region.0 += 1;
+        let installed = finish_mask_build(&current, cached(&built_requests));
+        assert!(retired_mask_values(&current, &installed, Arc::as_ptr).is_empty());
+        assert!(Arc::ptr_eq(installed[1].value.as_ref().unwrap(), &image));
+    }
+
     #[test]
     fn moving_one_mask_reuses_the_other_images() {
         let mut requests = requests(4);
diff --git a/apps/desktop-gpui/src/screenshot_annotations.rs b/apps/desktop-gpui/src/screenshot_annotations.rs
index 484e14e3c67..2bd7b539353 100644
--- a/apps/desktop-gpui/src/screenshot_annotations.rs
+++ b/apps/desktop-gpui/src/screenshot_annotations.rs
@@ -29,7 +29,8 @@ use std::rc::Rc;
 use std::sync::Arc;
 
 use cap_gpui_kernels::mask_cache::{
-    MaskEntry, MaskFrame, MaskRequest, retain_masks, retired_mask_values, update_masks,
+    MaskEntry, MaskFrame, MaskRequest, finish_mask_build, retain_masks, retired_mask_values,
+    should_cancel_mask_build, update_masks,
 };
 use cap_project::{Annotation, AnnotationType, AspectRatio, Crop, MaskType};
 use gpui::{
@@ -2276,8 +2277,18 @@ impl ScreenshotEditorWindow {
         if self.annotation_state.mask_pending.as_ref() == Some(&requests) {
             return;
         }
-        self.annotation_state.mask_task = None;
-        self.annotation_state.mask_pending = None;
+        let keep_build = self
+            .annotation_state
+            .mask_pending
+            .as_ref()
+            .is_some_and(|pending| !should_cancel_mask_build(pending, &requests));
+        if keep_build {
+            // Cancelling on each drag tick can starve installation even when filtering is fast.
+            self.annotation_state.mask_pending = Some(requests.clone());
+        } else {
+            self.annotation_state.mask_task = None;
+            self.annotation_state.mask_pending = None;
+        }
 
         let retained = retain_masks(&self.annotation_state.masks, &requests);
         if !retained.iter().map(|entry| &entry.request).eq(self
@@ -2289,12 +2300,13 @@ impl ScreenshotEditorWindow {
             self.install_mask_overlays(retained, window);
             cx.notify();
         }
-        if self
-            .annotation_state
-            .masks
-            .iter()
-            .map(|entry| &entry.request)
-            .eq(requests.iter())
+        if keep_build
+            || self
+                .annotation_state
+                .masks
+                .iter()
+                .map(|entry| &entry.request)
+                .eq(requests.iter())
         {
             return;
         }
@@ -2310,6 +2322,7 @@ impl ScreenshotEditorWindow {
                 .spawn(async move { build_mask_overlays(&rgba, &previous, &requests) })
                 .await;
             this.update_in(cx, |this, window, cx| {
+                let overlays = finish_mask_build(&this.annotation_state.masks, overlays);
                 this.install_mask_overlays(overlays, window);
                 this.annotation_state.mask_pending = None;
                 cx.notify();
@@ -4628,6 +4641,72 @@ mod tests {
         }
     }
 
+    #[test]
+    fn coalesced_mask_build_installs_progress_then_catches_up_without_retiring_reused_images() {
+        let frame = MaskFrame {
+            revision: 1,
+            size: (64, 48),
+            content: [0., 0., 64., 48.].map(f64::to_bits),
+            padding: 0_f64.to_bits(),
+            crop: None,
+        };
+        let a = shape(AnnotationType::Mask, 0., 0., 16., 16.);
+        let b = shape(AnnotationType::Mask, 32., 24., 16., 16.);
+        let mut moving = shape(AnnotationType::Mask, 40., 0., 16., 16.);
+        moving.id = "moving".into();
+        let original: Vec<_> = [a, b, moving]
+            .iter()
+            .filter_map(|mask| mask_request(mask, frame))
+            .collect();
+        let rgba = vec![128; 64 * 48 * 4];
+        let previous = build_mask_overlays(&rgba, &[], &original);
+        let mut started = original.clone();
+        started[2].region.0 += 1;
+        let mut latest = started.clone();
+        for _ in 0..8 {
+            let mut next = latest.clone();
+            next[2].region.0 -= 1;
+            assert!(!should_cancel_mask_build(&latest, &next));
+            latest = next;
+        }
+        latest.reverse();
+        assert!(!should_cancel_mask_build(&started, &latest));
+        let current = retain_masks(&previous, &latest);
+        let completed = build_mask_overlays(&rgba, &previous, &started);
+        let installed = finish_mask_build(&current, completed);
+        assert_eq!(installed[2].request, started[2]);
+        let retired =
+            retired_mask_values(&current, &installed, |overlay| Arc::as_ptr(&overlay.image));
+        assert_eq!(retired.len(), 1);
+        assert!(Arc::ptr_eq(
+            &retired[0].image,
+            &previous[2].value.as_ref().unwrap().image
+        ));
+        for index in 0..2 {
+            assert!(Arc::ptr_eq(
+                &installed[index].value.as_ref().unwrap().image,
+                &previous[index].value.as_ref().unwrap().image
+            ));
+        }
+        let retained = retain_masks(&installed, &latest);
+        assert!(
+            retired_mask_values(&installed, &retained, |overlay| Arc::as_ptr(&overlay.image))
+                .is_empty()
+        );
+        let completed = build_mask_overlays(&rgba, &retained, &latest);
+        let caught_up = finish_mask_build(&retained, completed);
+        assert!(
+            caught_up
+                .iter()
+                .map(|entry| &entry.request)
+                .eq(latest.iter())
+        );
+        assert_eq!(
+            retired_mask_values(&retained, &caught_up, |overlay| Arc::as_ptr(&overlay.image)).len(),
+            1
+        );
+    }
+
     /// A finished stroke stores fractions of its own box, so a later resize
     /// carries the samples with it (`:449-453`, `:915-921`).
     #[test]

From 6d804384efe516896663ba58989d51089771bca1 Mon Sep 17 00:00:00 2001
From: Marcos Daniel Rivera Gonzalez
 <139647784+LordOfGrillos@users.noreply.github.com>
Date: Tue, 13 Oct 2026 21:39:52 -0600
Subject: [PATCH 17/74] fix(video-decode): read past Media Foundation samples
 that carry no frame

ReadSample hands back a null sample for stream ticks (gaps in the stream),
and read_sample reported those as Ok(None), the same as the end of the
stream. The decoder then stopped a batch early and answered with an older
frame. Read again until a sample, the end-of-stream flag or an error.
---
 crates/video-decode/src/media_foundation.rs | 46 +++++++++++----------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/crates/video-decode/src/media_foundation.rs b/crates/video-decode/src/media_foundation.rs
index 45b6cf5a351..6b5755214bb 100644
--- a/crates/video-decode/src/media_foundation.rs
+++ b/crates/video-decode/src/media_foundation.rs
@@ -763,32 +763,36 @@ impl MediaFoundationDecoder {
         let mut timestamp = 0i64;
         let mut sample: Option<IMFSample> = None;
 
-        unsafe {
-            self.source_reader
-                .ReadSample(
-                    MF_SOURCE_READER_FIRST_VIDEO_STREAM.0 as u32,
-                    0,
-                    Some(&mut stream_index),
-                    Some(&mut flags),
-                    Some(&mut timestamp),
-                    Some(&mut sample),
-                )
-                .map_err(|e| format!("ReadSample failed: {e:?}"))?;
-        }
-
         const MF_SOURCE_READERF_ENDOFSTREAM: u32 = 0x00000001;
         const MF_SOURCE_READERF_ERROR: u32 = 0x00000002;
 
-        if flags & MF_SOURCE_READERF_ENDOFSTREAM != 0 {
-            return Ok(None);
-        }
+        // A stream tick (a gap in the stream) comes without a sample; only the end-of-stream
+        // flag means no samples follow.
+        let sample = loop {
+            unsafe {
+                self.source_reader
+                    .ReadSample(
+                        MF_SOURCE_READER_FIRST_VIDEO_STREAM.0 as u32,
+                        0,
+                        Some(&mut stream_index),
+                        Some(&mut flags),
+                        Some(&mut timestamp),
+                        Some(&mut sample),
+                    )
+                    .map_err(|e| format!("ReadSample failed: {e:?}"))?;
+            }
 
-        if flags & MF_SOURCE_READERF_ERROR != 0 {
-            return Err("Stream error".to_string());
-        }
+            if flags & MF_SOURCE_READERF_ENDOFSTREAM != 0 {
+                return Ok(None);
+            }
 
-        let Some(sample) = sample else {
-            return Ok(None);
+            if flags & MF_SOURCE_READERF_ERROR != 0 {
+                return Err("Stream error".to_string());
+            }
+
+            if let Some(sample) = sample.take() {
+                break sample;
+            }
         };
 
         let buffer = unsafe {

From ba1f2c2460491946672f293344d3369223293b7d Mon Sep 17 00:00:00 2001
From: Marcos Daniel Rivera Gonzalez
 <139647784+LordOfGrillos@users.noreply.github.com>
Date: Tue, 13 Oct 2026 21:39:53 -0600
Subject: [PATCH 18/74] refactor(rendering): drive the Media Foundation decoder
 from one request state machine

The decoder thread mixed batching, a mid-batch readahead slide, deferred
requests and four fallback chains in one loop. The policy now lives in
FrameRequests, which never touches Media Foundation: the thread takes in
requests, asks it for the next step (seek, decode one sample, or wait) and
does it. Tests drive it with a fake sample stream.

Once the decoder moves past a requested frame, the request gets the newest
sample at or below that frame. Requests are served lowest first, each with
its own seek when decoding forward cannot reach it, so the "first sample
after" fallback only applies to a frame before the stream's first sample.
The cache keeps every sample since the last seek and evicts the oldest, so
the newest sample at or below a frame is always cached.

Behaviour changes:
- Several requests in flight (export transitions between two segments of
  one recording decode both through the same decoder) each get their own
  frame. The highest used to be the target, and a lower one far from it got
  the target's frame.
- A request behind the decoder with nothing cached at or below it seeks back.
  Within half the cache size it used to get the next decoded, later frame.
- Every request slides the readahead, cache hits included, so a sequential
  reader no longer drains the cache while the decoder idles.
- Readahead stops at its frame count, or before the next sample would evict
  the one answering the latest request (frames too big for the cache budget
  used to get a later frame); the per-batch time budget is gone.
- Samples outside the old cache window are cached too, so a frame after a
  VFR gap past the window gets its own sample, not the one before the gap.
- A failed seek answers what waits from the cache instead of reading on from
  the old position as if it had landed.

Export output is byte-identical to the previous decoder on the reference
recording.
---
 .../rendering/src/decoder/media_foundation.rs | 827 +++++++++++-------
 1 file changed, 501 insertions(+), 326 deletions(-)

diff --git a/crates/rendering/src/decoder/media_foundation.rs b/crates/rendering/src/decoder/media_foundation.rs
index fa140793173..09c2f21d69d 100644
--- a/crates/rendering/src/decoder/media_foundation.rs
+++ b/crates/rendering/src/decoder/media_foundation.rs
@@ -230,9 +230,6 @@ impl MFDecoder {
             let video_width = decoder.width();
             let video_height = decoder.height();
 
-            let mut cache = BTreeMap::<u32, CachedFrame>::new();
-            let mut cache_bytes = 0usize;
-            let mut last_decoded_frame: Option<u32> = None;
             let mut health = DecoderHealthMonitor::new();
 
             let init_result = DecoderInitResult {
@@ -242,313 +239,106 @@ impl MFDecoder {
             };
             let _ = ready_tx.send(Ok(init_result));
 
-            struct PendingRequest {
-                frame: u32,
-                time: f32,
-                sender: oneshot::Sender<DecodedFrame>,
-            }
-
-            let mut carried: Option<VideoDecoderMessage> = None;
-            while let Some(r) = carried.take().or_else(|| rx.recv().ok()) {
-                let mut pending_requests: Vec<PendingRequest> = Vec::with_capacity(8);
+            let pixel_count = (video_width as u64) * (video_height as u64);
+            let readahead_frames = if pixel_count > 4_000_000 {
+                8
+            } else if pixel_count > 2_000_000 {
+                15
+            } else {
+                30
+            };
+            let mut requests = FrameRequests::new(readahead_frames);
+            let answer = |sender: oneshot::Sender<DecodedFrame>, frame: Option<CachedFrame>| {
+                let _ = sender.send(frame.map_or_else(
+                    || {
+                        DecodedFrame::new(
+                            vec![0u8; (video_width * video_height * 4) as usize],
+                            video_width,
+                            video_height,
+                        )
+                    },
+                    |frame| frame.to_decoded_frame(),
+                ));
+            };
 
-                let mut push_request =
-                    |requested_time: f32, sender: oneshot::Sender<DecodedFrame>| {
-                        if sender.is_closed() {
-                            return;
-                        }
-                        let frame = (requested_time * fps as f32).floor() as u32;
-                        pending_requests.push(PendingRequest {
-                            frame,
-                            time: requested_time,
-                            sender,
-                        });
+            loop {
+                loop {
+                    let message = match requests.next_step() {
+                        Step::Wait => rx.recv().ok(),
+                        _ => match rx.try_recv() {
+                            Err(mpsc::TryRecvError::Empty) => break,
+                            message => message.ok(),
+                        },
                     };
-
-                match r {
-                    VideoDecoderMessage::GetFrame(requested_time, _, sender) => {
-                        push_request(requested_time, sender);
+                    // Each request borrows a decoder handle, which owns the sender, so once the
+                    // channel is gone nobody is waiting for an answer.
+                    let Some(message) = message else {
+                        return;
+                    };
+                    let VideoDecoderMessage::GetFrame(time, _, sender) = message;
+                    if sender.is_closed() {
+                        continue;
                     }
-                }
 
-                while let Ok(msg) = rx.try_recv() {
-                    match msg {
-                        VideoDecoderMessage::GetFrame(requested_time, _, sender) => {
-                            push_request(requested_time, sender);
+                    let frame = (time * fps as f32).floor() as u32;
+                    match requests.request(frame, sender) {
+                        Some((sender, cached)) => answer(sender, cached),
+                        None => {
+                            health.record_request();
+                            if health.should_warn_unhealthy() {
+                                warn!(
+                                    name = name,
+                                    consecutive_errors = health.consecutive_errors,
+                                    texture_failures = health.consecutive_texture_read_failures,
+                                    total_decoded = health.total_frames_decoded,
+                                    "MediaFoundation decoder unhealthy, performance may degrade"
+                                );
+                            }
                         }
                     }
                 }
-
-                let mut unfulfilled = Vec::with_capacity(pending_requests.len());
-                for req in pending_requests.drain(..) {
-                    if let Some(frame) = cached_frame_for(&cache, last_decoded_frame, req.frame) {
-                        let _ = req.sender.send(frame.to_decoded_frame());
-                    } else if !req.sender.is_closed() {
-                        unfulfilled.push(req);
-                    }
-                }
-                pending_requests = unfulfilled;
-
-                if pending_requests.is_empty() {
-                    continue;
-                }
-
-                pending_requests.sort_by_key(|r| r.frame);
-
-                let target_request = pending_requests.pop().unwrap();
-                let deferred_requests = pending_requests;
-
-                let requested_frame = target_request.frame;
-                let mut sender = Some(target_request.sender);
-
-                health.record_request();
-
-                if health.should_warn_unhealthy() {
-                    warn!(
-                        name = name,
-                        consecutive_errors = health.consecutive_errors,
-                        texture_failures = health.consecutive_texture_read_failures,
-                        total_decoded = health.total_frames_decoded,
-                        "MediaFoundation decoder unhealthy, performance may degrade"
-                    );
-                }
-
-                let mut cache_min = requested_frame.saturating_sub(FRAME_CACHE_SIZE as u32 / 2);
-                let mut cache_max = requested_frame + FRAME_CACHE_SIZE as u32 / 2;
-
-                let needs_seek = last_decoded_frame
-                    .map(|last| {
-                        if requested_frame <= last {
-                            last - requested_frame > FRAME_CACHE_SIZE as u32 / 2
-                        } else {
-                            requested_frame - last > FRAME_CACHE_SIZE as u32
+                requests.waiting.retain(|(_, sender)| !sender.is_closed());
+
+                let answers = match requests.next_step() {
+                    Step::Wait => Vec::new(),
+                    Step::Seek(frame) => match decoder.seek(frame_to_100ns(frame, fps)) {
+                        Ok(()) => {
+                            requests.seeked(frame);
+                            Vec::new()
                         }
-                    })
-                    .unwrap_or(true);
-
-                if needs_seek {
-                    let time_100ns = frame_to_100ns(requested_frame, fps);
-                    if let Err(e) = decoder.seek(time_100ns) {
-                        warn!("MediaFoundation seek failed: {e}");
-                    }
-                    cache.clear();
-                    cache_bytes = 0;
-                    last_decoded_frame = None;
-                }
-
-                let mut last_valid_frame: Option<CachedFrame> = None;
-
-                let pixel_count = (video_width as u64) * (video_height as u64);
-                let readahead_frames = if pixel_count > 4_000_000 {
-                    8u32
-                } else if pixel_count > 2_000_000 {
-                    15u32
-                } else {
-                    30u32
-                };
-                let max_batch_duration = if pixel_count > 4_000_000 {
-                    Duration::from_millis(200)
-                } else if pixel_count > 2_000_000 {
-                    Duration::from_millis(400)
-                } else {
-                    Duration::from_millis(800)
-                };
-                let mut batch_start = Instant::now();
-                let mut readahead_target = requested_frame + readahead_frames;
-
-                loop {
-                    if sender.as_ref().is_some_and(|s| s.is_closed()) {
-                        sender.take();
-                        break;
-                    }
-
-                    if sender.is_none() && batch_start.elapsed() > max_batch_duration {
-                        break;
-                    }
-
-                    // Serve requests that arrive during readahead between samples and slide the
-                    // window with them; otherwise a sequential reader waits out the whole batch
-                    // and then finds the decoder idle while it consumes the cached frames.
-                    if sender.is_none() && deferred_requests.is_empty() {
-                        match rx.try_recv() {
-                            Ok(VideoDecoderMessage::GetFrame(time, distance, reply)) => {
-                                let frame = (time * fps as f32).floor() as u32;
-                                if let Some(cached) =
-                                    cached_frame_for(&cache, last_decoded_frame, frame)
-                                {
-                                    let _ = reply.send(cached.to_decoded_frame());
-                                    readahead_target =
-                                        readahead_target.max(frame + readahead_frames);
-                                    cache_min = frame.saturating_sub(FRAME_CACHE_SIZE as u32 / 2);
-                                    cache_max = frame + FRAME_CACHE_SIZE as u32 / 2;
-                                    batch_start = Instant::now();
-                                    continue;
-                                }
-                                carried =
-                                    Some(VideoDecoderMessage::GetFrame(time, distance, reply));
-                                break;
-                            }
-                            Err(mpsc::TryRecvError::Empty) => {}
-                            Err(mpsc::TryRecvError::Disconnected) => break,
+                        Err(e) => {
+                            warn!("MediaFoundation seek failed: {e}");
+                            requests.stopped()
                         }
-                    }
-
-                    let decode_start = Instant::now();
-                    match decoder.read_sample() {
-                        Ok(Some(mf_frame)) => {
-                            let decode_time = decode_start.elapsed();
-                            let frame_number = pts_100ns_to_frame(mf_frame.pts, fps);
-
-                            let has_valid_zero_copy_handles = {
-                                let null_ptr = std::ptr::null_mut();
-                                mf_frame.textures.y.handle.0 != null_ptr
-                                    && mf_frame.textures.uv.handle.0 != null_ptr
-                            };
-
-                            let nv12_data = if has_valid_zero_copy_handles {
-                                health.record_success(decode_time);
-                                None
-                            } else {
-                                match decoder.read_texture_to_cpu(
-                                    &mf_frame.textures.nv12.texture,
-                                    mf_frame.width,
-                                    mf_frame.height,
-                                ) {
-                                    Ok(data) => {
-                                        health.record_success(decode_time);
-                                        Some(Arc::new(data))
-                                    }
-                                    Err(e) => {
-                                        health.record_texture_read_failure();
-                                        warn!(
-                                            "Failed to read texture to CPU for frame {frame_number}: {e}"
-                                        );
-                                        None
-                                    }
-                                }
-                            };
-
-                            let cached = CachedFrame {
-                                number: frame_number,
-                                _texture: has_valid_zero_copy_handles
-                                    .then(|| mf_frame.textures.nv12.texture.clone()),
-                                _shared_handle: has_valid_zero_copy_handles
-                                    .then_some(mf_frame.textures.nv12.handle),
-                                _y_handle: has_valid_zero_copy_handles
-                                    .then_some(mf_frame.textures.y.handle),
-                                _uv_handle: has_valid_zero_copy_handles
-                                    .then_some(mf_frame.textures.uv.handle),
-                                nv12_data,
-                                width: mf_frame.width,
-                                height: mf_frame.height,
-                            };
-
-                            if !has_valid_zero_copy_handles {
-                                decoder.recycle_textures(mf_frame.textures);
+                    },
+                    Step::Decode => {
+                        let decode_start = Instant::now();
+                        match decoder.read_sample() {
+                            Ok(Some(mf_frame)) => {
+                                let cached = cache_sample(
+                                    &mut decoder,
+                                    mf_frame,
+                                    decode_start.elapsed(),
+                                    &mut health,
+                                    fps,
+                                );
+                                let (number, bytes) = (cached.number, cached.estimated_bytes());
+                                requests.decoded(number, cached, bytes)
                             }
-
-                            last_decoded_frame = Some(frame_number);
-
-                            if frame_number >= cache_min && frame_number <= cache_max {
-                                let frame_bytes = cached.estimated_bytes();
-                                while !cache.is_empty()
-                                    && (cache.len() >= FRAME_CACHE_SIZE
-                                        || cache_bytes.saturating_add(frame_bytes)
-                                            > MAX_FRAME_CACHE_BYTES)
-                                {
-                                    let key_to_remove = if frame_number > requested_frame {
-                                        *cache.keys().next().unwrap()
-                                    } else {
-                                        *cache.keys().next_back().unwrap()
-                                    };
-                                    if let Some(evicted) = cache.remove(&key_to_remove) {
-                                        cache_bytes =
-                                            cache_bytes.saturating_sub(evicted.estimated_bytes());
-                                    }
-                                }
-                                if let Some(replaced) = cache.insert(frame_number, cached.clone()) {
-                                    cache_bytes =
-                                        cache_bytes.saturating_sub(replaced.estimated_bytes());
-                                }
-                                cache_bytes = cache_bytes.saturating_add(frame_bytes);
+                            Ok(None) => requests.stopped(),
+                            Err(e) => {
+                                health.record_error();
+                                warn!(
+                                    consecutive_errors = health.consecutive_errors,
+                                    "MediaFoundation read_sample error: {e}"
+                                );
+                                requests.stopped()
                             }
-
-                            if frame_number <= requested_frame {
-                                last_valid_frame = Some(cached);
-                            }
-
-                            if frame_number > requested_frame {
-                                let frame_to_send = last_valid_frame.as_ref().or_else(|| {
-                                    cache
-                                        .range(..=requested_frame)
-                                        .next_back()
-                                        .map(|(_, f)| f)
-                                        .or_else(|| cache.get(&frame_number))
-                                });
-
-                                if let Some(frame) = frame_to_send
-                                    && let Some(s) = sender.take()
-                                {
-                                    let _ = s.send(frame.to_decoded_frame());
-                                }
-                            }
-
-                            if frame_number >= readahead_target || frame_number > cache_max {
-                                break;
-                            }
-                        }
-                        Ok(None) => {
-                            break;
-                        }
-                        Err(e) => {
-                            health.record_error();
-                            warn!(
-                                consecutive_errors = health.consecutive_errors,
-                                "MediaFoundation read_sample error: {e}"
-                            );
-                            break;
                         }
                     }
-                }
-
-                if let Some(s) = sender.take() {
-                    let fallback = last_valid_frame.as_ref().cloned().or_else(|| {
-                        cache
-                            .range(..=requested_frame)
-                            .next_back()
-                            .or_else(|| cache.range(requested_frame..).next())
-                            .map(|(_, f)| f.clone())
-                    });
-                    if let Some(frame) = fallback {
-                        let _ = s.send(frame.to_decoded_frame());
-                    } else {
-                        let black_frame = DecodedFrame::new(
-                            vec![0u8; (video_width * video_height * 4) as usize],
-                            video_width,
-                            video_height,
-                        );
-                        let _ = s.send(black_frame);
-                    }
-                }
-
-                for req in deferred_requests {
-                    if req.sender.is_closed() {
-                        continue;
-                    }
-                    let frame_to_send = cache
-                        .get(&req.frame)
-                        .or_else(|| cache.range(..=req.frame).next_back().map(|(_, f)| f))
-                        .or(last_valid_frame.as_ref());
-                    if let Some(frame) = frame_to_send {
-                        let _ = req.sender.send(frame.to_decoded_frame());
-                    } else {
-                        let black_frame = DecodedFrame::new(
-                            vec![0u8; (video_width * video_height * 4) as usize],
-                            video_width,
-                            video_height,
-                        );
-                        let _ = req.sender.send(black_frame);
-                    }
+                };
+                for (sender, cached) in answers {
+                    answer(sender, cached);
                 }
             }
         });
@@ -568,22 +358,215 @@ fn pts_100ns_to_frame(pts_100ns: i64, fps: u32) -> u32 {
     super::pts_to_frame(pts_100ns, ::ffmpeg::Rational::new(1, 10_000_000), fps)
 }
 
-// A frame the decoder has not moved past yet has to be decoded: answering with
-// the cached frame before it shows a stale image at every readahead boundary,
-// and a VFR stream can still have a later sample rounding to the same frame
-// (which replaces it in the cache), so answering early would make the choice
-// depend on request timing. Once the decoder is past a missing frame, the
-// stream has no frame there, and the latest earlier one is the hold the video
-// really shows.
-fn cached_frame_for<T>(
-    cache: &BTreeMap<u32, T>,
-    last_decoded: Option<u32>,
-    frame: u32,
-) -> Option<&T> {
-    last_decoded
-        .is_some_and(|last| last > frame)
-        .then(|| cache.range(..=frame).next_back().map(|(_, cached)| cached))
-        .flatten()
+fn cache_sample(
+    decoder: &mut cap_video_decode::MediaFoundationDecoder,
+    mf_frame: cap_video_decode::MFDecodedFrame,
+    decode_time: Duration,
+    health: &mut DecoderHealthMonitor,
+    fps: u32,
+) -> CachedFrame {
+    let frame_number = pts_100ns_to_frame(mf_frame.pts, fps);
+
+    let has_valid_zero_copy_handles = {
+        let null_ptr = std::ptr::null_mut();
+        mf_frame.textures.y.handle.0 != null_ptr && mf_frame.textures.uv.handle.0 != null_ptr
+    };
+
+    let nv12_data = if has_valid_zero_copy_handles {
+        health.record_success(decode_time);
+        None
+    } else {
+        match decoder.read_texture_to_cpu(
+            &mf_frame.textures.nv12.texture,
+            mf_frame.width,
+            mf_frame.height,
+        ) {
+            Ok(data) => {
+                health.record_success(decode_time);
+                Some(Arc::new(data))
+            }
+            Err(e) => {
+                health.record_texture_read_failure();
+                warn!("Failed to read texture to CPU for frame {frame_number}: {e}");
+                None
+            }
+        }
+    };
+
+    let cached = CachedFrame {
+        number: frame_number,
+        _texture: has_valid_zero_copy_handles.then(|| mf_frame.textures.nv12.texture.clone()),
+        _shared_handle: has_valid_zero_copy_handles.then_some(mf_frame.textures.nv12.handle),
+        _y_handle: has_valid_zero_copy_handles.then_some(mf_frame.textures.y.handle),
+        _uv_handle: has_valid_zero_copy_handles.then_some(mf_frame.textures.uv.handle),
+        nv12_data,
+        width: mf_frame.width,
+        height: mf_frame.height,
+    };
+
+    if !has_valid_zero_copy_handles {
+        decoder.recycle_textures(mf_frame.textures);
+    }
+    cached
+}
+
+enum Step {
+    Seek(u32),
+    Decode,
+    Wait,
+}
+
+type Answer<T, R> = (R, Option<T>);
+
+// The decoder thread's request policy, kept apart from Media Foundation so tests can drive
+// it. A request is answered with the newest sample at or below its frame once the decoder
+// has moved past that frame: a VFR stream can still have a later sample rounding to the same
+// frame (which replaces it), so answering earlier would make the choice depend on request
+// timing. Once the decoder is past a frame the stream has no sample for, the one before it is
+// the hold the video really shows.
+struct FrameRequests<T, R> {
+    // Every sample since the last seek minus the oldest evicted, so the newest entry at or
+    // below a frame is the stream's newest sample there.
+    cache: BTreeMap<u32, (T, usize)>,
+    cache_bytes: usize,
+    waiting: Vec<(u32, R)>,
+    seeked_to: Option<u32>,
+    readahead_frames: u32,
+    latest_request: Option<u32>,
+}
+
+impl<T: Clone, R> FrameRequests<T, R> {
+    fn new(readahead_frames: u32) -> Self {
+        Self {
+            cache: BTreeMap::new(),
+            cache_bytes: 0,
+            waiting: Vec::new(),
+            seeked_to: None,
+            readahead_frames,
+            latest_request: None,
+        }
+    }
+
+    fn newest(&self) -> Option<u32> {
+        self.cache.last_key_value().map(|(&frame, _)| frame)
+    }
+
+    fn newest_at(&self, frame: u32) -> Option<&T> {
+        self.cache
+            .range(..=frame)
+            .next_back()
+            .map(|(_, (sample, _))| sample)
+    }
+
+    // A seek lands on the keyframe before its target, which can be any distance below it.
+    fn position(&self) -> Option<u32> {
+        self.newest().max(self.seeked_to)
+    }
+
+    fn request(&mut self, frame: u32, reply: R) -> Option<Answer<T, R>> {
+        self.latest_request = Some(frame);
+        if self.newest().is_some_and(|newest| newest > frame)
+            && let Some(sample) = self.newest_at(frame)
+        {
+            return Some((reply, Some(sample.clone())));
+        }
+        self.waiting.push((frame, reply));
+        None
+    }
+
+    // The lowest waiting frame goes first, so each request gets its own sample instead of
+    // whatever a seek for a later one lands on. Decoding forward only reaches frames from the
+    // newest sample on, so one below it seeks back.
+    fn next_step(&self) -> Step {
+        let Some(target) = self.waiting.iter().map(|(frame, _)| *frame).min() else {
+            return if self.wants_readahead() {
+                Step::Decode
+            } else {
+                Step::Wait
+            };
+        };
+        let reachable = self
+            .newest()
+            .or(self.seeked_to)
+            .zip(self.position())
+            .is_some_and(|(from, position)| {
+                (from..=position.saturating_add(FRAME_CACHE_SIZE as u32)).contains(&target)
+            });
+        if reachable {
+            Step::Decode
+        } else {
+            Step::Seek(target)
+        }
+    }
+
+    // Readahead stops before the next sample would evict the one answering the latest
+    // request: with frames too big for the cache budget, that would send every request back
+    // to a seek.
+    fn wants_readahead(&self) -> bool {
+        let (Some(position), Some(latest)) = (self.position(), self.latest_request) else {
+            return false;
+        };
+        let full = self.cache.last_key_value().is_some_and(|(_, (_, bytes))| {
+            self.cache.len() >= FRAME_CACHE_SIZE || self.cache_bytes + bytes > MAX_FRAME_CACHE_BYTES
+        });
+        let evicts_shown = full && self.cache.range(..=latest).nth(1).is_none();
+        position < latest.saturating_add(self.readahead_frames) && !evicts_shown
+    }
+
+    fn seeked(&mut self, frame: u32) {
+        self.cache.clear();
+        self.cache_bytes = 0;
+        self.seeked_to = Some(frame);
+    }
+
+    // A waiting frame the decoder jumped past has no sample at or below it since the seek, so
+    // it gets the first one after.
+    fn decoded(&mut self, frame: u32, sample: T, bytes: usize) -> Vec<Answer<T, R>> {
+        let (passed, waiting): (Vec<_>, _) = std::mem::take(&mut self.waiting)
+            .into_iter()
+            .partition(|(requested, _)| *requested < frame);
+        self.waiting = waiting;
+        let answers = passed
+            .into_iter()
+            .map(|(requested, reply)| {
+                let held = self.newest_at(requested).unwrap_or(&sample);
+                (reply, Some(held.clone()))
+            })
+            .collect();
+
+        if let Some((_, replaced)) = self.cache.remove(&frame) {
+            self.cache_bytes -= replaced;
+        }
+        while !self.cache.is_empty()
+            && (self.cache.len() >= FRAME_CACHE_SIZE
+                || self.cache_bytes + bytes > MAX_FRAME_CACHE_BYTES)
+        {
+            if let Some((_, (_, evicted))) = self.cache.pop_first() {
+                self.cache_bytes -= evicted;
+            }
+        }
+        self.cache.insert(frame, (sample, bytes));
+        self.cache_bytes += bytes;
+        answers
+    }
+
+    // No sample came (end of stream or a read error), so nothing reads again until the next
+    // request.
+    fn stopped(&mut self) -> Vec<Answer<T, R>> {
+        self.latest_request = None;
+        std::mem::take(&mut self.waiting)
+            .into_iter()
+            .map(|(frame, reply)| {
+                let nearest = self.newest_at(frame).or_else(|| {
+                    self.cache
+                        .range(frame..)
+                        .next()
+                        .map(|(_, (sample, _))| sample)
+                });
+                (reply, nearest.cloned())
+            })
+            .collect()
+    }
 }
 
 #[cfg(test)]
@@ -598,26 +581,218 @@ mod tests {
         assert_eq!(pts_100ns_to_frame(10_000_000, 30), 30);
     }
 
+    // Samples are their index in `frames`, which holds the frame each one rounds to.
+    struct FakeStream {
+        frames: Vec<u32>,
+        keyframe_every: usize,
+        next: usize,
+        reads: usize,
+        seeks: usize,
+        bytes: usize,
+        fail_next_read: bool,
+    }
+
+    impl FakeStream {
+        fn new(frames: impl IntoIterator<Item = u32>, keyframe_every: usize) -> Self {
+            Self {
+                frames: frames.into_iter().collect(),
+                keyframe_every,
+                next: 0,
+                reads: 0,
+                seeks: 0,
+                bytes: 1,
+                fail_next_read: false,
+            }
+        }
+
+        fn step(
+            &mut self,
+            requests: &mut FrameRequests<usize, usize>,
+        ) -> Option<Vec<Answer<usize, usize>>> {
+            match requests.next_step() {
+                Step::Wait => None,
+                Step::Seek(frame) => {
+                    let at = self.frames.iter().rposition(|&f| f <= frame).unwrap_or(0);
+                    self.next = at - at % self.keyframe_every;
+                    self.seeks += 1;
+                    assert!(self.seeks < 100, "seek loop");
+                    requests.seeked(frame);
+                    Some(Vec::new())
+                }
+                Step::Decode => {
+                    self.reads += 1;
+                    Some(if std::mem::take(&mut self.fail_next_read) {
+                        requests.stopped()
+                    } else if let Some(&frame) = self.frames.get(self.next) {
+                        self.next += 1;
+                        requests.decoded(frame, self.next - 1, self.bytes)
+                    } else {
+                        requests.stopped()
+                    })
+                }
+            }
+        }
+
+        fn run(&mut self, requests: &mut FrameRequests<usize, usize>) -> Vec<Answer<usize, usize>> {
+            let mut answers = Vec::new();
+            while let Some(step) = self.step(requests) {
+                answers.extend(step);
+            }
+            answers
+        }
+    }
+
     #[test]
-    fn an_undecoded_frame_is_not_answered_with_the_one_before_it() {
-        let cache = BTreeMap::from([(14, 'a'), (15, 'b')]);
-        assert_eq!(cached_frame_for(&cache, Some(15), 16), None);
-        assert_eq!(cached_frame_for(&cache, Some(15), 17), None);
+    fn a_frame_is_answered_once_the_decoder_moves_past_it() {
+        let mut requests = FrameRequests::new(0);
+        let mut stream = FakeStream::new(0..20, 1);
+        assert!(requests.request(15, 0).is_none());
+        assert_eq!(stream.run(&mut requests), [(0, Some(15))]);
+        assert!(requests.request(16, 1).is_none());
+        assert_eq!(requests.request(15, 2), Some((2, Some(15))));
+        assert_eq!(stream.run(&mut requests), [(1, Some(16))]);
     }
 
     #[test]
-    fn the_newest_decoded_frame_waits_for_a_later_sample() {
-        let cache = BTreeMap::from([(14, 'a'), (15, 'b')]);
-        assert_eq!(cached_frame_for(&cache, Some(15), 14), Some(&'a'));
-        assert_eq!(cached_frame_for(&cache, Some(15), 15), None);
-        assert_eq!(cached_frame_for(&cache, Some(16), 15), Some(&'b'));
+    fn colliding_vfr_samples_answer_the_same_whenever_requested() {
+        let frames = [0, 1, 1, 2, 3];
+
+        let mut early = FrameRequests::new(0);
+        let mut stream = FakeStream::new(frames, 10);
+        early.request(1, 0);
+        assert_eq!(stream.run(&mut early), [(0, Some(2))]);
+
+        let mut late = FrameRequests::new(0);
+        let mut stream = FakeStream::new(frames, 10);
+        late.request(0, 0);
+        assert_eq!(stream.run(&mut late), [(0, Some(0))]);
+        assert!(late.request(1, 1).is_none());
+        assert_eq!(stream.run(&mut late), [(1, Some(2))]);
     }
 
     #[test]
     fn a_frame_the_stream_skipped_holds_the_previous_one() {
-        let cache = BTreeMap::from([(14, 'a'), (17, 'b')]);
-        assert_eq!(cached_frame_for(&cache, Some(17), 15), Some(&'a'));
-        assert_eq!(cached_frame_for(&cache, Some(17), 16), Some(&'a'));
-        assert_eq!(cached_frame_for(&cache, None, 16), None);
+        let mut requests = FrameRequests::new(0);
+        let mut stream = FakeStream::new([1, 4, 5], 10);
+        requests.request(0, 0);
+        requests.request(2, 1);
+        requests.request(3, 2);
+        assert_eq!(
+            stream.run(&mut requests),
+            [(0, Some(0)), (1, Some(0)), (2, Some(0))]
+        );
+    }
+
+    #[test]
+    fn readahead_slides_with_every_request() {
+        let mut requests = FrameRequests::new(5);
+        let mut stream = FakeStream::new(0..100, 30);
+        requests.request(0, 0);
+        assert_eq!(stream.run(&mut requests), [(0, Some(0))]);
+        for frame in 1..40 {
+            let sample = frame as usize;
+            assert_eq!(
+                requests.request(frame, sample),
+                Some((sample, Some(sample)))
+            );
+            assert!(stream.run(&mut requests).is_empty());
+            assert_eq!(requests.position(), Some(frame + 5));
+        }
+        assert_eq!(stream.seeks, 1);
+    }
+
+    #[test]
+    fn readahead_never_evicts_a_frame_still_being_shown() {
+        let frames: Vec<u32> = (0..=10).chain(50..=90).collect();
+        let mut requests = FrameRequests::new(8);
+        let mut stream = FakeStream::new(frames.clone(), 100);
+        stream.bytes = MAX_FRAME_CACHE_BYTES / 2;
+        for frame in 0..70 {
+            let mut answers: Vec<_> = requests.request(frame, 0).into_iter().collect();
+            answers.extend(stream.run(&mut requests));
+            assert_eq!(answers, [(0, frames.iter().rposition(|&f| f <= frame))]);
+        }
+        assert_eq!(stream.seeks, 1);
+    }
+
+    #[test]
+    fn every_waiting_request_gets_its_own_frame() {
+        let mut requests = FrameRequests::new(0);
+        let mut stream = FakeStream::new(0..400, 30);
+        requests.request(300, 0);
+        requests.request(30, 1);
+        assert_eq!(stream.run(&mut requests), [(1, Some(30)), (0, Some(300))]);
+        assert_eq!(stream.seeks, 2);
+    }
+
+    #[test]
+    fn a_passed_frame_missing_from_the_cache_seeks_back() {
+        let mut requests = FrameRequests::new(30);
+        let mut stream = FakeStream::new(0..200, 10);
+        requests.request(100, 0);
+        assert_eq!(stream.run(&mut requests), [(0, Some(100))]);
+        assert!(requests.request(90, 1).is_none());
+        assert_eq!(stream.run(&mut requests), [(1, Some(90))]);
+        assert_eq!(stream.seeks, 2);
+    }
+
+    #[test]
+    fn far_requests_seek_and_near_ones_decode_through() {
+        let mut requests = FrameRequests::new(0);
+        let mut stream = FakeStream::new(0..400, 30);
+        requests.request(10, 0);
+        stream.run(&mut requests);
+        requests.request(90, 1);
+        assert_eq!(stream.run(&mut requests), [(1, Some(90))]);
+        assert_eq!(stream.seeks, 1);
+        requests.request(300, 2);
+        assert_eq!(stream.run(&mut requests), [(2, Some(300))]);
+        assert_eq!(stream.seeks, 2);
+    }
+
+    #[test]
+    fn a_seek_decodes_through_a_long_gop_without_seeking_again() {
+        let mut requests = FrameRequests::new(0);
+        let mut stream = FakeStream::new(0..400, 200);
+        requests.request(150, 0);
+        assert_eq!(stream.run(&mut requests), [(0, Some(150))]);
+        assert_eq!(stream.seeks, 1);
+    }
+
+    #[test]
+    fn a_request_inside_a_seeks_preroll_decodes_through() {
+        let mut requests = FrameRequests::new(0);
+        let mut stream = FakeStream::new(0..400, 30);
+        requests.request(310, 0);
+        stream.step(&mut requests);
+        stream.step(&mut requests);
+        assert_eq!(requests.newest(), Some(300));
+        requests.request(305, 1);
+        assert_eq!(stream.run(&mut requests), [(1, Some(305)), (0, Some(310))]);
+        assert_eq!(stream.seeks, 1);
+    }
+
+    #[test]
+    fn the_end_of_the_stream_holds_its_last_frame() {
+        let mut requests = FrameRequests::new(30);
+        let mut stream = FakeStream::new(0..5, 10);
+        requests.request(3, 0);
+        assert_eq!(stream.run(&mut requests), [(0, Some(3))]);
+        assert!(requests.request(4, 1).is_none());
+        assert!(requests.request(60, 2).is_none());
+        assert_eq!(stream.run(&mut requests), [(1, Some(4)), (2, Some(4))]);
+    }
+
+    #[test]
+    fn a_read_error_answers_what_waits_and_the_next_request_retries() {
+        let mut requests = FrameRequests::new(0);
+        let mut stream = FakeStream::new(0..10, 10);
+        requests.request(0, 0);
+        stream.run(&mut requests);
+        requests.request(5, 1);
+        stream.fail_next_read = true;
+        assert_eq!(stream.run(&mut requests), [(1, Some(1))]);
+        requests.request(5, 2);
+        assert_eq!(stream.run(&mut requests), [(2, Some(5))]);
     }
 }

From db5c227cd2b7c1cdc6d77fa3f0f5c88c2a1c85f4 Mon Sep 17 00:00:00 2001
From: EfeDurmaz16 <efebarandurmaz05@gmail.com>
Date: Wed, 14 Oct 2026 13:08:50 +0300
Subject: [PATCH 19/74] perf(gpui): skip unused PCM preparation for video-only
 exports

---
 apps/desktop-gpui/src/editor_export.rs |  5 ++++-
 crates/export/src/lib.rs               | 18 ++++++++++++++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/apps/desktop-gpui/src/editor_export.rs b/apps/desktop-gpui/src/editor_export.rs
index abbf6d98e15..d1b439e3d44 100644
--- a/apps/desktop-gpui/src/editor_export.rs
+++ b/apps/desktop-gpui/src/editor_export.rs
@@ -2928,7 +2928,10 @@ async fn run_export(
         let total = base.total_frames(fps);
         (PreparedBase::Mp4(base), total)
     } else {
-        let base = builder.build().await.map_err(|error| error.to_string())?;
+        let base = builder
+            .build_video_only()
+            .await
+            .map_err(|error| error.to_string())?;
         let total = base.total_frames(fps);
         (PreparedBase::Other(base), total)
     };
diff --git a/crates/export/src/lib.rs b/crates/export/src/lib.rs
index 1a5667796f9..9591ebd19ac 100644
--- a/crates/export/src/lib.rs
+++ b/crates/export/src/lib.rs
@@ -85,14 +85,18 @@ impl ExporterBuilder {
     }
 
     pub async fn build(self) -> Result<ExporterBase, ExporterBuildError> {
-        self.build_inner(None).await
+        self.build_inner(None, true).await
+    }
+
+    pub async fn build_video_only(self) -> Result<ExporterBase, ExporterBuildError> {
+        self.build_inner(None, false).await
     }
 
     pub async fn build_for_mp4(
         self,
         cancellation: Arc<AtomicBool>,
     ) -> Result<Mp4ExporterBase, ExporterBuildError> {
-        self.build_inner(Some(cancellation))
+        self.build_inner(Some(cancellation), true)
             .await
             .map(Mp4ExporterBase)
     }
@@ -110,6 +114,7 @@ impl ExporterBuilder {
     async fn build_inner(
         mut self,
         cancellation: Option<Arc<AtomicBool>>,
+        include_audio: bool,
     ) -> Result<ExporterBase, ExporterBuildError> {
         type Error = ExporterBuildError;
 
@@ -179,6 +184,15 @@ impl ExporterBuilder {
             let (segments, audio) =
                 finish_audio_preparation(segments, preparation, &control.stop).await?;
             (segments, Some(audio))
+        } else if !include_audio {
+            let segments = cap_editor::create_segments_without_audio(
+                &recording_meta,
+                studio_meta,
+                self.force_ffmpeg_decoder,
+            )
+            .await
+            .map_err(Error::MediaLoad)?;
+            (segments, None)
         } else {
             let segments = cap_editor::create_segments(
                 &recording_meta,

From 0702ab69f8846af817f4dd52e8da32501f58ac12 Mon Sep 17 00:00:00 2001
From: EfeDurmaz16 <efebarandurmaz05@gmail.com>
Date: Wed, 14 Oct 2026 13:08:50 +0300
Subject: [PATCH 20/74] test(gpui): benchmark complete video-only exports

---
 .../docs/video-only-export-performance.md     |  97 ++++++++
 .../examples/video-only-preparation.rs        | 209 ++++++++++++++++++
 scripts/check-video-only-export-parity.py     |  74 +++++++
 scripts/prepare-video-only-export-fixture.py  | 119 ++++++++++
 4 files changed, 499 insertions(+)
 create mode 100644 apps/desktop-gpui/docs/video-only-export-performance.md
 create mode 100644 apps/desktop-gpui/examples/video-only-preparation.rs
 create mode 100644 scripts/check-video-only-export-parity.py
 create mode 100644 scripts/prepare-video-only-export-fixture.py

diff --git a/apps/desktop-gpui/docs/video-only-export-performance.md b/apps/desktop-gpui/docs/video-only-export-performance.md
new file mode 100644
index 00000000000..6f4ac85bfea
--- /dev/null
+++ b/apps/desktop-gpui/docs/video-only-export-performance.md
@@ -0,0 +1,97 @@
+# Video-only export preparation
+
+GIF and cursor-only MOV export no audio. Their GPUI preparation previously
+waited for every recording mic/system track to decode into retained PCM.
+`build_video_only()` uses the existing segment loader without audio. Generic
+`build()` and MP4 preparation keep their existing behavior. Recording metadata
+still probes audio files; this change removes full PCM decoding and retention,
+not all audio I/O.
+
+## Measurements
+
+Baseline source: `68d6c31b44db6b3c68d8da7510b159c538c06d49`.
+Measured on Apple M5 Pro, macOS 26.6.2 (25G83), Rust 1.97.1.
+Three paired repetitions per format/input, alternating pair order, separate
+processes, same release binary with baseline and video-only modes. The binary
+used the GPUI release profile: optimization level 3, thin LTO, one codegen unit.
+It called actual `ExporterBuilder` and GIF/ProRes encoders. The timer includes
+builder setup through encoder finish, excluding configuration JSON loading,
+fixture generation, validation, and GPUI dialogs/UI.
+
+Synthetic inputs: 30-second control and 1800-second stress recordings, each
+with two stereo AAC tracks at 48 kHz and a four-second trimmed timeline.
+Output is 640x360 at 15 fps, 60 decoded frames. Cursor fixtures reuse checked-in
+CLI assets with normalized movement, a shape change, and one click.
+
+| Source | Format | Median total, baseline to candidate | Median peak RSS, baseline to candidate |
+|---|---|---|---|
+| 30 s | GIF | 0.209761 to 0.197071 s | 138.98 to 122.94 MiB |
+| 30 s | Cursor MOV | 0.460177 to 0.450832 s | 88.77 to 66.45 MiB |
+| 1800 s | GIF | 0.871047 to 0.209086 s | 1458.03 to 123.23 MiB |
+| 1800 s | Cursor MOV | 1.120212 to 0.479418 s | 1397.25 to 69.45 MiB |
+
+All 12 baseline/candidate pairs passed decoded RGBA checksums, frame count,
+PTS/order/duration and stream metadata parity, with no audio stream. All six
+MOV pairs additionally passed decoded alpha parity and visible moving alpha.
+Results establish the benefit for these trimmed synthetic inputs; they do not
+predict export speedups for every recording. Short controls show modest gains.
+
+## Reproduce
+
+Requires the project's native FFmpeg setup, `ffmpeg`, `ffprobe`, and Python 3.
+Use the GPUI lockfile and workspace to retain its dependency pins. Build once,
+then time separate binary processes; exclude Cargo/build time from results.
+
+```sh
+python3 scripts/prepare-video-only-export-fixture.py /tmp/video-only-1800.cap --source-seconds 1800 --export-seconds 4 --with-cursor
+cargo +stable run --manifest-path apps/desktop-gpui/Cargo.toml --example video-only-preparation --release -- --project /tmp/video-only-1800.cap --output /tmp/video-only-baseline.gif --mode baseline --format gif
+cargo +stable run --manifest-path apps/desktop-gpui/Cargo.toml --example video-only-preparation --release -- --project /tmp/video-only-1800.cap --output /tmp/video-only-candidate.gif --mode video-only --format gif
+python3 scripts/check-video-only-export-parity.py /tmp/video-only-baseline.gif /tmp/video-only-candidate.gif
+```
+
+For MOV use `--format cursor-mov`, `.mov` output paths, and parity flags
+`--alpha --require-visible-alpha`. Repeat with `--source-seconds 30` for the
+control. Use unique output paths because the example refuses existing files.
+Capture JSON stdout and `/usr/bin/time -l` stderr for peak RSS on macOS.
+`--build-only` isolates preparation but is not a complete-export benchmark.
+The first progress timestamp measures a callback, not an encoded packet.
+
+Corrupt unused audio can now produce a video-only export after a metadata
+warning instead of failing the complete PCM/EOF wait. Display-video errors
+still fail preparation. Native GPUI UI timing and cancellation are outside
+these measurements. Separate source-loading checks passed: no-audio succeeds
+in both modes; invalid mic fails baseline and passes video-only; invalid
+display fails both modes.
+
+<details>
+<summary>Raw samples</summary>
+
+```csv
+source_seconds,format,repetition,mode,build_secs,total_secs,peak_rss_mib
+30,Gif,0,Baseline,0.056724625,0.360145084,156.609375
+30,Gif,0,VideoOnly,0.012039167,0.189455042,122.937500
+30,Gif,1,VideoOnly,0.012658167,0.199531333,122.906250
+30,Gif,1,Baseline,0.022580584,0.205054375,138.984375
+30,Gif,2,Baseline,0.020476042,0.209760750,133.125000
+30,Gif,2,VideoOnly,0.009499250,0.197070667,137.000000
+30,CursorMov,0,Baseline,0.021880417,0.460177125,88.765625
+30,CursorMov,0,VideoOnly,0.011225542,0.450831625,66.375000
+30,CursorMov,1,VideoOnly,0.012083208,0.459454000,66.593750
+30,CursorMov,1,Baseline,0.021884542,0.456129417,88.562500
+30,CursorMov,2,Baseline,0.024268625,0.472918166,88.968750
+30,CursorMov,2,VideoOnly,0.009287208,0.446681750,66.453125
+1800,Gif,0,Baseline,0.657632584,0.846303542,1459.031250
+1800,Gif,0,VideoOnly,0.012863292,0.209086459,123.468750
+1800,Gif,1,VideoOnly,0.012166709,0.196155334,117.234375
+1800,Gif,1,Baseline,0.664888292,0.871047209,1458.031250
+1800,Gif,2,Baseline,0.685738792,0.914366584,1450.703125
+1800,Gif,2,VideoOnly,0.013697875,0.216982000,123.234375
+1800,CursorMov,0,Baseline,0.668535250,1.155541958,1397.250000
+1800,CursorMov,0,VideoOnly,0.015395500,0.499813208,69.453125
+1800,CursorMov,1,VideoOnly,0.015545292,0.475296500,68.562500
+1800,CursorMov,1,Baseline,0.642078958,1.118089667,1398.000000
+1800,CursorMov,2,Baseline,0.639165958,1.120211791,1397.203125
+1800,CursorMov,2,VideoOnly,0.015095083,0.479417500,70.343750
+```
+
+</details>
diff --git a/apps/desktop-gpui/examples/video-only-preparation.rs b/apps/desktop-gpui/examples/video-only-preparation.rs
new file mode 100644
index 00000000000..dd5ef48ef53
--- /dev/null
+++ b/apps/desktop-gpui/examples/video-only-preparation.rs
@@ -0,0 +1,209 @@
+use std::{
+    collections::HashMap,
+    path::PathBuf,
+    sync::{
+        Arc,
+        atomic::{AtomicU32, AtomicU64, Ordering},
+    },
+    time::Instant,
+};
+
+use cap_export::{
+    ExporterBase, gif::GifExportSettings, make_cursor_only_project, mov::MovExportSettings,
+};
+use cap_project::{ProjectConfiguration, XY};
+
+#[derive(Clone, Copy, Debug)]
+enum Mode {
+    Baseline,
+    VideoOnly,
+}
+
+#[derive(Clone, Copy, Debug)]
+enum Format {
+    Gif,
+    CursorMov,
+}
+
+#[derive(Debug)]
+struct Args {
+    project: PathBuf,
+    output: PathBuf,
+    mode: Mode,
+    format: Format,
+    width: u32,
+    height: u32,
+    fps: u32,
+    build_only: bool,
+    force_ffmpeg: bool,
+}
+
+impl Args {
+    fn parse() -> Result<Self, Box<dyn std::error::Error>> {
+        let mut arguments = std::env::args().skip(1);
+        let mut values = HashMap::new();
+        let mut build_only = false;
+        let mut force_ffmpeg = false;
+        while let Some(argument) = arguments.next() {
+            match argument.as_str() {
+                "--build-only" if !build_only => build_only = true,
+                "--force-ffmpeg" if !force_ffmpeg => force_ffmpeg = true,
+                "--project" | "--output" | "--mode" | "--format" | "--width" | "--height"
+                | "--fps" => {
+                    let value = arguments
+                        .next()
+                        .ok_or_else(|| format!("Missing value for {argument}"))?;
+                    if values.insert(argument.clone(), value).is_some() {
+                        return Err(format!("Duplicate argument: {argument}").into());
+                    }
+                }
+                "--help" | "-h" => {
+                    println!(
+                        "Required: --project PATH --output PATH --mode baseline|video-only --format gif|cursor-mov\nOptional: --width 640 --height 360 --fps 15 --build-only --force-ffmpeg"
+                    );
+                    std::process::exit(0);
+                }
+                _ => return Err(format!("Unknown or duplicate argument: {argument}").into()),
+            }
+        }
+        let project = PathBuf::from(values.remove("--project").ok_or("--project is required")?);
+        let output = PathBuf::from(values.remove("--output").ok_or("--output is required")?);
+        let mode = match values
+            .remove("--mode")
+            .ok_or("--mode is required")?
+            .as_str()
+        {
+            "baseline" => Mode::Baseline,
+            "video-only" => Mode::VideoOnly,
+            _ => return Err("--mode must be baseline or video-only".into()),
+        };
+        let format = match values
+            .remove("--format")
+            .ok_or("--format is required")?
+            .as_str()
+        {
+            "gif" => Format::Gif,
+            "cursor-mov" => Format::CursorMov,
+            _ => return Err("--format must be gif or cursor-mov".into()),
+        };
+        let width = values
+            .remove("--width")
+            .map(|value| value.parse::<u32>())
+            .transpose()?
+            .unwrap_or(640);
+        let height = values
+            .remove("--height")
+            .map(|value| value.parse::<u32>())
+            .transpose()?
+            .unwrap_or(360);
+        let fps = values
+            .remove("--fps")
+            .map(|value| value.parse::<u32>())
+            .transpose()?
+            .unwrap_or(15);
+        if width == 0 || height == 0 || fps == 0 {
+            return Err("Width, height, and FPS must be positive".into());
+        }
+        Ok(Self {
+            project,
+            output,
+            mode,
+            format,
+            width,
+            height,
+            fps,
+            build_only,
+            force_ffmpeg,
+        })
+    }
+}
+
+#[tokio::main]
+async fn main() -> Result<(), Box<dyn std::error::Error>> {
+    let args = Args::parse()?;
+    let extension = match args.format {
+        Format::Gif => "gif",
+        Format::CursorMov => "mov",
+    };
+    if args.output.extension().and_then(|value| value.to_str()) != Some(extension) {
+        return Err(format!("Output must end with .{extension}").into());
+    }
+    if args.output.exists() {
+        return Err("Refusing to overwrite an existing output".into());
+    }
+    let mut config = ProjectConfiguration::load(&args.project)?;
+    if matches!(args.format, Format::CursorMov) {
+        config = make_cursor_only_project(config);
+    }
+    let started = Instant::now();
+    let builder = ExporterBase::builder(args.project.clone())
+        .with_config(config)
+        .with_output_path(args.output.clone())
+        .with_force_ffmpeg_decoder(args.force_ffmpeg);
+    let base = match args.mode {
+        Mode::Baseline => builder.build().await?,
+        Mode::VideoOnly => builder.build_video_only().await?,
+    };
+    let build_secs = started.elapsed().as_secs_f64();
+    let expected_frames = base.total_frames(args.fps);
+    if args.build_only {
+        println!(
+            "{}",
+            serde_json::json!({
+                "scope": "export_builder_only", "mode": format!("{:?}", args.mode),
+                "format": format!("{:?}", args.format), "build_secs": build_secs,
+                "expected_frames": expected_frames, "project": args.project,
+            })
+        );
+        drop(base);
+        return Ok(());
+    }
+    let frames = Arc::new(AtomicU32::new(0));
+    let first_progress_us = Arc::new(AtomicU64::new(u64::MAX));
+    let count = frames.clone();
+    let first = first_progress_us.clone();
+    let on_progress = move |_frame: u32| {
+        count.fetch_add(1, Ordering::Relaxed);
+        let _ = first.compare_exchange(
+            u64::MAX,
+            started.elapsed().as_micros() as u64,
+            Ordering::Relaxed,
+            Ordering::Relaxed,
+        );
+        true
+    };
+    let resolution_base = XY::new(args.width, args.height);
+    let output = match args.format {
+        Format::Gif => {
+            GifExportSettings {
+                fps: args.fps,
+                resolution_base,
+                quality: None,
+            }
+            .export(base, on_progress)
+            .await?
+        }
+        Format::CursorMov => {
+            MovExportSettings {
+                fps: args.fps,
+                resolution_base,
+                cursor_only: true,
+            }
+            .export(base, on_progress)
+            .await?
+        }
+    };
+    println!(
+        "{}",
+        serde_json::json!({
+            "scope": "gpui_equivalent_export", "mode": format!("{:?}", args.mode),
+            "format": format!("{:?}", args.format), "build_secs": build_secs,
+            "total_secs": started.elapsed().as_secs_f64(),
+            "first_progress_us": first_progress_us.load(Ordering::Relaxed),
+            "progress_frames": frames.load(Ordering::Relaxed),
+            "expected_frames": expected_frames, "output": output,
+            "output_bytes": std::fs::metadata(&output)?.len(),
+        })
+    );
+    Ok(())
+}
diff --git a/scripts/check-video-only-export-parity.py b/scripts/check-video-only-export-parity.py
new file mode 100644
index 00000000000..8398385bbd8
--- /dev/null
+++ b/scripts/check-video-only-export-parity.py
@@ -0,0 +1,74 @@
+import argparse
+import json
+import subprocess
+from pathlib import Path
+
+
+def probe(path):
+    raw = subprocess.check_output([
+        "ffprobe", "-v", "error", "-count_frames", "-show_streams", "-show_format",
+        "-of", "json", str(path),
+    ])
+    data = json.loads(raw)
+    selected = []
+    for stream in data["streams"]:
+        selected.append({key: stream.get(key) for key in [
+            "codec_name", "codec_type", "width", "height", "pix_fmt", "time_base",
+            "duration", "nb_read_frames", "avg_frame_rate",
+        ]})
+    return selected
+
+
+def frames(path, alpha=False):
+    command = ["ffmpeg", "-nostdin", "-hide_banner", "-loglevel", "error", "-i", str(path),
+               "-map", "0:v:0"]
+    if alpha:
+        command += ["-vf", "alphaextract"]
+    else:
+        command += ["-pix_fmt", "rgba"]
+    command += ["-f", "framemd5", "-"]
+    raw = subprocess.check_output(command).decode()
+    return [line.strip() for line in raw.splitlines() if line and not line.startswith("#")]
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("baseline", type=Path)
+    parser.add_argument("candidate", type=Path)
+    parser.add_argument("--alpha", action="store_true")
+    parser.add_argument("--require-visible-alpha", action="store_true")
+    args = parser.parse_args()
+    if args.require_visible_alpha and not args.alpha:
+        parser.error("--require-visible-alpha requires --alpha")
+    a, b = probe(args.baseline), probe(args.candidate)
+    if a != b:
+        raise SystemExit(f"Stream metadata differs: {a!r} vs {b!r}")
+    if any(stream["codec_type"] == "audio" for stream in a):
+        raise SystemExit("Unexpected audio stream in video-only export")
+    fa, fb = frames(args.baseline), frames(args.candidate)
+    if not fa or fa != fb:
+        raise SystemExit("Decoded frame checksums, PTS, durations, or order differ")
+    alpha_match = None
+    visible_alpha = None
+    if args.alpha:
+        aa, ab = frames(args.baseline, True), frames(args.candidate, True)
+        alpha_match = bool(aa) and aa == ab
+        if not alpha_match:
+            raise SystemExit("Decoded alpha differs")
+        if args.require_visible_alpha:
+            raw_alpha = subprocess.check_output([
+                "ffmpeg", "-nostdin", "-hide_banner", "-loglevel", "error",
+                "-i", str(args.baseline), "-map", "0:v:0", "-vf", "alphaextract",
+                "-pix_fmt", "gray", "-f", "rawvideo", "-",
+            ])
+            hashes = {line.rsplit(",", 1)[-1].strip() for line in aa}
+            visible_alpha = bool(raw_alpha) and min(raw_alpha) == 0 and max(raw_alpha) > 0 and len(hashes) > 1
+            if not visible_alpha:
+                raise SystemExit("Cursor alpha is empty, fully opaque, or static")
+    print(json.dumps({"decoded_frame_parity": True, "frames": len(fa),
+                      "streams": a, "alpha_parity": alpha_match,
+                      "visible_moving_alpha": visible_alpha}))
+
+
+if __name__ == "__main__":
+    main()
diff --git a/scripts/prepare-video-only-export-fixture.py b/scripts/prepare-video-only-export-fixture.py
new file mode 100644
index 00000000000..16b074743f6
--- /dev/null
+++ b/scripts/prepare-video-only-export-fixture.py
@@ -0,0 +1,119 @@
+import argparse
+import json
+import math
+import shutil
+import subprocess
+from pathlib import Path
+
+
+def add_cursor(fixture, assets_directory):
+    fixture = fixture.resolve()
+    marker = json.loads((fixture / "SYNTHETIC-FIXTURE.json").read_text())
+    if marker.get("synthetic") is not True or marker.get("audio_only"):
+        raise SystemExit("Only disposable synthetic full fixtures may be modified")
+    meta_path = fixture / "recording-meta.json"
+    meta = json.loads(meta_path.read_text())
+    if len(meta.get("segments", [])) != 1:
+        raise SystemExit("Expected one multi-segment recording entry")
+    assets = json.loads((assets_directory / "cursors.json").read_text())
+    for cursor_id in ("0", "2"):
+        relative = assets[cursor_id]["imagePath"]
+        source = assets_directory / f"cursor_{cursor_id}.png"
+        destination = fixture / relative
+        if destination.exists() and destination.read_bytes() != source.read_bytes():
+            raise SystemExit(f"Refusing to replace different cursor asset: {destination}")
+        destination.parent.mkdir(parents=True, exist_ok=True)
+        shutil.copyfile(source, destination)
+    duration = float(marker["export_seconds"])
+    sample_count = max(2, math.ceil(duration * 60))
+    moves = []
+    for index in range(sample_count + 1):
+        phase = index / sample_count
+        moves.append({
+            "active_modifiers": [], "cursor_id": "0" if phase < 0.5 else "2",
+            "time_ms": phase * duration * 1000,
+            "x": 0.2 + 0.6 * phase,
+            "y": 0.5 + 0.2 * math.sin(phase * math.tau),
+        })
+    click_time_ms = duration * 0.7 * 1000
+    clicks = [
+        {"active_modifiers": [], "cursor_num": 1, "cursor_id": "2",
+         "time_ms": click_time_ms, "down": True},
+        {"active_modifiers": [], "cursor_num": 1, "cursor_id": "2",
+         "time_ms": click_time_ms + 80, "down": False},
+    ]
+    cursor_path = fixture / "content/cursor-campaign.json"
+    cursor_path.write_text(json.dumps({"moves": moves, "clicks": clicks}, indent=2) + "\n")
+    meta["cursors"] = {cursor_id: assets[cursor_id] for cursor_id in ("0", "2")}
+    meta["segments"][0]["cursor"] = "content/cursor-campaign.json"
+    meta_path.write_text(json.dumps(meta, indent=2) + "\n")
+    marker["cursor_trajectory"] = "Synthetic normalized 60Hz movement, arrow-to-hand, one click"
+    marker["cursor_asset_source"] = str(assets_directory.resolve())
+    (fixture / "SYNTHETIC-FIXTURE.json").write_text(json.dumps(marker, indent=2) + "\n")
+    print(json.dumps({"fixture": str(fixture), "moves": len(moves), "clicks": len(clicks),
+                      "cursor_ids": ["0", "2"], "source": str(assets_directory.resolve())}))
+
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("destination", type=Path)
+    parser.add_argument("--source-seconds", type=int, default=600)
+    parser.add_argument("--export-seconds", type=float, default=4)
+    parser.add_argument("--audio-only", action="store_true")
+    parser.add_argument("--with-cursor", action="store_true")
+    parser.add_argument("--cursor-assets", type=Path, default=Path(__file__).resolve().parents[1] /
+                        "apps/cli/skill/cap-demo/assets")
+    args = parser.parse_args()
+    if args.audio_only and args.with_cursor:
+        parser.error("--with-cursor requires video generation")
+    target = args.destination.resolve()
+    if target.exists():
+        raise SystemExit("Refusing to replace an existing fixture directory")
+    if args.source_seconds <= 0 or not 0 < args.export_seconds <= args.source_seconds:
+        raise SystemExit("Invalid durations")
+    content = target / "content"
+    content.mkdir(parents=True)
+    for name, frequency in [("mic", 440), ("system", 880)]:
+        subprocess.run([
+            "ffmpeg", "-nostdin", "-hide_banner", "-loglevel", "error",
+            "-f", "lavfi", "-i", f"sine=frequency={frequency}:sample_rate=48000:duration={args.source_seconds}",
+            "-ac", "2", "-c:a", "aac", "-b:a", "96k", str(content / f"{name}.m4a"),
+        ], check=True)
+    if not args.audio_only:
+        subprocess.run([
+            "ffmpeg", "-nostdin", "-hide_banner", "-loglevel", "error",
+            "-f", "lavfi", "-i", f"color=c=0x234567:size=640x360:rate=15:duration={args.source_seconds}",
+            "-c:v", "libx264", "-preset", "ultrafast", "-threads", "2",
+            "-pix_fmt", "yuv420p", str(content / "display.mp4"),
+        ], check=True)
+    meta = {
+        "pretty_name": "SYNTHETIC disposable video-only export benchmark",
+        "sharing": None,
+        "segments": [{
+            "display": {"path": "content/display.mp4", "fps": 15},
+            "mic": {"path": "content/mic.m4a"},
+            "system_audio": {"path": "content/system.m4a"},
+        }],
+    }
+    config = {
+        "background": {"source": {"type": "color", "value": [30, 30, 46]}, "padding": 0},
+        "camera": {"hide": True},
+        "audio": {"mute": True},
+        "timeline": {"segments": [{"recordingSegment": 0, "timescale": 1.0, "start": 0.0,
+                                     "end": args.export_seconds}], "zoomSegments": []},
+    }
+    (target / "recording-meta.json").write_text(json.dumps(meta, indent=2) + "\n")
+    (target / "project-config.json").write_text(json.dumps(config, indent=2) + "\n")
+    (target / "SYNTHETIC-FIXTURE.json").write_text(json.dumps({
+        "synthetic": True, "source_seconds": args.source_seconds,
+        "export_seconds": args.export_seconds, "audio_only": args.audio_only,
+        "purpose": "Real Cap builder/export or ProgressiveAudio workload, synthetic inputs",
+    }, indent=2) + "\n")
+    if args.with_cursor:
+        add_cursor(target, args.cursor_assets)
+    print(target)
+
+
+if __name__ == "__main__":
+    main()

From b0fb820d0b55837390aee5b91626c2959eea9525 Mon Sep 17 00:00:00 2001
From: EfeDurmaz16 <efebarandurmaz05@gmail.com>
Date: Wed, 14 Oct 2026 14:51:27 +0300
Subject: [PATCH 21/74] fix(bench): stream export alpha validation in bounded
 chunks

---
 scripts/check-video-only-export-parity.py | 44 +++++++++--
 scripts/test-video-only-export-parity.py  | 92 +++++++++++++++++++++++
 2 files changed, 130 insertions(+), 6 deletions(-)
 create mode 100644 scripts/test-video-only-export-parity.py

diff --git a/scripts/check-video-only-export-parity.py b/scripts/check-video-only-export-parity.py
index 8398385bbd8..85063c61d48 100644
--- a/scripts/check-video-only-export-parity.py
+++ b/scripts/check-video-only-export-parity.py
@@ -3,6 +3,42 @@
 import subprocess
 from pathlib import Path
 
+ALPHA_READ_BYTES = 64 * 1024
+
+
+def read_alpha_extrema(stream):
+    minimum = None
+    maximum = None
+    while True:
+        chunk = stream.read(ALPHA_READ_BYTES)
+        if not chunk:
+            return minimum, maximum
+        chunk_minimum = min(chunk)
+        chunk_maximum = max(chunk)
+        minimum = chunk_minimum if minimum is None else min(minimum, chunk_minimum)
+        maximum = chunk_maximum if maximum is None else max(maximum, chunk_maximum)
+
+
+def alpha_extrema(path):
+    command = [
+        "ffmpeg", "-nostdin", "-hide_banner", "-loglevel", "error",
+        "-i", str(path), "-map", "0:v:0", "-vf", "alphaextract",
+        "-pix_fmt", "gray", "-f", "rawvideo", "-",
+    ]
+    with subprocess.Popen(command, stdout=subprocess.PIPE) as process:
+        try:
+            if process.stdout is None:
+                raise RuntimeError("FFmpeg alpha output pipe was not created")
+            extrema = read_alpha_extrema(process.stdout)
+        except BaseException:
+            process.kill()
+            process.wait()
+            raise
+        returncode = process.wait()
+        if returncode:
+            raise subprocess.CalledProcessError(returncode, command)
+        return extrema
+
 
 def probe(path):
     raw = subprocess.check_output([
@@ -56,13 +92,9 @@ def main():
         if not alpha_match:
             raise SystemExit("Decoded alpha differs")
         if args.require_visible_alpha:
-            raw_alpha = subprocess.check_output([
-                "ffmpeg", "-nostdin", "-hide_banner", "-loglevel", "error",
-                "-i", str(args.baseline), "-map", "0:v:0", "-vf", "alphaextract",
-                "-pix_fmt", "gray", "-f", "rawvideo", "-",
-            ])
+            minimum, maximum = alpha_extrema(args.baseline)
             hashes = {line.rsplit(",", 1)[-1].strip() for line in aa}
-            visible_alpha = bool(raw_alpha) and min(raw_alpha) == 0 and max(raw_alpha) > 0 and len(hashes) > 1
+            visible_alpha = minimum == 0 and maximum is not None and maximum > 0 and len(hashes) > 1
             if not visible_alpha:
                 raise SystemExit("Cursor alpha is empty, fully opaque, or static")
     print(json.dumps({"decoded_frame_parity": True, "frames": len(fa),
diff --git a/scripts/test-video-only-export-parity.py b/scripts/test-video-only-export-parity.py
new file mode 100644
index 00000000000..6bc1e6ae21c
--- /dev/null
+++ b/scripts/test-video-only-export-parity.py
@@ -0,0 +1,92 @@
+import importlib.util
+import io
+import subprocess
+import unittest
+from pathlib import Path
+from unittest.mock import MagicMock, patch
+
+SPEC = importlib.util.spec_from_file_location(
+    "video_only_export_parity",
+    Path(__file__).with_name("check-video-only-export-parity.py"),
+)
+CHECKER = importlib.util.module_from_spec(SPEC)
+SPEC.loader.exec_module(CHECKER)
+
+
+class VirtualChunk:
+    def __init__(self, size, tracking):
+        self.size = size
+        self.tracking = tracking
+        tracking["live"] += 1
+        tracking["peak"] = max(tracking["peak"], tracking["live"])
+
+    def __len__(self):
+        return self.size
+
+    def __iter__(self):
+        return iter((0, 255))
+
+    def __del__(self):
+        self.tracking["live"] -= 1
+
+
+class VirtualAlphaStream:
+    def __init__(self, size):
+        self.remaining = size
+        self.tracking = {"live": 0, "peak": 0}
+        self.reads = 0
+
+    def read(self, size=-1):
+        if not 0 < size <= CHECKER.ALPHA_READ_BYTES:
+            raise AssertionError("Alpha reads must have a bounded positive size")
+        self.reads += 1
+        size = min(size, self.remaining)
+        self.remaining -= size
+        return VirtualChunk(size, self.tracking) if size else b""
+
+
+class AlphaExtremaTests(unittest.TestCase):
+    def test_long_virtual_stream_has_bounded_reads_and_retention(self):
+        stream = VirtualAlphaStream(640 * 360 * 15 * 1800)
+        self.assertEqual(CHECKER.read_alpha_extrema(stream), (0, 255))
+        self.assertEqual(stream.remaining, 0)
+        self.assertGreater(stream.reads, 90_000)
+        self.assertLessEqual(stream.tracking["peak"], 2)
+        self.assertEqual(stream.tracking["live"], 0)
+
+    def test_empty_transparent_opaque_and_mixed_alpha(self):
+        for data, expected in [
+            (b"", (None, None)),
+            (b"\x00" * 17, (0, 0)),
+            (b"\xff" * 17, (255, 255)),
+            (b"\x00\x7f\xff", (0, 255)),
+        ]:
+            with self.subTest(data=data):
+                self.assertEqual(CHECKER.read_alpha_extrema(io.BytesIO(data)), expected)
+
+    def test_ffmpeg_failure_after_valid_alpha_is_propagated(self):
+        process = MagicMock()
+        process.__enter__.return_value = process
+        process.stdout = io.BytesIO(b"\x00\xff")
+        process.wait.return_value = 7
+        with patch.object(CHECKER.subprocess, "Popen", return_value=process) as spawn:
+            with self.assertRaises(subprocess.CalledProcessError) as failure:
+                CHECKER.alpha_extrema(Path("baseline.mov"))
+        self.assertEqual(failure.exception.returncode, 7)
+        self.assertEqual(spawn.call_args.kwargs, {"stdout": subprocess.PIPE})
+        process.wait.assert_called_once_with()
+        process.kill.assert_not_called()
+
+    def test_read_failure_kills_and_reaps_ffmpeg(self):
+        process = MagicMock()
+        process.__enter__.return_value = process
+        process.stdout.read.side_effect = OSError("Broken alpha read")
+        with patch.object(CHECKER.subprocess, "Popen", return_value=process):
+            with self.assertRaisesRegex(OSError, "Broken alpha read"):
+                CHECKER.alpha_extrema(Path("baseline.mov"))
+        process.kill.assert_called_once_with()
+        process.wait.assert_called_once_with()
+
+
+if __name__ == "__main__":
+    unittest.main()

From ad930c3ce54155bb4dddc61609e1396f169d55e3 Mon Sep 17 00:00:00 2001
From: Marcos Daniel Rivera Gonzalez
 <139647784+LordOfGrillos@users.noreply.github.com>
Date: Wed, 14 Oct 2026 09:24:46 -0600
Subject: [PATCH 22/74] perf(video-decode): pipeline the Media Foundation GPU
 readback

The decoder thread copied each sample to a staging texture and mapped it
straight away, so it sat blocked in Map while the GPU decoded and copied, and
the GPU sat idle while the CPU copied the frame out. read_nv12 now queues the
copy of the next sample before mapping the current one, through a ring of two
staging textures created with the decoder.

Samples are copied from Media Foundation's output surface directly into
staging, skipping the pool texture that only the disabled zero-copy path
needs. The rendering decoder caches the CPU NV12 data itself and drops the
zero-copy fields its frames could never fill, along with the two zero-copy
constructors that were their only producers.
---
 .../rendering/src/decoder/media_foundation.rs | 160 ++-----------
 crates/rendering/src/decoder/mod.rs           |  41 ----
 crates/video-decode/src/lib.rs                |   2 +-
 crates/video-decode/src/media_foundation.rs   | 222 +++++++++++++-----
 4 files changed, 187 insertions(+), 238 deletions(-)

diff --git a/crates/rendering/src/decoder/media_foundation.rs b/crates/rendering/src/decoder/media_foundation.rs
index 09c2f21d69d..9b0bfdfa6b7 100644
--- a/crates/rendering/src/decoder/media_foundation.rs
+++ b/crates/rendering/src/decoder/media_foundation.rs
@@ -3,12 +3,11 @@
 use std::{
     collections::BTreeMap,
     path::PathBuf,
-    sync::{Arc, mpsc},
+    sync::mpsc,
     time::{Duration, Instant},
 };
 use tokio::sync::oneshot;
 use tracing::{info, warn};
-use windows::Win32::{Foundation::HANDLE, Graphics::Direct3D11::ID3D11Texture2D};
 
 use super::{DecodedFrame, DecoderInitResult, DecoderType, FRAME_CACHE_SIZE, VideoDecoderMessage};
 
@@ -16,7 +15,6 @@ const MAX_FRAME_CACHE_BYTES: usize = 128 * 1024 * 1024;
 
 struct DecoderHealthMonitor {
     consecutive_errors: u32,
-    consecutive_texture_read_failures: u32,
     total_frames_decoded: u64,
     total_errors: u64,
     last_successful_decode: Instant,
@@ -31,7 +29,6 @@ impl DecoderHealthMonitor {
     fn new() -> Self {
         Self {
             consecutive_errors: 0,
-            consecutive_texture_read_failures: 0,
             total_frames_decoded: 0,
             total_errors: 0,
             last_successful_decode: Instant::now(),
@@ -49,7 +46,6 @@ impl DecoderHealthMonitor {
 
     fn record_success(&mut self, decode_time: Duration) {
         self.consecutive_errors = 0;
-        self.consecutive_texture_read_failures = 0;
         self.total_frames_decoded += 1;
         self.last_successful_decode = Instant::now();
 
@@ -67,18 +63,11 @@ impl DecoderHealthMonitor {
         self.total_errors += 1;
     }
 
-    fn record_texture_read_failure(&mut self) {
-        self.consecutive_texture_read_failures += 1;
-    }
-
     fn is_healthy(&self) -> bool {
         const MAX_CONSECUTIVE_ERRORS: u32 = 10;
-        const MAX_CONSECUTIVE_TEXTURE_FAILURES: u32 = 5;
         const MAX_TIME_SINCE_SUCCESS: Duration = Duration::from_secs(5);
 
-        if self.consecutive_errors >= MAX_CONSECUTIVE_ERRORS
-            || self.consecutive_texture_read_failures >= MAX_CONSECUTIVE_TEXTURE_FAILURES
-        {
+        if self.consecutive_errors >= MAX_CONSECUTIVE_ERRORS {
             return false;
         }
 
@@ -122,63 +111,6 @@ impl DecoderHealthMonitor {
     }
 }
 
-#[derive(Clone)]
-struct CachedFrame {
-    number: u32,
-    _texture: Option<ID3D11Texture2D>,
-    _shared_handle: Option<HANDLE>,
-    _y_handle: Option<HANDLE>,
-    _uv_handle: Option<HANDLE>,
-    nv12_data: Option<Arc<cap_video_decode::NV12Data>>,
-    width: u32,
-    height: u32,
-}
-
-impl CachedFrame {
-    fn estimated_bytes(&self) -> usize {
-        let texture_bytes = self._texture.as_ref().map_or(0, |_| {
-            (self.width as usize)
-                .saturating_mul(self.height as usize)
-                .saturating_mul(3)
-        });
-        texture_bytes.saturating_add(self.nv12_data.as_ref().map_or(0, |data| data.data.len()))
-    }
-
-    fn to_decoded_frame(&self) -> DecodedFrame {
-        let null_ptr = std::ptr::null_mut();
-        let y_handle = self._y_handle.filter(|h| h.0 != null_ptr);
-        let uv_handle = self._uv_handle.filter(|h| h.0 != null_ptr);
-        if let (Some(texture), Some(y_handle), Some(uv_handle)) =
-            (&self._texture, y_handle, uv_handle)
-        {
-            return DecodedFrame::new_nv12_with_d3d11_texture_and_yuv_handles(
-                self.width,
-                self.height,
-                texture.clone(),
-                self._shared_handle,
-                Some(y_handle),
-                Some(uv_handle),
-            );
-        }
-
-        if let Some(nv12_data) = &self.nv12_data {
-            DecodedFrame::new_nv12_with_arc(
-                Arc::clone(&nv12_data.data),
-                self.width,
-                self.height,
-                nv12_data.y_stride,
-                nv12_data.uv_stride,
-            )
-        } else {
-            warn!(
-                "CachedFrame has no CPU data, creating black frame (D3D11 zero-copy not implemented)"
-            );
-            let black_data = vec![0u8; (self.width * self.height * 3 / 2) as usize];
-            DecodedFrame::new_nv12(black_data, self.width, self.height, self.width, self.width)
-        }
-    }
-}
-
 pub struct MFDecoder;
 
 impl MFDecoder {
@@ -248,7 +180,8 @@ impl MFDecoder {
                 30
             };
             let mut requests = FrameRequests::new(readahead_frames);
-            let answer = |sender: oneshot::Sender<DecodedFrame>, frame: Option<CachedFrame>| {
+            let answer = |sender: oneshot::Sender<DecodedFrame>,
+                          frame: Option<cap_video_decode::NV12Data>| {
                 let _ = sender.send(frame.map_or_else(
                     || {
                         DecodedFrame::new(
@@ -257,7 +190,15 @@ impl MFDecoder {
                             video_height,
                         )
                     },
-                    |frame| frame.to_decoded_frame(),
+                    |data| {
+                        DecodedFrame::new_nv12_with_arc(
+                            data.data,
+                            video_width,
+                            video_height,
+                            data.y_stride,
+                            data.uv_stride,
+                        )
+                    },
                 ));
             };
 
@@ -289,7 +230,6 @@ impl MFDecoder {
                                 warn!(
                                     name = name,
                                     consecutive_errors = health.consecutive_errors,
-                                    texture_failures = health.consecutive_texture_read_failures,
                                     total_decoded = health.total_frames_decoded,
                                     "MediaFoundation decoder unhealthy, performance may degrade"
                                 );
@@ -313,24 +253,22 @@ impl MFDecoder {
                     },
                     Step::Decode => {
                         let decode_start = Instant::now();
-                        match decoder.read_sample() {
-                            Ok(Some(mf_frame)) => {
-                                let cached = cache_sample(
-                                    &mut decoder,
-                                    mf_frame,
-                                    decode_start.elapsed(),
-                                    &mut health,
-                                    fps,
-                                );
-                                let (number, bytes) = (cached.number, cached.estimated_bytes());
-                                requests.decoded(number, cached, bytes)
+                        match decoder.read_nv12() {
+                            Ok(Some(sample)) => {
+                                health.record_success(decode_start.elapsed());
+                                let bytes = sample.data.data.len();
+                                requests.decoded(
+                                    pts_100ns_to_frame(sample.pts, fps),
+                                    sample.data,
+                                    bytes,
+                                )
                             }
                             Ok(None) => requests.stopped(),
                             Err(e) => {
                                 health.record_error();
                                 warn!(
                                     consecutive_errors = health.consecutive_errors,
-                                    "MediaFoundation read_sample error: {e}"
+                                    "MediaFoundation read error: {e}"
                                 );
                                 requests.stopped()
                             }
@@ -358,58 +296,6 @@ fn pts_100ns_to_frame(pts_100ns: i64, fps: u32) -> u32 {
     super::pts_to_frame(pts_100ns, ::ffmpeg::Rational::new(1, 10_000_000), fps)
 }
 
-fn cache_sample(
-    decoder: &mut cap_video_decode::MediaFoundationDecoder,
-    mf_frame: cap_video_decode::MFDecodedFrame,
-    decode_time: Duration,
-    health: &mut DecoderHealthMonitor,
-    fps: u32,
-) -> CachedFrame {
-    let frame_number = pts_100ns_to_frame(mf_frame.pts, fps);
-
-    let has_valid_zero_copy_handles = {
-        let null_ptr = std::ptr::null_mut();
-        mf_frame.textures.y.handle.0 != null_ptr && mf_frame.textures.uv.handle.0 != null_ptr
-    };
-
-    let nv12_data = if has_valid_zero_copy_handles {
-        health.record_success(decode_time);
-        None
-    } else {
-        match decoder.read_texture_to_cpu(
-            &mf_frame.textures.nv12.texture,
-            mf_frame.width,
-            mf_frame.height,
-        ) {
-            Ok(data) => {
-                health.record_success(decode_time);
-                Some(Arc::new(data))
-            }
-            Err(e) => {
-                health.record_texture_read_failure();
-                warn!("Failed to read texture to CPU for frame {frame_number}: {e}");
-                None
-            }
-        }
-    };
-
-    let cached = CachedFrame {
-        number: frame_number,
-        _texture: has_valid_zero_copy_handles.then(|| mf_frame.textures.nv12.texture.clone()),
-        _shared_handle: has_valid_zero_copy_handles.then_some(mf_frame.textures.nv12.handle),
-        _y_handle: has_valid_zero_copy_handles.then_some(mf_frame.textures.y.handle),
-        _uv_handle: has_valid_zero_copy_handles.then_some(mf_frame.textures.uv.handle),
-        nv12_data,
-        width: mf_frame.width,
-        height: mf_frame.height,
-    };
-
-    if !has_valid_zero_copy_handles {
-        decoder.recycle_textures(mf_frame.textures);
-    }
-    cached
-}
-
 enum Step {
     Seek(u32),
     Decode,
diff --git a/crates/rendering/src/decoder/mod.rs b/crates/rendering/src/decoder/mod.rs
index d5a2d6b96fc..82a10c7cde2 100644
--- a/crates/rendering/src/decoder/mod.rs
+++ b/crates/rendering/src/decoder/mod.rs
@@ -109,20 +109,6 @@ impl SendableD3D11Texture {
         }
     }
 
-    pub fn new_with_yuv_handles(
-        texture: ID3D11Texture2D,
-        shared_handle: Option<HANDLE>,
-        y_handle: Option<HANDLE>,
-        uv_handle: Option<HANDLE>,
-    ) -> Self {
-        Self {
-            texture,
-            shared_handle,
-            y_handle,
-            uv_handle,
-        }
-    }
-
     pub fn inner(&self) -> &ID3D11Texture2D {
         &self.texture
     }
@@ -473,33 +459,6 @@ impl DecodedFrame {
         }
     }
 
-    #[cfg(target_os = "windows")]
-    pub fn new_nv12_with_d3d11_texture_and_yuv_handles(
-        width: u32,
-        height: u32,
-        texture: ID3D11Texture2D,
-        shared_handle: Option<HANDLE>,
-        y_handle: Option<HANDLE>,
-        uv_handle: Option<HANDLE>,
-    ) -> Self {
-        Self {
-            data: Arc::new(Vec::new()),
-            width,
-            height,
-            format: PixelFormat::Nv12,
-            y_stride: width,
-            uv_stride: width,
-            #[cfg(target_os = "macos")]
-            image_buf_backing: None,
-            d3d11_texture_backing: Some(Arc::new(SendableD3D11Texture::new_with_yuv_handles(
-                texture,
-                shared_handle,
-                y_handle,
-                uv_handle,
-            ))),
-        }
-    }
-
     #[cfg(target_os = "windows")]
     #[allow(clippy::redundant_closure)]
     pub fn d3d11_texture_backing(&self) -> Option<&ID3D11Texture2D> {
diff --git a/crates/video-decode/src/lib.rs b/crates/video-decode/src/lib.rs
index 682df7a778c..4eb9701378c 100644
--- a/crates/video-decode/src/lib.rs
+++ b/crates/video-decode/src/lib.rs
@@ -10,5 +10,5 @@ pub use ffmpeg::FFmpegDecoder;
 #[cfg(target_os = "windows")]
 pub use media_foundation::{
     FrameTextures, MFDecodedFrame, MFDecoderCapabilities, MediaFoundationDecoder, NV12Data,
-    get_mf_decoder_capabilities,
+    NV12Sample, get_mf_decoder_capabilities,
 };
diff --git a/crates/video-decode/src/media_foundation.rs b/crates/video-decode/src/media_foundation.rs
index 6b5755214bb..f05e5dc844b 100644
--- a/crates/video-decode/src/media_foundation.rs
+++ b/crates/video-decode/src/media_foundation.rs
@@ -1,3 +1,4 @@
+use std::collections::VecDeque;
 use std::path::Path;
 use std::sync::{Arc, OnceLock};
 use std::time::{Duration, Instant};
@@ -143,6 +144,12 @@ pub struct MFDecodedFrame {
     pub plane_time: Duration,
 }
 
+pub struct NV12Sample {
+    pub pts: i64,
+    pub data: NV12Data,
+}
+
+#[derive(Clone)]
 pub struct NV12Data {
     pub data: Arc<Vec<u8>>,
     pub y_stride: u32,
@@ -514,6 +521,36 @@ fn create_internal_texture(
     })
 }
 
+unsafe fn create_staging_texture(
+    device: &ID3D11Device,
+    width: u32,
+    height: u32,
+) -> Result<ID3D11Texture2D, String> {
+    let desc = D3D11_TEXTURE2D_DESC {
+        Width: width,
+        Height: height,
+        MipLevels: 1,
+        ArraySize: 1,
+        Format: DXGI_FORMAT_NV12,
+        SampleDesc: DXGI_SAMPLE_DESC {
+            Count: 1,
+            Quality: 0,
+        },
+        Usage: D3D11_USAGE_STAGING,
+        BindFlags: 0,
+        CPUAccessFlags: D3D11_CPU_ACCESS_READ.0 as u32,
+        MiscFlags: 0,
+    };
+
+    unsafe {
+        let mut tex: Option<ID3D11Texture2D> = None;
+        device
+            .CreateTexture2D(&desc, None, Some(&mut tex))
+            .map_err(|e| format!("CreateTexture2D staging failed: {e:?}"))?;
+        tex.ok_or_else(|| "CreateTexture2D staging returned null".to_string())
+    }
+}
+
 fn create_uav(
     device: &ID3D11Device,
     texture: &ID3D11Texture2D,
@@ -536,6 +573,9 @@ fn create_uav(
     }
 }
 
+// Samples whose copy to a staging texture can be in flight while an earlier one is read back.
+const READBACK_DEPTH: usize = 2;
+
 pub struct MediaFoundationDecoder {
     source_reader: IMFSourceReader,
     d3d11_device: ID3D11Device,
@@ -545,9 +585,10 @@ pub struct MediaFoundationDecoder {
     height: u32,
     frame_rate_num: u32,
     frame_rate_den: u32,
-    staging_texture: Option<ID3D11Texture2D>,
-    staging_width: u32,
-    staging_height: u32,
+    readback_free: Vec<ID3D11Texture2D>,
+    readback_queue: VecDeque<(i64, ID3D11Texture2D)>,
+    // How the stream stopped, reported once the queued readbacks are drained.
+    readback_end: Option<Result<(), String>>,
     frame_pool: FramePool,
     plane_converter: Nv12PlaneConverter,
     capabilities: MFDecoderCapabilities,
@@ -606,6 +647,10 @@ impl MediaFoundationDecoder {
 
         let plane_converter = Nv12PlaneConverter::new(&d3d11_device, &d3d11_context)?;
 
+        let readback_free = (0..READBACK_DEPTH)
+            .map(|_| unsafe { create_staging_texture(&d3d11_device, width, height) })
+            .collect::<Result<Vec<_>, _>>()?;
+
         if width > capabilities.max_width || height > capabilities.max_height {
             warn!(
                 video_width = width,
@@ -633,9 +678,9 @@ impl MediaFoundationDecoder {
             height,
             frame_rate_num,
             frame_rate_den,
-            staging_texture: None,
-            staging_width: 0,
-            staging_height: 0,
+            readback_free,
+            readback_queue: VecDeque::new(),
+            readback_end: None,
             frame_pool: FramePool::new(),
             plane_converter,
             capabilities,
@@ -663,60 +708,48 @@ impl MediaFoundationDecoder {
         &self.capabilities
     }
 
-    pub fn read_texture_to_cpu(
-        &mut self,
-        texture: &ID3D11Texture2D,
-        width: u32,
-        height: u32,
-    ) -> Result<NV12Data, String> {
-        unsafe { self.read_texture_to_cpu_inner(texture, width, height) }
-    }
-
-    unsafe fn read_texture_to_cpu_inner(
-        &mut self,
-        texture: &ID3D11Texture2D,
-        width: u32,
-        height: u32,
-    ) -> Result<NV12Data, String> {
-        if self.staging_width != width
-            || self.staging_height != height
-            || self.staging_texture.is_none()
+    /// Reads the next sample back to the CPU. The copy of the sample after it is queued
+    /// first, so the GPU decodes and copies that one while this one is copied out.
+    pub fn read_nv12(&mut self) -> Result<Option<NV12Sample>, String> {
+        while self.readback_end.is_none()
+            && let Some(staging) = self.readback_free.pop()
         {
-            let desc = D3D11_TEXTURE2D_DESC {
-                Width: width,
-                Height: height,
-                MipLevels: 1,
-                ArraySize: 1,
-                Format: DXGI_FORMAT_NV12,
-                SampleDesc: DXGI_SAMPLE_DESC {
-                    Count: 1,
-                    Quality: 0,
-                },
-                Usage: D3D11_USAGE_STAGING,
-                BindFlags: 0,
-                CPUAccessFlags: D3D11_CPU_ACCESS_READ.0 as u32,
-                MiscFlags: 0,
-            };
-
-            let staging_texture = unsafe {
-                let mut tex: Option<ID3D11Texture2D> = None;
-                self.d3d11_device
-                    .CreateTexture2D(&desc, None, Some(&mut tex))
-                    .map_err(|e| format!("CreateTexture2D staging failed: {e:?}"))?;
-                tex.ok_or("CreateTexture2D staging returned null")?
-            };
-
-            self.staging_texture = Some(staging_texture);
-            self.staging_width = width;
-            self.staging_height = height;
+            match unsafe { self.read_decoder_surface() } {
+                Ok(Some((texture, subresource, pts))) => {
+                    unsafe {
+                        self.d3d11_context.CopySubresourceRegion(
+                            &staging,
+                            0,
+                            0,
+                            0,
+                            0,
+                            &texture,
+                            subresource,
+                            None,
+                        );
+                    }
+                    self.readback_queue.push_back((pts, staging));
+                }
+                end => {
+                    self.readback_free.push(staging);
+                    self.readback_end = Some(end.map(|_| ()));
+                }
+            }
         }
 
-        let staging = self.staging_texture.as_ref().unwrap();
-
-        unsafe {
-            self.d3d11_context.CopyResource(staging, texture);
-        }
+        let Some((pts, staging)) = self.readback_queue.pop_front() else {
+            return self
+                .readback_end
+                .take()
+                .expect("the queue only runs dry once the stream has stopped")
+                .map(|()| None);
+        };
+        let data = unsafe { self.map_staging(&staging) };
+        self.readback_free.push(staging);
+        Ok(Some(NV12Sample { pts, data: data? }))
+    }
 
+    unsafe fn map_staging(&self, staging: &ID3D11Texture2D) -> Result<NV12Data, String> {
         let mut mapped = D3D11_MAPPED_SUBRESOURCE::default();
         unsafe {
             self.d3d11_context
@@ -725,8 +758,8 @@ impl MediaFoundationDecoder {
         }
 
         let y_stride = mapped.RowPitch;
-        let y_height = height;
-        let uv_height = height / 2;
+        let y_height = self.height;
+        let uv_height = self.height / 2;
 
         let y_size = (y_stride * y_height) as usize;
         let uv_size = (y_stride * uv_height) as usize;
@@ -757,7 +790,12 @@ impl MediaFoundationDecoder {
         }
     }
 
-    unsafe fn read_sample_inner(&mut self) -> Result<Option<MFDecodedFrame>, String> {
+    // The decoder's output surface for the next sample: a texture array, the sample's slice in
+    // it, and its time. Media Foundation decodes into the surface again once the sample is
+    // released, so copy out of it before the next read.
+    unsafe fn read_decoder_surface(
+        &mut self,
+    ) -> Result<Option<(ID3D11Texture2D, u32, i64)>, String> {
         let mut stream_index = 0u32;
         let mut flags = 0u32;
         let mut timestamp = 0i64;
@@ -819,6 +857,16 @@ impl MediaFoundationDecoder {
                 .map_err(|e| format!("GetSubresourceIndex failed: {e:?}"))?
         };
 
+        Ok(Some((texture, subresource_index, timestamp)))
+    }
+
+    unsafe fn read_sample_inner(&mut self) -> Result<Option<MFDecodedFrame>, String> {
+        let Some((texture, subresource_index, timestamp)) =
+            (unsafe { self.read_decoder_surface()? })
+        else {
+            return Ok(None);
+        };
+
         let frame_textures =
             self.frame_pool
                 .acquire(&self.d3d11_device, self.width, self.height)?;
@@ -876,6 +924,9 @@ impl MediaFoundationDecoder {
                 .map_err(|e| format!("Seek failed: {e:?}"))?;
         }
 
+        self.readback_free
+            .extend(self.readback_queue.drain(..).map(|(_, staging)| staging));
+        self.readback_end = None;
         Ok(())
     }
 }
@@ -1136,6 +1187,59 @@ mod tests {
         }
     }
 
+    #[test]
+    #[ignore = "requires a Windows D3D11 device"]
+    fn pipelined_readback_returns_every_sample_in_order() {
+        let path =
+            Path::new(env!("CARGO_MANIFEST_DIR")).join("tests/fixtures/h264-decoder-lifecycle.mp4");
+        // This file, like the reference recording, ends with a stream error rather than an
+        // end-of-stream flag, so both readers stop at whichever comes first.
+        let mut expected = Vec::new();
+        let mut decoder = MediaFoundationDecoder::new(&path).unwrap();
+        let staging = decoder.readback_free[0].clone();
+        let expected_end = loop {
+            match unsafe { decoder.read_decoder_surface() } {
+                Ok(Some((texture, subresource, pts))) => unsafe {
+                    decoder.d3d11_context.CopySubresourceRegion(
+                        &staging,
+                        0,
+                        0,
+                        0,
+                        0,
+                        &texture,
+                        subresource,
+                        None,
+                    );
+                    expected.push((pts, decoder.map_staging(&staging).unwrap().data));
+                },
+                end => break end.is_err(),
+            }
+        };
+        drop(decoder);
+
+        let mut decoder = MediaFoundationDecoder::new(&path).unwrap();
+        let mut read = Vec::new();
+        let end = loop {
+            match decoder.read_nv12() {
+                Ok(Some(sample)) => read.push((sample.pts, sample.data.data)),
+                end => break end.is_err(),
+            }
+        };
+        assert!(expected.len() > READBACK_DEPTH);
+        assert!(read == expected);
+        assert_eq!(end, expected_end);
+
+        let first = |decoder: &mut MediaFoundationDecoder| {
+            let sample = decoder.read_nv12().unwrap().unwrap();
+            (sample.pts, sample.data.data)
+        };
+        decoder.seek(0).unwrap();
+        assert!(first(&mut decoder) == expected[0]);
+        decoder.read_nv12().unwrap();
+        decoder.seek(0).unwrap();
+        assert!(first(&mut decoder) == expected[0]);
+    }
+
     fn normalized(path: &str) -> String {
         let encoded = media_foundation_path(Path::new(path));
         assert_eq!(encoded.last(), Some(&0));

From adb268d975f9a6a38fab00d5e299c59d68debdcb Mon Sep 17 00:00:00 2001
From: Marcos Daniel Rivera Gonzalez
 <139647784+LordOfGrillos@users.noreply.github.com>
Date: Wed, 14 Oct 2026 09:51:20 -0600
Subject: [PATCH 23/74] fix(scripts): reject broken exports and start
 benchmarks inside their job

An export that ffprobe cannot read, that has the wrong frame count, or that
falls outside the requested size is now an invalid run instead of a timing
sample. Benchmark processes start suspended and resume only once they are in
the job object, so nothing they spawn escapes its CPU accounting, and a failed
assignment kills the process. A note says why playback forces FFmpeg.
---
 scripts/capbench.py      | 41 +++++++++++++++++++++++++++++++++++++++-
 scripts/test-capbench.py |  9 +++++++++
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/scripts/capbench.py b/scripts/capbench.py
index 600fa3ae123..87ec2bb967a 100644
--- a/scripts/capbench.py
+++ b/scripts/capbench.py
@@ -80,6 +80,17 @@ def assign(self, process):
         ):
             raise OSError(ctypes.get_last_error(), "AssignProcessToJobObject failed")
 
+    def resume(self, process):
+        if self.handle is None:
+            return
+        from ctypes import wintypes
+
+        ntdll = ctypes.WinDLL("ntdll")
+        ntdll.NtResumeProcess.argtypes = [wintypes.HANDLE]
+        status = ntdll.NtResumeProcess(wintypes.HANDLE(int(process._handle)))
+        if status != 0:
+            raise OSError(status, "NtResumeProcess failed")
+
     def stats(self):
         if self.handle is None:
             return {}
@@ -149,9 +160,13 @@ class JobAccounting(ctypes.Structure):
         ]
 
 
+CREATE_SUSPENDED = 0x4
+
+
 def run_measured(argv, timeout, env=None, cwd=None, affinity=None):
     job = Job(affinity)
     started = time.perf_counter()
+    # Started suspended so nothing it spawns can run before it is in the job.
     process = subprocess.Popen(
         argv,
         stdout=subprocess.PIPE,
@@ -161,9 +176,16 @@ def run_measured(argv, timeout, env=None, cwd=None, affinity=None):
         text=True,
         encoding="utf-8",
         errors="replace",
+        creationflags=CREATE_SUSPENDED if job.handle is not None else 0,
     )
     try:
-        job.assign(process)
+        try:
+            job.assign(process)
+            job.resume(process)
+        except BaseException:
+            process.kill()
+            process.wait()
+            raise
         lines = []
 
         def pump():
@@ -255,6 +277,18 @@ def parse_export(lines):
     return metrics
 
 
+def export_problem(probe, expected_frames, resolution):
+    if not probe.get("out_frames"):
+        return "export has no readable video frames"
+    if expected_frames and probe["out_frames"] != expected_frames:
+        return f"export has {probe['out_frames']:.0f} frames, expected {expected_frames:.0f}"
+    max_width, max_height = (float(side) for side in resolution.split("x"))
+    width, height = probe.get("out_width", 0), probe.get("out_height", 0)
+    if not (0 < width <= max_width and 0 < height <= max_height):
+        return f"export is {width:.0f}x{height:.0f}, outside {resolution}"
+    return None
+
+
 def export_bench(fps, resolution, quality, extra=()):
     def argv(ctx, out_dir):
         return [
@@ -264,6 +298,9 @@ def argv(ctx, out_dir):
 
     def post(ctx, out_dir, metrics):
         probe = ffprobe_video(out_dir / "export.mp4")
+        problem = export_problem(probe, metrics.get("frames"), resolution)
+        if problem:
+            raise InvalidRun(problem)
         metrics.update(probe)
         if metrics.get("frames") and metrics.get("wall_s"):
             metrics["export_fps"] = metrics["frames"] / metrics["wall_s"]
@@ -405,6 +442,8 @@ def post(ctx, out_dir, metrics):
     "export-1080p60": export_bench(60, "1920x1080", "maximum"),
     "export-4k60": export_bench(60, "3840x2160", "maximum"),
     "export-720p30": export_bench(30, "1280x720", "social"),
+    # The editor decodes with FFmpeg on Windows (editor_instance.rs), so playback measures that path;
+    # Media Foundation is covered by decode-display and the exports.
     "playback-pipeline": example_bench(
         "playback-pipeline-benchmark",
         lambda ctx: ["--recording-path", str(ctx.fixture), "--fps", "60", "--frames", "300", "--force-ffmpeg"],
diff --git a/scripts/test-capbench.py b/scripts/test-capbench.py
index 9eefd98ab85..bcd2bff3919 100644
--- a/scripts/test-capbench.py
+++ b/scripts/test-capbench.py
@@ -107,6 +107,15 @@ def test_export_progress_timing(self):
         self.assertEqual(metrics["frames"], 100.0)
         self.assertAlmostEqual(metrics["steady_fps"], 50.0)
 
+    def test_export_problem_rejects_broken_exports(self):
+        good = {"out_frames": 1850.0, "out_width": 1664.0, "out_height": 1080.0}
+        self.assertIsNone(capbench.export_problem(good, 1850.0, "1920x1080"))
+        self.assertIsNotNone(capbench.export_problem({}, 1850.0, "1920x1080"))
+        self.assertIsNotNone(capbench.export_problem({**good, "out_frames": 0.0}, None, "1920x1080"))
+        self.assertIsNotNone(capbench.export_problem({**good, "out_frames": 1849.0}, 1850.0, "1920x1080"))
+        self.assertIsNotNone(capbench.export_problem({**good, "out_width": 0.0}, 1850.0, "1920x1080"))
+        self.assertIsNotNone(capbench.export_problem({**good, "out_height": 2160.0}, 1850.0, "1920x1080"))
+
     def test_compare_flags_only_separated_changes(self):
         def results(values):
             return {"benches": {"b": {"runs": [{"wall_s": v} for v in values], "better": {"wall_s": "lower"}}}}

From 80a038ed4d4a6bd597a55b7fd081902e2623f007 Mon Sep 17 00:00:00 2001
From: Scott Newton <scottanewton@yahoo.com>
Date: Tue, 13 Oct 2026 14:34:25 -0700
Subject: [PATCH 24/74] perf(rendering): reshape the keyboard overlay only when
 its text changes

---
 crates/rendering/src/layers/keyboard.rs | 303 +++++++++++++++++++++++-
 1 file changed, 290 insertions(+), 13 deletions(-)

diff --git a/crates/rendering/src/layers/keyboard.rs b/crates/rendering/src/layers/keyboard.rs
index a690adf3f93..184eefcad9d 100644
--- a/crates/rendering/src/layers/keyboard.rs
+++ b/crates/rendering/src/layers/keyboard.rs
@@ -149,12 +149,22 @@ fn resolve_background_top(
     adjusted_top.clamp(0.0, max_top)
 }
 
+#[derive(PartialEq)]
+struct ShapedKeyboardText {
+    text: String,
+    font_size: u32,
+    wrap_width: u32,
+    family: Family<'static>,
+    weight: Weight,
+}
+
 pub struct KeyboardLayer {
     font_system: FontSystem,
     swash_cache: SwashCache,
     text_atlas: TextAtlas,
     text_renderer: TextRenderer,
     text_buffer: Buffer,
+    shaped: Option<ShapedKeyboardText>,
     viewport: Viewport,
     background_pipeline: wgpu::RenderPipeline,
     background_bind_group: wgpu::BindGroup,
@@ -267,6 +277,7 @@ impl KeyboardLayer {
             text_atlas,
             text_renderer,
             text_buffer,
+            shaped: None,
             viewport,
             background_pipeline,
             background_bind_group,
@@ -398,11 +409,7 @@ impl KeyboardLayer {
 
         let font_size_base = active.segment.font_size_override.unwrap_or(settings.size) as f32;
         let font_size = font_size_base * (height as f32 / 1080.0);
-        let metrics = Metrics::new(font_size, font_size * 1.2);
-
-        let mut updated_buffer = Buffer::new(&mut self.font_system, metrics);
         let wrap_width = (width as f32 - margin * 2.0).max(font_size);
-        updated_buffer.set_size(&mut self.font_system, Some(wrap_width), None);
 
         let font_family = match settings.font.as_str() {
             "System Serif" => Family::Serif,
@@ -426,17 +433,30 @@ impl KeyboardLayer {
             (text_alpha * 255.0) as u8,
         );
 
-        let attrs = Attrs::new().family(font_family).weight(weight).color(color);
-        updated_buffer.set_text(
-            &mut self.font_system,
-            &visible_text,
-            &attrs,
-            Shaping::Advanced,
-        );
+        let shaped = ShapedKeyboardText {
+            text: visible_text,
+            font_size: font_size.to_bits(),
+            wrap_width: wrap_width.to_bits(),
+            family: font_family,
+            weight,
+        };
+        if self.shaped.as_ref() != Some(&shaped) {
+            let metrics = Metrics::new(font_size, font_size * 1.2);
+            let mut buffer = Buffer::new(&mut self.font_system, metrics);
+            buffer.set_size(&mut self.font_system, Some(wrap_width), None);
+            buffer.set_text(
+                &mut self.font_system,
+                &shaped.text,
+                &Attrs::new().family(font_family).weight(weight),
+                Shaping::Advanced,
+            );
+            self.text_buffer = buffer;
+            self.shaped = Some(shaped);
+        }
 
         let mut layout_width: f32 = 0.0;
         let mut layout_height: f32 = 0.0;
-        for run in glyphon::cosmic_text::LayoutRunIter::new(&updated_buffer) {
+        for run in glyphon::cosmic_text::LayoutRunIter::new(&self.text_buffer) {
             layout_width = layout_width.max(run.line_w);
             layout_height = layout_height.max(run.line_top + run.line_height);
         }
@@ -485,7 +505,6 @@ impl KeyboardLayer {
             bottom: (text_top + text_height + 2.0).ceil() as i32,
         };
 
-        self.text_buffer = updated_buffer;
         self.viewport.update(queue, Resolution { width, height });
 
         let text_areas = vec![TextArea {
@@ -816,3 +835,261 @@ mod tests {
         assert_eq!(resolved_top, 720.0);
     }
 }
+
+#[cfg(test)]
+mod gpu_tests {
+    use cap_project::{
+        CursorEvents, KeyPressDisplay, KeyboardData, KeyboardSettings, KeyboardTrackSegment,
+        ProjectConfiguration, RecordingMeta, RecordingMetaInner, StudioRecordingMeta,
+        TimelineConfiguration, XY,
+    };
+
+    use super::KeyboardLayer;
+    use crate::{
+        DecodedSegmentFrames, ProjectUniforms, RenderOptions, RenderVideoConstants,
+        ZoomTransformTimeline,
+    };
+
+    const FPS: u32 = 60;
+
+    fn constants(size: XY<u32>) -> RenderVideoConstants {
+        let meta: StudioRecordingMeta = serde_json::from_value(serde_json::json!({
+            "display": { "path": "synthetic.mp4", "fps": FPS }
+        }))
+        .unwrap();
+        let recording = RecordingMeta {
+            platform: None,
+            project_path: Default::default(),
+            pretty_name: "Keyboard overlay test".into(),
+            sharing: None,
+            inner: RecordingMetaInner::Studio(Box::new(meta.clone())),
+            upload: None,
+        };
+        pollster::block_on(RenderVideoConstants::new_with_options(
+            RenderOptions {
+                screen_size: size,
+                camera_size: None,
+                preserve_screen_alpha: false,
+            },
+            recording,
+            meta,
+        ))
+        .unwrap()
+    }
+
+    fn typed_segment(id: &str, start: f64, text: &str, key_gap_ms: f64) -> KeyboardTrackSegment {
+        let keys = text
+            .chars()
+            .enumerate()
+            .map(|(index, key)| KeyPressDisplay {
+                key: key.to_string(),
+                time_offset: index as f64 * key_gap_ms,
+            })
+            .collect::<Vec<_>>();
+        KeyboardTrackSegment {
+            id: id.to_string(),
+            start,
+            end: start + keys.len() as f64 * key_gap_ms / 1000.0 + 0.8,
+            display_text: text.to_string(),
+            keys,
+            fade_duration_override: None,
+            position_override: None,
+            color_override: None,
+            background_color_override: None,
+            font_size_override: None,
+            uppercase_override: None,
+        }
+    }
+
+    fn uniforms(
+        constants: &RenderVideoConstants,
+        segments: &[KeyboardTrackSegment],
+        size: XY<u32>,
+    ) -> ProjectUniforms {
+        let project = ProjectConfiguration::default();
+        let cursor = CursorEvents::default();
+        let frames = frames(size);
+        let mut zoom = ZoomTransformTimeline::from_project(&project, &cursor, 60.0, size);
+        zoom.ensure_precomputed_until(60.0);
+        let mut uniforms = ProjectUniforms::new(
+            constants, &project, 0, FPS, size, &cursor, &frames, 60.0, &zoom,
+        );
+        uniforms.output_size = (size.x, size.y);
+        uniforms.project.keyboard = Some(KeyboardData {
+            settings: KeyboardSettings {
+                enabled: true,
+                ..Default::default()
+            },
+        });
+        uniforms.project.timeline = Some(TimelineConfiguration {
+            segments: vec![],
+            transitions: vec![],
+            zoom_segments: vec![],
+            scene_segments: vec![],
+            mask_segments: vec![],
+            text_segments: vec![],
+            caption_segments: vec![],
+            keyboard_segments: segments.to_vec(),
+            audio_segments: vec![],
+            style_segments: vec![],
+            image_segments: vec![],
+            camera3d_segments: vec![],
+        });
+        uniforms
+    }
+
+    fn frames(size: XY<u32>) -> DecodedSegmentFrames {
+        DecodedSegmentFrames {
+            screen_size: size,
+            screen_frame: None,
+            camera_frame: None,
+            segment_time: 0.0,
+            recording_time: 0.0,
+            segment_has_camera: false,
+        }
+    }
+
+    fn render_pixels(
+        constants: &RenderVideoConstants,
+        layer: &KeyboardLayer,
+        size: XY<u32>,
+    ) -> Vec<u8> {
+        let device = &constants.device;
+        let target = device.create_texture(&wgpu::TextureDescriptor {
+            label: Some("Keyboard Test Target"),
+            size: wgpu::Extent3d {
+                width: size.x,
+                height: size.y,
+                depth_or_array_layers: 1,
+            },
+            mip_level_count: 1,
+            sample_count: 1,
+            dimension: wgpu::TextureDimension::D2,
+            format: wgpu::TextureFormat::Rgba8Unorm,
+            usage: wgpu::TextureUsages::RENDER_ATTACHMENT | wgpu::TextureUsages::COPY_SRC,
+            view_formats: &[],
+        });
+        let view = target.create_view(&Default::default());
+        let readback = device.create_buffer(&wgpu::BufferDescriptor {
+            label: Some("Keyboard Test Readback"),
+            size: u64::from(size.x * size.y * 4),
+            usage: wgpu::BufferUsages::COPY_DST | wgpu::BufferUsages::MAP_READ,
+            mapped_at_creation: false,
+        });
+        let mut encoder = device.create_command_encoder(&Default::default());
+        {
+            let mut pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
+                label: Some("Keyboard Test Pass"),
+                color_attachments: &[Some(wgpu::RenderPassColorAttachment {
+                    view: &view,
+                    resolve_target: None,
+                    ops: wgpu::Operations {
+                        load: wgpu::LoadOp::Clear(wgpu::Color::TRANSPARENT),
+                        store: wgpu::StoreOp::Store,
+                    },
+                })],
+                depth_stencil_attachment: None,
+                timestamp_writes: None,
+                occlusion_query_set: None,
+            });
+            layer.render(&mut pass);
+        }
+        encoder.copy_texture_to_buffer(
+            wgpu::TexelCopyTextureInfo {
+                texture: &target,
+                mip_level: 0,
+                origin: wgpu::Origin3d::ZERO,
+                aspect: wgpu::TextureAspect::All,
+            },
+            wgpu::TexelCopyBufferInfo {
+                buffer: &readback,
+                layout: wgpu::TexelCopyBufferLayout {
+                    offset: 0,
+                    bytes_per_row: Some(size.x * 4),
+                    rows_per_image: Some(size.y),
+                },
+            },
+            wgpu::Extent3d {
+                width: size.x,
+                height: size.y,
+                depth_or_array_layers: 1,
+            },
+        );
+        constants.queue.submit([encoder.finish()]);
+        readback.slice(..).map_async(wgpu::MapMode::Read, |_| {});
+        device.poll(wgpu::PollType::Wait).unwrap();
+        let pixels = readback.slice(..).get_mapped_range().to_vec();
+        readback.unmap();
+        pixels
+    }
+
+    #[test]
+    #[ignore = "requires a working wgpu adapter"]
+    fn every_frame_of_a_typed_segment_renders_like_a_fresh_layer() {
+        let size = XY::new(512, 288);
+        let constants = constants(size);
+        let segments = [typed_segment("typed", 0.2, "git push", 90.0)];
+        let mut uniforms = uniforms(&constants, &segments, size);
+        let frames = frames(size);
+        let mut reused = KeyboardLayer::new(&constants.device, &constants.queue);
+        let mut drawn_frames = 0;
+        for frame in 0..((segments[0].end + 0.2) * FPS as f64) as u32 {
+            uniforms.frame_number = frame;
+            reused.prepare(&uniforms, &frames, size, &constants, None);
+            let mut fresh = KeyboardLayer::new(&constants.device, &constants.queue);
+            fresh.prepare(&uniforms, &frames, size, &constants, None);
+            assert_eq!(reused.has_content(), fresh.has_content(), "frame {frame}");
+            let pixels = render_pixels(&constants, &reused, size);
+            assert_eq!(
+                pixels,
+                render_pixels(&constants, &fresh, size),
+                "frame {frame}"
+            );
+            drawn_frames += usize::from(pixels.chunks_exact(4).any(|pixel| pixel[3] != 0));
+        }
+        assert!(drawn_frames > 40);
+    }
+
+    #[test]
+    #[ignore = "benchmark; requires a working wgpu adapter"]
+    fn benchmark_keyboard_layer_prepare() {
+        let size = XY::new(1920, 1080);
+        let constants = constants(size);
+        let mut segments = Vec::new();
+        let mut start = 0.5;
+        for (index, text) in ["cargo test --release", "git status", "npm run dev"]
+            .iter()
+            .enumerate()
+        {
+            let segment = typed_segment(&format!("typed-{index}"), start, text, 120.0);
+            start = segment.end + 0.5;
+            segments.push(segment);
+        }
+        let mut uniforms = uniforms(&constants, &segments, size);
+        let frames = frames(size);
+        let total_frames = (start * FPS as f64) as u32;
+        let mut layer = KeyboardLayer::new(&constants.device, &constants.queue);
+
+        let mut samples = Vec::new();
+        for pass in 0..4 {
+            for frame in 0..total_frames {
+                uniforms.frame_number = frame;
+                let started = std::time::Instant::now();
+                layer.prepare(&uniforms, &frames, size, &constants, None);
+                let elapsed = started.elapsed().as_secs_f64() * 1e6;
+                if pass > 0 && layer.has_content() {
+                    samples.push(elapsed);
+                }
+            }
+        }
+        constants.device.poll(wgpu::PollType::Wait).unwrap();
+        samples.sort_by(f64::total_cmp);
+        println!(
+            "keyboard layer prepare ({} visible frames): p50 {:.1} us, p95 {:.1} us, mean {:.1} us",
+            samples.len(),
+            samples[samples.len() / 2],
+            samples[samples.len() * 95 / 100],
+            samples.iter().sum::<f64>() / samples.len() as f64,
+        );
+    }
+}

From 4577e9d359d4eafe402f72cc4962ebc61952e0e2 Mon Sep 17 00:00:00 2001
From: Scott Newton <scottanewton@yahoo.com>
Date: Tue, 13 Oct 2026 14:45:21 -0700
Subject: [PATCH 25/74] perf(rendering): reshape captions only when their text
 or style changes

---
 crates/rendering/src/layers/captions.rs | 378 +++++++++++++++++++++++-
 1 file changed, 363 insertions(+), 15 deletions(-)

diff --git a/crates/rendering/src/layers/captions.rs b/crates/rendering/src/layers/captions.rs
index 0c47bddd912..798d72fb858 100644
--- a/crates/rendering/src/layers/captions.rs
+++ b/crates/rendering/src/layers/captions.rs
@@ -261,6 +261,16 @@ fn calculate_word_highlight(
     0.0
 }
 
+#[derive(PartialEq)]
+struct ShapedCaptionText {
+    text: String,
+    font_size: u32,
+    wrap_width: u32,
+    family: Family<'static>,
+    weight: Weight,
+    color: Color,
+}
+
 pub struct CaptionsLayer {
     _settings_buffer: wgpu::Buffer,
     font_system: FontSystem,
@@ -268,6 +278,7 @@ pub struct CaptionsLayer {
     text_atlas: TextAtlas,
     text_renderer: TextRenderer,
     text_buffer: Buffer,
+    shaped: Option<ShapedCaptionText>,
     current_text: Option<String>,
     current_segment_start: f32,
     current_segment_end: f32,
@@ -412,6 +423,7 @@ impl CaptionsLayer {
             text_atlas,
             text_renderer,
             text_buffer,
+            shaped: None,
             current_text: None,
             current_segment_start: 0.0,
             current_segment_end: 0.0,
@@ -605,12 +617,13 @@ impl CaptionsLayer {
             .clamp(0.0, 1.0);
 
         let font_size = caption_data.settings.size as f32 * (height as f32 / 1080.0);
-        let metrics = Metrics::new(font_size, font_size * 1.2);
-
-        let mut updated_buffer = Buffer::new(&mut self.font_system, metrics);
         let wrap_width = (width as f32 - margin * 2.0).max(font_size);
-        updated_buffer.set_size(&mut self.font_system, Some(wrap_width), None);
-        updated_buffer.set_wrap(&mut self.font_system, glyphon::Wrap::None);
+        let new_buffer = |font_system: &mut FontSystem| {
+            let mut buffer = Buffer::new(font_system, Metrics::new(font_size, font_size * 1.2));
+            buffer.set_size(font_system, Some(wrap_width), None);
+            buffer.set_wrap(font_system, glyphon::Wrap::None);
+            buffer
+        };
 
         let font_family = match caption_data.settings.font.as_str() {
             "System Serif" => Family::Serif,
@@ -708,13 +721,16 @@ impl CaptionsLayer {
                 ));
             }
 
-            updated_buffer.set_rich_text(
+            let mut buffer = new_buffer(&mut self.font_system);
+            buffer.set_rich_text(
                 &mut self.font_system,
                 rich_text,
                 &Attrs::new().family(font_family).weight(weight),
                 Shaping::Advanced,
                 None,
             );
+            self.text_buffer = buffer;
+            self.shaped = None;
         } else {
             let color = Color::rgba(
                 (base_color[0] * 255.0) as u8,
@@ -722,19 +738,31 @@ impl CaptionsLayer {
                 (base_color[2] * 255.0) as u8,
                 (highlight_alpha * 255.0) as u8,
             );
-            let attrs = Attrs::new().family(font_family).weight(weight).color(color);
-            updated_buffer.set_text(
-                &mut self.font_system,
-                caption_text.as_str(),
-                &attrs,
-                Shaping::Advanced,
-            );
+            let shaped = ShapedCaptionText {
+                text: caption_text,
+                font_size: font_size.to_bits(),
+                wrap_width: wrap_width.to_bits(),
+                family: font_family,
+                weight,
+                color,
+            };
+            if self.shaped.as_ref() != Some(&shaped) {
+                let mut buffer = new_buffer(&mut self.font_system);
+                buffer.set_text(
+                    &mut self.font_system,
+                    &shaped.text,
+                    &Attrs::new().family(font_family).weight(weight).color(color),
+                    Shaping::Advanced,
+                );
+                self.text_buffer = buffer;
+                self.shaped = Some(shaped);
+            }
         }
 
         let mut layout_width: f32 = 0.0;
         let mut layout_height: f32 = 0.0;
         let mut highlight_extent: Option<(f32, f32, f32, f32)> = None;
-        for run in LayoutRunIter::new(&updated_buffer) {
+        for run in LayoutRunIter::new(&self.text_buffer) {
             layout_width = layout_width.max(run.line_w);
             layout_height = layout_height.max(run.line_top + run.line_height);
 
@@ -844,7 +872,6 @@ impl CaptionsLayer {
             bottom: (text_top + draw_text_height + 2.0).ceil() as i32,
         };
 
-        self.text_buffer = updated_buffer;
         self.viewport.update(queue, Resolution { width, height });
 
         let mut text_areas = Vec::new();
@@ -1260,3 +1287,324 @@ mod tests {
         assert_eq!(word_byte_range("missing", &words, 0, false), None);
     }
 }
+
+#[cfg(test)]
+mod gpu_tests {
+    use cap_project::{
+        CaptionSettings, CaptionTrackSegment, CaptionWord, CaptionsData, CursorEvents,
+        ProjectConfiguration, RecordingMeta, RecordingMetaInner, StudioRecordingMeta,
+        TimelineConfiguration, XY,
+    };
+
+    use super::CaptionsLayer;
+    use crate::{
+        DecodedSegmentFrames, ProjectUniforms, RenderOptions, RenderVideoConstants,
+        ZoomTransformTimeline,
+    };
+
+    const FPS: u32 = 60;
+
+    fn constants(size: XY<u32>) -> RenderVideoConstants {
+        let meta: StudioRecordingMeta = serde_json::from_value(serde_json::json!({
+            "display": { "path": "synthetic.mp4", "fps": FPS }
+        }))
+        .unwrap();
+        let recording = RecordingMeta {
+            platform: None,
+            project_path: Default::default(),
+            pretty_name: "Caption overlay test".into(),
+            sharing: None,
+            inner: RecordingMetaInner::Studio(Box::new(meta.clone())),
+            upload: None,
+        };
+        pollster::block_on(RenderVideoConstants::new_with_options(
+            RenderOptions {
+                screen_size: size,
+                camera_size: None,
+                preserve_screen_alpha: false,
+            },
+            recording,
+            meta,
+        ))
+        .unwrap()
+    }
+
+    fn spoken_segments(sentences: &[&str]) -> Vec<CaptionTrackSegment> {
+        let mut start = 0.3;
+        sentences
+            .iter()
+            .enumerate()
+            .map(|(index, sentence)| {
+                let words = sentence
+                    .split_whitespace()
+                    .enumerate()
+                    .map(|(word_index, text)| CaptionWord {
+                        text: text.to_string(),
+                        start: start as f32 + word_index as f32 * 0.3,
+                        end: start as f32 + word_index as f32 * 0.3 + 0.25,
+                    })
+                    .collect::<Vec<_>>();
+                let end = f64::from(words.last().map_or(start as f32, |word| word.end));
+                let segment = CaptionTrackSegment {
+                    id: format!("caption-{index}"),
+                    start,
+                    end,
+                    text: sentence.to_string(),
+                    words,
+                    fade_duration_override: None,
+                    linger_duration_override: None,
+                    position_override: None,
+                    color_override: None,
+                    background_color_override: None,
+                    font_size_override: None,
+                };
+                start = end + 0.4;
+                segment
+            })
+            .collect()
+    }
+
+    fn frames(size: XY<u32>) -> DecodedSegmentFrames {
+        DecodedSegmentFrames {
+            screen_size: size,
+            screen_frame: None,
+            camera_frame: None,
+            segment_time: 0.0,
+            recording_time: 0.0,
+            segment_has_camera: false,
+        }
+    }
+
+    fn uniforms(
+        constants: &RenderVideoConstants,
+        settings: CaptionSettings,
+        segments: &[CaptionTrackSegment],
+        size: XY<u32>,
+    ) -> ProjectUniforms {
+        let project = ProjectConfiguration::default();
+        let cursor = CursorEvents::default();
+        let frames = frames(size);
+        let mut zoom = ZoomTransformTimeline::from_project(&project, &cursor, 60.0, size);
+        zoom.ensure_precomputed_until(60.0);
+        let mut uniforms = ProjectUniforms::new(
+            constants, &project, 0, FPS, size, &cursor, &frames, 60.0, &zoom,
+        );
+        uniforms.output_size = (size.x, size.y);
+        uniforms.project.captions = Some(CaptionsData {
+            segments: vec![],
+            settings,
+            source_timed: false,
+        });
+        uniforms.project.timeline = Some(TimelineConfiguration {
+            segments: vec![],
+            transitions: vec![],
+            zoom_segments: vec![],
+            scene_segments: vec![],
+            mask_segments: vec![],
+            text_segments: vec![],
+            caption_segments: segments.to_vec(),
+            keyboard_segments: vec![],
+            audio_segments: vec![],
+            style_segments: vec![],
+            image_segments: vec![],
+            camera3d_segments: vec![],
+        });
+        uniforms
+    }
+
+    fn render_pixels(
+        constants: &RenderVideoConstants,
+        layer: &CaptionsLayer,
+        size: XY<u32>,
+    ) -> Vec<u8> {
+        let device = &constants.device;
+        let target = device.create_texture(&wgpu::TextureDescriptor {
+            label: Some("Caption Test Target"),
+            size: wgpu::Extent3d {
+                width: size.x,
+                height: size.y,
+                depth_or_array_layers: 1,
+            },
+            mip_level_count: 1,
+            sample_count: 1,
+            dimension: wgpu::TextureDimension::D2,
+            format: wgpu::TextureFormat::Rgba8Unorm,
+            usage: wgpu::TextureUsages::RENDER_ATTACHMENT | wgpu::TextureUsages::COPY_SRC,
+            view_formats: &[],
+        });
+        let view = target.create_view(&Default::default());
+        let readback = device.create_buffer(&wgpu::BufferDescriptor {
+            label: Some("Caption Test Readback"),
+            size: u64::from(size.x * size.y * 4),
+            usage: wgpu::BufferUsages::COPY_DST | wgpu::BufferUsages::MAP_READ,
+            mapped_at_creation: false,
+        });
+        let mut encoder = device.create_command_encoder(&Default::default());
+        {
+            let mut pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
+                label: Some("Caption Test Pass"),
+                color_attachments: &[Some(wgpu::RenderPassColorAttachment {
+                    view: &view,
+                    resolve_target: None,
+                    ops: wgpu::Operations {
+                        load: wgpu::LoadOp::Clear(wgpu::Color::TRANSPARENT),
+                        store: wgpu::StoreOp::Store,
+                    },
+                })],
+                depth_stencil_attachment: None,
+                timestamp_writes: None,
+                occlusion_query_set: None,
+            });
+            layer.render(&mut pass);
+        }
+        encoder.copy_texture_to_buffer(
+            wgpu::TexelCopyTextureInfo {
+                texture: &target,
+                mip_level: 0,
+                origin: wgpu::Origin3d::ZERO,
+                aspect: wgpu::TextureAspect::All,
+            },
+            wgpu::TexelCopyBufferInfo {
+                buffer: &readback,
+                layout: wgpu::TexelCopyBufferLayout {
+                    offset: 0,
+                    bytes_per_row: Some(size.x * 4),
+                    rows_per_image: Some(size.y),
+                },
+            },
+            wgpu::Extent3d {
+                width: size.x,
+                height: size.y,
+                depth_or_array_layers: 1,
+            },
+        );
+        constants.queue.submit([encoder.finish()]);
+        readback.slice(..).map_async(wgpu::MapMode::Read, |_| {});
+        device.poll(wgpu::PollType::Wait).unwrap();
+        let pixels = readback.slice(..).get_mapped_range().to_vec();
+        readback.unmap();
+        pixels
+    }
+
+    #[test]
+    #[ignore = "requires a working wgpu adapter"]
+    fn every_caption_frame_renders_like_a_fresh_layer() {
+        let size = XY::new(512, 288);
+        let constants = constants(size);
+        let segments = spoken_segments(&["Hello there", "Ship it today"]);
+        let frames = frames(size);
+        let enabled = CaptionSettings {
+            enabled: true,
+            size: 60,
+            ..Default::default()
+        };
+        let variants = [
+            enabled.clone(),
+            CaptionSettings {
+                outline: true,
+                uppercase: true,
+                animation: "pop".to_string(),
+                ..enabled.clone()
+            },
+            CaptionSettings {
+                active_word_highlight: true,
+                highlight_style: "pill".to_string(),
+                ..enabled.clone()
+            },
+            CaptionSettings {
+                active_word_highlight: true,
+                ..enabled
+            },
+        ];
+        let last_frame = (segments.last().unwrap().end + 0.3) * f64::from(FPS);
+        for settings in variants {
+            let mut uniforms = uniforms(&constants, settings, &segments, size);
+            let mut reused = CaptionsLayer::new(&constants.device, &constants.queue);
+            let mut drawn_frames = 0;
+            for frame in 0..last_frame as u32 {
+                uniforms.frame_number = frame;
+                reused.prepare(&uniforms, &frames, size, &constants);
+                let mut fresh = CaptionsLayer::new(&constants.device, &constants.queue);
+                fresh.prepare(&uniforms, &frames, size, &constants);
+                assert_eq!(reused.has_caption, fresh.has_caption, "frame {frame}");
+                let pixels = render_pixels(&constants, &reused, size);
+                assert_eq!(
+                    pixels,
+                    render_pixels(&constants, &fresh, size),
+                    "frame {frame}"
+                );
+                drawn_frames += usize::from(pixels.chunks_exact(4).any(|pixel| pixel[3] != 0));
+            }
+            assert!(drawn_frames > 60);
+        }
+    }
+
+    #[test]
+    #[ignore = "benchmark; requires a working wgpu adapter"]
+    fn benchmark_captions_layer_prepare() {
+        let size = XY::new(1920, 1080);
+        let constants = constants(size);
+        let segments = spoken_segments(&[
+            "Today I want to walk you through the new export flow",
+            "First pick a preset and the resolution you need",
+            "Then trim the start and end so the video gets to the point",
+            "When you are happy with it press export and share the link",
+        ]);
+        let frames = frames(size);
+        let last_frame = (segments.last().unwrap().end * f64::from(FPS)) as u32;
+        let base = CaptionSettings {
+            enabled: true,
+            ..Default::default()
+        };
+        let cases = [
+            ("default", base.clone()),
+            (
+                "outline",
+                CaptionSettings {
+                    outline: true,
+                    ..base.clone()
+                },
+            ),
+            (
+                "pill highlight",
+                CaptionSettings {
+                    active_word_highlight: true,
+                    highlight_style: "pill".to_string(),
+                    ..base.clone()
+                },
+            ),
+            (
+                "color highlight",
+                CaptionSettings {
+                    active_word_highlight: true,
+                    ..base
+                },
+            ),
+        ];
+        for (name, settings) in cases {
+            let mut uniforms = uniforms(&constants, settings, &segments, size);
+            let mut layer = CaptionsLayer::new(&constants.device, &constants.queue);
+            let mut samples = Vec::new();
+            for pass in 0..4 {
+                for frame in 0..last_frame {
+                    uniforms.frame_number = frame;
+                    let started = std::time::Instant::now();
+                    layer.prepare(&uniforms, &frames, size, &constants);
+                    let elapsed = started.elapsed().as_secs_f64() * 1e6;
+                    if pass > 0 && layer.has_caption {
+                        samples.push(elapsed);
+                    }
+                }
+            }
+            constants.device.poll(wgpu::PollType::Wait).unwrap();
+            samples.sort_by(f64::total_cmp);
+            println!(
+                "captions layer prepare [{name}] ({} visible frames): p50 {:.1} us, p95 {:.1} us, mean {:.1} us",
+                samples.len(),
+                samples[samples.len() / 2],
+                samples[samples.len() * 95 / 100],
+                samples.iter().sum::<f64>() / samples.len() as f64,
+            );
+        }
+    }
+}

From 32eb6ca841b81e1a9b125219092fd3dd4d8144d2 Mon Sep 17 00:00:00 2001
From: Scott Newton <scottanewton@yahoo.com>
Date: Wed, 14 Oct 2026 11:04:45 -0700
Subject: [PATCH 26/74] test(rendering): check the keyboard layout cache
 against font and size changes

---
 crates/rendering/src/layers/keyboard.rs | 55 +++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/crates/rendering/src/layers/keyboard.rs b/crates/rendering/src/layers/keyboard.rs
index 184eefcad9d..11ed208428b 100644
--- a/crates/rendering/src/layers/keyboard.rs
+++ b/crates/rendering/src/layers/keyboard.rs
@@ -1050,6 +1050,61 @@ mod gpu_tests {
         assert!(drawn_frames > 40);
     }
 
+    #[test]
+    #[ignore = "requires a working wgpu adapter"]
+    fn reused_layer_follows_font_and_output_size_changes() {
+        type Edit = (&'static str, XY<u32>, fn(&mut KeyboardSettings));
+        let base_size = XY::new(512, 288);
+        let constants = constants(base_size);
+        let segments = [typed_segment("typed", 0.2, "git push origin main", 60.0)];
+        let frames = frames(base_size);
+        let prepare =
+            |layer: &mut KeyboardLayer, size: XY<u32>, edit: fn(&mut KeyboardSettings)| {
+                let mut uniforms = uniforms(&constants, &segments, size);
+                uniforms.frame_number = 96;
+                edit(&mut uniforms.project.keyboard.as_mut().unwrap().settings);
+                layer.prepare(&uniforms, &frames, size, &constants, None);
+                assert!(layer.has_content());
+                render_pixels(&constants, layer, size)
+            };
+        let unchanged: fn(&mut KeyboardSettings) = |_| {};
+        let edits: [Edit; 5] = [
+            ("font size", base_size, |settings| settings.size = 70),
+            ("font family", base_size, |settings| {
+                settings.font = "System Monospace".to_string()
+            }),
+            ("font weight", base_size, |settings| {
+                settings.font_weight = 700
+            }),
+            ("output height", XY::new(512, 216), unchanged),
+            ("output width", XY::new(128, 288), unchanged),
+        ];
+        let base_pixels = prepare(
+            &mut KeyboardLayer::new(&constants.device, &constants.queue),
+            base_size,
+            unchanged,
+        );
+
+        for (name, size, edit) in edits {
+            let expected = prepare(
+                &mut KeyboardLayer::new(&constants.device, &constants.queue),
+                size,
+                edit,
+            );
+            assert!(
+                expected != base_pixels,
+                "{name} edit should change the output"
+            );
+
+            let mut reused = KeyboardLayer::new(&constants.device, &constants.queue);
+            prepare(&mut reused, base_size, unchanged);
+            assert!(
+                prepare(&mut reused, size, edit) == expected,
+                "{name} edit reused a stale layout"
+            );
+        }
+    }
+
     #[test]
     #[ignore = "benchmark; requires a working wgpu adapter"]
     fn benchmark_keyboard_layer_prepare() {

From a496dabbc40c2af63ea7818bc285f0dfac5e8168 Mon Sep 17 00:00:00 2001
From: Scott Newton <scottanewton@yahoo.com>
Date: Wed, 14 Oct 2026 11:22:59 -0700
Subject: [PATCH 27/74] test(rendering): check the caption layout cache against
 style and size changes

---
 crates/rendering/src/layers/captions.rs | 122 ++++++++++++++++++++++++
 1 file changed, 122 insertions(+)

diff --git a/crates/rendering/src/layers/captions.rs b/crates/rendering/src/layers/captions.rs
index 798d72fb858..218b8ce0669 100644
--- a/crates/rendering/src/layers/captions.rs
+++ b/crates/rendering/src/layers/captions.rs
@@ -1539,6 +1539,128 @@ mod gpu_tests {
         }
     }
 
+    #[test]
+    #[ignore = "requires a working wgpu adapter"]
+    fn reused_layer_follows_style_and_output_size_changes() {
+        let base_size = XY::new(512, 288);
+        let constants = constants(base_size);
+        let segments = spoken_segments(&["Ship it today"]);
+        let frames = frames(base_size);
+        let render = |layer: &mut CaptionsLayer, settings: &CaptionSettings, size: XY<u32>| {
+            let mut uniforms = uniforms(&constants, settings.clone(), &segments, size);
+            uniforms.frame_number = 45;
+            layer.prepare(&uniforms, &frames, size, &constants);
+            assert!(layer.has_caption);
+            render_pixels(&constants, layer, size)
+        };
+        let plain = CaptionSettings {
+            enabled: true,
+            size: 60,
+            ..Default::default()
+        };
+        let color_highlight = CaptionSettings {
+            active_word_highlight: true,
+            highlight_color: "#FF0000".to_string(),
+            ..plain.clone()
+        };
+        let cases = [
+            (
+                "font size",
+                plain.clone(),
+                CaptionSettings {
+                    size: 80,
+                    ..plain.clone()
+                },
+                base_size,
+            ),
+            (
+                "font family",
+                plain.clone(),
+                CaptionSettings {
+                    font: "System Monospace".to_string(),
+                    ..plain.clone()
+                },
+                base_size,
+            ),
+            (
+                "font weight",
+                plain.clone(),
+                CaptionSettings {
+                    font_weight: 400,
+                    ..plain.clone()
+                },
+                base_size,
+            ),
+            (
+                "text color",
+                plain.clone(),
+                CaptionSettings {
+                    color: "#FF0000".to_string(),
+                    ..plain.clone()
+                },
+                base_size,
+            ),
+            (
+                "output height",
+                plain.clone(),
+                plain.clone(),
+                XY::new(512, 216),
+            ),
+            (
+                "output width",
+                plain.clone(),
+                plain.clone(),
+                XY::new(384, 288),
+            ),
+            (
+                "plain to color highlight",
+                plain.clone(),
+                color_highlight.clone(),
+                base_size,
+            ),
+            (
+                "color highlight to plain",
+                color_highlight.clone(),
+                plain.clone(),
+                base_size,
+            ),
+        ];
+
+        for (name, before, after, size) in cases {
+            let expected = render(
+                &mut CaptionsLayer::new(&constants.device, &constants.queue),
+                &after,
+                size,
+            );
+            let previous = render(
+                &mut CaptionsLayer::new(&constants.device, &constants.queue),
+                &before,
+                base_size,
+            );
+            assert!(expected != previous, "{name} edit should change the output");
+
+            let mut reused = CaptionsLayer::new(&constants.device, &constants.queue);
+            render(&mut reused, &before, base_size);
+            assert!(
+                render(&mut reused, &after, size) == expected,
+                "{name} edit reused a stale layout"
+            );
+        }
+
+        let mut reused = CaptionsLayer::new(&constants.device, &constants.queue);
+        render(&mut reused, &plain, base_size);
+        render(&mut reused, &color_highlight, base_size);
+        let expected = render(
+            &mut CaptionsLayer::new(&constants.device, &constants.queue),
+            &plain,
+            base_size,
+        );
+        assert!(
+            render(&mut reused, &plain, base_size) == expected,
+            "returning to plain text reused the highlighted layout"
+        );
+    }
+
     #[test]
     #[ignore = "benchmark; requires a working wgpu adapter"]
     fn benchmark_captions_layer_prepare() {

From 563c686ee33900c79ced678e8f2f5b77ffc66300 Mon Sep 17 00:00:00 2001
From: Scott Newton <scottanewton@yahoo.com>
Date: Tue, 13 Oct 2026 17:40:13 -0700
Subject: [PATCH 28/74] perf(editor): keep the preview updating while scrubbing

A newer preview request cancelled the in-flight frame every time, so a scrub faster than one seek never presented a frame until the mouse stopped. A newer request now only wins while a frame was presented in the last 33 ms; otherwise the in-flight frame is shown and the renderer moves on to the latest request.
---
 crates/editor/examples/scrub-benchmark.rs | 203 ++++++++++++++++++++++
 crates/editor/src/editor_instance.rs      |  46 ++++-
 2 files changed, 242 insertions(+), 7 deletions(-)
 create mode 100644 crates/editor/examples/scrub-benchmark.rs

diff --git a/crates/editor/examples/scrub-benchmark.rs b/crates/editor/examples/scrub-benchmark.rs
new file mode 100644
index 00000000000..4232ffa8a02
--- /dev/null
+++ b/crates/editor/examples/scrub-benchmark.rs
@@ -0,0 +1,203 @@
+use std::{
+    path::PathBuf,
+    sync::mpsc,
+    time::{Duration, Instant},
+};
+
+use cap_editor::{EditorFrameOutput, EditorInstance, FrameLayout};
+use cap_project::{ProjectConfiguration, XY};
+
+const FPS: u32 = 60;
+const MOUSE_HZ: f64 = 120.0;
+
+fn arg_value<'a>(args: &'a [String], flag: &str) -> Option<&'a str> {
+    args.iter()
+        .position(|arg| arg == flag)
+        .and_then(|idx| args.get(idx + 1))
+        .map(String::as_str)
+}
+
+fn presented_frame(output: &EditorFrameOutput) -> u32 {
+    match output {
+        EditorFrameOutput::Rgba(frame) => frame.frame_number,
+        EditorFrameOutput::Nv12(frame) => frame.frame_number,
+        #[cfg(target_os = "macos")]
+        EditorFrameOutput::Surface(frame) => frame.frame_number,
+    }
+}
+
+struct SweepResult {
+    requests: usize,
+    presented: usize,
+    longest_gap_ms: f64,
+    settle_ms: f64,
+}
+
+async fn sweep(
+    editor: &EditorInstance,
+    frames_rx: &mpsc::Receiver<(Instant, u32)>,
+    from: u32,
+    to: u32,
+    sweep_secs: f64,
+    resolution: XY<u32>,
+) -> SweepResult {
+    while frames_rx.try_recv().is_ok() {}
+
+    let steps = (sweep_secs * MOUSE_HZ).round().max(1.0) as usize;
+    let interval = Duration::from_secs_f64(1.0 / MOUSE_HZ);
+    let started = Instant::now();
+    let mut presented = Vec::new();
+
+    for step in 0..=steps {
+        let progress = step as f64 / steps as f64;
+        let frame = (from as f64 + (to as f64 - from as f64) * progress).round() as u32;
+        editor
+            .preview_tx
+            .send_modify(|value| *value = Some((frame, FPS, resolution)));
+        let deadline = started + interval * (step as u32 + 1);
+        while let Ok(event) = frames_rx.try_recv() {
+            presented.push(event);
+        }
+        tokio::time::sleep_until(deadline.into()).await;
+    }
+
+    let last_send = Instant::now();
+    let presented_during_drag = presented.len();
+    let settle_ms = loop {
+        match frames_rx.recv_timeout(Duration::from_secs(10)) {
+            Ok((at, frame)) => {
+                presented.push((at, frame));
+                if frame == to {
+                    break at.saturating_duration_since(last_send).as_secs_f64() * 1000.0;
+                }
+            }
+            Err(_) => panic!("final frame {to} never presented"),
+        }
+    };
+
+    let mut longest_gap = Duration::ZERO;
+    let mut previous = started;
+    for (at, _) in presented.iter().filter(|(at, _)| *at <= last_send) {
+        longest_gap = longest_gap.max(at.saturating_duration_since(previous));
+        previous = *at;
+    }
+    longest_gap = longest_gap.max(last_send.saturating_duration_since(previous));
+
+    SweepResult {
+        requests: steps + 1,
+        presented: presented_during_drag,
+        longest_gap_ms: longest_gap.as_secs_f64() * 1000.0,
+        settle_ms,
+    }
+}
+
+#[tokio::main]
+async fn main() {
+    let args: Vec<String> = std::env::args().collect();
+    let recording_path = arg_value(&args, "--recording-path")
+        .map(PathBuf::from)
+        .expect("Usage: scrub-benchmark --recording-path <path> [--runs <count>]");
+    let runs = arg_value(&args, "--runs")
+        .and_then(|value| value.parse::<usize>().ok())
+        .unwrap_or(3);
+    let resolution = XY::new(960, 540);
+
+    let duration = ProjectConfiguration::load(&recording_path)
+        .ok()
+        .and_then(|config| config.timeline.map(|timeline| timeline.duration()))
+        .expect("project needs a timeline");
+    let last_frame = ((duration * FPS as f64).floor() as u32).saturating_sub(2);
+
+    let (frames_tx, frames_rx) = mpsc::channel::<(Instant, u32)>();
+    let editor = EditorInstance::new(
+        recording_path.clone(),
+        |_| {},
+        Box::new(move |output: EditorFrameOutput, _: FrameLayout| {
+            let _ = frames_tx.send((Instant::now(), presented_frame(&output)));
+        }),
+        None,
+    )
+    .await
+    .expect("Failed to create editor instance");
+
+    editor
+        .preview_tx
+        .send_modify(|value| *value = Some((0, FPS, resolution)));
+    frames_rx
+        .recv_timeout(Duration::from_secs(10))
+        .expect("first preview frame");
+    tokio::time::sleep(Duration::from_millis(500)).await;
+
+    println!("Recording: {}", recording_path.display());
+    println!(
+        "Timeline: {duration:.1}s, preview {}x{}, mouse {MOUSE_HZ} Hz",
+        resolution.x, resolution.y
+    );
+
+    let cases: [(&str, f64, bool); 4] = [
+        ("fast drag, whole timeline in 2 s", 2.0, false),
+        ("fast drag back", 2.0, true),
+        ("slow drag, whole timeline in 8 s", 8.0, false),
+        ("slow drag back", 8.0, true),
+    ];
+    for (name, secs, backward) in cases {
+        let mut results = Vec::new();
+        for _ in 0..runs {
+            let (from, to) = if backward {
+                (last_frame, 0)
+            } else {
+                (0, last_frame)
+            };
+            editor
+                .preview_tx
+                .send_modify(|value| *value = Some((from, FPS, resolution)));
+            tokio::time::sleep(Duration::from_millis(800)).await;
+            results.push(sweep(&editor, &frames_rx, from, to, secs, resolution).await);
+            tokio::time::sleep(Duration::from_millis(300)).await;
+        }
+        let mean =
+            |f: fn(&SweepResult) -> f64| results.iter().map(f).sum::<f64>() / results.len() as f64;
+        println!(
+            "{name:<34} requests={:>4} presented={:>6.1} ({:>5.1}/s) longest_gap={:>7.1}ms settle={:>6.1}ms",
+            results[0].requests,
+            mean(|r| r.presented as f64),
+            mean(|r| r.presented as f64) / secs,
+            mean(|r| r.longest_gap_ms),
+            mean(|r| r.settle_ms),
+        );
+    }
+
+    let mut seek_ms = Vec::new();
+    let mut seed = 0x2545F4914F6CDD1Du64;
+    for _ in 0..30 {
+        seed ^= seed << 13;
+        seed ^= seed >> 7;
+        seed ^= seed << 17;
+        let target = (seed % u64::from(last_frame)) as u32;
+        while frames_rx.try_recv().is_ok() {}
+        let sent = Instant::now();
+        editor
+            .preview_tx
+            .send_modify(|value| *value = Some((target, FPS, resolution)));
+        loop {
+            let (at, frame) = frames_rx
+                .recv_timeout(Duration::from_secs(10))
+                .expect("seek target never presented");
+            if frame == target {
+                seek_ms.push(at.saturating_duration_since(sent).as_secs_f64() * 1000.0);
+                break;
+            }
+        }
+        tokio::time::sleep(Duration::from_millis(400)).await;
+    }
+    seek_ms.sort_by(f64::total_cmp);
+    println!(
+        "{:<34} p50={:>6.1}ms p90={:>6.1}ms max={:>6.1}ms",
+        "single random seek (idle)",
+        seek_ms[seek_ms.len() / 2],
+        seek_ms[seek_ms.len() * 9 / 10],
+        seek_ms[seek_ms.len() - 1]
+    );
+
+    editor.dispose().await;
+}
diff --git a/crates/editor/src/editor_instance.rs b/crates/editor/src/editor_instance.rs
index ea0569daa9a..4558145552f 100644
--- a/crates/editor/src/editor_instance.rs
+++ b/crates/editor/src/editor_instance.rs
@@ -18,6 +18,7 @@ use std::{
         Arc,
         atomic::{AtomicBool, AtomicU64, Ordering},
     },
+    time::{Duration, Instant},
 };
 use tokio::sync::{Mutex, watch};
 use tokio_util::sync::CancellationToken;
@@ -26,6 +27,32 @@ use tracing::warn;
 pub(super) const PREVIEW_RENDER_MAX_ATTEMPTS: u32 = 3;
 pub(super) const PREVIEW_RENDER_RETRY_DELAY_MS: u64 = 120;
 const PREVIEW_CURSOR_CACHE_CAPACITY: usize = 2;
+const PREVIEW_SCRUB_FRAME_INTERVAL: Duration = Duration::from_millis(33);
+
+type PreviewRequest = Option<(u32, u32, XY<u32>)>;
+
+// A scrub sends a new request faster than a seek can decode. Abandoning the
+// in-flight frame for every newer request starves the preview until the mouse
+// stops, so a newer request only wins while a frame was presented recently.
+fn preview_frame_overdue(last_presented: Option<Instant>) -> bool {
+    last_presented.is_none_or(|at| at.elapsed() >= PREVIEW_SCRUB_FRAME_INTERVAL)
+}
+
+fn preview_superseded(
+    preview_rx: &watch::Receiver<PreviewRequest>,
+    last_presented: Option<Instant>,
+) -> bool {
+    preview_rx.has_changed().unwrap_or(false) && !preview_frame_overdue(last_presented)
+}
+
+async fn preview_superseded_while_fresh(
+    mut probe: watch::Receiver<PreviewRequest>,
+    last_presented: Option<Instant>,
+) {
+    if probe.changed().await.is_err() || preview_frame_overdue(last_presented) {
+        std::future::pending::<()>().await;
+    }
+}
 
 #[derive(Default)]
 pub(super) struct PreviewCursorCache {
@@ -979,10 +1006,11 @@ impl EditorInstance {
 
     fn spawn_preview_renderer(
         self: Arc<Self>,
-        mut preview_rx: watch::Receiver<Option<(u32, u32, XY<u32>)>>,
+        mut preview_rx: watch::Receiver<PreviewRequest>,
     ) -> tokio::task::JoinHandle<()> {
         tokio::spawn(async move {
             let mut prefetch_cancel_token: Option<CancellationToken> = None;
+            let mut last_presented: Option<Instant> = None;
             let mut cursor_cache = PreviewCursorCache::default();
             let mut project_rx = self.project_config.1.clone();
             let mut zoom_timelines = HashMap::<u32, ZoomTransformTimeline>::new();
@@ -1056,7 +1084,7 @@ impl EditorInstance {
                     tokio::select! {
                         biased;
 
-                        _ = preview_rx.changed() => {
+                        _ = preview_superseded_while_fresh(preview_rx.clone(), last_presented) => {
                             continue;
                         }
 
@@ -1066,7 +1094,7 @@ impl EditorInstance {
                             true,
                             clip_offsets,
                         ) => {
-                            if preview_rx.has_changed().unwrap_or(false) {
+                            if preview_superseded(&preview_rx, last_presented) {
                                 continue;
                             }
 
@@ -1115,7 +1143,10 @@ impl EditorInstance {
                                     .unwrap_or_default();
                                 let outgoing_frames = tokio::select! {
                                     biased;
-                                    _ = preview_rx.changed() => {
+                                    _ = preview_superseded_while_fresh(
+                                        preview_rx.clone(),
+                                        last_presented,
+                                    ) => {
                                         continue;
                                     }
                                     frames = outgoing_media.decoders.get_frames_initial(
@@ -1145,7 +1176,7 @@ impl EditorInstance {
                                         &outgoing_media.cursor,
                                         &project,
                                     );
-                                    if preview_rx.has_changed().unwrap_or(false) {
+                                    if preview_superseded(&preview_rx, last_presented) {
                                         continue;
                                     }
                                     let outgoing_uniforms = if let Some(cursor_timeline) =
@@ -1190,7 +1221,7 @@ impl EditorInstance {
                                 None
                             };
 
-                            if preview_rx.has_changed().unwrap_or(false) {
+                            if preview_superseded(&preview_rx, last_presented) {
                                 continue;
                             }
 
@@ -1199,7 +1230,7 @@ impl EditorInstance {
                                 &segment_medias.cursor,
                                 &project,
                             );
-                            if preview_rx.has_changed().unwrap_or(false) {
+                            if preview_superseded(&preview_rx, last_presented) {
                                 continue;
                             }
 
@@ -1273,6 +1304,7 @@ impl EditorInstance {
                                 };
                                 if render_confirmed {
                                     rendered = true;
+                                    last_presented = Some(Instant::now());
                                     break;
                                 }
 

From 8d04dac757294bad8fa95405a046d529c3067dff Mon Sep 17 00:00:00 2001
From: Scott Newton <scottanewton@yahoo.com>
Date: Tue, 13 Oct 2026 19:39:04 -0700
Subject: [PATCH 29/74] perf(desktop-gpui): repaint only the timeline and
 transport on hover

---
 apps/desktop-gpui/src/app_windows.rs        |   1 +
 apps/desktop-gpui/src/editor_hover_bench.rs | 141 ++++++++++++++++++++
 apps/desktop-gpui/src/editor_window.rs      |  27 +++-
 apps/desktop-gpui/src/main.rs               |   1 +
 4 files changed, 165 insertions(+), 5 deletions(-)
 create mode 100644 apps/desktop-gpui/src/editor_hover_bench.rs

diff --git a/apps/desktop-gpui/src/app_windows.rs b/apps/desktop-gpui/src/app_windows.rs
index ae2ecce7976..a730927eef6 100644
--- a/apps/desktop-gpui/src/app_windows.rs
+++ b/apps/desktop-gpui/src/app_windows.rs
@@ -5373,6 +5373,7 @@ fn load_editor_project_candidate(
         drive_auto_sidebar(handle, cx).await;
         drive_auto_playback(path, handle, cx).await;
         drive_auto_export(handle, cx).await;
+        crate::editor_hover_bench::run(handle, cx).await;
     })
     .detach();
 }
diff --git a/apps/desktop-gpui/src/editor_hover_bench.rs b/apps/desktop-gpui/src/editor_hover_bench.rs
new file mode 100644
index 00000000000..2a0a2747b8b
--- /dev/null
+++ b/apps/desktop-gpui/src/editor_hover_bench.rs
@@ -0,0 +1,141 @@
+//! `CAP_GPUI_AUTO_HOVER_BENCH=1` (with `CAP_GPUI_AUTO_EDITOR`): the editor's
+//! per-move cost while the pointer glides over a paused timeline. The pointer
+//! sweeps the timeline at a fixed speed and moves arrive at
+//! `CAP_GPUI_AUTO_HOVER_BENCH_HZ` (default 120); a move that lands while the
+//! previous one is still being handled is coalesced into the next, as the OS
+//! does. Each move runs the timeline's own hover handler, then one synchronous
+//! `Window::draw` (view renders + layout + prepaint + paint) is timed with it.
+//! `CAP_GPUI_AUTO_SIDEBAR` picks the sidebar tab that stays open meanwhile.
+//!
+//! Run:
+//!   CAP_GPUI_AUTO_EDITOR=<project.cap> CAP_GPUI_AUTO_HOVER_BENCH=1 \
+//!     CAP_GPUI_AUTO_SIDEBAR=captions CAP_GPUI_NO_MENUS=1 CAP_GPUI_NO_TRAY=1 \
+//!     cargo run --release
+
+use std::time::{Duration, Instant};
+
+use gpui::{App, WindowHandle};
+
+use crate::editor_window::EditorWindow;
+
+const DEFAULT_MOUSE_HZ: u64 = 120;
+const DEFAULT_SWEEP_SECS: f32 = 3.;
+const WARMUP: Duration = Duration::from_secs(1);
+const MEASURED: Duration = Duration::from_secs(6);
+
+pub async fn run(handle: WindowHandle<EditorWindow>, cx: &mut gpui::AsyncApp) {
+    if !std::env::var("CAP_GPUI_AUTO_HOVER_BENCH").is_ok_and(|value| value == "1") {
+        return;
+    }
+    cx.background_executor()
+        .timer(Duration::from_millis(2500))
+        .await;
+    cx.update(|cx| {
+        cx.activate(true);
+        handle
+            .update(cx, |_, window, _| window.activate_window())
+            .ok();
+    });
+    cx.background_executor()
+        .timer(Duration::from_millis(500))
+        .await;
+
+    let mouse_hz = std::env::var("CAP_GPUI_AUTO_HOVER_BENCH_HZ")
+        .ok()
+        .and_then(|value| value.parse::<u64>().ok())
+        .filter(|hz| *hz > 0)
+        .unwrap_or(DEFAULT_MOUSE_HZ);
+    let interval = Duration::from_micros(1_000_000 / mouse_hz);
+    let sweep_secs = std::env::var("CAP_GPUI_AUTO_HOVER_BENCH_SWEEP_SECS")
+        .ok()
+        .and_then(|value| value.parse::<f32>().ok())
+        .filter(|secs| *secs > 0.)
+        .unwrap_or(DEFAULT_SWEEP_SECS);
+    let started = Instant::now();
+    let mut next_move = started;
+    let mut move_us = Vec::new();
+    let mut frames_at_start = None;
+    loop {
+        next_move += interval;
+        let now = Instant::now();
+        if next_move > now {
+            cx.background_executor()
+                .timer(next_move.saturating_duration_since(now))
+                .await;
+        } else {
+            next_move = now;
+        }
+        let elapsed = started.elapsed();
+        if elapsed >= WARMUP + MEASURED {
+            break;
+        }
+        let measuring = elapsed >= WARMUP;
+        if measuring && frames_at_start.is_none() {
+            frames_at_start = cx.update(|cx| frames_presented(handle, cx));
+        }
+        let phase = (elapsed.as_secs_f32() / sweep_secs).fract();
+        // Two separate updates: observers of the editor (its section views)
+        // only hear about the move once the first update flushes its effects,
+        // and nothing yields to the run loop in between, so the platform
+        // cannot draw the frame before it is timed here.
+        let move_started = Instant::now();
+        let hovered = cx.update(|cx| {
+            handle
+                .update(cx, |view, window, cx| {
+                    let width = f32::from(window.viewport_size().width);
+                    let x = 140. + (width - 180.).max(1.) * phase;
+                    view.timeline_hover(x, window, cx);
+                })
+                .is_ok()
+        });
+        let drawn = cx.update(|cx| draw_editor_window(handle, cx));
+        if !hovered || drawn.is_none() {
+            eprintln!("hover-bench: the editor window went away");
+            std::process::exit(1);
+        }
+        if measuring {
+            move_us.push(move_started.elapsed().as_secs_f64() * 1e6);
+        }
+    }
+    let frames = cx
+        .update(|cx| frames_presented(handle, cx))
+        .zip(frames_at_start)
+        .map(|(end, start)| end.saturating_sub(start));
+
+    println!(
+        "hover-bench: sidebar tab {}, pointer at {mouse_hz}Hz crossing the timeline in {sweep_secs}s, {} moves handled and {frames:?} preview frames presented in {:.1}s",
+        std::env::var("CAP_GPUI_AUTO_SIDEBAR").unwrap_or_else(|_| "default".into()),
+        move_us.len(),
+        MEASURED.as_secs_f64(),
+    );
+    report("move", &mut move_us);
+    std::process::exit(0);
+}
+
+fn frames_presented(handle: WindowHandle<EditorWindow>, cx: &mut App) -> Option<u64> {
+    handle
+        .update(cx, |view, _, _| view.preview_frames_presented())
+        .ok()
+        .flatten()
+}
+
+fn report(label: &str, samples: &mut [f64]) {
+    if samples.is_empty() {
+        println!("hover-bench: no {label} samples");
+        return;
+    }
+    samples.sort_by(|a, b| a.partial_cmp(b).expect("no NaN draw times"));
+    let mean = samples.iter().sum::<f64>() / samples.len() as f64;
+    let p50 = samples[samples.len() / 2];
+    let p95 = samples[(samples.len() as f64 * 0.95) as usize];
+    let max = samples[samples.len() - 1];
+    println!("hover-bench: {label} {mean:.1} mean / {p50:.1} p50 / {p95:.1} p95 / {max:.1} max us");
+}
+
+/// `AnyWindowHandle::update` hands over the root as an unleased `AnyView`;
+/// the typed handle would lease the root entity that `draw()` re-renders.
+fn draw_editor_window(handle: WindowHandle<EditorWindow>, cx: &mut App) -> Option<()> {
+    gpui::AnyWindowHandle::from(handle)
+        .update(cx, |_, window, cx| window.draw(cx).clear())
+        .ok()
+}
diff --git a/apps/desktop-gpui/src/editor_window.rs b/apps/desktop-gpui/src/editor_window.rs
index 63c57330865..ca0140b6145 100644
--- a/apps/desktop-gpui/src/editor_window.rs
+++ b/apps/desktop-gpui/src/editor_window.rs
@@ -3773,10 +3773,16 @@ impl EditorWindow {
         );
     }
 
+    pub(crate) fn preview_frames_presented(&self) -> Option<u64> {
+        self.stats
+            .as_ref()
+            .map(|stats| stats.presented.load(Ordering::Relaxed))
+    }
+
     /// `onMouseMove` on the timeline container (`TL/index.tsx:1170-1188`):
     /// while paused, the pointer's time becomes `previewTime`; outside the
     /// content column, and at all times while playing, it is cleared.
-    fn timeline_hover(&mut self, x: f32, window: &mut Window, cx: &mut Context<Self>) {
+    pub(crate) fn timeline_hover(&mut self, x: f32, window: &mut Window, cx: &mut Context<Self>) {
         // `if (editorState.playing) return;` -- the handler bails *before* it
         // writes, so a preview time set while paused survives a play rather
         // than being cleared. The ghost is hidden by the render's own
@@ -3789,17 +3795,28 @@ impl EditorWindow {
         if next != self.view.preview_time {
             self.view.preview_time = next;
             self.emit_preview_frame();
-            self.invalidate_playback_chrome(window, cx);
+            self.invalidate_hover_chrome(cx);
         }
     }
 
-    fn timeline_hover_leave(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+    fn timeline_hover_leave(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
         if self.playing || self.view.preview_time.is_none() {
             return;
         }
         self.view.preview_time = None;
         self.emit_preview_frame();
-        self.invalidate_playback_chrome(window, cx);
+        self.invalidate_hover_chrome(cx);
+    }
+
+    /// Pointer-hover state that only the timeline, the transport and the
+    /// canvas overlay read. Notifying `self` would rebuild the header, toolbar
+    /// and sidebar on every pointer move, because each section observes the
+    /// editor. Notifying a child view marks its ancestors dirty instead, so
+    /// this window and its canvas overlay still re-render while the untouched
+    /// sections are reused from their cache.
+    fn invalidate_hover_chrome(&mut self, cx: &mut Context<Self>) {
+        self.timeline_view.update(cx, |_, cx| cx.notify());
+        self.transport_controls.update(cx, |_, cx| cx.notify());
     }
 
     fn set_hovered_track(
@@ -5889,7 +5906,7 @@ impl EditorWindow {
             changed = true;
         }
         if changed {
-            cx.notify();
+            self.invalidate_hover_chrome(cx);
         }
     }
 
diff --git a/apps/desktop-gpui/src/main.rs b/apps/desktop-gpui/src/main.rs
index ea640335174..8c887d00760 100644
--- a/apps/desktop-gpui/src/main.rs
+++ b/apps/desktop-gpui/src/main.rs
@@ -27,6 +27,7 @@ mod editor_color;
 mod editor_crop;
 mod editor_edits;
 mod editor_export;
+mod editor_hover_bench;
 #[cfg(target_os = "linux")]
 mod editor_modal;
 mod editor_panels;

From 5ee0eb77f7ddd695b102eabb28e54aec7143f254 Mon Sep 17 00:00:00 2001
From: Scott Newton <scottanewton@yahoo.com>
Date: Tue, 13 Oct 2026 20:48:40 -0700
Subject: [PATCH 30/74] perf(editor): time the scrub benchmark from the final
 request

---
 crates/editor/examples/scrub-benchmark.rs | 14 +++++++++-----
 crates/editor/src/editor_instance.rs      |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/crates/editor/examples/scrub-benchmark.rs b/crates/editor/examples/scrub-benchmark.rs
index 4232ffa8a02..1646c6ebb69 100644
--- a/crates/editor/examples/scrub-benchmark.rs
+++ b/crates/editor/examples/scrub-benchmark.rs
@@ -47,6 +47,7 @@ async fn sweep(
     let interval = Duration::from_secs_f64(1.0 / MOUSE_HZ);
     let started = Instant::now();
     let mut presented = Vec::new();
+    let mut last_send = started;
 
     for step in 0..=steps {
         let progress = step as f64 / steps as f64;
@@ -54,15 +55,16 @@ async fn sweep(
         editor
             .preview_tx
             .send_modify(|value| *value = Some((frame, FPS, resolution)));
-        let deadline = started + interval * (step as u32 + 1);
+        last_send = Instant::now();
         while let Ok(event) = frames_rx.try_recv() {
             presented.push(event);
         }
-        tokio::time::sleep_until(deadline.into()).await;
+        if step < steps {
+            let deadline = started + interval * (step as u32 + 1);
+            tokio::time::sleep_until(deadline.into()).await;
+        }
     }
 
-    let last_send = Instant::now();
-    let presented_during_drag = presented.len();
     let settle_ms = loop {
         match frames_rx.recv_timeout(Duration::from_secs(10)) {
             Ok((at, frame)) => {
@@ -75,9 +77,11 @@ async fn sweep(
         }
     };
 
+    let during_drag = || presented.iter().filter(|(at, _)| *at <= last_send);
+    let presented_during_drag = during_drag().count();
     let mut longest_gap = Duration::ZERO;
     let mut previous = started;
-    for (at, _) in presented.iter().filter(|(at, _)| *at <= last_send) {
+    for (at, _) in during_drag() {
         longest_gap = longest_gap.max(at.saturating_duration_since(previous));
         previous = *at;
     }
diff --git a/crates/editor/src/editor_instance.rs b/crates/editor/src/editor_instance.rs
index 4558145552f..9236ffc0fb0 100644
--- a/crates/editor/src/editor_instance.rs
+++ b/crates/editor/src/editor_instance.rs
@@ -29,7 +29,7 @@ pub(super) const PREVIEW_RENDER_RETRY_DELAY_MS: u64 = 120;
 const PREVIEW_CURSOR_CACHE_CAPACITY: usize = 2;
 const PREVIEW_SCRUB_FRAME_INTERVAL: Duration = Duration::from_millis(33);
 
-type PreviewRequest = Option<(u32, u32, XY<u32>)>;
+type PreviewRequest = Option<PreviewFrameInstruction>;
 
 // A scrub sends a new request faster than a seek can decode. Abandoning the
 // in-flight frame for every newer request starves the preview until the mouse

From 094120cae78a9c7f5931464ce38e7ef44d2203ad Mon Sep 17 00:00:00 2001
From: Scott Newton <scottanewton@yahoo.com>
Date: Tue, 13 Oct 2026 19:59:15 -0700
Subject: [PATCH 31/74] perf(desktop-gpui): let the hover bench yield between
 overloaded moves

---
 apps/desktop-gpui/src/editor_hover_bench.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/desktop-gpui/src/editor_hover_bench.rs b/apps/desktop-gpui/src/editor_hover_bench.rs
index 2a0a2747b8b..4325410ada8 100644
--- a/apps/desktop-gpui/src/editor_hover_bench.rs
+++ b/apps/desktop-gpui/src/editor_hover_bench.rs
@@ -64,6 +64,9 @@ pub async fn run(handle: WindowHandle<EditorWindow>, cx: &mut gpui::AsyncApp) {
                 .await;
         } else {
             next_move = now;
+            // An overloaded loop must still give the preview pump and the run
+            // loop a turn between moves, as real event dispatch does.
+            tokio::task::yield_now().await;
         }
         let elapsed = started.elapsed();
         if elapsed >= WARMUP + MEASURED {

From 4a842f7300db8115224ce6e3abb4e0f1a281bc8d Mon Sep 17 00:00:00 2001
From: Scott Newton <scottanewton@yahoo.com>
Date: Wed, 14 Oct 2026 11:27:42 -0700
Subject: [PATCH 32/74] fix(editor): catch early final frames and odd inputs in
 the scrub benchmark

---
 crates/editor/examples/scrub-benchmark.rs | 52 ++++++++++++++++-------
 1 file changed, 36 insertions(+), 16 deletions(-)

diff --git a/crates/editor/examples/scrub-benchmark.rs b/crates/editor/examples/scrub-benchmark.rs
index 1646c6ebb69..e89a889945e 100644
--- a/crates/editor/examples/scrub-benchmark.rs
+++ b/crates/editor/examples/scrub-benchmark.rs
@@ -5,7 +5,7 @@ use std::{
 };
 
 use cap_editor::{EditorFrameOutput, EditorInstance, FrameLayout};
-use cap_project::{ProjectConfiguration, XY};
+use cap_project::XY;
 
 const FPS: u32 = 60;
 const MOUSE_HZ: f64 = 120.0;
@@ -48,6 +48,7 @@ async fn sweep(
     let started = Instant::now();
     let mut presented = Vec::new();
     let mut last_send = started;
+    let mut after_last_send = 0;
 
     for step in 0..=steps {
         let progress = step as f64 / steps as f64;
@@ -56,6 +57,7 @@ async fn sweep(
             .preview_tx
             .send_modify(|value| *value = Some((frame, FPS, resolution)));
         last_send = Instant::now();
+        after_last_send = presented.len();
         while let Ok(event) = frames_rx.try_recv() {
             presented.push(event);
         }
@@ -65,17 +67,25 @@ async fn sweep(
         }
     }
 
-    let settle_ms = loop {
-        match frames_rx.recv_timeout(Duration::from_secs(10)) {
-            Ok((at, frame)) => {
-                presented.push((at, frame));
-                if frame == to {
-                    break at.saturating_duration_since(last_send).as_secs_f64() * 1000.0;
+    let already_presented = presented[after_last_send..]
+        .iter()
+        .find(|(_, frame)| *frame == to)
+        .map(|(at, _)| *at);
+    let final_at = match already_presented {
+        Some(at) => at,
+        None => loop {
+            match frames_rx.recv_timeout(Duration::from_secs(10)) {
+                Ok((at, frame)) => {
+                    presented.push((at, frame));
+                    if frame == to {
+                        break at;
+                    }
                 }
+                Err(_) => panic!("final frame {to} never presented"),
             }
-            Err(_) => panic!("final frame {to} never presented"),
-        }
+        },
     };
+    let settle_ms = final_at.saturating_duration_since(last_send).as_secs_f64() * 1000.0;
 
     let during_drag = || presented.iter().filter(|(at, _)| *at <= last_send);
     let presented_during_drag = during_drag().count();
@@ -103,15 +113,10 @@ async fn main() {
         .expect("Usage: scrub-benchmark --recording-path <path> [--runs <count>]");
     let runs = arg_value(&args, "--runs")
         .and_then(|value| value.parse::<usize>().ok())
-        .unwrap_or(3);
+        .unwrap_or(3)
+        .max(1);
     let resolution = XY::new(960, 540);
 
-    let duration = ProjectConfiguration::load(&recording_path)
-        .ok()
-        .and_then(|config| config.timeline.map(|timeline| timeline.duration()))
-        .expect("project needs a timeline");
-    let last_frame = ((duration * FPS as f64).floor() as u32).saturating_sub(2);
-
     let (frames_tx, frames_rx) = mpsc::channel::<(Instant, u32)>();
     let editor = EditorInstance::new(
         recording_path.clone(),
@@ -124,6 +129,21 @@ async fn main() {
     .await
     .expect("Failed to create editor instance");
 
+    let timeline_duration = editor
+        .project_config
+        .1
+        .borrow()
+        .timeline
+        .as_ref()
+        .map(|timeline| timeline.duration());
+    let duration = timeline_duration
+        .unwrap_or_else(|| f64::from(editor.get_total_frames(FPS)) / f64::from(FPS));
+    let last_frame = ((duration * FPS as f64).floor() as u32).saturating_sub(2);
+    assert!(
+        last_frame > 0,
+        "the recording is too short to benchmark scrubbing"
+    );
+
     editor
         .preview_tx
         .send_modify(|value| *value = Some((0, FPS, resolution)));

From 46fe21b40be1ed7281d7c72d93573a2ff30714ff Mon Sep 17 00:00:00 2001
From: Scott Newton <scottanewton@yahoo.com>
Date: Tue, 13 Oct 2026 20:29:27 -0700
Subject: [PATCH 33/74] perf(desktop-gpui): note that hover no longer takes the
 full paused invalidation

---
 apps/desktop-gpui/src/editor_window.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/apps/desktop-gpui/src/editor_window.rs b/apps/desktop-gpui/src/editor_window.rs
index ca0140b6145..7b4be35223b 100644
--- a/apps/desktop-gpui/src/editor_window.rs
+++ b/apps/desktop-gpui/src/editor_window.rs
@@ -3750,9 +3750,11 @@ impl EditorWindow {
         // scene-mode pane gates on it too. Notifying the parent here would
         // rebuild every cached section -- header, toolbar, sidebar included --
         // at the 60Hz playhead rate, which is the same class of rebuild that
-        // measured 40ms/frame on the text-panel sidebar. Paused paths (hover,
-        // seeks) keep the full invalidation: the overlay's element boxes
-        // appear and disappear as the playhead crosses segments.
+        // measured 40ms/frame on the text-panel sidebar. A paused playhead
+        // change keeps the full invalidation: the overlay's element boxes
+        // appear and disappear as the playhead crosses segments. Pointer hover
+        // goes through `invalidate_hover_chrome` instead, and an arriving
+        // paused frame whose layout changed still notifies the whole editor.
         if !self.playing {
             cx.notify();
         }

From 8e8755f52c0e117a3304f655b2de4a98f99bdad4 Mon Sep 17 00:00:00 2001
From: Scott Newton <scottanewton@yahoo.com>
Date: Wed, 14 Oct 2026 12:18:58 -0700
Subject: [PATCH 34/74] test(editor): cover when a newer scrub request cancels
 the frame in flight

---
 crates/editor/src/editor_instance.rs | 55 ++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/crates/editor/src/editor_instance.rs b/crates/editor/src/editor_instance.rs
index 9236ffc0fb0..937f70125d4 100644
--- a/crates/editor/src/editor_instance.rs
+++ b/crates/editor/src/editor_instance.rs
@@ -1896,6 +1896,61 @@ mod tests {
     use super::*;
     use cap_project::{AudioGapSummary, CursorClickEvent, CursorConfiguration, CursorMoveEvent};
 
+    fn scrub_request(frame: u32) -> PreviewRequest {
+        Some((frame, 60, XY::new(960, 540)))
+    }
+
+    fn overdue_frame() -> Option<Instant> {
+        Instant::now().checked_sub(PREVIEW_SCRUB_FRAME_INTERVAL)
+    }
+
+    #[test]
+    fn preview_frames_go_overdue_after_the_scrub_interval() {
+        assert!(preview_frame_overdue(None));
+        assert!(!preview_frame_overdue(Some(Instant::now())));
+        assert!(preview_frame_overdue(overdue_frame()));
+    }
+
+    #[test]
+    fn newer_requests_cancel_only_while_a_frame_is_fresh() {
+        let (tx, rx) = watch::channel(scrub_request(0));
+        assert!(!preview_superseded(&rx, Some(Instant::now())));
+
+        tx.send_modify(|request| *request = scrub_request(10));
+        assert!(preview_superseded(&rx, Some(Instant::now())));
+        assert!(!preview_superseded(&rx, overdue_frame()));
+        assert!(!preview_superseded(&rx, None));
+    }
+
+    #[tokio::test]
+    async fn fresh_frames_yield_to_newer_requests_and_keep_them_queued() {
+        let (tx, mut rx) = watch::channel(scrub_request(0));
+        let superseded = preview_superseded_while_fresh(rx.clone(), Some(Instant::now()));
+        tx.send_modify(|request| *request = scrub_request(10));
+
+        tokio::time::timeout(Duration::from_secs(1), superseded)
+            .await
+            .expect("a newer request should cancel a frame while the last one is fresh");
+        assert!(rx.has_changed().unwrap());
+        assert_eq!(*rx.borrow_and_update(), scrub_request(10));
+    }
+
+    #[tokio::test]
+    async fn overdue_frames_finish_before_newer_requests() {
+        let (tx, mut rx) = watch::channel(scrub_request(0));
+        let superseded = preview_superseded_while_fresh(rx.clone(), overdue_frame());
+        tx.send_modify(|request| *request = scrub_request(10));
+
+        assert!(
+            tokio::time::timeout(Duration::from_millis(100), superseded)
+                .await
+                .is_err(),
+            "an overdue frame should not be cancelled by a newer request"
+        );
+        assert!(rx.has_changed().unwrap());
+        assert_eq!(*rx.borrow_and_update(), scrub_request(10));
+    }
+
     #[tokio::test]
     async fn completed_pcm_loader_reuses_arc_without_opening_a_missing_file() {
         let audio = crate::completed_audio::tests::audio();

From 8e64a9dbd6804b77bf11f584130a8abc46eab70f Mon Sep 17 00:00:00 2001
From: Colin Kim <121141519+colinvkim@users.noreply.github.com>
Date: Wed, 14 Oct 2026 13:47:20 -0700
Subject: [PATCH 35/74] perf(rendering): index auto-zoom cursor clusters

---
 crates/rendering/benches/zoom-clusters.csv |  61 ++++
 crates/rendering/benches/zoom-clusters.md  |  83 +++++
 crates/rendering/src/zoom_spring.rs        | 358 +++++++++++++++++++--
 scripts/benchmark-zoom-clusters.py         | 133 ++++++++
 4 files changed, 616 insertions(+), 19 deletions(-)
 create mode 100644 crates/rendering/benches/zoom-clusters.csv
 create mode 100644 crates/rendering/benches/zoom-clusters.md
 create mode 100644 scripts/benchmark-zoom-clusters.py

diff --git a/crates/rendering/benches/zoom-clusters.csv b/crates/rendering/benches/zoom-clusters.csv
new file mode 100644
index 00000000000..aea7fc76e17
--- /dev/null
+++ b/crates/rendering/benches/zoom-clusters.csv
@@ -0,0 +1,61 @@
+fixture,run,variant,durationSecs,zoomSegments,completedAwaitedEdits,terminalFailures,stderrErrors,stderrWarnings,editCpuSecs,early_atSecs,early_seekMs,early_editMedianMs,early_editP95Ms,middle_atSecs,middle_seekMs,middle_editMedianMs,middle_editP95Ms,late_atSecs,late_seekMs,late_editMedianMs,late_editP95Ms
+smooth-30.cap,1,baseline,30.0,1,90,0,0,0,0.176116,0.5833333333333334,14.535833,6.014083,9.471791999999999,14.983333333333333,22.618125,6.410792,10.370208,29.383333333333333,22.452792,9.150917,13.705333
+smooth-30.cap,1,candidate,30.0,1,90,0,0,0,0.193078,0.5833333333333334,15.171125,6.070167,8.379707999999999,14.983333333333333,22.378709,8.138959,10.947792,29.383333333333333,23.029999999999998,10.571041,13.780041
+smooth-30.cap,2,candidate,30.0,1,90,0,0,0,0.14635,0.5833333333333334,18.434791999999998,6.074834,8.364375,14.983333333333333,31.232291999999998,7.974458,11.515917,29.383333333333333,18.025917,7.031833000000001,10.406708
+smooth-30.cap,2,baseline,30.0,1,90,0,0,0,0.20678600000000003,0.5833333333333334,15.822709000000001,8.396249999999998,9.595459,14.983333333333333,25.102541,7.688875,9.992666000000002,29.383333333333333,27.852291,7.868541,11.2005
+smooth-30.cap,3,baseline,30.0,1,90,0,0,0,0.12227999999999997,0.5833333333333334,14.68525,6.005958,7.184167,14.983333333333333,22.380459,7.3140410000000005,10.767125,29.383333333333333,18.689542,7.515541,10.470417
+smooth-30.cap,3,candidate,30.0,1,90,0,0,0,0.15273599999999998,0.5833333333333334,14.435292,5.970083,7.165792,14.983333333333333,21.131332999999998,5.092625,9.655958,29.383333333333333,20.224290999999997,7.9645410000000005,10.515416
+smooth-30.cap,4,candidate,30.0,1,90,0,0,0,0.17471899999999993,0.5833333333333334,16.013042000000002,8.393374999999999,9.563416,14.983333333333333,32.867541,7.733042,11.358792,29.383333333333333,32.4925,8.461916,11.756166
+smooth-30.cap,4,baseline,30.0,1,90,0,0,0,0.159136,0.5833333333333334,19.161583,5.9818750000000005,7.178249999999999,14.983333333333333,30.798333,8.471459000000001,11.462458999999999,29.383333333333333,21.190875000000002,7.8408750000000005,9.906208
+smooth-30.cap,5,baseline,30.0,1,90,0,0,0,0.17704,0.5833333333333334,15.852834,6.08925,9.427833,14.983333333333333,25.203792,6.533167000000001,9.871292,29.383333333333333,28.503209000000002,8.115458,9.365
+smooth-30.cap,5,candidate,30.0,1,90,0,0,0,0.15830499999999997,0.5833333333333334,14.468958,4.949833,9.428958,14.983333333333333,19.027790999999997,5.4025419999999995,6.8065,29.383333333333333,24.3315,7.816,12.702833
+smooth-120.cap,1,baseline,120.0,1,90,0,0,0,0.224209,2.3833333333333333,15.726207999999998,6.066125,8.480959,59.983333333333334,24.454625,8.39775,10.291042000000001,117.58333333333333,27.800667,10.882,14.25825
+smooth-120.cap,1,candidate,120.0,1,90,0,0,0,0.251459,2.3833333333333333,14.195167,7.284833,8.471667,59.983333333333334,29.787125,8.987958,11.002875000000001,117.58333333333333,30.72525,9.794625,13.674916
+smooth-120.cap,2,candidate,120.0,1,90,0,0,0,0.193544,2.3833333333333333,15.332709,5.93825,8.416916,59.983333333333334,21.452875,7.297,10.384834000000001,117.58333333333333,22.954791,9.060417,11.821584
+smooth-120.cap,2,baseline,120.0,1,90,0,0,0,0.20932700000000004,2.3833333333333333,16.424,6.039708,8.50275,59.983333333333334,24.345125,8.442958,12.520708,117.58333333333333,26.141583,10.481541,16.255125
+smooth-120.cap,3,baseline,120.0,1,90,0,0,0,0.19719,2.3833333333333333,23.206833,5.02325,8.41225,59.983333333333334,33.208917,7.766833,12.16,117.58333333333333,23.45425,9.719458,12.879541
+smooth-120.cap,3,candidate,120.0,1,90,0,0,0,0.171051,2.3833333333333333,12.924667000000001,6.052166000000001,8.533875,59.983333333333334,25.25975,6.2983329999999995,11.30725,117.58333333333333,19.834334,8.003,10.947458000000001
+smooth-120.cap,4,candidate,120.0,1,90,0,0,0,0.17092500000000005,2.3833333333333333,14.21225,5.993875,9.621792000000001,59.983333333333334,28.377916,6.891958,10.863958,117.58333333333333,28.847250000000003,8.117958999999999,10.484333
+smooth-120.cap,4,baseline,120.0,1,90,0,0,0,0.146543,2.3833333333333333,14.073584,5.985125,9.788625,59.983333333333334,23.654333,9.14675,11.713959,117.58333333333333,18.633792,7.041083,9.425625
+smooth-120.cap,5,baseline,120.0,1,90,0,0,0,0.17456399999999997,2.3833333333333333,17.661417,6.105916000000001,8.461917,59.983333333333334,26.056791,9.710208999999999,15.137292,117.58333333333333,22.76875,10.335375,13.898375
+smooth-120.cap,5,candidate,120.0,1,90,0,0,0,0.18976700000000002,2.3833333333333333,15.454959,8.333874999999999,9.628708,59.983333333333334,26.591083,7.852792000000001,10.353875,117.58333333333333,28.871791,9.567417,12.074625000000001
+smooth-600.cap,1,baseline,600.0,1,90,0,0,0,0.7870170000000001,11.983333333333333,20.805291999999998,7.8325830000000005,9.270875,299.98333333333335,33.287625,18.199458,20.498209,587.9833333333333,25.181375,20.704832999999997,22.787625
+smooth-600.cap,1,candidate,600.0,1,90,0,0,0,0.29328199999999993,11.983333333333333,18.462709,5.13025,9.870084,299.98333333333335,27.7975,10.9885,12.097833000000001,587.9833333333333,25.595,12.488624999999999,13.95275
+smooth-600.cap,2,candidate,600.0,1,90,0,0,0,0.300285,11.983333333333333,18.231167,8.74875,9.968665999999999,299.98333333333335,28.597832999999998,11.159917,12.444875,587.9833333333333,25.355584,12.18375,13.497291
+smooth-600.cap,2,baseline,600.0,1,90,0,0,0,0.799258,11.983333333333333,19.45475,8.029917,10.616541999999999,299.98333333333335,37.664375,18.138749999999998,20.003292,587.9833333333333,23.160957999999997,21.5395,23.0665
+smooth-600.cap,3,baseline,600.0,1,90,0,0,0,0.7913209999999999,11.983333333333333,16.532708,5.625167,9.744667,299.98333333333335,30.937042,18.237083000000002,20.668958,587.9833333333333,27.398,19.503417,22.644166000000002
+smooth-600.cap,3,candidate,600.0,1,90,0,0,0,0.24995000000000003,11.983333333333333,18.864667,5.2249159999999994,11.944958,299.98333333333335,14.497333,7.89425,10.152750000000001,587.9833333333333,21.846,12.16025,14.034958999999999
+smooth-600.cap,4,candidate,600.0,1,90,0,0,0,0.306248,11.983333333333333,18.400458,9.780875,10.953583,299.98333333333335,39.607666,11.93975,13.570958,587.9833333333333,24.109708,11.828875,13.841417
+smooth-600.cap,4,baseline,600.0,1,90,0,0,0,0.7959860000000001,11.983333333333333,22.244875,9.385083,10.936625,299.98333333333335,37.927958,18.19375,19.8995,587.9833333333333,27.922,19.754082999999998,22.30625
+smooth-600.cap,5,baseline,600.0,1,90,0,0,0,0.8500629999999999,11.983333333333333,19.923083000000002,5.600499999999999,7.425916,299.98333333333335,31.534542,18.435792,19.470292,587.9833333333333,28.754790999999997,22.533792000000002,27.9235
+smooth-600.cap,5,candidate,600.0,1,90,0,0,0,0.29704699999999995,11.983333333333333,16.002083,3.9802500000000003,7.591292,299.98333333333335,23.937,11.020875,12.189625000000001,587.9833333333333,23.991583000000002,12.61575,14.9935
+short-600.cap,1,baseline,600.0,20,90,0,0,0,0.18384099999999995,11.983333333333333,17.502584000000002,8.402415999999999,9.662833,299.98333333333335,24.26375,4.972042,6.084542,587.9833333333333,20.83075,4.603917,7.335167
+short-600.cap,1,candidate,600.0,20,90,0,0,0,0.18166500000000005,11.983333333333333,18.54975,8.476416,9.528,299.98333333333335,26.784208,5.045084,6.180333,587.9833333333333,16.545583999999998,4.450791,5.7895840000000005
+short-600.cap,2,candidate,600.0,20,90,0,0,0,0.19037800000000005,11.983333333333333,19.514375,8.65525,9.812208,299.98333333333335,22.327042,3.965916,5.255166,587.9833333333333,22.590041000000003,4.4185,6.105625
+short-600.cap,2,baseline,600.0,20,90,0,0,0,0.15605000000000002,11.983333333333333,26.488125,6.218292,9.588332999999999,299.98333333333335,20.710375,3.46575,5.692333,587.9833333333333,17.165,4.20925,5.40575
+short-600.cap,3,baseline,600.0,20,90,0,0,0,0.13899400000000003,11.983333333333333,19.96575,8.536833000000001,9.681583,299.98333333333335,13.389833,3.21775,4.413875,587.9833333333333,17.208791,4.093292,6.333333
+short-600.cap,3,candidate,600.0,20,90,0,0,0,0.171271,11.983333333333333,18.468999999999998,8.466916999999999,9.65275,299.98333333333335,20.040875,4.107875000000001,5.059125,587.9833333333333,20.485500000000002,4.170084,5.580792000000001
+short-600.cap,4,candidate,600.0,20,90,0,0,0,0.14888799999999996,11.983333333333333,19.622833,5.179084,12.993333,299.98333333333335,14.398833,3.522209,4.717333,587.9833333333333,17.7845,4.2772499999999996,7.453542
+short-600.cap,4,baseline,600.0,20,90,0,0,0,0.16166200000000003,11.983333333333333,18.580291,8.365875,14.466166000000001,299.98333333333335,21.544125,3.3558339999999998,6.638459,587.9833333333333,14.053125,5.141,8.518333
+short-600.cap,5,baseline,600.0,20,90,0,0,0,0.13187200000000004,11.983333333333333,23.094167,6.122291000000001,8.23225,299.98333333333335,12.352333,3.4052499999999997,5.68825,587.9833333333333,14.874167,4.271417,6.147667
+short-600.cap,5,candidate,600.0,20,90,0,0,0,0.1251480000000001,11.983333333333333,18.681292,6.097667,8.411458999999999,299.98333333333335,14.862959,3.1945419999999998,5.466042,587.9833333333333,12.712041000000001,3.81975,5.2449580000000005
+full-600.cap,1,baseline,600.0,1,90,0,0,0,0.793398,11.983333333333333,38.12525,9.143625,10.412958,299.98333333333335,47.956209,18.054000000000002,19.226042,587.9833333333333,35.881375,21.426542,25.209792
+full-600.cap,1,candidate,600.0,1,90,0,0,0,0.2794740000000001,11.983333333333333,33.098416,5.608458000000001,7.411541,299.98333333333335,44.592542,8.525917,12.928875,587.9833333333333,50.435874999999996,15.05625,46.178583
+full-600.cap,2,candidate,600.0,1,90,0,0,0,0.2102550000000001,11.983333333333333,31.675167,5.0607500000000005,7.234875,299.98333333333335,29.008291,10.156,11.570542,587.9833333333333,35.719167000000006,8.864458,12.521083
+full-600.cap,2,baseline,600.0,1,90,0,0,0,0.7273779999999999,11.983333333333333,28.10925,6.579542,10.038042,299.98333333333335,34.837667,17.214,18.638542,587.9833333333333,33.684125,20.893333,22.05
+full-600.cap,3,baseline,600.0,1,90,0,0,0,0.727938,11.983333333333333,26.689375000000002,4.377167,9.088333,299.98333333333335,43.131958,17.886375,20.495124999999998,587.9833333333333,31.318749999999998,18.5335,21.800375
+full-600.cap,3,candidate,600.0,1,90,0,0,0,0.22764099999999998,11.983333333333333,25.579833999999998,4.951416,8.518333,299.98333333333335,36.102458,10.437750000000001,11.473333,587.9833333333333,30.738083,12.865167,14.070915999999999
+full-600.cap,4,candidate,600.0,1,90,0,0,0,0.22326500000000002,11.983333333333333,25.176209,7.310334,9.607125,299.98333333333335,27.181333,8.835334,10.491208,587.9833333333333,29.287084,11.609417,12.840709
+full-600.cap,4,baseline,600.0,1,90,0,0,0,0.7603270000000001,11.983333333333333,28.901666,9.077292,10.549959,299.98333333333335,41.204499999999996,18.013250000000003,18.139291,587.9833333333333,33.018458,20.744041000000003,23.427417
+full-600.cap,5,baseline,600.0,1,90,0,0,0,0.74926,11.983333333333333,26.578,5.412208,6.711208,299.98333333333335,44.466832999999994,17.996417,19.164082999999998,587.9833333333333,35.046375,19.518167,23.114875
+full-600.cap,5,candidate,600.0,1,90,0,0,0,0.25702100000000005,11.983333333333333,28.757875,5.155583,8.602291999999998,299.98333333333335,39.540040999999995,9.625125,12.353625,587.9833333333333,31.536250000000003,12.342042,14.453875
+full-short-600.cap,1,baseline,600.0,20,90,0,0,0,0.13350600000000004,11.983333333333333,25.029708000000003,7.089042,10.560917,299.98333333333335,32.516208,4.649208,5.986458,587.9833333333333,31.411458000000003,5.225917,5.449792
+full-short-600.cap,1,candidate,600.0,20,90,0,0,0,0.12485600000000001,11.983333333333333,25.301417,5.9717080000000005,9.47575,299.98333333333335,23.605833999999998,3.414958,4.599959,587.9833333333333,25.462333,4.19625,5.358209
+full-short-600.cap,2,candidate,600.0,20,90,0,0,0,0.12378300000000003,11.983333333333333,28.065542,8.269125,9.441167,299.98333333333335,25.191917,3.429792,4.562125,587.9833333333333,25.460041999999998,4.161625000000001,6.342875
+full-short-600.cap,2,baseline,600.0,20,90,0,0,0,0.12141800000000001,11.983333333333333,25.996416,8.259542,9.563125000000001,299.98333333333335,28.879915999999998,3.49825,4.659042,587.9833333333333,30.213875,3.8865000000000003,5.052875
+full-short-600.cap,3,baseline,600.0,20,90,0,0,0,0.11791599999999999,11.983333333333333,28.318833,5.945709000000001,9.446665999999999,299.98333333333335,25.501333000000002,3.388,4.531375,587.9833333333333,26.651457999999998,4.040916,5.27925
+full-short-600.cap,3,candidate,600.0,20,90,0,0,0,0.115095,11.983333333333333,26.286417,5.933041,7.138208,299.98333333333335,26.458375,3.333833,5.629208,587.9833333333333,23.773542000000003,4.029917,5.15975
+full-short-600.cap,4,candidate,600.0,20,90,0,0,0,0.12557899999999997,11.983333333333333,26.28625,8.244792,10.472083,299.98333333333335,23.680041999999997,3.56275,4.935959,587.9833333333333,26.645666,4.07675,5.30425
+full-short-600.cap,4,baseline,600.0,20,90,0,0,0,0.12949300000000002,11.983333333333333,26.042708,8.278875,9.474375,299.98333333333335,34.110208,3.5752919999999997,4.860125,587.9833333333333,25.577166,4.102333,5.285416000000001
+full-short-600.cap,5,baseline,600.0,20,90,0,0,0,0.11517700000000002,11.983333333333333,25.45225,8.312792,10.509792000000001,299.98333333333335,26.264542,3.327333,5.532459,587.9833333333333,28.734917,4.919207999999999,6.169084
+full-short-600.cap,5,candidate,600.0,20,90,0,0,0,0.127569,11.983333333333333,25.420375,8.314541,10.450834,299.98333333333335,27.60925,3.252917,5.809333,587.9833333333333,25.541417,3.9958329999999997,5.127667
diff --git a/crates/rendering/benches/zoom-clusters.md b/crates/rendering/benches/zoom-clusters.md
new file mode 100644
index 00000000000..4d5335f2e37
--- /dev/null
+++ b/crates/rendering/benches/zoom-clusters.md
@@ -0,0 +1,83 @@
+# Auto-zoom cluster benchmark results
+
+On the synthetic ten-minute 1080p recording, a paused edit at 9:48 takes 20.74 ms before and 12.34 ms after, a 40.5% latency reduction. These are medians of five run medians. The ranges are 18.53–21.43 ms before and 8.86–15.06 ms after.
+
+The improvement concerns long auto-zoom segments. Shorter recordings and four-second zoom controls have overlapping run ranges and do not establish a performance difference.
+
+## Measurement
+
+The baseline is upstream `34036657845bf063c875e66a10ad537afa415f35`, which includes #2557. Both binaries use the GPUI workspace release profile, Rust 1.97.1, and the same native FFmpeg libraries. The machine is an Apple M5 with ten logical cores and macOS 27.0.1.
+
+The existing GPUI `live-edit-benchmark` sends a padding change to `EditorInstance`, requests the paused frame, and awaits the matching frame callback. It uses two Tokio workers, a 1248×702 preview, 60 fps, and the app's `BgraSurface` output on macOS. The timer includes project publication, zoom reconstruction and simulation, decoding, rendering, and frame delivery. It excludes editor startup, the first warmup frame, and window composition.
+
+Each fixture runs five times per binary. The binary order reverses between pairs. Each run completes 30 edits at each of the 2%, 50%, and 98% playhead positions. The 60 successful runs complete 5,400 timed edits with no terminal failures, renderer errors, or warnings. The runner checks the loaded duration, zoom count, and exact playhead positions.
+
+The machine has other desktop applications running. The initial one-minute load average is 8.47. Compilation and profiling finish before the timed comparisons. Interleaving limits the effect of background activity, and the ranges below retain its variation.
+
+The primary H.264 recording is 1920×1080 at 30 fps, with 18,000 video frames. A second suite uses 320×180 video. Cursor events arrive at 60 Hz. The cursor moves smoothly between x=0.1 and x=0.9 over a 3.2-second cycle, with a slower vertical oscillation. Cursor smoothing remains enabled. The recording has no audio or camera. The long case sets one continuous 2× auto-zoom segment. This is a supported manually extended segment, rather than output from the click generator. The control contains four-second zooms every 30 seconds.
+
+## Results
+
+Each cell gives the median of five run medians, followed by their minimum and maximum, in milliseconds. The [raw CSV](zoom-clusters.csv) contains every run and region, plus process CPU time and error counts.
+
+| 1080p fixture                  | Playhead |               Before |               After |
+| ------------------------------ | -------: | -------------------: | ------------------: |
+| 600 seconds, continuous zoom   |       2% |    6.58 [4.38, 9.14] |   5.16 [4.95, 7.31] |
+| 600 seconds, continuous zoom   |      50% | 18.00 [17.21, 18.05] |  9.63 [8.53, 10.44] |
+| 600 seconds, continuous zoom   |      98% | 20.74 [18.53, 21.43] | 12.34 [8.86, 15.06] |
+| 600 seconds, four-second zooms |       2% |    8.26 [5.95, 8.31] |   8.24 [5.93, 8.31] |
+| 600 seconds, four-second zooms |      50% |    3.50 [3.33, 4.65] |   3.41 [3.25, 3.56] |
+| 600 seconds, four-second zooms |      98% |    4.10 [3.89, 5.23] |   4.08 [4.00, 4.20] |
+
+| 320×180 fixture                | Playhead |               Before |                After |
+| ------------------------------ | -------: | -------------------: | -------------------: |
+| 30 seconds, continuous zoom    |       2% |    6.01 [5.98, 8.40] |    6.07 [4.95, 8.39] |
+| 30 seconds, continuous zoom    |      50% |    7.31 [6.41, 8.47] |    7.73 [5.09, 8.14] |
+| 30 seconds, continuous zoom    |      98% |    7.87 [7.52, 9.15] |   7.96 [7.03, 10.57] |
+| 120 seconds, continuous zoom   |       2% |    6.04 [5.02, 6.11] |    6.05 [5.94, 8.33] |
+| 120 seconds, continuous zoom   |      50% |    8.44 [7.77, 9.71] |    7.30 [6.30, 8.99] |
+| 120 seconds, continuous zoom   |      98% |  10.34 [7.04, 10.88] |    9.06 [8.00, 9.79] |
+| 600 seconds, continuous zoom   |       2% |    7.83 [5.60, 9.39] |    5.22 [3.98, 9.78] |
+| 600 seconds, continuous zoom   |      50% | 18.20 [18.14, 18.44] |  11.02 [7.89, 11.94] |
+| 600 seconds, continuous zoom   |      98% | 20.70 [19.50, 22.53] | 12.18 [11.83, 12.62] |
+| 600 seconds, four-second zooms |       2% |    8.37 [6.12, 8.54] |    8.47 [5.18, 8.66] |
+| 600 seconds, four-second zooms |      50% |    3.41 [3.22, 4.97] |    3.97 [3.19, 5.05] |
+| 600 seconds, four-second zooms |      98% |    4.27 [4.09, 5.14] |    4.28 [3.82, 4.45] |
+
+An exact two-sided rank-sum check on the five run medians gives p=0.0079 for both the middle and late continuous ten-minute case at either resolution. The other comparisons have p≥0.095. The 320×180 four-second control's middle-position median increases, but its overlapping ranges and p=0.42 do not establish a regression. These small samples do not prove that all short inputs have identical cost.
+
+Median process CPU time over the 90 edits in the continuous ten-minute 1080p case is 0.749 seconds before and 0.228 seconds after. The average CPU saving is smaller than the original average CPU cost per edit. The latency result therefore does not require saving more CPU work than the baseline performs.
+
+## Profiler and correctness evidence
+
+A separate, unreported `sample` run uses the 320×180 baseline with symbols retained. The dominant `targets_at` offsets, +788 and +792, resolve to the reverse cluster loop: load a timestamp, move backward 48 bytes, compare with the requested time, and branch back. `targets_at` accounts for 2,096 of the 2,172 samples below `advance_one_step`. This identifies the precompute CPU cost, not its fraction of whole-edit wall time. Sleeping decoder, GPU, and runtime threads are also present in the profile.
+
+The ten-minute continuous fixture produces 1,126 clusters and up to 75,002 cached spring samples. The indexed lookup changes a linear reverse search into a binary search for ordered clusters. Unordered lists retain the original scan. The ignored rebuild benchmark compares every sample bit with the linear path outside its timer, including the long and four-second controls. The full ten-minute continuous case has sample hash `8f8ba71ca9a5b122`.
+
+Validation passes all 307 rendering unit tests, including 30,811 lookup comparisons and 24 complete-timeline comparisons across crop styles, fullscreen holds, reordered moves, clip jumps, and transitions. The export equivalence test also passes for eager, incremental, and seek paths. Rust formatting, all-target compilation, and Python Ruff checks pass.
+
+Strict Rust 1.97 Clippy reports existing modulo expressions in `crates/project/src/animated_gradient.rs:259,266`, loop suggestions in `crates/rendering/src/lib.rs:738,1325`, and a cloned-reference suggestion in `crates/rendering/src/layers/text.rs:992`. These files match the baseline. Running Clippy again with the original zoom source reproduces the same rendering findings. No lint suppressions are added. Root CI uses Rust 1.88.
+
+## Commands
+
+Fixture creation uses the new generator. It refuses an existing destination.
+
+```sh
+python3 scripts/benchmark-zoom-clusters.py /tmp/zoom-long.cap --duration 600 --width 1920 --height 1080
+python3 scripts/benchmark-zoom-clusters.py /tmp/zoom-short.cap --duration 600 --width 1920 --height 1080 --short-zooms
+```
+
+The existing benchmark command runs from `apps/desktop-gpui` on each revision, with the same generated fixture and native dependency environment. The measurements above use five interleaved runs per revision.
+
+```sh
+cargo +stable run --release --example live-edit-benchmark -- /tmp/zoom-long.cap 30
+cargo +stable run --release --example live-edit-benchmark -- /tmp/zoom-short.cap 30
+```
+
+The rendering crate owns the ignored diagnostic benchmark and correctness tests. Its release profile uses size optimization by default. The opt-level override below matches the GPUI app's optimization level.
+
+```sh
+cargo +stable test -p cap-rendering --lib --release --config profile.release.opt-level=3 zoom_cluster_timeline_rebuild -- --ignored --nocapture
+cargo +stable test -p cap-rendering --lib
+cargo +stable test -p cap-rendering --test export_zoom_equivalence
+```
diff --git a/crates/rendering/src/zoom_spring.rs b/crates/rendering/src/zoom_spring.rs
index eb85f8b8ed6..497ecd99616 100644
--- a/crates/rendering/src/zoom_spring.rs
+++ b/crates/rendering/src/zoom_spring.rs
@@ -183,9 +183,41 @@ impl CursorCropMaps {
     }
 }
 
+struct ClusterCenters {
+    clusters: Vec<ClickCluster>,
+    time_ordered: bool,
+}
+
+impl ClusterCenters {
+    fn new(clusters: Vec<ClickCluster>) -> Self {
+        let time_ordered =
+            clusters.is_sorted_by(|left, right| left.start_time_ms <= right.start_time_ms);
+        Self {
+            clusters,
+            time_ordered,
+        }
+    }
+
+    fn center_at(&self, time_ms: f64) -> Option<(f64, f64)> {
+        if self.time_ordered {
+            let through_time = self
+                .clusters
+                .partition_point(|cluster| cluster.start_time_ms <= time_ms);
+            self.clusters.get(through_time.saturating_sub(1))
+        } else {
+            self.clusters
+                .iter()
+                .rev()
+                .find(|cluster| cluster.start_time_ms <= time_ms)
+                .or_else(|| self.clusters.first())
+        }
+        .map(ClickCluster::center)
+    }
+}
+
 struct CroppedClusters {
     crop: Option<CursorCropMap>,
-    clusters: Vec<ClickCluster>,
+    clusters: ClusterCenters,
 }
 
 struct TimedClusterVariant {
@@ -195,7 +227,7 @@ struct TimedClusterVariant {
 }
 
 enum ZoomClusters {
-    Static(Vec<ClickCluster>),
+    Static(ClusterCenters),
     Styled {
         variants: Vec<CroppedClusters>,
         styles: Vec<TimedClusterVariant>,
@@ -212,14 +244,14 @@ impl ZoomClusters {
         crops: &CursorCropMaps,
     ) -> Self {
         let build = |crop| {
-            build_clusters(
+            ClusterCenters::new(build_clusters(
                 cursor_events,
                 moves_time_ordered,
                 recording_start,
                 recording_end,
                 segment.amount,
                 crop,
-            )
+            ))
         };
         let base = build(crops.base);
         let overlaps =
@@ -275,7 +307,7 @@ impl ZoomClusters {
                 &variants[variant].clusters
             }
         };
-        cluster_center_at_time(clusters, recording_ms)
+        clusters.center_at(recording_ms)
     }
 }
 
@@ -417,20 +449,6 @@ pub(crate) fn build_clusters(
     clusters
 }
 
-/// The active cluster at `time_ms` (RECORDING time) is the last cluster whose
-/// first event time is <= t; the spring smooths the discrete re-aims.
-pub(crate) fn cluster_center_at_time(
-    clusters: &[ClickCluster],
-    time_ms: f64,
-) -> Option<(f64, f64)> {
-    clusters
-        .iter()
-        .rev()
-        .find(|c| c.start_time_ms <= time_ms)
-        .or_else(|| clusters.first())
-        .map(|c| c.center())
-}
-
 /// One entry of the timeline-time -> recording-time mapping derived from
 /// [`TimelineConfiguration::get_segment_time`]'s accumulation logic.
 #[derive(Clone, Copy)]
@@ -2613,4 +2631,306 @@ mod tests {
             }
         }
     }
+
+    fn linear_cluster_center_at_time(
+        clusters: &[ClickCluster],
+        time_ms: f64,
+    ) -> Option<(f64, f64)> {
+        clusters
+            .iter()
+            .rev()
+            .find(|cluster| cluster.start_time_ms <= time_ms)
+            .or_else(|| clusters.first())
+            .map(ClickCluster::center)
+    }
+
+    #[test]
+    fn cluster_centers_match_linear_lookup_for_all_short_sequences() {
+        let starts = [
+            f64::NEG_INFINITY,
+            -0.0,
+            0.0,
+            1.0,
+            2.0,
+            f64::INFINITY,
+            f64::NAN,
+        ];
+        let queries = [
+            f64::NEG_INFINITY,
+            -1.0,
+            -0.0,
+            0.0,
+            1.0_f64.next_down(),
+            1.0,
+            1.0_f64.next_up(),
+            2.0,
+            3.0,
+            f64::INFINITY,
+            f64::NAN,
+        ];
+        for length in 0..=4 {
+            for mut sequence in 0..starts.len().pow(length) {
+                let clusters = (0..length)
+                    .map(|index| {
+                        let start = starts[sequence % starts.len()];
+                        sequence /= starts.len();
+                        ClickCluster::new(f64::from(index), f64::from(index) * 0.5, start)
+                    })
+                    .collect();
+                let centers = ClusterCenters::new(clusters);
+                for time in queries {
+                    assert_eq!(
+                        centers.center_at(time),
+                        linear_cluster_center_at_time(&centers.clusters, time),
+                        "clusters {:?}, time {time}",
+                        centers.clusters
+                    );
+                }
+            }
+        }
+    }
+
+    fn smooth_cluster_cursor(duration_secs: f64) -> CursorEvents {
+        let moves = (0..(duration_secs * 60.0) as usize)
+            .map(|index| {
+                let time = index as f64 / 60.0;
+                let phase = (time % 3.2) / 3.2;
+                let triangle = 1.0 - (2.0 * phase - 1.0).abs();
+                move_event(
+                    time * 1000.0,
+                    0.1 + 0.8 * triangle,
+                    0.5 + 0.2 * (time * std::f64::consts::TAU / 11.0).sin(),
+                )
+            })
+            .collect();
+        CursorEvents {
+            moves,
+            clicks: Vec::new(),
+        }
+    }
+
+    fn force_linear_cluster_lookup(timeline: &mut ZoomTransformTimeline) {
+        for clusters in timeline.clusters.iter_mut().flatten() {
+            match clusters {
+                ZoomClusters::Static(centers) => centers.time_ordered = false,
+                ZoomClusters::Styled { variants, .. } => {
+                    for variant in variants {
+                        variant.clusters.time_ordered = false;
+                    }
+                }
+            }
+        }
+    }
+
+    #[test]
+    fn indexed_cluster_samples_match_linear_lookup_across_crops_and_clip_jumps() {
+        for styled in [false, true] {
+            let styles = if styled {
+                vec![
+                    crop_style(
+                        1.5,
+                        6.0,
+                        0,
+                        Some(Crop {
+                            position: XY::new(0, 0),
+                            size: XY::new(500, 1000),
+                        }),
+                    ),
+                    crop_style(
+                        3.0,
+                        4.5,
+                        1,
+                        Some(Crop {
+                            position: XY::new(0, 500),
+                            size: XY::new(1000, 500),
+                        }),
+                    ),
+                ]
+            } else {
+                Vec::new()
+            };
+            for reordered_clips in [false, true] {
+                let mut project =
+                    project_with_crop_styles(vec![auto_segment(0.25, 7.75, 2.0)], styles.clone());
+                let config = project.timeline.as_mut().unwrap();
+                if styled {
+                    config.text_segments.push(
+                        serde_json::from_value(serde_json::json!({
+                            "start": 2.0,
+                            "end": 3.0,
+                            "layout": "fullscreen",
+                        }))
+                        .unwrap(),
+                    );
+                }
+                let ranges = if reordered_clips {
+                    vec![(0, 0.0, 2.0), (1, 6.0, 8.0), (0, 2.0, 6.0)]
+                } else {
+                    vec![(0, 0.0, 8.0)]
+                };
+                config.segments = ranges
+                    .into_iter()
+                    .map(|(recording_clip, start, end)| TimelineSegment {
+                        recording_clip,
+                        timescale: 1.0,
+                        start,
+                        end,
+                        name: None,
+                        speed_audio_mode: None,
+                        hide_cursor: None,
+                        volume: None,
+                    })
+                    .collect();
+                if reordered_clips {
+                    config.transitions = [1, 2]
+                        .into_iter()
+                        .map(|segment_index| ClipTransition {
+                            segment_index,
+                            kind: ClipTransitionType::CrossFade,
+                            duration: 0.25,
+                        })
+                        .collect();
+                }
+                for reordered_moves in [false, true] {
+                    let mut cursor = smooth_cluster_cursor(8.0);
+                    if reordered_moves {
+                        cursor.moves.reverse();
+                    }
+                    for (recording_clip, outgoing) in [(0, false), (0, true), (1, false)] {
+                        let build = || {
+                            if outgoing {
+                                ZoomTransformTimeline::from_project_for_outgoing_clip(
+                                    &project,
+                                    &cursor,
+                                    8.0,
+                                    XY::new(1000, 1000),
+                                    recording_clip,
+                                )
+                            } else {
+                                ZoomTransformTimeline::from_project_for_clip(
+                                    &project,
+                                    &cursor,
+                                    8.0,
+                                    XY::new(1000, 1000),
+                                    recording_clip,
+                                )
+                            }
+                        };
+                        let mut indexed = build();
+                        let mut linear = build();
+                        force_linear_cluster_lookup(&mut linear);
+                        indexed.precompute();
+                        for time in [1.0, 3.5, 2.0, 8.0] {
+                            linear.ensure_precomputed_until(time);
+                        }
+                        assert_samples_identical(&indexed, &linear);
+                    }
+                }
+            }
+        }
+    }
+
+    #[test]
+    #[ignore = "benchmark; run with --release --ignored --nocapture"]
+    fn zoom_cluster_timeline_rebuild() {
+        use std::time::{Duration, Instant};
+
+        const RUNS: usize = 7;
+        let percentile = |times: &mut Vec<Duration>, p: f64| {
+            times.sort_unstable();
+            let index = ((times.len() - 1) as f64 * p).round() as usize;
+            times[index].as_secs_f64() * 1000.0
+        };
+        let cluster_count = |timeline: &ZoomTransformTimeline| {
+            timeline
+                .clusters
+                .iter()
+                .flatten()
+                .map(|clusters| match clusters {
+                    ZoomClusters::Static(centers) => centers.clusters.len(),
+                    ZoomClusters::Styled { variants, .. } => variants
+                        .iter()
+                        .map(|variant| variant.clusters.clusters.len())
+                        .sum(),
+                })
+                .sum::<usize>()
+        };
+        println!(
+            "| seconds | zoom | playhead | moves | clusters | samples | build p50 ms | precompute p50 ms | rebuild p50 ms | rebuild min ms | rebuild max ms | samples hash |"
+        );
+        println!(
+            "| ---: | --- | ---: | ---: | ---: | ---: | ---: | ---: | ---: | ---: | ---: | --- |"
+        );
+        for duration_secs in [60.0, 600.0] {
+            let cursor = smooth_cluster_cursor(duration_secs);
+            for long_zoom in [false, true] {
+                let mut project = benchmark_project(duration_secs, (duration_secs / 30.0) as usize);
+                if long_zoom {
+                    project.timeline.as_mut().unwrap().zoom_segments =
+                        vec![auto_segment(0.0, duration_secs, 2.0)];
+                }
+                for fraction in [0.5, 1.0] {
+                    let playhead = (duration_secs * fraction) as f32;
+                    let mut build_times = Vec::with_capacity(RUNS);
+                    let mut precompute_times = Vec::with_capacity(RUNS);
+                    let mut rebuild_times = Vec::with_capacity(RUNS);
+                    let mut expected_hash = None;
+                    let mut clusters = 0;
+                    let mut samples = 0;
+                    let mut reference = ZoomTransformTimeline::from_project_for_clip(
+                        &project,
+                        &cursor,
+                        duration_secs,
+                        XY::new(1920, 1080),
+                        0,
+                    );
+                    force_linear_cluster_lookup(&mut reference);
+                    reference.ensure_precomputed_until(playhead);
+                    for run in 0..=RUNS {
+                        let build_start = Instant::now();
+                        let mut timeline = ZoomTransformTimeline::from_project_for_clip(
+                            &project,
+                            &cursor,
+                            duration_secs,
+                            XY::new(1920, 1080),
+                            0,
+                        );
+                        let build_elapsed = build_start.elapsed();
+                        let precompute_start = Instant::now();
+                        timeline.ensure_precomputed_until(playhead);
+                        let precompute_elapsed = precompute_start.elapsed();
+                        let rebuild_elapsed = build_start.elapsed();
+                        assert_samples_identical(&timeline, &reference);
+                        let hash = samples_hash(&timeline);
+                        if let Some(expected_hash) = expected_hash {
+                            assert_eq!(hash, expected_hash);
+                        } else {
+                            expected_hash = Some(hash);
+                        }
+                        clusters = cluster_count(&timeline);
+                        samples = timeline.samples.len();
+                        assert!(samples > (f64::from(playhead) * 1000.0 / STEP_MS) as usize);
+                        std::hint::black_box(timeline.sample(playhead));
+                        if run > 0 {
+                            build_times.push(build_elapsed);
+                            precompute_times.push(precompute_elapsed);
+                            rebuild_times.push(rebuild_elapsed);
+                        }
+                    }
+                    let rebuild_p50 = percentile(&mut rebuild_times, 0.5);
+                    println!(
+                        "| {duration_secs:.0} | {} | {:.0}% | {} | {clusters} | {samples} | {:.3} | {:.3} | {rebuild_p50:.3} | {:.3} | {:.3} | {:016x} |",
+                        if long_zoom { "long" } else { "4s every 30s" },
+                        fraction * 100.0,
+                        cursor.moves.len(),
+                        percentile(&mut build_times, 0.5),
+                        percentile(&mut precompute_times, 0.5),
+                        rebuild_times[0].as_secs_f64() * 1000.0,
+                        rebuild_times[RUNS - 1].as_secs_f64() * 1000.0,
+                        expected_hash.unwrap(),
+                    );
+                }
+            }
+        }
+    }
 }
diff --git a/scripts/benchmark-zoom-clusters.py b/scripts/benchmark-zoom-clusters.py
new file mode 100644
index 00000000000..c717c1a3b72
--- /dev/null
+++ b/scripts/benchmark-zoom-clusters.py
@@ -0,0 +1,133 @@
+import argparse
+import json
+import math
+import subprocess
+from pathlib import Path
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("target", type=Path)
+    parser.add_argument("--duration", type=int, default=120)
+    parser.add_argument("--width", type=int, default=320)
+    parser.add_argument("--height", type=int, default=180)
+    parser.add_argument("--short-zooms", action="store_true")
+    args = parser.parse_args()
+    if args.duration <= 0:
+        parser.error("duration must be positive")
+    if args.width <= 0 or args.height <= 0 or args.width % 2 or args.height % 2:
+        parser.error("width and height must be positive even integers")
+    target = args.target.resolve()
+    if target.exists():
+        parser.error("target must not exist")
+    target.mkdir(parents=True)
+
+    subprocess.run(
+        [
+            "ffmpeg",
+            "-hide_banner",
+            "-loglevel",
+            "error",
+            "-nostdin",
+            "-f",
+            "lavfi",
+            "-i",
+            f"testsrc2=size={args.width}x{args.height}:rate=30",
+            "-t",
+            str(args.duration),
+            "-an",
+            "-c:v",
+            "libx264",
+            "-preset",
+            "ultrafast",
+            "-crf",
+            "35",
+            "-g",
+            "30",
+            "-keyint_min",
+            "30",
+            "-sc_threshold",
+            "0",
+            "-pix_fmt",
+            "yuv420p",
+            "-movflags",
+            "+faststart",
+            str(target / "display.mp4"),
+        ],
+        check=True,
+    )
+
+    moves = []
+    for index in range(args.duration * 60):
+        time = index / 60
+        phase = (time % 3.2) / 3.2
+        triangle = 1 - abs(2 * phase - 1)
+        moves.append(
+            {
+                "active_modifiers": [],
+                "cursor_id": "default",
+                "time_ms": time * 1000,
+                "x": 0.1 + 0.8 * triangle,
+                "y": 0.5 + 0.2 * math.sin(time * math.tau / 11),
+            }
+        )
+    (target / "cursor.json").write_text(json.dumps({"moves": moves, "clicks": []}))
+    metadata = {
+        "pretty_name": f"Synthetic smooth cursor zoom ({args.duration}s)",
+        "platform": "MacOS",
+        "segments": [
+            {
+                "display": {"path": "display.mp4", "fps": 30},
+                "cursor": "cursor.json",
+            }
+        ],
+    }
+    project = {
+        "camera": {"hide": True},
+        "audio": {"mute": True},
+        "cursor": {"type": "circle", "useSvg": False, "raw": False},
+        "screenMotionBlur": 1.0,
+        "textSizeVersion": 1,
+        "textAnimVersion": 1,
+        "timeline": {
+            "segments": [
+                {
+                    "recordingSegment": 0,
+                    "timescale": 1.0,
+                    "start": 0.0,
+                    "end": args.duration,
+                }
+            ],
+            "zoomSegments": [
+                {"start": 0.0, "end": args.duration, "amount": 2.0, "mode": "auto"}
+            ],
+        },
+    }
+    if args.short_zooms:
+        project["timeline"]["zoomSegments"] = [
+            {
+                "start": start,
+                "end": min(start + 4, args.duration),
+                "amount": 2,
+                "mode": "auto",
+            }
+            for start in range(8, args.duration, 30)
+        ]
+    (target / "recording-meta.json").write_text(json.dumps(metadata, indent=2) + "\n")
+    (target / "project-config.json").write_text(json.dumps(project, indent=2) + "\n")
+
+    print(
+        json.dumps(
+            {
+                "project": str(target),
+                "durationSecs": args.duration,
+                "moves": len(moves),
+                "videoSize": [args.width, args.height],
+                "shortZooms": args.short_zooms,
+            }
+        )
+    )
+
+
+if __name__ == "__main__":
+    main()

From e1ecebb8d4b60ab70709c7c0b297457170a94a69 Mon Sep 17 00:00:00 2001
From: Colin Kim <121141519+colinvkim@users.noreply.github.com>
Date: Wed, 14 Oct 2026 18:25:26 -0700
Subject: [PATCH 36/74] refactor(rendering): simplify zoom lookup patch

---
 crates/rendering/benches/zoom-clusters.csv |  61 ------
 crates/rendering/benches/zoom-clusters.md  |  83 -------
 crates/rendering/src/zoom_spring.rs        | 244 ---------------------
 scripts/benchmark-zoom-clusters.py         | 133 -----------
 4 files changed, 521 deletions(-)
 delete mode 100644 crates/rendering/benches/zoom-clusters.csv
 delete mode 100644 crates/rendering/benches/zoom-clusters.md
 delete mode 100644 scripts/benchmark-zoom-clusters.py

diff --git a/crates/rendering/benches/zoom-clusters.csv b/crates/rendering/benches/zoom-clusters.csv
deleted file mode 100644
index aea7fc76e17..00000000000
--- a/crates/rendering/benches/zoom-clusters.csv
+++ /dev/null
@@ -1,61 +0,0 @@
-fixture,run,variant,durationSecs,zoomSegments,completedAwaitedEdits,terminalFailures,stderrErrors,stderrWarnings,editCpuSecs,early_atSecs,early_seekMs,early_editMedianMs,early_editP95Ms,middle_atSecs,middle_seekMs,middle_editMedianMs,middle_editP95Ms,late_atSecs,late_seekMs,late_editMedianMs,late_editP95Ms
-smooth-30.cap,1,baseline,30.0,1,90,0,0,0,0.176116,0.5833333333333334,14.535833,6.014083,9.471791999999999,14.983333333333333,22.618125,6.410792,10.370208,29.383333333333333,22.452792,9.150917,13.705333
-smooth-30.cap,1,candidate,30.0,1,90,0,0,0,0.193078,0.5833333333333334,15.171125,6.070167,8.379707999999999,14.983333333333333,22.378709,8.138959,10.947792,29.383333333333333,23.029999999999998,10.571041,13.780041
-smooth-30.cap,2,candidate,30.0,1,90,0,0,0,0.14635,0.5833333333333334,18.434791999999998,6.074834,8.364375,14.983333333333333,31.232291999999998,7.974458,11.515917,29.383333333333333,18.025917,7.031833000000001,10.406708
-smooth-30.cap,2,baseline,30.0,1,90,0,0,0,0.20678600000000003,0.5833333333333334,15.822709000000001,8.396249999999998,9.595459,14.983333333333333,25.102541,7.688875,9.992666000000002,29.383333333333333,27.852291,7.868541,11.2005
-smooth-30.cap,3,baseline,30.0,1,90,0,0,0,0.12227999999999997,0.5833333333333334,14.68525,6.005958,7.184167,14.983333333333333,22.380459,7.3140410000000005,10.767125,29.383333333333333,18.689542,7.515541,10.470417
-smooth-30.cap,3,candidate,30.0,1,90,0,0,0,0.15273599999999998,0.5833333333333334,14.435292,5.970083,7.165792,14.983333333333333,21.131332999999998,5.092625,9.655958,29.383333333333333,20.224290999999997,7.9645410000000005,10.515416
-smooth-30.cap,4,candidate,30.0,1,90,0,0,0,0.17471899999999993,0.5833333333333334,16.013042000000002,8.393374999999999,9.563416,14.983333333333333,32.867541,7.733042,11.358792,29.383333333333333,32.4925,8.461916,11.756166
-smooth-30.cap,4,baseline,30.0,1,90,0,0,0,0.159136,0.5833333333333334,19.161583,5.9818750000000005,7.178249999999999,14.983333333333333,30.798333,8.471459000000001,11.462458999999999,29.383333333333333,21.190875000000002,7.8408750000000005,9.906208
-smooth-30.cap,5,baseline,30.0,1,90,0,0,0,0.17704,0.5833333333333334,15.852834,6.08925,9.427833,14.983333333333333,25.203792,6.533167000000001,9.871292,29.383333333333333,28.503209000000002,8.115458,9.365
-smooth-30.cap,5,candidate,30.0,1,90,0,0,0,0.15830499999999997,0.5833333333333334,14.468958,4.949833,9.428958,14.983333333333333,19.027790999999997,5.4025419999999995,6.8065,29.383333333333333,24.3315,7.816,12.702833
-smooth-120.cap,1,baseline,120.0,1,90,0,0,0,0.224209,2.3833333333333333,15.726207999999998,6.066125,8.480959,59.983333333333334,24.454625,8.39775,10.291042000000001,117.58333333333333,27.800667,10.882,14.25825
-smooth-120.cap,1,candidate,120.0,1,90,0,0,0,0.251459,2.3833333333333333,14.195167,7.284833,8.471667,59.983333333333334,29.787125,8.987958,11.002875000000001,117.58333333333333,30.72525,9.794625,13.674916
-smooth-120.cap,2,candidate,120.0,1,90,0,0,0,0.193544,2.3833333333333333,15.332709,5.93825,8.416916,59.983333333333334,21.452875,7.297,10.384834000000001,117.58333333333333,22.954791,9.060417,11.821584
-smooth-120.cap,2,baseline,120.0,1,90,0,0,0,0.20932700000000004,2.3833333333333333,16.424,6.039708,8.50275,59.983333333333334,24.345125,8.442958,12.520708,117.58333333333333,26.141583,10.481541,16.255125
-smooth-120.cap,3,baseline,120.0,1,90,0,0,0,0.19719,2.3833333333333333,23.206833,5.02325,8.41225,59.983333333333334,33.208917,7.766833,12.16,117.58333333333333,23.45425,9.719458,12.879541
-smooth-120.cap,3,candidate,120.0,1,90,0,0,0,0.171051,2.3833333333333333,12.924667000000001,6.052166000000001,8.533875,59.983333333333334,25.25975,6.2983329999999995,11.30725,117.58333333333333,19.834334,8.003,10.947458000000001
-smooth-120.cap,4,candidate,120.0,1,90,0,0,0,0.17092500000000005,2.3833333333333333,14.21225,5.993875,9.621792000000001,59.983333333333334,28.377916,6.891958,10.863958,117.58333333333333,28.847250000000003,8.117958999999999,10.484333
-smooth-120.cap,4,baseline,120.0,1,90,0,0,0,0.146543,2.3833333333333333,14.073584,5.985125,9.788625,59.983333333333334,23.654333,9.14675,11.713959,117.58333333333333,18.633792,7.041083,9.425625
-smooth-120.cap,5,baseline,120.0,1,90,0,0,0,0.17456399999999997,2.3833333333333333,17.661417,6.105916000000001,8.461917,59.983333333333334,26.056791,9.710208999999999,15.137292,117.58333333333333,22.76875,10.335375,13.898375
-smooth-120.cap,5,candidate,120.0,1,90,0,0,0,0.18976700000000002,2.3833333333333333,15.454959,8.333874999999999,9.628708,59.983333333333334,26.591083,7.852792000000001,10.353875,117.58333333333333,28.871791,9.567417,12.074625000000001
-smooth-600.cap,1,baseline,600.0,1,90,0,0,0,0.7870170000000001,11.983333333333333,20.805291999999998,7.8325830000000005,9.270875,299.98333333333335,33.287625,18.199458,20.498209,587.9833333333333,25.181375,20.704832999999997,22.787625
-smooth-600.cap,1,candidate,600.0,1,90,0,0,0,0.29328199999999993,11.983333333333333,18.462709,5.13025,9.870084,299.98333333333335,27.7975,10.9885,12.097833000000001,587.9833333333333,25.595,12.488624999999999,13.95275
-smooth-600.cap,2,candidate,600.0,1,90,0,0,0,0.300285,11.983333333333333,18.231167,8.74875,9.968665999999999,299.98333333333335,28.597832999999998,11.159917,12.444875,587.9833333333333,25.355584,12.18375,13.497291
-smooth-600.cap,2,baseline,600.0,1,90,0,0,0,0.799258,11.983333333333333,19.45475,8.029917,10.616541999999999,299.98333333333335,37.664375,18.138749999999998,20.003292,587.9833333333333,23.160957999999997,21.5395,23.0665
-smooth-600.cap,3,baseline,600.0,1,90,0,0,0,0.7913209999999999,11.983333333333333,16.532708,5.625167,9.744667,299.98333333333335,30.937042,18.237083000000002,20.668958,587.9833333333333,27.398,19.503417,22.644166000000002
-smooth-600.cap,3,candidate,600.0,1,90,0,0,0,0.24995000000000003,11.983333333333333,18.864667,5.2249159999999994,11.944958,299.98333333333335,14.497333,7.89425,10.152750000000001,587.9833333333333,21.846,12.16025,14.034958999999999
-smooth-600.cap,4,candidate,600.0,1,90,0,0,0,0.306248,11.983333333333333,18.400458,9.780875,10.953583,299.98333333333335,39.607666,11.93975,13.570958,587.9833333333333,24.109708,11.828875,13.841417
-smooth-600.cap,4,baseline,600.0,1,90,0,0,0,0.7959860000000001,11.983333333333333,22.244875,9.385083,10.936625,299.98333333333335,37.927958,18.19375,19.8995,587.9833333333333,27.922,19.754082999999998,22.30625
-smooth-600.cap,5,baseline,600.0,1,90,0,0,0,0.8500629999999999,11.983333333333333,19.923083000000002,5.600499999999999,7.425916,299.98333333333335,31.534542,18.435792,19.470292,587.9833333333333,28.754790999999997,22.533792000000002,27.9235
-smooth-600.cap,5,candidate,600.0,1,90,0,0,0,0.29704699999999995,11.983333333333333,16.002083,3.9802500000000003,7.591292,299.98333333333335,23.937,11.020875,12.189625000000001,587.9833333333333,23.991583000000002,12.61575,14.9935
-short-600.cap,1,baseline,600.0,20,90,0,0,0,0.18384099999999995,11.983333333333333,17.502584000000002,8.402415999999999,9.662833,299.98333333333335,24.26375,4.972042,6.084542,587.9833333333333,20.83075,4.603917,7.335167
-short-600.cap,1,candidate,600.0,20,90,0,0,0,0.18166500000000005,11.983333333333333,18.54975,8.476416,9.528,299.98333333333335,26.784208,5.045084,6.180333,587.9833333333333,16.545583999999998,4.450791,5.7895840000000005
-short-600.cap,2,candidate,600.0,20,90,0,0,0,0.19037800000000005,11.983333333333333,19.514375,8.65525,9.812208,299.98333333333335,22.327042,3.965916,5.255166,587.9833333333333,22.590041000000003,4.4185,6.105625
-short-600.cap,2,baseline,600.0,20,90,0,0,0,0.15605000000000002,11.983333333333333,26.488125,6.218292,9.588332999999999,299.98333333333335,20.710375,3.46575,5.692333,587.9833333333333,17.165,4.20925,5.40575
-short-600.cap,3,baseline,600.0,20,90,0,0,0,0.13899400000000003,11.983333333333333,19.96575,8.536833000000001,9.681583,299.98333333333335,13.389833,3.21775,4.413875,587.9833333333333,17.208791,4.093292,6.333333
-short-600.cap,3,candidate,600.0,20,90,0,0,0,0.171271,11.983333333333333,18.468999999999998,8.466916999999999,9.65275,299.98333333333335,20.040875,4.107875000000001,5.059125,587.9833333333333,20.485500000000002,4.170084,5.580792000000001
-short-600.cap,4,candidate,600.0,20,90,0,0,0,0.14888799999999996,11.983333333333333,19.622833,5.179084,12.993333,299.98333333333335,14.398833,3.522209,4.717333,587.9833333333333,17.7845,4.2772499999999996,7.453542
-short-600.cap,4,baseline,600.0,20,90,0,0,0,0.16166200000000003,11.983333333333333,18.580291,8.365875,14.466166000000001,299.98333333333335,21.544125,3.3558339999999998,6.638459,587.9833333333333,14.053125,5.141,8.518333
-short-600.cap,5,baseline,600.0,20,90,0,0,0,0.13187200000000004,11.983333333333333,23.094167,6.122291000000001,8.23225,299.98333333333335,12.352333,3.4052499999999997,5.68825,587.9833333333333,14.874167,4.271417,6.147667
-short-600.cap,5,candidate,600.0,20,90,0,0,0,0.1251480000000001,11.983333333333333,18.681292,6.097667,8.411458999999999,299.98333333333335,14.862959,3.1945419999999998,5.466042,587.9833333333333,12.712041000000001,3.81975,5.2449580000000005
-full-600.cap,1,baseline,600.0,1,90,0,0,0,0.793398,11.983333333333333,38.12525,9.143625,10.412958,299.98333333333335,47.956209,18.054000000000002,19.226042,587.9833333333333,35.881375,21.426542,25.209792
-full-600.cap,1,candidate,600.0,1,90,0,0,0,0.2794740000000001,11.983333333333333,33.098416,5.608458000000001,7.411541,299.98333333333335,44.592542,8.525917,12.928875,587.9833333333333,50.435874999999996,15.05625,46.178583
-full-600.cap,2,candidate,600.0,1,90,0,0,0,0.2102550000000001,11.983333333333333,31.675167,5.0607500000000005,7.234875,299.98333333333335,29.008291,10.156,11.570542,587.9833333333333,35.719167000000006,8.864458,12.521083
-full-600.cap,2,baseline,600.0,1,90,0,0,0,0.7273779999999999,11.983333333333333,28.10925,6.579542,10.038042,299.98333333333335,34.837667,17.214,18.638542,587.9833333333333,33.684125,20.893333,22.05
-full-600.cap,3,baseline,600.0,1,90,0,0,0,0.727938,11.983333333333333,26.689375000000002,4.377167,9.088333,299.98333333333335,43.131958,17.886375,20.495124999999998,587.9833333333333,31.318749999999998,18.5335,21.800375
-full-600.cap,3,candidate,600.0,1,90,0,0,0,0.22764099999999998,11.983333333333333,25.579833999999998,4.951416,8.518333,299.98333333333335,36.102458,10.437750000000001,11.473333,587.9833333333333,30.738083,12.865167,14.070915999999999
-full-600.cap,4,candidate,600.0,1,90,0,0,0,0.22326500000000002,11.983333333333333,25.176209,7.310334,9.607125,299.98333333333335,27.181333,8.835334,10.491208,587.9833333333333,29.287084,11.609417,12.840709
-full-600.cap,4,baseline,600.0,1,90,0,0,0,0.7603270000000001,11.983333333333333,28.901666,9.077292,10.549959,299.98333333333335,41.204499999999996,18.013250000000003,18.139291,587.9833333333333,33.018458,20.744041000000003,23.427417
-full-600.cap,5,baseline,600.0,1,90,0,0,0,0.74926,11.983333333333333,26.578,5.412208,6.711208,299.98333333333335,44.466832999999994,17.996417,19.164082999999998,587.9833333333333,35.046375,19.518167,23.114875
-full-600.cap,5,candidate,600.0,1,90,0,0,0,0.25702100000000005,11.983333333333333,28.757875,5.155583,8.602291999999998,299.98333333333335,39.540040999999995,9.625125,12.353625,587.9833333333333,31.536250000000003,12.342042,14.453875
-full-short-600.cap,1,baseline,600.0,20,90,0,0,0,0.13350600000000004,11.983333333333333,25.029708000000003,7.089042,10.560917,299.98333333333335,32.516208,4.649208,5.986458,587.9833333333333,31.411458000000003,5.225917,5.449792
-full-short-600.cap,1,candidate,600.0,20,90,0,0,0,0.12485600000000001,11.983333333333333,25.301417,5.9717080000000005,9.47575,299.98333333333335,23.605833999999998,3.414958,4.599959,587.9833333333333,25.462333,4.19625,5.358209
-full-short-600.cap,2,candidate,600.0,20,90,0,0,0,0.12378300000000003,11.983333333333333,28.065542,8.269125,9.441167,299.98333333333335,25.191917,3.429792,4.562125,587.9833333333333,25.460041999999998,4.161625000000001,6.342875
-full-short-600.cap,2,baseline,600.0,20,90,0,0,0,0.12141800000000001,11.983333333333333,25.996416,8.259542,9.563125000000001,299.98333333333335,28.879915999999998,3.49825,4.659042,587.9833333333333,30.213875,3.8865000000000003,5.052875
-full-short-600.cap,3,baseline,600.0,20,90,0,0,0,0.11791599999999999,11.983333333333333,28.318833,5.945709000000001,9.446665999999999,299.98333333333335,25.501333000000002,3.388,4.531375,587.9833333333333,26.651457999999998,4.040916,5.27925
-full-short-600.cap,3,candidate,600.0,20,90,0,0,0,0.115095,11.983333333333333,26.286417,5.933041,7.138208,299.98333333333335,26.458375,3.333833,5.629208,587.9833333333333,23.773542000000003,4.029917,5.15975
-full-short-600.cap,4,candidate,600.0,20,90,0,0,0,0.12557899999999997,11.983333333333333,26.28625,8.244792,10.472083,299.98333333333335,23.680041999999997,3.56275,4.935959,587.9833333333333,26.645666,4.07675,5.30425
-full-short-600.cap,4,baseline,600.0,20,90,0,0,0,0.12949300000000002,11.983333333333333,26.042708,8.278875,9.474375,299.98333333333335,34.110208,3.5752919999999997,4.860125,587.9833333333333,25.577166,4.102333,5.285416000000001
-full-short-600.cap,5,baseline,600.0,20,90,0,0,0,0.11517700000000002,11.983333333333333,25.45225,8.312792,10.509792000000001,299.98333333333335,26.264542,3.327333,5.532459,587.9833333333333,28.734917,4.919207999999999,6.169084
-full-short-600.cap,5,candidate,600.0,20,90,0,0,0,0.127569,11.983333333333333,25.420375,8.314541,10.450834,299.98333333333335,27.60925,3.252917,5.809333,587.9833333333333,25.541417,3.9958329999999997,5.127667
diff --git a/crates/rendering/benches/zoom-clusters.md b/crates/rendering/benches/zoom-clusters.md
deleted file mode 100644
index 4d5335f2e37..00000000000
--- a/crates/rendering/benches/zoom-clusters.md
+++ /dev/null
@@ -1,83 +0,0 @@
-# Auto-zoom cluster benchmark results
-
-On the synthetic ten-minute 1080p recording, a paused edit at 9:48 takes 20.74 ms before and 12.34 ms after, a 40.5% latency reduction. These are medians of five run medians. The ranges are 18.53–21.43 ms before and 8.86–15.06 ms after.
-
-The improvement concerns long auto-zoom segments. Shorter recordings and four-second zoom controls have overlapping run ranges and do not establish a performance difference.
-
-## Measurement
-
-The baseline is upstream `34036657845bf063c875e66a10ad537afa415f35`, which includes #2557. Both binaries use the GPUI workspace release profile, Rust 1.97.1, and the same native FFmpeg libraries. The machine is an Apple M5 with ten logical cores and macOS 27.0.1.
-
-The existing GPUI `live-edit-benchmark` sends a padding change to `EditorInstance`, requests the paused frame, and awaits the matching frame callback. It uses two Tokio workers, a 1248×702 preview, 60 fps, and the app's `BgraSurface` output on macOS. The timer includes project publication, zoom reconstruction and simulation, decoding, rendering, and frame delivery. It excludes editor startup, the first warmup frame, and window composition.
-
-Each fixture runs five times per binary. The binary order reverses between pairs. Each run completes 30 edits at each of the 2%, 50%, and 98% playhead positions. The 60 successful runs complete 5,400 timed edits with no terminal failures, renderer errors, or warnings. The runner checks the loaded duration, zoom count, and exact playhead positions.
-
-The machine has other desktop applications running. The initial one-minute load average is 8.47. Compilation and profiling finish before the timed comparisons. Interleaving limits the effect of background activity, and the ranges below retain its variation.
-
-The primary H.264 recording is 1920×1080 at 30 fps, with 18,000 video frames. A second suite uses 320×180 video. Cursor events arrive at 60 Hz. The cursor moves smoothly between x=0.1 and x=0.9 over a 3.2-second cycle, with a slower vertical oscillation. Cursor smoothing remains enabled. The recording has no audio or camera. The long case sets one continuous 2× auto-zoom segment. This is a supported manually extended segment, rather than output from the click generator. The control contains four-second zooms every 30 seconds.
-
-## Results
-
-Each cell gives the median of five run medians, followed by their minimum and maximum, in milliseconds. The [raw CSV](zoom-clusters.csv) contains every run and region, plus process CPU time and error counts.
-
-| 1080p fixture                  | Playhead |               Before |               After |
-| ------------------------------ | -------: | -------------------: | ------------------: |
-| 600 seconds, continuous zoom   |       2% |    6.58 [4.38, 9.14] |   5.16 [4.95, 7.31] |
-| 600 seconds, continuous zoom   |      50% | 18.00 [17.21, 18.05] |  9.63 [8.53, 10.44] |
-| 600 seconds, continuous zoom   |      98% | 20.74 [18.53, 21.43] | 12.34 [8.86, 15.06] |
-| 600 seconds, four-second zooms |       2% |    8.26 [5.95, 8.31] |   8.24 [5.93, 8.31] |
-| 600 seconds, four-second zooms |      50% |    3.50 [3.33, 4.65] |   3.41 [3.25, 3.56] |
-| 600 seconds, four-second zooms |      98% |    4.10 [3.89, 5.23] |   4.08 [4.00, 4.20] |
-
-| 320×180 fixture                | Playhead |               Before |                After |
-| ------------------------------ | -------: | -------------------: | -------------------: |
-| 30 seconds, continuous zoom    |       2% |    6.01 [5.98, 8.40] |    6.07 [4.95, 8.39] |
-| 30 seconds, continuous zoom    |      50% |    7.31 [6.41, 8.47] |    7.73 [5.09, 8.14] |
-| 30 seconds, continuous zoom    |      98% |    7.87 [7.52, 9.15] |   7.96 [7.03, 10.57] |
-| 120 seconds, continuous zoom   |       2% |    6.04 [5.02, 6.11] |    6.05 [5.94, 8.33] |
-| 120 seconds, continuous zoom   |      50% |    8.44 [7.77, 9.71] |    7.30 [6.30, 8.99] |
-| 120 seconds, continuous zoom   |      98% |  10.34 [7.04, 10.88] |    9.06 [8.00, 9.79] |
-| 600 seconds, continuous zoom   |       2% |    7.83 [5.60, 9.39] |    5.22 [3.98, 9.78] |
-| 600 seconds, continuous zoom   |      50% | 18.20 [18.14, 18.44] |  11.02 [7.89, 11.94] |
-| 600 seconds, continuous zoom   |      98% | 20.70 [19.50, 22.53] | 12.18 [11.83, 12.62] |
-| 600 seconds, four-second zooms |       2% |    8.37 [6.12, 8.54] |    8.47 [5.18, 8.66] |
-| 600 seconds, four-second zooms |      50% |    3.41 [3.22, 4.97] |    3.97 [3.19, 5.05] |
-| 600 seconds, four-second zooms |      98% |    4.27 [4.09, 5.14] |    4.28 [3.82, 4.45] |
-
-An exact two-sided rank-sum check on the five run medians gives p=0.0079 for both the middle and late continuous ten-minute case at either resolution. The other comparisons have p≥0.095. The 320×180 four-second control's middle-position median increases, but its overlapping ranges and p=0.42 do not establish a regression. These small samples do not prove that all short inputs have identical cost.
-
-Median process CPU time over the 90 edits in the continuous ten-minute 1080p case is 0.749 seconds before and 0.228 seconds after. The average CPU saving is smaller than the original average CPU cost per edit. The latency result therefore does not require saving more CPU work than the baseline performs.
-
-## Profiler and correctness evidence
-
-A separate, unreported `sample` run uses the 320×180 baseline with symbols retained. The dominant `targets_at` offsets, +788 and +792, resolve to the reverse cluster loop: load a timestamp, move backward 48 bytes, compare with the requested time, and branch back. `targets_at` accounts for 2,096 of the 2,172 samples below `advance_one_step`. This identifies the precompute CPU cost, not its fraction of whole-edit wall time. Sleeping decoder, GPU, and runtime threads are also present in the profile.
-
-The ten-minute continuous fixture produces 1,126 clusters and up to 75,002 cached spring samples. The indexed lookup changes a linear reverse search into a binary search for ordered clusters. Unordered lists retain the original scan. The ignored rebuild benchmark compares every sample bit with the linear path outside its timer, including the long and four-second controls. The full ten-minute continuous case has sample hash `8f8ba71ca9a5b122`.
-
-Validation passes all 307 rendering unit tests, including 30,811 lookup comparisons and 24 complete-timeline comparisons across crop styles, fullscreen holds, reordered moves, clip jumps, and transitions. The export equivalence test also passes for eager, incremental, and seek paths. Rust formatting, all-target compilation, and Python Ruff checks pass.
-
-Strict Rust 1.97 Clippy reports existing modulo expressions in `crates/project/src/animated_gradient.rs:259,266`, loop suggestions in `crates/rendering/src/lib.rs:738,1325`, and a cloned-reference suggestion in `crates/rendering/src/layers/text.rs:992`. These files match the baseline. Running Clippy again with the original zoom source reproduces the same rendering findings. No lint suppressions are added. Root CI uses Rust 1.88.
-
-## Commands
-
-Fixture creation uses the new generator. It refuses an existing destination.
-
-```sh
-python3 scripts/benchmark-zoom-clusters.py /tmp/zoom-long.cap --duration 600 --width 1920 --height 1080
-python3 scripts/benchmark-zoom-clusters.py /tmp/zoom-short.cap --duration 600 --width 1920 --height 1080 --short-zooms
-```
-
-The existing benchmark command runs from `apps/desktop-gpui` on each revision, with the same generated fixture and native dependency environment. The measurements above use five interleaved runs per revision.
-
-```sh
-cargo +stable run --release --example live-edit-benchmark -- /tmp/zoom-long.cap 30
-cargo +stable run --release --example live-edit-benchmark -- /tmp/zoom-short.cap 30
-```
-
-The rendering crate owns the ignored diagnostic benchmark and correctness tests. Its release profile uses size optimization by default. The opt-level override below matches the GPUI app's optimization level.
-
-```sh
-cargo +stable test -p cap-rendering --lib --release --config profile.release.opt-level=3 zoom_cluster_timeline_rebuild -- --ignored --nocapture
-cargo +stable test -p cap-rendering --lib
-cargo +stable test -p cap-rendering --test export_zoom_equivalence
-```
diff --git a/crates/rendering/src/zoom_spring.rs b/crates/rendering/src/zoom_spring.rs
index 497ecd99616..90012d90bb3 100644
--- a/crates/rendering/src/zoom_spring.rs
+++ b/crates/rendering/src/zoom_spring.rs
@@ -2689,248 +2689,4 @@ mod tests {
             }
         }
     }
-
-    fn smooth_cluster_cursor(duration_secs: f64) -> CursorEvents {
-        let moves = (0..(duration_secs * 60.0) as usize)
-            .map(|index| {
-                let time = index as f64 / 60.0;
-                let phase = (time % 3.2) / 3.2;
-                let triangle = 1.0 - (2.0 * phase - 1.0).abs();
-                move_event(
-                    time * 1000.0,
-                    0.1 + 0.8 * triangle,
-                    0.5 + 0.2 * (time * std::f64::consts::TAU / 11.0).sin(),
-                )
-            })
-            .collect();
-        CursorEvents {
-            moves,
-            clicks: Vec::new(),
-        }
-    }
-
-    fn force_linear_cluster_lookup(timeline: &mut ZoomTransformTimeline) {
-        for clusters in timeline.clusters.iter_mut().flatten() {
-            match clusters {
-                ZoomClusters::Static(centers) => centers.time_ordered = false,
-                ZoomClusters::Styled { variants, .. } => {
-                    for variant in variants {
-                        variant.clusters.time_ordered = false;
-                    }
-                }
-            }
-        }
-    }
-
-    #[test]
-    fn indexed_cluster_samples_match_linear_lookup_across_crops_and_clip_jumps() {
-        for styled in [false, true] {
-            let styles = if styled {
-                vec![
-                    crop_style(
-                        1.5,
-                        6.0,
-                        0,
-                        Some(Crop {
-                            position: XY::new(0, 0),
-                            size: XY::new(500, 1000),
-                        }),
-                    ),
-                    crop_style(
-                        3.0,
-                        4.5,
-                        1,
-                        Some(Crop {
-                            position: XY::new(0, 500),
-                            size: XY::new(1000, 500),
-                        }),
-                    ),
-                ]
-            } else {
-                Vec::new()
-            };
-            for reordered_clips in [false, true] {
-                let mut project =
-                    project_with_crop_styles(vec![auto_segment(0.25, 7.75, 2.0)], styles.clone());
-                let config = project.timeline.as_mut().unwrap();
-                if styled {
-                    config.text_segments.push(
-                        serde_json::from_value(serde_json::json!({
-                            "start": 2.0,
-                            "end": 3.0,
-                            "layout": "fullscreen",
-                        }))
-                        .unwrap(),
-                    );
-                }
-                let ranges = if reordered_clips {
-                    vec![(0, 0.0, 2.0), (1, 6.0, 8.0), (0, 2.0, 6.0)]
-                } else {
-                    vec![(0, 0.0, 8.0)]
-                };
-                config.segments = ranges
-                    .into_iter()
-                    .map(|(recording_clip, start, end)| TimelineSegment {
-                        recording_clip,
-                        timescale: 1.0,
-                        start,
-                        end,
-                        name: None,
-                        speed_audio_mode: None,
-                        hide_cursor: None,
-                        volume: None,
-                    })
-                    .collect();
-                if reordered_clips {
-                    config.transitions = [1, 2]
-                        .into_iter()
-                        .map(|segment_index| ClipTransition {
-                            segment_index,
-                            kind: ClipTransitionType::CrossFade,
-                            duration: 0.25,
-                        })
-                        .collect();
-                }
-                for reordered_moves in [false, true] {
-                    let mut cursor = smooth_cluster_cursor(8.0);
-                    if reordered_moves {
-                        cursor.moves.reverse();
-                    }
-                    for (recording_clip, outgoing) in [(0, false), (0, true), (1, false)] {
-                        let build = || {
-                            if outgoing {
-                                ZoomTransformTimeline::from_project_for_outgoing_clip(
-                                    &project,
-                                    &cursor,
-                                    8.0,
-                                    XY::new(1000, 1000),
-                                    recording_clip,
-                                )
-                            } else {
-                                ZoomTransformTimeline::from_project_for_clip(
-                                    &project,
-                                    &cursor,
-                                    8.0,
-                                    XY::new(1000, 1000),
-                                    recording_clip,
-                                )
-                            }
-                        };
-                        let mut indexed = build();
-                        let mut linear = build();
-                        force_linear_cluster_lookup(&mut linear);
-                        indexed.precompute();
-                        for time in [1.0, 3.5, 2.0, 8.0] {
-                            linear.ensure_precomputed_until(time);
-                        }
-                        assert_samples_identical(&indexed, &linear);
-                    }
-                }
-            }
-        }
-    }
-
-    #[test]
-    #[ignore = "benchmark; run with --release --ignored --nocapture"]
-    fn zoom_cluster_timeline_rebuild() {
-        use std::time::{Duration, Instant};
-
-        const RUNS: usize = 7;
-        let percentile = |times: &mut Vec<Duration>, p: f64| {
-            times.sort_unstable();
-            let index = ((times.len() - 1) as f64 * p).round() as usize;
-            times[index].as_secs_f64() * 1000.0
-        };
-        let cluster_count = |timeline: &ZoomTransformTimeline| {
-            timeline
-                .clusters
-                .iter()
-                .flatten()
-                .map(|clusters| match clusters {
-                    ZoomClusters::Static(centers) => centers.clusters.len(),
-                    ZoomClusters::Styled { variants, .. } => variants
-                        .iter()
-                        .map(|variant| variant.clusters.clusters.len())
-                        .sum(),
-                })
-                .sum::<usize>()
-        };
-        println!(
-            "| seconds | zoom | playhead | moves | clusters | samples | build p50 ms | precompute p50 ms | rebuild p50 ms | rebuild min ms | rebuild max ms | samples hash |"
-        );
-        println!(
-            "| ---: | --- | ---: | ---: | ---: | ---: | ---: | ---: | ---: | ---: | ---: | --- |"
-        );
-        for duration_secs in [60.0, 600.0] {
-            let cursor = smooth_cluster_cursor(duration_secs);
-            for long_zoom in [false, true] {
-                let mut project = benchmark_project(duration_secs, (duration_secs / 30.0) as usize);
-                if long_zoom {
-                    project.timeline.as_mut().unwrap().zoom_segments =
-                        vec![auto_segment(0.0, duration_secs, 2.0)];
-                }
-                for fraction in [0.5, 1.0] {
-                    let playhead = (duration_secs * fraction) as f32;
-                    let mut build_times = Vec::with_capacity(RUNS);
-                    let mut precompute_times = Vec::with_capacity(RUNS);
-                    let mut rebuild_times = Vec::with_capacity(RUNS);
-                    let mut expected_hash = None;
-                    let mut clusters = 0;
-                    let mut samples = 0;
-                    let mut reference = ZoomTransformTimeline::from_project_for_clip(
-                        &project,
-                        &cursor,
-                        duration_secs,
-                        XY::new(1920, 1080),
-                        0,
-                    );
-                    force_linear_cluster_lookup(&mut reference);
-                    reference.ensure_precomputed_until(playhead);
-                    for run in 0..=RUNS {
-                        let build_start = Instant::now();
-                        let mut timeline = ZoomTransformTimeline::from_project_for_clip(
-                            &project,
-                            &cursor,
-                            duration_secs,
-                            XY::new(1920, 1080),
-                            0,
-                        );
-                        let build_elapsed = build_start.elapsed();
-                        let precompute_start = Instant::now();
-                        timeline.ensure_precomputed_until(playhead);
-                        let precompute_elapsed = precompute_start.elapsed();
-                        let rebuild_elapsed = build_start.elapsed();
-                        assert_samples_identical(&timeline, &reference);
-                        let hash = samples_hash(&timeline);
-                        if let Some(expected_hash) = expected_hash {
-                            assert_eq!(hash, expected_hash);
-                        } else {
-                            expected_hash = Some(hash);
-                        }
-                        clusters = cluster_count(&timeline);
-                        samples = timeline.samples.len();
-                        assert!(samples > (f64::from(playhead) * 1000.0 / STEP_MS) as usize);
-                        std::hint::black_box(timeline.sample(playhead));
-                        if run > 0 {
-                            build_times.push(build_elapsed);
-                            precompute_times.push(precompute_elapsed);
-                            rebuild_times.push(rebuild_elapsed);
-                        }
-                    }
-                    let rebuild_p50 = percentile(&mut rebuild_times, 0.5);
-                    println!(
-                        "| {duration_secs:.0} | {} | {:.0}% | {} | {clusters} | {samples} | {:.3} | {:.3} | {rebuild_p50:.3} | {:.3} | {:.3} | {:016x} |",
-                        if long_zoom { "long" } else { "4s every 30s" },
-                        fraction * 100.0,
-                        cursor.moves.len(),
-                        percentile(&mut build_times, 0.5),
-                        percentile(&mut precompute_times, 0.5),
-                        rebuild_times[0].as_secs_f64() * 1000.0,
-                        rebuild_times[RUNS - 1].as_secs_f64() * 1000.0,
-                        expected_hash.unwrap(),
-                    );
-                }
-            }
-        }
-    }
 }
diff --git a/scripts/benchmark-zoom-clusters.py b/scripts/benchmark-zoom-clusters.py
deleted file mode 100644
index c717c1a3b72..00000000000
--- a/scripts/benchmark-zoom-clusters.py
+++ /dev/null
@@ -1,133 +0,0 @@
-import argparse
-import json
-import math
-import subprocess
-from pathlib import Path
-
-
-def main():
-    parser = argparse.ArgumentParser()
-    parser.add_argument("target", type=Path)
-    parser.add_argument("--duration", type=int, default=120)
-    parser.add_argument("--width", type=int, default=320)
-    parser.add_argument("--height", type=int, default=180)
-    parser.add_argument("--short-zooms", action="store_true")
-    args = parser.parse_args()
-    if args.duration <= 0:
-        parser.error("duration must be positive")
-    if args.width <= 0 or args.height <= 0 or args.width % 2 or args.height % 2:
-        parser.error("width and height must be positive even integers")
-    target = args.target.resolve()
-    if target.exists():
-        parser.error("target must not exist")
-    target.mkdir(parents=True)
-
-    subprocess.run(
-        [
-            "ffmpeg",
-            "-hide_banner",
-            "-loglevel",
-            "error",
-            "-nostdin",
-            "-f",
-            "lavfi",
-            "-i",
-            f"testsrc2=size={args.width}x{args.height}:rate=30",
-            "-t",
-            str(args.duration),
-            "-an",
-            "-c:v",
-            "libx264",
-            "-preset",
-            "ultrafast",
-            "-crf",
-            "35",
-            "-g",
-            "30",
-            "-keyint_min",
-            "30",
-            "-sc_threshold",
-            "0",
-            "-pix_fmt",
-            "yuv420p",
-            "-movflags",
-            "+faststart",
-            str(target / "display.mp4"),
-        ],
-        check=True,
-    )
-
-    moves = []
-    for index in range(args.duration * 60):
-        time = index / 60
-        phase = (time % 3.2) / 3.2
-        triangle = 1 - abs(2 * phase - 1)
-        moves.append(
-            {
-                "active_modifiers": [],
-                "cursor_id": "default",
-                "time_ms": time * 1000,
-                "x": 0.1 + 0.8 * triangle,
-                "y": 0.5 + 0.2 * math.sin(time * math.tau / 11),
-            }
-        )
-    (target / "cursor.json").write_text(json.dumps({"moves": moves, "clicks": []}))
-    metadata = {
-        "pretty_name": f"Synthetic smooth cursor zoom ({args.duration}s)",
-        "platform": "MacOS",
-        "segments": [
-            {
-                "display": {"path": "display.mp4", "fps": 30},
-                "cursor": "cursor.json",
-            }
-        ],
-    }
-    project = {
-        "camera": {"hide": True},
-        "audio": {"mute": True},
-        "cursor": {"type": "circle", "useSvg": False, "raw": False},
-        "screenMotionBlur": 1.0,
-        "textSizeVersion": 1,
-        "textAnimVersion": 1,
-        "timeline": {
-            "segments": [
-                {
-                    "recordingSegment": 0,
-                    "timescale": 1.0,
-                    "start": 0.0,
-                    "end": args.duration,
-                }
-            ],
-            "zoomSegments": [
-                {"start": 0.0, "end": args.duration, "amount": 2.0, "mode": "auto"}
-            ],
-        },
-    }
-    if args.short_zooms:
-        project["timeline"]["zoomSegments"] = [
-            {
-                "start": start,
-                "end": min(start + 4, args.duration),
-                "amount": 2,
-                "mode": "auto",
-            }
-            for start in range(8, args.duration, 30)
-        ]
-    (target / "recording-meta.json").write_text(json.dumps(metadata, indent=2) + "\n")
-    (target / "project-config.json").write_text(json.dumps(project, indent=2) + "\n")
-
-    print(
-        json.dumps(
-            {
-                "project": str(target),
-                "durationSecs": args.duration,
-                "moves": len(moves),
-                "videoSize": [args.width, args.height],
-                "shortZooms": args.short_zooms,
-            }
-        )
-    )
-
-
-if __name__ == "__main__":
-    main()

From 65d938d408ff642cd9b1d7f830588206d119a5f6 Mon Sep 17 00:00:00 2001
From: Vagarth <vagarth419@gmail.com>
Date: Thu, 15 Oct 2026 18:45:29 +0530
Subject: [PATCH 37/74] perf(export): encode MP4 export audio with AudioToolbox
 on macOS

FFmpeg's built-in AAC encoder is the busiest CPU thread in an MP4 export.
On macOS, exports now encode audio with AudioToolbox (`aac_at`, already in
the bundled FFmpeg) in average-bitrate mode and fall back to FFmpeg's
encoder if it fails to open. Recording paths keep FFmpeg's encoder: their
fragmented MP4s keep encoder priming in the timeline, and AudioToolbox
primes 2112 samples instead of 1024.

libavcodec pads AudioToolbox's final frame to a full frame and its packet
durations count the padding, so the audio track is trimmed back to the end
of the input. Encoders that accept a short final frame (FFmpeg `aac`,
`libopus`) are not affected.

Adds an export benchmark example to the GPUI workspace that exports the way
the export page does.
---
 .../desktop-gpui/examples/export-benchmark.rs | 134 ++++++++
 crates/enc-ffmpeg/src/audio/aac.rs            | 303 +++++++++++++++++-
 crates/enc-ffmpeg/src/audio/base.rs           |  67 +++-
 crates/export/src/mp4.rs                      |   2 +-
 4 files changed, 488 insertions(+), 18 deletions(-)
 create mode 100644 apps/desktop-gpui/examples/export-benchmark.rs

diff --git a/apps/desktop-gpui/examples/export-benchmark.rs b/apps/desktop-gpui/examples/export-benchmark.rs
new file mode 100644
index 00000000000..4c10debc300
--- /dev/null
+++ b/apps/desktop-gpui/examples/export-benchmark.rs
@@ -0,0 +1,134 @@
+//! Exports a project to MP4 the way the GPUI export page does (`run_export` in
+//! `src/editor_export.rs`) and reports wall time, frames per second and process
+//! CPU time.
+//!
+//! Run: cargo run --release --example export-benchmark -- <project.cap> [WIDTH] [HEIGHT] [FPS] [RUNS]
+
+use std::{
+    path::PathBuf,
+    sync::{Arc, atomic::AtomicBool},
+    time::Instant,
+};
+
+use cap_export::{
+    ExporterBase,
+    mp4::{ExportCompression, Mp4ExportSettings},
+};
+use cap_project::XY;
+
+#[cfg(unix)]
+fn cpu_secs() -> f64 {
+    let mut usage = std::mem::MaybeUninit::<libc::rusage>::zeroed();
+    unsafe { libc::getrusage(libc::RUSAGE_SELF, usage.as_mut_ptr()) };
+    let usage = unsafe { usage.assume_init() };
+    let secs = |time: libc::timeval| time.tv_sec as f64 + time.tv_usec as f64 / 1_000_000.0;
+    secs(usage.ru_utime) + secs(usage.ru_stime)
+}
+
+#[cfg(windows)]
+fn cpu_secs() -> f64 {
+    use windows_sys::Win32::{
+        Foundation::FILETIME,
+        System::Threading::{GetCurrentProcess, GetProcessTimes},
+    };
+
+    let empty = FILETIME {
+        dwLowDateTime: 0,
+        dwHighDateTime: 0,
+    };
+    let (mut creation, mut exit, mut kernel, mut user) = (empty, empty, empty, empty);
+    unsafe {
+        GetProcessTimes(
+            GetCurrentProcess(),
+            &mut creation,
+            &mut exit,
+            &mut kernel,
+            &mut user,
+        )
+    };
+    let secs = |time: FILETIME| {
+        ((u64::from(time.dwHighDateTime) << 32) | u64::from(time.dwLowDateTime)) as f64
+            / 10_000_000.0
+    };
+    secs(kernel) + secs(user)
+}
+
+async fn run(project_path: PathBuf, size: XY<u32>, fps: u32, runs: u32) -> anyhow::Result<()> {
+    let output_dir = std::env::temp_dir().join("cap-export-benchmark");
+    std::fs::create_dir_all(&output_dir)?;
+    for run in 0..runs {
+        let output_path = output_dir.join(format!("run-{run}.mp4"));
+        let _ = std::fs::remove_file(&output_path);
+        let cancel = Arc::new(AtomicBool::new(false));
+        let started = Instant::now();
+        let cpu_started = cpu_secs();
+        let base = ExporterBase::builder(project_path.clone())
+            .with_output_path(output_path.clone())
+            .build_for_mp4(cancel)
+            .await
+            .map_err(|error| anyhow::anyhow!("{error}"))?;
+        let total = base.total_frames(fps);
+        let prepared_ms = started.elapsed().as_secs_f64() * 1000.0;
+        let path = Mp4ExportSettings {
+            fps,
+            resolution_base: size,
+            compression: ExportCompression::Maximum,
+            custom_bpp: None,
+            force_ffmpeg_decoder: false,
+            optimize_filesize: false,
+        }
+        .export_prepared(base, |_| true)
+        .await
+        .map_err(|error| anyhow::anyhow!("{error}"))?;
+        let wall = started.elapsed().as_secs_f64();
+        let cpu = cpu_secs() - cpu_started;
+        let bytes = std::fs::metadata(&path).map(|meta| meta.len()).unwrap_or(0);
+        println!(
+            "{}",
+            serde_json::json!({
+                "run": run,
+                "frames": total,
+                "width": size.x,
+                "height": size.y,
+                "fps": fps,
+                "prepareMs": prepared_ms,
+                "wallSecs": wall,
+                "exportFps": f64::from(total) / wall,
+                "cpuSecs": cpu,
+                "bytes": bytes,
+            })
+        );
+    }
+    Ok(())
+}
+
+fn main() -> anyhow::Result<()> {
+    tracing_subscriber::fmt()
+        .with_env_filter(
+            tracing_subscriber::EnvFilter::try_from_default_env().unwrap_or_else(|_| "warn".into()),
+        )
+        .with_writer(std::io::stderr)
+        .init();
+
+    let mut arguments = std::env::args().skip(1);
+    let project_path = arguments
+        .next()
+        .map(PathBuf::from)
+        .ok_or_else(|| anyhow::anyhow!("Pass a studio .cap project path"))?;
+    let mut number = |default: u32| {
+        arguments
+            .next()
+            .and_then(|value| value.parse().ok())
+            .unwrap_or(default)
+    };
+    let size = XY::new(number(1920), number(1080));
+    let fps = number(60);
+    let runs = number(3).max(1);
+
+    tokio::runtime::Builder::new_multi_thread()
+        .worker_threads(2)
+        .thread_stack_size(16 * 1024 * 1024)
+        .enable_all()
+        .build()?
+        .block_on(run(project_path, size, fps, runs))
+}
diff --git a/crates/enc-ffmpeg/src/audio/aac.rs b/crates/enc-ffmpeg/src/audio/aac.rs
index 89ce84fcd3a..77a9aef7463 100644
--- a/crates/enc-ffmpeg/src/audio/aac.rs
+++ b/crates/enc-ffmpeg/src/audio/aac.rs
@@ -44,7 +44,41 @@ impl AACEncoder {
         input_config: AudioInfo,
         output: &mut format::context::Output,
     ) -> Result<Self, AACEncoderError> {
-        let codec = encoder::find_by_name("aac").ok_or(AACEncoderError::CodecNotFound)?;
+        Self::init_with_codec("aac", ffmpeg::Dictionary::new(), input_config, output)
+    }
+
+    // A plain MP4's edit list trims AudioToolbox's 2112-sample encoder priming.
+    // Fragmented recording outputs keep priming in the timeline, so they stay on
+    // FFmpeg's encoder: AudioToolbox would start their audio ~23 ms later.
+    pub fn init_for_export(
+        input_config: AudioInfo,
+        output: &mut format::context::Output,
+    ) -> Result<Self, AACEncoderError> {
+        #[cfg(target_os = "macos")]
+        {
+            // AudioToolbox defaults to constant bitrate, which fills silence up to
+            // the full 320 kbps; average bitrate keeps silent stretches near-free.
+            let mut options = ffmpeg::Dictionary::new();
+            options.set("aac_at_mode", "abr");
+            match Self::init_with_codec("aac_at", options, input_config, output) {
+                Ok(encoder) => return Ok(encoder),
+                Err(error) => {
+                    tracing::warn!(%error, "AudioToolbox AAC encoder unavailable, using FFmpeg's");
+                }
+            }
+        }
+
+        Self::init(input_config, output)
+    }
+
+    fn init_with_codec(
+        name: &str,
+        options: ffmpeg::Dictionary,
+        input_config: AudioInfo,
+        output: &mut format::context::Output,
+    ) -> Result<Self, AACEncoderError> {
+        let codec = encoder::find_by_name(name).ok_or(AACEncoderError::CodecNotFound)?;
+        let audio_codec = codec.audio()?;
         let mut encoder_ctx = context::Context::new_with_codec(codec);
         let thread_count = thread::available_parallelism()
             .map(|v| v.get())
@@ -53,27 +87,41 @@ impl AACEncoder {
         let mut encoder = encoder_ctx.encoder().audio()?;
 
         let rate = {
-            let mut rates = codec
-                .audio()
-                .unwrap()
+            let mut rates = audio_codec
                 .rates()
                 .into_iter()
                 .flatten()
                 .collect::<Vec<_>>();
             rates.sort();
 
-            let Some(&rate) = rates
-                .iter()
-                .find(|r| **r >= input_config.rate())
-                .or(rates.first())
-            else {
-                return Err(AACEncoderError::RateNotSupported(input_config.rate()));
-            };
-            rate
+            if rates.is_empty() {
+                input_config.rate()
+            } else {
+                let Some(&rate) = rates
+                    .iter()
+                    .find(|r| **r >= input_config.rate())
+                    .or(rates.first())
+                else {
+                    return Err(AACEncoderError::RateNotSupported(input_config.rate()));
+                };
+                rate
+            }
+        };
+
+        let sample_format = {
+            let formats = audio_codec
+                .formats()
+                .into_iter()
+                .flatten()
+                .collect::<Vec<_>>();
+            match formats.first() {
+                Some(&first) if !formats.contains(&Self::SAMPLE_FORMAT) => first,
+                _ => Self::SAMPLE_FORMAT,
+            }
         };
 
         let mut output_config = input_config;
-        output_config.sample_format = Self::SAMPLE_FORMAT;
+        output_config.sample_format = sample_format;
         output_config.sample_rate = rate as u32;
 
         let resampler = BufferedResampler::new(input_config, output_config)
@@ -85,7 +133,7 @@ impl AACEncoder {
         encoder.set_channel_layout(output_config.channel_layout());
         encoder.set_time_base(FFRational(1, output_config.rate()));
 
-        let encoder = encoder.open()?;
+        let encoder = encoder.open_with(options)?;
 
         let mut output_stream = output.add_stream(codec)?;
         output_stream.set_time_base(FFRational(1, output_config.rate()));
@@ -287,6 +335,233 @@ mod tests {
         assert_eq!(encode_audio(true), encode_audio_through_queue());
     }
 
+    const CLICK_AT: usize = 24_000;
+
+    fn click_frame(start: usize, samples: usize) -> frame::Audio {
+        let mut audio =
+            frame::Audio::new(Sample::F32(Type::Packed), samples, ChannelLayout::STEREO);
+        audio.set_rate(48_000);
+        audio.set_pts(Some(start as i64));
+        for (index, sample) in audio.data_mut(0)[..samples * 2 * size_of::<f32>()]
+            .chunks_exact_mut(2 * size_of::<f32>())
+            .enumerate()
+        {
+            let position = start + index;
+            let value = if (CLICK_AT..CLICK_AT + 48).contains(&position) {
+                0.9_f32
+            } else {
+                0.0
+            };
+            sample[..4].copy_from_slice(&value.to_le_bytes());
+            sample[4..].copy_from_slice(&value.to_le_bytes());
+        }
+        audio
+    }
+
+    fn encode_click_for_export(path: &std::path::Path) -> i32 {
+        let mut output = format::output(path).unwrap();
+        let mut encoder = AACEncoder::init_for_export(
+            AudioInfo::new_raw(Sample::F32(Type::Packed), 48_000, 2),
+            &mut output,
+        )
+        .unwrap();
+        let initial_padding = unsafe {
+            (*output
+                .stream(encoder.stream_index())
+                .unwrap()
+                .parameters()
+                .as_ptr())
+            .initial_padding
+        };
+        output.write_header().unwrap();
+
+        let mut position = 0;
+        while position < 48_000 {
+            let samples = 960.min(48_000 - position);
+            encoder
+                .send_frame(click_frame(position, samples), Duration::MAX, &mut output)
+                .unwrap();
+            position += samples;
+        }
+
+        encoder.flush(&mut output).unwrap();
+        output.write_trailer().unwrap();
+        initial_padding
+    }
+
+    fn decode_first_channel(path: &std::path::Path) -> (Vec<f32>, i64) {
+        use ffmpeg::Rescale;
+
+        let mut input = format::input(path).unwrap();
+        let stream = input.streams().best(ffmpeg::media::Type::Audio).unwrap();
+        let stream_index = stream.index();
+        let time_base = stream.time_base();
+        let mut decoder = context::Context::from_parameters(stream.parameters())
+            .unwrap()
+            .decoder()
+            .audio()
+            .unwrap();
+        let mut decoded = frame::Audio::empty();
+        let mut samples = Vec::new();
+        let mut track_end = i64::MIN;
+
+        for (stream, packet) in input.packets() {
+            if stream.index() != stream_index {
+                continue;
+            }
+            if let Some(pts) = packet.pts() {
+                track_end =
+                    track_end.max((pts + packet.duration()).rescale(time_base, (1, 48_000)));
+            }
+            decoder.send_packet(&packet).unwrap();
+            while decoder.receive_frame(&mut decoded).is_ok() {
+                samples.extend_from_slice(decoded.plane::<f32>(0));
+            }
+        }
+        decoder.send_eof().unwrap();
+        while decoder.receive_frame(&mut decoded).is_ok() {
+            samples.extend_from_slice(decoded.plane::<f32>(0));
+        }
+        (samples, track_end)
+    }
+
+    #[test]
+    fn export_encoder_keeps_audio_aligned_in_mp4() {
+        let directory = tempfile::tempdir().unwrap();
+        let path = directory.path().join("click.mp4");
+        encode_click_for_export(&path);
+
+        let (samples, track_end) = decode_first_channel(&path);
+        let click = samples
+            .iter()
+            .position(|sample| sample.abs() > 0.3)
+            .expect("the encoded click was not found");
+        assert!(
+            click.abs_diff(CLICK_AT) < 64,
+            "click decoded at sample {click}, encoded at {CLICK_AT}"
+        );
+        assert_eq!(track_end, 48_000);
+    }
+
+    #[test]
+    fn export_encoder_spends_almost_nothing_on_silence() {
+        let directory = tempfile::tempdir().unwrap();
+        let path = directory.path().join("silence.mp4");
+        let mut output = format::output(&path).unwrap();
+        let mut encoder = AACEncoder::init_for_export(
+            AudioInfo::new_raw(Sample::F32(Type::Packed), 48_000, 2),
+            &mut output,
+        )
+        .unwrap();
+        output.write_header().unwrap();
+        for start in (0..480_000).step_by(960) {
+            let mut audio =
+                frame::Audio::new(Sample::F32(Type::Packed), 960, ChannelLayout::STEREO);
+            audio.set_rate(48_000);
+            audio.set_pts(Some(start));
+            audio.data_mut(0)[..960 * 2 * size_of::<f32>()].fill(0);
+            encoder
+                .send_frame(audio, Duration::MAX, &mut output)
+                .unwrap();
+        }
+        encoder.flush(&mut output).unwrap();
+        output.write_trailer().unwrap();
+        drop(encoder);
+        drop(output);
+
+        let mut input = format::input(&path).unwrap();
+        let stream_index = input
+            .streams()
+            .best(ffmpeg::media::Type::Audio)
+            .unwrap()
+            .index();
+        let bytes = input
+            .packets()
+            .filter(|(stream, _)| stream.index() == stream_index)
+            .map(|(_, packet)| packet.size())
+            .sum::<usize>();
+        assert!(bytes < 40_000, "10 s of silence took {bytes} bytes");
+    }
+
+    #[cfg(target_os = "macos")]
+    #[test]
+    fn export_encoder_uses_audiotoolbox_on_macos() {
+        let directory = tempfile::tempdir().unwrap();
+        let initial_padding = encode_click_for_export(&directory.path().join("click.mp4"));
+        assert_eq!(initial_padding, 2112);
+    }
+
+    #[test]
+    #[ignore]
+    fn benchmark_export_aac_encoder() {
+        type Init =
+            fn(AudioInfo, &mut format::context::Output) -> Result<AACEncoder, AACEncoderError>;
+
+        fn voice_like_frame(start: usize, samples: usize, noise: &mut u32) -> frame::Audio {
+            let mut audio =
+                frame::Audio::new(Sample::F32(Type::Packed), samples, ChannelLayout::STEREO);
+            audio.set_rate(48_000);
+            audio.set_pts(Some(start as i64));
+            for (index, sample) in audio.data_mut(0)[..samples * 2 * size_of::<f32>()]
+                .chunks_exact_mut(size_of::<f32>())
+                .enumerate()
+            {
+                *noise ^= *noise << 13;
+                *noise ^= *noise >> 17;
+                *noise ^= *noise << 5;
+                let time = (start + index / 2) as f32 / 48_000.0;
+                let value = 0.3 * (std::f32::consts::TAU * 220.0 * time).sin()
+                    + 0.15 * (std::f32::consts::TAU * 1_330.0 * time).sin()
+                    + 0.1 * (*noise as f32 / u32::MAX as f32 - 0.5);
+                sample.copy_from_slice(&value.to_le_bytes());
+            }
+            audio
+        }
+
+        let seconds = std::env::var("CAP_AAC_BENCH_SECONDS")
+            .ok()
+            .and_then(|value| value.parse().ok())
+            .unwrap_or(60usize);
+        let samples = seconds * 48_000;
+        let directory = tempfile::tempdir().unwrap();
+        let encoders: [(&str, Init); 2] = [
+            ("init (FFmpeg aac)", AACEncoder::init),
+            ("init_for_export", AACEncoder::init_for_export),
+        ];
+        for round in 0..3 {
+            for (label, init) in encoders {
+                let path = directory.path().join(format!("{round}.mp4"));
+                let mut output = format::output(&path).unwrap();
+                let mut encoder = init(
+                    AudioInfo::new_raw(Sample::F32(Type::Packed), 48_000, 2),
+                    &mut output,
+                )
+                .unwrap();
+                output.write_header().unwrap();
+                let mut noise = 0x9e37_79b9_u32;
+                let frames = (0..samples)
+                    .step_by(960)
+                    .map(|position| {
+                        voice_like_frame(position, 960.min(samples - position), &mut noise)
+                    })
+                    .collect::<Vec<_>>();
+                let started = std::time::Instant::now();
+                for frame in frames {
+                    encoder
+                        .send_frame(frame, Duration::MAX, &mut output)
+                        .unwrap();
+                }
+                encoder.flush(&mut output).unwrap();
+                output.write_trailer().unwrap();
+                let wall = started.elapsed().as_secs_f64();
+                println!(
+                    "round {round} {label}: {seconds}s of 48 kHz stereo in {wall:.3}s ({:.0}x realtime)",
+                    seconds as f64 / wall
+                );
+            }
+        }
+    }
+
     #[test]
     fn checked_audio_submission_reports_a_closed_encoder() {
         let directory = tempfile::tempdir().unwrap();
diff --git a/crates/enc-ffmpeg/src/audio/base.rs b/crates/enc-ffmpeg/src/audio/base.rs
index cd5197a7c71..932649ccf42 100644
--- a/crates/enc-ffmpeg/src/audio/base.rs
+++ b/crates/enc-ffmpeg/src/audio/base.rs
@@ -1,12 +1,17 @@
 use super::buffered_resampler::BufferedResampler;
 use crate::base::{EncoderBase, PacketSink};
-use ffmpeg::{codec::encoder, frame};
+use ffmpeg::{
+    Packet, Rational, Rescale,
+    codec::{Capabilities, encoder},
+    frame,
+};
 use std::time::Duration;
 
 pub struct AudioEncoderBase {
     inner: EncoderBase,
     encoder: encoder::Audio,
     resampler: BufferedResampler,
+    input_end: Option<i64>,
 }
 
 impl AudioEncoderBase {
@@ -15,6 +20,7 @@ impl AudioEncoderBase {
             inner: EncoderBase::new(stream_index),
             encoder,
             resampler,
+            input_end: None,
         }
     }
 
@@ -33,6 +39,7 @@ impl AudioEncoderBase {
         self.resampler.add_frame(frame);
 
         while let Some(frame) = self.resampler.get_frame(self.encoder.frame_size() as usize) {
+            self.track_input_end(&frame);
             self.inner.send_frame(&frame, output, &mut self.encoder)?;
         }
 
@@ -40,10 +47,64 @@ impl AudioEncoderBase {
     }
 
     pub fn flush<S: PacketSink + ?Sized>(&mut self, output: &mut S) -> Result<(), ffmpeg::Error> {
+        let mut frames = Vec::new();
         while let Some(frame) = self.resampler.flush(self.encoder.frame_size() as usize) {
-            self.inner.send_frame(&frame, output, &mut self.encoder)?;
+            self.track_input_end(&frame);
+            frames.push(frame);
+        }
+
+        // Encoders that only take full frames (AudioToolbox) get the last one
+        // padded by libavcodec, and their packet durations count that padding,
+        // so the track would end up to a frame after the input did.
+        let pads_final_frame = self.encoder.codec().is_some_and(|codec| {
+            !codec
+                .capabilities()
+                .intersects(Capabilities::SMALL_LAST_FRAME | Capabilities::VARIABLE_FRAME_SIZE)
+        });
+        let mut output = EndTrimmedSink {
+            output,
+            end: self.input_end.filter(|_| pads_final_frame),
+            time_base: self.encoder.time_base(),
+        };
+        for frame in &frames {
+            self.inner
+                .send_frame(frame, &mut output, &mut self.encoder)?;
         }
+        self.inner.process_eof(&mut output, &mut self.encoder)
+    }
 
-        self.inner.process_eof(output, &mut self.encoder)
+    fn track_input_end(&mut self, frame: &frame::Audio) {
+        if let Some(pts) = frame.pts() {
+            let end = pts + frame.samples() as i64;
+            self.input_end = Some(self.input_end.map_or(end, |current| current.max(end)));
+        }
+    }
+}
+
+struct EndTrimmedSink<'a, S: PacketSink + ?Sized> {
+    output: &'a mut S,
+    end: Option<i64>,
+    time_base: Rational,
+}
+
+impl<S: PacketSink + ?Sized> PacketSink for EndTrimmedSink<'_, S> {
+    fn stream_time_base(&self, stream_index: usize) -> Rational {
+        self.output.stream_time_base(stream_index)
+    }
+
+    fn write_packet(&mut self, mut packet: Packet) -> Result<(), ffmpeg::Error> {
+        if let (Some(end), Some(pts)) = (self.end, packet.pts()) {
+            let end = end.rescale(
+                self.time_base,
+                self.output.stream_time_base(packet.stream()),
+            );
+            if pts >= end {
+                return Ok(());
+            }
+            if pts + packet.duration() > end {
+                packet.set_duration(end - pts);
+            }
+        }
+        self.output.write_packet(packet)
     }
 }
diff --git a/crates/export/src/mp4.rs b/crates/export/src/mp4.rs
index f120f6cff10..7d070bd0570 100644
--- a/crates/export/src/mp4.rs
+++ b/crates/export/src/mp4.rs
@@ -451,7 +451,7 @@ impl Mp4ExportSettings {
                     if !has_audio {
                         return None;
                     }
-                    match AACEncoder::init(AudioRenderer::info(), o) {
+                    match AACEncoder::init_for_export(AudioRenderer::info(), o) {
                         Ok(audio) => {
                             detached_audio = Some(audio);
                             None

From 941824baaedf5ea529fee0446167c7be43ad7f67 Mon Sep 17 00:00:00 2001
From: Marcos Daniel Rivera Gonzalez
 <139647784+LordOfGrillos@users.noreply.github.com>
Date: Thu, 15 Oct 2026 23:01:24 -0600
Subject: [PATCH 38/74] fix(video-decode): hold the Media Foundation sample
 until its surface is copied

read_decoder_surface released the IMFSample when it returned, before the caller queued the copy out of its texture slice. Media Foundation can decode the next frame into that slice as soon as the sample is released, so a frame sometimes came back with another frame's pixels. The surface now carries the sample, which is released only after the copy is queued; the shared immediate context then orders the copy before any later decode into the slice. pipelined_readback_returns_every_sample_in_order failed 3 of 15 runs before and 0 of 30 after.
---
 crates/video-decode/src/media_foundation.rs | 50 ++++++++++++---------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/crates/video-decode/src/media_foundation.rs b/crates/video-decode/src/media_foundation.rs
index f05e5dc844b..5b4de1c8067 100644
--- a/crates/video-decode/src/media_foundation.rs
+++ b/crates/video-decode/src/media_foundation.rs
@@ -144,6 +144,16 @@ pub struct MFDecodedFrame {
     pub plane_time: Duration,
 }
 
+// The decoder's output surface for a sample: a texture array, the sample's slice in it, and its
+// time. Media Foundation decodes into the slice again as soon as the sample is released, so the
+// sample is held until the copy out of it is queued.
+struct DecoderSurface {
+    _sample: IMFSample,
+    texture: ID3D11Texture2D,
+    subresource: u32,
+    pts: i64,
+}
+
 pub struct NV12Sample {
     pub pts: i64,
     pub data: NV12Data,
@@ -715,7 +725,7 @@ impl MediaFoundationDecoder {
             && let Some(staging) = self.readback_free.pop()
         {
             match unsafe { self.read_decoder_surface() } {
-                Ok(Some((texture, subresource, pts))) => {
+                Ok(Some(surface)) => {
                     unsafe {
                         self.d3d11_context.CopySubresourceRegion(
                             &staging,
@@ -723,12 +733,12 @@ impl MediaFoundationDecoder {
                             0,
                             0,
                             0,
-                            &texture,
-                            subresource,
+                            &surface.texture,
+                            surface.subresource,
                             None,
                         );
                     }
-                    self.readback_queue.push_back((pts, staging));
+                    self.readback_queue.push_back((surface.pts, staging));
                 }
                 end => {
                     self.readback_free.push(staging);
@@ -790,12 +800,7 @@ impl MediaFoundationDecoder {
         }
     }
 
-    // The decoder's output surface for the next sample: a texture array, the sample's slice in
-    // it, and its time. Media Foundation decodes into the surface again once the sample is
-    // released, so copy out of it before the next read.
-    unsafe fn read_decoder_surface(
-        &mut self,
-    ) -> Result<Option<(ID3D11Texture2D, u32, i64)>, String> {
+    unsafe fn read_decoder_surface(&mut self) -> Result<Option<DecoderSurface>, String> {
         let mut stream_index = 0u32;
         let mut flags = 0u32;
         let mut timestamp = 0i64;
@@ -857,13 +862,16 @@ impl MediaFoundationDecoder {
                 .map_err(|e| format!("GetSubresourceIndex failed: {e:?}"))?
         };
 
-        Ok(Some((texture, subresource_index, timestamp)))
+        Ok(Some(DecoderSurface {
+            _sample: sample,
+            texture,
+            subresource: subresource_index,
+            pts: timestamp,
+        }))
     }
 
     unsafe fn read_sample_inner(&mut self) -> Result<Option<MFDecodedFrame>, String> {
-        let Some((texture, subresource_index, timestamp)) =
-            (unsafe { self.read_decoder_surface()? })
-        else {
+        let Some(surface) = (unsafe { self.read_decoder_surface()? }) else {
             return Ok(None);
         };
 
@@ -880,8 +888,8 @@ impl MediaFoundationDecoder {
                 0,
                 0,
                 0,
-                &texture,
-                subresource_index,
+                &surface.texture,
+                surface.subresource,
                 None,
             );
 
@@ -901,7 +909,7 @@ impl MediaFoundationDecoder {
             textures: Arc::new(frame_textures),
             width: self.width,
             height: self.height,
-            pts: timestamp,
+            pts: surface.pts,
             plane_time,
         }))
     }
@@ -1199,18 +1207,18 @@ mod tests {
         let staging = decoder.readback_free[0].clone();
         let expected_end = loop {
             match unsafe { decoder.read_decoder_surface() } {
-                Ok(Some((texture, subresource, pts))) => unsafe {
+                Ok(Some(surface)) => unsafe {
                     decoder.d3d11_context.CopySubresourceRegion(
                         &staging,
                         0,
                         0,
                         0,
                         0,
-                        &texture,
-                        subresource,
+                        &surface.texture,
+                        surface.subresource,
                         None,
                     );
-                    expected.push((pts, decoder.map_staging(&staging).unwrap().data));
+                    expected.push((surface.pts, decoder.map_staging(&staging).unwrap().data));
                 },
                 end => break end.is_err(),
             }

From 04d9156c3c433be3be0b726985dfe497acd0569f Mon Sep 17 00:00:00 2001
From: zingzy <admin@spoo.me>
Date: Sat, 17 Oct 2026 07:09:20 +0530
Subject: [PATCH 39/74] fix(desktop-gpui): keep the timeline position when a
 new clip reloads the editor

Recording or importing a clip into an open project appends it and then
rebuilds the editor window, which fitted the timeline from 0:00 again. The
reload now carries the old window's position and zoom into the new one,
applied where the first render would otherwise fit the timeline. A view that
was never fitted is ignored, since restoring a zero zoom would zoom all the
way in.
---
 apps/desktop-gpui/src/app_windows.rs     | 16 +++++++++++++++-
 apps/desktop-gpui/src/editor_timeline.rs | 23 +++++++++++++++++++++++
 apps/desktop-gpui/src/editor_window.rs   | 24 +++++++++++++++++++++---
 3 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/apps/desktop-gpui/src/app_windows.rs b/apps/desktop-gpui/src/app_windows.rs
index ae2ecce7976..e82738f1531 100644
--- a/apps/desktop-gpui/src/app_windows.rs
+++ b/apps/desktop-gpui/src/app_windows.rs
@@ -6106,6 +6106,11 @@ pub fn reload_editor(project_path: &Path, cx: &mut App) {
         let index = editors.iter().position(|(path, _)| path == &key);
         index.map(|index| editors.remove(index).1)
     };
+    let transform = handle.and_then(|handle| {
+        handle
+            .update(cx, |view, _window, _cx| view.timeline_transform())
+            .ok()
+    });
 
     if let Some(handle) = handle {
         if let Ok(pending) = handle.update(cx, |view, _window, _cx| view.pending_save()) {
@@ -6124,7 +6129,16 @@ pub fn reload_editor(project_path: &Path, cx: &mut App) {
     }
 
     tracing::info!(path = %key.display(), "reloading editor after import");
-    open_editor(key, cx);
+    open_editor(key.clone(), cx);
+    if let Some(transform) = transform
+        && let Some(handle) = editor_window_handle(&key, cx)
+    {
+        handle
+            .update(cx, |view, _window, _cx| {
+                view.restore_timeline_transform(transform)
+            })
+            .ok();
+    }
 }
 
 /// `editor_window_for_path` (`src-tauri/src/windows.rs:3699-3706`): the live
diff --git a/apps/desktop-gpui/src/editor_timeline.rs b/apps/desktop-gpui/src/editor_timeline.rs
index 78757d14ded..9cd6a884a83 100644
--- a/apps/desktop-gpui/src/editor_timeline.rs
+++ b/apps/desktop-gpui/src/editor_timeline.rs
@@ -283,6 +283,16 @@ impl Transform {
         }
     }
 
+    pub fn restored(saved: Transform, total_duration: f64) -> Option<Self> {
+        if saved.zoom <= 0. {
+            return None;
+        }
+        let mut transform = Self::initial(total_duration);
+        transform.update_zoom(saved.zoom, 0., total_duration);
+        transform.set_position(saved.position, total_duration);
+        Some(transform)
+    }
+
     /// `secsPerPixel = transform.zoom / timelineBounds.width`
     /// (`TL/index.tsx:189`, `TL/context.ts:91-92`).
     /// Floored at the smallest positive double so a transform with no project
@@ -3634,6 +3644,19 @@ mod tests {
         assert_eq!(Transform::initial(3_600.0).zoom, 600.0);
     }
 
+    #[test]
+    fn restored_transform_keeps_the_saved_view_and_clamps_to_the_timeline() {
+        let saved = Transform {
+            zoom: 17.05,
+            position: 12.5,
+        };
+        assert_eq!(Transform::restored(saved, 61.0), Some(saved));
+        let shorter = Transform::restored(saved, 10.0).unwrap();
+        assert_eq!(shorter.zoom, 10.0);
+        assert_eq!(shorter.position, 4.0);
+        assert_eq!(Transform::restored(Transform::default(), 61.0), None);
+    }
+
     #[test]
     fn zoom_clamps_to_max_zoom_in_and_the_zoom_out_limit() {
         let total = 60.0;
diff --git a/apps/desktop-gpui/src/editor_window.rs b/apps/desktop-gpui/src/editor_window.rs
index 63c57330865..d882ea45082 100644
--- a/apps/desktop-gpui/src/editor_window.rs
+++ b/apps/desktop-gpui/src/editor_window.rs
@@ -1426,6 +1426,7 @@ pub struct EditorWindow {
     /// width (`TL/index.tsx:689-703`). There is no mount hook here, so the
     /// first render that knows both the width and the duration does it.
     fitted: bool,
+    restore_transform: Option<Transform>,
     /// The transport's zoom slider track rect, written by the slider's own
     /// prepaint canvas and read by the pointer maths.
     zoom_slider_track: ui::SliderTrack,
@@ -2081,6 +2082,7 @@ impl EditorWindow {
             view: TimelineView::default(),
             playback_follow: timeline::PlaybackFollow::default(),
             fitted: false,
+            restore_transform: None,
             zoom_slider_track: ui::SliderTrack::default(),
             zoom_slider_drag: false,
             project: ProjectConfiguration::default(),
@@ -2902,6 +2904,14 @@ impl EditorWindow {
         self.instance.take()
     }
 
+    pub fn timeline_transform(&self) -> Transform {
+        self.view.transform
+    }
+
+    pub fn restore_timeline_transform(&mut self, transform: Transform) {
+        self.restore_transform = Some(transform);
+    }
+
     /// Hand the window its transport, the pump's counters, and the duration
     /// the engine will actually stop at.
     pub fn set_transport(
@@ -11181,9 +11191,17 @@ impl Render for EditorWindow {
         if !self.fitted && self.total_duration() > 0.0 {
             self.fitted = true;
             let total = self.total_duration();
-            self.view
-                .transform
-                .fit_on_mount(timeline::content_width(viewport_width), total);
+            match self
+                .restore_transform
+                .take()
+                .and_then(|saved| Transform::restored(saved, total))
+            {
+                Some(transform) => self.view.transform = transform,
+                None => self
+                    .view
+                    .transform
+                    .fit_on_mount(timeline::content_width(viewport_width), total),
+            }
         }
 
         if self.export.is_some() {

From 5aa476a8fb914deff0d4ddabe5d9d3d16abd56f3 Mon Sep 17 00:00:00 2001
From: Richie McIlroy <33632126+richiemcilroy@users.noreply.github.com>
Date: Mon, 19 Oct 2026 02:43:35 +0900
Subject: [PATCH 40/74] test(rendering): use the indexed cluster lookup in the
 idle-cursor auto zoom test

---
 crates/rendering/src/zoom_spring.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/rendering/src/zoom_spring.rs b/crates/rendering/src/zoom_spring.rs
index 57a93c2e815..897014084dc 100644
--- a/crates/rendering/src/zoom_spring.rs
+++ b/crates/rendering/src/zoom_spring.rs
@@ -1871,7 +1871,7 @@ mod tests {
         };
         for ordered in [false, true] {
             let clusters = build_clusters(&cursor, ordered, 2.0, 10.0, 2.0, None);
-            assert_eq!(cluster_center_at_time(&clusters, 2000.0), Some((0.1, 0.1)));
+            assert_eq!(ClusterCenters::new(clusters).center_at(2000.0), Some((0.1, 0.1)));
         }
     }
 

From 0812b9714156b875d68255382697c9b5a7026e33 Mon Sep 17 00:00:00 2001
From: Akshar Patel <aksharcommit@gmail.com>
Date: Sun, 18 Oct 2026 21:13:43 -0400
Subject: [PATCH 41/74] perf(desktop-gpui): avoid decoding offscreen clip
 thumbnails

---
 apps/desktop-gpui/src/editor_clips.rs | 95 ++++++++++++---------------
 1 file changed, 41 insertions(+), 54 deletions(-)

diff --git a/apps/desktop-gpui/src/editor_clips.rs b/apps/desktop-gpui/src/editor_clips.rs
index a69618ab8ef..422e8b98e29 100644
--- a/apps/desktop-gpui/src/editor_clips.rs
+++ b/apps/desktop-gpui/src/editor_clips.rs
@@ -696,58 +696,38 @@ impl EditorWindow {
 
     // -- Thumbnails ------------------------------------------------------------
 
-    /// Queue background decodes for every card without a picture, at most
-    /// [`MAX_THUMBNAIL_LOADS`] in flight -- each completion notifies, which
-    /// re-runs this and pulls the next one off the "queue".
-    fn request_clip_thumbnails(&mut self, cx: &mut Context<Self>) {
-        let wanted: Vec<(ThumbKey, f64)> = self
-            .clip_segments()
-            .iter()
-            .map(|segment| {
-                (
-                    (
-                        segment.recording_clip,
-                        (segment.start * 1000.0).round() as i64,
-                    ),
-                    segment.start,
-                )
-            })
-            .collect();
-        for (key, start) in wanted {
-            if self.clips.thumbs_inflight >= MAX_THUMBNAIL_LOADS {
-                break;
-            }
-            if self.clips.thumbs.contains_key(&key) {
-                continue;
-            }
-            self.clips.thumbs.insert(key, ClipThumb::Loading);
-            self.clips.thumbs_inflight += 1;
-            let project_path = self.project_path.clone();
-            cx.spawn(async move |this, cx| {
-                let decoded = cx
-                    .background_executor()
-                    .spawn(async move { decode_clip_thumbnail(&project_path, key.0, start) })
-                    .await;
-                this.update(cx, |this, cx| {
-                    this.clips.thumbs_inflight = this.clips.thumbs_inflight.saturating_sub(1);
-                    let entry = match decoded {
-                        Ok(image) => ClipThumb::Ready(image),
-                        Err(error) => {
-                            tracing::warn!(
-                                segment = key.0,
-                                start_ms = key.1,
-                                "clip thumbnail decode failed: {error}"
-                            );
-                            ClipThumb::Failed
-                        }
-                    };
-                    this.clips.thumbs.insert(key, entry);
-                    cx.notify();
-                })
-                .ok();
-            })
-            .detach();
+    fn request_clip_thumbnail(&mut self, key: ThumbKey, start: f64, cx: &mut Context<Self>) {
+        if self.clips.thumbs_inflight >= MAX_THUMBNAIL_LOADS || self.clips.thumbs.contains_key(&key)
+        {
+            return;
         }
+        self.clips.thumbs.insert(key, ClipThumb::Loading);
+        self.clips.thumbs_inflight += 1;
+        let project_path = self.project_path.clone();
+        cx.spawn(async move |this, cx| {
+            let decoded = cx
+                .background_executor()
+                .spawn(async move { decode_clip_thumbnail(&project_path, key.0, start) })
+                .await;
+            this.update(cx, |this, cx| {
+                this.clips.thumbs_inflight = this.clips.thumbs_inflight.saturating_sub(1);
+                let entry = match decoded {
+                    Ok(image) => ClipThumb::Ready(image),
+                    Err(error) => {
+                        tracing::warn!(
+                            segment = key.0,
+                            start_ms = key.1,
+                            "clip thumbnail decode failed: {error}"
+                        );
+                        ClipThumb::Failed
+                    }
+                };
+                this.clips.thumbs.insert(key, entry);
+                cx.notify();
+            })
+            .ok();
+        })
+        .detach();
     }
 
     // -- The sidebar ------------------------------------------------------------
@@ -756,8 +736,6 @@ impl EditorWindow {
     /// mode is open. Same `ml-2 w-104` wrapper the config sidebar carries, and
     /// the same card.
     pub(crate) fn render_clips_sidebar(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
-        self.request_clip_thumbnails(cx);
-
         div()
             .w(px(crate::editor_window::SIDEBAR_WIDTH))
             .flex_none()
@@ -1022,12 +1000,21 @@ impl EditorWindow {
         let group: SharedString = SharedString::from(format!("clip-card-{index}"));
         let probe = {
             let cell = self.clips.card_bounds.clone();
+            let editor = cx.weak_entity();
+            let start = segment.start;
             gpui::canvas(
-                move |bounds, _window, _cx| {
+                move |bounds, window, cx| {
                     let mut slots = cell.borrow_mut();
                     if index < slots.len() {
                         slots[index] = Some(bounds);
                     }
+                    if bounds.intersects(&window.content_mask().bounds) {
+                        editor
+                            .update(cx, |editor, cx| {
+                                editor.request_clip_thumbnail(thumb_key, start, cx);
+                            })
+                            .ok();
+                    }
                 },
                 |_, _, _, _| {},
             )

From 3bc89760340e842e735dea17a6ef7aa06655b10d Mon Sep 17 00:00:00 2001
From: Vagarth <vagarth419@gmail.com>
Date: Mon, 19 Oct 2026 18:10:05 +0530
Subject: [PATCH 42/74] chore(export-benchmark): write runs to a per-process
 temp dir, drop narrating comment

---
 apps/desktop-gpui/Cargo.lock                   |  1 +
 apps/desktop-gpui/Cargo.toml                   |  1 +
 apps/desktop-gpui/examples/export-benchmark.rs | 10 ++--------
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/apps/desktop-gpui/Cargo.lock b/apps/desktop-gpui/Cargo.lock
index 4d2ac0436be..8a41257d6ec 100644
--- a/apps/desktop-gpui/Cargo.lock
+++ b/apps/desktop-gpui/Cargo.lock
@@ -1584,6 +1584,7 @@ dependencies = [
  "sha2",
  "smallvec",
  "tauri-winres",
+ "tempfile",
  "tiny-skia",
  "tokio",
  "tracing",
diff --git a/apps/desktop-gpui/Cargo.toml b/apps/desktop-gpui/Cargo.toml
index c803d72db27..f3a193603a3 100644
--- a/apps/desktop-gpui/Cargo.toml
+++ b/apps/desktop-gpui/Cargo.toml
@@ -170,6 +170,7 @@ tauri-winres = "0.3.5"
 # runtime would deadlock the moment the test thread blocks on a frame. Kept in
 # dev-dependencies so the shipped binary's tokio features are unchanged.
 tokio = { version = "1", features = ["rt-multi-thread", "time", "test-util"] }
+tempfile = "3"
 
 [target.'cfg(unix)'.dependencies]
 libc = "0.2"
diff --git a/apps/desktop-gpui/examples/export-benchmark.rs b/apps/desktop-gpui/examples/export-benchmark.rs
index 4c10debc300..58b842ff2a5 100644
--- a/apps/desktop-gpui/examples/export-benchmark.rs
+++ b/apps/desktop-gpui/examples/export-benchmark.rs
@@ -1,7 +1,3 @@
-//! Exports a project to MP4 the way the GPUI export page does (`run_export` in
-//! `src/editor_export.rs`) and reports wall time, frames per second and process
-//! CPU time.
-//!
 //! Run: cargo run --release --example export-benchmark -- <project.cap> [WIDTH] [HEIGHT] [FPS] [RUNS]
 
 use std::{
@@ -54,11 +50,9 @@ fn cpu_secs() -> f64 {
 }
 
 async fn run(project_path: PathBuf, size: XY<u32>, fps: u32, runs: u32) -> anyhow::Result<()> {
-    let output_dir = std::env::temp_dir().join("cap-export-benchmark");
-    std::fs::create_dir_all(&output_dir)?;
+    let output_dir = tempfile::tempdir()?;
     for run in 0..runs {
-        let output_path = output_dir.join(format!("run-{run}.mp4"));
-        let _ = std::fs::remove_file(&output_path);
+        let output_path = output_dir.path().join(format!("run-{run}.mp4"));
         let cancel = Arc::new(AtomicBool::new(false));
         let started = Instant::now();
         let cpu_started = cpu_secs();

From 80f0d9a25d0845f04eed1805274701e1c9d4a81c Mon Sep 17 00:00:00 2001
From: Richie McIlroy <33632126+richiemcilroy@users.noreply.github.com>
Date: Tue, 20 Oct 2026 01:38:41 +0800
Subject: [PATCH 43/74] fix(gpui): follow the macOS Reduce Motion setting

---
 apps/desktop-gpui/Cargo.lock      |  1 +
 apps/desktop-gpui/Cargo.toml      |  5 ++--
 apps/desktop-gpui/src/main.rs     |  1 +
 apps/desktop-gpui/src/platform.rs | 45 +++++++++++++++++++++++++++++++
 4 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/apps/desktop-gpui/Cargo.lock b/apps/desktop-gpui/Cargo.lock
index e189df4ea3d..b7e12867d54 100644
--- a/apps/desktop-gpui/Cargo.lock
+++ b/apps/desktop-gpui/Cargo.lock
@@ -1532,6 +1532,7 @@ dependencies = [
  "anyhow",
  "ashpd 0.11.1",
  "base64 0.22.1",
+ "block2 0.5.1",
  "bytes",
  "cap-audio",
  "cap-camera",
diff --git a/apps/desktop-gpui/Cargo.toml b/apps/desktop-gpui/Cargo.toml
index dc01411ceb0..8f9008b9841 100644
--- a/apps/desktop-gpui/Cargo.toml
+++ b/apps/desktop-gpui/Cargo.toml
@@ -210,10 +210,11 @@ x11rb = "0.13"
 objc2 = "0.5.2"
 # `NSVisualEffectView` is the pre-macOS-26 window-material fallback. Features
 # only -- the versions stay pinned, or a second objc2 universe gets built.
-objc2-app-kit = { version = "0.2.2", features = ["NSAppearance", "NSWindow", "NSView", "NSResponder", "NSGraphics", "NSPasteboard", "NSVisualEffectView"] }
+objc2-app-kit = { version = "0.2.2", features = ["NSAppearance", "NSWindow", "NSView", "NSResponder", "NSGraphics", "NSPasteboard", "NSVisualEffectView", "NSWorkspace", "NSAccessibility"] }
 # NSRect/NSPoint/NSSize for `setFrame:display:`. Already in the tree as
 # objc2-app-kit's own dependency, so this adds nothing to the build.
-objc2-foundation = "0.2.2"
+objc2-foundation = { version = "0.2.2", features = ["NSNotification", "NSOperation", "NSString", "block2"] }
+block2 = "0.5.1"
 raw-window-handle = "0.6"
 core-foundation = "0.10"
 core-video = { version = "0.5.2", features = ["metal"] }
diff --git a/apps/desktop-gpui/src/main.rs b/apps/desktop-gpui/src/main.rs
index 066acdd740a..0d2ba82f256 100644
--- a/apps/desktop-gpui/src/main.rs
+++ b/apps/desktop-gpui/src/main.rs
@@ -316,6 +316,7 @@ fn main() {
         // the path runs (`gpui/src/window.rs:5280-5296`).
         ui::bind_text_input_keys(cx);
         crate::theme::init(cx);
+        platform::follow_system_reduce_motion(cx);
 
         let session = RecordingSession::init(cx);
         crate::sign_in::SignIn::init(cx);
diff --git a/apps/desktop-gpui/src/platform.rs b/apps/desktop-gpui/src/platform.rs
index 8bf5a7ee58e..6189355ea70 100644
--- a/apps/desktop-gpui/src/platform.rs
+++ b/apps/desktop-gpui/src/platform.rs
@@ -587,6 +587,15 @@ pub struct PanelBehavior {
 #[cfg(target_os = "macos")]
 pub use mac::*;
 
+/// GPUI keeps its own Reduce Motion flag and never reads the OS setting, so
+/// every animation ignored it until this fed it in.
+pub fn follow_system_reduce_motion(cx: &mut gpui::App) {
+    #[cfg(target_os = "macos")]
+    mac::follow_system_reduce_motion(cx);
+    #[cfg(not(target_os = "macos"))]
+    let _ = cx;
+}
+
 #[cfg(target_os = "macos")]
 mod macos_exception_guard;
 
@@ -595,6 +604,42 @@ mod macos_occlusion;
 
 #[cfg(target_os = "macos")]
 mod mac {
+    pub fn follow_system_reduce_motion(cx: &mut gpui::App) {
+        use objc2_app_kit::{
+            NSWorkspace, NSWorkspaceAccessibilityDisplayOptionsDidChangeNotification,
+        };
+        use objc2_foundation::{NSNotification, NSOperationQueue};
+
+        let reduce_motion = || {
+            let reduce =
+                unsafe { NSWorkspace::sharedWorkspace().accessibilityDisplayShouldReduceMotion() };
+            tracing::debug!(reduce, "system reduce motion");
+            reduce
+        };
+        cx.set_reduce_motion(reduce_motion());
+
+        let (changed, changes) = flume::unbounded::<()>();
+        let block = block2::RcBlock::new(move |_: std::ptr::NonNull<NSNotification>| {
+            let _ = changed.send(());
+        });
+        unsafe {
+            let center = NSWorkspace::sharedWorkspace().notificationCenter();
+            let observer = center.addObserverForName_object_queue_usingBlock(
+                Some(NSWorkspaceAccessibilityDisplayOptionsDidChangeNotification),
+                None,
+                Some(&NSOperationQueue::mainQueue()),
+                &block,
+            );
+            std::mem::forget(observer);
+        }
+        cx.spawn(async move |cx| {
+            while changes.recv_async().await.is_ok() {
+                cx.update(|cx| cx.set_reduce_motion(reduce_motion()));
+            }
+        })
+        .detach();
+    }
+
     use gpui::Window;
     use objc2::rc::Id;
     use objc2::runtime::{AnyObject, Sel};

From 148798120eb6f7bfc146f829ae5a10f1657f042b Mon Sep 17 00:00:00 2001
From: Richie McIlroy <33632126+richiemcilroy@users.noreply.github.com>
Date: Tue, 20 Oct 2026 01:47:00 +0800
Subject: [PATCH 44/74] style: cargo fmt

---
 crates/rendering/src/zoom_spring.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/crates/rendering/src/zoom_spring.rs b/crates/rendering/src/zoom_spring.rs
index a95740009be..a8ddaab2ca0 100644
--- a/crates/rendering/src/zoom_spring.rs
+++ b/crates/rendering/src/zoom_spring.rs
@@ -1873,7 +1873,10 @@ mod tests {
         };
         for ordered in [false, true] {
             let clusters = build_clusters(&cursor, ordered, 2.0, 10.0, 2.0, None);
-            assert_eq!(ClusterCenters::new(clusters).center_at(2000.0), Some((0.1, 0.1)));
+            assert_eq!(
+                ClusterCenters::new(clusters).center_at(2000.0),
+                Some((0.1, 0.1))
+            );
         }
     }
 

From b7742b9db7101cf6aa70a0865cfbd0aa76dcd1d4 Mon Sep 17 00:00:00 2001
From: Richie McIlroy <33632126+richiemcilroy@users.noreply.github.com>
Date: Tue, 20 Oct 2026 02:02:47 +0800
Subject: [PATCH 45/74] test(gpui): pin the clock in the same-second
 diagnostics report test

---
 apps/desktop-gpui/src/diagnostics.rs | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/apps/desktop-gpui/src/diagnostics.rs b/apps/desktop-gpui/src/diagnostics.rs
index 3e8eb5f775c..af250bff901 100644
--- a/apps/desktop-gpui/src/diagnostics.rs
+++ b/apps/desktop-gpui/src/diagnostics.rs
@@ -816,12 +816,16 @@ pub fn write_report(report: &Value) -> Result<PathBuf, String> {
 /// [`write_report`] with the directory lifted into a parameter, so the naming
 /// and pruning are testable without writing into the real store.
 fn write_report_into(dir: &Path, report: &Value) -> Result<PathBuf, String> {
-    std::fs::create_dir_all(dir)
-        .map_err(|error| format!("Failed to create the diagnostics folder: {error}"))?;
     let stamp = SystemTime::now()
         .duration_since(UNIX_EPOCH)
         .map(|since| since.as_secs())
         .unwrap_or(0);
+    write_report_at(dir, report, stamp)
+}
+
+fn write_report_at(dir: &Path, report: &Value, stamp: u64) -> Result<PathBuf, String> {
+    std::fs::create_dir_all(dir)
+        .map_err(|error| format!("Failed to create the diagnostics folder: {error}"))?;
     // A run with no sidecar finishes in well under a second, so two of them
     // would otherwise write the same name and the second would overwrite the
     // first. The prefix and suffix stay exactly as the pruning filter expects.
@@ -1194,8 +1198,9 @@ mod tests {
     #[test]
     fn reports_in_the_same_second_do_not_collide() {
         let dir = temp_dir("collide");
-        let first = write_report_into(&dir, &json!({ "first": true })).unwrap();
-        let second = write_report_into(&dir, &json!({ "second": true })).unwrap();
+        let at = 1_792_431_796;
+        let first = write_report_at(&dir, &json!({ "first": true }), at).unwrap();
+        let second = write_report_at(&dir, &json!({ "second": true }), at).unwrap();
 
         assert_ne!(first, second);
         assert!(first.exists() && second.exists());
@@ -1206,8 +1211,8 @@ mod tests {
         // Both parse back to the same second, so pruning still orders by time
         // first and falls back to the name.
         let stamp = |path: &Path| report_file_stamp(path.file_name().unwrap().to_str().unwrap());
-        assert_eq!(stamp(&first), stamp(&second));
-        assert!(stamp(&first).is_some_and(|secs| secs > 0));
+        assert_eq!(stamp(&first), Some(at));
+        assert_eq!(stamp(&second), Some(at));
 
         std::fs::remove_dir_all(&dir).ok();
     }

From a884fb64dc6da8be9b5e2428e916c6fa7cc39318 Mon Sep 17 00:00:00 2001
From: Richie McIlroy <33632126+richiemcilroy@users.noreply.github.com>
Date: Tue, 20 Oct 2026 02:42:40 +0800
Subject: [PATCH 46/74] chore: drop the benchmark notes and parity scripts

---
 .../docs/video-only-export-performance.md     |  97 --------------
 scripts/check-video-only-export-parity.py     | 106 ----------------
 scripts/prepare-video-only-export-fixture.py  | 119 ------------------
 scripts/test-video-only-export-parity.py      |  92 --------------
 4 files changed, 414 deletions(-)
 delete mode 100644 apps/desktop-gpui/docs/video-only-export-performance.md
 delete mode 100644 scripts/check-video-only-export-parity.py
 delete mode 100644 scripts/prepare-video-only-export-fixture.py
 delete mode 100644 scripts/test-video-only-export-parity.py

diff --git a/apps/desktop-gpui/docs/video-only-export-performance.md b/apps/desktop-gpui/docs/video-only-export-performance.md
deleted file mode 100644
index 6f4ac85bfea..00000000000
--- a/apps/desktop-gpui/docs/video-only-export-performance.md
+++ /dev/null
@@ -1,97 +0,0 @@
-# Video-only export preparation
-
-GIF and cursor-only MOV export no audio. Their GPUI preparation previously
-waited for every recording mic/system track to decode into retained PCM.
-`build_video_only()` uses the existing segment loader without audio. Generic
-`build()` and MP4 preparation keep their existing behavior. Recording metadata
-still probes audio files; this change removes full PCM decoding and retention,
-not all audio I/O.
-
-## Measurements
-
-Baseline source: `68d6c31b44db6b3c68d8da7510b159c538c06d49`.
-Measured on Apple M5 Pro, macOS 26.6.2 (25G83), Rust 1.97.1.
-Three paired repetitions per format/input, alternating pair order, separate
-processes, same release binary with baseline and video-only modes. The binary
-used the GPUI release profile: optimization level 3, thin LTO, one codegen unit.
-It called actual `ExporterBuilder` and GIF/ProRes encoders. The timer includes
-builder setup through encoder finish, excluding configuration JSON loading,
-fixture generation, validation, and GPUI dialogs/UI.
-
-Synthetic inputs: 30-second control and 1800-second stress recordings, each
-with two stereo AAC tracks at 48 kHz and a four-second trimmed timeline.
-Output is 640x360 at 15 fps, 60 decoded frames. Cursor fixtures reuse checked-in
-CLI assets with normalized movement, a shape change, and one click.
-
-| Source | Format | Median total, baseline to candidate | Median peak RSS, baseline to candidate |
-|---|---|---|---|
-| 30 s | GIF | 0.209761 to 0.197071 s | 138.98 to 122.94 MiB |
-| 30 s | Cursor MOV | 0.460177 to 0.450832 s | 88.77 to 66.45 MiB |
-| 1800 s | GIF | 0.871047 to 0.209086 s | 1458.03 to 123.23 MiB |
-| 1800 s | Cursor MOV | 1.120212 to 0.479418 s | 1397.25 to 69.45 MiB |
-
-All 12 baseline/candidate pairs passed decoded RGBA checksums, frame count,
-PTS/order/duration and stream metadata parity, with no audio stream. All six
-MOV pairs additionally passed decoded alpha parity and visible moving alpha.
-Results establish the benefit for these trimmed synthetic inputs; they do not
-predict export speedups for every recording. Short controls show modest gains.
-
-## Reproduce
-
-Requires the project's native FFmpeg setup, `ffmpeg`, `ffprobe`, and Python 3.
-Use the GPUI lockfile and workspace to retain its dependency pins. Build once,
-then time separate binary processes; exclude Cargo/build time from results.
-
-```sh
-python3 scripts/prepare-video-only-export-fixture.py /tmp/video-only-1800.cap --source-seconds 1800 --export-seconds 4 --with-cursor
-cargo +stable run --manifest-path apps/desktop-gpui/Cargo.toml --example video-only-preparation --release -- --project /tmp/video-only-1800.cap --output /tmp/video-only-baseline.gif --mode baseline --format gif
-cargo +stable run --manifest-path apps/desktop-gpui/Cargo.toml --example video-only-preparation --release -- --project /tmp/video-only-1800.cap --output /tmp/video-only-candidate.gif --mode video-only --format gif
-python3 scripts/check-video-only-export-parity.py /tmp/video-only-baseline.gif /tmp/video-only-candidate.gif
-```
-
-For MOV use `--format cursor-mov`, `.mov` output paths, and parity flags
-`--alpha --require-visible-alpha`. Repeat with `--source-seconds 30` for the
-control. Use unique output paths because the example refuses existing files.
-Capture JSON stdout and `/usr/bin/time -l` stderr for peak RSS on macOS.
-`--build-only` isolates preparation but is not a complete-export benchmark.
-The first progress timestamp measures a callback, not an encoded packet.
-
-Corrupt unused audio can now produce a video-only export after a metadata
-warning instead of failing the complete PCM/EOF wait. Display-video errors
-still fail preparation. Native GPUI UI timing and cancellation are outside
-these measurements. Separate source-loading checks passed: no-audio succeeds
-in both modes; invalid mic fails baseline and passes video-only; invalid
-display fails both modes.
-
-<details>
-<summary>Raw samples</summary>
-
-```csv
-source_seconds,format,repetition,mode,build_secs,total_secs,peak_rss_mib
-30,Gif,0,Baseline,0.056724625,0.360145084,156.609375
-30,Gif,0,VideoOnly,0.012039167,0.189455042,122.937500
-30,Gif,1,VideoOnly,0.012658167,0.199531333,122.906250
-30,Gif,1,Baseline,0.022580584,0.205054375,138.984375
-30,Gif,2,Baseline,0.020476042,0.209760750,133.125000
-30,Gif,2,VideoOnly,0.009499250,0.197070667,137.000000
-30,CursorMov,0,Baseline,0.021880417,0.460177125,88.765625
-30,CursorMov,0,VideoOnly,0.011225542,0.450831625,66.375000
-30,CursorMov,1,VideoOnly,0.012083208,0.459454000,66.593750
-30,CursorMov,1,Baseline,0.021884542,0.456129417,88.562500
-30,CursorMov,2,Baseline,0.024268625,0.472918166,88.968750
-30,CursorMov,2,VideoOnly,0.009287208,0.446681750,66.453125
-1800,Gif,0,Baseline,0.657632584,0.846303542,1459.031250
-1800,Gif,0,VideoOnly,0.012863292,0.209086459,123.468750
-1800,Gif,1,VideoOnly,0.012166709,0.196155334,117.234375
-1800,Gif,1,Baseline,0.664888292,0.871047209,1458.031250
-1800,Gif,2,Baseline,0.685738792,0.914366584,1450.703125
-1800,Gif,2,VideoOnly,0.013697875,0.216982000,123.234375
-1800,CursorMov,0,Baseline,0.668535250,1.155541958,1397.250000
-1800,CursorMov,0,VideoOnly,0.015395500,0.499813208,69.453125
-1800,CursorMov,1,VideoOnly,0.015545292,0.475296500,68.562500
-1800,CursorMov,1,Baseline,0.642078958,1.118089667,1398.000000
-1800,CursorMov,2,Baseline,0.639165958,1.120211791,1397.203125
-1800,CursorMov,2,VideoOnly,0.015095083,0.479417500,70.343750
-```
-
-</details>
diff --git a/scripts/check-video-only-export-parity.py b/scripts/check-video-only-export-parity.py
deleted file mode 100644
index 85063c61d48..00000000000
--- a/scripts/check-video-only-export-parity.py
+++ /dev/null
@@ -1,106 +0,0 @@
-import argparse
-import json
-import subprocess
-from pathlib import Path
-
-ALPHA_READ_BYTES = 64 * 1024
-
-
-def read_alpha_extrema(stream):
-    minimum = None
-    maximum = None
-    while True:
-        chunk = stream.read(ALPHA_READ_BYTES)
-        if not chunk:
-            return minimum, maximum
-        chunk_minimum = min(chunk)
-        chunk_maximum = max(chunk)
-        minimum = chunk_minimum if minimum is None else min(minimum, chunk_minimum)
-        maximum = chunk_maximum if maximum is None else max(maximum, chunk_maximum)
-
-
-def alpha_extrema(path):
-    command = [
-        "ffmpeg", "-nostdin", "-hide_banner", "-loglevel", "error",
-        "-i", str(path), "-map", "0:v:0", "-vf", "alphaextract",
-        "-pix_fmt", "gray", "-f", "rawvideo", "-",
-    ]
-    with subprocess.Popen(command, stdout=subprocess.PIPE) as process:
-        try:
-            if process.stdout is None:
-                raise RuntimeError("FFmpeg alpha output pipe was not created")
-            extrema = read_alpha_extrema(process.stdout)
-        except BaseException:
-            process.kill()
-            process.wait()
-            raise
-        returncode = process.wait()
-        if returncode:
-            raise subprocess.CalledProcessError(returncode, command)
-        return extrema
-
-
-def probe(path):
-    raw = subprocess.check_output([
-        "ffprobe", "-v", "error", "-count_frames", "-show_streams", "-show_format",
-        "-of", "json", str(path),
-    ])
-    data = json.loads(raw)
-    selected = []
-    for stream in data["streams"]:
-        selected.append({key: stream.get(key) for key in [
-            "codec_name", "codec_type", "width", "height", "pix_fmt", "time_base",
-            "duration", "nb_read_frames", "avg_frame_rate",
-        ]})
-    return selected
-
-
-def frames(path, alpha=False):
-    command = ["ffmpeg", "-nostdin", "-hide_banner", "-loglevel", "error", "-i", str(path),
-               "-map", "0:v:0"]
-    if alpha:
-        command += ["-vf", "alphaextract"]
-    else:
-        command += ["-pix_fmt", "rgba"]
-    command += ["-f", "framemd5", "-"]
-    raw = subprocess.check_output(command).decode()
-    return [line.strip() for line in raw.splitlines() if line and not line.startswith("#")]
-
-
-def main():
-    parser = argparse.ArgumentParser()
-    parser.add_argument("baseline", type=Path)
-    parser.add_argument("candidate", type=Path)
-    parser.add_argument("--alpha", action="store_true")
-    parser.add_argument("--require-visible-alpha", action="store_true")
-    args = parser.parse_args()
-    if args.require_visible_alpha and not args.alpha:
-        parser.error("--require-visible-alpha requires --alpha")
-    a, b = probe(args.baseline), probe(args.candidate)
-    if a != b:
-        raise SystemExit(f"Stream metadata differs: {a!r} vs {b!r}")
-    if any(stream["codec_type"] == "audio" for stream in a):
-        raise SystemExit("Unexpected audio stream in video-only export")
-    fa, fb = frames(args.baseline), frames(args.candidate)
-    if not fa or fa != fb:
-        raise SystemExit("Decoded frame checksums, PTS, durations, or order differ")
-    alpha_match = None
-    visible_alpha = None
-    if args.alpha:
-        aa, ab = frames(args.baseline, True), frames(args.candidate, True)
-        alpha_match = bool(aa) and aa == ab
-        if not alpha_match:
-            raise SystemExit("Decoded alpha differs")
-        if args.require_visible_alpha:
-            minimum, maximum = alpha_extrema(args.baseline)
-            hashes = {line.rsplit(",", 1)[-1].strip() for line in aa}
-            visible_alpha = minimum == 0 and maximum is not None and maximum > 0 and len(hashes) > 1
-            if not visible_alpha:
-                raise SystemExit("Cursor alpha is empty, fully opaque, or static")
-    print(json.dumps({"decoded_frame_parity": True, "frames": len(fa),
-                      "streams": a, "alpha_parity": alpha_match,
-                      "visible_moving_alpha": visible_alpha}))
-
-
-if __name__ == "__main__":
-    main()
diff --git a/scripts/prepare-video-only-export-fixture.py b/scripts/prepare-video-only-export-fixture.py
deleted file mode 100644
index 16b074743f6..00000000000
--- a/scripts/prepare-video-only-export-fixture.py
+++ /dev/null
@@ -1,119 +0,0 @@
-import argparse
-import json
-import math
-import shutil
-import subprocess
-from pathlib import Path
-
-
-def add_cursor(fixture, assets_directory):
-    fixture = fixture.resolve()
-    marker = json.loads((fixture / "SYNTHETIC-FIXTURE.json").read_text())
-    if marker.get("synthetic") is not True or marker.get("audio_only"):
-        raise SystemExit("Only disposable synthetic full fixtures may be modified")
-    meta_path = fixture / "recording-meta.json"
-    meta = json.loads(meta_path.read_text())
-    if len(meta.get("segments", [])) != 1:
-        raise SystemExit("Expected one multi-segment recording entry")
-    assets = json.loads((assets_directory / "cursors.json").read_text())
-    for cursor_id in ("0", "2"):
-        relative = assets[cursor_id]["imagePath"]
-        source = assets_directory / f"cursor_{cursor_id}.png"
-        destination = fixture / relative
-        if destination.exists() and destination.read_bytes() != source.read_bytes():
-            raise SystemExit(f"Refusing to replace different cursor asset: {destination}")
-        destination.parent.mkdir(parents=True, exist_ok=True)
-        shutil.copyfile(source, destination)
-    duration = float(marker["export_seconds"])
-    sample_count = max(2, math.ceil(duration * 60))
-    moves = []
-    for index in range(sample_count + 1):
-        phase = index / sample_count
-        moves.append({
-            "active_modifiers": [], "cursor_id": "0" if phase < 0.5 else "2",
-            "time_ms": phase * duration * 1000,
-            "x": 0.2 + 0.6 * phase,
-            "y": 0.5 + 0.2 * math.sin(phase * math.tau),
-        })
-    click_time_ms = duration * 0.7 * 1000
-    clicks = [
-        {"active_modifiers": [], "cursor_num": 1, "cursor_id": "2",
-         "time_ms": click_time_ms, "down": True},
-        {"active_modifiers": [], "cursor_num": 1, "cursor_id": "2",
-         "time_ms": click_time_ms + 80, "down": False},
-    ]
-    cursor_path = fixture / "content/cursor-campaign.json"
-    cursor_path.write_text(json.dumps({"moves": moves, "clicks": clicks}, indent=2) + "\n")
-    meta["cursors"] = {cursor_id: assets[cursor_id] for cursor_id in ("0", "2")}
-    meta["segments"][0]["cursor"] = "content/cursor-campaign.json"
-    meta_path.write_text(json.dumps(meta, indent=2) + "\n")
-    marker["cursor_trajectory"] = "Synthetic normalized 60Hz movement, arrow-to-hand, one click"
-    marker["cursor_asset_source"] = str(assets_directory.resolve())
-    (fixture / "SYNTHETIC-FIXTURE.json").write_text(json.dumps(marker, indent=2) + "\n")
-    print(json.dumps({"fixture": str(fixture), "moves": len(moves), "clicks": len(clicks),
-                      "cursor_ids": ["0", "2"], "source": str(assets_directory.resolve())}))
-
-
-
-def main():
-    parser = argparse.ArgumentParser()
-    parser.add_argument("destination", type=Path)
-    parser.add_argument("--source-seconds", type=int, default=600)
-    parser.add_argument("--export-seconds", type=float, default=4)
-    parser.add_argument("--audio-only", action="store_true")
-    parser.add_argument("--with-cursor", action="store_true")
-    parser.add_argument("--cursor-assets", type=Path, default=Path(__file__).resolve().parents[1] /
-                        "apps/cli/skill/cap-demo/assets")
-    args = parser.parse_args()
-    if args.audio_only and args.with_cursor:
-        parser.error("--with-cursor requires video generation")
-    target = args.destination.resolve()
-    if target.exists():
-        raise SystemExit("Refusing to replace an existing fixture directory")
-    if args.source_seconds <= 0 or not 0 < args.export_seconds <= args.source_seconds:
-        raise SystemExit("Invalid durations")
-    content = target / "content"
-    content.mkdir(parents=True)
-    for name, frequency in [("mic", 440), ("system", 880)]:
-        subprocess.run([
-            "ffmpeg", "-nostdin", "-hide_banner", "-loglevel", "error",
-            "-f", "lavfi", "-i", f"sine=frequency={frequency}:sample_rate=48000:duration={args.source_seconds}",
-            "-ac", "2", "-c:a", "aac", "-b:a", "96k", str(content / f"{name}.m4a"),
-        ], check=True)
-    if not args.audio_only:
-        subprocess.run([
-            "ffmpeg", "-nostdin", "-hide_banner", "-loglevel", "error",
-            "-f", "lavfi", "-i", f"color=c=0x234567:size=640x360:rate=15:duration={args.source_seconds}",
-            "-c:v", "libx264", "-preset", "ultrafast", "-threads", "2",
-            "-pix_fmt", "yuv420p", str(content / "display.mp4"),
-        ], check=True)
-    meta = {
-        "pretty_name": "SYNTHETIC disposable video-only export benchmark",
-        "sharing": None,
-        "segments": [{
-            "display": {"path": "content/display.mp4", "fps": 15},
-            "mic": {"path": "content/mic.m4a"},
-            "system_audio": {"path": "content/system.m4a"},
-        }],
-    }
-    config = {
-        "background": {"source": {"type": "color", "value": [30, 30, 46]}, "padding": 0},
-        "camera": {"hide": True},
-        "audio": {"mute": True},
-        "timeline": {"segments": [{"recordingSegment": 0, "timescale": 1.0, "start": 0.0,
-                                     "end": args.export_seconds}], "zoomSegments": []},
-    }
-    (target / "recording-meta.json").write_text(json.dumps(meta, indent=2) + "\n")
-    (target / "project-config.json").write_text(json.dumps(config, indent=2) + "\n")
-    (target / "SYNTHETIC-FIXTURE.json").write_text(json.dumps({
-        "synthetic": True, "source_seconds": args.source_seconds,
-        "export_seconds": args.export_seconds, "audio_only": args.audio_only,
-        "purpose": "Real Cap builder/export or ProgressiveAudio workload, synthetic inputs",
-    }, indent=2) + "\n")
-    if args.with_cursor:
-        add_cursor(target, args.cursor_assets)
-    print(target)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/scripts/test-video-only-export-parity.py b/scripts/test-video-only-export-parity.py
deleted file mode 100644
index 6bc1e6ae21c..00000000000
--- a/scripts/test-video-only-export-parity.py
+++ /dev/null
@@ -1,92 +0,0 @@
-import importlib.util
-import io
-import subprocess
-import unittest
-from pathlib import Path
-from unittest.mock import MagicMock, patch
-
-SPEC = importlib.util.spec_from_file_location(
-    "video_only_export_parity",
-    Path(__file__).with_name("check-video-only-export-parity.py"),
-)
-CHECKER = importlib.util.module_from_spec(SPEC)
-SPEC.loader.exec_module(CHECKER)
-
-
-class VirtualChunk:
-    def __init__(self, size, tracking):
-        self.size = size
-        self.tracking = tracking
-        tracking["live"] += 1
-        tracking["peak"] = max(tracking["peak"], tracking["live"])
-
-    def __len__(self):
-        return self.size
-
-    def __iter__(self):
-        return iter((0, 255))
-
-    def __del__(self):
-        self.tracking["live"] -= 1
-
-
-class VirtualAlphaStream:
-    def __init__(self, size):
-        self.remaining = size
-        self.tracking = {"live": 0, "peak": 0}
-        self.reads = 0
-
-    def read(self, size=-1):
-        if not 0 < size <= CHECKER.ALPHA_READ_BYTES:
-            raise AssertionError("Alpha reads must have a bounded positive size")
-        self.reads += 1
-        size = min(size, self.remaining)
-        self.remaining -= size
-        return VirtualChunk(size, self.tracking) if size else b""
-
-
-class AlphaExtremaTests(unittest.TestCase):
-    def test_long_virtual_stream_has_bounded_reads_and_retention(self):
-        stream = VirtualAlphaStream(640 * 360 * 15 * 1800)
-        self.assertEqual(CHECKER.read_alpha_extrema(stream), (0, 255))
-        self.assertEqual(stream.remaining, 0)
-        self.assertGreater(stream.reads, 90_000)
-        self.assertLessEqual(stream.tracking["peak"], 2)
-        self.assertEqual(stream.tracking["live"], 0)
-
-    def test_empty_transparent_opaque_and_mixed_alpha(self):
-        for data, expected in [
-            (b"", (None, None)),
-            (b"\x00" * 17, (0, 0)),
-            (b"\xff" * 17, (255, 255)),
-            (b"\x00\x7f\xff", (0, 255)),
-        ]:
-            with self.subTest(data=data):
-                self.assertEqual(CHECKER.read_alpha_extrema(io.BytesIO(data)), expected)
-
-    def test_ffmpeg_failure_after_valid_alpha_is_propagated(self):
-        process = MagicMock()
-        process.__enter__.return_value = process
-        process.stdout = io.BytesIO(b"\x00\xff")
-        process.wait.return_value = 7
-        with patch.object(CHECKER.subprocess, "Popen", return_value=process) as spawn:
-            with self.assertRaises(subprocess.CalledProcessError) as failure:
-                CHECKER.alpha_extrema(Path("baseline.mov"))
-        self.assertEqual(failure.exception.returncode, 7)
-        self.assertEqual(spawn.call_args.kwargs, {"stdout": subprocess.PIPE})
-        process.wait.assert_called_once_with()
-        process.kill.assert_not_called()
-
-    def test_read_failure_kills_and_reaps_ffmpeg(self):
-        process = MagicMock()
-        process.__enter__.return_value = process
-        process.stdout.read.side_effect = OSError("Broken alpha read")
-        with patch.object(CHECKER.subprocess, "Popen", return_value=process):
-            with self.assertRaisesRegex(OSError, "Broken alpha read"):
-                CHECKER.alpha_extrema(Path("baseline.mov"))
-        process.kill.assert_called_once_with()
-        process.wait.assert_called_once_with()
-
-
-if __name__ == "__main__":
-    unittest.main()

From d6b1a8e669e488ca3cb5ffbde9073a20f023a17c Mon Sep 17 00:00:00 2001
From: Kyzer Phneh <36684609+kyzer1023@users.noreply.github.com>
Date: Mon, 19 Oct 2026 20:13:20 +0000
Subject: [PATCH 47/74] improve(editor): mix export audio from contiguous
 slices

Streaming MP4 export renders through ExportAudioView, which only
implemented sample(). render_audio therefore used the per-sample
fallback. sample_slice returns the window already buffered for that
source_start, so contiguous blocks mix from one slice.

The indexed and slice paths stay bit-identical, including a non-zero
source_start and a window shorter than the requested range.
---
 crates/editor/src/export_audio.rs | 158 ++++++++++++++++++++++++++++++
 1 file changed, 158 insertions(+)

diff --git a/crates/editor/src/export_audio.rs b/crates/editor/src/export_audio.rs
index 8df5e4df7f3..b3f28b6154e 100644
--- a/crates/editor/src/export_audio.rs
+++ b/crates/editor/src/export_audio.rs
@@ -8,6 +8,7 @@ use cap_project::{ClipOffsets, ProjectConfiguration, RecordingMeta, StudioRecord
 use std::{
     collections::HashMap,
     fmt,
+    ops::Range,
     path::{Path, PathBuf},
     sync::{
         Arc,
@@ -704,6 +705,11 @@ impl AudioSampleSource for ExportAudioView<'_> {
             .checked_sub(self.source_start * self.channels as usize)
             .and_then(|index| self.samples.get(index))
     }
+    fn sample_slice(&self, range: Range<usize>) -> Option<&[f32]> {
+        let base = self.source_start * self.channels as usize;
+        self.samples
+            .get(range.start.checked_sub(base)?..range.end.checked_sub(base)?)
+    }
 }
 
 #[cfg(test)]
@@ -1696,6 +1702,158 @@ mod tests {
         assert!(!ExportAudioRenderer::eligible_sources(&project, 3));
     }
 
+    #[test]
+    fn offset_view_slice_and_indexed_mixing_are_bit_identical() {
+        struct Indexed<'a>(&'a ExportAudioView<'a>);
+
+        impl AudioSampleSource for Indexed<'_> {
+            fn channels(&self) -> u16 {
+                self.0.channels()
+            }
+
+            fn sample_count(&self) -> usize {
+                self.0.sample_count()
+            }
+
+            fn sample(&self, index: usize) -> Option<&f32> {
+                self.0.sample(index)
+            }
+        }
+
+        fn track<'a, T: AudioSampleSource>(
+            data: &'a T,
+            channels: u16,
+            mono_right: bool,
+        ) -> AudioRendererTrack<'a, T> {
+            AudioRendererTrack {
+                data,
+                gain: -6.0,
+                stereo_mode: if channels == 1 {
+                    StereoMode::Stereo
+                } else if mono_right {
+                    StereoMode::MonoR
+                } else {
+                    StereoMode::Stereo
+                },
+                offset: 0,
+            }
+        }
+
+        for channels in [1u16, 2] {
+            for mono_right in [false, true] {
+                if channels == 1 && mono_right {
+                    continue;
+                }
+                let source_start = 1_537usize;
+                let frames = source_start + 5_000;
+                let width = usize::from(channels);
+                let samples = (0..frames * width)
+                    .map(|index| {
+                        let raw = (index.wrapping_mul(73) % 60_001) as i32 - 30_000;
+                        raw as f32 / 32_768.0
+                    })
+                    .collect::<Vec<_>>();
+                let window = &samples[source_start * width..];
+                let view = ExportAudioView {
+                    samples: window,
+                    channels,
+                    source_start,
+                    available_end: frames,
+                };
+                let short = ExportAudioView {
+                    samples: &window[..100 * width],
+                    channels,
+                    source_start,
+                    available_end: frames,
+                };
+                for index in 0..frames * width {
+                    let indexed = view.sample(index).copied().map(f32::to_bits);
+                    let sliced = view
+                        .sample_slice(index..index + 1)
+                        .map(|slice| slice[0].to_bits());
+                    assert_eq!(indexed, sliced, "channels {channels} index {index}");
+                }
+                let aligned = source_start * width..(source_start + 128) * width;
+                let slice = view.sample_slice(aligned.clone()).unwrap();
+                assert_eq!(slice.len(), aligned.end - aligned.start);
+                assert!(view.sample_slice(0..width).is_none());
+                assert!(
+                    view.sample_slice((frames - 1) * width..(frames + 1) * width)
+                        .is_none()
+                );
+                assert!(view.sample((frames - 1) * width).is_some());
+                assert!(
+                    short
+                        .sample_slice(source_start * width..(source_start + 101) * width)
+                        .is_none()
+                );
+                assert!(
+                    short
+                        .sample_slice(source_start * width..(source_start + 100) * width)
+                        .is_some()
+                );
+
+                let indexed = Indexed(&view);
+                let indexed_short = Indexed(&short);
+                let mut slice_out = vec![13.0f32; 4_096 * 2];
+                let mut indexed_out = slice_out.clone();
+                for (cursor, request, source_view, source_indexed) in [
+                    (0usize, 64usize, &view, &indexed),
+                    (source_start - 3, 4_096, &view, &indexed),
+                    (source_start, 4_096, &view, &indexed),
+                    (source_start + 17, 1, &view, &indexed),
+                    (source_start + 100, 7, &view, &indexed),
+                    (frames - 10, 4_096, &view, &indexed),
+                    (frames, 8, &view, &indexed),
+                    (source_start, 4_096, &short, &indexed_short),
+                    (source_start + 90, 4_096, &short, &indexed_short),
+                ] {
+                    let rendered_slice = cap_audio::render_audio(
+                        &[track(source_view, channels, mono_right)],
+                        cursor,
+                        request,
+                        0,
+                        &mut slice_out,
+                    );
+                    let rendered_indexed = cap_audio::render_audio(
+                        &[track(source_indexed, channels, mono_right)],
+                        cursor,
+                        request,
+                        0,
+                        &mut indexed_out,
+                    );
+                    assert_eq!(rendered_slice, rendered_indexed);
+                    if cursor >= source_start
+                        && cursor + rendered_slice <= source_view.sample_count()
+                        && rendered_slice > 0
+                        && (cursor + rendered_slice).saturating_sub(source_start) * width
+                            <= source_view.samples.len()
+                    {
+                        assert!(
+                            source_view
+                                .sample_slice(cursor * width..(cursor + rendered_slice) * width)
+                                .is_some(),
+                            "channels {channels} cursor {cursor}"
+                        );
+                    }
+                    assert_eq!(
+                        slice_out[..rendered_slice * 2]
+                            .iter()
+                            .copied()
+                            .map(f32::to_bits)
+                            .collect::<Vec<_>>(),
+                        indexed_out[..rendered_indexed * 2]
+                            .iter()
+                            .copied()
+                            .map(f32::to_bits)
+                            .collect::<Vec<_>>(),
+                        "channels {channels} cursor {cursor} mono_right {mono_right}"
+                    );
+                }
+            }
+        }
+    }
+
     #[test]
     fn source_windows_reject_backward_reads_and_keep_failures_sticky() {
         let directory = tempfile::tempdir().unwrap();

From 7beebecab6eda202a091163a42f225969f54b1cb Mon Sep 17 00:00:00 2001
From: Kyzer Phneh <36684609+kyzer1023@users.noreply.github.com>
Date: Mon, 19 Oct 2026 20:26:51 +0000
Subject: [PATCH 48/74] improve(audio): inline the stereo export slice mix

Size-optimized builds left the stereo slice iterator as a call per frame, which made the shipping stereo mix slower than indexing. Mix that slice with an inlined indexed loop so mono and stereo stay bit-identical and faster than the indexed path.
---
 crates/audio/src/renderer.rs | 48 +++++++++++++++++++++++++++++++++---
 1 file changed, 45 insertions(+), 3 deletions(-)

diff --git a/crates/audio/src/renderer.rs b/crates/audio/src/renderer.rs
index fd0226d5850..f1fd08985ec 100644
--- a/crates/audio/src/renderer.rs
+++ b/crates/audio/src/renderer.rs
@@ -109,9 +109,9 @@ pub fn render_audio<T: AudioSampleSource>(
                     .zip((first + count).checked_mul(2))
                     .and_then(|(start, end)| track.data.sample_slice(start..end));
                 if let Some(input) = input {
-                    for (sample, frame) in input.chunks_exact(2).zip(output.chunks_exact_mut(2)) {
-                        mix_stereo(sample[0], sample[1], frame, &track.stereo_mode, gain);
-                    }
+                    // `opt-level = s` does not inline `chunks_exact().zip()`, so this
+                    // path was a call per frame and slower than indexing.
+                    mix_stereo_slice(input, output, count, &track.stereo_mode, gain);
                 } else {
                     for (index, frame) in output.chunks_exact_mut(2).enumerate() {
                         let base = (first + index).saturating_mul(2);
@@ -136,6 +136,48 @@ pub fn render_audio<T: AudioSampleSource>(
     samples
 }
 
+#[inline(always)]
+fn mix_stereo_slice(
+    input: &[f32],
+    output: &mut [f32],
+    frames: usize,
+    mode: &StereoMode,
+    gain: f32,
+) {
+    let frames = frames.min(input.len() / 2).min(output.len() / 2);
+    match mode {
+        StereoMode::Stereo => {
+            let mut index = 0;
+            while index < frames {
+                let base = index * 2;
+                output[base] += input[base] * gain;
+                output[base + 1] += input[base + 1] * gain;
+                index += 1;
+            }
+        }
+        StereoMode::MonoL => {
+            let mut index = 0;
+            while index < frames {
+                let base = index * 2;
+                let sample = input[base] * gain;
+                output[base] += sample;
+                output[base + 1] += sample;
+                index += 1;
+            }
+        }
+        StereoMode::MonoR => {
+            let mut index = 0;
+            while index < frames {
+                let base = index * 2;
+                let sample = input[base + 1] * gain;
+                output[base] += sample;
+                output[base + 1] += sample;
+                index += 1;
+            }
+        }
+    }
+}
+
 fn mix_stereo(left: f32, right: f32, frame: &mut [f32], mode: &StereoMode, gain: f32) {
     let (left, right) = match mode {
         StereoMode::Stereo => (left, right),

From 0c0ef19114ceae124447d8d5b97b0cf159f1bb97 Mon Sep 17 00:00:00 2001
From: Richie McIlroy <33632126+richiemcilroy@users.noreply.github.com>
Date: Tue, 20 Oct 2026 09:07:42 +0800
Subject: [PATCH 49/74] chore: drop the standalone mask-cache benchmark package

---
 .../kernels/benchmarks/mask-cache/Cargo.lock  | 65 -------------------
 .../kernels/benchmarks/mask-cache/Cargo.toml  | 22 -------
 .../kernels/benchmarks/mask-cache/README.md   | 60 -----------------
 .../kernels/benchmarks/mask-cache/lib.rs      |  4 --
 4 files changed, 151 deletions(-)
 delete mode 100644 apps/desktop-gpui/kernels/benchmarks/mask-cache/Cargo.lock
 delete mode 100644 apps/desktop-gpui/kernels/benchmarks/mask-cache/Cargo.toml
 delete mode 100644 apps/desktop-gpui/kernels/benchmarks/mask-cache/README.md
 delete mode 100644 apps/desktop-gpui/kernels/benchmarks/mask-cache/lib.rs

diff --git a/apps/desktop-gpui/kernels/benchmarks/mask-cache/Cargo.lock b/apps/desktop-gpui/kernels/benchmarks/mask-cache/Cargo.lock
deleted file mode 100644
index 65c42077127..00000000000
--- a/apps/desktop-gpui/kernels/benchmarks/mask-cache/Cargo.lock
+++ /dev/null
@@ -1,65 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 4
-
-[[package]]
-name = "autocfg"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
-
-[[package]]
-name = "bytemuck"
-version = "1.25.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95832e849adfb21180ccb6826a99da14e5d266ae5c2e668e1602cf234f153797"
-
-[[package]]
-name = "byteorder-lite"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
-
-[[package]]
-name = "cap-screenshot-mask-cache-benchmark"
-version = "0.1.0"
-dependencies = [
- "image",
-]
-
-[[package]]
-name = "image"
-version = "0.25.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85ab80394333c02fe689eaf900ab500fbd0c2213da414687ebf995a65d5a6104"
-dependencies = [
- "bytemuck",
- "byteorder-lite",
- "moxcms",
- "num-traits",
-]
-
-[[package]]
-name = "moxcms"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb85c154ba489f01b25c0d36ae69a87e4a1c73a72631fc6c0eb6dde34a73e44b"
-dependencies = [
- "num-traits",
- "pxfm",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "pxfm"
-version = "0.1.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d55d956fa96f5ec02be2e13af0e20391a5aa83d6a074e3ad368959d0fab299ea"
diff --git a/apps/desktop-gpui/kernels/benchmarks/mask-cache/Cargo.toml b/apps/desktop-gpui/kernels/benchmarks/mask-cache/Cargo.toml
deleted file mode 100644
index bda064d8078..00000000000
--- a/apps/desktop-gpui/kernels/benchmarks/mask-cache/Cargo.toml
+++ /dev/null
@@ -1,22 +0,0 @@
-[workspace]
-
-[package]
-name = "cap-screenshot-mask-cache-benchmark"
-version = "0.1.0"
-edition = "2024"
-publish = false
-
-[lib]
-name = "cap_gpui_kernels"
-path = "lib.rs"
-
-[[example]]
-name = "screenshot-mask-cache-benchmark"
-path = "../../examples/screenshot-mask-cache-benchmark.rs"
-
-[dependencies]
-image = { version = "=0.25.10", default-features = false }
-
-[profile.release]
-codegen-units = 1
-lto = "thin"
diff --git a/apps/desktop-gpui/kernels/benchmarks/mask-cache/README.md b/apps/desktop-gpui/kernels/benchmarks/mask-cache/README.md
deleted file mode 100644
index 30fca7dabe6..00000000000
--- a/apps/desktop-gpui/kernels/benchmarks/mask-cache/README.md
+++ /dev/null
@@ -1,60 +0,0 @@
-# Screenshot mask cache benchmark
-
-Run from the repository root:
-
-```sh
-cargo +stable run --locked --release \
-  --manifest-path apps/desktop-gpui/kernels/benchmarks/mask-cache/Cargo.toml \
-  --example screenshot-mask-cache-benchmark
-```
-
-This standalone package compiles the production `mask_cache.rs` and `screenshot.rs` directly. It requires Rust and the `image` crate, with a committed lockfile matching the desktop workspace's image/filter dependencies. It does not build GPUI, audio, FFmpeg, or platform libraries, and can run on Linux x86_64 as well as macOS arm64. The same example is also available through `cargo run -p cap-gpui-kernels --release --example screenshot-mask-cache-benchmark` in the desktop workspace, when its full dependency prerequisites are installed.
-
-The fixture is a deterministic, nonuniform 3840 × 2160 RGBA image with varying alpha. Each workload has 1, 4, 8, or 16 masks of 640 × 360 pixels at level 16, using either blur or pixelate. One mask moves one pixel per event; the others stay fixed. Each workload primes the cache, runs 12 warmup pairs, then measures 120 drag events. The old path filters every mask on every update. The new path calls the production cache diff and filters only changed masks. Both paths call the unchanged production `mask_filter`.
-
-Execution order alternates between old-first and new-first to reduce order bias. Every overlay's request and all of its output bytes are compared after every warmup and measured event, outside the timed intervals. A mismatch or unexpected filter-call count fails the run. Filter-call counts in the table cover the 120 measured events only; cache priming and warmup are excluded. The speedup is the ratio of means. The median is the average of the two middle samples.
-
-Timings include cache diffing, region extraction/filtering, image allocation, `Arc` ownership, and release of retired CPU images. Request/geometry construction and correctness comparisons are outside timing. The benchmark excludes GPUI image conversion, task scheduling/cancellation, GPU atlas uploads, painting, and screenshot export. It measures completed CPU preparation work, not pointer-event latency or application FPS. One mask is a control case: it has no reusable image during a drag. A replaced frame invalidates every mask and is not expected to benefit. Overlapping masks, deletion, reordering, style changes, frame/layout invalidation, and fractional/clipped rectangles are covered by the production module's unit tests.
-
-Run the portable tests and lint checks:
-
-```sh
-cargo +stable test --locked \
-  --manifest-path apps/desktop-gpui/kernels/benchmarks/mask-cache/Cargo.toml \
-  --all-targets
-cargo +stable clippy --locked \
-  --manifest-path apps/desktop-gpui/kernels/benchmarks/mask-cache/Cargo.toml \
-  --all-targets -- -D warnings
-```
-
-Run the release command at least twice on an otherwise idle machine. Keep the full output, CPU model, operating system, Rust version, and power mode with results. Compare both means and medians, including the one-mask control. Cross-architecture results should use the same lockfile and workload.
-
-## Recorded results
-
-Two consecutive release runs on Apple M4 Pro, macOS 27.2, Rust 1.97.0, battery power with automatic power mode, October 13, 2026. All overlay bytes matched after every event in both runs. These are CPU overlay-preparation measurements with the exclusions described above.
-
-Run 1:
-
-| Mode | Masks | Old mean ms | New mean ms | Old median ms | New median ms | Mean speedup | Old calls | New calls |
-| --- | ---: | ---: | ---: | ---: | ---: | ---: | ---: | ---: |
-| blur | 1 | 1.637 | 1.631 | 1.630 | 1.621 | 1.00x | 120 | 120 |
-| blur | 4 | 6.701 | 1.687 | 6.697 | 1.688 | 3.97x | 480 | 120 |
-| blur | 8 | 13.266 | 1.664 | 13.291 | 1.660 | 7.97x | 960 | 120 |
-| blur | 16 | 26.504 | 1.688 | 26.494 | 1.685 | 15.70x | 1920 | 120 |
-| pixelate | 1 | 0.805 | 0.812 | 0.804 | 0.804 | 0.99x | 120 | 120 |
-| pixelate | 4 | 3.310 | 0.828 | 3.306 | 0.826 | 4.00x | 480 | 120 |
-| pixelate | 8 | 6.938 | 0.900 | 6.956 | 0.902 | 7.71x | 960 | 120 |
-| pixelate | 16 | 13.723 | 0.911 | 13.605 | 0.878 | 15.07x | 1920 | 120 |
-
-Run 2:
-
-| Mode | Masks | Old mean ms | New mean ms | Old median ms | New median ms | Mean speedup | Old calls | New calls |
-| --- | ---: | ---: | ---: | ---: | ---: | ---: | ---: | ---: |
-| blur | 1 | 1.600 | 1.600 | 1.585 | 1.589 | 1.00x | 120 | 120 |
-| blur | 4 | 6.569 | 1.657 | 6.548 | 1.651 | 3.96x | 480 | 120 |
-| blur | 8 | 13.384 | 1.713 | 13.293 | 1.672 | 7.82x | 960 | 120 |
-| blur | 16 | 26.587 | 1.708 | 26.138 | 1.661 | 15.57x | 1920 | 120 |
-| pixelate | 1 | 0.790 | 0.789 | 0.791 | 0.791 | 1.00x | 120 | 120 |
-| pixelate | 4 | 3.252 | 0.812 | 3.234 | 0.809 | 4.00x | 480 | 120 |
-| pixelate | 8 | 6.749 | 0.862 | 6.664 | 0.857 | 7.83x | 960 | 120 |
-| pixelate | 16 | 13.750 | 0.888 | 13.766 | 0.883 | 15.48x | 1920 | 120 |
diff --git a/apps/desktop-gpui/kernels/benchmarks/mask-cache/lib.rs b/apps/desktop-gpui/kernels/benchmarks/mask-cache/lib.rs
deleted file mode 100644
index 334cafd746a..00000000000
--- a/apps/desktop-gpui/kernels/benchmarks/mask-cache/lib.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-#[path = "../../src/mask_cache.rs"]
-pub mod mask_cache;
-#[path = "../../src/screenshot.rs"]
-pub mod screenshot;

From bd38d9153e6e36c73ac1d51a757383a289081bfd Mon Sep 17 00:00:00 2001
From: Richie McIlroy <33632126+richiemcilroy@users.noreply.github.com>
Date: Tue, 20 Oct 2026 09:36:16 +0800
Subject: [PATCH 50/74] perf(gpui): stop the display link while a window has
 nothing to draw

---
 .../patches/zed-idle-frames.patch             | 250 ++++++++++++++++++
 scripts/prepare-gpui-dependency.sh            |   1 +
 scripts/prepare-gpui-dependency.test.mjs      |  32 +++
 3 files changed, 283 insertions(+)
 create mode 100644 apps/desktop-gpui/patches/zed-idle-frames.patch

diff --git a/apps/desktop-gpui/patches/zed-idle-frames.patch b/apps/desktop-gpui/patches/zed-idle-frames.patch
new file mode 100644
index 00000000000..abf4d295b9f
--- /dev/null
+++ b/apps/desktop-gpui/patches/zed-idle-frames.patch
@@ -0,0 +1,250 @@
+diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
+index 0294b7d..6fe853b 100644
+--- a/crates/gpui/src/platform.rs
++++ b/crates/gpui/src/platform.rs
+@@ -843,6 +843,12 @@ pub trait PlatformWindow: HasWindowHandle + HasDisplayHandle {
+     fn toggle_fullscreen(&self);
+     fn is_fullscreen(&self) -> bool;
+     fn on_request_frame(&self, callback: Box<dyn FnMut(RequestFrameOptions)>);
++    /// Returns a switch that stops (`false`) and restarts (`true`) the frame
++    /// requests delivered to [`Self::on_request_frame`]. Windows stop them while
++    /// they have nothing to draw. Platforms without one keep requesting frames.
++    fn frame_request_toggle(&self) -> Option<Box<dyn Fn(bool)>> {
++        None
++    }
+     fn on_input(&self, callback: Box<dyn FnMut(PlatformInput) -> DispatchEventResult>);
+     fn on_active_status_change(&self, callback: Box<dyn FnMut(bool)>);
+     fn on_hover_status_change(&self, callback: Box<dyn FnMut(bool)>);
+diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
+index 393e517..74f7d32 100644
+--- a/crates/gpui/src/window.rs
++++ b/crates/gpui/src/window.rs
+@@ -120,6 +120,53 @@ struct WindowInvalidatorInner {
+     pub dirty_views: FxHashSet<EntityId>,
+     pub update_count: usize,
+     pub frame_dirty: FrameDirtyAccumulator,
++    pub frame_pacer: Rc<FramePacer>,
++}
++
++/// Stops the platform's frame requests once a window has had nothing to draw
++/// for [`FramePacer::IDLE_DELAY`], and restarts them as soon as anything
++/// invalidates the window or schedules a next-frame callback. Without this an
++/// idle window still wakes the main thread on every display refresh.
++pub(crate) struct FramePacer {
++    toggle: Option<Box<dyn Fn(bool)>>,
++    paused: Cell<bool>,
++    busy_at: Cell<Instant>,
++}
++
++impl FramePacer {
++    /// Long enough that steady low-rate redraws (30fps video, timers) never
++    /// stop and restart the frame source between frames.
++    const IDLE_DELAY: Duration = Duration::from_millis(100);
++
++    fn new(toggle: Option<Box<dyn Fn(bool)>>) -> Self {
++        FramePacer {
++            toggle,
++            paused: Cell::new(false),
++            busy_at: Cell::new(Instant::now()),
++        }
++    }
++
++    fn wake(&self) {
++        if let Some(toggle) = &self.toggle
++            && self.paused.replace(false)
++        {
++            self.busy_at.set(Instant::now());
++            toggle(true);
++        }
++    }
++
++    fn frame_finished(&self, busy: bool, now: Instant) {
++        let Some(toggle) = &self.toggle else {
++            return;
++        };
++        if busy {
++            self.busy_at.set(now);
++        } else if now.duration_since(self.busy_at.get()) >= Self::IDLE_DELAY
++            && !self.paused.replace(true)
++        {
++            toggle(false);
++        }
++    }
+ }
+ 
+ /// Per-frame invalidation bookkeeping, drained at draw time and emitted to the
+@@ -138,7 +185,7 @@ pub(crate) struct WindowInvalidator {
+ }
+ 
+ impl WindowInvalidator {
+-    pub fn new() -> Self {
++    pub fn new(frame_pacer: Rc<FramePacer>) -> Self {
+         WindowInvalidator {
+             inner: Rc::new(RefCell::new(WindowInvalidatorInner {
+                 dirty: true,
+@@ -146,6 +193,7 @@ impl WindowInvalidator {
+                 dirty_views: FxHashSet::default(),
+                 update_count: 0,
+                 frame_dirty: FrameDirtyAccumulator::default(),
++                frame_pacer,
+             })),
+         }
+     }
+@@ -157,6 +205,9 @@ impl WindowInvalidator {
+         if inner.draw_phase == DrawPhase::None {
+             Self::record_frame_dirty(&mut inner);
+             inner.dirty = true;
++            let frame_pacer = inner.frame_pacer.clone();
++            drop(inner);
++            frame_pacer.wake();
+             cx.push_effect(Effect::Notify { emitter: entity });
+             true
+         } else {
+@@ -174,6 +225,9 @@ impl WindowInvalidator {
+         if dirty {
+             inner.update_count += 1;
+             Self::record_frame_dirty(&mut inner);
++            let frame_pacer = inner.frame_pacer.clone();
++            drop(inner);
++            frame_pacer.wake();
+         }
+     }
+ 
+@@ -1390,7 +1444,8 @@ impl Window {
+         let scale_factor = platform_window.scale_factor();
+         let appearance = platform_window.appearance();
+         let text_system = Arc::new(WindowTextSystem::new(cx.text_system().clone()));
+-        let invalidator = WindowInvalidator::new();
++        let frame_pacer = Rc::new(FramePacer::new(platform_window.frame_request_toggle()));
++        let invalidator = WindowInvalidator::new(frame_pacer.clone());
+         let active = Rc::new(Cell::new(platform_window.is_active()));
+         let hovered = Rc::new(Cell::new(platform_window.is_hovered()));
+         let needs_present = Rc::new(Cell::new(false));
+@@ -1507,9 +1562,10 @@ impl Window {
+             let invalidator = invalidator.clone();
+             let active = active.clone();
+             let needs_present = needs_present.clone();
+-            let next_frame_callbacks = next_frame_callbacks.clone();
++            let pending_frame_callbacks = next_frame_callbacks.clone();
+             let input_rate_tracker = input_rate_tracker.clone();
+             move |request_frame_options| {
++                let next_frame_callbacks = &pending_frame_callbacks;
+                 let thermal_state = handle
+                     .update(&mut cx, |_, _, cx| cx.thermal_state())
+                     .log_err();
+@@ -1551,8 +1607,11 @@ impl Window {
+                 }
+                 last_frame_time.set(Some(now));
+ 
++                let mut busy = request_frame_options.force_render
++                    || request_frame_options.require_presentation;
+                 let next_frame_callbacks = next_frame_callbacks.take();
+                 if !next_frame_callbacks.is_empty() {
++                    busy = true;
+                     handle
+                         .update(&mut cx, |_, window, cx| {
+                             for callback in next_frame_callbacks {
+@@ -1570,6 +1629,7 @@ impl Window {
+                     || (active.get() && input_rate_tracker.borrow_mut().is_high_rate());
+ 
+                 if invalidator.is_dirty() || request_frame_options.force_render {
++                    busy = true;
+                     measure("frame duration", || {
+                         handle
+                             .update(&mut cx, |_, window, cx| {
+@@ -1585,6 +1645,7 @@ impl Window {
+                             .log_err();
+                     })
+                 } else if needs_present {
++                    busy = true;
+                     handle
+                         .update(&mut cx, |_, window, _| window.present())
+                         .log_err();
+@@ -1595,6 +1656,9 @@ impl Window {
+                         window.complete_frame();
+                     })
+                     .log_err();
++
++                busy |= invalidator.is_dirty() || !pending_frame_callbacks.borrow().is_empty();
++                frame_pacer.frame_finished(busy, now);
+             }
+         }));
+         platform_window.on_resize(Box::new({
+@@ -2263,6 +2327,8 @@ impl Window {
+     /// Schedule the given closure to be run directly after the current frame is rendered.
+     pub fn on_next_frame(&self, callback: impl FnOnce(&mut Window, &mut App) + 'static) {
+         RefCell::borrow_mut(&self.next_frame_callbacks).push(Box::new(callback));
++        let frame_pacer = self.invalidator.inner.borrow().frame_pacer.clone();
++        frame_pacer.wake();
+     }
+ 
+     /// Schedule a frame to be drawn on the next animation frame.
+diff --git a/crates/gpui_macos/src/window.rs b/crates/gpui_macos/src/window.rs
+index f5b2c1a..1d8d41b 100644
+--- a/crates/gpui_macos/src/window.rs
++++ b/crates/gpui_macos/src/window.rs
+@@ -499,6 +499,7 @@ struct MacWindowState {
+     frame_source: Option<WindowFrameSource>,
+     renderer: renderer::Renderer,
+     request_frame_callback: Option<Box<dyn FnMut(RequestFrameOptions)>>,
++    frame_requests_paused: bool,
+     event_callback: Option<Box<dyn FnMut(PlatformInput) -> gpui::DispatchEventResult>>,
+     activate_callback: Option<Box<dyn FnMut(bool)>>,
+     resize_callback: Option<Box<dyn FnMut(Size<Pixels>, f32)>>,
+@@ -657,6 +658,9 @@ impl MacWindowState {
+ 
+     fn start_display_link(&mut self) {
+         self.stop_display_link();
++        if self.frame_requests_paused {
++            return;
++        }
+         unsafe {
+             if !self
+                 .native_window
+@@ -896,6 +900,7 @@ impl MacWindow {
+                 frame_source: None,
+                 renderer,
+                 request_frame_callback: None,
++                frame_requests_paused: false,
+                 event_callback: None,
+                 activate_callback: None,
+                 resize_callback: None,
+@@ -1670,6 +1675,38 @@ impl PlatformWindow for MacWindow {
+         self.0.as_ref().lock().request_frame_callback = Some(callback);
+     }
+ 
++    fn frame_request_toggle(&self) -> Option<Box<dyn Fn(bool)>> {
++        let window_state = Arc::downgrade(&self.0);
++        Some(Box::new(move |enabled| {
++            let Some(window_state) = window_state.upgrade() else {
++                return;
++            };
++            let mut lock = window_state.lock();
++            lock.frame_requests_paused = !enabled;
++            if !enabled {
++                lock.stop_display_link();
++                return;
++            }
++            lock.start_display_link();
++            // A restarted display link first fires a refresh or two later, so
++            // draw the frame that woke the window right away instead.
++            let window_state = Arc::downgrade(&window_state);
++            lock.foreground_executor
++                .spawn(async move {
++                    let Some(window_state) = window_state.upgrade() else {
++                        return;
++                    };
++                    let Some(mut callback) = window_state.lock().request_frame_callback.take()
++                    else {
++                        return;
++                    };
++                    callback(Default::default());
++                    window_state.lock().request_frame_callback = Some(callback);
++                })
++                .detach();
++        }))
++    }
++
+     fn on_input(&self, callback: Box<dyn FnMut(PlatformInput) -> gpui::DispatchEventResult>) {
+         self.0.as_ref().lock().event_callback = Some(callback);
+     }
diff --git a/scripts/prepare-gpui-dependency.sh b/scripts/prepare-gpui-dependency.sh
index 3ccc9b4c4e6..bffbd90c10d 100755
--- a/scripts/prepare-gpui-dependency.sh
+++ b/scripts/prepare-gpui-dependency.sh
@@ -7,6 +7,7 @@ patch_paths=(
 	"apps/desktop-gpui/patches/zed-gpui.patch"
 	"apps/desktop-gpui/patches/zed-windows.patch"
 	"apps/desktop-gpui/patches/zed-linux.patch"
+	"apps/desktop-gpui/patches/zed-idle-frames.patch"
 )
 patch_files=("${patch_paths[@]/#/$repo_root/}")
 base_revision="5d1f83d9f27a19bec1fb241dc33b42238af9cf8d"
diff --git a/scripts/prepare-gpui-dependency.test.mjs b/scripts/prepare-gpui-dependency.test.mjs
index 8d786f7101d..21bfe11a595 100644
--- a/scripts/prepare-gpui-dependency.test.mjs
+++ b/scripts/prepare-gpui-dependency.test.mjs
@@ -121,6 +121,7 @@ test("dependency verification handles overlapping patches without changing the c
 	};
 	writeFileSync(path.join(upstream, "renderer.rs"), "base\n");
 	writeFileSync(path.join(upstream, "windows.rs"), "base\n");
+	writeFileSync(path.join(upstream, "frames.rs"), "base\n");
 	commit();
 	const base = git(upstream, "rev-parse", "HEAD").trim();
 	const patch = (name) => {
@@ -139,6 +140,8 @@ test("dependency verification handles overlapping patches without changing the c
 	writeFileSync(path.join(upstream, "renderer.rs"), "Linux renderer\n");
 	rmSync(path.join(upstream, "temporary.rs"));
 	patch("zed-linux.patch");
+	writeFileSync(path.join(upstream, "frames.rs"), "paced frames\n");
+	patch("zed-idle-frames.patch");
 	const script = path.join(cap, "scripts/prepare-gpui-dependency.sh");
 	writeFileSync(
 		script,
@@ -158,6 +161,10 @@ test("dependency verification handles overlapping patches without changing the c
 			"Linux renderer\n",
 		);
 		assert.equal(existsSync(path.join(zed, "temporary.rs")), false);
+		assert.equal(
+			readFileSync(path.join(zed, "frames.rs"), "utf8"),
+			"paced frames\n",
+		);
 	});
 
 	writeFileSync(path.join(zed, "unrelated.txt"), "preserve staged work\n");
@@ -242,6 +249,31 @@ test("dependency verification handles overlapping patches without changing the c
 		},
 	);
 
+	await t.test(
+		"a checkout prepared before a patch was added gains the new patch",
+		() => {
+			const addedPatch = path.join(cap, patchDirectory, "zed-idle-frames.patch");
+			const addedPatchBytes = readFileSync(addedPatch);
+			git(zed, "apply", "--reverse", addedPatch);
+			git(cap, "rm", "--quiet", addedPatch);
+			git(cap, "commit", "--quiet", "-m", "Stack without the added patch");
+			writeFileSync(addedPatch, addedPatchBytes);
+			git(cap, "add", addedPatch);
+			git(cap, "commit", "--quiet", "-m", "Add a patch");
+			const before = fingerprint();
+			const result = run(cap, "bash", [script]);
+			assert.equal(result.status, 0, result.stderr);
+			assert.match(result.stderr, /Updated .* to the current ones/);
+			assert.equal(
+				readFileSync(path.join(zed, "frames.rs"), "utf8"),
+				"paced frames\n",
+			);
+			const after = fingerprint();
+			assert.deepEqual(after.unrelated, before.unrelated);
+			assert.equal(after.head, before.head);
+		},
+	);
+
 	await t.test(
 		"local edits to a patched file are never overwritten by an update",
 		() => {

From 4643e2b0a177acc95f321f02de22e328dc1b769f Mon Sep 17 00:00:00 2001
From: Richie McIlroy <33632126+richiemcilroy@users.noreply.github.com>
Date: Tue, 20 Oct 2026 10:09:02 +0800
Subject: [PATCH 51/74] style: format the gpui dependency test

---
 scripts/prepare-gpui-dependency.test.mjs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/prepare-gpui-dependency.test.mjs b/scripts/prepare-gpui-dependency.test.mjs
index 21bfe11a595..e66507100a4 100644
--- a/scripts/prepare-gpui-dependency.test.mjs
+++ b/scripts/prepare-gpui-dependency.test.mjs
@@ -252,7 +252,11 @@ test("dependency verification handles overlapping patches without changing the c
 	await t.test(
 		"a checkout prepared before a patch was added gains the new patch",
 		() => {
-			const addedPatch = path.join(cap, patchDirectory, "zed-idle-frames.patch");
+			const addedPatch = path.join(
+				cap,
+				patchDirectory,
+				"zed-idle-frames.patch",
+			);
 			const addedPatchBytes = readFileSync(addedPatch);
 			git(zed, "apply", "--reverse", addedPatch);
 			git(cap, "rm", "--quiet", addedPatch);

From 76f950afd7984c1254014ad8b2547dcbfcf5cf96 Mon Sep 17 00:00:00 2001
From: Richie McIlroy <33632126+richiemcilroy@users.noreply.github.com>
Date: Tue, 20 Oct 2026 10:37:08 +0800
Subject: [PATCH 52/74] test(gpui): cover when the frame pacer stops and
 restarts frame requests

---
 .../patches/zed-idle-frames.patch             | 86 ++++++++++++++++++-
 1 file changed, 85 insertions(+), 1 deletion(-)

diff --git a/apps/desktop-gpui/patches/zed-idle-frames.patch b/apps/desktop-gpui/patches/zed-idle-frames.patch
index abf4d295b9f..80f9b096024 100644
--- a/apps/desktop-gpui/patches/zed-idle-frames.patch
+++ b/apps/desktop-gpui/patches/zed-idle-frames.patch
@@ -16,7 +16,7 @@ index 0294b7d..6fe853b 100644
      fn on_active_status_change(&self, callback: Box<dyn FnMut(bool)>);
      fn on_hover_status_change(&self, callback: Box<dyn FnMut(bool)>);
 diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
-index 393e517..74f7d32 100644
+index 393e517..e5850bf 100644
 --- a/crates/gpui/src/window.rs
 +++ b/crates/gpui/src/window.rs
 @@ -120,6 +120,53 @@ struct WindowInvalidatorInner {
@@ -179,6 +179,90 @@ index 393e517..74f7d32 100644
      }
  
      /// Schedule a frame to be drawn on the next animation frame.
+@@ -6807,6 +6873,83 @@ pub fn outline(
+     }
+ }
+ 
++#[cfg(test)]
++mod frame_pacer_tests {
++    use super::{FramePacer, Instant};
++    use std::{cell::RefCell, rc::Rc, time::Duration};
++
++    fn recording_pacer() -> (FramePacer, Rc<RefCell<Vec<bool>>>, Instant) {
++        let calls = Rc::new(RefCell::new(Vec::new()));
++        let recorded = calls.clone();
++        let pacer = FramePacer::new(Some(Box::new(move |enabled| {
++            recorded.borrow_mut().push(enabled)
++        })));
++        let created = pacer.busy_at.get();
++        (pacer, calls, created)
++    }
++
++    #[test]
++    fn idle_frames_stop_requests_only_after_the_delay() {
++        let (pacer, calls, start) = recording_pacer();
++        pacer.frame_finished(false, start + Duration::from_millis(99));
++        assert!(calls.borrow().is_empty());
++        pacer.frame_finished(false, start + FramePacer::IDLE_DELAY);
++        assert_eq!(*calls.borrow(), [false]);
++    }
++
++    #[test]
++    fn a_busy_frame_restarts_the_delay() {
++        let (pacer, calls, start) = recording_pacer();
++        pacer.frame_finished(true, start + Duration::from_millis(90));
++        pacer.frame_finished(false, start + Duration::from_millis(150));
++        assert!(calls.borrow().is_empty());
++        pacer.frame_finished(false, start + Duration::from_millis(190));
++        assert_eq!(*calls.borrow(), [false]);
++    }
++
++    #[test]
++    fn repeated_idle_frames_stop_requests_once() {
++        let (pacer, calls, start) = recording_pacer();
++        for ms in [100, 120, 500] {
++            pacer.frame_finished(false, start + Duration::from_millis(ms));
++        }
++        assert_eq!(*calls.borrow(), [false]);
++    }
++
++    #[test]
++    fn wake_restarts_requests_once_and_only_when_stopped() {
++        let (pacer, calls, start) = recording_pacer();
++        pacer.wake();
++        assert!(calls.borrow().is_empty());
++        pacer.frame_finished(false, start + FramePacer::IDLE_DELAY);
++        pacer.wake();
++        pacer.wake();
++        assert_eq!(*calls.borrow(), [false, true]);
++    }
++
++    #[test]
++    fn a_woken_window_waits_a_full_delay_before_stopping_again() {
++        let (pacer, calls, start) = recording_pacer();
++        pacer.frame_finished(false, start + FramePacer::IDLE_DELAY);
++        pacer.wake();
++        let woken = pacer.busy_at.get();
++        pacer.frame_finished(false, woken + Duration::from_millis(50));
++        assert_eq!(*calls.borrow(), [false, true]);
++        pacer.frame_finished(false, woken + FramePacer::IDLE_DELAY);
++        assert_eq!(*calls.borrow(), [false, true, false]);
++    }
++
++    #[test]
++    fn without_a_platform_toggle_nothing_is_tracked() {
++        let pacer = FramePacer::new(None);
++        let start = pacer.busy_at.get();
++        pacer.frame_finished(false, start + FramePacer::IDLE_DELAY);
++        assert!(!pacer.paused.get());
++        pacer.wake();
++        assert!(!pacer.paused.get());
++    }
++}
++
+ #[cfg(test)]
+ mod tests {
+     use crate::{
 diff --git a/crates/gpui_macos/src/window.rs b/crates/gpui_macos/src/window.rs
 index f5b2c1a..1d8d41b 100644
 --- a/crates/gpui_macos/src/window.rs

From 0b4279532c17680ad50b876d7dbe09dd33e92343 Mon Sep 17 00:00:00 2001
From: Richie McIlroy <33632126+richiemcilroy@users.noreply.github.com>
Date: Tue, 20 Oct 2026 12:03:29 +0800
Subject: [PATCH 53/74] perf(recording): read the cursor image only on ticks
 that record an event

---
 crates/recording/src/cursor.rs | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/crates/recording/src/cursor.rs b/crates/recording/src/cursor.rs
index 607154b13a2..6e49d37aee1 100644
--- a/crates/recording/src/cursor.rs
+++ b/crates/recording/src/cursor.rs
@@ -572,7 +572,17 @@ pub fn spawn_cursor_recorder(
                 last_window_position = window_position;
             }
 
-            let cursor_id = if let Some(data) = get_cursor_data() {
+            // The cursor image only labels this tick's move and click events,
+            // and reading it builds a full TIFF of every representation
+            // (~0.5 ms, ~580 KB on a Retina Mac), so skip it on ticks that
+            // record neither.
+            let buttons_changed = buttons_changed(
+                &last_mouse_state.button_pressed,
+                &mouse_state.button_pressed,
+            );
+            let cursor_id = if !position_changed && !buttons_changed && last_cursor_id.is_some() {
+                last_cursor_id.clone()
+            } else if let Some(data) = get_cursor_data() {
                 let cursor_id = cursor_id_for_image(
                     data,
                     &mut response,
@@ -703,6 +713,15 @@ pub fn spawn_cursor_recorder(
     }
 }
 
+/// Whether any button present in both samples changed state: the same pairs
+/// the click events below are generated from.
+fn buttons_changed(previous: &[bool], current: &[bool]) -> bool {
+    previous
+        .iter()
+        .zip(current)
+        .any(|(previous, current)| previous != current)
+}
+
 fn cursor_id_for_image(
     data: CursorData,
     response: &mut CursorActorResponse,
@@ -1634,6 +1653,19 @@ mod cursor_image_tests {
         }
     }
 
+    #[test]
+    fn button_changes_match_the_pairs_clicks_are_built_from() {
+        assert!(!buttons_changed(
+            &[false, false, false],
+            &[false, false, false]
+        ));
+        assert!(buttons_changed(&[false, false], &[false, true]));
+        assert!(buttons_changed(&[true], &[false]));
+        // Clicks only compare buttons present in both samples.
+        assert!(!buttons_changed(&[false], &[false, true]));
+        assert!(!buttons_changed(&[], &[true]));
+    }
+
     #[test]
     fn an_unchanged_cursor_image_reuses_its_id_without_hashing() {
         let dir = tempfile::tempdir().unwrap();

From 2ffe5127acb7469da2eb006dded23572a2a4df9f Mon Sep 17 00:00:00 2001
From: Richie McIlroy <33632126+richiemcilroy@users.noreply.github.com>
Date: Tue, 20 Oct 2026 12:05:58 +0800
Subject: [PATCH 54/74] fix(gpui): don't draw a hidden window when it wakes
 from idle

---
 apps/desktop-gpui/patches/zed-idle-frames.patch | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/apps/desktop-gpui/patches/zed-idle-frames.patch b/apps/desktop-gpui/patches/zed-idle-frames.patch
index 80f9b096024..c9afcbed0ec 100644
--- a/apps/desktop-gpui/patches/zed-idle-frames.patch
+++ b/apps/desktop-gpui/patches/zed-idle-frames.patch
@@ -264,7 +264,7 @@ index 393e517..e5850bf 100644
  mod tests {
      use crate::{
 diff --git a/crates/gpui_macos/src/window.rs b/crates/gpui_macos/src/window.rs
-index f5b2c1a..1d8d41b 100644
+index f5b2c1a..e3e4b34 100644
 --- a/crates/gpui_macos/src/window.rs
 +++ b/crates/gpui_macos/src/window.rs
 @@ -499,6 +499,7 @@ struct MacWindowState {
@@ -293,7 +293,7 @@ index f5b2c1a..1d8d41b 100644
                  event_callback: None,
                  activate_callback: None,
                  resize_callback: None,
-@@ -1670,6 +1675,38 @@ impl PlatformWindow for MacWindow {
+@@ -1670,6 +1675,48 @@ impl PlatformWindow for MacWindow {
          self.0.as_ref().lock().request_frame_callback = Some(callback);
      }
  
@@ -310,6 +310,16 @@ index f5b2c1a..1d8d41b 100644
 +                return;
 +            }
 +            lock.start_display_link();
++            // A hidden window draws nothing until it is shown again, when the
++            // occlusion handler restarts its display link.
++            let visible = unsafe {
++                lock.native_window
++                    .occlusionState()
++                    .contains(NSWindowOcclusionState::NSWindowOcclusionStateVisible)
++            };
++            if !visible {
++                return;
++            }
 +            // A restarted display link first fires a refresh or two later, so
 +            // draw the frame that woke the window right away instead.
 +            let window_state = Arc::downgrade(&window_state);

From 5ec4b840db427cc95e6f1fedade2a77caadc1354 Mon Sep 17 00:00:00 2001
From: Richie McIlroy <33632126+richiemcilroy@users.noreply.github.com>
Date: Tue, 20 Oct 2026 12:26:01 +0800
Subject: [PATCH 55/74] fix(desktop-gpui): hold the automatic update prompt
 until recording or export finishes

---
 apps/desktop-gpui/src/updates.rs | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/apps/desktop-gpui/src/updates.rs b/apps/desktop-gpui/src/updates.rs
index 2a16bf13ed2..85324423d75 100644
--- a/apps/desktop-gpui/src/updates.rs
+++ b/apps/desktop-gpui/src/updates.rs
@@ -91,6 +91,12 @@ fn qualifies(
             && remote != current)
 }
 
+/// A check the user asked for answers now; a scheduled one waits for the
+/// work in flight to finish before showing its modal prompt.
+fn holds_scheduled_prompt(manual: bool, busy: bool) -> bool {
+    !manual && busy
+}
+
 fn current_version() -> Result<Version, String> {
     Version::parse(env!("CARGO_PKG_VERSION")).map_err(|error| error.to_string())
 }
@@ -373,6 +379,22 @@ pub(crate) fn schedule_startup_check(cx: &mut App) {
                 continue;
             }
 
+            // The prompt is modal and brings Cap forward, so an automatic
+            // check holds it until a recording, export, import or
+            // transcription has finished rather than interrupting it.
+            let mut channel_changed = false;
+            while holds_scheduled_prompt(manual, cx.update(work_in_flight)) {
+                cx.background_executor().timer(BUSY_RETRY_DELAY).await;
+                channel_changed =
+                    cx.update(|cx| cx.global::<UpdateScheduler>().pending.channel.is_some());
+                if channel_changed {
+                    break;
+                }
+            }
+            if channel_changed {
+                continue;
+            }
+
             crate::platform::activate_app();
             let accepted = crate::platform::confirm_dialog(
                 "Update Cap",
@@ -700,6 +722,14 @@ mod tests {
         }
     }
 
+    #[test]
+    fn only_scheduled_checks_wait_for_work_in_flight() {
+        assert!(holds_scheduled_prompt(false, true));
+        assert!(!holds_scheduled_prompt(false, false));
+        assert!(!holds_scheduled_prompt(true, true));
+        assert!(!holds_scheduled_prompt(true, false));
+    }
+
     #[test]
     fn stable_channel_accepts_newer_versions_and_explicit_prerelease_downgrades() {
         assert!(qualifies(

From ea15792d2e4fbcabe19264717d0d08f35c048e76 Mon Sep 17 00:00:00 2001
From: Richie McIlroy <33632126+richiemcilroy@users.noreply.github.com>
Date: Tue, 20 Oct 2026 12:36:14 +0800
Subject: [PATCH 56/74] fix(recording): drop the original media backup once a
 plain Studio stop is published

---
 crates/recording/src/recovery.rs            | 57 ++++++++++++++++++---
 crates/recording/src/recovery/retirement.rs | 24 +++++++++
 2 files changed, 75 insertions(+), 6 deletions(-)

diff --git a/crates/recording/src/recovery.rs b/crates/recording/src/recovery.rs
index 3ae062fb383..9ca452c1269 100644
--- a/crates/recording/src/recovery.rs
+++ b/crates/recording/src/recovery.rs
@@ -284,15 +284,34 @@ impl RecoveryManager {
             return Ok(false);
         }
 
+        // Without a preparing editor nothing reads the originals once they are
+        // published, so the backup goes with the stop instead of doubling the
+        // recording's size on disk for good.
+        let unread = preparing.is_none();
+        let published_workspace = std::cell::RefCell::new(None);
         Self::finalize_with_publication(
             &incomplete,
             RecoveryPurpose::Finalize,
             copy_recovery_input_with_durability,
             |_, _| Ok(()),
-            publish_recovery,
+            |project, workspace| {
+                publish_recovery(project, workspace)?;
+                *published_workspace.borrow_mut() = Some(workspace.to_path_buf());
+                Ok(())
+            },
             RecoveryLock::acquire,
             preparing,
         )?;
+        #[cfg(unix)]
+        if unread && let Some(workspace) = published_workspace.into_inner() {
+            let retired = RecoveryLock::acquire(project_path)
+                .and_then(|_lock| retirement::retire_unread_originals(project_path, &workspace));
+            if let Err(error) = retired {
+                warn!(path = %workspace.display(), %error, "Original media backup retained");
+            }
+        }
+        #[cfg(not(unix))]
+        let _ = (unread, published_workspace);
         Ok(true)
     }
 
@@ -5076,6 +5095,34 @@ mod clean_studio_snapshot_tests {
         assert!(RecoveryLock::acquire(project).is_ok());
     }
 
+    #[cfg(unix)]
+    #[test]
+    fn a_stop_without_a_preparing_editor_retires_the_original_media_backup() {
+        let directory = playable_studio_project(StudioRecordingStatus::NeedsRemux);
+        let project = directory.path();
+
+        assert!(RecoveryManager::remux_if_needed(project).unwrap());
+
+        let workspaces: Vec<_> = fs::read_dir(project)
+            .unwrap()
+            .map(|entry| entry.unwrap().path())
+            .filter(|path| {
+                path.file_name()
+                    .unwrap()
+                    .to_string_lossy()
+                    .starts_with(".recovery-")
+            })
+            .collect();
+        assert_eq!(workspaces.len(), 1);
+        assert!(!workspaces[0].join("original-segments").exists());
+        let meta = RecordingMeta::load_for_project(project).unwrap();
+        let StudioRecordingMeta::MultipleSegments { inner } = meta.studio_meta().unwrap() else {
+            panic!()
+        };
+        let display = meta.path(&inner.segments[0].display.path);
+        assert!(cap_enc_ffmpeg::remux::get_video_fps(&display).is_some());
+    }
+
     #[test]
     fn studio_finalization_keeps_the_recorded_display_fps() {
         let directory = playable_studio_project(StudioRecordingStatus::NeedsRemux);
@@ -5135,7 +5182,6 @@ mod clean_studio_snapshot_tests {
         let project = directory.path();
         let microphone = add_fragmented_audio(project, "audio-input", 90);
         let system_audio = add_fragmented_audio(project, "system_audio", 90);
-        let original_bytes = fs::read(&microphone).unwrap();
         let original_audio = cap_audio::AudioData::from_file(&microphone).unwrap();
         let mut meta = RecordingMeta::load_for_project(project).unwrap();
         let RecordingMetaInner::Studio(studio) = &mut meta.inner else {
@@ -5190,10 +5236,9 @@ mod clean_studio_snapshot_tests {
                     .starts_with(".recovery-")
             })
             .unwrap();
-        assert_eq!(
-            fs::read(backup.join("original-segments/segment-0/audio-input.m4a")).unwrap(),
-            original_bytes
-        );
+        // A stop without a preparing editor retires the original backup once
+        // the published tracks above are in place.
+        assert!(!backup.join("original-segments").exists());
     }
 
     #[test]
diff --git a/crates/recording/src/recovery/retirement.rs b/crates/recording/src/recovery/retirement.rs
index 9dd70066a26..065cc4826f6 100644
--- a/crates/recording/src/recovery/retirement.rs
+++ b/crates/recording/src/recovery/retirement.rs
@@ -77,6 +77,30 @@ impl Drop for RecoveryLease {
     }
 }
 
+/// Removes the original media backup of a publication whose lock was never
+/// shared with a preparing reader, after the same durability barrier and
+/// receipt checks the shared lease uses.
+pub(super) fn retire_unread_originals(
+    project: &Path,
+    workspace: &Path,
+) -> Result<(), RecoveryError> {
+    let retirement = OriginalMediaRetirement {
+        project: project.canonicalize()?,
+        workspace: workspace.canonicalize()?,
+        receipt: read_recovery_publication(&workspace.join(RECOVERY_PUBLICATION_RECEIPT))?,
+    };
+    retirement.validate()?;
+    sync_directories(&project.join("content/segments"))?;
+    for directory in [
+        project.join("content"),
+        project.to_path_buf(),
+        workspace.to_path_buf(),
+    ] {
+        File::open(directory)?.sync_all()?;
+    }
+    retirement.remove_originals()
+}
+
 struct OriginalMediaRetirement {
     project: PathBuf,
     workspace: PathBuf,

From ce71f7ad6e0dde981a9d535a2f52a9537932135c Mon Sep 17 00:00:00 2001
From: Richie McIlroy <33632126+richiemcilroy@users.noreply.github.com>
Date: Tue, 20 Oct 2026 12:40:01 +0800
Subject: [PATCH 57/74] fix(desktop-gpui): let a manual check or channel change
 replace a held update prompt

---
 apps/desktop-gpui/src/updates.rs | 39 +++++++++++++++++++++++++++-----
 1 file changed, 33 insertions(+), 6 deletions(-)

diff --git a/apps/desktop-gpui/src/updates.rs b/apps/desktop-gpui/src/updates.rs
index 85324423d75..ae48b344e1f 100644
--- a/apps/desktop-gpui/src/updates.rs
+++ b/apps/desktop-gpui/src/updates.rs
@@ -97,6 +97,12 @@ fn holds_scheduled_prompt(manual: bool, busy: bool) -> bool {
     !manual && busy
 }
 
+/// A manual check or a channel change queued while an automatic prompt waits
+/// replaces it, so neither has to wait for the work in flight to finish.
+fn supersedes_held_prompt(pending: &PendingUpdateRequests) -> bool {
+    pending.manual || pending.channel.is_some()
+}
+
 fn current_version() -> Result<Version, String> {
     Version::parse(env!("CARGO_PKG_VERSION")).map_err(|error| error.to_string())
 }
@@ -382,16 +388,24 @@ pub(crate) fn schedule_startup_check(cx: &mut App) {
             // The prompt is modal and brings Cap forward, so an automatic
             // check holds it until a recording, export, import or
             // transcription has finished rather than interrupting it.
-            let mut channel_changed = false;
+            let mut superseded = false;
             while holds_scheduled_prompt(manual, cx.update(work_in_flight)) {
-                cx.background_executor().timer(BUSY_RETRY_DELAY).await;
-                channel_changed =
-                    cx.update(|cx| cx.global::<UpdateScheduler>().pending.channel.is_some());
-                if channel_changed {
+                let timer = cx.background_executor().timer(BUSY_RETRY_DELAY);
+                let request = requests.recv_async();
+                futures_util::pin_mut!(timer, request);
+                if let Either::Right((Err(_), _)) = select(timer, request).await {
+                    return;
+                }
+                superseded = cx.update(|cx| {
+                    supersedes_held_prompt(&cx.global::<UpdateScheduler>().pending)
+                });
+                if superseded {
                     break;
                 }
             }
-            if channel_changed {
+            if superseded {
+                // Run the queued manual check or channel change straight away.
+                delay = Some(Duration::ZERO);
                 continue;
             }
 
@@ -730,6 +744,19 @@ mod tests {
         assert!(!holds_scheduled_prompt(true, false));
     }
 
+    #[test]
+    fn queued_manual_checks_and_channel_changes_replace_a_held_prompt() {
+        assert!(!supersedes_held_prompt(&PendingUpdateRequests::default()));
+        assert!(supersedes_held_prompt(&PendingUpdateRequests {
+            manual: true,
+            ..PendingUpdateRequests::default()
+        }));
+        assert!(supersedes_held_prompt(&PendingUpdateRequests {
+            channel: Some(UpdateChannel::Nightly),
+            ..PendingUpdateRequests::default()
+        }));
+    }
+
     #[test]
     fn stable_channel_accepts_newer_versions_and_explicit_prerelease_downgrades() {
         assert!(qualifies(

From 88e159d0bd36255c51ed6d1bbed52b6224498eb4 Mon Sep 17 00:00:00 2001
From: Richie McIlroy <33632126+richiemcilroy@users.noreply.github.com>
Date: Tue, 20 Oct 2026 12:42:28 +0800
Subject: [PATCH 58/74] fix(desktop-gpui): install the CLI from Settings with
 the shared cli-install crate

---
 apps/desktop-gpui/Cargo.lock            |  10 +
 apps/desktop-gpui/Cargo.toml            |   1 +
 apps/desktop-gpui/src/settings_pages.rs | 642 +-----------------------
 3 files changed, 12 insertions(+), 641 deletions(-)

diff --git a/apps/desktop-gpui/Cargo.lock b/apps/desktop-gpui/Cargo.lock
index b7e12867d54..b9df7cbb901 100644
--- a/apps/desktop-gpui/Cargo.lock
+++ b/apps/desktop-gpui/Cargo.lock
@@ -1494,6 +1494,15 @@ dependencies = [
  "workspace-hack",
 ]
 
+[[package]]
+name = "cap-cli-install"
+version = "0.1.0"
+dependencies = [
+ "dirs 6.0.0",
+ "serde",
+ "workspace-hack",
+]
+
 [[package]]
 name = "cap-cursor-capture"
 version = "0.1.0"
@@ -1537,6 +1546,7 @@ dependencies = [
  "cap-audio",
  "cap-camera",
  "cap-camera-effects",
+ "cap-cli-install",
  "cap-cursor-info",
  "cap-editor",
  "cap-enc-ffmpeg",
diff --git a/apps/desktop-gpui/Cargo.toml b/apps/desktop-gpui/Cargo.toml
index be42a946586..f496ed30e58 100644
--- a/apps/desktop-gpui/Cargo.toml
+++ b/apps/desktop-gpui/Cargo.toml
@@ -25,6 +25,7 @@ path = "../../crates/recording/examples/studio-finalization-benchmark.rs"
 
 [dependencies]
 cap-audio = { path = "../../crates/audio" }
+cap-cli-install = { path = "../../crates/cli-install" }
 cap-gpui-kernels = { path = "kernels" }
 # gpui — the wingleeio/zed fork Comet ships. The pinned rev carries f596cde
 # ("destination alpha on transparent windows: Porter-Duff OVER, not additive"),
diff --git a/apps/desktop-gpui/src/settings_pages.rs b/apps/desktop-gpui/src/settings_pages.rs
index 62b3f926bc3..c0d5d6bb421 100644
--- a/apps/desktop-gpui/src/settings_pages.rs
+++ b/apps/desktop-gpui/src/settings_pages.rs
@@ -25,6 +25,7 @@ use gpui::{
     MouseButton, ParentElement, SharedString, StatefulInteractiveElement, Styled, Window, div,
     prelude::FluentBuilder, px, rgb, svg,
 };
+use cap_cli_install as cli_install;
 use serde::Deserialize;
 use serde_json::{Map, Value, json};
 
@@ -8110,647 +8111,6 @@ async fn http_json(
 /// depend on the crate, and the whole point is that `status`/`install`/
 /// `uninstall` behave byte-for-byte like the Tauri commands
 /// (`src-tauri/src/cli.rs`) so the two apps manage the same shim.
-mod cli_install {
-    #[cfg(unix)]
-    use std::ffi::OsStr;
-    use std::{
-        env, fs,
-        path::{Path, PathBuf},
-    };
-
-    const CAP_DIR_NAME: &str = ".cap";
-    const BIN_DIR_NAME: &str = "bin";
-    const CLI_BINARY_STEM: &str = "cap-cli";
-
-    #[cfg(windows)]
-    const SHIM_NAME: &str = "cap.cmd";
-    #[cfg(not(windows))]
-    const SHIM_NAME: &str = "cap";
-
-    #[cfg(windows)]
-    const CLI_BINARY_NAME: &str = "cap-cli.exe";
-    #[cfg(not(windows))]
-    const CLI_BINARY_NAME: &str = "cap-cli";
-
-    /// `CliInstallStatus`, minus the serde/specta derives the commands need
-    /// and minus `install_dir`, which neither cli.tsx nor this page displays
-    /// (`path_entry` carries the same string).
-    #[derive(Clone, Debug)]
-    pub(crate) struct CliInstallStatus {
-        pub shim_path: String,
-        pub target_path: String,
-        pub installed: bool,
-        pub on_path: bool,
-        pub conflict: Option<String>,
-        pub path_entry: String,
-        pub shell_command: String,
-        pub path_configured: bool,
-    }
-
-    fn home_dir() -> Result<PathBuf, String> {
-        dirs::home_dir().ok_or_else(|| "Could not determine home directory".to_string())
-    }
-
-    fn install_dir() -> Result<PathBuf, String> {
-        let home = home_dir()?;
-        let cap_bin = home.join(CAP_DIR_NAME).join(BIN_DIR_NAME);
-        let local_bin = home.join(".local/bin");
-
-        // Prefer whichever candidate already holds a Cap-managed shim, so
-        // status and install agree regardless of the launching PATH.
-        if let Ok(target) = target_path() {
-            for candidate in [&cap_bin, &local_bin] {
-                let shim = candidate.join(SHIM_NAME);
-                if shim_points_to(&shim, &target).unwrap_or(false) || shim_is_cap_managed(&shim) {
-                    return Ok(candidate.clone());
-                }
-            }
-        }
-
-        if path_is_present(&cap_bin.join(SHIM_NAME)) || cfg!(windows) {
-            return Ok(cap_bin);
-        }
-
-        if path_contains_install_dir(&local_bin) {
-            return Ok(local_bin);
-        }
-
-        Ok(cap_bin)
-    }
-
-    fn shim_path() -> Result<PathBuf, String> {
-        Ok(install_dir()?.join(SHIM_NAME))
-    }
-
-    fn target_path() -> Result<PathBuf, String> {
-        let exe =
-            env::current_exe().map_err(|e| format!("Could not locate Cap executable: {e}"))?;
-        let exe = resolve_path_for_target_lookup(exe);
-        let dir = exe
-            .parent()
-            .ok_or_else(|| "Could not locate Cap executable directory".to_string())?;
-
-        for candidate in cli_binary_candidates(dir) {
-            if candidate.exists() {
-                return Ok(resolve_path_for_target_lookup(candidate));
-            }
-        }
-
-        Ok(dir.join(CLI_BINARY_NAME))
-    }
-
-    #[cfg(windows)]
-    fn resolve_path_for_target_lookup(path: PathBuf) -> PathBuf {
-        path
-    }
-
-    #[cfg(not(windows))]
-    fn resolve_path_for_target_lookup(path: PathBuf) -> PathBuf {
-        fs::canonicalize(&path).unwrap_or(path)
-    }
-
-    fn cli_binary_candidates(dir: &Path) -> Vec<PathBuf> {
-        let mut names = vec![CLI_BINARY_NAME.to_string()];
-        if let Some(target_triple) = current_target_triple() {
-            names.push(target_specific_cli_binary_name(target_triple));
-        }
-
-        let dirs = [
-            dir.to_path_buf(),
-            dir.join("../MacOS"),
-            dir.join("../Resources"),
-        ];
-        let mut candidates = Vec::new();
-        for dir in dirs {
-            for name in &names {
-                candidates.push(dir.join(name));
-            }
-        }
-        candidates
-    }
-
-    fn target_specific_cli_binary_name(target_triple: &str) -> String {
-        format!(
-            "{CLI_BINARY_STEM}-{target_triple}{}",
-            exe_suffix_for_target(target_triple)
-        )
-    }
-
-    fn exe_suffix_for_target(target_triple: &str) -> &'static str {
-        if target_triple.contains("windows") {
-            ".exe"
-        } else {
-            ""
-        }
-    }
-
-    fn current_target_triple() -> Option<&'static str> {
-        if cfg!(all(
-            target_os = "windows",
-            target_arch = "x86_64",
-            target_env = "msvc"
-        )) {
-            Some("x86_64-pc-windows-msvc")
-        } else if cfg!(all(
-            target_os = "windows",
-            target_arch = "aarch64",
-            target_env = "msvc"
-        )) {
-            Some("aarch64-pc-windows-msvc")
-        } else if cfg!(all(target_os = "macos", target_arch = "aarch64")) {
-            Some("aarch64-apple-darwin")
-        } else if cfg!(all(target_os = "macos", target_arch = "x86_64")) {
-            Some("x86_64-apple-darwin")
-        } else if cfg!(all(target_os = "linux", target_arch = "x86_64")) {
-            Some("x86_64-unknown-linux-gnu")
-        } else if cfg!(all(target_os = "linux", target_arch = "aarch64")) {
-            Some("aarch64-unknown-linux-gnu")
-        } else {
-            None
-        }
-    }
-
-    #[cfg(unix)]
-    fn cli_binary_file_name_is_cap_managed(name: &OsStr) -> bool {
-        if name == CLI_BINARY_NAME {
-            return true;
-        }
-
-        let Some(name) = name.to_str() else {
-            return false;
-        };
-
-        current_target_triple().is_some_and(|target_triple| {
-            name.eq_ignore_ascii_case(&target_specific_cli_binary_name(target_triple))
-        })
-    }
-
-    fn display_path(path: &Path) -> String {
-        path.to_string_lossy().into_owned()
-    }
-
-    fn path_is_present(path: &Path) -> bool {
-        fs::symlink_metadata(path).is_ok()
-    }
-
-    fn path_contains_install_dir(install_dir: &Path) -> bool {
-        let Some(path) = env::var_os("PATH") else {
-            return false;
-        };
-
-        env::split_paths(&path).any(|entry| entry == install_dir)
-    }
-
-    #[cfg(unix)]
-    fn shim_points_to(shim_path: &Path, target_path: &Path) -> Result<bool, String> {
-        match fs::read_link(shim_path) {
-            Ok(link) => Ok(link == target_path || same_file(&link, target_path)),
-            Err(err)
-                if matches!(
-                    err.kind(),
-                    std::io::ErrorKind::NotFound | std::io::ErrorKind::InvalidInput
-                ) =>
-            {
-                Ok(false)
-            }
-            Err(err) => Err(format!("Could not read CLI shim: {err}")),
-        }
-    }
-
-    #[cfg(unix)]
-    fn same_file(a: &Path, b: &Path) -> bool {
-        match (fs::canonicalize(a), fs::canonicalize(b)) {
-            (Ok(a), Ok(b)) => a == b,
-            _ => false,
-        }
-    }
-
-    #[cfg(windows)]
-    fn shim_points_to(shim_path: &Path, target_path: &Path) -> Result<bool, String> {
-        let contents = match fs::read(shim_path) {
-            Ok(contents) => contents,
-            Err(err) if err.kind() == std::io::ErrorKind::NotFound => return Ok(false),
-            Err(err) => return Err(format!("Could not read CLI shim: {err}")),
-        };
-
-        let target = windows_command_path(target_path);
-        Ok(windows_shim_target(&contents).is_some_and(|shim_target| {
-            windows_shim_target_matches(shim_target, &target, |name| env::var(name).ok())
-        }))
-    }
-
-    #[cfg(unix)]
-    fn shim_is_cap_managed(shim_path: &Path) -> bool {
-        match fs::read_link(shim_path) {
-            Ok(link) => link
-                .file_name()
-                .is_some_and(cli_binary_file_name_is_cap_managed),
-            Err(_) => false,
-        }
-    }
-
-    #[cfg(windows)]
-    fn shim_is_cap_managed(shim_path: &Path) -> bool {
-        fs::read(shim_path).is_ok_and(|contents| windows_shim_target(&contents).is_some())
-    }
-
-    #[cfg(windows)]
-    fn windows_shim_target(contents: &[u8]) -> Option<&[u8]> {
-        let contents = contents.strip_prefix(b"\xef\xbb\xbf").unwrap_or(contents);
-        let mut lines = contents.split(|byte| *byte == b'\n');
-        if !trim_ascii_whitespace(lines.next()?).eq_ignore_ascii_case(b"@echo off") {
-            return None;
-        }
-
-        let command = trim_ascii_whitespace(lines.next()?);
-        if lines.any(|line| !trim_ascii_whitespace(line).is_empty()) {
-            return None;
-        }
-
-        let target = command.strip_prefix(b"\"")?.strip_suffix(b"\" %*")?;
-        if windows_cli_binary_file_name_is_cap_managed(windows_path_file_name(target)) {
-            Some(target)
-        } else {
-            None
-        }
-    }
-
-    #[cfg(windows)]
-    fn windows_path_file_name(path: &[u8]) -> &[u8] {
-        path.rsplit(|byte| *byte == b'\\' || *byte == b'/')
-            .next()
-            .unwrap_or(path)
-    }
-
-    #[cfg(windows)]
-    fn windows_cli_binary_file_name_is_cap_managed(name: &[u8]) -> bool {
-        name.eq_ignore_ascii_case(b"cap-cli.exe")
-            || name.eq_ignore_ascii_case(b"cap-cli-x86_64-pc-windows-msvc.exe")
-            || name.eq_ignore_ascii_case(b"cap-cli-aarch64-pc-windows-msvc.exe")
-    }
-
-    #[cfg(windows)]
-    fn windows_command_path(path: &Path) -> String {
-        let path = display_path(path);
-
-        if let Some(rest) = path.strip_prefix("\\\\?\\UNC\\") {
-            return format!("\\\\{rest}");
-        }
-
-        if let Some(rest) = path.strip_prefix("\\\\?\\") {
-            return rest.to_string();
-        }
-
-        path
-    }
-
-    #[cfg(windows)]
-    fn windows_shim_target_matches<F>(shim_target: &[u8], target: &str, env_value: F) -> bool
-    where
-        F: FnMut(&str) -> Option<String>,
-    {
-        if shim_target.eq_ignore_ascii_case(target.as_bytes()) {
-            return true;
-        }
-
-        let Ok(shim_target) = std::str::from_utf8(shim_target) else {
-            return false;
-        };
-
-        windows_expand_env_prefix(shim_target, env_value)
-            .is_some_and(|expanded| expanded.eq_ignore_ascii_case(target))
-    }
-
-    #[cfg(windows)]
-    fn windows_expand_env_prefix<F>(target: &str, mut env_value: F) -> Option<String>
-    where
-        F: FnMut(&str) -> Option<String>,
-    {
-        let rest = target.strip_prefix('%')?;
-        let (name, suffix) = rest.split_once('%')?;
-        if name.is_empty() {
-            return None;
-        }
-
-        env_value(name).map(|value| format!("{value}{suffix}"))
-    }
-
-    #[cfg(windows)]
-    fn windows_env_prefixed_path<F>(target: &str, mut env_value: F) -> Option<String>
-    where
-        F: FnMut(&str) -> Option<String>,
-    {
-        for name in ["LOCALAPPDATA", "ProgramFiles", "ProgramFiles(x86)"] {
-            let Some(value) = env_value(name) else {
-                continue;
-            };
-            let Some(suffix) = strip_ascii_prefix(target, &value) else {
-                continue;
-            };
-            if suffix.is_empty() || suffix.starts_with('\\') || suffix.starts_with('/') {
-                return Some(format!("%{name}%{suffix}"));
-            }
-        }
-
-        None
-    }
-
-    #[cfg(windows)]
-    fn strip_ascii_prefix<'a>(value: &'a str, prefix: &str) -> Option<&'a str> {
-        let head = value.get(..prefix.len())?;
-        let tail = value.get(prefix.len()..)?;
-        head.eq_ignore_ascii_case(prefix).then_some(tail)
-    }
-
-    #[cfg(windows)]
-    fn trim_ascii_whitespace(mut value: &[u8]) -> &[u8] {
-        while value.first().is_some_and(|byte| byte.is_ascii_whitespace()) {
-            value = &value[1..];
-        }
-
-        while value.last().is_some_and(|byte| byte.is_ascii_whitespace()) {
-            value = &value[..value.len() - 1];
-        }
-
-        value
-    }
-
-    fn shell_command(install_dir: &Path) -> String {
-        let install_dir = display_path(install_dir);
-
-        if cfg!(windows) {
-            let install_dir = install_dir.replace('\'', "''");
-            format!(
-                r#"powershell -NoProfile -Command "[Environment]::SetEnvironmentVariable('Path', [Environment]::GetEnvironmentVariable('Path', 'User') + ';{install_dir}', 'User')""#
-            )
-        } else {
-            format!(r#"export PATH="{install_dir}:$PATH""#)
-        }
-    }
-
-    pub(crate) fn status() -> Result<CliInstallStatus, String> {
-        let install_dir = install_dir()?;
-        let shim_path = shim_path()?;
-        let target_path = target_path()?;
-        let target_exists = target_path.exists();
-        let shim_exists = path_is_present(&shim_path);
-        let installed = target_exists && shim_points_to(&shim_path, &target_path)?;
-        let conflict = if shim_exists && !installed && !shim_is_cap_managed(&shim_path) {
-            Some(format!(
-                "{} already exists and is not managed by Cap",
-                display_path(&shim_path)
-            ))
-        } else if !target_exists {
-            Some(format!(
-                "Bundled CLI binary not found at {}",
-                display_path(&target_path)
-            ))
-        } else {
-            None
-        };
-
-        let on_path = path_contains_install_dir(&install_dir);
-
-        Ok(CliInstallStatus {
-            shim_path: display_path(&shim_path),
-            target_path: display_path(&target_path),
-            installed,
-            on_path,
-            conflict,
-            path_entry: display_path(&install_dir),
-            shell_command: shell_command(&install_dir),
-            path_configured: path_persisted(&install_dir, on_path),
-        })
-    }
-
-    #[cfg(unix)]
-    fn write_shim(shim_path: &Path, target_path: &Path) -> Result<(), String> {
-        std::os::unix::fs::symlink(target_path, shim_path)
-            .map_err(|e| format!("Could not create CLI symlink: {e}"))
-    }
-
-    #[cfg(windows)]
-    fn write_shim(shim_path: &Path, target_path: &Path) -> Result<(), String> {
-        let target = windows_command_path(target_path);
-        let target =
-            windows_env_prefixed_path(&target, |name| env::var(name).ok()).unwrap_or(target);
-        let contents = format!(
-            r#"@echo off
-"{target}" %*
-"#
-        );
-        fs::write(shim_path, contents).map_err(|e| format!("Could not write CLI shim: {e}"))
-    }
-
-    pub(crate) fn install() -> Result<CliInstallStatus, String> {
-        let install_dir = install_dir()?;
-        let shim_path = shim_path()?;
-        let target_path = target_path()?;
-
-        if !target_path.exists() {
-            return Err(format!(
-                "Bundled CLI binary not found at {}",
-                display_path(&target_path)
-            ));
-        }
-
-        fs::create_dir_all(&install_dir)
-            .map_err(|e| format!("Could not create CLI directory: {e}"))?;
-
-        if path_is_present(&shim_path) {
-            // Repoint our own shim and any other Cap-managed one; only refuse
-            // to clobber a genuinely foreign file.
-            if !shim_points_to(&shim_path, &target_path)? && !shim_is_cap_managed(&shim_path) {
-                return Err(format!(
-                    "{} already exists and is not managed by Cap",
-                    display_path(&shim_path)
-                ));
-            }
-
-            match fs::remove_file(&shim_path) {
-                Ok(()) => {}
-                Err(e) if e.kind() == std::io::ErrorKind::NotFound => {}
-                Err(e) => return Err(format!("Could not replace CLI shim: {e}")),
-            }
-        }
-
-        write_shim(&shim_path, &target_path)?;
-
-        let mut status = status()?;
-        if !status.on_path && ensure_path_persisted(&install_dir) {
-            status.path_configured = true;
-        }
-        Ok(status)
-    }
-
-    #[cfg(unix)]
-    fn ensure_path_persisted(install_dir: &Path) -> bool {
-        if env::var_os("CAP_NO_MODIFY_PATH").is_some() {
-            return false;
-        }
-        let Some(home) = dirs::home_dir() else {
-            return false;
-        };
-        let needle = display_path(install_dir);
-        if profile_mentions_dir(&home, &needle) {
-            return true;
-        }
-        let shell = env::var("SHELL").unwrap_or_default();
-        let shell_name = Path::new(&shell)
-            .file_name()
-            .and_then(|name| name.to_str())
-            .unwrap_or("");
-        append_path_export(&shell_profile(&home, shell_name), &needle)
-    }
-
-    #[cfg(windows)]
-    fn ensure_path_persisted(install_dir: &Path) -> bool {
-        if env::var_os("CAP_NO_MODIFY_PATH").is_some() {
-            return false;
-        }
-        let dir = display_path(install_dir).replace('\'', "''");
-        let script = format!(
-            "$d = '{dir}'; \
-             $u = [Environment]::GetEnvironmentVariable('Path', 'User'); \
-             $e = if ($u) {{ $u -split ';' }} else {{ @() }}; \
-             if ($e -notcontains $d) {{ \
-             $n = if ($u) {{ \"$d;$u\" }} else {{ $d }}; \
-             [Environment]::SetEnvironmentVariable('Path', $n, 'User') }}"
-        );
-        let mut command = powershell_command();
-        command
-            .args(["-NoProfile", "-NonInteractive", "-Command", &script])
-            .status()
-            .map(|status| status.success())
-            .unwrap_or(false)
-    }
-
-    #[cfg(unix)]
-    fn path_persisted(install_dir: &Path, on_path: bool) -> bool {
-        on_path
-            || dirs::home_dir()
-                .is_some_and(|home| profile_mentions_dir(&home, &display_path(install_dir)))
-    }
-
-    #[cfg(windows)]
-    fn path_persisted(install_dir: &Path, on_path: bool) -> bool {
-        on_path || windows_user_path_contains(install_dir)
-    }
-
-    #[cfg(windows)]
-    fn windows_user_path_contains(install_dir: &Path) -> bool {
-        let mut command = powershell_command();
-        let Ok(output) = command
-            .args([
-                "-NoProfile",
-                "-NonInteractive",
-                "-Command",
-                "[Environment]::GetEnvironmentVariable('Path', 'User')",
-            ])
-            .output()
-        else {
-            return false;
-        };
-        if !output.status.success() {
-            return false;
-        }
-        let needle = display_path(install_dir);
-        let needle = needle.trim();
-        String::from_utf8_lossy(&output.stdout)
-            .split(';')
-            .any(|entry| entry.trim().eq_ignore_ascii_case(needle))
-    }
-
-    #[cfg(windows)]
-    fn powershell_command() -> std::process::Command {
-        use std::os::windows::process::CommandExt;
-
-        const CREATE_NO_WINDOW: u32 = 0x0800_0000;
-
-        let mut command = std::process::Command::new("powershell");
-        command.creation_flags(CREATE_NO_WINDOW);
-        command
-    }
-
-    #[cfg(unix)]
-    fn shell_profile(home: &Path, shell_name: &str) -> PathBuf {
-        match shell_name {
-            "zsh" => home.join(".zshrc"),
-            "bash" => home.join(".bashrc"),
-            "" if home.join(".zshrc").exists() => home.join(".zshrc"),
-            _ => home.join(".profile"),
-        }
-    }
-
-    #[cfg(unix)]
-    fn profile_mentions_dir(home: &Path, needle: &str) -> bool {
-        [".zshrc", ".bashrc", ".bash_profile", ".profile"]
-            .iter()
-            .any(|file| fs::read_to_string(home.join(file)).is_ok_and(|c| c.contains(needle)))
-    }
-
-    #[cfg(unix)]
-    fn append_path_export(profile: &Path, install_dir: &str) -> bool {
-        use std::io::Write;
-        let line = format!("export PATH=\"{install_dir}:$PATH\"");
-        fs::OpenOptions::new()
-            .create(true)
-            .append(true)
-            .open(profile)
-            .and_then(|mut file| writeln!(file, "\n# Added by Cap\n{line}"))
-            .is_ok()
-    }
-
-    pub(crate) fn uninstall() -> Result<CliInstallStatus, String> {
-        let shim_path = shim_path()?;
-        let target_path = target_path()?;
-
-        if shim_points_to(&shim_path, &target_path)? {
-            fs::remove_file(&shim_path).map_err(|e| format!("Could not remove CLI shim: {e}"))?;
-        }
-
-        status()
-    }
-
-    #[cfg(all(test, unix))]
-    mod tests {
-        use super::*;
-
-        #[test]
-        fn shell_profile_selection() {
-            let home = Path::new("/home/u");
-            assert_eq!(shell_profile(home, "zsh"), home.join(".zshrc"));
-            assert_eq!(shell_profile(home, "bash"), home.join(".bashrc"));
-            assert_eq!(shell_profile(home, "fish"), home.join(".profile"));
-        }
-
-        #[test]
-        fn cap_managed_shim_detection() {
-            let dir =
-                std::env::temp_dir().join(format!("cap-gpui-cli-test-{}", std::process::id()));
-            let _ = fs::remove_dir_all(&dir);
-            fs::create_dir_all(&dir).unwrap();
-            let shim = dir.join(SHIM_NAME);
-
-            // A symlink to a cap-cli binary is Cap-managed even when it points
-            // at a different install (the target need not exist).
-            std::os::unix::fs::symlink("/elsewhere/Cap.app/Contents/MacOS/cap-cli", &shim).unwrap();
-            assert!(shim_is_cap_managed(&shim));
-
-            // A symlink to anything else is not.
-            fs::remove_file(&shim).unwrap();
-            std::os::unix::fs::symlink("/bin/ls", &shim).unwrap();
-            assert!(!shim_is_cap_managed(&shim));
-
-            // Nor is a regular file, so install refuses to clobber it.
-            fs::remove_file(&shim).unwrap();
-            fs::write(&shim, b"#!/bin/sh\n").unwrap();
-            assert!(!shim_is_cap_managed(&shim));
-
-            let _ = fs::remove_dir_all(&dir);
-        }
-    }
-}
 
 // ---------------------------------------------------------------------------
 // Tests

From 4dc50f3b287ecd5f25c9b0f8509aa0bf9d68837c Mon Sep 17 00:00:00 2001
From: Richie McIlroy <33632126+richiemcilroy@users.noreply.github.com>
Date: Tue, 20 Oct 2026 12:55:26 +0800
Subject: [PATCH 59/74] perf(recording): compare the cursor bitmap before
 encoding its TIFF while the pointer moves

---
 crates/recording/src/cursor.rs | 141 ++++++++++++++++++++++++++++++---
 1 file changed, 129 insertions(+), 12 deletions(-)

diff --git a/crates/recording/src/cursor.rs b/crates/recording/src/cursor.rs
index 6e49d37aee1..2669866c924 100644
--- a/crates/recording/src/cursor.rs
+++ b/crates/recording/src/cursor.rs
@@ -530,6 +530,7 @@ pub fn spawn_cursor_recorder(
         let flush_interval = Duration::from_secs(CURSOR_FLUSH_INTERVAL_SECS);
         let mut last_cursor_id: Option<String> = None;
         let mut last_cursor_image = None;
+        let mut last_cursor_fingerprint: Option<CursorFingerprint> = None;
         let mut awaiting_start = start_gate.is_some();
 
         loop {
@@ -582,18 +583,29 @@ pub fn spawn_cursor_recorder(
             );
             let cursor_id = if !position_changed && !buttons_changed && last_cursor_id.is_some() {
                 last_cursor_id.clone()
-            } else if let Some(data) = get_cursor_data() {
-                let cursor_id = cursor_id_for_image(
-                    data,
-                    &mut response,
-                    &cursors_dir,
-                    writer.as_ref(),
-                    &mut last_cursor_image,
-                );
-                last_cursor_id = Some(cursor_id.clone());
-                Some(cursor_id)
             } else {
-                last_cursor_id.clone()
+                // While the pointer moves the shape rarely changes, so compare
+                // the raw bitmap first and build the TIFF only for a new shape.
+                let fingerprint = current_cursor_fingerprint();
+                if fingerprint.is_some()
+                    && fingerprint == last_cursor_fingerprint
+                    && last_cursor_id.is_some()
+                {
+                    last_cursor_id.clone()
+                } else if let Some(data) = get_cursor_data() {
+                    let cursor_id = cursor_id_for_image(
+                        data,
+                        &mut response,
+                        &cursors_dir,
+                        writer.as_ref(),
+                        &mut last_cursor_image,
+                    );
+                    last_cursor_id = Some(cursor_id.clone());
+                    last_cursor_fingerprint = fingerprint;
+                    Some(cursor_id)
+                } else {
+                    last_cursor_id.clone()
+                }
             };
 
             let Some(cursor_id) = cursor_id else {
@@ -814,6 +826,82 @@ fn get_cursor_data() -> Option<CursorData> {
     })
 }
 
+/// What tells two cursor shapes apart without encoding them: the image's
+/// rendered pixels, its size and its hotspot.
+#[cfg(target_os = "macos")]
+#[derive(PartialEq)]
+struct CursorFingerprint {
+    pixels: Vec<u8>,
+    bitmap: (usize, usize, usize),
+    size: (u64, u64),
+    hotspot: (u64, u64),
+}
+
+#[cfg(not(target_os = "macos"))]
+#[derive(PartialEq)]
+struct CursorFingerprint;
+
+#[cfg(not(target_os = "macos"))]
+fn current_cursor_fingerprint() -> Option<CursorFingerprint> {
+    None
+}
+
+#[cfg(target_os = "macos")]
+fn current_cursor_fingerprint() -> Option<CursorFingerprint> {
+    use objc::rc::autoreleasepool;
+    use objc2::{ClassType, msg_send, rc::Retained};
+    use objc2_app_kit::NSCursor;
+
+    autoreleasepool(|| unsafe {
+        #[allow(deprecated)]
+        let cursor = NSCursor::currentSystemCursor().or_else(|| {
+            let cursor: Option<Retained<NSCursor>> = msg_send![NSCursor::class(), currentCursor];
+            cursor
+        })?;
+        macos_cursor_fingerprint(&cursor)
+    })
+}
+
+#[cfg(target_os = "macos")]
+fn macos_cursor_fingerprint(cursor: &objc2_app_kit::NSCursor) -> Option<CursorFingerprint> {
+    use core_graphics::image::CGImageRef;
+    use foreign_types_shared::ForeignTypeRef;
+    use objc::{sel, sel_impl};
+    use objc2::{msg_send, rc::Retained};
+    use objc2_app_kit::NSImage;
+
+    unsafe {
+        let image: Option<Retained<NSImage>> = msg_send![cursor, image];
+        let image = image?;
+        let size = image.size();
+        let hotspot = cursor.hotSpot();
+        let image_ptr = Retained::as_ptr(&image) as *mut objc::runtime::Object;
+        let nil = std::ptr::null_mut::<objc::runtime::Object>();
+        // `CGImageForProposedRect:context:hints:` returns an autoreleased
+        // CGImageRef, valid for the caller's autorelease pool.
+        let cg_image: *mut std::ffi::c_void = objc::msg_send![
+            image_ptr,
+            CGImageForProposedRect: std::ptr::null_mut::<std::ffi::c_void>()
+            context: nil
+            hints: nil
+        ];
+        if cg_image.is_null() {
+            return None;
+        }
+        let cg_image = CGImageRef::from_ptr(cg_image.cast());
+        Some(CursorFingerprint {
+            pixels: cg_image.data().bytes().to_vec(),
+            bitmap: (
+                cg_image.width(),
+                cg_image.height(),
+                cg_image.bytes_per_row(),
+            ),
+            size: (size.width.to_bits(), size.height.to_bits()),
+            hotspot: (hotspot.x.to_bits(), hotspot.y.to_bits()),
+        })
+    }
+}
+
 #[cfg(target_os = "macos")]
 fn macos_cursor_data(cursor: &objc2_app_kit::NSCursor) -> Option<CursorData> {
     use objc2::{msg_send, rc::Retained};
@@ -847,7 +935,7 @@ fn macos_cursor_data(cursor: &objc2_app_kit::NSCursor) -> Option<CursorData> {
 
 #[cfg(all(test, target_os = "macos"))]
 mod macos_cursor_tests {
-    use super::macos_cursor_data;
+    use super::{macos_cursor_data, macos_cursor_fingerprint};
     use objc2::{AllocAnyThread, class, msg_send, rc::Retained, runtime::AnyObject};
     use objc2_app_kit::{NSCursor, NSImage};
 
@@ -864,6 +952,35 @@ mod macos_cursor_tests {
         assert!(macos_cursor_data(&cursor).is_none());
     }
 
+    fn cursor_with(color: [u8; 4]) -> Retained<NSCursor> {
+        let mut png = std::io::Cursor::new(Vec::new());
+        image::RgbaImage::from_pixel(8, 8, image::Rgba(color))
+            .write_to(&mut png, image::ImageFormat::Png)
+            .unwrap();
+        let png = png.into_inner();
+        let data: Retained<AnyObject> = unsafe {
+            msg_send![class!(NSData), dataWithBytes: png.as_ptr().cast::<std::ffi::c_void>(), length: png.len()]
+        };
+        let image: Retained<NSImage> = unsafe { msg_send![NSImage::alloc(), initWithData: &*data] };
+        NSCursor::initWithImage_hotSpot(NSCursor::alloc(), &image, Default::default())
+    }
+
+    #[test]
+    fn the_fingerprint_tells_cursor_shapes_apart_without_encoding_them() {
+        let arrow = macos_cursor_fingerprint(&cursor_with([20, 40, 80, 255])).unwrap();
+        let same = macos_cursor_fingerprint(&cursor_with([20, 40, 80, 255])).unwrap();
+        let recolored = macos_cursor_fingerprint(&cursor_with([200, 40, 80, 255])).unwrap();
+        assert!(arrow == same);
+        assert!(arrow != recolored);
+        assert!(!arrow.pixels.is_empty());
+    }
+
+    #[test]
+    fn a_cursor_without_an_image_has_no_fingerprint() {
+        let cursor = unsafe { NSCursor::new() };
+        assert!(macos_cursor_fingerprint(&cursor).is_none());
+    }
+
     #[test]
     fn valid_cursor_keeps_image_and_hotspot() {
         let mut png = std::io::Cursor::new(Vec::new());

From 9bd2a91cdc912e66b8f9f13897988322a7d6e040 Mon Sep 17 00:00:00 2001
From: Richie McIlroy <33632126+richiemcilroy@users.noreply.github.com>
Date: Tue, 20 Oct 2026 12:56:43 +0800
Subject: [PATCH 60/74] fix(gpui): end a frame quietly when its window has
 already closed

---
 .../patches/zed-idle-frames.patch             | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/apps/desktop-gpui/patches/zed-idle-frames.patch b/apps/desktop-gpui/patches/zed-idle-frames.patch
index c9afcbed0ec..fdc9da01286 100644
--- a/apps/desktop-gpui/patches/zed-idle-frames.patch
+++ b/apps/desktop-gpui/patches/zed-idle-frames.patch
@@ -16,7 +16,7 @@ index 0294b7d..6fe853b 100644
      fn on_active_status_change(&self, callback: Box<dyn FnMut(bool)>);
      fn on_hover_status_change(&self, callback: Box<dyn FnMut(bool)>);
 diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
-index 393e517..e5850bf 100644
+index 393e517..18a4e73 100644
 --- a/crates/gpui/src/window.rs
 +++ b/crates/gpui/src/window.rs
 @@ -120,6 +120,53 @@ struct WindowInvalidatorInner {
@@ -120,7 +120,7 @@ index 393e517..e5850bf 100644
          let active = Rc::new(Cell::new(platform_window.is_active()));
          let hovered = Rc::new(Cell::new(platform_window.is_hovered()));
          let needs_present = Rc::new(Cell::new(false));
-@@ -1507,9 +1562,10 @@ impl Window {
+@@ -1507,12 +1562,17 @@ impl Window {
              let invalidator = invalidator.clone();
              let active = active.clone();
              let needs_present = needs_present.clone();
@@ -128,11 +128,21 @@ index 393e517..e5850bf 100644
 +            let pending_frame_callbacks = next_frame_callbacks.clone();
              let input_rate_tracker = input_rate_tracker.clone();
              move |request_frame_options| {
+-                let thermal_state = handle
+-                    .update(&mut cx, |_, _, cx| cx.thermal_state())
+-                    .log_err();
 +                let next_frame_callbacks = &pending_frame_callbacks;
-                 let thermal_state = handle
-                     .update(&mut cx, |_, _, cx| cx.thermal_state())
-                     .log_err();
-@@ -1551,8 +1607,11 @@ impl Window {
++                // A frame can still arrive for a window that was just closed
++                // (its display link or a pending wake); there is nothing to draw.
++                let Ok(thermal_state) = handle.update(&mut cx, |_, _, cx| cx.thermal_state())
++                else {
++                    return;
++                };
++                let thermal_state = Some(thermal_state);
+ 
+                 // Throttle frame rate based on conditions:
+                 // - Thermal pressure (Serious/Critical): cap to ~60fps
+@@ -1551,8 +1611,11 @@ impl Window {
                  }
                  last_frame_time.set(Some(now));
  
@@ -144,7 +154,7 @@ index 393e517..e5850bf 100644
                      handle
                          .update(&mut cx, |_, window, cx| {
                              for callback in next_frame_callbacks {
-@@ -1570,6 +1629,7 @@ impl Window {
+@@ -1570,6 +1633,7 @@ impl Window {
                      || (active.get() && input_rate_tracker.borrow_mut().is_high_rate());
  
                  if invalidator.is_dirty() || request_frame_options.force_render {
@@ -152,7 +162,7 @@ index 393e517..e5850bf 100644
                      measure("frame duration", || {
                          handle
                              .update(&mut cx, |_, window, cx| {
-@@ -1585,6 +1645,7 @@ impl Window {
+@@ -1585,6 +1649,7 @@ impl Window {
                              .log_err();
                      })
                  } else if needs_present {
@@ -160,7 +170,7 @@ index 393e517..e5850bf 100644
                      handle
                          .update(&mut cx, |_, window, _| window.present())
                          .log_err();
-@@ -1595,6 +1656,9 @@ impl Window {
+@@ -1595,6 +1660,9 @@ impl Window {
                          window.complete_frame();
                      })
                      .log_err();
@@ -170,7 +180,7 @@ index 393e517..e5850bf 100644
              }
          }));
          platform_window.on_resize(Box::new({
-@@ -2263,6 +2327,8 @@ impl Window {
+@@ -2263,6 +2331,8 @@ impl Window {
      /// Schedule the given closure to be run directly after the current frame is rendered.
      pub fn on_next_frame(&self, callback: impl FnOnce(&mut Window, &mut App) + 'static) {
          RefCell::borrow_mut(&self.next_frame_callbacks).push(Box::new(callback));
@@ -179,7 +189,7 @@ index 393e517..e5850bf 100644
      }
  
      /// Schedule a frame to be drawn on the next animation frame.
-@@ -6807,6 +6873,83 @@ pub fn outline(
+@@ -6807,6 +6877,83 @@ pub fn outline(
      }
  }
  

From aaa056868a2960f9dc1142dd2bc92d3f8e2e26f1 Mon Sep 17 00:00:00 2001
From: Richie McIlroy <33632126+richiemcilroy@users.noreply.github.com>
Date: Tue, 20 Oct 2026 13:03:56 +0800
Subject: [PATCH 61/74] fix(recording): keep the backup when it holds a legacy
 omitted track, and gate the backup check to unix

---
 crates/recording/src/recovery.rs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/crates/recording/src/recovery.rs b/crates/recording/src/recovery.rs
index 9ca452c1269..96c7618b5f5 100644
--- a/crates/recording/src/recovery.rs
+++ b/crates/recording/src/recovery.rs
@@ -286,8 +286,12 @@ impl RecoveryManager {
 
         // Without a preparing editor nothing reads the originals once they are
         // published, so the backup goes with the stop instead of doubling the
-        // recording's size on disk for good.
-        let unread = preparing.is_none();
+        // recording's size on disk for good -- unless it holds a legacy
+        // omitted track, which publication leaves out and only the backup
+        // keeps.
+        let unread = preparing.is_none()
+            && legacy_omitted_tracks(&incomplete.meta, project_path)
+                .is_ok_and(|tracks| tracks.is_empty());
         let published_workspace = std::cell::RefCell::new(None);
         Self::finalize_with_publication(
             &incomplete,
@@ -5237,8 +5241,8 @@ mod clean_studio_snapshot_tests {
             })
             .unwrap();
         // A stop without a preparing editor retires the original backup once
-        // the published tracks above are in place.
-        assert!(!backup.join("original-segments").exists());
+        // the published tracks above are in place (unix only, for now).
+        assert_eq!(backup.join("original-segments").exists(), !cfg!(unix));
     }
 
     #[test]

From 3e830844c230cd39eab326612479302ab9beb0d3 Mon Sep 17 00:00:00 2001
From: Richie McIlroy <33632126+richiemcilroy@users.noreply.github.com>
Date: Tue, 20 Oct 2026 13:04:57 +0800
Subject: [PATCH 62/74] fix(desktop-gpui): run the bundled CLI when the
 AppImage launcher passes --cap-cli

---
 apps/desktop-gpui/src/main.rs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/apps/desktop-gpui/src/main.rs b/apps/desktop-gpui/src/main.rs
index b05741e9ddc..10cdb7b09fb 100644
--- a/apps/desktop-gpui/src/main.rs
+++ b/apps/desktop-gpui/src/main.rs
@@ -268,6 +268,14 @@ fn main() {
         }
     }
 
+    // The AppImage CLI launcher re-enters the AppImage with `--cap-cli`; hand
+    // it to the bundled CLI before logging, single-instance or the GUI start.
+    #[cfg(target_os = "linux")]
+    if let Err(error) = cap_cli_install::appimage::dispatch_cli() {
+        eprintln!("{error}");
+        std::process::exit(1);
+    }
+
     let _log_guard = init_logging();
 
     single_instance::acquire();

From 5b56697d279bd82688f2b5aca0a08ae11e396e50 Mon Sep 17 00:00:00 2001
From: Richie McIlroy <33632126+richiemcilroy@users.noreply.github.com>
Date: Tue, 20 Oct 2026 13:08:04 +0800
Subject: [PATCH 63/74] fix(recording): read each cursor tick from one snapshot
 and cache only registered images

---
 crates/recording/src/cursor.rs | 99 +++++++++++++++++++---------------
 1 file changed, 57 insertions(+), 42 deletions(-)

diff --git a/crates/recording/src/cursor.rs b/crates/recording/src/cursor.rs
index 2669866c924..f715870a56e 100644
--- a/crates/recording/src/cursor.rs
+++ b/crates/recording/src/cursor.rs
@@ -586,25 +586,30 @@ pub fn spawn_cursor_recorder(
             } else {
                 // While the pointer moves the shape rarely changes, so compare
                 // the raw bitmap first and build the TIFF only for a new shape.
-                let fingerprint = current_cursor_fingerprint();
-                if fingerprint.is_some()
-                    && fingerprint == last_cursor_fingerprint
-                    && last_cursor_id.is_some()
-                {
-                    last_cursor_id.clone()
-                } else if let Some(data) = get_cursor_data() {
-                    let cursor_id = cursor_id_for_image(
-                        data,
-                        &mut response,
-                        &cursors_dir,
-                        writer.as_ref(),
-                        &mut last_cursor_image,
-                    );
-                    last_cursor_id = Some(cursor_id.clone());
-                    last_cursor_fingerprint = fingerprint;
-                    Some(cursor_id)
-                } else {
-                    last_cursor_id.clone()
+                let known = last_cursor_id
+                    .is_some()
+                    .then_some(last_cursor_fingerprint.as_ref())
+                    .flatten();
+                match sample_cursor(known) {
+                    CursorSample::Unchanged => last_cursor_id.clone(),
+                    CursorSample::Read {
+                        fingerprint,
+                        data: Some(data),
+                    } => {
+                        let cursor_id = cursor_id_for_image(
+                            data,
+                            &mut response,
+                            &cursors_dir,
+                            writer.as_ref(),
+                            &mut last_cursor_image,
+                        );
+                        last_cursor_id = Some(cursor_id.clone());
+                        // Only a registered image may short-circuit later ticks;
+                        // a failed decode or save keeps retrying.
+                        last_cursor_fingerprint = last_cursor_image.as_ref().and(fingerprint);
+                        Some(cursor_id)
+                    }
+                    CursorSample::Read { data: None, .. } => last_cursor_id.clone(),
                 }
             };
 
@@ -809,23 +814,6 @@ struct CursorData {
     shape: Option<CursorShape>,
 }
 
-#[cfg(target_os = "macos")]
-fn get_cursor_data() -> Option<CursorData> {
-    use objc::rc::autoreleasepool;
-    use objc2::{ClassType, msg_send, rc::Retained};
-    use objc2_app_kit::NSCursor;
-
-    autoreleasepool(|| unsafe {
-        #[allow(deprecated)]
-        let cursor = NSCursor::currentSystemCursor().or_else(|| {
-            let cursor: Option<Retained<NSCursor>> = msg_send![NSCursor::class(), currentCursor];
-            cursor
-        })?;
-
-        macos_cursor_data(&cursor)
-    })
-}
-
 /// What tells two cursor shapes apart without encoding them: the image's
 /// rendered pixels, its size and its hotspot.
 #[cfg(target_os = "macos")]
@@ -841,24 +829,51 @@ struct CursorFingerprint {
 #[derive(PartialEq)]
 struct CursorFingerprint;
 
+enum CursorSample {
+    /// The cursor still matches the fingerprint of the last registered image.
+    Unchanged,
+    Read {
+        fingerprint: Option<CursorFingerprint>,
+        data: Option<CursorData>,
+    },
+}
+
 #[cfg(not(target_os = "macos"))]
-fn current_cursor_fingerprint() -> Option<CursorFingerprint> {
-    None
+fn sample_cursor(_known: Option<&CursorFingerprint>) -> CursorSample {
+    CursorSample::Read {
+        fingerprint: None,
+        data: get_cursor_data(),
+    }
 }
 
+/// One read of the current cursor per tick: its fingerprint, and its encoded
+/// image only when that fingerprint differs from `known`, both from the same
+/// `NSCursor` so a shape change between two reads can't pair them wrongly.
 #[cfg(target_os = "macos")]
-fn current_cursor_fingerprint() -> Option<CursorFingerprint> {
+fn sample_cursor(known: Option<&CursorFingerprint>) -> CursorSample {
     use objc::rc::autoreleasepool;
     use objc2::{ClassType, msg_send, rc::Retained};
     use objc2_app_kit::NSCursor;
 
     autoreleasepool(|| unsafe {
         #[allow(deprecated)]
-        let cursor = NSCursor::currentSystemCursor().or_else(|| {
+        let Some(cursor) = NSCursor::currentSystemCursor().or_else(|| {
             let cursor: Option<Retained<NSCursor>> = msg_send![NSCursor::class(), currentCursor];
             cursor
-        })?;
-        macos_cursor_fingerprint(&cursor)
+        }) else {
+            return CursorSample::Read {
+                fingerprint: None,
+                data: None,
+            };
+        };
+        let fingerprint = macos_cursor_fingerprint(&cursor);
+        if fingerprint.is_some() && fingerprint.as_ref() == known {
+            return CursorSample::Unchanged;
+        }
+        CursorSample::Read {
+            data: macos_cursor_data(&cursor),
+            fingerprint,
+        }
     })
 }
 

From 78353ef21eeaf9ddf0df772dbfc8876000de8459 Mon Sep 17 00:00:00 2001
From: Richie McIlroy <33632126+richiemcilroy@users.noreply.github.com>
Date: Tue, 20 Oct 2026 13:17:51 +0800
Subject: [PATCH 64/74] fix(recording): allow the macOS-only cursor sample
 variant elsewhere

---
 crates/recording/src/cursor.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/crates/recording/src/cursor.rs b/crates/recording/src/cursor.rs
index f715870a56e..7827d6fe9c9 100644
--- a/crates/recording/src/cursor.rs
+++ b/crates/recording/src/cursor.rs
@@ -814,8 +814,8 @@ struct CursorData {
     shape: Option<CursorShape>,
 }
 
-/// What tells two cursor shapes apart without encoding them: the image's
-/// rendered pixels, its size and its hotspot.
+/// Cheap enough to take every tick (~0.1 ms against ~0.4 ms for the TIFF),
+/// and changes whenever the TIFF would, since both come from the same image.
 #[cfg(target_os = "macos")]
 #[derive(PartialEq)]
 struct CursorFingerprint {
@@ -831,6 +831,7 @@ struct CursorFingerprint;
 
 enum CursorSample {
     /// The cursor still matches the fingerprint of the last registered image.
+    #[cfg_attr(not(target_os = "macos"), allow(dead_code))]
     Unchanged,
     Read {
         fingerprint: Option<CursorFingerprint>,

From 45eef9aebb42424ec18e5f36504ba24a60423338 Mon Sep 17 00:00:00 2001
From: Richie McIlroy <33632126+richiemcilroy@users.noreply.github.com>
Date: Tue, 20 Oct 2026 14:17:09 +0800
Subject: [PATCH 65/74] perf(gpui): draw one frame per wake while a window is
 idle instead of restarting the display link

---
 .../patches/zed-idle-frames.patch             | 294 +++++++++++-------
 1 file changed, 189 insertions(+), 105 deletions(-)

diff --git a/apps/desktop-gpui/patches/zed-idle-frames.patch b/apps/desktop-gpui/patches/zed-idle-frames.patch
index fdc9da01286..e9f7d7cb714 100644
--- a/apps/desktop-gpui/patches/zed-idle-frames.patch
+++ b/apps/desktop-gpui/patches/zed-idle-frames.patch
@@ -1,25 +1,54 @@
 diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
-index 0294b7d..6fe853b 100644
+index 0294b7d..09adcdd 100644
 --- a/crates/gpui/src/platform.rs
 +++ b/crates/gpui/src/platform.rs
-@@ -843,6 +843,12 @@ pub trait PlatformWindow: HasWindowHandle + HasDisplayHandle {
+@@ -793,6 +793,18 @@ pub enum TextInputStateChange {
+     ContentChanged,
+ }
+ 
++/// What [`PlatformWindow::frame_request_toggle`] asks of the platform.
++#[derive(Clone, Copy, Debug, PartialEq, Eq)]
++pub enum FrameRequests {
++    /// Stop requesting frames.
++    Stop,
++    /// Request a frame every display refresh again.
++    Start,
++    /// Deliver one frame as soon as possible without restarting the
++    /// per-refresh requests.
++    Once,
++}
++
+ #[expect(missing_docs)]
+ pub trait PlatformWindow: HasWindowHandle + HasDisplayHandle {
+     #[cfg(all(target_os = "linux", feature = "wayland"))]
+@@ -843,6 +855,12 @@ pub trait PlatformWindow: HasWindowHandle + HasDisplayHandle {
      fn toggle_fullscreen(&self);
      fn is_fullscreen(&self) -> bool;
      fn on_request_frame(&self, callback: Box<dyn FnMut(RequestFrameOptions)>);
-+    /// Returns a switch that stops (`false`) and restarts (`true`) the frame
-+    /// requests delivered to [`Self::on_request_frame`]. Windows stop them while
-+    /// they have nothing to draw. Platforms without one keep requesting frames.
-+    fn frame_request_toggle(&self) -> Option<Box<dyn Fn(bool)>> {
++    /// Returns a switch over the frame requests delivered to
++    /// [`Self::on_request_frame`]. Windows stop them while they have nothing to
++    /// draw. Platforms without one keep requesting frames.
++    fn frame_request_toggle(&self) -> Option<Box<dyn Fn(FrameRequests)>> {
 +        None
 +    }
      fn on_input(&self, callback: Box<dyn FnMut(PlatformInput) -> DispatchEventResult>);
      fn on_active_status_change(&self, callback: Box<dyn FnMut(bool)>);
      fn on_hover_status_change(&self, callback: Box<dyn FnMut(bool)>);
 diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
-index 393e517..18a4e73 100644
+index 393e517..de95b7d 100644
 --- a/crates/gpui/src/window.rs
 +++ b/crates/gpui/src/window.rs
-@@ -120,6 +120,53 @@ struct WindowInvalidatorInner {
+@@ -9,7 +9,8 @@ use crate::{
+     Hsla, InputHandler, IsZero, KeyBinding, KeyContext, KeyDownEvent, KeyEvent, Keystroke,
+     KeystrokeEvent, LayoutId, LineLayoutIndex, Modifiers, ModifiersChangedEvent, MonochromeSprite,
+     MouseButton, MouseEvent, MouseMoveEvent, MouseUpEvent, Path, Pixels, PlatformAtlas,
+-    PlatformDisplay, PlatformInput, PlatformInputHandler, PlatformWindow, Point, PolychromeSprite,
++    FrameRequests, PlatformDisplay, PlatformInput, PlatformInputHandler, PlatformWindow, Point,
++    PolychromeSprite,
+     Priority, PromptButton, PromptLevel, Quad, Render, RenderGlyphParams, RenderImage,
+     RenderImageParams, RenderSvgParams, Replay, ResizeEdge, SMOOTH_SVG_SCALE_FACTOR,
+     SUBPIXEL_VARIANTS_X, SUBPIXEL_VARIANTS_Y, BackdropBlur, ScaledPixels, Scene, Shadow, SharedString, Size,
+@@ -120,6 +121,69 @@ struct WindowInvalidatorInner {
      pub dirty_views: FxHashSet<EntityId>,
      pub update_count: usize,
      pub frame_dirty: FrameDirtyAccumulator,
@@ -27,12 +56,16 @@ index 393e517..18a4e73 100644
 +}
 +
 +/// Stops the platform's frame requests once a window has had nothing to draw
-+/// for [`FramePacer::IDLE_DELAY`], and restarts them as soon as anything
-+/// invalidates the window or schedules a next-frame callback. Without this an
-+/// idle window still wakes the main thread on every display refresh.
++/// for [`FramePacer::IDLE_DELAY`]. While stopped, an invalidation or a
++/// next-frame callback asks for a single frame, and the per-refresh requests
++/// only restart if work is still pending after it (an animation). Without this
++/// an idle window wakes the main thread on every display refresh, and a window
++/// that redraws a few times a second (a level meter, a clock) keeps the
++/// requests running between its redraws.
 +pub(crate) struct FramePacer {
-+    toggle: Option<Box<dyn Fn(bool)>>,
++    toggle: Option<Box<dyn Fn(FrameRequests)>>,
 +    paused: Cell<bool>,
++    once_pending: Cell<bool>,
 +    busy_at: Cell<Instant>,
 +}
 +
@@ -41,39 +74,51 @@ index 393e517..18a4e73 100644
 +    /// stop and restart the frame source between frames.
 +    const IDLE_DELAY: Duration = Duration::from_millis(100);
 +
-+    fn new(toggle: Option<Box<dyn Fn(bool)>>) -> Self {
++    fn new(toggle: Option<Box<dyn Fn(FrameRequests)>>) -> Self {
 +        FramePacer {
 +            toggle,
 +            paused: Cell::new(false),
++            once_pending: Cell::new(false),
 +            busy_at: Cell::new(Instant::now()),
 +        }
 +    }
 +
 +    fn wake(&self) {
 +        if let Some(toggle) = &self.toggle
-+            && self.paused.replace(false)
++            && self.paused.get()
++            && !self.once_pending.replace(true)
 +        {
-+            self.busy_at.set(Instant::now());
-+            toggle(true);
++            toggle(FrameRequests::Once);
 +        }
 +    }
 +
-+    fn frame_finished(&self, busy: bool, now: Instant) {
++    /// `busy`: the frame did work. `pending`: work is left for the next frame.
++    fn frame_finished(&self, busy: bool, pending: bool, now: Instant) {
 +        let Some(toggle) = &self.toggle else {
 +            return;
 +        };
-+        if busy {
++        if self.paused.get() {
++            self.once_pending.set(false);
++            if pending {
++                self.paused.set(false);
++                self.busy_at.set(now);
++                toggle(FrameRequests::Start);
++            } else {
++                // Also stops a link the platform restarted on its own (a window
++                // shown again while it had nothing to draw).
++                toggle(FrameRequests::Stop);
++            }
++        } else if busy || pending {
 +            self.busy_at.set(now);
-+        } else if now.duration_since(self.busy_at.get()) >= Self::IDLE_DELAY
-+            && !self.paused.replace(true)
-+        {
-+            toggle(false);
++        } else if now.duration_since(self.busy_at.get()) >= Self::IDLE_DELAY {
++            self.paused.set(true);
++            toggle(FrameRequests::Stop);
 +        }
 +    }
  }
  
  /// Per-frame invalidation bookkeeping, drained at draw time and emitted to the
-@@ -138,7 +185,7 @@ pub(crate) struct WindowInvalidator {
+@@ -138,7 +202,7 @@ pub(crate) struct WindowInvalidator {
  }
  
  impl WindowInvalidator {
@@ -82,7 +127,7 @@ index 393e517..18a4e73 100644
          WindowInvalidator {
              inner: Rc::new(RefCell::new(WindowInvalidatorInner {
                  dirty: true,
-@@ -146,6 +193,7 @@ impl WindowInvalidator {
+@@ -146,6 +210,7 @@ impl WindowInvalidator {
                  dirty_views: FxHashSet::default(),
                  update_count: 0,
                  frame_dirty: FrameDirtyAccumulator::default(),
@@ -90,7 +135,7 @@ index 393e517..18a4e73 100644
              })),
          }
      }
-@@ -157,6 +205,9 @@ impl WindowInvalidator {
+@@ -157,6 +222,9 @@ impl WindowInvalidator {
          if inner.draw_phase == DrawPhase::None {
              Self::record_frame_dirty(&mut inner);
              inner.dirty = true;
@@ -100,7 +145,7 @@ index 393e517..18a4e73 100644
              cx.push_effect(Effect::Notify { emitter: entity });
              true
          } else {
-@@ -174,6 +225,9 @@ impl WindowInvalidator {
+@@ -174,6 +242,9 @@ impl WindowInvalidator {
          if dirty {
              inner.update_count += 1;
              Self::record_frame_dirty(&mut inner);
@@ -110,7 +155,7 @@ index 393e517..18a4e73 100644
          }
      }
  
-@@ -1390,7 +1444,8 @@ impl Window {
+@@ -1390,7 +1461,8 @@ impl Window {
          let scale_factor = platform_window.scale_factor();
          let appearance = platform_window.appearance();
          let text_system = Arc::new(WindowTextSystem::new(cx.text_system().clone()));
@@ -120,7 +165,7 @@ index 393e517..18a4e73 100644
          let active = Rc::new(Cell::new(platform_window.is_active()));
          let hovered = Rc::new(Cell::new(platform_window.is_hovered()));
          let needs_present = Rc::new(Cell::new(false));
-@@ -1507,12 +1562,17 @@ impl Window {
+@@ -1507,12 +1579,17 @@ impl Window {
              let invalidator = invalidator.clone();
              let active = active.clone();
              let needs_present = needs_present.clone();
@@ -142,7 +187,13 @@ index 393e517..18a4e73 100644
  
                  // Throttle frame rate based on conditions:
                  // - Thermal pressure (Serious/Critical): cap to ~60fps
-@@ -1551,8 +1611,11 @@ impl Window {
+@@ -1546,13 +1623,17 @@ impl Window {
+                         handle
+                             .update(&mut cx, |_, window, _| window.complete_frame())
+                             .log_err();
++                        frame_pacer.frame_finished(true, true, now);
+                         return;
+                     }
                  }
                  last_frame_time.set(Some(now));
  
@@ -154,7 +205,7 @@ index 393e517..18a4e73 100644
                      handle
                          .update(&mut cx, |_, window, cx| {
                              for callback in next_frame_callbacks {
-@@ -1570,6 +1633,7 @@ impl Window {
+@@ -1570,6 +1651,7 @@ impl Window {
                      || (active.get() && input_rate_tracker.borrow_mut().is_high_rate());
  
                  if invalidator.is_dirty() || request_frame_options.force_render {
@@ -162,7 +213,7 @@ index 393e517..18a4e73 100644
                      measure("frame duration", || {
                          handle
                              .update(&mut cx, |_, window, cx| {
-@@ -1585,6 +1649,7 @@ impl Window {
+@@ -1585,6 +1667,7 @@ impl Window {
                              .log_err();
                      })
                  } else if needs_present {
@@ -170,17 +221,17 @@ index 393e517..18a4e73 100644
                      handle
                          .update(&mut cx, |_, window, _| window.present())
                          .log_err();
-@@ -1595,6 +1660,9 @@ impl Window {
+@@ -1595,6 +1678,9 @@ impl Window {
                          window.complete_frame();
                      })
                      .log_err();
 +
-+                busy |= invalidator.is_dirty() || !pending_frame_callbacks.borrow().is_empty();
-+                frame_pacer.frame_finished(busy, now);
++                let pending = invalidator.is_dirty() || !pending_frame_callbacks.borrow().is_empty();
++                frame_pacer.frame_finished(busy, pending, now);
              }
          }));
          platform_window.on_resize(Box::new({
-@@ -2263,6 +2331,8 @@ impl Window {
+@@ -2263,6 +2349,8 @@ impl Window {
      /// Schedule the given closure to be run directly after the current frame is rendered.
      pub fn on_next_frame(&self, callback: impl FnOnce(&mut Window, &mut App) + 'static) {
          RefCell::borrow_mut(&self.next_frame_callbacks).push(Box::new(callback));
@@ -189,84 +240,99 @@ index 393e517..18a4e73 100644
      }
  
      /// Schedule a frame to be drawn on the next animation frame.
-@@ -6807,6 +6877,83 @@ pub fn outline(
+@@ -6807,6 +6895,98 @@ pub fn outline(
      }
  }
  
 +#[cfg(test)]
 +mod frame_pacer_tests {
-+    use super::{FramePacer, Instant};
++    use super::{FramePacer, FrameRequests, Instant};
 +    use std::{cell::RefCell, rc::Rc, time::Duration};
 +
-+    fn recording_pacer() -> (FramePacer, Rc<RefCell<Vec<bool>>>, Instant) {
++    fn recording_pacer() -> (FramePacer, Rc<RefCell<Vec<FrameRequests>>>, Instant) {
 +        let calls = Rc::new(RefCell::new(Vec::new()));
 +        let recorded = calls.clone();
-+        let pacer = FramePacer::new(Some(Box::new(move |enabled| {
-+            recorded.borrow_mut().push(enabled)
++        let pacer = FramePacer::new(Some(Box::new(move |request| {
++            recorded.borrow_mut().push(request)
 +        })));
 +        let created = pacer.busy_at.get();
 +        (pacer, calls, created)
 +    }
 +
-+    #[test]
-+    fn idle_frames_stop_requests_only_after_the_delay() {
++    fn stopped_pacer() -> (FramePacer, Rc<RefCell<Vec<FrameRequests>>>, Instant) {
 +        let (pacer, calls, start) = recording_pacer();
-+        pacer.frame_finished(false, start + Duration::from_millis(99));
-+        assert!(calls.borrow().is_empty());
-+        pacer.frame_finished(false, start + FramePacer::IDLE_DELAY);
-+        assert_eq!(*calls.borrow(), [false]);
++        pacer.frame_finished(false, false, start + FramePacer::IDLE_DELAY);
++        calls.borrow_mut().clear();
++        (pacer, calls, start + FramePacer::IDLE_DELAY)
 +    }
 +
 +    #[test]
-+    fn a_busy_frame_restarts_the_delay() {
++    fn idle_frames_stop_requests_only_after_the_delay() {
 +        let (pacer, calls, start) = recording_pacer();
-+        pacer.frame_finished(true, start + Duration::from_millis(90));
-+        pacer.frame_finished(false, start + Duration::from_millis(150));
++        pacer.frame_finished(false, false, start + Duration::from_millis(99));
 +        assert!(calls.borrow().is_empty());
-+        pacer.frame_finished(false, start + Duration::from_millis(190));
-+        assert_eq!(*calls.borrow(), [false]);
++        pacer.frame_finished(false, false, start + FramePacer::IDLE_DELAY);
++        assert_eq!(*calls.borrow(), [FrameRequests::Stop]);
 +    }
 +
 +    #[test]
-+    fn repeated_idle_frames_stop_requests_once() {
++    fn busy_or_pending_frames_restart_the_delay() {
 +        let (pacer, calls, start) = recording_pacer();
-+        for ms in [100, 120, 500] {
-+            pacer.frame_finished(false, start + Duration::from_millis(ms));
-+        }
-+        assert_eq!(*calls.borrow(), [false]);
++        pacer.frame_finished(true, false, start + Duration::from_millis(90));
++        pacer.frame_finished(false, true, start + Duration::from_millis(150));
++        pacer.frame_finished(false, false, start + Duration::from_millis(240));
++        assert!(calls.borrow().is_empty());
++        pacer.frame_finished(false, false, start + Duration::from_millis(250));
++        assert_eq!(*calls.borrow(), [FrameRequests::Stop]);
 +    }
 +
 +    #[test]
-+    fn wake_restarts_requests_once_and_only_when_stopped() {
-+        let (pacer, calls, start) = recording_pacer();
++    fn a_stopped_window_asks_for_one_frame_per_wake() {
++        let (pacer, calls, now) = stopped_pacer();
 +        pacer.wake();
-+        assert!(calls.borrow().is_empty());
-+        pacer.frame_finished(false, start + FramePacer::IDLE_DELAY);
 +        pacer.wake();
++        assert_eq!(*calls.borrow(), [FrameRequests::Once]);
++        // The single frame drew everything: requests stay stopped.
++        pacer.frame_finished(true, false, now + Duration::from_millis(50));
 +        pacer.wake();
-+        assert_eq!(*calls.borrow(), [false, true]);
++        assert_eq!(
++            *calls.borrow(),
++            [FrameRequests::Once, FrameRequests::Stop, FrameRequests::Once]
++        );
 +    }
 +
 +    #[test]
-+    fn a_woken_window_waits_a_full_delay_before_stopping_again() {
-+        let (pacer, calls, start) = recording_pacer();
-+        pacer.frame_finished(false, start + FramePacer::IDLE_DELAY);
++    fn work_left_after_a_single_frame_restarts_requests() {
++        let (pacer, calls, now) = stopped_pacer();
 +        pacer.wake();
-+        let woken = pacer.busy_at.get();
-+        pacer.frame_finished(false, woken + Duration::from_millis(50));
-+        assert_eq!(*calls.borrow(), [false, true]);
-+        pacer.frame_finished(false, woken + FramePacer::IDLE_DELAY);
-+        assert_eq!(*calls.borrow(), [false, true, false]);
++        pacer.frame_finished(true, true, now + Duration::from_millis(5));
++        assert_eq!(*calls.borrow(), [FrameRequests::Once, FrameRequests::Start]);
++        // Running again: wakes ask for nothing, and the idle delay applies anew.
++        pacer.wake();
++        pacer.frame_finished(false, false, now + Duration::from_millis(50));
++        assert_eq!(*calls.borrow(), [FrameRequests::Once, FrameRequests::Start]);
++        pacer.frame_finished(false, false, now + Duration::from_millis(105));
++        assert_eq!(
++            *calls.borrow(),
++            [FrameRequests::Once, FrameRequests::Start, FrameRequests::Stop]
++        );
++    }
++
++    #[test]
++    fn a_frame_from_a_link_the_platform_restarted_stops_it_again() {
++        let (pacer, calls, now) = stopped_pacer();
++        pacer.frame_finished(false, false, now + Duration::from_millis(8));
++        assert_eq!(*calls.borrow(), [FrameRequests::Stop]);
 +    }
 +
 +    #[test]
 +    fn without_a_platform_toggle_nothing_is_tracked() {
 +        let pacer = FramePacer::new(None);
 +        let start = pacer.busy_at.get();
-+        pacer.frame_finished(false, start + FramePacer::IDLE_DELAY);
++        pacer.frame_finished(false, false, start + FramePacer::IDLE_DELAY);
 +        assert!(!pacer.paused.get());
 +        pacer.wake();
-+        assert!(!pacer.paused.get());
++        assert!(!pacer.once_pending.get());
 +    }
 +}
 +
@@ -274,9 +340,18 @@ index 393e517..18a4e73 100644
  mod tests {
      use crate::{
 diff --git a/crates/gpui_macos/src/window.rs b/crates/gpui_macos/src/window.rs
-index f5b2c1a..e3e4b34 100644
+index f5b2c1a..96f7826 100644
 --- a/crates/gpui_macos/src/window.rs
 +++ b/crates/gpui_macos/src/window.rs
+@@ -24,7 +24,7 @@ use cocoa::{
+ };
+ use dispatch2::DispatchQueue;
+ use gpui::{
+-    AnyWindowHandle, BackgroundExecutor, Bounds, Capslock, CursorStyle, ExternalPaths,
++    AnyWindowHandle, BackgroundExecutor, Bounds, Capslock, CursorStyle, ExternalPaths, FrameRequests,
+     FileDropEvent, ForegroundExecutor, KeyDownEvent, Keystroke, Modifiers, ModifiersChangedEvent,
+     MouseButton, MouseDownEvent, MouseMoveEvent, MouseUpEvent, Pixels, PlatformAtlas,
+     PlatformDisplay, PlatformInput, PlatformInputHandler, PlatformWindow, Point, PromptButton,
 @@ -499,6 +499,7 @@ struct MacWindowState {
      frame_source: Option<WindowFrameSource>,
      renderer: renderer::Renderer,
@@ -303,49 +378,58 @@ index f5b2c1a..e3e4b34 100644
                  event_callback: None,
                  activate_callback: None,
                  resize_callback: None,
-@@ -1670,6 +1675,48 @@ impl PlatformWindow for MacWindow {
+@@ -1670,6 +1675,57 @@ impl PlatformWindow for MacWindow {
          self.0.as_ref().lock().request_frame_callback = Some(callback);
      }
  
-+    fn frame_request_toggle(&self) -> Option<Box<dyn Fn(bool)>> {
++    fn frame_request_toggle(&self) -> Option<Box<dyn Fn(FrameRequests)>> {
 +        let window_state = Arc::downgrade(&self.0);
-+        Some(Box::new(move |enabled| {
++        Some(Box::new(move |request| {
 +            let Some(window_state) = window_state.upgrade() else {
 +                return;
 +            };
 +            let mut lock = window_state.lock();
-+            lock.frame_requests_paused = !enabled;
-+            if !enabled {
-+                lock.stop_display_link();
-+                return;
-+            }
-+            lock.start_display_link();
-+            // A hidden window draws nothing until it is shown again, when the
-+            // occlusion handler restarts its display link.
-+            let visible = unsafe {
-+                lock.native_window
-+                    .occlusionState()
-+                    .contains(NSWindowOcclusionState::NSWindowOcclusionStateVisible)
-+            };
-+            if !visible {
-+                return;
-+            }
-+            // A restarted display link first fires a refresh or two later, so
-+            // draw the frame that woke the window right away instead.
-+            let window_state = Arc::downgrade(&window_state);
-+            lock.foreground_executor
-+                .spawn(async move {
-+                    let Some(window_state) = window_state.upgrade() else {
-+                        return;
++            match request {
++                FrameRequests::Stop => {
++                    lock.frame_requests_paused = true;
++                    lock.stop_display_link();
++                }
++                FrameRequests::Start => {
++                    lock.frame_requests_paused = false;
++                    lock.start_display_link();
++                }
++                FrameRequests::Once => {
++                    let visible = unsafe {
++                        lock.native_window
++                            .occlusionState()
++                            .contains(NSWindowOcclusionState::NSWindowOcclusionStateVisible)
 +                    };
-+                    let Some(mut callback) = window_state.lock().request_frame_callback.take()
-+                    else {
++                    if !visible {
++                        // A hidden window draws nothing now; let the occlusion
++                        // handler start its link when it is shown, and the
++                        // first frame after that draws what changed meanwhile.
++                        lock.frame_requests_paused = false;
 +                        return;
-+                    };
-+                    callback(Default::default());
-+                    window_state.lock().request_frame_callback = Some(callback);
-+                })
-+                .detach();
++                    }
++                    // Draw the frame that woke the window now: a restarted
++                    // display link first fires a refresh or two later.
++                    let window_state = Arc::downgrade(&window_state);
++                    lock.foreground_executor
++                        .spawn(async move {
++                            let Some(window_state) = window_state.upgrade() else {
++                                return;
++                            };
++                            let Some(mut callback) =
++                                window_state.lock().request_frame_callback.take()
++                            else {
++                                return;
++                            };
++                            callback(Default::default());
++                            window_state.lock().request_frame_callback = Some(callback);
++                        })
++                        .detach();
++                }
++            }
 +        }))
 +    }
 +

From 0da8f6d4d994d0c75ded92b8262bf6731e9c9c72 Mon Sep 17 00:00:00 2001
From: Richie McIlroy <33632126+richiemcilroy@users.noreply.github.com>
Date: Tue, 20 Oct 2026 22:05:50 +0800
Subject: [PATCH 66/74] 0.6.1

---
 apps/web/content/changelog/desktop/104.mdx | 94 ++++++++++++++++++++++
 1 file changed, 94 insertions(+)
 create mode 100644 apps/web/content/changelog/desktop/104.mdx

diff --git a/apps/web/content/changelog/desktop/104.mdx b/apps/web/content/changelog/desktop/104.mdx
new file mode 100644
index 00000000000..34f989aa792
--- /dev/null
+++ b/apps/web/content/changelog/desktop/104.mdx
@@ -0,0 +1,94 @@
+---
+title: Fully Native Cap, Faster Everything & Hundreds of Fixes
+app: Cap Desktop
+publishedAt: "2026-10-20"
+version: 0.6.1
+image:
+---
+
+Cap is now a fully native app. Compared with the Tauri app, editor playback uses 77% less CPU and 88% less memory, recording uses 46% less CPU and 87% less memory, and Linux downloads are up to 57% smaller. 0.6.1 also brings faster exports and more than 180 fixes and improvements across recording, editing and export.
+
+## The native app
+
+- **Native Cap is now the only Cap** - The GPUI app replaces the old Tauri app on every platform. 0.6.0 updates in place: recordings, settings and macOS permissions carry over, with nothing to reinstall.
+- **Lighter and faster than Tauri** - Editor playback holds a steady 60 fps (up from 56) with 77% less CPU and 88% less memory (440 MB vs 3.7 GB). Recording uses 46% less CPU and 87% less memory (256 MB vs 2 GB).
+- **Much smaller downloads** - Linux packages are less than half their old size (DEB 224 → 97 MB, AppImage 265 → 131 MB), and macOS and Windows downloads are smaller too.
+- **Signed native updater** - Updates are verified while they download, show progress in Settings and finish with a "Restart to update" prompt. Switching channels cancels any pending update from the old channel.
+- **New onboarding** - A welcome screen with an animated sky, then a step-by-step permissions checklist. On macOS, a drag-to-grant guide follows System Settings, and Cap relaunches itself when Screen Recording needs it.
+- **Native look and feel** - Uses the system font (SF Pro on macOS, Segoe UI on Windows), grouped settings, glass capture buttons and Control Center style camera and microphone lists.
+- **Editor window placement** - On macOS the editor opens at a size that fits your display and reopens where you left it on each display.
+- **Reduce Motion** - Animations follow the macOS Reduce Motion setting.
+
+## Features
+
+- **Shortcuts, rebuilt** - Shortcuts are grouped into Screenshots, Recording and While recording, and each row explains what it does. Start Studio and Start Instant recording can now be bound from this page.
+- **After-capture choices** - Choose what happens after a screenshot (open editor, copy, copy and edit, or do nothing) and after a Studio recording (open editor, show Cap, or do nothing).
+- **Better background removal** - On macOS, only the main person is kept, so people behind you are removed. Edges are sharper and steadier, and the live preview runs at 720p.
+- **Captions for long recordings** - Recordings longer than 6m40s can now be captioned with the Recommended model, and long transcriptions run up to 44% faster.
+- **Camera and microphone access** - The app shows clearly when camera or mic access is missing or pending instead of an endless spinner, and picks the device up again once access is granted.
+- **System audio remembered** - The system audio toggle keeps its setting between launches.
+
+## Recording and sync
+
+- **Audio and video stay in sync** - Fixed video drifting ahead of audio after dropped frames at recording start, frames stamped with their processing time instead of their capture time, and dropped audio samples when audio latency improved partway through a recording.
+- **Instant mode sync** - Microphone, system audio and screen now start together. System audio could start up to 60 ms off, and a slow mic up to a second early.
+- **Camera alignment** - The camera no longer plays ahead of the screen when it started recording first.
+- **Idle-screen frame rate** - Studio recordings of mostly static screens keep their real frame rate. Previously, exports dropped frames and sync drifted. Existing recordings are repaired when opened.
+- **Steadier camera** - Camera frames are kept through brief system stalls, and Windows no longer duplicates camera frames under normal timing jitter.
+- **Cursor through slow drives** - Cursor, click and key data keep recording when an SD card, external drive or network drive stalls.
+- **Crash recovery** - Recovered recordings keep their last finished fragment and their track timing. Static screens are flushed every 2 seconds, so a crash can no longer lose 10+ seconds. Footage is recovered after an early muxer restart.
+- **58 crash and hang fixes** - A new stress suite found and fixed crashes from mics that send empty buffers or change format during device switches, screen or camera buffers that change size mid-recording, and damaged project files.
+- **5K and 6K displays** - Studio recordings on displays over 4096 px wide are scaled by macOS during capture, so they are no longer resized afterwards.
+
+## Editing and export fixes
+
+- **True export colors** - Exports now use the BT.709 color standard they are tagged with, so backgrounds, captions and overlays match the colors you picked in the editor.
+- **Correct frames in playback and export** - Fixed decoders that sometimes showed the wrong frame on macOS (including a camera that could run far ahead in long exports), Windows and Linux. Also fixed stale frames in cross-fades and after seeks, and the frame-before-the-requested-one bug.
+- **Export under load** - Exports keep every frame in order even when the machine is busy.
+- **Windows export judder** - Exports no longer hold a frame too long and then jump ahead.
+- **Smaller macOS exports** - macOS exports could come out up to 3x larger than needed. They now use a 2 second keyframe interval and match the size estimate.
+- **Captions in exports** - Captions that appear in the editor now always appear in exports. Deleting a caption word no longer cuts footage. Unicode captions break correctly.
+- **Closing titles** - Fullscreen titles placed at the very end of a video now play and export.
+- **Audio editing** - Changing audio sync offsets updates playback immediately and moves the waveform with them. Trimming the start of an audio track keeps the remaining audio in place.
+- **Auto zoom** - Auto zooms land at the right time on multi-take, trimmed or speed-changed timelines, and frame an idle cursor before it moves.
+- **Mask timing** - Mask animations follow clip speed changes.
+- **Image backgrounds** - Image backgrounds are re-cropped when you change the aspect ratio.
+- **Adding clips** - Recording or importing a new clip keeps your place on the timeline. Imported videos keep their final frame.
+- **Odd-sized videos** - Videos with odd widths or heights keep correct colors at the edges.
+- **Cross-platform projects** - Projects recorded on Windows open on macOS and Linux, keyboard overlays included.
+- **MOV and GIF** - Full MOV exports from Automations and the CLI include the recording, not just the background. Cancelled GIF exports no longer leave a broken file.
+
+## App fixes
+
+- **Global shortcuts** - Shortcuts keep working after the first target picker opens. Screenshot shortcuts from another app bring the editor to the front. Recording shortcuts no longer fail on a window that no longer exists.
+- **Microphone released** - Cap releases the microphone when its main window is hidden, so the mic indicator turns off.
+- **Memory** - Closing the editor frees its memory (about 100 MB per open before). Fixed a camera blur and background removal leak of up to 1.4 GB per minute on macOS. The caption model no longer holds 2 GB after captions finish.
+- **Mac sleep** - An open, idle editor no longer keeps your Mac from sleeping.
+- **Sign-in** - Sign-in completes even when the browser responds slowly. Only one sign-in runs at a time, and signing out stays signed out.
+- **Screen Recording permission** - Stale permission grants after an update are detected, so Cap guides you through granting again instead of failing to record.
+- **Instant uploads** - Live uploads survive brief network failures, and quitting Cap no longer uses up upload retries.
+- **Settings saves** - Saving settings at the same moment as a background update no longer loses a change.
+- **Touch Bar Macs** - Fixed a crash when starting a recording on Intel MacBook Pros with a Touch Bar.
+- **No startup flash** - The main window no longer flashes before onboarding on first launch.
+- **Windows** - The ✕ button closes to the tray and releases the camera. Launching Cap again brings the running window back. Restarting or shutting down no longer triggers an "exited unexpectedly" warning. Overlays and recording controls now appear on the correct monitor when displays use different scaling. Updating from 0.6.0 asks you to close the old native app instead of failing.
+- **Linux** - Studio export and editor audio work with comma-decimal locales such as pt_BR. The tray can stop a recording when Wayland global shortcuts are unavailable (GNOME 50). Packages declare their glibc 2.39 requirement instead of failing on launch.
+- **CLI** - `cap record --mode instant` uses a start gate for proper sync and no longer locks the camera on macOS. `--json` returns JSON for validation errors.
+
+## Performance
+
+- **Faster exports** - macOS hardware exports are 18–27% faster, with about 11% less CPU. Export audio is encoded on its own thread (with AudioToolbox on macOS). ProRes MOV exports use every core, about 4x faster.
+- **Windows speed** - Editor playback decoding is about 3x faster, 1080p60 exports are 23% faster, and recording uses about 20% less CPU.
+- **Linux speed** - X11 recording at 1080p reaches about 59 fps (from 41). Instant camera overlays render 4–9x faster, and video decoding uses multiple threads.
+- **Faster editor opening** - The first frame of long projects appears up to 3.8x sooner. Recording details are read from file headers, and project files with long transcripts load about 2.5x faster.
+- **Smoother editing** - Scrubbing, live appearance edits and zoom changes on long recordings no longer slow down as the playhead moves later. Captions render up to 7.6x faster and keyboard overlays 2.8x faster. Long clip lists stay responsive.
+- **Faster Studio stop** - Finalization checks run in parallel, audio is validated during the remux, and the GPU device is ready before you stop.
+- **Camera effects** - Background blur and removal use less than half the CPU on macOS.
+- **Captions** - Preparing captions for long recordings uses hundreds of MB less memory.
+- **Imports and screenshots** - Video imports are up to 1.9x faster. Screenshots save faster by encoding PNGs on multiple cores. Copying unannotated screenshots is 8x faster, and the first text annotation export is 24x faster.
+- **Library** - Recordings and Recents load with 80% less scanning in large libraries, tray thumbnails load in 20 ms instead of 1.6 s, and settings thumbnails decode in parallel.
+- **Uploads** - Multipart uploads reuse connections, and Instant share links are confirmed sooner after you stop.
+- **Lower idle CPU** - Hidden windows and an idle target picker stop redrawing. The recording bar repaints only when it changes, and the mic meter runs off the main thread. Global shortcuts no longer wake Linux 20 times a second.
+
+## Thanks
+
+A huge thank you to everyone who contributed to this release: @yashranaway, @Hona, @AatmanAJ, @AksharP5, @tadhgdowdall, @jatmn, @celeroncoder, @YoavLevavi, @Theophilus2003, @viralcodex, @unhingedpanda, @notkainoa, @nikolas-sapa, @himanshu748, @dheeraj-juvvadi, @cesarfrancots, @x1xhlol, @wleeaf, @vagxrth, @shubhook, @qflen, @patrickballard, @mihir0209, @melcheikh, @maddiedreese, @hridaya423, @harshav167, @dennisimoo, @colinvkim, @cartesian-plane, @apoorvdarshan, @ajanraj, @Zingzy, @The-Best-Codes, @Supernova-45, @SoulSniper-V2, @OptimistOtaku, @JeffreyLin1, @Ehsan-hash, @EfeDurmaz16 and @Aqua-123.

From 7185eec9e0fdb0df66b22a3af0b947ef519803fa Mon Sep 17 00:00:00 2001
From: Richie McIlroy <33632126+richiemcilroy@users.noreply.github.com>
Date: Tue, 20 Oct 2026 23:50:59 +0800
Subject: [PATCH 67/74] fix: show Loom concierge errors in production and keep
 open customer questions

---
 apps/web/actions/loom-concierge.tsx           | 100 +++++++++-----
 apps/web/actions/loom.ts                      | 128 ++++++++++++------
 .../loom-migrations/LoomMigrationQueue.tsx    |  61 +++++----
 .../migrations/loom/LoomMigrationPage.tsx     |  13 +-
 apps/web/lib/loom-concierge.ts                |  37 +++--
 apps/web/lib/loom-migration-state.ts          |  42 ++++--
 6 files changed, 263 insertions(+), 118 deletions(-)

diff --git a/apps/web/actions/loom-concierge.tsx b/apps/web/actions/loom-concierge.tsx
index 007584ce806..66f5e4c114c 100644
--- a/apps/web/actions/loom-concierge.tsx
+++ b/apps/web/actions/loom-concierge.tsx
@@ -24,9 +24,11 @@ import {
 	requireCustomerMigrationAccess,
 	requireMigrationOperator,
 	requireProCustomerMigrationAccess,
+	toLoomMigrationResult,
 } from "@/lib/loom-concierge";
 import {
 	LOOM_MIGRATION_STATUS_LABELS,
+	LoomMigrationError,
 	type LoomMigrationStatus,
 	normalizeMigrationText,
 	validateOperatorMigrationUpdate,
@@ -51,14 +53,14 @@ function refreshMigrationPages() {
 
 async function findMigration(requestId: string) {
 	if (typeof requestId !== "string" || !/^[A-Za-z0-9_-]{15}$/.test(requestId)) {
-		throw new Error("Invalid migration request.");
+		throw new LoomMigrationError("Invalid migration request.");
 	}
 	const [request] = await db()
 		.select()
 		.from(loomMigrationRequests)
 		.where(eq(loomMigrationRequests.id, requestId))
 		.limit(1);
-	if (!request) throw new Error("Migration request not found.");
+	if (!request) throw new LoomMigrationError("Migration request not found.");
 	return request;
 }
 
@@ -73,15 +75,21 @@ export async function getLoomMigrationDashboard(
 	return { isPro, requests };
 }
 
-export async function requestLoomMigration({
-	organizationId,
-	workspaceName,
-	note,
-}: {
+type LoomMigrationRequestInput = {
 	organizationId: Organisation.OrganisationId;
 	workspaceName: string;
 	note: string;
-}) {
+};
+
+export async function requestLoomMigration(input: LoomMigrationRequestInput) {
+	return toLoomMigrationResult(() => createMigrationRequest(input));
+}
+
+async function createMigrationRequest({
+	organizationId,
+	workspaceName,
+	note,
+}: LoomMigrationRequestInput) {
 	const user = await requireProCustomerMigrationAccess(organizationId);
 	const normalizedWorkspaceName = normalizeMigrationText(
 		workspaceName,
@@ -154,10 +162,14 @@ export async function requestLoomMigration({
 }
 
 export async function confirmLoomMigrationInvite(requestId: string) {
+	return toLoomMigrationResult(() => markMigrationInviteSent(requestId));
+}
+
+async function markMigrationInviteSent(requestId: string) {
 	const request = await findMigration(requestId);
 	await requireCustomerMigrationAccess(request.organizationId);
 	if (request.status === "completed") {
-		throw new Error("This migration is already complete.");
+		throw new LoomMigrationError("This migration is already complete.");
 	}
 	if (request.invitedAt) return;
 	const result = await db()
@@ -170,23 +182,30 @@ export async function confirmLoomMigrationInvite(requestId: string) {
 			),
 		);
 	if (affectedRows(result) === 0) {
-		throw new Error("The migration request changed. Refresh and try again.");
+		throw new LoomMigrationError(
+			"The migration request changed. Refresh and try again.",
+		);
 	}
 	refreshMigrationPages();
 }
 
-export async function answerLoomMigrationQuestion({
+type LoomMigrationAnswerInput = { requestId: string; answer: string };
+
+export async function answerLoomMigrationQuestion(
+	input: LoomMigrationAnswerInput,
+) {
+	return toLoomMigrationResult(() => saveMigrationAnswer(input));
+}
+
+async function saveMigrationAnswer({
 	requestId,
 	answer,
-}: {
-	requestId: string;
-	answer: string;
-}) {
+}: LoomMigrationAnswerInput) {
 	const request = await findMigration(requestId);
 	await requireCustomerMigrationAccess(request.organizationId);
 	const normalizedAnswer = normalizeMigrationText(answer, "Answer", 2000);
 	if (!normalizedAnswer)
-		throw new Error("Enter the information Cap asked for.");
+		throw new LoomMigrationError("Enter the information Cap asked for.");
 	const result = await db()
 		.update(loomMigrationRequests)
 		.set({
@@ -201,7 +220,9 @@ export async function answerLoomMigrationQuestion({
 			),
 		);
 	if (affectedRows(result) === 0) {
-		throw new Error("The migration request changed. Refresh and try again.");
+		throw new LoomMigrationError(
+			"The migration request changed. Refresh and try again.",
+		);
 	}
 	refreshMigrationPages();
 }
@@ -210,21 +231,29 @@ export async function getLoomMigrationOperatorQueue() {
 	return getOperatorMigrationQueue();
 }
 
-export async function updateLoomMigrationStatus({
-	requestId,
-	nextStatus,
-	message,
-	verified,
-	expectedVideoCount,
-	importedVideoCount,
-}: {
+type LoomMigrationStatusInput = {
 	requestId: string;
 	nextStatus: LoomMigrationStatus;
 	message: string;
 	verified: boolean;
 	expectedVideoCount: number | null;
 	importedVideoCount: number;
-}) {
+};
+
+export async function updateLoomMigrationStatus(
+	input: LoomMigrationStatusInput,
+) {
+	return toLoomMigrationResult(() => saveMigrationStatus(input));
+}
+
+async function saveMigrationStatus({
+	requestId,
+	nextStatus,
+	message,
+	verified,
+	expectedVideoCount,
+	importedVideoCount,
+}: LoomMigrationStatusInput) {
 	const operator = await requireMigrationOperator();
 	const request = await findMigration(requestId);
 	const normalizedMessage = validateOperatorMigrationUpdate({
@@ -264,7 +293,7 @@ export async function updateLoomMigrationStatus({
 			)
 			.limit(1);
 		if (unfinishedImport) {
-			throw new Error(
+			throw new LoomMigrationError(
 				"Loom imports are still processing or have errors. Resolve them before completion.",
 			);
 		}
@@ -305,16 +334,21 @@ export async function updateLoomMigrationStatus({
 			),
 		);
 	if (affectedRows(result) === 0) {
-		throw new Error(
+		throw new LoomMigrationError(
 			"The migration request changed or imports are starting. Refresh and try again.",
 		);
 	}
 
-	const [requester] = await db()
-		.select({ email: users.email })
-		.from(users)
-		.where(eq(users.id, request.requestedByUserId))
-		.limit(1);
+	const customerVisibleChange =
+		nextStatus !== request.status ||
+		(normalizedMessage || null) !== request.capMessage;
+	const [requester] = customerVisibleChange
+		? await db()
+				.select({ email: users.email })
+				.from(users)
+				.where(eq(users.id, request.requestedByUserId))
+				.limit(1)
+		: [];
 	if (requester) {
 		try {
 			const delivery = await sendEmail({
diff --git a/apps/web/actions/loom.ts b/apps/web/actions/loom.ts
index a89a6676c5e..9d3acc866b0 100644
--- a/apps/web/actions/loom.ts
+++ b/apps/web/actions/loom.ts
@@ -46,8 +46,13 @@ import {
 	renewConciergeImport,
 	requireMigrationOperator,
 	reserveConciergeImport,
+	toLoomMigrationResult,
 } from "@/lib/loom-concierge";
 import type { LoomImportDestination } from "@/lib/loom-import-destination";
+import {
+	LoomMigrationError,
+	type LoomMigrationResult,
+} from "@/lib/loom-migration-state";
 import { isOrganizationOwnerPro } from "@/lib/org-pro";
 import { provisionOrganizationInvitee } from "@/lib/organization-provisioning";
 import { canManageOrganizationSettings } from "@/lib/permissions/roles";
@@ -438,7 +443,9 @@ async function importLoomVideoForOwner({
 				!reservation.leaseUntil ||
 				reservation.leaseUntil <= new Date()
 			) {
-				throw new Error("The concierge import expired. Retry this video.");
+				throw new LoomMigrationError(
+					"The concierge import expired. Retry this video.",
+				);
 			}
 		}
 		await tx.insert(videos).values({
@@ -891,7 +898,9 @@ async function processLoomCsvRows({
 	for (const row of normalizedRows) {
 		if (migrationRequestId) {
 			if (!migrationLeaseToken) {
-				throw new Error("The concierge import is missing its reservation.");
+				throw new LoomMigrationError(
+					"The concierge import is missing its reservation.",
+				);
 			}
 			await renewConciergeImport(migrationRequestId, migrationLeaseToken);
 		}
@@ -1028,7 +1037,14 @@ async function processLoomCsvRows({
 	};
 }
 
-export async function importFromLoomCsvForConcierge({
+export async function importFromLoomCsvForConcierge(input: {
+	requestId: string;
+	rows: LoomCsvImportRow[];
+}): Promise<LoomMigrationResult<LoomCsvImportResult>> {
+	return toLoomMigrationResult(() => importConciergeCsvRows(input));
+}
+
+async function importConciergeCsvRows({
 	requestId,
 	rows,
 }: {
@@ -1037,7 +1053,7 @@ export async function importFromLoomCsvForConcierge({
 }): Promise<LoomCsvImportResult> {
 	const operator = await requireMigrationOperator();
 	if (typeof requestId !== "string" || !/^[A-Za-z0-9_-]{15}$/.test(requestId)) {
-		throw new Error("Invalid migration request.");
+		throw new LoomMigrationError("Invalid migration request.");
 	}
 	const [request] = await db()
 		.select({
@@ -1059,13 +1075,15 @@ export async function importFromLoomCsvForConcierge({
 		)
 		.limit(1);
 	if (!request || request.status === "completed") {
-		throw new Error("The migration request is no longer active.");
+		throw new LoomMigrationError("The migration request is no longer active.");
 	}
 	if (!(await isOrganizationOwnerPro(request.organizationId))) {
-		throw new Error("The destination workspace needs Cap Pro.");
+		throw new LoomMigrationError("The destination workspace needs Cap Pro.");
 	}
 	if (!Array.isArray(rows) || rows.length > 10) {
-		throw new Error("Concierge CSV imports run in batches of 10 videos.");
+		throw new LoomMigrationError(
+			"Concierge CSV imports run in batches of 10 videos.",
+		);
 	}
 	const leaseToken = await reserveConciergeImport(requestId, operator.id);
 	try {
@@ -1084,39 +1102,52 @@ export async function importFromLoomCsvForConcierge({
 	}
 }
 
-export async function createConciergeLoomFileUpload({
-	requestId,
-	loomUrl,
-	userEmail,
-	spaceName,
-	videoTitle,
-}: {
+type ConciergeLoomFileUploadInput = {
 	requestId: string;
 	loomUrl: string;
 	userEmail: string;
 	spaceName: string;
 	videoTitle: string;
-}): Promise<{
+};
+
+type ConciergeLoomFileUpload = {
 	videoId: Video.VideoId;
 	uploadTarget: StorageDomain.UploadTarget;
-}> {
+};
+
+export async function createConciergeLoomFileUpload(
+	input: ConciergeLoomFileUploadInput,
+): Promise<LoomMigrationResult<ConciergeLoomFileUpload>> {
+	return toLoomMigrationResult(() => prepareConciergeLoomFileUpload(input));
+}
+
+async function prepareConciergeLoomFileUpload({
+	requestId,
+	loomUrl,
+	userEmail,
+	spaceName,
+	videoTitle,
+}: ConciergeLoomFileUploadInput): Promise<ConciergeLoomFileUpload> {
 	const operator = await requireMigrationOperator();
 	if (typeof requestId !== "string" || !/^[A-Za-z0-9_-]{15}$/.test(requestId)) {
-		throw new Error("Invalid migration request.");
+		throw new LoomMigrationError("Invalid migration request.");
 	}
 	const loomVideoId = extractLoomVideoId(loomUrl.trim());
-	if (!loomVideoId) throw new Error("Enter a valid Loom video URL.");
+	if (!loomVideoId)
+		throw new LoomMigrationError("Enter a valid Loom video URL.");
 	const normalizedEmail = normalizeImportEmail(userEmail);
 	if (!isValidImportEmail(normalizedEmail)) {
-		throw new Error("Enter a valid destination owner email.");
+		throw new LoomMigrationError("Enter a valid destination owner email.");
 	}
 	const normalizedSpaceName = normalizeImportSpaceName(spaceName);
 	if (!isValidImportSpaceName(normalizedSpaceName)) {
-		throw new Error("Space name is too long.");
+		throw new LoomMigrationError("Space name is too long.");
 	}
 	const normalizedTitle = videoTitle.trim();
 	if (!normalizedTitle || normalizedTitle.length > 255) {
-		throw new Error("Enter a video title of 255 characters or fewer.");
+		throw new LoomMigrationError(
+			"Enter a video title of 255 characters or fewer.",
+		);
 	}
 	const [request] = await db()
 		.select({
@@ -1136,9 +1167,10 @@ export async function createConciergeLoomFileUpload({
 			),
 		)
 		.limit(1);
-	if (!request) throw new Error("The migration request is no longer active.");
+	if (!request)
+		throw new LoomMigrationError("The migration request is no longer active.");
 	if (!(await isOrganizationOwnerPro(request.organizationId))) {
-		throw new Error("The destination workspace needs Cap Pro.");
+		throw new LoomMigrationError("The destination workspace needs Cap Pro.");
 	}
 	const leaseToken = await reserveConciergeImport(requestId, operator.id);
 	try {
@@ -1181,7 +1213,7 @@ export async function createConciergeLoomFileUpload({
 					(existing.phase !== "uploading" ||
 						existing.processingMessage !== "Uploading Loom video..."))
 			) {
-				throw new Error(
+				throw new LoomMigrationError(
 					"This Loom video is already in the Cap import inventory.",
 				);
 			}
@@ -1201,7 +1233,7 @@ export async function createConciergeLoomFileUpload({
 				Option.getOrNull(retryUpload.storageIntegrationId) !==
 					existing.storageIntegrationId
 			) {
-				throw new Error(
+				throw new LoomMigrationError(
 					"The Cap storage destination changed. Review this upload before retrying.",
 				);
 			}
@@ -1213,7 +1245,7 @@ export async function createConciergeLoomFileUpload({
 				)
 				.limit(1);
 			if (mapped && mapped.requestId !== requestId) {
-				throw new Error(
+				throw new LoomMigrationError(
 					"This Loom import belongs to another migration request.",
 				);
 			}
@@ -1235,7 +1267,9 @@ export async function createConciergeLoomFileUpload({
 						!reservation.leaseUntil ||
 						reservation.leaseUntil <= new Date()
 					) {
-						throw new Error("The concierge import expired. Retry this video.");
+						throw new LoomMigrationError(
+							"The concierge import expired. Retry this video.",
+						);
 					}
 					await tx.insert(loomMigrationImports).values({
 						videoId: Video.VideoId.make(existing.id),
@@ -1310,7 +1344,9 @@ export async function createConciergeLoomFileUpload({
 				!reservation.leaseUntil ||
 				reservation.leaseUntil <= new Date()
 			) {
-				throw new Error("The concierge import expired. Retry this video.");
+				throw new LoomMigrationError(
+					"The concierge import expired. Retry this video.",
+				);
 			}
 			await tx.insert(videos).values({
 				id: videoId,
@@ -1360,7 +1396,14 @@ export async function createConciergeLoomFileUpload({
 	}
 }
 
-export async function finishConciergeLoomFileUpload({
+export async function finishConciergeLoomFileUpload(input: {
+	requestId: string;
+	videoId: Video.VideoId;
+}) {
+	return toLoomMigrationResult(() => startConciergeLoomFileProcessing(input));
+}
+
+async function startConciergeLoomFileProcessing({
 	requestId,
 	videoId,
 }: {
@@ -1369,7 +1412,7 @@ export async function finishConciergeLoomFileUpload({
 }) {
 	const operator = await requireMigrationOperator();
 	if (typeof requestId !== "string" || !/^[A-Za-z0-9_-]{15}$/.test(requestId)) {
-		throw new Error("Invalid migration request.");
+		throw new LoomMigrationError("Invalid migration request.");
 	}
 	const leaseToken = await reserveConciergeImport(requestId, operator.id);
 	try {
@@ -1416,20 +1459,27 @@ export async function finishConciergeLoomFileUpload({
 				(record.phase !== "uploading" ||
 					record.processingMessage !== "Uploading Loom video..."))
 		) {
-			throw new Error("This Loom upload is no longer available.");
+			throw new LoomMigrationError("This Loom upload is no longer available.");
 		}
 		const [bucket] = await Storage.getAccessForVideo(
 			decodeStorageVideo(record.video),
 		).pipe(runPromise);
-		const head = await bucket.headObject(record.rawFileKey).pipe(
-			Effect.retry({
-				times: 3,
-				schedule: Schedule.exponential("100 millis"),
-			}),
-			runPromise,
-		);
+		const head = await bucket
+			.headObject(record.rawFileKey)
+			.pipe(
+				Effect.retry({
+					times: 3,
+					schedule: Schedule.exponential("100 millis"),
+				}),
+				runPromise,
+			)
+			.catch(() => {
+				throw new LoomMigrationError(
+					"The uploaded file was not found in storage. Upload it again.",
+				);
+			});
 		if ((head.ContentLength ?? 0) <= 0)
-			throw new Error("The uploaded file is empty.");
+			throw new LoomMigrationError("The uploaded file is empty.");
 		const status = await startVideoProcessingWorkflow({
 			videoId,
 			userId: record.video.ownerId,
diff --git a/apps/web/app/(org)/dashboard/admin/loom-migrations/LoomMigrationQueue.tsx b/apps/web/app/(org)/dashboard/admin/loom-migrations/LoomMigrationQueue.tsx
index 34f6f5e2c42..b7c6b1ea9ea 100644
--- a/apps/web/app/(org)/dashboard/admin/loom-migrations/LoomMigrationQueue.tsx
+++ b/apps/web/app/(org)/dashboard/admin/loom-migrations/LoomMigrationQueue.tsx
@@ -21,6 +21,7 @@ import { parseConciergeLoomCsv } from "@/lib/loom-csv";
 import {
 	LOOM_MIGRATION_STATUS_LABELS,
 	type LoomMigrationStatus,
+	unwrapLoomMigrationResult,
 } from "@/lib/loom-migration-state";
 import { uploadWithTarget } from "@/utils/upload-target";
 
@@ -71,16 +72,20 @@ function QueueItem({ request }: { request: OperatorLoomMigrationView }) {
 	const refresh = () =>
 		queryClient.invalidateQueries({ queryKey: ["loom-migration-queue"] });
 	const statusMutation = useMutation({
-		mutationFn: () =>
-			updateLoomMigrationStatus({
-				requestId: request.id,
-				nextStatus,
-				message,
-				verified,
-				expectedVideoCount:
-					expectedVideoCount.trim() === "" ? null : Number(expectedVideoCount),
-				importedVideoCount: Number(importedVideoCount),
-			}),
+		mutationFn: async () =>
+			unwrapLoomMigrationResult(
+				await updateLoomMigrationStatus({
+					requestId: request.id,
+					nextStatus,
+					message,
+					verified,
+					expectedVideoCount:
+						expectedVideoCount.trim() === ""
+							? null
+							: Number(expectedVideoCount),
+					importedVideoCount: Number(importedVideoCount),
+				}),
+			),
 		onSuccess: async () => {
 			await refresh();
 			toast.success("Migration status updated.");
@@ -97,10 +102,12 @@ function QueueItem({ request }: { request: OperatorLoomMigrationView }) {
 			const failures: LoomCsvImportRowResult[] = [];
 			for (let index = 0; index < csvRows.length; index += BATCH_SIZE) {
 				const batch = csvRows.slice(index, index + BATCH_SIZE);
-				const result = await importFromLoomCsvForConcierge({
-					requestId: request.id,
-					rows: batch,
-				});
+				const result = unwrapLoomMigrationResult(
+					await importFromLoomCsvForConcierge({
+						requestId: request.id,
+						rows: batch,
+					}),
+				);
 				started += result.importedCount;
 				failures.push(...result.results.filter((row) => !row.success));
 				setProcessedRows(index + batch.length);
@@ -132,13 +139,15 @@ function QueueItem({ request }: { request: OperatorLoomMigrationView }) {
 				throw new Error("Choose an MP4 downloaded from Loom.");
 			}
 			if (file.size === 0) throw new Error("The MP4 file is empty.");
-			const prepared = await createConciergeLoomFileUpload({
-				requestId: request.id,
-				loomUrl: fileLoomUrl,
-				userEmail: fileOwnerEmail,
-				spaceName: fileSpaceName,
-				videoTitle: fileTitle.trim() || file.name.replace(/\.mp4$/i, ""),
-			});
+			const prepared = unwrapLoomMigrationResult(
+				await createConciergeLoomFileUpload({
+					requestId: request.id,
+					loomUrl: fileLoomUrl,
+					userEmail: fileOwnerEmail,
+					spaceName: fileSpaceName,
+					videoTitle: fileTitle.trim() || file.name.replace(/\.mp4$/i, ""),
+				}),
+			);
 			setUploadPercent(0);
 			await uploadWithTarget({
 				target: prepared.uploadTarget,
@@ -148,10 +157,12 @@ function QueueItem({ request }: { request: OperatorLoomMigrationView }) {
 					if (total > 0) setUploadPercent(Math.round((loaded / total) * 100));
 				},
 			});
-			return finishConciergeLoomFileUpload({
-				requestId: request.id,
-				videoId: prepared.videoId,
-			});
+			return unwrapLoomMigrationResult(
+				await finishConciergeLoomFileUpload({
+					requestId: request.id,
+					videoId: prepared.videoId,
+				}),
+			);
 		},
 		onSuccess: async (result) => {
 			await refresh();
diff --git a/apps/web/app/(org)/dashboard/migrations/loom/LoomMigrationPage.tsx b/apps/web/app/(org)/dashboard/migrations/loom/LoomMigrationPage.tsx
index 63129848ccf..9bcbb0ffbdf 100644
--- a/apps/web/app/(org)/dashboard/migrations/loom/LoomMigrationPage.tsx
+++ b/apps/web/app/(org)/dashboard/migrations/loom/LoomMigrationPage.tsx
@@ -17,6 +17,7 @@ import type { LoomMigrationView } from "@/lib/loom-concierge";
 import {
 	LOOM_MIGRATION_STATUS_LABELS,
 	type LoomMigrationStatus,
+	unwrapLoomMigrationResult,
 } from "@/lib/loom-migration-state";
 
 const STATUS_STYLE: Record<LoomMigrationStatus, string> = {
@@ -117,9 +118,11 @@ export function LoomMigrationPage() {
 			queryKey: ["loom-concierge", organizationId],
 		});
 	const requestMutation = useMutation({
-		mutationFn: () => {
+		mutationFn: async () => {
 			if (!organizationId) throw new Error("Select a Cap workspace.");
-			return requestLoomMigration({ organizationId, workspaceName, note });
+			return unwrapLoomMigrationResult(
+				await requestLoomMigration({ organizationId, workspaceName, note }),
+			);
 		},
 		onSuccess: async (result) => {
 			await refresh();
@@ -133,7 +136,8 @@ export function LoomMigrationPage() {
 		onError: (error) => toast.error(error.message),
 	});
 	const inviteMutation = useMutation({
-		mutationFn: confirmLoomMigrationInvite,
+		mutationFn: async (requestId: string) =>
+			unwrapLoomMigrationResult(await confirmLoomMigrationInvite(requestId)),
 		onSuccess: async () => {
 			await refresh();
 			toast.success("Thanks. Cap can now review your Loom invite.");
@@ -141,7 +145,8 @@ export function LoomMigrationPage() {
 		onError: (error) => toast.error(error.message),
 	});
 	const answerMutation = useMutation({
-		mutationFn: answerLoomMigrationQuestion,
+		mutationFn: async (input: { requestId: string; answer: string }) =>
+			unwrapLoomMigrationResult(await answerLoomMigrationQuestion(input)),
 		onSuccess: async () => {
 			setAnswer("");
 			await refresh();
diff --git a/apps/web/lib/loom-concierge.ts b/apps/web/lib/loom-concierge.ts
index 7bd62cf691f..27538802fe1 100644
--- a/apps/web/lib/loom-concierge.ts
+++ b/apps/web/lib/loom-concierge.ts
@@ -26,7 +26,11 @@ import {
 import { requireOrganizationSettingsManager } from "@/actions/organization/authorization";
 import { MESSENGER_ADMIN_EMAIL } from "@/lib/messenger/constants";
 import { isOrganizationOwnerPro } from "@/lib/org-pro";
-import type { LoomMigrationStatus } from "./loom-migration-state";
+import {
+	LoomMigrationError,
+	type LoomMigrationResult,
+	type LoomMigrationStatus,
+} from "./loom-migration-state";
 
 type MigrationRecord = typeof loomMigrationRequests.$inferSelect;
 const IMPORT_LEASE_MS = 60 * 60 * 1000;
@@ -54,6 +58,19 @@ export type OperatorLoomMigrationView = LoomMigrationView & {
 	requestedByEmail: string;
 };
 
+export async function toLoomMigrationResult<T>(
+	run: () => Promise<T>,
+): Promise<LoomMigrationResult<T>> {
+	try {
+		return { ok: true, value: await run() };
+	} catch (error) {
+		if (error instanceof LoomMigrationError) {
+			return { ok: false, error: error.message };
+		}
+		throw error;
+	}
+}
+
 export function migrationToView(record: MigrationRecord): LoomMigrationView {
 	return {
 		id: record.id,
@@ -82,7 +99,7 @@ export async function requireCustomerMigrationAccess(
 	organizationId: Organisation.OrganisationId,
 ) {
 	const user = await getCurrentUser();
-	if (!user) throw new Error("Unauthorized");
+	if (!user) throw new LoomMigrationError("Unauthorized");
 	await requireOrganizationSettingsManager(user.id, organizationId);
 	return user;
 }
@@ -92,10 +109,12 @@ export async function requireProCustomerMigrationAccess(
 ) {
 	const user = await requireCustomerMigrationAccess(organizationId);
 	if (!buildEnv.NEXT_PUBLIC_IS_CAP) {
-		throw new Error("Concierge migration is available on Cap Cloud.");
+		throw new LoomMigrationError(
+			"Concierge migration is available on Cap Cloud.",
+		);
 	}
 	if (!(await isOrganizationOwnerPro(organizationId))) {
-		throw new Error("Concierge Loom migration requires Cap Pro.");
+		throw new LoomMigrationError("Concierge Loom migration requires Cap Pro.");
 	}
 	return user;
 }
@@ -107,7 +126,7 @@ export async function requireMigrationOperator() {
 		!user ||
 		user.email.toLowerCase() !== MESSENGER_ADMIN_EMAIL
 	) {
-		throw new Error("Unauthorized");
+		throw new LoomMigrationError("Unauthorized");
 	}
 	return user;
 }
@@ -133,7 +152,7 @@ export async function reserveConciergeImport(
 			activeImportCount: 1,
 			activeImportLeaseToken: token,
 			activeImportLeaseUntil: new Date(now.getTime() + IMPORT_LEASE_MS),
-			status: "in_progress",
+			status: sql`CASE WHEN ${loomMigrationRequests.status} = 'pending' THEN 'in_progress' ELSE ${loomMigrationRequests.status} END`,
 			lastOperatorUserId: operatorId,
 			lastOperatorAt: now,
 			updatedAt: now,
@@ -149,7 +168,7 @@ export async function reserveConciergeImport(
 			),
 		);
 	if (affectedRows(result) === 0) {
-		throw new Error(
+		throw new LoomMigrationError(
 			"The migration request changed or another import is starting. Refresh and try again.",
 		);
 	}
@@ -191,7 +210,9 @@ export async function renewConciergeImport(requestId: string, token: string) {
 			),
 		);
 	if (affectedRows(result) === 0) {
-		throw new Error("The concierge import expired. Refresh and retry.");
+		throw new LoomMigrationError(
+			"The concierge import expired. Refresh and retry.",
+		);
 	}
 }
 
diff --git a/apps/web/lib/loom-migration-state.ts b/apps/web/lib/loom-migration-state.ts
index 1e2791df990..79ab2a6c476 100644
--- a/apps/web/lib/loom-migration-state.ts
+++ b/apps/web/lib/loom-migration-state.ts
@@ -7,6 +7,19 @@ export const LOOM_MIGRATION_STATUSES = [
 
 export type LoomMigrationStatus = (typeof LOOM_MIGRATION_STATUSES)[number];
 
+export class LoomMigrationError extends Error {
+	override name = "LoomMigrationError";
+}
+
+export type LoomMigrationResult<T> =
+	| { ok: true; value: T }
+	| { ok: false; error: string };
+
+export function unwrapLoomMigrationResult<T>(result: LoomMigrationResult<T>) {
+	if (!result.ok) throw new Error(result.error);
+	return result.value;
+}
+
 export const LOOM_MIGRATION_STATUS_LABELS: Record<LoomMigrationStatus, string> =
 	{
 		pending: "Pending",
@@ -20,10 +33,13 @@ export function normalizeMigrationText(
 	label: string,
 	maxLength: number,
 ) {
-	if (typeof value !== "string") throw new Error(`${label} is invalid.`);
+	if (typeof value !== "string")
+		throw new LoomMigrationError(`${label} is invalid.`);
 	const normalized = value.trim().replace(/\s+/g, " ");
 	if (normalized.length > maxLength) {
-		throw new Error(`${label} must be ${maxLength} characters or fewer.`);
+		throw new LoomMigrationError(
+			`${label} must be ${maxLength} characters or fewer.`,
+		);
 	}
 	return normalized;
 }
@@ -44,20 +60,26 @@ export function validateOperatorMigrationUpdate({
 	importedVideoCount: number;
 }) {
 	if (currentStatus === "completed") {
-		throw new Error("A completed migration cannot be changed.");
+		throw new LoomMigrationError("A completed migration cannot be changed.");
 	}
 	if (!LOOM_MIGRATION_STATUSES.includes(nextStatus)) {
-		throw new Error("Invalid migration status.");
+		throw new LoomMigrationError("Invalid migration status.");
 	}
 	const normalizedMessage = normalizeMigrationText(message, "Message", 2000);
 	if (nextStatus === "needs_information" && !normalizedMessage) {
-		throw new Error("Tell the customer what information you need.");
+		throw new LoomMigrationError(
+			"Tell the customer what information you need.",
+		);
 	}
 	if (nextStatus === "completed" && !verified) {
-		throw new Error("Verify the migrated library before marking it complete.");
+		throw new LoomMigrationError(
+			"Verify the migrated library before marking it complete.",
+		);
 	}
 	if (nextStatus === "completed" && expectedVideoCount === null) {
-		throw new Error("Enter the agreed source video count before completion.");
+		throw new LoomMigrationError(
+			"Enter the agreed source video count before completion.",
+		);
 	}
 	if (
 		!Number.isInteger(importedVideoCount) ||
@@ -67,14 +89,16 @@ export function validateOperatorMigrationUpdate({
 				expectedVideoCount < 0 ||
 				importedVideoCount > expectedVideoCount))
 	) {
-		throw new Error("Enter valid video counts.");
+		throw new LoomMigrationError("Enter valid video counts.");
 	}
 	if (
 		nextStatus === "completed" &&
 		expectedVideoCount !== null &&
 		importedVideoCount !== expectedVideoCount
 	) {
-		throw new Error("Reconcile the expected video count before completion.");
+		throw new LoomMigrationError(
+			"Reconcile the expected video count before completion.",
+		);
 	}
 	return normalizedMessage;
 }

From d5e6a5d37b9c044a3bfd8101eda3a152152a856e Mon Sep 17 00:00:00 2001
From: Richie McIlroy <33632126+richiemcilroy@users.noreply.github.com>
Date: Tue, 20 Oct 2026 23:50:59 +0800
Subject: [PATCH 68/74] test: cover Loom concierge migration against MySQL and
 S3

---
 .../loom-concierge-database.test.ts           | 843 ++++++++++++++++++
 1 file changed, 843 insertions(+)
 create mode 100644 apps/web/__tests__/integration/loom-concierge-database.test.ts

diff --git a/apps/web/__tests__/integration/loom-concierge-database.test.ts b/apps/web/__tests__/integration/loom-concierge-database.test.ts
new file mode 100644
index 00000000000..ae8f4fe55a6
--- /dev/null
+++ b/apps/web/__tests__/integration/loom-concierge-database.test.ts
@@ -0,0 +1,843 @@
+import { randomUUID } from "node:crypto";
+import { db } from "@cap/database";
+import {
+	importedVideos,
+	loomMigrationImports,
+	loomMigrationRequests,
+	organizationMembers,
+	organizations,
+	users,
+	videos,
+	videoUploads,
+} from "@cap/database/schema";
+import { Organisation, User, Video } from "@cap/web-domain";
+import { eq } from "drizzle-orm";
+import {
+	afterAll,
+	beforeAll,
+	beforeEach,
+	describe,
+	expect,
+	it,
+	vi,
+} from "vitest";
+import {
+	type LoomMigrationResult,
+	unwrapLoomMigrationResult,
+} from "@/lib/loom-migration-state";
+
+const databaseUrl = process.env.CAP_LOOM_CONCIERGE_TEST_DATABASE_URL;
+
+const fixture = vi.hoisted(() => {
+	const url = process.env.CAP_LOOM_CONCIERGE_TEST_DATABASE_URL;
+	if (url) process.env.DATABASE_URL = url;
+	return {
+		currentUserId: null as string | null,
+		sendEmail: vi.fn(async (_input: unknown) => ({})),
+		start: vi.fn(async (_workflow: unknown, _args: unknown) => ({
+			runId: "run_fixture",
+		})),
+	};
+});
+
+vi.mock("server-only", () => ({}));
+vi.mock("next/cache", () => ({ revalidatePath: vi.fn() }));
+vi.mock("next/headers", () => ({
+	cookies: async () => ({ get: () => undefined }),
+	headers: async () => new Headers(),
+}));
+vi.mock("workflow/api", () => ({ start: fixture.start }));
+vi.mock("@cap/database/emails/config", () => ({
+	sendEmail: fixture.sendEmail,
+}));
+vi.mock("@cap/database/auth/session", () => ({
+	getCurrentUser: async () => {
+		if (!fixture.currentUserId) return null;
+		const [user] = await db()
+			.select()
+			.from(users)
+			.where(eq(users.id, User.UserId.make(fixture.currentUserId)))
+			.limit(1);
+		return user ?? null;
+	},
+}));
+
+const OPERATOR_EMAIL = "richie@cap.so";
+const realFetch = globalThis.fetch;
+
+function id() {
+	return randomUUID().replaceAll("-", "").slice(0, 15);
+}
+
+function loomId() {
+	return randomUUID().replaceAll("-", "");
+}
+
+function unwrapped<Args extends unknown[], T>(
+	action: (...args: Args) => Promise<LoomMigrationResult<T>>,
+) {
+	return async (...args: Args) =>
+		unwrapLoomMigrationResult(await action(...args));
+}
+
+function signInAs(userId: string | null) {
+	fixture.currentUserId = userId;
+}
+
+async function makeUser({
+	email = `${id()}@example.com`,
+	pro = false,
+	activeOrganizationId = Organisation.OrganisationId.make(id()),
+}: {
+	email?: string;
+	pro?: boolean;
+	activeOrganizationId?: Organisation.OrganisationId;
+} = {}) {
+	const userId = User.UserId.make(id());
+	await db()
+		.insert(users)
+		.values({
+			id: userId,
+			email,
+			activeOrganizationId,
+			stripeSubscriptionStatus: pro ? "active" : null,
+			stripeSubscriptionId: pro ? `sub_fixture_${id()}` : null,
+		});
+	return userId;
+}
+
+async function makeOrganization({
+	pro = true,
+	privateByDefault = false,
+}: {
+	pro?: boolean;
+	privateByDefault?: boolean;
+} = {}) {
+	const organizationId = Organisation.OrganisationId.make(id());
+	const ownerId = await makeUser({ pro, activeOrganizationId: organizationId });
+	await db()
+		.insert(organizations)
+		.values({
+			id: organizationId,
+			ownerId,
+			name: "Concierge fixture",
+			defaultVideoVisibility: privateByDefault ? "private" : null,
+		});
+	await db().insert(organizationMembers).values({
+		id: id(),
+		userId: ownerId,
+		organizationId,
+		role: "owner",
+	});
+	return { ownerId, organizationId };
+}
+
+async function addMember(
+	organizationId: Organisation.OrganisationId,
+	role: "member" | "admin",
+) {
+	const userId = await makeUser();
+	await db().insert(organizationMembers).values({
+		id: id(),
+		userId,
+		organizationId,
+		role,
+	});
+	return userId;
+}
+
+async function getOperatorId() {
+	const [existing] = await db()
+		.select({ id: users.id })
+		.from(users)
+		.where(eq(users.email, OPERATOR_EMAIL))
+		.limit(1);
+	return existing?.id ?? (await makeUser({ email: OPERATOR_EMAIL }));
+}
+
+async function getRequest(requestId: string) {
+	const [request] = await db()
+		.select()
+		.from(loomMigrationRequests)
+		.where(eq(loomMigrationRequests.id, requestId))
+		.limit(1);
+	if (!request) throw new Error("Missing request fixture");
+	return request;
+}
+
+async function setUploadPhase(
+	videoId: string,
+	phase: "uploading" | "processing" | "complete" | "error",
+) {
+	await db()
+		.update(videoUploads)
+		.set({ phase })
+		.where(eq(videoUploads.videoId, Video.VideoId.make(videoId)));
+}
+
+function stubLoomFetch() {
+	vi.stubGlobal(
+		"fetch",
+		vi.fn(async (input: RequestInfo | URL, init?: RequestInit) => {
+			const url = typeof input === "string" ? input : input.toString();
+			if (url.includes("/transcoded-url") || url.includes("/raw-url")) {
+				return new Response(
+					JSON.stringify({ url: "https://cdn.loom.com/sessions/video.mp4" }),
+					{ status: 200 },
+				);
+			}
+			if (url.startsWith("https://www.loom.com/graphql")) {
+				return Response.json({ data: { getVideo: { name: "Loom fixture" } } });
+			}
+			if (url.startsWith("https://www.loom.com/v1/oembed")) {
+				return Response.json({ duration: 12, width: 1280, height: 720 });
+			}
+			return realFetch(input, init);
+		}),
+	);
+}
+
+describe.skipIf(!databaseUrl)("Loom concierge migration database", () => {
+	let rawActions: typeof import("@/actions/loom-concierge");
+	let rawLoom: typeof import("@/actions/loom");
+	let operatorId: User.UserId;
+
+	const actions = {
+		getLoomMigrationDashboard: (
+			...args: Parameters<typeof rawActions.getLoomMigrationDashboard>
+		) => rawActions.getLoomMigrationDashboard(...args),
+		getLoomMigrationOperatorQueue: () =>
+			rawActions.getLoomMigrationOperatorQueue(),
+		requestLoomMigration: unwrapped(
+			(...args: Parameters<typeof rawActions.requestLoomMigration>) =>
+				rawActions.requestLoomMigration(...args),
+		),
+		confirmLoomMigrationInvite: unwrapped((requestId: string) =>
+			rawActions.confirmLoomMigrationInvite(requestId),
+		),
+		answerLoomMigrationQuestion: unwrapped(
+			(...args: Parameters<typeof rawActions.answerLoomMigrationQuestion>) =>
+				rawActions.answerLoomMigrationQuestion(...args),
+		),
+		updateLoomMigrationStatus: unwrapped(
+			(...args: Parameters<typeof rawActions.updateLoomMigrationStatus>) =>
+				rawActions.updateLoomMigrationStatus(...args),
+		),
+	};
+	const loom = {
+		importFromLoomCsvForConcierge: unwrapped(
+			(...args: Parameters<typeof rawLoom.importFromLoomCsvForConcierge>) =>
+				rawLoom.importFromLoomCsvForConcierge(...args),
+		),
+		createConciergeLoomFileUpload: unwrapped(
+			(...args: Parameters<typeof rawLoom.createConciergeLoomFileUpload>) =>
+				rawLoom.createConciergeLoomFileUpload(...args),
+		),
+		finishConciergeLoomFileUpload: unwrapped(
+			(...args: Parameters<typeof rawLoom.finishConciergeLoomFileUpload>) =>
+				rawLoom.finishConciergeLoomFileUpload(...args),
+		),
+	};
+
+	beforeAll(async () => {
+		rawActions = await import("@/actions/loom-concierge");
+		rawLoom = await import("@/actions/loom");
+		operatorId = await getOperatorId();
+	});
+
+	beforeEach(() => {
+		signInAs(null);
+		stubLoomFetch();
+	});
+
+	afterAll(() => {
+		vi.unstubAllGlobals();
+	});
+
+	async function requestMigration(
+		organizationId: Organisation.OrganisationId,
+		ownerId: User.UserId,
+	) {
+		signInAs(ownerId);
+		const result = await actions.requestLoomMigration({
+			organizationId,
+			workspaceName: "  Acme   Loom  ",
+			note: "Two workspaces",
+		});
+		return result.id;
+	}
+
+	it("lets a Pro organization manager request one active migration", async () => {
+		const { ownerId, organizationId } = await makeOrganization();
+		signInAs(ownerId);
+		const first = await actions.requestLoomMigration({
+			organizationId,
+			workspaceName: "  Acme   Loom  ",
+			note: "",
+		});
+		const second = await actions.requestLoomMigration({
+			organizationId,
+			workspaceName: "Again",
+			note: "",
+		});
+
+		expect(first.alreadyRequested).toBe(false);
+		expect(second).toEqual({ id: first.id, alreadyRequested: true });
+		const request = await getRequest(first.id);
+		expect(request.workspaceName).toBe("Acme Loom");
+		expect(request.status).toBe("pending");
+		expect(request.activeOrganizationId).toBe(organizationId);
+		expect(fixture.sendEmail).toHaveBeenCalledTimes(1);
+		expect(fixture.sendEmail.mock.calls[0]?.[0]).toMatchObject({
+			email: "hello@cap.so",
+		});
+
+		const dashboard = await actions.getLoomMigrationDashboard(organizationId);
+		expect(dashboard.isPro).toBe(true);
+		expect(dashboard.requests.map((item) => item.id)).toEqual([first.id]);
+	});
+
+	it("rejects free organizations, members, outsiders, and signed-out users", async () => {
+		const free = await makeOrganization({ pro: false });
+		signInAs(free.ownerId);
+		await expect(
+			actions.requestLoomMigration({
+				organizationId: free.organizationId,
+				workspaceName: "",
+				note: "",
+			}),
+		).rejects.toThrow("requires Cap Pro");
+
+		const { ownerId, organizationId } = await makeOrganization();
+		const requestId = await requestMigration(organizationId, ownerId);
+
+		const member = await addMember(organizationId, "member");
+		signInAs(member);
+		await expect(
+			actions.getLoomMigrationDashboard(organizationId),
+		).rejects.toThrow();
+		await expect(
+			actions.confirmLoomMigrationInvite(requestId),
+		).rejects.toThrow();
+
+		const outsider = await makeOrganization();
+		signInAs(outsider.ownerId);
+		await expect(
+			actions.getLoomMigrationDashboard(organizationId),
+		).rejects.toThrow();
+		await expect(
+			actions.confirmLoomMigrationInvite(requestId),
+		).rejects.toThrow();
+		await expect(
+			actions.answerLoomMigrationQuestion({ requestId, answer: "hi" }),
+		).rejects.toThrow();
+
+		signInAs(null);
+		await expect(actions.confirmLoomMigrationInvite(requestId)).rejects.toThrow(
+			"Unauthorized",
+		);
+
+		const admin = await addMember(organizationId, "admin");
+		signInAs(admin);
+		await actions.confirmLoomMigrationInvite(requestId);
+		expect((await getRequest(requestId)).invitedAt).not.toBeNull();
+	});
+
+	it("limits every operator action to the Cap operator account", async () => {
+		const { ownerId, organizationId } = await makeOrganization();
+		const requestId = await requestMigration(organizationId, ownerId);
+
+		signInAs(ownerId);
+		await expect(actions.getLoomMigrationOperatorQueue()).rejects.toThrow(
+			"Unauthorized",
+		);
+		await expect(
+			actions.updateLoomMigrationStatus({
+				requestId,
+				nextStatus: "in_progress",
+				message: "",
+				verified: false,
+				expectedVideoCount: null,
+				importedVideoCount: 0,
+			}),
+		).rejects.toThrow("Unauthorized");
+		await expect(
+			loom.importFromLoomCsvForConcierge({ requestId, rows: [] }),
+		).rejects.toThrow("Unauthorized");
+		await expect(
+			loom.createConciergeLoomFileUpload({
+				requestId,
+				loomUrl: `https://www.loom.com/share/${loomId()}`,
+				userEmail: "someone@example.com",
+				spaceName: "",
+				videoTitle: "Title",
+			}),
+		).rejects.toThrow("Unauthorized");
+		await expect(
+			loom.finishConciergeLoomFileUpload({
+				requestId,
+				videoId: Video.VideoId.make(id()),
+			}),
+		).rejects.toThrow("Unauthorized");
+
+		signInAs(operatorId);
+		const queue = await actions.getLoomMigrationOperatorQueue();
+		expect(queue.find((item) => item.id === requestId)).toMatchObject({
+			organizationName: "Concierge fixture",
+			status: "pending",
+		});
+	});
+
+	it("returns expected failures as data so production clients can show them", async () => {
+		const { ownerId, organizationId } = await makeOrganization();
+		const requestId = await requestMigration(organizationId, ownerId);
+
+		signInAs(operatorId);
+		await expect(
+			rawActions.updateLoomMigrationStatus({
+				requestId,
+				nextStatus: "completed",
+				message: "",
+				verified: false,
+				expectedVideoCount: 1,
+				importedVideoCount: 1,
+			}),
+		).resolves.toEqual({
+			ok: false,
+			error: "Verify the migrated library before marking it complete.",
+		});
+		await expect(
+			rawLoom.finishConciergeLoomFileUpload({
+				requestId: "not-a-request",
+				videoId: Video.VideoId.make(id()),
+			}),
+		).resolves.toEqual({ ok: false, error: "Invalid migration request." });
+
+		signInAs(ownerId);
+		await expect(
+			rawLoom.importFromLoomCsvForConcierge({ requestId, rows: [] }),
+		).resolves.toEqual({ ok: false, error: "Unauthorized" });
+	});
+
+	it("keeps an open customer question while imports run and only emails visible changes", async () => {
+		const { ownerId, organizationId } = await makeOrganization();
+		const requestId = await requestMigration(organizationId, ownerId);
+
+		signInAs(operatorId);
+		await actions.updateLoomMigrationStatus({
+			requestId,
+			nextStatus: "needs_information",
+			message: "Please share the Sales folder",
+			verified: false,
+			expectedVideoCount: null,
+			importedVideoCount: 0,
+		});
+		await loom.importFromLoomCsvForConcierge({
+			requestId,
+			rows: [
+				{
+					rowNumber: 2,
+					loomUrl: `https://www.loom.com/share/${loomId()}`,
+					userEmail: `${id()}@example.com`,
+					spaceName: "",
+				},
+			],
+		});
+		expect((await getRequest(requestId)).status).toBe("needs_information");
+
+		fixture.sendEmail.mockClear();
+		await actions.updateLoomMigrationStatus({
+			requestId,
+			nextStatus: "needs_information",
+			message: "Please share the Sales folder",
+			verified: false,
+			expectedVideoCount: 5,
+			importedVideoCount: 1,
+		});
+		expect(fixture.sendEmail).not.toHaveBeenCalled();
+		expect((await getRequest(requestId)).expectedVideoCount).toBe(5);
+
+		signInAs(ownerId);
+		await actions.answerLoomMigrationQuestion({
+			requestId,
+			answer: "Shared it",
+		});
+		expect((await getRequest(requestId)).status).toBe("pending");
+	});
+
+	it("round-trips an information request with the customer", async () => {
+		const { ownerId, organizationId } = await makeOrganization();
+		const requestId = await requestMigration(organizationId, ownerId);
+
+		signInAs(operatorId);
+		await expect(
+			actions.updateLoomMigrationStatus({
+				requestId,
+				nextStatus: "needs_information",
+				message: "   ",
+				verified: false,
+				expectedVideoCount: null,
+				importedVideoCount: 0,
+			}),
+		).rejects.toThrow("what information you need");
+		await actions.updateLoomMigrationStatus({
+			requestId,
+			nextStatus: "needs_information",
+			message: "Which Loom workspace?",
+			verified: false,
+			expectedVideoCount: null,
+			importedVideoCount: 0,
+		});
+
+		signInAs(ownerId);
+		await actions.answerLoomMigrationQuestion({
+			requestId,
+			answer: "The Acme one",
+		});
+		const answered = await getRequest(requestId);
+		expect(answered.status).toBe("pending");
+		expect(answered.customerReply).toBe("The Acme one");
+		await expect(
+			actions.answerLoomMigrationQuestion({ requestId, answer: "Again" }),
+		).rejects.toThrow("changed");
+	});
+
+	it("imports CSV rows into the customer workspace under the request", async () => {
+		const { ownerId, organizationId } = await makeOrganization();
+		const requestId = await requestMigration(organizationId, ownerId);
+		const firstRow = {
+			rowNumber: 2,
+			loomUrl: `https://www.loom.com/share/${loomId()}`,
+			userEmail: `${id()}@example.com`,
+			spaceName: "Sales",
+		};
+		const rows = [
+			firstRow,
+			{
+				rowNumber: 3,
+				loomUrl: `https://www.loom.com/share/${loomId()}`,
+				userEmail: `${id()}@example.com`,
+				spaceName: "",
+			},
+		];
+
+		signInAs(operatorId);
+		await expect(
+			loom.importFromLoomCsvForConcierge({
+				requestId,
+				rows: Array.from({ length: 11 }, () => firstRow),
+			}),
+		).rejects.toThrow("batches of 10");
+
+		const result = await loom.importFromLoomCsvForConcierge({
+			requestId,
+			rows,
+		});
+		expect(result.importedCount).toBe(2);
+		expect(fixture.start).toHaveBeenCalledTimes(2);
+
+		const mapped = await db()
+			.select({ videoId: loomMigrationImports.videoId, orgId: videos.orgId })
+			.from(loomMigrationImports)
+			.innerJoin(videos, eq(videos.id, loomMigrationImports.videoId))
+			.where(eq(loomMigrationImports.requestId, requestId));
+		expect(mapped).toHaveLength(2);
+		expect(mapped.every((row) => row.orgId === organizationId)).toBe(true);
+
+		const request = await getRequest(requestId);
+		expect(request.queuedVideoCount).toBe(2);
+		expect(request.status).toBe("in_progress");
+		expect(request.activeImportCount).toBe(0);
+		expect(request.activeImportLeaseToken).toBeNull();
+
+		const repeat = await loom.importFromLoomCsvForConcierge({
+			requestId,
+			rows: [firstRow],
+		});
+		expect(repeat.importedCount).toBe(0);
+		expect((await getRequest(requestId)).queuedVideoCount).toBe(2);
+	});
+
+	it("serializes imports and recovers expired reservations", async () => {
+		const { ownerId, organizationId } = await makeOrganization();
+		const requestId = await requestMigration(organizationId, ownerId);
+		const row = {
+			rowNumber: 2,
+			loomUrl: `https://www.loom.com/share/${loomId()}`,
+			userEmail: `${id()}@example.com`,
+			spaceName: "",
+		};
+
+		await db()
+			.update(loomMigrationRequests)
+			.set({
+				activeImportCount: 1,
+				activeImportLeaseToken: randomUUID(),
+				activeImportLeaseUntil: new Date(Date.now() + 60_000),
+			})
+			.where(eq(loomMigrationRequests.id, requestId));
+
+		signInAs(operatorId);
+		await expect(
+			loom.importFromLoomCsvForConcierge({ requestId, rows: [row] }),
+		).rejects.toThrow("another import is starting");
+		await expect(
+			actions.updateLoomMigrationStatus({
+				requestId,
+				nextStatus: "completed",
+				message: "",
+				verified: true,
+				expectedVideoCount: 0,
+				importedVideoCount: 0,
+			}),
+		).rejects.toThrow("imports are starting");
+
+		await db()
+			.update(loomMigrationRequests)
+			.set({ activeImportLeaseUntil: new Date(Date.now() - 1_000) })
+			.where(eq(loomMigrationRequests.id, requestId));
+		const result = await loom.importFromLoomCsvForConcierge({
+			requestId,
+			rows: [row],
+		});
+		expect(result.importedCount).toBe(1);
+		expect((await getRequest(requestId)).activeImportLeaseToken).toBeNull();
+	});
+
+	it("only completes reconciled requests with finished imports", async () => {
+		const { ownerId, organizationId } = await makeOrganization();
+		const requestId = await requestMigration(organizationId, ownerId);
+
+		signInAs(operatorId);
+		await loom.importFromLoomCsvForConcierge({
+			requestId,
+			rows: [
+				{
+					rowNumber: 2,
+					loomUrl: `https://www.loom.com/share/${loomId()}`,
+					userEmail: `${id()}@example.com`,
+					spaceName: "",
+				},
+			],
+		});
+		const [mapped] = await db()
+			.select({ videoId: loomMigrationImports.videoId })
+			.from(loomMigrationImports)
+			.where(eq(loomMigrationImports.requestId, requestId));
+		if (!mapped) throw new Error("Missing mapped import");
+
+		const complete = {
+			requestId,
+			nextStatus: "completed" as const,
+			message: "All done",
+			verified: true,
+			expectedVideoCount: 1,
+			importedVideoCount: 1,
+		};
+		await expect(
+			actions.updateLoomMigrationStatus({ ...complete, verified: false }),
+		).rejects.toThrow("Verify");
+		await expect(
+			actions.updateLoomMigrationStatus({
+				...complete,
+				expectedVideoCount: null,
+			}),
+		).rejects.toThrow("agreed source video count");
+		await expect(
+			actions.updateLoomMigrationStatus({ ...complete, expectedVideoCount: 2 }),
+		).rejects.toThrow("Reconcile");
+
+		for (const phase of ["uploading", "processing", "error"] as const) {
+			await setUploadPhase(mapped.videoId, phase);
+			await expect(actions.updateLoomMigrationStatus(complete)).rejects.toThrow(
+				"still processing",
+			);
+		}
+
+		const unrelated = await makeOrganization();
+		signInAs(unrelated.ownerId);
+		const unrelatedRequest = await requestMigration(
+			unrelated.organizationId,
+			unrelated.ownerId,
+		);
+		expect(unrelatedRequest).not.toBe(requestId);
+
+		signInAs(operatorId);
+		await setUploadPhase(mapped.videoId, "complete");
+		fixture.sendEmail.mockClear();
+		await actions.updateLoomMigrationStatus(complete);
+
+		const completed = await getRequest(requestId);
+		expect(completed.status).toBe("completed");
+		expect(completed.activeOrganizationId).toBeNull();
+		expect(completed.completedAt).not.toBeNull();
+		expect(fixture.sendEmail).toHaveBeenCalledTimes(1);
+
+		await expect(
+			actions.updateLoomMigrationStatus({
+				...complete,
+				nextStatus: "in_progress",
+			}),
+		).rejects.toThrow("cannot be changed");
+		await expect(
+			loom.importFromLoomCsvForConcierge({ requestId, rows: [] }),
+		).rejects.toThrow("no longer active");
+
+		const queue = await actions.getLoomMigrationOperatorQueue();
+		expect(queue.some((item) => item.id === requestId)).toBe(false);
+
+		signInAs(ownerId);
+		const reopened = await actions.requestLoomMigration({
+			organizationId,
+			workspaceName: "",
+			note: "One more workspace",
+		});
+		expect(reopened.alreadyRequested).toBe(false);
+		expect(reopened.id).not.toBe(requestId);
+	});
+
+	it("uploads restricted MP4 files to storage and starts processing", async () => {
+		const { ownerId, organizationId } = await makeOrganization({
+			privateByDefault: true,
+		});
+		const requestId = await requestMigration(organizationId, ownerId);
+		const ownerEmail = `${id()}@example.com`;
+		const loomUrl = `https://www.loom.com/share/${loomId()}`;
+
+		signInAs(operatorId);
+		await expect(
+			loom.createConciergeLoomFileUpload({
+				requestId,
+				loomUrl: "http://evil.example.com/share/abcdefghijk",
+				userEmail: ownerEmail,
+				spaceName: "",
+				videoTitle: "Kickoff",
+			}),
+		).rejects.toThrow("valid Loom video URL");
+
+		const prepared = await loom.createConciergeLoomFileUpload({
+			requestId,
+			loomUrl,
+			userEmail: ownerEmail,
+			spaceName: "Imported",
+			videoTitle: "Kickoff",
+		});
+		const [video] = await db()
+			.select()
+			.from(videos)
+			.where(eq(videos.id, prepared.videoId));
+		if (!video) throw new Error("Missing uploaded video");
+		expect(video).toMatchObject({ orgId: organizationId, public: false });
+		const [owner] = await db()
+			.select({ email: users.email })
+			.from(users)
+			.where(eq(users.id, video.ownerId));
+		expect(owner?.email).toBe(ownerEmail);
+		const [imported] = await db()
+			.select()
+			.from(importedVideos)
+			.where(eq(importedVideos.id, prepared.videoId));
+		expect(imported?.source).toBe("loom");
+
+		await expect(
+			loom.finishConciergeLoomFileUpload({
+				requestId,
+				videoId: prepared.videoId,
+			}),
+		).rejects.toThrow("not found in storage");
+
+		const retry = await loom.createConciergeLoomFileUpload({
+			requestId,
+			loomUrl,
+			userEmail: ownerEmail,
+			spaceName: "Imported",
+			videoTitle: "Kickoff",
+		});
+		expect(retry.videoId).toBe(prepared.videoId);
+		await expect(
+			loom.createConciergeLoomFileUpload({
+				requestId,
+				loomUrl,
+				userEmail: `${id()}@example.com`,
+				spaceName: "",
+				videoTitle: "Kickoff",
+			}),
+		).rejects.toThrow("already in the Cap import inventory");
+
+		const target = retry.uploadTarget;
+		const body = new Uint8Array(4096).fill(7);
+		if (target.type === "put") {
+			const response = await realFetch(target.url, {
+				method: "PUT",
+				headers: target.headers,
+				body,
+			});
+			expect(response.ok).toBe(true);
+		} else if (target.type === "s3Post") {
+			const form = new FormData();
+			for (const [key, value] of Object.entries(target.fields)) {
+				form.append(key, value);
+			}
+			form.append("file", new Blob([body], { type: "video/mp4" }));
+			const response = await realFetch(target.url, {
+				method: "POST",
+				body: form,
+			});
+			expect(response.ok).toBe(true);
+		} else {
+			throw new Error(`Unexpected upload target ${target.type}`);
+		}
+
+		fixture.start.mockClear();
+		const finished = await loom.finishConciergeLoomFileUpload({
+			requestId,
+			videoId: prepared.videoId,
+		});
+		expect(finished.status).toBe("started");
+		expect(fixture.start).toHaveBeenCalledTimes(1);
+		const [upload] = await db()
+			.select({ phase: videoUploads.phase })
+			.from(videoUploads)
+			.where(eq(videoUploads.videoId, prepared.videoId));
+		expect(upload?.phase).toBe("processing");
+		expect((await getRequest(requestId)).queuedVideoCount).toBe(1);
+
+		await expect(
+			loom.createConciergeLoomFileUpload({
+				requestId,
+				loomUrl,
+				userEmail: ownerEmail,
+				spaceName: "",
+				videoTitle: "Kickoff",
+			}),
+		).rejects.toThrow("already in the Cap import inventory");
+	});
+
+	it("refuses to map another request's video", async () => {
+		const first = await makeOrganization();
+		const firstRequest = await requestMigration(
+			first.organizationId,
+			first.ownerId,
+		);
+		const second = await makeOrganization();
+		const secondRequest = await requestMigration(
+			second.organizationId,
+			second.ownerId,
+		);
+
+		signInAs(operatorId);
+		const prepared = await loom.createConciergeLoomFileUpload({
+			requestId: firstRequest,
+			loomUrl: `https://www.loom.com/share/${loomId()}`,
+			userEmail: `${id()}@example.com`,
+			spaceName: "",
+			videoTitle: "First",
+		});
+		await expect(
+			loom.finishConciergeLoomFileUpload({
+				requestId: secondRequest,
+				videoId: prepared.videoId,
+			}),
+		).rejects.toThrow("no longer available");
+	});
+});

From 19bfa8bc50e1e3fa1735fc6300650408b9375013 Mon Sep 17 00:00:00 2001
From: Richie McIlroy <33632126+richiemcilroy@users.noreply.github.com>
Date: Wed, 21 Oct 2026 00:07:47 +0800
Subject: [PATCH 69/74] fix: use defined colours for Loom migration status and
 reset operator message on status change

---
 .../admin/loom-migrations/LoomMigrationQueue.tsx     | 10 +++++++---
 .../dashboard/migrations/loom/LoomMigrationPage.tsx  | 12 ++++++------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/apps/web/app/(org)/dashboard/admin/loom-migrations/LoomMigrationQueue.tsx b/apps/web/app/(org)/dashboard/admin/loom-migrations/LoomMigrationQueue.tsx
index b7c6b1ea9ea..b27cc2d6465 100644
--- a/apps/web/app/(org)/dashboard/admin/loom-migrations/LoomMigrationQueue.tsx
+++ b/apps/web/app/(org)/dashboard/admin/loom-migrations/LoomMigrationQueue.tsx
@@ -403,9 +403,13 @@ function QueueItem({ request }: { request: OperatorLoomMigrationView }) {
 						<select
 							className="mt-2 w-full rounded-lg border border-gray-6 bg-gray-1 px-3 py-2 text-sm text-gray-12"
 							id={`loom-status-${request.id}`}
-							onChange={(event) =>
-								setNextStatus(event.target.value as LoomMigrationStatus)
-							}
+							onChange={(event) => {
+								const status = event.target.value as LoomMigrationStatus;
+								setNextStatus(status);
+								setMessage(
+									status === request.status ? (request.capMessage ?? "") : "",
+								);
+							}}
 							value={nextStatus}
 						>
 							<option value="pending">Pending</option>
diff --git a/apps/web/app/(org)/dashboard/migrations/loom/LoomMigrationPage.tsx b/apps/web/app/(org)/dashboard/migrations/loom/LoomMigrationPage.tsx
index 9bcbb0ffbdf..57883accaba 100644
--- a/apps/web/app/(org)/dashboard/migrations/loom/LoomMigrationPage.tsx
+++ b/apps/web/app/(org)/dashboard/migrations/loom/LoomMigrationPage.tsx
@@ -21,10 +21,10 @@ import {
 } from "@/lib/loom-migration-state";
 
 const STATUS_STYLE: Record<LoomMigrationStatus, string> = {
-	pending: "bg-amber-3 text-amber-11",
+	pending: "bg-amber-500/10 text-amber-600",
 	in_progress: "bg-blue-3 text-blue-11",
-	needs_information: "bg-orange-3 text-orange-11",
-	completed: "bg-green-3 text-green-11",
+	needs_information: "bg-orange-500/10 text-orange-600",
+	completed: "bg-green-500/10 text-green-600",
 };
 
 function MigrationStatus({ request }: { request: LoomMigrationView }) {
@@ -58,7 +58,7 @@ function MigrationStatus({ request }: { request: LoomMigrationView }) {
 			)}
 			{request.status === "completed" && (
 				<div className="mt-4 flex items-start gap-3 text-sm text-gray-11">
-					<CheckCircle2 className="mt-0.5 size-4 shrink-0 text-green-11" />
+					<CheckCircle2 className="mt-0.5 size-4 shrink-0 text-green-600" />
 					<div>
 						<p>Your migration is complete.</p>
 						{request.expectedVideoCount !== null && (
@@ -251,14 +251,14 @@ export function LoomMigrationPage() {
 			)}
 			{activeRequest?.status === "needs_information" && (
 				<form
-					className="rounded-xl border border-orange-6 bg-orange-2 p-5"
+					className="rounded-xl border border-orange-500/30 bg-orange-500/5 p-5"
 					onSubmit={(event) => {
 						event.preventDefault();
 						answerMutation.mutate({ requestId: activeRequest.id, answer });
 					}}
 				>
 					<div className="flex items-center gap-2 font-medium text-gray-12">
-						<CircleHelp className="size-5 text-orange-11" /> Cap needs a little
+						<CircleHelp className="size-5 text-orange-600" /> Cap needs a little
 						more information
 					</div>
 					<label className="mt-4 block text-sm text-gray-11" htmlFor={answerId}>

From 2ed109293f6d4421be85777b3647f78f86b675a3 Mon Sep 17 00:00:00 2001
From: Richie McIlroy <33632126+richiemcilroy@users.noreply.github.com>
Date: Wed, 21 Oct 2026 00:08:19 +0800
Subject: [PATCH 70/74] chore: keep migration journal formatting consistent

---
 .../migrations/meta/0050_snapshot.json        | 10901 ++++++++--------
 .../database/migrations/meta/_journal.json    |   724 +-
 2 files changed, 5574 insertions(+), 6051 deletions(-)

diff --git a/packages/database/migrations/meta/0050_snapshot.json b/packages/database/migrations/meta/0050_snapshot.json
index cab35a76dcc..05304809297 100644
--- a/packages/database/migrations/meta/0050_snapshot.json
+++ b/packages/database/migrations/meta/0050_snapshot.json
@@ -1,5690 +1,5213 @@
 {
-  "version": "5",
-  "dialect": "mysql",
-  "id": "d513a71b-36f6-4513-8ebf-071a00a4e709",
-  "prevId": "7db9e8b2-ba9e-416d-a243-4b79b5d4ec5d",
-  "tables": {
-    "accounts": {
-      "name": "accounts",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "userId": {
-          "name": "userId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "type": {
-          "name": "type",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "provider": {
-          "name": "provider",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "providerAccountId": {
-          "name": "providerAccountId",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "access_token": {
-          "name": "access_token",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "expires_in": {
-          "name": "expires_in",
-          "type": "int",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "id_token": {
-          "name": "id_token",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "refresh_token": {
-          "name": "refresh_token",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "refresh_token_expires_in": {
-          "name": "refresh_token_expires_in",
-          "type": "int",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "scope": {
-          "name": "scope",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "token_type": {
-          "name": "token_type",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        },
-        "updatedAt": {
-          "name": "updatedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "onUpdate": true,
-          "default": "(now())"
-        },
-        "tempColumn": {
-          "name": "tempColumn",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "user_id_idx": {
-          "name": "user_id_idx",
-          "columns": [
-            "userId"
-          ],
-          "isUnique": false
-        },
-        "provider_account_id_idx": {
-          "name": "provider_account_id_idx",
-          "columns": [
-            "providerAccountId"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "accounts_id": {
-          "name": "accounts_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "agent_api_authorization_codes": {
-      "name": "agent_api_authorization_codes",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "userId": {
-          "name": "userId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "codeHash": {
-          "name": "codeHash",
-          "type": "varchar(64)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "codeChallenge": {
-          "name": "codeChallenge",
-          "type": "varchar(64)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "redirectUri": {
-          "name": "redirectUri",
-          "type": "varchar(512)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "scopes": {
-          "name": "scopes",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "expiresAt": {
-          "name": "expiresAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "consumedAt": {
-          "name": "consumedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        }
-      },
-      "indexes": {
-        "code_hash_idx": {
-          "name": "code_hash_idx",
-          "columns": [
-            "codeHash"
-          ],
-          "isUnique": true
-        },
-        "expires_at_idx": {
-          "name": "expires_at_idx",
-          "columns": [
-            "expiresAt"
-          ],
-          "isUnique": false
-        },
-        "user_created_at_idx": {
-          "name": "user_created_at_idx",
-          "columns": [
-            "userId",
-            "createdAt"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "agent_api_authorization_codes_id": {
-          "name": "agent_api_authorization_codes_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "agent_api_idempotency": {
-      "name": "agent_api_idempotency",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "userId": {
-          "name": "userId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "operation": {
-          "name": "operation",
-          "type": "varchar(64)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "keyHash": {
-          "name": "keyHash",
-          "type": "varchar(64)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "requestHash": {
-          "name": "requestHash",
-          "type": "varchar(64)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "state": {
-          "name": "state",
-          "type": "varchar(16)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'pending'"
-        },
-        "statusCode": {
-          "name": "statusCode",
-          "type": "int",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "response": {
-          "name": "response",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "expiresAt": {
-          "name": "expiresAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        },
-        "updatedAt": {
-          "name": "updatedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "onUpdate": true,
-          "default": "(now())"
-        }
-      },
-      "indexes": {
-        "user_operation_key_idx": {
-          "name": "user_operation_key_idx",
-          "columns": [
-            "userId",
-            "operation",
-            "keyHash"
-          ],
-          "isUnique": true
-        },
-        "expires_at_idx": {
-          "name": "expires_at_idx",
-          "columns": [
-            "expiresAt"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "agent_api_idempotency_id": {
-          "name": "agent_api_idempotency_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "agent_api_keys": {
-      "name": "agent_api_keys",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "userId": {
-          "name": "userId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "tokenHash": {
-          "name": "tokenHash",
-          "type": "varchar(64)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
-          "type": "varchar(100)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'Cap CLI'"
-        },
-        "scopes": {
-          "name": "scopes",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "expiresAt": {
-          "name": "expiresAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "revokedAt": {
-          "name": "revokedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        },
-        "lastUsedAt": {
-          "name": "lastUsedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "token_hash_idx": {
-          "name": "token_hash_idx",
-          "columns": [
-            "tokenHash"
-          ],
-          "isUnique": true
-        },
-        "user_created_at_idx": {
-          "name": "user_created_at_idx",
-          "columns": [
-            "userId",
-            "createdAt"
-          ],
-          "isUnique": false
-        },
-        "expires_at_idx": {
-          "name": "expires_at_idx",
-          "columns": [
-            "expiresAt"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "agent_api_keys_id": {
-          "name": "agent_api_keys_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "agent_api_operations": {
-      "name": "agent_api_operations",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "userId": {
-          "name": "userId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "kind": {
-          "name": "kind",
-          "type": "varchar(32)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "resourceId": {
-          "name": "resourceId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "resultResourceId": {
-          "name": "resultResourceId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "state": {
-          "name": "state",
-          "type": "varchar(16)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'queued'"
-        },
-        "payload": {
-          "name": "payload",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "result": {
-          "name": "result",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "errorCode": {
-          "name": "errorCode",
-          "type": "varchar(64)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "errorMessage": {
-          "name": "errorMessage",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        },
-        "updatedAt": {
-          "name": "updatedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "onUpdate": true,
-          "default": "(now())"
-        },
-        "completedAt": {
-          "name": "completedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "user_created_at_idx": {
-          "name": "user_created_at_idx",
-          "columns": [
-            "userId",
-            "createdAt"
-          ],
-          "isUnique": false
-        },
-        "state_updated_at_idx": {
-          "name": "state_updated_at_idx",
-          "columns": [
-            "state",
-            "updatedAt"
-          ],
-          "isUnique": false
-        },
-        "resource_id_idx": {
-          "name": "resource_id_idx",
-          "columns": [
-            "resourceId"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "agent_api_operations_id": {
-          "name": "agent_api_operations_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "auth_api_keys": {
-      "name": "auth_api_keys",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(36)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "userId": {
-          "name": "userId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "source": {
-          "name": "source",
-          "type": "varchar(32)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'unknown'"
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        }
-      },
-      "indexes": {
-        "user_id_created_at_idx": {
-          "name": "user_id_created_at_idx",
-          "columns": [
-            "userId",
-            "createdAt"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "auth_api_keys_id": {
-          "name": "auth_api_keys_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "comments": {
-      "name": "comments",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "type": {
-          "name": "type",
-          "type": "varchar(6)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "content": {
-          "name": "content",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "timestamp": {
-          "name": "timestamp",
-          "type": "float",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "authorId": {
-          "name": "authorId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "videoId": {
-          "name": "videoId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        },
-        "updatedAt": {
-          "name": "updatedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "onUpdate": true,
-          "default": "(now())"
-        },
-        "parentCommentId": {
-          "name": "parentCommentId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "mediaKey": {
-          "name": "mediaKey",
-          "type": "varchar(512)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "mediaDuration": {
-          "name": "mediaDuration",
-          "type": "float",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "mediaMeta": {
-          "name": "mediaMeta",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "video_type_created_idx": {
-          "name": "video_type_created_idx",
-          "columns": [
-            "videoId",
-            "type",
-            "createdAt",
-            "id"
-          ],
-          "isUnique": false
-        },
-        "author_id_idx": {
-          "name": "author_id_idx",
-          "columns": [
-            "authorId"
-          ],
-          "isUnique": false
-        },
-        "parent_comment_id_idx": {
-          "name": "parent_comment_id_idx",
-          "columns": [
-            "parentCommentId"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "comments_id": {
-          "name": "comments_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "developer_api_keys": {
-      "name": "developer_api_keys",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "appId": {
-          "name": "appId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "keyType": {
-          "name": "keyType",
-          "type": "varchar(8)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "keyPrefix": {
-          "name": "keyPrefix",
-          "type": "varchar(12)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "keyHash": {
-          "name": "keyHash",
-          "type": "varchar(64)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "encryptedKey": {
-          "name": "encryptedKey",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "lastUsedAt": {
-          "name": "lastUsedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "revokedAt": {
-          "name": "revokedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        }
-      },
-      "indexes": {
-        "key_hash_idx": {
-          "name": "key_hash_idx",
-          "columns": [
-            "keyHash"
-          ],
-          "isUnique": true
-        },
-        "app_key_type_idx": {
-          "name": "app_key_type_idx",
-          "columns": [
-            "appId",
-            "keyType"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {
-        "developer_api_keys_appId_developer_apps_id_fk": {
-          "name": "developer_api_keys_appId_developer_apps_id_fk",
-          "tableFrom": "developer_api_keys",
-          "tableTo": "developer_apps",
-          "columnsFrom": [
-            "appId"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {
-        "developer_api_keys_id": {
-          "name": "developer_api_keys_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "developer_app_domains": {
-      "name": "developer_app_domains",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "appId": {
-          "name": "appId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "domain": {
-          "name": "domain",
-          "type": "varchar(253)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "developer_app_domains_appId_developer_apps_id_fk": {
-          "name": "developer_app_domains_appId_developer_apps_id_fk",
-          "tableFrom": "developer_app_domains",
-          "tableTo": "developer_apps",
-          "columnsFrom": [
-            "appId"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {
-        "developer_app_domains_id": {
-          "name": "developer_app_domains_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {
-        "app_domain_unique": {
-          "name": "app_domain_unique",
-          "columns": [
-            "appId",
-            "domain"
-          ]
-        }
-      },
-      "checkConstraint": {}
-    },
-    "developer_apps": {
-      "name": "developer_apps",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "ownerId": {
-          "name": "ownerId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "environment": {
-          "name": "environment",
-          "type": "varchar(16)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "logoUrl": {
-          "name": "logoUrl",
-          "type": "varchar(1024)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "deletedAt": {
-          "name": "deletedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        },
-        "updatedAt": {
-          "name": "updatedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "onUpdate": true,
-          "default": "(now())"
-        }
-      },
-      "indexes": {
-        "owner_deleted_idx": {
-          "name": "owner_deleted_idx",
-          "columns": [
-            "ownerId",
-            "deletedAt"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "developer_apps_id": {
-          "name": "developer_apps_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "developer_credit_accounts": {
-      "name": "developer_credit_accounts",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "appId": {
-          "name": "appId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "ownerId": {
-          "name": "ownerId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "balanceMicroCredits": {
-          "name": "balanceMicroCredits",
-          "type": "bigint unsigned",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "stripeCustomerId": {
-          "name": "stripeCustomerId",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "stripePaymentMethodId": {
-          "name": "stripePaymentMethodId",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "autoTopUpEnabled": {
-          "name": "autoTopUpEnabled",
-          "type": "boolean",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "autoTopUpThresholdMicroCredits": {
-          "name": "autoTopUpThresholdMicroCredits",
-          "type": "bigint unsigned",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "autoTopUpAmountCents": {
-          "name": "autoTopUpAmountCents",
-          "type": "int",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        },
-        "updatedAt": {
-          "name": "updatedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "onUpdate": true,
-          "default": "(now())"
-        }
-      },
-      "indexes": {
-        "app_id_unique": {
-          "name": "app_id_unique",
-          "columns": [
-            "appId"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "developer_credit_accounts_appId_developer_apps_id_fk": {
-          "name": "developer_credit_accounts_appId_developer_apps_id_fk",
-          "tableFrom": "developer_credit_accounts",
-          "tableTo": "developer_apps",
-          "columnsFrom": [
-            "appId"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {
-        "developer_credit_accounts_id": {
-          "name": "developer_credit_accounts_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "developer_credit_transactions": {
-      "name": "developer_credit_transactions",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "accountId": {
-          "name": "accountId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "type": {
-          "name": "type",
-          "type": "varchar(16)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "amountMicroCredits": {
-          "name": "amountMicroCredits",
-          "type": "bigint",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "balanceAfterMicroCredits": {
-          "name": "balanceAfterMicroCredits",
-          "type": "bigint unsigned",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "referenceId": {
-          "name": "referenceId",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "referenceType": {
-          "name": "referenceType",
-          "type": "varchar(32)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "metadata": {
-          "name": "metadata",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        }
-      },
-      "indexes": {
-        "account_type_created_idx": {
-          "name": "account_type_created_idx",
-          "columns": [
-            "accountId",
-            "type",
-            "createdAt"
-          ],
-          "isUnique": false
-        },
-        "account_ref_dedup_idx": {
-          "name": "account_ref_dedup_idx",
-          "columns": [
-            "accountId",
-            "referenceId",
-            "referenceType"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {
-        "dev_credit_txn_account_fk": {
-          "name": "dev_credit_txn_account_fk",
-          "tableFrom": "developer_credit_transactions",
-          "tableTo": "developer_credit_accounts",
-          "columnsFrom": [
-            "accountId"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {
-        "developer_credit_transactions_id": {
-          "name": "developer_credit_transactions_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "developer_daily_storage_snapshots": {
-      "name": "developer_daily_storage_snapshots",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "appId": {
-          "name": "appId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "snapshotDate": {
-          "name": "snapshotDate",
-          "type": "varchar(10)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "totalDurationMinutes": {
-          "name": "totalDurationMinutes",
-          "type": "float",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "videoCount": {
-          "name": "videoCount",
-          "type": "int",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "microCreditsCharged": {
-          "name": "microCreditsCharged",
-          "type": "bigint unsigned",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "processedAt": {
-          "name": "processedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "developer_daily_storage_snapshots_appId_developer_apps_id_fk": {
-          "name": "developer_daily_storage_snapshots_appId_developer_apps_id_fk",
-          "tableFrom": "developer_daily_storage_snapshots",
-          "tableTo": "developer_apps",
-          "columnsFrom": [
-            "appId"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {
-        "developer_daily_storage_snapshots_id": {
-          "name": "developer_daily_storage_snapshots_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {
-        "app_date_unique": {
-          "name": "app_date_unique",
-          "columns": [
-            "appId",
-            "snapshotDate"
-          ]
-        }
-      },
-      "checkConstraint": {}
-    },
-    "developer_videos": {
-      "name": "developer_videos",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "appId": {
-          "name": "appId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "externalUserId": {
-          "name": "externalUserId",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'Untitled'"
-        },
-        "duration": {
-          "name": "duration",
-          "type": "float",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "width": {
-          "name": "width",
-          "type": "int",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "height": {
-          "name": "height",
-          "type": "int",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "fps": {
-          "name": "fps",
-          "type": "int",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "s3Key": {
-          "name": "s3Key",
-          "type": "varchar(512)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "transcriptionStatus": {
-          "name": "transcriptionStatus",
-          "type": "varchar(16)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "metadata": {
-          "name": "metadata",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "deletedAt": {
-          "name": "deletedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        },
-        "updatedAt": {
-          "name": "updatedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "onUpdate": true,
-          "default": "(now())"
-        }
-      },
-      "indexes": {
-        "app_created_idx": {
-          "name": "app_created_idx",
-          "columns": [
-            "appId",
-            "createdAt"
-          ],
-          "isUnique": false
-        },
-        "app_user_idx": {
-          "name": "app_user_idx",
-          "columns": [
-            "appId",
-            "externalUserId"
-          ],
-          "isUnique": false
-        },
-        "app_deleted_idx": {
-          "name": "app_deleted_idx",
-          "columns": [
-            "appId",
-            "deletedAt"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {
-        "developer_videos_appId_developer_apps_id_fk": {
-          "name": "developer_videos_appId_developer_apps_id_fk",
-          "tableFrom": "developer_videos",
-          "tableTo": "developer_apps",
-          "columnsFrom": [
-            "appId"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {
-        "developer_videos_id": {
-          "name": "developer_videos_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "folders": {
-      "name": "folders",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "color": {
-          "name": "color",
-          "type": "varchar(16)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'normal'"
-        },
-        "public": {
-          "name": "public",
-          "type": "boolean",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "settings": {
-          "name": "settings",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "organizationId": {
-          "name": "organizationId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "createdById": {
-          "name": "createdById",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "parentId": {
-          "name": "parentId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "spaceId": {
-          "name": "spaceId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        },
-        "updatedAt": {
-          "name": "updatedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "onUpdate": true,
-          "default": "(now())"
-        }
-      },
-      "indexes": {
-        "organization_id_idx": {
-          "name": "organization_id_idx",
-          "columns": [
-            "organizationId"
-          ],
-          "isUnique": false
-        },
-        "created_by_id_idx": {
-          "name": "created_by_id_idx",
-          "columns": [
-            "createdById"
-          ],
-          "isUnique": false
-        },
-        "parent_id_idx": {
-          "name": "parent_id_idx",
-          "columns": [
-            "parentId"
-          ],
-          "isUnique": false
-        },
-        "space_id_idx": {
-          "name": "space_id_idx",
-          "columns": [
-            "spaceId"
-          ],
-          "isUnique": false
-        },
-        "public_parent_id_idx": {
-          "name": "public_parent_id_idx",
-          "columns": [
-            "public",
-            "parentId"
-          ],
-          "isUnique": false
-        },
-        "public_space_parent_id_idx": {
-          "name": "public_space_parent_id_idx",
-          "columns": [
-            "public",
-            "spaceId",
-            "parentId"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "folders_id": {
-          "name": "folders_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "imported_videos": {
-      "name": "imported_videos",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "orgId": {
-          "name": "orgId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "source": {
-          "name": "source",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "source_id": {
-          "name": "source_id",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "id_idx": {
-          "name": "id_idx",
-          "columns": [
-            "id"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "imported_videos_orgId_source_source_id_pk": {
-          "name": "imported_videos_orgId_source_source_id_pk",
-          "columns": [
-            "orgId",
-            "source",
-            "source_id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "integration_installations": {
-      "name": "integration_installations",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "provider": {
-          "name": "provider",
-          "type": "varchar(64)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "externalId": {
-          "name": "externalId",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "displayName": {
-          "name": "displayName",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "organizationId": {
-          "name": "organizationId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "installedByUserId": {
-          "name": "installedByUserId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "encryptedCredentials": {
-          "name": "encryptedCredentials",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "metadata": {
-          "name": "metadata",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        },
-        "updatedAt": {
-          "name": "updatedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "onUpdate": true,
-          "default": "(now())"
-        }
-      },
-      "indexes": {
-        "provider_external_id_idx": {
-          "name": "provider_external_id_idx",
-          "columns": [
-            "provider",
-            "externalId"
-          ],
-          "isUnique": true
-        },
-        "organization_provider_display_name_idx": {
-          "name": "organization_provider_display_name_idx",
-          "columns": [
-            "organizationId",
-            "provider",
-            "displayName"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "integration_installations_id": {
-          "name": "integration_installations_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "loom_migration_imports": {
-      "name": "loom_migration_imports",
-      "columns": {
-        "videoId": {
-          "name": "videoId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "requestId": {
-          "name": "requestId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "datetime",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "loom_migration_imports_request_idx": {
-          "name": "loom_migration_imports_request_idx",
-          "columns": [
-            "requestId"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "loom_migration_imports_videoId": {
-          "name": "loom_migration_imports_videoId",
-          "columns": [
-            "videoId"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "loom_migration_requests": {
-      "name": "loom_migration_requests",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "organizationId": {
-          "name": "organizationId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "activeOrganizationId": {
-          "name": "activeOrganizationId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "requestedByUserId": {
-          "name": "requestedByUserId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "workspaceName": {
-          "name": "workspaceName",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "customerNote": {
-          "name": "customerNote",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "customerReply": {
-          "name": "customerReply",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "invitedAt": {
-          "name": "invitedAt",
-          "type": "datetime",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "status": {
-          "name": "status",
-          "type": "varchar(32)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'pending'"
-        },
-        "capMessage": {
-          "name": "capMessage",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "expectedVideoCount": {
-          "name": "expectedVideoCount",
-          "type": "int",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "importedVideoCount": {
-          "name": "importedVideoCount",
-          "type": "int",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "queuedVideoCount": {
-          "name": "queuedVideoCount",
-          "type": "int",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "activeImportCount": {
-          "name": "activeImportCount",
-          "type": "int",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "activeImportLeaseToken": {
-          "name": "activeImportLeaseToken",
-          "type": "varchar(36)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "activeImportLeaseUntil": {
-          "name": "activeImportLeaseUntil",
-          "type": "datetime",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "lastOperatorUserId": {
-          "name": "lastOperatorUserId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "lastOperatorAt": {
-          "name": "lastOperatorAt",
-          "type": "datetime",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "completedAt": {
-          "name": "completedAt",
-          "type": "datetime",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "datetime",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "updatedAt": {
-          "name": "updatedAt",
-          "type": "datetime",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "loom_migration_active_org_idx": {
-          "name": "loom_migration_active_org_idx",
-          "columns": [
-            "activeOrganizationId"
-          ],
-          "isUnique": true
-        },
-        "loom_migration_org_created_idx": {
-          "name": "loom_migration_org_created_idx",
-          "columns": [
-            "organizationId",
-            "createdAt"
-          ],
-          "isUnique": false
-        },
-        "loom_migration_status_created_idx": {
-          "name": "loom_migration_status_created_idx",
-          "columns": [
-            "status",
-            "createdAt"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "loom_migration_requests_id": {
-          "name": "loom_migration_requests_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "loops_sync_jobs": {
-      "name": "loops_sync_jobs",
-      "columns": {
-        "userId": {
-          "name": "userId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "revision": {
-          "name": "revision",
-          "type": "int",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 1
-        },
-        "nextAttemptAt": {
-          "name": "nextAttemptAt",
-          "type": "datetime",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "leaseToken": {
-          "name": "leaseToken",
-          "type": "varchar(36)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "leaseUntil": {
-          "name": "leaseUntil",
-          "type": "datetime",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "failures": {
-          "name": "failures",
-          "type": "int",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "lastError": {
-          "name": "lastError",
-          "type": "varchar(64)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "profileHash": {
-          "name": "profileHash",
-          "type": "varchar(64)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "teammateJoinedAt": {
-          "name": "teammateJoinedAt",
-          "type": "datetime",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "syncedEmail": {
-          "name": "syncedEmail",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "lastSyncedAt": {
-          "name": "lastSyncedAt",
-          "type": "datetime",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "loops_sync_due_idx": {
-          "name": "loops_sync_due_idx",
-          "columns": [
-            "nextAttemptAt"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "loops_sync_jobs_userId": {
-          "name": "loops_sync_jobs_userId",
-          "columns": [
-            "userId"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "mcp_oauth_clients": {
-      "name": "mcp_oauth_clients",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "clientId": {
-          "name": "clientId",
-          "type": "varchar(128)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "clientName": {
-          "name": "clientName",
-          "type": "varchar(100)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "redirectUris": {
-          "name": "redirectUris",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "activatedAt": {
-          "name": "activatedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        }
-      },
-      "indexes": {
-        "client_id_idx": {
-          "name": "client_id_idx",
-          "columns": [
-            "clientId"
-          ],
-          "isUnique": true
-        },
-        "inactive_created_at_idx": {
-          "name": "inactive_created_at_idx",
-          "columns": [
-            "activatedAt",
-            "createdAt"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "mcp_oauth_clients_id": {
-          "name": "mcp_oauth_clients_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "mcp_oauth_codes": {
-      "name": "mcp_oauth_codes",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "userId": {
-          "name": "userId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "clientId": {
-          "name": "clientId",
-          "type": "varchar(128)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "codeHash": {
-          "name": "codeHash",
-          "type": "varchar(64)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "codeChallenge": {
-          "name": "codeChallenge",
-          "type": "varchar(64)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "redirectUri": {
-          "name": "redirectUri",
-          "type": "varchar(512)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "resource": {
-          "name": "resource",
-          "type": "varchar(512)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "expiresAt": {
-          "name": "expiresAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "consumedAt": {
-          "name": "consumedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        }
-      },
-      "indexes": {
-        "code_hash_idx": {
-          "name": "code_hash_idx",
-          "columns": [
-            "codeHash"
-          ],
-          "isUnique": true
-        },
-        "expires_at_idx": {
-          "name": "expires_at_idx",
-          "columns": [
-            "expiresAt"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "mcp_oauth_codes_id": {
-          "name": "mcp_oauth_codes_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "mcp_oauth_registration_quotas": {
-      "name": "mcp_oauth_registration_quotas",
-      "columns": {
-        "windowId": {
-          "name": "windowId",
-          "type": "varchar(10)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "registrations": {
-          "name": "registrations",
-          "type": "int",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "expiresAt": {
-          "name": "expiresAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "expires_at_idx": {
-          "name": "expires_at_idx",
-          "columns": [
-            "expiresAt"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "mcp_oauth_registration_quotas_windowId": {
-          "name": "mcp_oauth_registration_quotas_windowId",
-          "columns": [
-            "windowId"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "mcp_oauth_tokens": {
-      "name": "mcp_oauth_tokens",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "userId": {
-          "name": "userId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "clientId": {
-          "name": "clientId",
-          "type": "varchar(128)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "familyId": {
-          "name": "familyId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "resource": {
-          "name": "resource",
-          "type": "varchar(512)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "accessHash": {
-          "name": "accessHash",
-          "type": "varchar(64)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "refreshHash": {
-          "name": "refreshHash",
-          "type": "varchar(64)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "accessExpiresAt": {
-          "name": "accessExpiresAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "refreshExpiresAt": {
-          "name": "refreshExpiresAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "revokedAt": {
-          "name": "revokedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        }
-      },
-      "indexes": {
-        "access_hash_idx": {
-          "name": "access_hash_idx",
-          "columns": [
-            "accessHash"
-          ],
-          "isUnique": true
-        },
-        "refresh_hash_idx": {
-          "name": "refresh_hash_idx",
-          "columns": [
-            "refreshHash"
-          ],
-          "isUnique": true
-        },
-        "family_id_idx": {
-          "name": "family_id_idx",
-          "columns": [
-            "familyId"
-          ],
-          "isUnique": false
-        },
-        "client_active_idx": {
-          "name": "client_active_idx",
-          "columns": [
-            "clientId",
-            "revokedAt",
-            "refreshExpiresAt"
-          ],
-          "isUnique": false
-        },
-        "refresh_expires_at_idx": {
-          "name": "refresh_expires_at_idx",
-          "columns": [
-            "refreshExpiresAt"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "mcp_oauth_tokens_id": {
-          "name": "mcp_oauth_tokens_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "media_processing_budgets": {
-      "name": "media_processing_budgets",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(64)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "reserved_bytes": {
-          "name": "reserved_bytes",
-          "type": "bigint unsigned",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "limit_bytes": {
-          "name": "limit_bytes",
-          "type": "bigint unsigned",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "expires_at": {
-          "name": "expires_at",
-          "type": "datetime(3)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "media_budget_expiry_idx": {
-          "name": "media_budget_expiry_idx",
-          "columns": [
-            "expires_at"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "media_processing_budgets_id": {
-          "name": "media_processing_budgets_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "messenger_conversations": {
-      "name": "messenger_conversations",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "agent": {
-          "name": "agent",
-          "type": "varchar(32)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "mode": {
-          "name": "mode",
-          "type": "varchar(16)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'agent'"
-        },
-        "userId": {
-          "name": "userId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "anonymousId": {
-          "name": "anonymousId",
-          "type": "varchar(64)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "takeoverByUserId": {
-          "name": "takeoverByUserId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "takeoverAt": {
-          "name": "takeoverAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        },
-        "updatedAt": {
-          "name": "updatedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "onUpdate": true,
-          "default": "(now())"
-        },
-        "lastMessageAt": {
-          "name": "lastMessageAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        }
-      },
-      "indexes": {
-        "user_last_message_idx": {
-          "name": "user_last_message_idx",
-          "columns": [
-            "userId",
-            "lastMessageAt"
-          ],
-          "isUnique": false
-        },
-        "anonymous_last_message_idx": {
-          "name": "anonymous_last_message_idx",
-          "columns": [
-            "anonymousId",
-            "lastMessageAt"
-          ],
-          "isUnique": false
-        },
-        "mode_last_message_idx": {
-          "name": "mode_last_message_idx",
-          "columns": [
-            "mode",
-            "lastMessageAt"
-          ],
-          "isUnique": false
-        },
-        "updated_at_idx": {
-          "name": "updated_at_idx",
-          "columns": [
-            "updatedAt"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "messenger_conversations_id": {
-          "name": "messenger_conversations_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "messenger_messages": {
-      "name": "messenger_messages",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "conversationId": {
-          "name": "conversationId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "role": {
-          "name": "role",
-          "type": "varchar(16)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "content": {
-          "name": "content",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "userId": {
-          "name": "userId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "anonymousId": {
-          "name": "anonymousId",
-          "type": "varchar(64)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        }
-      },
-      "indexes": {
-        "conversation_created_at_idx": {
-          "name": "conversation_created_at_idx",
-          "columns": [
-            "conversationId",
-            "createdAt"
-          ],
-          "isUnique": false
-        },
-        "role_created_at_idx": {
-          "name": "role_created_at_idx",
-          "columns": [
-            "role",
-            "createdAt"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {
-        "messenger_messages_conversationId_messenger_conversations_id_fk": {
-          "name": "messenger_messages_conversationId_messenger_conversations_id_fk",
-          "tableFrom": "messenger_messages",
-          "tableTo": "messenger_conversations",
-          "columnsFrom": [
-            "conversationId"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {
-        "messenger_messages_id": {
-          "name": "messenger_messages_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "messenger_support_emails": {
-      "name": "messenger_support_emails",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "conversationId": {
-          "name": "conversationId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "userId": {
-          "name": "userId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "userEmail": {
-          "name": "userEmail",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "subject": {
-          "name": "subject",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "message": {
-          "name": "message",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        }
-      },
-      "indexes": {
-        "support_email_user_created_at_idx": {
-          "name": "support_email_user_created_at_idx",
-          "columns": [
-            "userId",
-            "createdAt"
-          ],
-          "isUnique": false
-        },
-        "support_email_conversation_created_at_idx": {
-          "name": "support_email_conversation_created_at_idx",
-          "columns": [
-            "conversationId",
-            "createdAt"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {
-        "support_email_conversation_fk": {
-          "name": "support_email_conversation_fk",
-          "tableFrom": "messenger_support_emails",
-          "tableTo": "messenger_conversations",
-          "columnsFrom": [
-            "conversationId"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {
-        "messenger_support_emails_id": {
-          "name": "messenger_support_emails_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "notifications": {
-      "name": "notifications",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "orgId": {
-          "name": "orgId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "recipientId": {
-          "name": "recipientId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "type": {
-          "name": "type",
-          "type": "varchar(16)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "data": {
-          "name": "data",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "videoId": {
-          "name": "videoId",
-          "type": "varchar(50)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "dedupKey": {
-          "name": "dedupKey",
-          "type": "varchar(128)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "readAt": {
-          "name": "readAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        }
-      },
-      "indexes": {
-        "org_id_idx": {
-          "name": "org_id_idx",
-          "columns": [
-            "orgId"
-          ],
-          "isUnique": false
-        },
-        "type_idx": {
-          "name": "type_idx",
-          "columns": [
-            "type"
-          ],
-          "isUnique": false
-        },
-        "read_at_idx": {
-          "name": "read_at_idx",
-          "columns": [
-            "readAt"
-          ],
-          "isUnique": false
-        },
-        "created_at_idx": {
-          "name": "created_at_idx",
-          "columns": [
-            "createdAt"
-          ],
-          "isUnique": false
-        },
-        "recipient_read_idx": {
-          "name": "recipient_read_idx",
-          "columns": [
-            "recipientId",
-            "readAt"
-          ],
-          "isUnique": false
-        },
-        "recipient_created_idx": {
-          "name": "recipient_created_idx",
-          "columns": [
-            "recipientId",
-            "createdAt"
-          ],
-          "isUnique": false
-        },
-        "dedup_key_idx": {
-          "name": "dedup_key_idx",
-          "columns": [
-            "dedupKey"
-          ],
-          "isUnique": true
-        },
-        "type_recipient_created_idx": {
-          "name": "type_recipient_created_idx",
-          "columns": [
-            "type",
-            "recipientId",
-            "createdAt"
-          ],
-          "isUnique": false
-        },
-        "type_recipient_video_created_idx": {
-          "name": "type_recipient_video_created_idx",
-          "columns": [
-            "type",
-            "recipientId",
-            "videoId",
-            "createdAt"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "notifications_id": {
-          "name": "notifications_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "organization_invites": {
-      "name": "organization_invites",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "organizationId": {
-          "name": "organizationId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "invitedEmail": {
-          "name": "invitedEmail",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "invitedByUserId": {
-          "name": "invitedByUserId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "role": {
-          "name": "role",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "status": {
-          "name": "status",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'pending'"
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        },
-        "updatedAt": {
-          "name": "updatedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "onUpdate": true,
-          "default": "(now())"
-        },
-        "expiresAt": {
-          "name": "expiresAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "organization_id_idx": {
-          "name": "organization_id_idx",
-          "columns": [
-            "organizationId"
-          ],
-          "isUnique": false
-        },
-        "invited_email_idx": {
-          "name": "invited_email_idx",
-          "columns": [
-            "invitedEmail"
-          ],
-          "isUnique": false
-        },
-        "invited_by_user_id_idx": {
-          "name": "invited_by_user_id_idx",
-          "columns": [
-            "invitedByUserId"
-          ],
-          "isUnique": false
-        },
-        "status_idx": {
-          "name": "status_idx",
-          "columns": [
-            "status"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "organization_invites_id": {
-          "name": "organization_invites_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "organization_members": {
-      "name": "organization_members",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "userId": {
-          "name": "userId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "organizationId": {
-          "name": "organizationId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "role": {
-          "name": "role",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "hasProSeat": {
-          "name": "hasProSeat",
-          "type": "boolean",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        },
-        "updatedAt": {
-          "name": "updatedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "onUpdate": true,
-          "default": "(now())"
-        }
-      },
-      "indexes": {
-        "organization_id_idx": {
-          "name": "organization_id_idx",
-          "columns": [
-            "organizationId"
-          ],
-          "isUnique": false
-        },
-        "user_id_organization_id_idx": {
-          "name": "user_id_organization_id_idx",
-          "columns": [
-            "userId",
-            "organizationId"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "organization_members_id": {
-          "name": "organization_members_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "organization_sso": {
-      "name": "organization_sso",
-      "columns": {
-        "organizationId": {
-          "name": "organizationId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "purchasedByUserId": {
-          "name": "purchasedByUserId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "stripeCustomerId": {
-          "name": "stripeCustomerId",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "stripeSubscriptionId": {
-          "name": "stripeSubscriptionId",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "stripePriceId": {
-          "name": "stripePriceId",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "status": {
-          "name": "status",
-          "type": "varchar(32)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'unpaid'"
-        },
-        "paidThrough": {
-          "name": "paidThrough",
-          "type": "datetime",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "currentPeriodEnd": {
-          "name": "currentPeriodEnd",
-          "type": "datetime",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "cancelAtPeriodEnd": {
-          "name": "cancelAtPeriodEnd",
-          "type": "boolean",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "checkoutAttemptId": {
-          "name": "checkoutAttemptId",
-          "type": "varchar(36)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "checkoutCurrency": {
-          "name": "checkoutCurrency",
-          "type": "varchar(3)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "checkoutPriceId": {
-          "name": "checkoutPriceId",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "checkoutSessionId": {
-          "name": "checkoutSessionId",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "checkoutStartedAt": {
-          "name": "checkoutStartedAt",
-          "type": "datetime",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        },
-        "updatedAt": {
-          "name": "updatedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "onUpdate": true,
-          "default": "(now())"
-        }
-      },
-      "indexes": {
-        "sso_stripe_subscription_id_idx": {
-          "name": "sso_stripe_subscription_id_idx",
-          "columns": [
-            "stripeSubscriptionId"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "organization_sso_organizationId": {
-          "name": "organization_sso_organizationId",
-          "columns": [
-            "organizationId"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "organizations": {
-      "name": "organizations",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "ownerId": {
-          "name": "ownerId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "metadata": {
-          "name": "metadata",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "tombstoneAt": {
-          "name": "tombstoneAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "allowedEmailDomain": {
-          "name": "allowedEmailDomain",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "defaultVideoVisibility": {
-          "name": "defaultVideoVisibility",
-          "type": "varchar(7)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "customDomain": {
-          "name": "customDomain",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "domainVerified": {
-          "name": "domainVerified",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "settings": {
-          "name": "settings",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "iconUrl": {
-          "name": "iconUrl",
-          "type": "varchar(1024)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "shareableLinkIconUrl": {
-          "name": "shareableLinkIconUrl",
-          "type": "varchar(1024)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        },
-        "updatedAt": {
-          "name": "updatedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "onUpdate": true,
-          "default": "(now())"
-        },
-        "workosOrganizationId": {
-          "name": "workosOrganizationId",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "workosConnectionId": {
-          "name": "workosConnectionId",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "owner_id_tombstone_idx": {
-          "name": "owner_id_tombstone_idx",
-          "columns": [
-            "ownerId",
-            "tombstoneAt"
-          ],
-          "isUnique": false
-        },
-        "custom_domain_idx": {
-          "name": "custom_domain_idx",
-          "columns": [
-            "customDomain"
-          ],
-          "isUnique": false
-        },
-        "workos_organization_id_idx": {
-          "name": "workos_organization_id_idx",
-          "columns": [
-            "workosOrganizationId"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "organizations_id": {
-          "name": "organizations_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "s3_buckets": {
-      "name": "s3_buckets",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "ownerId": {
-          "name": "ownerId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "organizationId": {
-          "name": "organizationId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "region": {
-          "name": "region",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "endpoint": {
-          "name": "endpoint",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "bucketName": {
-          "name": "bucketName",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "accessKeyId": {
-          "name": "accessKeyId",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "secretAccessKey": {
-          "name": "secretAccessKey",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "provider": {
-          "name": "provider",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "('aws')"
-        },
-        "active": {
-          "name": "active",
-          "type": "boolean",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        },
-        "updatedAt": {
-          "name": "updatedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "onUpdate": true,
-          "default": "(now())"
-        }
-      },
-      "indexes": {
-        "owner_organization_idx": {
-          "name": "owner_organization_idx",
-          "columns": [
-            "ownerId",
-            "organizationId"
-          ],
-          "isUnique": false
-        },
-        "organization_id_idx": {
-          "name": "organization_id_idx",
-          "columns": [
-            "organizationId"
-          ],
-          "isUnique": false
-        },
-        "organization_active_idx": {
-          "name": "organization_active_idx",
-          "columns": [
-            "organizationId",
-            "active",
-            "updatedAt"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "s3_buckets_id": {
-          "name": "s3_buckets_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "sessions": {
-      "name": "sessions",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "sessionToken": {
-          "name": "sessionToken",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "userId": {
-          "name": "userId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "expires": {
-          "name": "expires",
-          "type": "datetime",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "onUpdate": true,
-          "default": "(now())"
-        }
-      },
-      "indexes": {
-        "session_token_idx": {
-          "name": "session_token_idx",
-          "columns": [
-            "sessionToken"
-          ],
-          "isUnique": true
-        },
-        "user_id_idx": {
-          "name": "user_id_idx",
-          "columns": [
-            "userId"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "sessions_id": {
-          "name": "sessions_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "shared_videos": {
-      "name": "shared_videos",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "videoId": {
-          "name": "videoId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "folderId": {
-          "name": "folderId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "organizationId": {
-          "name": "organizationId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "sharedByUserId": {
-          "name": "sharedByUserId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "sharedAt": {
-          "name": "sharedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        }
-      },
-      "indexes": {
-        "folder_id_idx": {
-          "name": "folder_id_idx",
-          "columns": [
-            "folderId"
-          ],
-          "isUnique": false
-        },
-        "organization_id_idx": {
-          "name": "organization_id_idx",
-          "columns": [
-            "organizationId"
-          ],
-          "isUnique": false
-        },
-        "shared_by_user_id_idx": {
-          "name": "shared_by_user_id_idx",
-          "columns": [
-            "sharedByUserId"
-          ],
-          "isUnique": false
-        },
-        "video_id_organization_id_idx": {
-          "name": "video_id_organization_id_idx",
-          "columns": [
-            "videoId",
-            "organizationId"
-          ],
-          "isUnique": false
-        },
-        "video_id_folder_id_idx": {
-          "name": "video_id_folder_id_idx",
-          "columns": [
-            "videoId",
-            "folderId"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "shared_videos_id": {
-          "name": "shared_videos_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "signed_baas": {
-      "name": "signed_baas",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "organizationId": {
-          "name": "organizationId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "userId": {
-          "name": "userId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "status": {
-          "name": "status",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'pending'"
-        },
-        "stripeSubscriptionId": {
-          "name": "stripeSubscriptionId",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "entityName": {
-          "name": "entityName",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "entityType": {
-          "name": "entityType",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "entityAddress": {
-          "name": "entityAddress",
-          "type": "varchar(500)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "signerName": {
-          "name": "signerName",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "signerTitle": {
-          "name": "signerTitle",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "noticesEmail": {
-          "name": "noticesEmail",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "signatureData": {
-          "name": "signatureData",
-          "type": "longtext",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "signedAt": {
-          "name": "signedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "emailSentAt": {
-          "name": "emailSentAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        },
-        "updatedAt": {
-          "name": "updatedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "onUpdate": true,
-          "default": "(now())"
-        }
-      },
-      "indexes": {
-        "signed_baa_organization_id_idx": {
-          "name": "signed_baa_organization_id_idx",
-          "columns": [
-            "organizationId"
-          ],
-          "isUnique": true
-        },
-        "signed_baa_stripe_subscription_idx": {
-          "name": "signed_baa_stripe_subscription_idx",
-          "columns": [
-            "stripeSubscriptionId"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "signed_baas_id": {
-          "name": "signed_baas_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "space_members": {
-      "name": "space_members",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "spaceId": {
-          "name": "spaceId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "userId": {
-          "name": "userId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "role": {
-          "name": "role",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'member'"
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        },
-        "updatedAt": {
-          "name": "updatedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "onUpdate": true,
-          "default": "(now())"
-        }
-      },
-      "indexes": {
-        "user_id_idx": {
-          "name": "user_id_idx",
-          "columns": [
-            "userId"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "space_members_id": {
-          "name": "space_members_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {
-        "space_id_user_id_unique": {
-          "name": "space_id_user_id_unique",
-          "columns": [
-            "spaceId",
-            "userId"
-          ]
-        }
-      },
-      "checkConstraint": {}
-    },
-    "space_videos": {
-      "name": "space_videos",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "spaceId": {
-          "name": "spaceId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "folderId": {
-          "name": "folderId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "videoId": {
-          "name": "videoId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "addedById": {
-          "name": "addedById",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "addedAt": {
-          "name": "addedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        }
-      },
-      "indexes": {
-        "folder_id_idx": {
-          "name": "folder_id_idx",
-          "columns": [
-            "folderId"
-          ],
-          "isUnique": false
-        },
-        "video_id_idx": {
-          "name": "video_id_idx",
-          "columns": [
-            "videoId"
-          ],
-          "isUnique": false
-        },
-        "added_by_id_idx": {
-          "name": "added_by_id_idx",
-          "columns": [
-            "addedById"
-          ],
-          "isUnique": false
-        },
-        "space_id_video_id_idx": {
-          "name": "space_id_video_id_idx",
-          "columns": [
-            "spaceId",
-            "videoId"
-          ],
-          "isUnique": false
-        },
-        "space_id_folder_id_idx": {
-          "name": "space_id_folder_id_idx",
-          "columns": [
-            "spaceId",
-            "folderId"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "space_videos_id": {
-          "name": "space_videos_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "spaces": {
-      "name": "spaces",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "primary": {
-          "name": "primary",
-          "type": "boolean",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "name": {
-          "name": "name",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "organizationId": {
-          "name": "organizationId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "createdById": {
-          "name": "createdById",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "iconUrl": {
-          "name": "iconUrl",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "description": {
-          "name": "description",
-          "type": "varchar(1000)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "settings": {
-          "name": "settings",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "password": {
-          "name": "password",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        },
-        "updatedAt": {
-          "name": "updatedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "onUpdate": true,
-          "default": "(now())"
-        },
-        "privacy": {
-          "name": "privacy",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'Private'"
-        },
-        "public": {
-          "name": "public",
-          "type": "boolean",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        }
-      },
-      "indexes": {
-        "organization_id_idx": {
-          "name": "organization_id_idx",
-          "columns": [
-            "organizationId"
-          ],
-          "isUnique": false
-        },
-        "created_by_id_idx": {
-          "name": "created_by_id_idx",
-          "columns": [
-            "createdById"
-          ],
-          "isUnique": false
-        },
-        "public_organization_id_idx": {
-          "name": "public_organization_id_idx",
-          "columns": [
-            "public",
-            "organizationId"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "spaces_id": {
-          "name": "spaces_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "storage_integrations": {
-      "name": "storage_integrations",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "ownerId": {
-          "name": "ownerId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "organizationId": {
-          "name": "organizationId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "provider": {
-          "name": "provider",
-          "type": "varchar(64)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "displayName": {
-          "name": "displayName",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "status": {
-          "name": "status",
-          "type": "varchar(32)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'active'"
-        },
-        "active": {
-          "name": "active",
-          "type": "boolean",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "encryptedConfig": {
-          "name": "encryptedConfig",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "googleDriveAccessToken": {
-          "name": "googleDriveAccessToken",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "googleDriveAccessTokenExpiresAt": {
-          "name": "googleDriveAccessTokenExpiresAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "googleDriveTokenRefreshLeaseId": {
-          "name": "googleDriveTokenRefreshLeaseId",
-          "type": "varchar(64)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "googleDriveTokenRefreshLeaseExpiresAt": {
-          "name": "googleDriveTokenRefreshLeaseExpiresAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "googleDriveStorageQuotaCache": {
-          "name": "googleDriveStorageQuotaCache",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        },
-        "updatedAt": {
-          "name": "updatedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "onUpdate": true,
-          "default": "(now())"
-        }
-      },
-      "indexes": {
-        "owner_provider_idx": {
-          "name": "owner_provider_idx",
-          "columns": [
-            "ownerId",
-            "provider"
-          ],
-          "isUnique": false
-        },
-        "owner_active_idx": {
-          "name": "owner_active_idx",
-          "columns": [
-            "ownerId",
-            "active"
-          ],
-          "isUnique": false
-        },
-        "organization_provider_idx": {
-          "name": "organization_provider_idx",
-          "columns": [
-            "organizationId",
-            "provider"
-          ],
-          "isUnique": false
-        },
-        "organization_active_idx": {
-          "name": "organization_active_idx",
-          "columns": [
-            "organizationId",
-            "active",
-            "status"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "storage_integrations_id": {
-          "name": "storage_integrations_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "storage_objects": {
-      "name": "storage_objects",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "integrationId": {
-          "name": "integrationId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "ownerId": {
-          "name": "ownerId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "videoId": {
-          "name": "videoId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "objectKey": {
-          "name": "objectKey",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "objectKeyHash": {
-          "name": "objectKeyHash",
-          "type": "varchar(64)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "providerObjectId": {
-          "name": "providerObjectId",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "uploadSessionUrl": {
-          "name": "uploadSessionUrl",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "uploadStatus": {
-          "name": "uploadStatus",
-          "type": "varchar(32)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'pending'"
-        },
-        "contentType": {
-          "name": "contentType",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "contentLength": {
-          "name": "contentLength",
-          "type": "bigint unsigned",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "metadata": {
-          "name": "metadata",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        },
-        "updatedAt": {
-          "name": "updatedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "onUpdate": true,
-          "default": "(now())"
-        }
-      },
-      "indexes": {
-        "integration_key_hash_idx": {
-          "name": "integration_key_hash_idx",
-          "columns": [
-            "integrationId",
-            "objectKeyHash"
-          ],
-          "isUnique": true
-        },
-        "integration_status_idx": {
-          "name": "integration_status_idx",
-          "columns": [
-            "integrationId",
-            "uploadStatus"
-          ],
-          "isUnique": false
-        },
-        "integration_object_key_prefix_idx": {
-          "name": "integration_object_key_prefix_idx",
-          "columns": [
-            "integrationId",
-            "`objectKey`(191)"
-          ],
-          "isUnique": false
-        },
-        "video_id_idx": {
-          "name": "video_id_idx",
-          "columns": [
-            "videoId"
-          ],
-          "isUnique": false
-        },
-        "owner_id_idx": {
-          "name": "owner_id_idx",
-          "columns": [
-            "ownerId"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {
-        "storage_objects_integrationId_storage_integrations_id_fk": {
-          "name": "storage_objects_integrationId_storage_integrations_id_fk",
-          "tableFrom": "storage_objects",
-          "tableTo": "storage_integrations",
-          "columnsFrom": [
-            "integrationId"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "restrict",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {
-        "storage_objects_id": {
-          "name": "storage_objects_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "users": {
-      "name": "users",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "lastName": {
-          "name": "lastName",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "email": {
-          "name": "email",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "emailVerified": {
-          "name": "emailVerified",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "image": {
-          "name": "image",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "stripeCustomerId": {
-          "name": "stripeCustomerId",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "stripeSubscriptionId": {
-          "name": "stripeSubscriptionId",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "thirdPartyStripeSubscriptionId": {
-          "name": "thirdPartyStripeSubscriptionId",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "stripeSubscriptionStatus": {
-          "name": "stripeSubscriptionStatus",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "stripeSubscriptionPriceId": {
-          "name": "stripeSubscriptionPriceId",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "preferences": {
-          "name": "preferences",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "('null')"
-        },
-        "activeOrganizationId": {
-          "name": "activeOrganizationId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "onUpdate": true,
-          "default": "(now())"
-        },
-        "onboardingSteps": {
-          "name": "onboardingSteps",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "onboarding_completed_at": {
-          "name": "onboarding_completed_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "customBucket": {
-          "name": "customBucket",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "inviteQuota": {
-          "name": "inviteQuota",
-          "type": "int",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 1
-        },
-        "defaultOrgId": {
-          "name": "defaultOrgId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "authSessionVersion": {
-          "name": "authSessionVersion",
-          "type": "int",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "marketingOrigin": {
-          "name": "marketingOrigin",
-          "type": "varchar(20)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'unknown'"
-        }
-      },
-      "indexes": {
-        "email_idx": {
-          "name": "email_idx",
-          "columns": [
-            "email"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "users_id": {
-          "name": "users_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "verification_tokens": {
-      "name": "verification_tokens",
-      "columns": {
-        "identifier": {
-          "name": "identifier",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "token": {
-          "name": "token",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "expires": {
-          "name": "expires",
-          "type": "datetime",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "onUpdate": true,
-          "default": "(now())"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "verification_tokens_identifier": {
-          "name": "verification_tokens_identifier",
-          "columns": [
-            "identifier"
-          ]
-        }
-      },
-      "uniqueConstraints": {
-        "verification_tokens_token_unique": {
-          "name": "verification_tokens_token_unique",
-          "columns": [
-            "token"
-          ]
-        }
-      },
-      "checkConstraint": {}
-    },
-    "video_edits": {
-      "name": "video_edits",
-      "columns": {
-        "videoId": {
-          "name": "videoId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "sourceKey": {
-          "name": "sourceKey",
-          "type": "varchar(512)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "editSpec": {
-          "name": "editSpec",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        },
-        "updatedAt": {
-          "name": "updatedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "onUpdate": true,
-          "default": "(now())"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "video_edits_videoId_videos_id_fk": {
-          "name": "video_edits_videoId_videos_id_fk",
-          "tableFrom": "video_edits",
-          "tableTo": "videos",
-          "columnsFrom": [
-            "videoId"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {
-        "video_edits_videoId": {
-          "name": "video_edits_videoId",
-          "columns": [
-            "videoId"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "video_processing_jobs": {
-      "name": "video_processing_jobs",
-      "columns": {
-        "video_id": {
-          "name": "video_id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "owner_id": {
-          "name": "owner_id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "generation": {
-          "name": "generation",
-          "type": "varchar(64)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "manifest_sha256": {
-          "name": "manifest_sha256",
-          "type": "varchar(64)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "state": {
-          "name": "state",
-          "type": "varchar(32)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'committing'"
-        },
-        "attempt_id": {
-          "name": "attempt_id",
-          "type": "varchar(64)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "attempt_count": {
-          "name": "attempt_count",
-          "type": "int",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "lease_expires_at": {
-          "name": "lease_expires_at",
-          "type": "datetime(3)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "next_retry_at": {
-          "name": "next_retry_at",
-          "type": "datetime(3)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "workflow_run_id": {
-          "name": "workflow_run_id",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "remote_job_id": {
-          "name": "remote_job_id",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "source": {
-          "name": "source",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "verification": {
-          "name": "verification",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "output": {
-          "name": "output",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "error_code": {
-          "name": "error_code",
-          "type": "varchar(64)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "error_message": {
-          "name": "error_message",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "datetime(3)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "datetime(3)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "processing_state_retry_video_idx": {
-          "name": "processing_state_retry_video_idx",
-          "columns": [
-            "state",
-            "next_retry_at",
-            "video_id"
-          ],
-          "isUnique": false
-        },
-        "processing_state_lease_video_idx": {
-          "name": "processing_state_lease_video_idx",
-          "columns": [
-            "state",
-            "lease_expires_at",
-            "video_id"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "video_processing_jobs_video_id": {
-          "name": "video_processing_jobs_video_id",
-          "columns": [
-            "video_id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "video_uploads": {
-      "name": "video_uploads",
-      "columns": {
-        "video_id": {
-          "name": "video_id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "uploaded": {
-          "name": "uploaded",
-          "type": "bigint unsigned",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "total": {
-          "name": "total",
-          "type": "bigint unsigned",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "started_at": {
-          "name": "started_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        },
-        "mode": {
-          "name": "mode",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "phase": {
-          "name": "phase",
-          "type": "varchar(32)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'uploading'"
-        },
-        "processing_progress": {
-          "name": "processing_progress",
-          "type": "int",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "processing_message": {
-          "name": "processing_message",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "processing_error": {
-          "name": "processing_error",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "raw_file_key": {
-          "name": "raw_file_key",
-          "type": "varchar(512)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "phase_updated_at_video_id_idx": {
-          "name": "phase_updated_at_video_id_idx",
-          "columns": [
-            "phase",
-            "updated_at",
-            "video_id"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {
-        "video_uploads_video_id": {
-          "name": "video_uploads_video_id",
-          "columns": [
-            "video_id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "video_viewer_grants": {
-      "name": "video_viewer_grants",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "videoId": {
-          "name": "videoId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "email": {
-          "name": "email",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "invitedByUserId": {
-          "name": "invitedByUserId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        },
-        "revokedAt": {
-          "name": "revokedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "video_email_idx": {
-          "name": "video_email_idx",
-          "columns": [
-            "videoId",
-            "email"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "video_viewer_grants_videoId_videos_id_fk": {
-          "name": "video_viewer_grants_videoId_videos_id_fk",
-          "tableFrom": "video_viewer_grants",
-          "tableTo": "videos",
-          "columnsFrom": [
-            "videoId"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {
-        "video_viewer_grants_id": {
-          "name": "video_viewer_grants_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    },
-    "videos": {
-      "name": "videos",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "ownerId": {
-          "name": "ownerId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "orgId": {
-          "name": "orgId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'My Video'"
-        },
-        "bucket": {
-          "name": "bucket",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "storageIntegrationId": {
-          "name": "storageIntegrationId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "duration": {
-          "name": "duration",
-          "type": "float",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "width": {
-          "name": "width",
-          "type": "int",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "height": {
-          "name": "height",
-          "type": "int",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "fps": {
-          "name": "fps",
-          "type": "int",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "metadata": {
-          "name": "metadata",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "public": {
-          "name": "public",
-          "type": "boolean",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "settings": {
-          "name": "settings",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "transcriptionStatus": {
-          "name": "transcriptionStatus",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "source": {
-          "name": "source",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "('{\"type\":\"MediaConvert\"}')"
-        },
-        "folderId": {
-          "name": "folderId",
-          "type": "varchar(15)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "createdAt": {
-          "name": "createdAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(now())"
-        },
-        "effectiveCreatedAt": {
-          "name": "effectiveCreatedAt",
-          "type": "datetime",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "generated": {
-            "as": "COALESCE(\n          STR_TO_DATE(JSON_UNQUOTE(JSON_EXTRACT(`metadata`, '$.customCreatedAt')), '%Y-%m-%dT%H:%i:%s.%fZ'),\n          STR_TO_DATE(JSON_UNQUOTE(JSON_EXTRACT(`metadata`, '$.customCreatedAt')), '%Y-%m-%dT%H:%i:%sZ'),\n          `createdAt`\n        )",
-            "type": "stored"
-          }
-        },
-        "updatedAt": {
-          "name": "updatedAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "onUpdate": true,
-          "default": "(now())"
-        },
-        "password": {
-          "name": "password",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "xStreamInfo": {
-          "name": "xStreamInfo",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "firstViewEmailSentAt": {
-          "name": "firstViewEmailSentAt",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "isScreenshot": {
-          "name": "isScreenshot",
-          "type": "boolean",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "awsRegion": {
-          "name": "awsRegion",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "awsBucket": {
-          "name": "awsBucket",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "videoStartTime": {
-          "name": "videoStartTime",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "audioStartTime": {
-          "name": "audioStartTime",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "jobId": {
-          "name": "jobId",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "jobStatus": {
-          "name": "jobStatus",
-          "type": "varchar(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "skipProcessing": {
-          "name": "skipProcessing",
-          "type": "boolean",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        }
-      },
-      "indexes": {
-        "owner_id_idx": {
-          "name": "owner_id_idx",
-          "columns": [
-            "ownerId"
-          ],
-          "isUnique": false
-        },
-        "owner_updated_id_idx": {
-          "name": "owner_updated_id_idx",
-          "columns": [
-            "ownerId",
-            "updatedAt",
-            "id"
-          ],
-          "isUnique": false
-        },
-        "is_public_idx": {
-          "name": "is_public_idx",
-          "columns": [
-            "public"
-          ],
-          "isUnique": false
-        },
-        "folder_id_idx": {
-          "name": "folder_id_idx",
-          "columns": [
-            "folderId"
-          ],
-          "isUnique": false
-        },
-        "storage_integration_id_idx": {
-          "name": "storage_integration_id_idx",
-          "columns": [
-            "storageIntegrationId"
-          ],
-          "isUnique": false
-        },
-        "org_owner_folder_idx": {
-          "name": "org_owner_folder_idx",
-          "columns": [
-            "orgId",
-            "ownerId",
-            "folderId"
-          ],
-          "isUnique": false
-        },
-        "org_effective_created_idx": {
-          "name": "org_effective_created_idx",
-          "columns": [
-            "orgId",
-            "effectiveCreatedAt"
-          ],
-          "isUnique": false
-        },
-        "screenshot_transcription_created_idx": {
-          "name": "screenshot_transcription_created_idx",
-          "columns": [
-            "isScreenshot",
-            "transcriptionStatus",
-            "createdAt"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {
-        "videos_storageIntegrationId_storage_integrations_id_fk": {
-          "name": "videos_storageIntegrationId_storage_integrations_id_fk",
-          "tableFrom": "videos",
-          "tableTo": "storage_integrations",
-          "columnsFrom": [
-            "storageIntegrationId"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "restrict",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {
-        "videos_id": {
-          "name": "videos_id",
-          "columns": [
-            "id"
-          ]
-        }
-      },
-      "uniqueConstraints": {},
-      "checkConstraint": {}
-    }
-  },
-  "views": {},
-  "_meta": {
-    "schemas": {},
-    "tables": {},
-    "columns": {}
-  },
-  "internal": {
-    "tables": {},
-    "indexes": {
-      "integration_object_key_prefix_idx": {
-        "columns": {
-          "`objectKey`(191)": {
-            "isExpression": true
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
+	"version": "5",
+	"dialect": "mysql",
+	"id": "d513a71b-36f6-4513-8ebf-071a00a4e709",
+	"prevId": "7db9e8b2-ba9e-416d-a243-4b79b5d4ec5d",
+	"tables": {
+		"accounts": {
+			"name": "accounts",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"type": {
+					"name": "type",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"provider": {
+					"name": "provider",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"providerAccountId": {
+					"name": "providerAccountId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"access_token": {
+					"name": "access_token",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"expires_in": {
+					"name": "expires_in",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"id_token": {
+					"name": "id_token",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"refresh_token": {
+					"name": "refresh_token",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"refresh_token_expires_in": {
+					"name": "refresh_token_expires_in",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"scope": {
+					"name": "scope",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"token_type": {
+					"name": "token_type",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				},
+				"tempColumn": {
+					"name": "tempColumn",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"user_id_idx": {
+					"name": "user_id_idx",
+					"columns": ["userId"],
+					"isUnique": false
+				},
+				"provider_account_id_idx": {
+					"name": "provider_account_id_idx",
+					"columns": ["providerAccountId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"accounts_id": {
+					"name": "accounts_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"agent_api_authorization_codes": {
+			"name": "agent_api_authorization_codes",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"codeHash": {
+					"name": "codeHash",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"codeChallenge": {
+					"name": "codeChallenge",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"redirectUri": {
+					"name": "redirectUri",
+					"type": "varchar(512)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"scopes": {
+					"name": "scopes",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"expiresAt": {
+					"name": "expiresAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"consumedAt": {
+					"name": "consumedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"code_hash_idx": {
+					"name": "code_hash_idx",
+					"columns": ["codeHash"],
+					"isUnique": true
+				},
+				"expires_at_idx": {
+					"name": "expires_at_idx",
+					"columns": ["expiresAt"],
+					"isUnique": false
+				},
+				"user_created_at_idx": {
+					"name": "user_created_at_idx",
+					"columns": ["userId", "createdAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"agent_api_authorization_codes_id": {
+					"name": "agent_api_authorization_codes_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"agent_api_idempotency": {
+			"name": "agent_api_idempotency",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"operation": {
+					"name": "operation",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"keyHash": {
+					"name": "keyHash",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"requestHash": {
+					"name": "requestHash",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"state": {
+					"name": "state",
+					"type": "varchar(16)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'pending'"
+				},
+				"statusCode": {
+					"name": "statusCode",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"response": {
+					"name": "response",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"expiresAt": {
+					"name": "expiresAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"user_operation_key_idx": {
+					"name": "user_operation_key_idx",
+					"columns": ["userId", "operation", "keyHash"],
+					"isUnique": true
+				},
+				"expires_at_idx": {
+					"name": "expires_at_idx",
+					"columns": ["expiresAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"agent_api_idempotency_id": {
+					"name": "agent_api_idempotency_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"agent_api_keys": {
+			"name": "agent_api_keys",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"tokenHash": {
+					"name": "tokenHash",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"name": {
+					"name": "name",
+					"type": "varchar(100)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'Cap CLI'"
+				},
+				"scopes": {
+					"name": "scopes",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"expiresAt": {
+					"name": "expiresAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"revokedAt": {
+					"name": "revokedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"lastUsedAt": {
+					"name": "lastUsedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"token_hash_idx": {
+					"name": "token_hash_idx",
+					"columns": ["tokenHash"],
+					"isUnique": true
+				},
+				"user_created_at_idx": {
+					"name": "user_created_at_idx",
+					"columns": ["userId", "createdAt"],
+					"isUnique": false
+				},
+				"expires_at_idx": {
+					"name": "expires_at_idx",
+					"columns": ["expiresAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"agent_api_keys_id": {
+					"name": "agent_api_keys_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"agent_api_operations": {
+			"name": "agent_api_operations",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"kind": {
+					"name": "kind",
+					"type": "varchar(32)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"resourceId": {
+					"name": "resourceId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"resultResourceId": {
+					"name": "resultResourceId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"state": {
+					"name": "state",
+					"type": "varchar(16)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'queued'"
+				},
+				"payload": {
+					"name": "payload",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"result": {
+					"name": "result",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"errorCode": {
+					"name": "errorCode",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"errorMessage": {
+					"name": "errorMessage",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				},
+				"completedAt": {
+					"name": "completedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"user_created_at_idx": {
+					"name": "user_created_at_idx",
+					"columns": ["userId", "createdAt"],
+					"isUnique": false
+				},
+				"state_updated_at_idx": {
+					"name": "state_updated_at_idx",
+					"columns": ["state", "updatedAt"],
+					"isUnique": false
+				},
+				"resource_id_idx": {
+					"name": "resource_id_idx",
+					"columns": ["resourceId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"agent_api_operations_id": {
+					"name": "agent_api_operations_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"auth_api_keys": {
+			"name": "auth_api_keys",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(36)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"source": {
+					"name": "source",
+					"type": "varchar(32)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'unknown'"
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"user_id_created_at_idx": {
+					"name": "user_id_created_at_idx",
+					"columns": ["userId", "createdAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"auth_api_keys_id": {
+					"name": "auth_api_keys_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"comments": {
+			"name": "comments",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"type": {
+					"name": "type",
+					"type": "varchar(6)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"content": {
+					"name": "content",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"timestamp": {
+					"name": "timestamp",
+					"type": "float",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"authorId": {
+					"name": "authorId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"videoId": {
+					"name": "videoId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				},
+				"parentCommentId": {
+					"name": "parentCommentId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"mediaKey": {
+					"name": "mediaKey",
+					"type": "varchar(512)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"mediaDuration": {
+					"name": "mediaDuration",
+					"type": "float",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"mediaMeta": {
+					"name": "mediaMeta",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"video_type_created_idx": {
+					"name": "video_type_created_idx",
+					"columns": ["videoId", "type", "createdAt", "id"],
+					"isUnique": false
+				},
+				"author_id_idx": {
+					"name": "author_id_idx",
+					"columns": ["authorId"],
+					"isUnique": false
+				},
+				"parent_comment_id_idx": {
+					"name": "parent_comment_id_idx",
+					"columns": ["parentCommentId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"comments_id": {
+					"name": "comments_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"developer_api_keys": {
+			"name": "developer_api_keys",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"appId": {
+					"name": "appId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"keyType": {
+					"name": "keyType",
+					"type": "varchar(8)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"keyPrefix": {
+					"name": "keyPrefix",
+					"type": "varchar(12)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"keyHash": {
+					"name": "keyHash",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"encryptedKey": {
+					"name": "encryptedKey",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"lastUsedAt": {
+					"name": "lastUsedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"revokedAt": {
+					"name": "revokedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"key_hash_idx": {
+					"name": "key_hash_idx",
+					"columns": ["keyHash"],
+					"isUnique": true
+				},
+				"app_key_type_idx": {
+					"name": "app_key_type_idx",
+					"columns": ["appId", "keyType"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {
+				"developer_api_keys_appId_developer_apps_id_fk": {
+					"name": "developer_api_keys_appId_developer_apps_id_fk",
+					"tableFrom": "developer_api_keys",
+					"tableTo": "developer_apps",
+					"columnsFrom": ["appId"],
+					"columnsTo": ["id"],
+					"onDelete": "no action",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"developer_api_keys_id": {
+					"name": "developer_api_keys_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"developer_app_domains": {
+			"name": "developer_app_domains",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"appId": {
+					"name": "appId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"domain": {
+					"name": "domain",
+					"type": "varchar(253)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {},
+			"foreignKeys": {
+				"developer_app_domains_appId_developer_apps_id_fk": {
+					"name": "developer_app_domains_appId_developer_apps_id_fk",
+					"tableFrom": "developer_app_domains",
+					"tableTo": "developer_apps",
+					"columnsFrom": ["appId"],
+					"columnsTo": ["id"],
+					"onDelete": "no action",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"developer_app_domains_id": {
+					"name": "developer_app_domains_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {
+				"app_domain_unique": {
+					"name": "app_domain_unique",
+					"columns": ["appId", "domain"]
+				}
+			},
+			"checkConstraint": {}
+		},
+		"developer_apps": {
+			"name": "developer_apps",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"ownerId": {
+					"name": "ownerId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"name": {
+					"name": "name",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"environment": {
+					"name": "environment",
+					"type": "varchar(16)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"logoUrl": {
+					"name": "logoUrl",
+					"type": "varchar(1024)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"deletedAt": {
+					"name": "deletedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"owner_deleted_idx": {
+					"name": "owner_deleted_idx",
+					"columns": ["ownerId", "deletedAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"developer_apps_id": {
+					"name": "developer_apps_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"developer_credit_accounts": {
+			"name": "developer_credit_accounts",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"appId": {
+					"name": "appId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"ownerId": {
+					"name": "ownerId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"balanceMicroCredits": {
+					"name": "balanceMicroCredits",
+					"type": "bigint unsigned",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"stripeCustomerId": {
+					"name": "stripeCustomerId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"stripePaymentMethodId": {
+					"name": "stripePaymentMethodId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"autoTopUpEnabled": {
+					"name": "autoTopUpEnabled",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": false
+				},
+				"autoTopUpThresholdMicroCredits": {
+					"name": "autoTopUpThresholdMicroCredits",
+					"type": "bigint unsigned",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"autoTopUpAmountCents": {
+					"name": "autoTopUpAmountCents",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"app_id_unique": {
+					"name": "app_id_unique",
+					"columns": ["appId"],
+					"isUnique": true
+				}
+			},
+			"foreignKeys": {
+				"developer_credit_accounts_appId_developer_apps_id_fk": {
+					"name": "developer_credit_accounts_appId_developer_apps_id_fk",
+					"tableFrom": "developer_credit_accounts",
+					"tableTo": "developer_apps",
+					"columnsFrom": ["appId"],
+					"columnsTo": ["id"],
+					"onDelete": "no action",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"developer_credit_accounts_id": {
+					"name": "developer_credit_accounts_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"developer_credit_transactions": {
+			"name": "developer_credit_transactions",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"accountId": {
+					"name": "accountId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"type": {
+					"name": "type",
+					"type": "varchar(16)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"amountMicroCredits": {
+					"name": "amountMicroCredits",
+					"type": "bigint",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"balanceAfterMicroCredits": {
+					"name": "balanceAfterMicroCredits",
+					"type": "bigint unsigned",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"referenceId": {
+					"name": "referenceId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"referenceType": {
+					"name": "referenceType",
+					"type": "varchar(32)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"metadata": {
+					"name": "metadata",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"account_type_created_idx": {
+					"name": "account_type_created_idx",
+					"columns": ["accountId", "type", "createdAt"],
+					"isUnique": false
+				},
+				"account_ref_dedup_idx": {
+					"name": "account_ref_dedup_idx",
+					"columns": ["accountId", "referenceId", "referenceType"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {
+				"dev_credit_txn_account_fk": {
+					"name": "dev_credit_txn_account_fk",
+					"tableFrom": "developer_credit_transactions",
+					"tableTo": "developer_credit_accounts",
+					"columnsFrom": ["accountId"],
+					"columnsTo": ["id"],
+					"onDelete": "no action",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"developer_credit_transactions_id": {
+					"name": "developer_credit_transactions_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"developer_daily_storage_snapshots": {
+			"name": "developer_daily_storage_snapshots",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"appId": {
+					"name": "appId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"snapshotDate": {
+					"name": "snapshotDate",
+					"type": "varchar(10)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"totalDurationMinutes": {
+					"name": "totalDurationMinutes",
+					"type": "float",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"videoCount": {
+					"name": "videoCount",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"microCreditsCharged": {
+					"name": "microCreditsCharged",
+					"type": "bigint unsigned",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"processedAt": {
+					"name": "processedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {},
+			"foreignKeys": {
+				"developer_daily_storage_snapshots_appId_developer_apps_id_fk": {
+					"name": "developer_daily_storage_snapshots_appId_developer_apps_id_fk",
+					"tableFrom": "developer_daily_storage_snapshots",
+					"tableTo": "developer_apps",
+					"columnsFrom": ["appId"],
+					"columnsTo": ["id"],
+					"onDelete": "no action",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"developer_daily_storage_snapshots_id": {
+					"name": "developer_daily_storage_snapshots_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {
+				"app_date_unique": {
+					"name": "app_date_unique",
+					"columns": ["appId", "snapshotDate"]
+				}
+			},
+			"checkConstraint": {}
+		},
+		"developer_videos": {
+			"name": "developer_videos",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"appId": {
+					"name": "appId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"externalUserId": {
+					"name": "externalUserId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"name": {
+					"name": "name",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'Untitled'"
+				},
+				"duration": {
+					"name": "duration",
+					"type": "float",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"width": {
+					"name": "width",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"height": {
+					"name": "height",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"fps": {
+					"name": "fps",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"s3Key": {
+					"name": "s3Key",
+					"type": "varchar(512)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"transcriptionStatus": {
+					"name": "transcriptionStatus",
+					"type": "varchar(16)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"metadata": {
+					"name": "metadata",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"deletedAt": {
+					"name": "deletedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"app_created_idx": {
+					"name": "app_created_idx",
+					"columns": ["appId", "createdAt"],
+					"isUnique": false
+				},
+				"app_user_idx": {
+					"name": "app_user_idx",
+					"columns": ["appId", "externalUserId"],
+					"isUnique": false
+				},
+				"app_deleted_idx": {
+					"name": "app_deleted_idx",
+					"columns": ["appId", "deletedAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {
+				"developer_videos_appId_developer_apps_id_fk": {
+					"name": "developer_videos_appId_developer_apps_id_fk",
+					"tableFrom": "developer_videos",
+					"tableTo": "developer_apps",
+					"columnsFrom": ["appId"],
+					"columnsTo": ["id"],
+					"onDelete": "no action",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"developer_videos_id": {
+					"name": "developer_videos_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"folders": {
+			"name": "folders",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"name": {
+					"name": "name",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"color": {
+					"name": "color",
+					"type": "varchar(16)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'normal'"
+				},
+				"public": {
+					"name": "public",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": false
+				},
+				"settings": {
+					"name": "settings",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"createdById": {
+					"name": "createdById",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"parentId": {
+					"name": "parentId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"spaceId": {
+					"name": "spaceId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"organization_id_idx": {
+					"name": "organization_id_idx",
+					"columns": ["organizationId"],
+					"isUnique": false
+				},
+				"created_by_id_idx": {
+					"name": "created_by_id_idx",
+					"columns": ["createdById"],
+					"isUnique": false
+				},
+				"parent_id_idx": {
+					"name": "parent_id_idx",
+					"columns": ["parentId"],
+					"isUnique": false
+				},
+				"space_id_idx": {
+					"name": "space_id_idx",
+					"columns": ["spaceId"],
+					"isUnique": false
+				},
+				"public_parent_id_idx": {
+					"name": "public_parent_id_idx",
+					"columns": ["public", "parentId"],
+					"isUnique": false
+				},
+				"public_space_parent_id_idx": {
+					"name": "public_space_parent_id_idx",
+					"columns": ["public", "spaceId", "parentId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"folders_id": {
+					"name": "folders_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"imported_videos": {
+			"name": "imported_videos",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"orgId": {
+					"name": "orgId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"source": {
+					"name": "source",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"source_id": {
+					"name": "source_id",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"id_idx": {
+					"name": "id_idx",
+					"columns": ["id"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"imported_videos_orgId_source_source_id_pk": {
+					"name": "imported_videos_orgId_source_source_id_pk",
+					"columns": ["orgId", "source", "source_id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"integration_installations": {
+			"name": "integration_installations",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"provider": {
+					"name": "provider",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"externalId": {
+					"name": "externalId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"displayName": {
+					"name": "displayName",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"installedByUserId": {
+					"name": "installedByUserId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"encryptedCredentials": {
+					"name": "encryptedCredentials",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"metadata": {
+					"name": "metadata",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"provider_external_id_idx": {
+					"name": "provider_external_id_idx",
+					"columns": ["provider", "externalId"],
+					"isUnique": true
+				},
+				"organization_provider_display_name_idx": {
+					"name": "organization_provider_display_name_idx",
+					"columns": ["organizationId", "provider", "displayName"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"integration_installations_id": {
+					"name": "integration_installations_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"loom_migration_imports": {
+			"name": "loom_migration_imports",
+			"columns": {
+				"videoId": {
+					"name": "videoId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"requestId": {
+					"name": "requestId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"loom_migration_imports_request_idx": {
+					"name": "loom_migration_imports_request_idx",
+					"columns": ["requestId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"loom_migration_imports_videoId": {
+					"name": "loom_migration_imports_videoId",
+					"columns": ["videoId"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"loom_migration_requests": {
+			"name": "loom_migration_requests",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"activeOrganizationId": {
+					"name": "activeOrganizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"requestedByUserId": {
+					"name": "requestedByUserId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"workspaceName": {
+					"name": "workspaceName",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"customerNote": {
+					"name": "customerNote",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"customerReply": {
+					"name": "customerReply",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"invitedAt": {
+					"name": "invitedAt",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"status": {
+					"name": "status",
+					"type": "varchar(32)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'pending'"
+				},
+				"capMessage": {
+					"name": "capMessage",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"expectedVideoCount": {
+					"name": "expectedVideoCount",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"importedVideoCount": {
+					"name": "importedVideoCount",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"queuedVideoCount": {
+					"name": "queuedVideoCount",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"activeImportCount": {
+					"name": "activeImportCount",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"activeImportLeaseToken": {
+					"name": "activeImportLeaseToken",
+					"type": "varchar(36)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"activeImportLeaseUntil": {
+					"name": "activeImportLeaseUntil",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"lastOperatorUserId": {
+					"name": "lastOperatorUserId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"lastOperatorAt": {
+					"name": "lastOperatorAt",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"completedAt": {
+					"name": "completedAt",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"loom_migration_active_org_idx": {
+					"name": "loom_migration_active_org_idx",
+					"columns": ["activeOrganizationId"],
+					"isUnique": true
+				},
+				"loom_migration_org_created_idx": {
+					"name": "loom_migration_org_created_idx",
+					"columns": ["organizationId", "createdAt"],
+					"isUnique": false
+				},
+				"loom_migration_status_created_idx": {
+					"name": "loom_migration_status_created_idx",
+					"columns": ["status", "createdAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"loom_migration_requests_id": {
+					"name": "loom_migration_requests_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"loops_sync_jobs": {
+			"name": "loops_sync_jobs",
+			"columns": {
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"revision": {
+					"name": "revision",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 1
+				},
+				"nextAttemptAt": {
+					"name": "nextAttemptAt",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"leaseToken": {
+					"name": "leaseToken",
+					"type": "varchar(36)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"leaseUntil": {
+					"name": "leaseUntil",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"failures": {
+					"name": "failures",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"lastError": {
+					"name": "lastError",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"profileHash": {
+					"name": "profileHash",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"teammateJoinedAt": {
+					"name": "teammateJoinedAt",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"syncedEmail": {
+					"name": "syncedEmail",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"lastSyncedAt": {
+					"name": "lastSyncedAt",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"loops_sync_due_idx": {
+					"name": "loops_sync_due_idx",
+					"columns": ["nextAttemptAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"loops_sync_jobs_userId": {
+					"name": "loops_sync_jobs_userId",
+					"columns": ["userId"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"mcp_oauth_clients": {
+			"name": "mcp_oauth_clients",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"clientId": {
+					"name": "clientId",
+					"type": "varchar(128)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"clientName": {
+					"name": "clientName",
+					"type": "varchar(100)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"redirectUris": {
+					"name": "redirectUris",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"activatedAt": {
+					"name": "activatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"client_id_idx": {
+					"name": "client_id_idx",
+					"columns": ["clientId"],
+					"isUnique": true
+				},
+				"inactive_created_at_idx": {
+					"name": "inactive_created_at_idx",
+					"columns": ["activatedAt", "createdAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"mcp_oauth_clients_id": {
+					"name": "mcp_oauth_clients_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"mcp_oauth_codes": {
+			"name": "mcp_oauth_codes",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"clientId": {
+					"name": "clientId",
+					"type": "varchar(128)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"codeHash": {
+					"name": "codeHash",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"codeChallenge": {
+					"name": "codeChallenge",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"redirectUri": {
+					"name": "redirectUri",
+					"type": "varchar(512)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"resource": {
+					"name": "resource",
+					"type": "varchar(512)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"expiresAt": {
+					"name": "expiresAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"consumedAt": {
+					"name": "consumedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"code_hash_idx": {
+					"name": "code_hash_idx",
+					"columns": ["codeHash"],
+					"isUnique": true
+				},
+				"expires_at_idx": {
+					"name": "expires_at_idx",
+					"columns": ["expiresAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"mcp_oauth_codes_id": {
+					"name": "mcp_oauth_codes_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"mcp_oauth_registration_quotas": {
+			"name": "mcp_oauth_registration_quotas",
+			"columns": {
+				"windowId": {
+					"name": "windowId",
+					"type": "varchar(10)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"registrations": {
+					"name": "registrations",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"expiresAt": {
+					"name": "expiresAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"expires_at_idx": {
+					"name": "expires_at_idx",
+					"columns": ["expiresAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"mcp_oauth_registration_quotas_windowId": {
+					"name": "mcp_oauth_registration_quotas_windowId",
+					"columns": ["windowId"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"mcp_oauth_tokens": {
+			"name": "mcp_oauth_tokens",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"clientId": {
+					"name": "clientId",
+					"type": "varchar(128)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"familyId": {
+					"name": "familyId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"resource": {
+					"name": "resource",
+					"type": "varchar(512)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"accessHash": {
+					"name": "accessHash",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"refreshHash": {
+					"name": "refreshHash",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"accessExpiresAt": {
+					"name": "accessExpiresAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"refreshExpiresAt": {
+					"name": "refreshExpiresAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"revokedAt": {
+					"name": "revokedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"access_hash_idx": {
+					"name": "access_hash_idx",
+					"columns": ["accessHash"],
+					"isUnique": true
+				},
+				"refresh_hash_idx": {
+					"name": "refresh_hash_idx",
+					"columns": ["refreshHash"],
+					"isUnique": true
+				},
+				"family_id_idx": {
+					"name": "family_id_idx",
+					"columns": ["familyId"],
+					"isUnique": false
+				},
+				"client_active_idx": {
+					"name": "client_active_idx",
+					"columns": ["clientId", "revokedAt", "refreshExpiresAt"],
+					"isUnique": false
+				},
+				"refresh_expires_at_idx": {
+					"name": "refresh_expires_at_idx",
+					"columns": ["refreshExpiresAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"mcp_oauth_tokens_id": {
+					"name": "mcp_oauth_tokens_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"media_processing_budgets": {
+			"name": "media_processing_budgets",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"reserved_bytes": {
+					"name": "reserved_bytes",
+					"type": "bigint unsigned",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"limit_bytes": {
+					"name": "limit_bytes",
+					"type": "bigint unsigned",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"expires_at": {
+					"name": "expires_at",
+					"type": "datetime(3)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"media_budget_expiry_idx": {
+					"name": "media_budget_expiry_idx",
+					"columns": ["expires_at"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"media_processing_budgets_id": {
+					"name": "media_processing_budgets_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"messenger_conversations": {
+			"name": "messenger_conversations",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"agent": {
+					"name": "agent",
+					"type": "varchar(32)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"mode": {
+					"name": "mode",
+					"type": "varchar(16)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'agent'"
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"anonymousId": {
+					"name": "anonymousId",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"takeoverByUserId": {
+					"name": "takeoverByUserId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"takeoverAt": {
+					"name": "takeoverAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				},
+				"lastMessageAt": {
+					"name": "lastMessageAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"user_last_message_idx": {
+					"name": "user_last_message_idx",
+					"columns": ["userId", "lastMessageAt"],
+					"isUnique": false
+				},
+				"anonymous_last_message_idx": {
+					"name": "anonymous_last_message_idx",
+					"columns": ["anonymousId", "lastMessageAt"],
+					"isUnique": false
+				},
+				"mode_last_message_idx": {
+					"name": "mode_last_message_idx",
+					"columns": ["mode", "lastMessageAt"],
+					"isUnique": false
+				},
+				"updated_at_idx": {
+					"name": "updated_at_idx",
+					"columns": ["updatedAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"messenger_conversations_id": {
+					"name": "messenger_conversations_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"messenger_messages": {
+			"name": "messenger_messages",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"conversationId": {
+					"name": "conversationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"role": {
+					"name": "role",
+					"type": "varchar(16)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"content": {
+					"name": "content",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"anonymousId": {
+					"name": "anonymousId",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"conversation_created_at_idx": {
+					"name": "conversation_created_at_idx",
+					"columns": ["conversationId", "createdAt"],
+					"isUnique": false
+				},
+				"role_created_at_idx": {
+					"name": "role_created_at_idx",
+					"columns": ["role", "createdAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {
+				"messenger_messages_conversationId_messenger_conversations_id_fk": {
+					"name": "messenger_messages_conversationId_messenger_conversations_id_fk",
+					"tableFrom": "messenger_messages",
+					"tableTo": "messenger_conversations",
+					"columnsFrom": ["conversationId"],
+					"columnsTo": ["id"],
+					"onDelete": "cascade",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"messenger_messages_id": {
+					"name": "messenger_messages_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"messenger_support_emails": {
+			"name": "messenger_support_emails",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"conversationId": {
+					"name": "conversationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userEmail": {
+					"name": "userEmail",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"subject": {
+					"name": "subject",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"message": {
+					"name": "message",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"support_email_user_created_at_idx": {
+					"name": "support_email_user_created_at_idx",
+					"columns": ["userId", "createdAt"],
+					"isUnique": false
+				},
+				"support_email_conversation_created_at_idx": {
+					"name": "support_email_conversation_created_at_idx",
+					"columns": ["conversationId", "createdAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {
+				"support_email_conversation_fk": {
+					"name": "support_email_conversation_fk",
+					"tableFrom": "messenger_support_emails",
+					"tableTo": "messenger_conversations",
+					"columnsFrom": ["conversationId"],
+					"columnsTo": ["id"],
+					"onDelete": "cascade",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"messenger_support_emails_id": {
+					"name": "messenger_support_emails_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"notifications": {
+			"name": "notifications",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"orgId": {
+					"name": "orgId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"recipientId": {
+					"name": "recipientId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"type": {
+					"name": "type",
+					"type": "varchar(16)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"data": {
+					"name": "data",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"videoId": {
+					"name": "videoId",
+					"type": "varchar(50)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"dedupKey": {
+					"name": "dedupKey",
+					"type": "varchar(128)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"readAt": {
+					"name": "readAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"org_id_idx": {
+					"name": "org_id_idx",
+					"columns": ["orgId"],
+					"isUnique": false
+				},
+				"type_idx": {
+					"name": "type_idx",
+					"columns": ["type"],
+					"isUnique": false
+				},
+				"read_at_idx": {
+					"name": "read_at_idx",
+					"columns": ["readAt"],
+					"isUnique": false
+				},
+				"created_at_idx": {
+					"name": "created_at_idx",
+					"columns": ["createdAt"],
+					"isUnique": false
+				},
+				"recipient_read_idx": {
+					"name": "recipient_read_idx",
+					"columns": ["recipientId", "readAt"],
+					"isUnique": false
+				},
+				"recipient_created_idx": {
+					"name": "recipient_created_idx",
+					"columns": ["recipientId", "createdAt"],
+					"isUnique": false
+				},
+				"dedup_key_idx": {
+					"name": "dedup_key_idx",
+					"columns": ["dedupKey"],
+					"isUnique": true
+				},
+				"type_recipient_created_idx": {
+					"name": "type_recipient_created_idx",
+					"columns": ["type", "recipientId", "createdAt"],
+					"isUnique": false
+				},
+				"type_recipient_video_created_idx": {
+					"name": "type_recipient_video_created_idx",
+					"columns": ["type", "recipientId", "videoId", "createdAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"notifications_id": {
+					"name": "notifications_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"organization_invites": {
+			"name": "organization_invites",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"invitedEmail": {
+					"name": "invitedEmail",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"invitedByUserId": {
+					"name": "invitedByUserId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"role": {
+					"name": "role",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"status": {
+					"name": "status",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'pending'"
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				},
+				"expiresAt": {
+					"name": "expiresAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"organization_id_idx": {
+					"name": "organization_id_idx",
+					"columns": ["organizationId"],
+					"isUnique": false
+				},
+				"invited_email_idx": {
+					"name": "invited_email_idx",
+					"columns": ["invitedEmail"],
+					"isUnique": false
+				},
+				"invited_by_user_id_idx": {
+					"name": "invited_by_user_id_idx",
+					"columns": ["invitedByUserId"],
+					"isUnique": false
+				},
+				"status_idx": {
+					"name": "status_idx",
+					"columns": ["status"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"organization_invites_id": {
+					"name": "organization_invites_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"organization_members": {
+			"name": "organization_members",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"role": {
+					"name": "role",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"hasProSeat": {
+					"name": "hasProSeat",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"organization_id_idx": {
+					"name": "organization_id_idx",
+					"columns": ["organizationId"],
+					"isUnique": false
+				},
+				"user_id_organization_id_idx": {
+					"name": "user_id_organization_id_idx",
+					"columns": ["userId", "organizationId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"organization_members_id": {
+					"name": "organization_members_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"organization_sso": {
+			"name": "organization_sso",
+			"columns": {
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"purchasedByUserId": {
+					"name": "purchasedByUserId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"stripeCustomerId": {
+					"name": "stripeCustomerId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"stripeSubscriptionId": {
+					"name": "stripeSubscriptionId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"stripePriceId": {
+					"name": "stripePriceId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"status": {
+					"name": "status",
+					"type": "varchar(32)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'unpaid'"
+				},
+				"paidThrough": {
+					"name": "paidThrough",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"currentPeriodEnd": {
+					"name": "currentPeriodEnd",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"cancelAtPeriodEnd": {
+					"name": "cancelAtPeriodEnd",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": false
+				},
+				"checkoutAttemptId": {
+					"name": "checkoutAttemptId",
+					"type": "varchar(36)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"checkoutCurrency": {
+					"name": "checkoutCurrency",
+					"type": "varchar(3)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"checkoutPriceId": {
+					"name": "checkoutPriceId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"checkoutSessionId": {
+					"name": "checkoutSessionId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"checkoutStartedAt": {
+					"name": "checkoutStartedAt",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"sso_stripe_subscription_id_idx": {
+					"name": "sso_stripe_subscription_id_idx",
+					"columns": ["stripeSubscriptionId"],
+					"isUnique": true
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"organization_sso_organizationId": {
+					"name": "organization_sso_organizationId",
+					"columns": ["organizationId"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"organizations": {
+			"name": "organizations",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"name": {
+					"name": "name",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"ownerId": {
+					"name": "ownerId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"metadata": {
+					"name": "metadata",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"tombstoneAt": {
+					"name": "tombstoneAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"allowedEmailDomain": {
+					"name": "allowedEmailDomain",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"defaultVideoVisibility": {
+					"name": "defaultVideoVisibility",
+					"type": "varchar(7)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"customDomain": {
+					"name": "customDomain",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"domainVerified": {
+					"name": "domainVerified",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"settings": {
+					"name": "settings",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"iconUrl": {
+					"name": "iconUrl",
+					"type": "varchar(1024)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"shareableLinkIconUrl": {
+					"name": "shareableLinkIconUrl",
+					"type": "varchar(1024)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				},
+				"workosOrganizationId": {
+					"name": "workosOrganizationId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"workosConnectionId": {
+					"name": "workosConnectionId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"owner_id_tombstone_idx": {
+					"name": "owner_id_tombstone_idx",
+					"columns": ["ownerId", "tombstoneAt"],
+					"isUnique": false
+				},
+				"custom_domain_idx": {
+					"name": "custom_domain_idx",
+					"columns": ["customDomain"],
+					"isUnique": false
+				},
+				"workos_organization_id_idx": {
+					"name": "workos_organization_id_idx",
+					"columns": ["workosOrganizationId"],
+					"isUnique": true
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"organizations_id": {
+					"name": "organizations_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"s3_buckets": {
+			"name": "s3_buckets",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"ownerId": {
+					"name": "ownerId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"region": {
+					"name": "region",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"endpoint": {
+					"name": "endpoint",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"bucketName": {
+					"name": "bucketName",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"accessKeyId": {
+					"name": "accessKeyId",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"secretAccessKey": {
+					"name": "secretAccessKey",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"provider": {
+					"name": "provider",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "('aws')"
+				},
+				"active": {
+					"name": "active",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": true
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"owner_organization_idx": {
+					"name": "owner_organization_idx",
+					"columns": ["ownerId", "organizationId"],
+					"isUnique": false
+				},
+				"organization_id_idx": {
+					"name": "organization_id_idx",
+					"columns": ["organizationId"],
+					"isUnique": false
+				},
+				"organization_active_idx": {
+					"name": "organization_active_idx",
+					"columns": ["organizationId", "active", "updatedAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"s3_buckets_id": {
+					"name": "s3_buckets_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"sessions": {
+			"name": "sessions",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"sessionToken": {
+					"name": "sessionToken",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"expires": {
+					"name": "expires",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"created_at": {
+					"name": "created_at",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updated_at": {
+					"name": "updated_at",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"session_token_idx": {
+					"name": "session_token_idx",
+					"columns": ["sessionToken"],
+					"isUnique": true
+				},
+				"user_id_idx": {
+					"name": "user_id_idx",
+					"columns": ["userId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"sessions_id": {
+					"name": "sessions_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"shared_videos": {
+			"name": "shared_videos",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"videoId": {
+					"name": "videoId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"folderId": {
+					"name": "folderId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"sharedByUserId": {
+					"name": "sharedByUserId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"sharedAt": {
+					"name": "sharedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"folder_id_idx": {
+					"name": "folder_id_idx",
+					"columns": ["folderId"],
+					"isUnique": false
+				},
+				"organization_id_idx": {
+					"name": "organization_id_idx",
+					"columns": ["organizationId"],
+					"isUnique": false
+				},
+				"shared_by_user_id_idx": {
+					"name": "shared_by_user_id_idx",
+					"columns": ["sharedByUserId"],
+					"isUnique": false
+				},
+				"video_id_organization_id_idx": {
+					"name": "video_id_organization_id_idx",
+					"columns": ["videoId", "organizationId"],
+					"isUnique": false
+				},
+				"video_id_folder_id_idx": {
+					"name": "video_id_folder_id_idx",
+					"columns": ["videoId", "folderId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"shared_videos_id": {
+					"name": "shared_videos_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"signed_baas": {
+			"name": "signed_baas",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"status": {
+					"name": "status",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'pending'"
+				},
+				"stripeSubscriptionId": {
+					"name": "stripeSubscriptionId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"entityName": {
+					"name": "entityName",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"entityType": {
+					"name": "entityType",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"entityAddress": {
+					"name": "entityAddress",
+					"type": "varchar(500)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"signerName": {
+					"name": "signerName",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"signerTitle": {
+					"name": "signerTitle",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"noticesEmail": {
+					"name": "noticesEmail",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"signatureData": {
+					"name": "signatureData",
+					"type": "longtext",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"signedAt": {
+					"name": "signedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"emailSentAt": {
+					"name": "emailSentAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"signed_baa_organization_id_idx": {
+					"name": "signed_baa_organization_id_idx",
+					"columns": ["organizationId"],
+					"isUnique": true
+				},
+				"signed_baa_stripe_subscription_idx": {
+					"name": "signed_baa_stripe_subscription_idx",
+					"columns": ["stripeSubscriptionId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"signed_baas_id": {
+					"name": "signed_baas_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"space_members": {
+			"name": "space_members",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"spaceId": {
+					"name": "spaceId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"userId": {
+					"name": "userId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"role": {
+					"name": "role",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'member'"
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"user_id_idx": {
+					"name": "user_id_idx",
+					"columns": ["userId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"space_members_id": {
+					"name": "space_members_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {
+				"space_id_user_id_unique": {
+					"name": "space_id_user_id_unique",
+					"columns": ["spaceId", "userId"]
+				}
+			},
+			"checkConstraint": {}
+		},
+		"space_videos": {
+			"name": "space_videos",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"spaceId": {
+					"name": "spaceId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"folderId": {
+					"name": "folderId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"videoId": {
+					"name": "videoId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"addedById": {
+					"name": "addedById",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"addedAt": {
+					"name": "addedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"folder_id_idx": {
+					"name": "folder_id_idx",
+					"columns": ["folderId"],
+					"isUnique": false
+				},
+				"video_id_idx": {
+					"name": "video_id_idx",
+					"columns": ["videoId"],
+					"isUnique": false
+				},
+				"added_by_id_idx": {
+					"name": "added_by_id_idx",
+					"columns": ["addedById"],
+					"isUnique": false
+				},
+				"space_id_video_id_idx": {
+					"name": "space_id_video_id_idx",
+					"columns": ["spaceId", "videoId"],
+					"isUnique": false
+				},
+				"space_id_folder_id_idx": {
+					"name": "space_id_folder_id_idx",
+					"columns": ["spaceId", "folderId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"space_videos_id": {
+					"name": "space_videos_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"spaces": {
+			"name": "spaces",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"primary": {
+					"name": "primary",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": false
+				},
+				"name": {
+					"name": "name",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"createdById": {
+					"name": "createdById",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"iconUrl": {
+					"name": "iconUrl",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"description": {
+					"name": "description",
+					"type": "varchar(1000)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"settings": {
+					"name": "settings",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"password": {
+					"name": "password",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				},
+				"privacy": {
+					"name": "privacy",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'Private'"
+				},
+				"public": {
+					"name": "public",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": false
+				}
+			},
+			"indexes": {
+				"organization_id_idx": {
+					"name": "organization_id_idx",
+					"columns": ["organizationId"],
+					"isUnique": false
+				},
+				"created_by_id_idx": {
+					"name": "created_by_id_idx",
+					"columns": ["createdById"],
+					"isUnique": false
+				},
+				"public_organization_id_idx": {
+					"name": "public_organization_id_idx",
+					"columns": ["public", "organizationId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"spaces_id": {
+					"name": "spaces_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"storage_integrations": {
+			"name": "storage_integrations",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"ownerId": {
+					"name": "ownerId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"organizationId": {
+					"name": "organizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"provider": {
+					"name": "provider",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"displayName": {
+					"name": "displayName",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"status": {
+					"name": "status",
+					"type": "varchar(32)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'active'"
+				},
+				"active": {
+					"name": "active",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": false
+				},
+				"encryptedConfig": {
+					"name": "encryptedConfig",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"googleDriveAccessToken": {
+					"name": "googleDriveAccessToken",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"googleDriveAccessTokenExpiresAt": {
+					"name": "googleDriveAccessTokenExpiresAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"googleDriveTokenRefreshLeaseId": {
+					"name": "googleDriveTokenRefreshLeaseId",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"googleDriveTokenRefreshLeaseExpiresAt": {
+					"name": "googleDriveTokenRefreshLeaseExpiresAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"googleDriveStorageQuotaCache": {
+					"name": "googleDriveStorageQuotaCache",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"owner_provider_idx": {
+					"name": "owner_provider_idx",
+					"columns": ["ownerId", "provider"],
+					"isUnique": false
+				},
+				"owner_active_idx": {
+					"name": "owner_active_idx",
+					"columns": ["ownerId", "active"],
+					"isUnique": false
+				},
+				"organization_provider_idx": {
+					"name": "organization_provider_idx",
+					"columns": ["organizationId", "provider"],
+					"isUnique": false
+				},
+				"organization_active_idx": {
+					"name": "organization_active_idx",
+					"columns": ["organizationId", "active", "status"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"storage_integrations_id": {
+					"name": "storage_integrations_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"storage_objects": {
+			"name": "storage_objects",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"integrationId": {
+					"name": "integrationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"ownerId": {
+					"name": "ownerId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"videoId": {
+					"name": "videoId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"objectKey": {
+					"name": "objectKey",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"objectKeyHash": {
+					"name": "objectKeyHash",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"providerObjectId": {
+					"name": "providerObjectId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"uploadSessionUrl": {
+					"name": "uploadSessionUrl",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"uploadStatus": {
+					"name": "uploadStatus",
+					"type": "varchar(32)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'pending'"
+				},
+				"contentType": {
+					"name": "contentType",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"contentLength": {
+					"name": "contentLength",
+					"type": "bigint unsigned",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"metadata": {
+					"name": "metadata",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {
+				"integration_key_hash_idx": {
+					"name": "integration_key_hash_idx",
+					"columns": ["integrationId", "objectKeyHash"],
+					"isUnique": true
+				},
+				"integration_status_idx": {
+					"name": "integration_status_idx",
+					"columns": ["integrationId", "uploadStatus"],
+					"isUnique": false
+				},
+				"integration_object_key_prefix_idx": {
+					"name": "integration_object_key_prefix_idx",
+					"columns": ["integrationId", "`objectKey`(191)"],
+					"isUnique": false
+				},
+				"video_id_idx": {
+					"name": "video_id_idx",
+					"columns": ["videoId"],
+					"isUnique": false
+				},
+				"owner_id_idx": {
+					"name": "owner_id_idx",
+					"columns": ["ownerId"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {
+				"storage_objects_integrationId_storage_integrations_id_fk": {
+					"name": "storage_objects_integrationId_storage_integrations_id_fk",
+					"tableFrom": "storage_objects",
+					"tableTo": "storage_integrations",
+					"columnsFrom": ["integrationId"],
+					"columnsTo": ["id"],
+					"onDelete": "restrict",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"storage_objects_id": {
+					"name": "storage_objects_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"users": {
+			"name": "users",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"name": {
+					"name": "name",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"lastName": {
+					"name": "lastName",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"email": {
+					"name": "email",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"emailVerified": {
+					"name": "emailVerified",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"image": {
+					"name": "image",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"stripeCustomerId": {
+					"name": "stripeCustomerId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"stripeSubscriptionId": {
+					"name": "stripeSubscriptionId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"thirdPartyStripeSubscriptionId": {
+					"name": "thirdPartyStripeSubscriptionId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"stripeSubscriptionStatus": {
+					"name": "stripeSubscriptionStatus",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"stripeSubscriptionPriceId": {
+					"name": "stripeSubscriptionPriceId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"preferences": {
+					"name": "preferences",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false,
+					"default": "('null')"
+				},
+				"activeOrganizationId": {
+					"name": "activeOrganizationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"created_at": {
+					"name": "created_at",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updated_at": {
+					"name": "updated_at",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				},
+				"onboardingSteps": {
+					"name": "onboardingSteps",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"onboarding_completed_at": {
+					"name": "onboarding_completed_at",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"customBucket": {
+					"name": "customBucket",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"inviteQuota": {
+					"name": "inviteQuota",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 1
+				},
+				"defaultOrgId": {
+					"name": "defaultOrgId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"authSessionVersion": {
+					"name": "authSessionVersion",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"marketingOrigin": {
+					"name": "marketingOrigin",
+					"type": "varchar(20)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'unknown'"
+				}
+			},
+			"indexes": {
+				"email_idx": {
+					"name": "email_idx",
+					"columns": ["email"],
+					"isUnique": true
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"users_id": {
+					"name": "users_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"verification_tokens": {
+			"name": "verification_tokens",
+			"columns": {
+				"identifier": {
+					"name": "identifier",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"token": {
+					"name": "token",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"expires": {
+					"name": "expires",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"created_at": {
+					"name": "created_at",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updated_at": {
+					"name": "updated_at",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"verification_tokens_identifier": {
+					"name": "verification_tokens_identifier",
+					"columns": ["identifier"]
+				}
+			},
+			"uniqueConstraints": {
+				"verification_tokens_token_unique": {
+					"name": "verification_tokens_token_unique",
+					"columns": ["token"]
+				}
+			},
+			"checkConstraint": {}
+		},
+		"video_edits": {
+			"name": "video_edits",
+			"columns": {
+				"videoId": {
+					"name": "videoId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"sourceKey": {
+					"name": "sourceKey",
+					"type": "varchar(512)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"editSpec": {
+					"name": "editSpec",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				}
+			},
+			"indexes": {},
+			"foreignKeys": {
+				"video_edits_videoId_videos_id_fk": {
+					"name": "video_edits_videoId_videos_id_fk",
+					"tableFrom": "video_edits",
+					"tableTo": "videos",
+					"columnsFrom": ["videoId"],
+					"columnsTo": ["id"],
+					"onDelete": "cascade",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"video_edits_videoId": {
+					"name": "video_edits_videoId",
+					"columns": ["videoId"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"video_processing_jobs": {
+			"name": "video_processing_jobs",
+			"columns": {
+				"video_id": {
+					"name": "video_id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"owner_id": {
+					"name": "owner_id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"generation": {
+					"name": "generation",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"manifest_sha256": {
+					"name": "manifest_sha256",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"state": {
+					"name": "state",
+					"type": "varchar(32)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'committing'"
+				},
+				"attempt_id": {
+					"name": "attempt_id",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"attempt_count": {
+					"name": "attempt_count",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"lease_expires_at": {
+					"name": "lease_expires_at",
+					"type": "datetime(3)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"next_retry_at": {
+					"name": "next_retry_at",
+					"type": "datetime(3)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"workflow_run_id": {
+					"name": "workflow_run_id",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"remote_job_id": {
+					"name": "remote_job_id",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"source": {
+					"name": "source",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"verification": {
+					"name": "verification",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"output": {
+					"name": "output",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"error_code": {
+					"name": "error_code",
+					"type": "varchar(64)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"error_message": {
+					"name": "error_message",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"created_at": {
+					"name": "created_at",
+					"type": "datetime(3)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"updated_at": {
+					"name": "updated_at",
+					"type": "datetime(3)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"processing_state_retry_video_idx": {
+					"name": "processing_state_retry_video_idx",
+					"columns": ["state", "next_retry_at", "video_id"],
+					"isUnique": false
+				},
+				"processing_state_lease_video_idx": {
+					"name": "processing_state_lease_video_idx",
+					"columns": ["state", "lease_expires_at", "video_id"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"video_processing_jobs_video_id": {
+					"name": "video_processing_jobs_video_id",
+					"columns": ["video_id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"video_uploads": {
+			"name": "video_uploads",
+			"columns": {
+				"video_id": {
+					"name": "video_id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"uploaded": {
+					"name": "uploaded",
+					"type": "bigint unsigned",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"total": {
+					"name": "total",
+					"type": "bigint unsigned",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"started_at": {
+					"name": "started_at",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"updated_at": {
+					"name": "updated_at",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"mode": {
+					"name": "mode",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"phase": {
+					"name": "phase",
+					"type": "varchar(32)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'uploading'"
+				},
+				"processing_progress": {
+					"name": "processing_progress",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": 0
+				},
+				"processing_message": {
+					"name": "processing_message",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"processing_error": {
+					"name": "processing_error",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"raw_file_key": {
+					"name": "raw_file_key",
+					"type": "varchar(512)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"phase_updated_at_video_id_idx": {
+					"name": "phase_updated_at_video_id_idx",
+					"columns": ["phase", "updated_at", "video_id"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {},
+			"compositePrimaryKeys": {
+				"video_uploads_video_id": {
+					"name": "video_uploads_video_id",
+					"columns": ["video_id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"video_viewer_grants": {
+			"name": "video_viewer_grants",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"videoId": {
+					"name": "videoId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"email": {
+					"name": "email",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"invitedByUserId": {
+					"name": "invitedByUserId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"revokedAt": {
+					"name": "revokedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				}
+			},
+			"indexes": {
+				"video_email_idx": {
+					"name": "video_email_idx",
+					"columns": ["videoId", "email"],
+					"isUnique": true
+				}
+			},
+			"foreignKeys": {
+				"video_viewer_grants_videoId_videos_id_fk": {
+					"name": "video_viewer_grants_videoId_videos_id_fk",
+					"tableFrom": "video_viewer_grants",
+					"tableTo": "videos",
+					"columnsFrom": ["videoId"],
+					"columnsTo": ["id"],
+					"onDelete": "cascade",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"video_viewer_grants_id": {
+					"name": "video_viewer_grants_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		},
+		"videos": {
+			"name": "videos",
+			"columns": {
+				"id": {
+					"name": "id",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"ownerId": {
+					"name": "ownerId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"orgId": {
+					"name": "orgId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"name": {
+					"name": "name",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "'My Video'"
+				},
+				"bucket": {
+					"name": "bucket",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"storageIntegrationId": {
+					"name": "storageIntegrationId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"duration": {
+					"name": "duration",
+					"type": "float",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"width": {
+					"name": "width",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"height": {
+					"name": "height",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"fps": {
+					"name": "fps",
+					"type": "int",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"metadata": {
+					"name": "metadata",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"public": {
+					"name": "public",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": true
+				},
+				"settings": {
+					"name": "settings",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"transcriptionStatus": {
+					"name": "transcriptionStatus",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"source": {
+					"name": "source",
+					"type": "json",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "('{\"type\":\"MediaConvert\"}')"
+				},
+				"folderId": {
+					"name": "folderId",
+					"type": "varchar(15)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"createdAt": {
+					"name": "createdAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": "(now())"
+				},
+				"effectiveCreatedAt": {
+					"name": "effectiveCreatedAt",
+					"type": "datetime",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false,
+					"generated": {
+						"as": "COALESCE(\n          STR_TO_DATE(JSON_UNQUOTE(JSON_EXTRACT(`metadata`, '$.customCreatedAt')), '%Y-%m-%dT%H:%i:%s.%fZ'),\n          STR_TO_DATE(JSON_UNQUOTE(JSON_EXTRACT(`metadata`, '$.customCreatedAt')), '%Y-%m-%dT%H:%i:%sZ'),\n          `createdAt`\n        )",
+						"type": "stored"
+					}
+				},
+				"updatedAt": {
+					"name": "updatedAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"onUpdate": true,
+					"default": "(now())"
+				},
+				"password": {
+					"name": "password",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"xStreamInfo": {
+					"name": "xStreamInfo",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"firstViewEmailSentAt": {
+					"name": "firstViewEmailSentAt",
+					"type": "timestamp",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"isScreenshot": {
+					"name": "isScreenshot",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": false
+				},
+				"awsRegion": {
+					"name": "awsRegion",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"awsBucket": {
+					"name": "awsBucket",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"videoStartTime": {
+					"name": "videoStartTime",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"audioStartTime": {
+					"name": "audioStartTime",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"jobId": {
+					"name": "jobId",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"jobStatus": {
+					"name": "jobStatus",
+					"type": "varchar(255)",
+					"primaryKey": false,
+					"notNull": false,
+					"autoincrement": false
+				},
+				"skipProcessing": {
+					"name": "skipProcessing",
+					"type": "boolean",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false,
+					"default": false
+				}
+			},
+			"indexes": {
+				"owner_id_idx": {
+					"name": "owner_id_idx",
+					"columns": ["ownerId"],
+					"isUnique": false
+				},
+				"owner_updated_id_idx": {
+					"name": "owner_updated_id_idx",
+					"columns": ["ownerId", "updatedAt", "id"],
+					"isUnique": false
+				},
+				"is_public_idx": {
+					"name": "is_public_idx",
+					"columns": ["public"],
+					"isUnique": false
+				},
+				"folder_id_idx": {
+					"name": "folder_id_idx",
+					"columns": ["folderId"],
+					"isUnique": false
+				},
+				"storage_integration_id_idx": {
+					"name": "storage_integration_id_idx",
+					"columns": ["storageIntegrationId"],
+					"isUnique": false
+				},
+				"org_owner_folder_idx": {
+					"name": "org_owner_folder_idx",
+					"columns": ["orgId", "ownerId", "folderId"],
+					"isUnique": false
+				},
+				"org_effective_created_idx": {
+					"name": "org_effective_created_idx",
+					"columns": ["orgId", "effectiveCreatedAt"],
+					"isUnique": false
+				},
+				"screenshot_transcription_created_idx": {
+					"name": "screenshot_transcription_created_idx",
+					"columns": ["isScreenshot", "transcriptionStatus", "createdAt"],
+					"isUnique": false
+				}
+			},
+			"foreignKeys": {
+				"videos_storageIntegrationId_storage_integrations_id_fk": {
+					"name": "videos_storageIntegrationId_storage_integrations_id_fk",
+					"tableFrom": "videos",
+					"tableTo": "storage_integrations",
+					"columnsFrom": ["storageIntegrationId"],
+					"columnsTo": ["id"],
+					"onDelete": "restrict",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {
+				"videos_id": {
+					"name": "videos_id",
+					"columns": ["id"]
+				}
+			},
+			"uniqueConstraints": {},
+			"checkConstraint": {}
+		}
+	},
+	"views": {},
+	"_meta": {
+		"schemas": {},
+		"tables": {},
+		"columns": {}
+	},
+	"internal": {
+		"tables": {},
+		"indexes": {
+			"integration_object_key_prefix_idx": {
+				"columns": {
+					"`objectKey`(191)": {
+						"isExpression": true
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/packages/database/migrations/meta/_journal.json b/packages/database/migrations/meta/_journal.json
index 345c9edfab7..ded36cce8cc 100644
--- a/packages/database/migrations/meta/_journal.json
+++ b/packages/database/migrations/meta/_journal.json
@@ -1,363 +1,363 @@
 {
-  "version": "5",
-  "dialect": "mysql",
-  "entries": [
-    {
-      "idx": 0,
-      "version": "5",
-      "when": 1743020179593,
-      "tag": "0000_brown_sunfire",
-      "breakpoints": true
-    },
-    {
-      "idx": 1,
-      "version": "5",
-      "when": 1749268354138,
-      "tag": "0001_white_young_avengers",
-      "breakpoints": true
-    },
-    {
-      "idx": 2,
-      "version": "5",
-      "when": 1750935538683,
-      "tag": "0002_dusty_maginty",
-      "breakpoints": true
-    },
-    {
-      "idx": 3,
-      "version": "5",
-      "when": 1761710697286,
-      "tag": "0003_thin_gressill",
-      "breakpoints": true
-    },
-    {
-      "idx": 4,
-      "version": "5",
-      "when": 1761711378574,
-      "tag": "0004_video-org-id",
-      "breakpoints": true
-    },
-    {
-      "idx": 5,
-      "version": "5",
-      "when": 1761711605408,
-      "tag": "0005_video-org-id-required",
-      "breakpoints": true
-    },
-    {
-      "idx": 6,
-      "version": "5",
-      "when": 1762410865419,
-      "tag": "0006_hesitant_stone_men",
-      "breakpoints": true
-    },
-    {
-      "idx": 7,
-      "version": "5",
-      "when": 1762428551824,
-      "tag": "0007_public_toxin",
-      "breakpoints": true
-    },
-    {
-      "idx": 8,
-      "version": "5",
-      "when": 1762428905323,
-      "tag": "0008_fat_ender_wiggin",
-      "breakpoints": true
-    },
-    {
-      "idx": 9,
-      "version": "5",
-      "when": 1768139432782,
-      "tag": "0009_easy_ulik",
-      "breakpoints": true
-    },
-    {
-      "idx": 10,
-      "version": "5",
-      "when": 1738505600000,
-      "tag": "0010_video_uploads_bigint",
-      "breakpoints": true
-    },
-    {
-      "idx": 11,
-      "version": "5",
-      "when": 1771325011010,
-      "tag": "0011_public_inhumans",
-      "breakpoints": true
-    },
-    {
-      "idx": 12,
-      "version": "5",
-      "when": 1772534950328,
-      "tag": "0012_lethal_lilith",
-      "breakpoints": true
-    },
-    {
-      "idx": 13,
-      "version": "5",
-      "when": 1772573402457,
-      "tag": "0013_faithful_marvex",
-      "breakpoints": true
-    },
-    {
-      "idx": 14,
-      "version": "5",
-      "when": 1772576220593,
-      "tag": "0014_modern_triton",
-      "breakpoints": true
-    },
-    {
-      "idx": 15,
-      "version": "5",
-      "when": 1772582468257,
-      "tag": "0015_closed_tigra",
-      "breakpoints": true
-    },
-    {
-      "idx": 16,
-      "version": "5",
-      "when": 1772641549840,
-      "tag": "0016_bouncy_hellcat",
-      "breakpoints": true
-    },
-    {
-      "idx": 17,
-      "version": "5",
-      "when": 1778099532336,
-      "tag": "0017_productive_betty_brant",
-      "breakpoints": true
-    },
-    {
-      "idx": 18,
-      "version": "5",
-      "when": 1778153157657,
-      "tag": "0018_loud_mongu",
-      "breakpoints": true
-    },
-    {
-      "idx": 19,
-      "version": "5",
-      "when": 1778154209547,
-      "tag": "0019_solid_paibok",
-      "breakpoints": true
-    },
-    {
-      "idx": 20,
-      "version": "5",
-      "when": 1778157016497,
-      "tag": "0020_orange_talkback",
-      "breakpoints": true
-    },
-    {
-      "idx": 21,
-      "version": "5",
-      "when": 1778249922872,
-      "tag": "0021_glorious_khan",
-      "breakpoints": true
-    },
-    {
-      "idx": 22,
-      "version": "5",
-      "when": 1778252207674,
-      "tag": "0022_dazzling_namor",
-      "breakpoints": true
-    },
-    {
-      "idx": 23,
-      "version": "5",
-      "when": 1778434170430,
-      "tag": "0023_misty_luckman",
-      "breakpoints": true
-    },
-    {
-      "idx": 24,
-      "version": "5",
-      "when": 1778776694053,
-      "tag": "0024_many_speed",
-      "breakpoints": true
-    },
-    {
-      "idx": 25,
-      "version": "5",
-      "when": 1778858762935,
-      "tag": "0025_demonic_mother_askani",
-      "breakpoints": true
-    },
-    {
-      "idx": 26,
-      "version": "5",
-      "when": 1779283712737,
-      "tag": "0026_pretty_the_professor",
-      "breakpoints": true
-    },
-    {
-      "idx": 27,
-      "version": "5",
-      "when": 1780932760351,
-      "tag": "0027_giant_shinko_yamashiro",
-      "breakpoints": true
-    },
-    {
-      "idx": 28,
-      "version": "5",
-      "when": 1780937790068,
-      "tag": "0028_nebulous_madame_masque",
-      "breakpoints": true
-    },
-    {
-      "idx": 29,
-      "version": "5",
-      "when": 1780937848351,
-      "tag": "0029_blushing_pretty_boy",
-      "breakpoints": true
-    },
-    {
-      "idx": 30,
-      "version": "5",
-      "when": 1780940100362,
-      "tag": "0030_add_folder_settings",
-      "breakpoints": true
-    },
-    {
-      "idx": 31,
-      "version": "5",
-      "when": 1781271269353,
-      "tag": "0031_add_auth_api_keys_user_created_index",
-      "breakpoints": true
-    },
-    {
-      "idx": 32,
-      "version": "5",
-      "when": 1782850635482,
-      "tag": "0032_past_lester",
-      "breakpoints": true
-    },
-    {
-      "idx": 33,
-      "version": "5",
-      "when": 1782853232527,
-      "tag": "0033_fluffy_gamora",
-      "breakpoints": true
-    },
-    {
-      "idx": 34,
-      "version": "5",
-      "when": 1782854064505,
-      "tag": "0034_fluffy_falcon",
-      "breakpoints": true
-    },
-    {
-      "idx": 35,
-      "version": "5",
-      "when": 1784393810560,
-      "tag": "0035_agent_api",
-      "breakpoints": true
-    },
-    {
-      "idx": 36,
-      "version": "5",
-      "when": 1784402487715,
-      "tag": "0036_premium_master_chief",
-      "breakpoints": true
-    },
-    {
-      "idx": 37,
-      "version": "5",
-      "when": 1785452585612,
-      "tag": "0037_integration_installations",
-      "breakpoints": true
-    },
-    {
-      "idx": 38,
-      "version": "5",
-      "when": 1785892430217,
-      "tag": "0038_mean_ozymandias",
-      "breakpoints": true
-    },
-    {
-      "idx": 39,
-      "version": "5",
-      "when": 1787096888361,
-      "tag": "0039_magical_vermin",
-      "breakpoints": true
-    },
-    {
-      "idx": 40,
-      "version": "5",
-      "when": 1788366318415,
-      "tag": "0040_recording_jobs",
-      "breakpoints": true
-    },
-    {
-      "idx": 41,
-      "version": "5",
-      "when": 1788384021541,
-      "tag": "0041_saml_sso",
-      "breakpoints": true
-    },
-    {
-      "idx": 42,
-      "version": "5",
-      "when": 1788437051131,
-      "tag": "0042_perf_indexes",
-      "breakpoints": true
-    },
-    {
-      "idx": 43,
-      "version": "5",
-      "when": 1788695529193,
-      "tag": "0043_flimsy_caretaker",
-      "breakpoints": true
-    },
-    {
-      "idx": 44,
-      "version": "5",
-      "when": 1789135858521,
-      "tag": "0044_awesome_sugar_man",
-      "breakpoints": true
-    },
-    {
-      "idx": 45,
-      "version": "5",
-      "when": 1789136779085,
-      "tag": "0045_steep_forge",
-      "breakpoints": true
-    },
-    {
-      "idx": 46,
-      "version": "5",
-      "when": 1790071320615,
-      "tag": "0046_mcp_oauth",
-      "breakpoints": true
-    },
-    {
-      "idx": 47,
-      "version": "5",
-      "when": 1790073320452,
-      "tag": "0047_mcp_client_lifecycle",
-      "breakpoints": true
-    },
-    {
-      "idx": 48,
-      "version": "5",
-      "when": 1790073970527,
-      "tag": "0048_mcp_registration_quota",
-      "breakpoints": true
-    },
-    {
-      "idx": 49,
-      "version": "5",
-      "when": 1790203121737,
-      "tag": "0049_jittery_professor_monster",
-      "breakpoints": true
-    },
-    {
-      "idx": 50,
-      "version": "5",
-      "when": 1792510929738,
-      "tag": "0050_loom_concierge",
-      "breakpoints": true
-    }
-  ]
-}
\ No newline at end of file
+	"version": "5",
+	"dialect": "mysql",
+	"entries": [
+		{
+			"idx": 0,
+			"version": "5",
+			"when": 1743020179593,
+			"tag": "0000_brown_sunfire",
+			"breakpoints": true
+		},
+		{
+			"idx": 1,
+			"version": "5",
+			"when": 1749268354138,
+			"tag": "0001_white_young_avengers",
+			"breakpoints": true
+		},
+		{
+			"idx": 2,
+			"version": "5",
+			"when": 1750935538683,
+			"tag": "0002_dusty_maginty",
+			"breakpoints": true
+		},
+		{
+			"idx": 3,
+			"version": "5",
+			"when": 1761710697286,
+			"tag": "0003_thin_gressill",
+			"breakpoints": true
+		},
+		{
+			"idx": 4,
+			"version": "5",
+			"when": 1761711378574,
+			"tag": "0004_video-org-id",
+			"breakpoints": true
+		},
+		{
+			"idx": 5,
+			"version": "5",
+			"when": 1761711605408,
+			"tag": "0005_video-org-id-required",
+			"breakpoints": true
+		},
+		{
+			"idx": 6,
+			"version": "5",
+			"when": 1762410865419,
+			"tag": "0006_hesitant_stone_men",
+			"breakpoints": true
+		},
+		{
+			"idx": 7,
+			"version": "5",
+			"when": 1762428551824,
+			"tag": "0007_public_toxin",
+			"breakpoints": true
+		},
+		{
+			"idx": 8,
+			"version": "5",
+			"when": 1762428905323,
+			"tag": "0008_fat_ender_wiggin",
+			"breakpoints": true
+		},
+		{
+			"idx": 9,
+			"version": "5",
+			"when": 1768139432782,
+			"tag": "0009_easy_ulik",
+			"breakpoints": true
+		},
+		{
+			"idx": 10,
+			"version": "5",
+			"when": 1738505600000,
+			"tag": "0010_video_uploads_bigint",
+			"breakpoints": true
+		},
+		{
+			"idx": 11,
+			"version": "5",
+			"when": 1771325011010,
+			"tag": "0011_public_inhumans",
+			"breakpoints": true
+		},
+		{
+			"idx": 12,
+			"version": "5",
+			"when": 1772534950328,
+			"tag": "0012_lethal_lilith",
+			"breakpoints": true
+		},
+		{
+			"idx": 13,
+			"version": "5",
+			"when": 1772573402457,
+			"tag": "0013_faithful_marvex",
+			"breakpoints": true
+		},
+		{
+			"idx": 14,
+			"version": "5",
+			"when": 1772576220593,
+			"tag": "0014_modern_triton",
+			"breakpoints": true
+		},
+		{
+			"idx": 15,
+			"version": "5",
+			"when": 1772582468257,
+			"tag": "0015_closed_tigra",
+			"breakpoints": true
+		},
+		{
+			"idx": 16,
+			"version": "5",
+			"when": 1772641549840,
+			"tag": "0016_bouncy_hellcat",
+			"breakpoints": true
+		},
+		{
+			"idx": 17,
+			"version": "5",
+			"when": 1778099532336,
+			"tag": "0017_productive_betty_brant",
+			"breakpoints": true
+		},
+		{
+			"idx": 18,
+			"version": "5",
+			"when": 1778153157657,
+			"tag": "0018_loud_mongu",
+			"breakpoints": true
+		},
+		{
+			"idx": 19,
+			"version": "5",
+			"when": 1778154209547,
+			"tag": "0019_solid_paibok",
+			"breakpoints": true
+		},
+		{
+			"idx": 20,
+			"version": "5",
+			"when": 1778157016497,
+			"tag": "0020_orange_talkback",
+			"breakpoints": true
+		},
+		{
+			"idx": 21,
+			"version": "5",
+			"when": 1778249922872,
+			"tag": "0021_glorious_khan",
+			"breakpoints": true
+		},
+		{
+			"idx": 22,
+			"version": "5",
+			"when": 1778252207674,
+			"tag": "0022_dazzling_namor",
+			"breakpoints": true
+		},
+		{
+			"idx": 23,
+			"version": "5",
+			"when": 1778434170430,
+			"tag": "0023_misty_luckman",
+			"breakpoints": true
+		},
+		{
+			"idx": 24,
+			"version": "5",
+			"when": 1778776694053,
+			"tag": "0024_many_speed",
+			"breakpoints": true
+		},
+		{
+			"idx": 25,
+			"version": "5",
+			"when": 1778858762935,
+			"tag": "0025_demonic_mother_askani",
+			"breakpoints": true
+		},
+		{
+			"idx": 26,
+			"version": "5",
+			"when": 1779283712737,
+			"tag": "0026_pretty_the_professor",
+			"breakpoints": true
+		},
+		{
+			"idx": 27,
+			"version": "5",
+			"when": 1780932760351,
+			"tag": "0027_giant_shinko_yamashiro",
+			"breakpoints": true
+		},
+		{
+			"idx": 28,
+			"version": "5",
+			"when": 1780937790068,
+			"tag": "0028_nebulous_madame_masque",
+			"breakpoints": true
+		},
+		{
+			"idx": 29,
+			"version": "5",
+			"when": 1780937848351,
+			"tag": "0029_blushing_pretty_boy",
+			"breakpoints": true
+		},
+		{
+			"idx": 30,
+			"version": "5",
+			"when": 1780940100362,
+			"tag": "0030_add_folder_settings",
+			"breakpoints": true
+		},
+		{
+			"idx": 31,
+			"version": "5",
+			"when": 1781271269353,
+			"tag": "0031_add_auth_api_keys_user_created_index",
+			"breakpoints": true
+		},
+		{
+			"idx": 32,
+			"version": "5",
+			"when": 1782850635482,
+			"tag": "0032_past_lester",
+			"breakpoints": true
+		},
+		{
+			"idx": 33,
+			"version": "5",
+			"when": 1782853232527,
+			"tag": "0033_fluffy_gamora",
+			"breakpoints": true
+		},
+		{
+			"idx": 34,
+			"version": "5",
+			"when": 1782854064505,
+			"tag": "0034_fluffy_falcon",
+			"breakpoints": true
+		},
+		{
+			"idx": 35,
+			"version": "5",
+			"when": 1784393810560,
+			"tag": "0035_agent_api",
+			"breakpoints": true
+		},
+		{
+			"idx": 36,
+			"version": "5",
+			"when": 1784402487715,
+			"tag": "0036_premium_master_chief",
+			"breakpoints": true
+		},
+		{
+			"idx": 37,
+			"version": "5",
+			"when": 1785452585612,
+			"tag": "0037_integration_installations",
+			"breakpoints": true
+		},
+		{
+			"idx": 38,
+			"version": "5",
+			"when": 1785892430217,
+			"tag": "0038_mean_ozymandias",
+			"breakpoints": true
+		},
+		{
+			"idx": 39,
+			"version": "5",
+			"when": 1787096888361,
+			"tag": "0039_magical_vermin",
+			"breakpoints": true
+		},
+		{
+			"idx": 40,
+			"version": "5",
+			"when": 1788366318415,
+			"tag": "0040_recording_jobs",
+			"breakpoints": true
+		},
+		{
+			"idx": 41,
+			"version": "5",
+			"when": 1788384021541,
+			"tag": "0041_saml_sso",
+			"breakpoints": true
+		},
+		{
+			"idx": 42,
+			"version": "5",
+			"when": 1788437051131,
+			"tag": "0042_perf_indexes",
+			"breakpoints": true
+		},
+		{
+			"idx": 43,
+			"version": "5",
+			"when": 1788695529193,
+			"tag": "0043_flimsy_caretaker",
+			"breakpoints": true
+		},
+		{
+			"idx": 44,
+			"version": "5",
+			"when": 1789135858521,
+			"tag": "0044_awesome_sugar_man",
+			"breakpoints": true
+		},
+		{
+			"idx": 45,
+			"version": "5",
+			"when": 1789136779085,
+			"tag": "0045_steep_forge",
+			"breakpoints": true
+		},
+		{
+			"idx": 46,
+			"version": "5",
+			"when": 1790071320615,
+			"tag": "0046_mcp_oauth",
+			"breakpoints": true
+		},
+		{
+			"idx": 47,
+			"version": "5",
+			"when": 1790073320452,
+			"tag": "0047_mcp_client_lifecycle",
+			"breakpoints": true
+		},
+		{
+			"idx": 48,
+			"version": "5",
+			"when": 1790073970527,
+			"tag": "0048_mcp_registration_quota",
+			"breakpoints": true
+		},
+		{
+			"idx": 49,
+			"version": "5",
+			"when": 1790203121737,
+			"tag": "0049_jittery_professor_monster",
+			"breakpoints": true
+		},
+		{
+			"idx": 50,
+			"version": "5",
+			"when": 1792510929738,
+			"tag": "0050_loom_concierge",
+			"breakpoints": true
+		}
+	]
+}

From 5efae8d17807ca8a725dfac8e911437a16393831 Mon Sep 17 00:00:00 2001
From: Richie McIlroy <33632126+richiemcilroy@users.noreply.github.com>
Date: Wed, 21 Oct 2026 00:23:32 +0800
Subject: [PATCH 71/74] fix: lock Loom concierge completion, recover failed
 automatic imports, and surface unmapped rows

---
 .../loom-concierge-database.test.ts           | 158 +++++++++++++++---
 apps/web/actions/loom-concierge.tsx           | 135 ++++++++-------
 apps/web/actions/loom.ts                      |  24 ++-
 .../loom-migrations/LoomMigrationQueue.tsx    |  18 +-
 .../migrations/loom/LoomMigrationPage.tsx     |   2 +-
 5 files changed, 241 insertions(+), 96 deletions(-)

diff --git a/apps/web/__tests__/integration/loom-concierge-database.test.ts b/apps/web/__tests__/integration/loom-concierge-database.test.ts
index ae8f4fe55a6..f296f046cfa 100644
--- a/apps/web/__tests__/integration/loom-concierge-database.test.ts
+++ b/apps/web/__tests__/integration/loom-concierge-database.test.ts
@@ -10,8 +10,14 @@ import {
 	videos,
 	videoUploads,
 } from "@cap/database/schema";
-import { Organisation, User, Video } from "@cap/web-domain";
+import {
+	Organisation,
+	type Storage as StorageDomain,
+	User,
+	Video,
+} from "@cap/web-domain";
 import { eq } from "drizzle-orm";
+import { createConnection } from "mysql2/promise";
 import {
 	afterAll,
 	beforeAll,
@@ -65,6 +71,8 @@ vi.mock("@cap/database/auth/session", () => ({
 const OPERATOR_EMAIL = "richie@cap.so";
 const realFetch = globalThis.fetch;
 
+type StorageUploadTarget = StorageDomain.UploadTarget;
+
 function id() {
 	return randomUUID().replaceAll("-", "").slice(0, 15);
 }
@@ -175,6 +183,31 @@ async function setUploadPhase(
 		.where(eq(videoUploads.videoId, Video.VideoId.make(videoId)));
 }
 
+async function uploadToTarget(target: StorageUploadTarget) {
+	const body = new Uint8Array(4096).fill(7);
+	if (target.type === "put") {
+		const response = await realFetch(target.url, {
+			method: "PUT",
+			headers: target.headers,
+			body,
+		});
+		expect(response.ok).toBe(true);
+	} else if (target.type === "s3Post") {
+		const form = new FormData();
+		for (const [key, value] of Object.entries(target.fields)) {
+			form.append(key, value);
+		}
+		form.append("file", new Blob([body], { type: "video/mp4" }));
+		const response = await realFetch(target.url, {
+			method: "POST",
+			body: form,
+		});
+		expect(response.ok).toBe(true);
+	} else {
+		throw new Error(`Unexpected upload target ${target.type}`);
+	}
+}
+
 function stubLoomFetch() {
 	vi.stubGlobal(
 		"fetch",
@@ -764,29 +797,7 @@ describe.skipIf(!databaseUrl)("Loom concierge migration database", () => {
 			}),
 		).rejects.toThrow("already in the Cap import inventory");
 
-		const target = retry.uploadTarget;
-		const body = new Uint8Array(4096).fill(7);
-		if (target.type === "put") {
-			const response = await realFetch(target.url, {
-				method: "PUT",
-				headers: target.headers,
-				body,
-			});
-			expect(response.ok).toBe(true);
-		} else if (target.type === "s3Post") {
-			const form = new FormData();
-			for (const [key, value] of Object.entries(target.fields)) {
-				form.append(key, value);
-			}
-			form.append("file", new Blob([body], { type: "video/mp4" }));
-			const response = await realFetch(target.url, {
-				method: "POST",
-				body: form,
-			});
-			expect(response.ok).toBe(true);
-		} else {
-			throw new Error(`Unexpected upload target ${target.type}`);
-		}
+		await uploadToTarget(retry.uploadTarget);
 
 		fixture.start.mockClear();
 		const finished = await loom.finishConciergeLoomFileUpload({
@@ -813,6 +824,105 @@ describe.skipIf(!databaseUrl)("Loom concierge migration database", () => {
 		).rejects.toThrow("already in the Cap import inventory");
 	});
 
+	it("recovers a failed automatic import with a restricted MP4", async () => {
+		const { ownerId, organizationId } = await makeOrganization();
+		const requestId = await requestMigration(organizationId, ownerId);
+		const ownerEmail = `${id()}@example.com`;
+		const loomUrl = `https://www.loom.com/share/${loomId()}`;
+
+		signInAs(operatorId);
+		const imported = await loom.importFromLoomCsvForConcierge({
+			requestId,
+			rows: [{ rowNumber: 2, loomUrl, userEmail: ownerEmail, spaceName: "" }],
+		});
+		const videoId = imported.results[0]?.videoId;
+		if (!videoId) throw new Error("Missing automatic import");
+		await setUploadPhase(videoId, "error");
+		const [failed] = await db()
+			.select({ rawFileKey: videoUploads.rawFileKey })
+			.from(videoUploads)
+			.where(eq(videoUploads.videoId, videoId));
+		expect(failed?.rawFileKey).toBeNull();
+
+		const prepared = await loom.createConciergeLoomFileUpload({
+			requestId,
+			loomUrl,
+			userEmail: ownerEmail,
+			spaceName: "",
+			videoTitle: "Recovered",
+		});
+		expect(prepared.videoId).toBe(videoId);
+		const [video] = await db()
+			.select({ ownerId: videos.ownerId })
+			.from(videos)
+			.where(eq(videos.id, videoId));
+		const [recovering] = await db()
+			.select({ rawFileKey: videoUploads.rawFileKey })
+			.from(videoUploads)
+			.where(eq(videoUploads.videoId, videoId));
+		expect(recovering?.rawFileKey).toBe(
+			`${video?.ownerId}/${videoId}/raw-upload.mp4`,
+		);
+		expect((await getRequest(requestId)).queuedVideoCount).toBe(1);
+
+		await uploadToTarget(prepared.uploadTarget);
+		fixture.start.mockClear();
+		const finished = await loom.finishConciergeLoomFileUpload({
+			requestId,
+			videoId,
+		});
+		expect(finished.status).toBe("started");
+		expect(fixture.start).toHaveBeenCalledTimes(1);
+	});
+
+	it("waits for an in-flight import transaction before completing", async () => {
+		const { ownerId, organizationId } = await makeOrganization();
+		const requestId = await requestMigration(organizationId, ownerId);
+		if (!databaseUrl) throw new Error("Missing test database");
+		const connection = await createConnection(databaseUrl);
+		const videoId = id();
+		try {
+			await connection.beginTransaction();
+			await connection.query(
+				"SELECT id FROM loom_migration_requests WHERE id = ? FOR UPDATE",
+				[requestId],
+			);
+			await connection.query(
+				"INSERT INTO videos (id, ownerId, orgId, name, source, createdAt, updatedAt) VALUES (?, ?, ?, 'In flight', ?, NOW(), NOW())",
+				[videoId, ownerId, organizationId, JSON.stringify({ type: "webMP4" })],
+			);
+			await connection.query(
+				"INSERT INTO video_uploads (video_id, phase, mode) VALUES (?, 'uploading', 'singlepart')",
+				[videoId],
+			);
+			await connection.query(
+				"INSERT INTO loom_migration_imports (videoId, requestId, createdAt) VALUES (?, ?, NOW())",
+				[videoId, requestId],
+			);
+
+			signInAs(operatorId);
+			const completion = actions.updateLoomMigrationStatus({
+				requestId,
+				nextStatus: "completed",
+				message: "",
+				verified: true,
+				expectedVideoCount: 0,
+				importedVideoCount: 0,
+			});
+			const settled = completion.then(
+				() => "completed",
+				(error: Error) => error.message,
+			);
+			await new Promise((resolve) => setTimeout(resolve, 300));
+			await connection.commit();
+
+			expect(await settled).toContain("still processing");
+			expect((await getRequest(requestId)).status).toBe("pending");
+		} finally {
+			await connection.end();
+		}
+	});
+
 	it("refuses to map another request's video", async () => {
 		const first = await makeOrganization();
 		const firstRequest = await requestMigration(
diff --git a/apps/web/actions/loom-concierge.tsx b/apps/web/actions/loom-concierge.tsx
index 66f5e4c114c..b332c0c2e8f 100644
--- a/apps/web/actions/loom-concierge.tsx
+++ b/apps/web/actions/loom-concierge.tsx
@@ -16,7 +16,7 @@ import {
 } from "@cap/database/schema";
 import { serverEnv } from "@cap/env";
 import type { Organisation } from "@cap/web-domain";
-import { and, eq, inArray, isNotNull, lte, or } from "drizzle-orm";
+import { and, eq, inArray, isNotNull } from "drizzle-orm";
 import { revalidatePath } from "next/cache";
 import {
 	getCustomerMigrationRequests,
@@ -272,72 +272,83 @@ async function saveMigrationStatus({
 	) {
 		return;
 	}
-	if (nextStatus === "completed") {
-		const [unfinishedImport] = await db()
-			.select({ videoId: videoUploads.videoId })
-			.from(loomMigrationImports)
-			.innerJoin(
-				videoUploads,
-				eq(videoUploads.videoId, loomMigrationImports.videoId),
-			)
-			.where(
-				and(
-					eq(loomMigrationImports.requestId, requestId),
-					inArray(videoUploads.phase, [
-						"uploading",
-						"processing",
-						"generating_thumbnail",
-						"error",
-					]),
-				),
-			)
-			.limit(1);
-		if (unfinishedImport) {
-			throw new LoomMigrationError(
-				"Loom imports are still processing or have errors. Resolve them before completion.",
-			);
-		}
-	}
 	const [organization] = await db()
 		.select({ name: organizations.name })
 		.from(organizations)
 		.where(eq(organizations.id, request.organizationId))
 		.limit(1);
-	const result = await db()
-		.update(loomMigrationRequests)
-		.set({
-			status: nextStatus,
-			capMessage: normalizedMessage || null,
-			expectedVideoCount,
-			importedVideoCount,
-			activeImportCount: nextStatus === "completed" ? 0 : undefined,
-			activeImportLeaseToken: nextStatus === "completed" ? null : undefined,
-			activeImportLeaseUntil: nextStatus === "completed" ? null : undefined,
-			activeOrganizationId:
-				nextStatus === "completed" ? null : request.organizationId,
-			completedAt: nextStatus === "completed" ? new Date() : null,
-			lastOperatorUserId: operator.id,
-			lastOperatorAt: new Date(),
-			updatedAt: new Date(),
-		})
-		.where(
-			and(
-				eq(loomMigrationRequests.id, requestId),
-				eq(loomMigrationRequests.status, request.status),
-				isNotNull(loomMigrationRequests.activeOrganizationId),
-				nextStatus === "completed"
-					? or(
-							eq(loomMigrationRequests.activeImportCount, 0),
-							lte(loomMigrationRequests.activeImportLeaseUntil, new Date()),
-						)
-					: undefined,
-			),
-		);
-	if (affectedRows(result) === 0) {
-		throw new LoomMigrationError(
-			"The migration request changed or imports are starting. Refresh and try again.",
-		);
-	}
+	await db().transaction(async (tx) => {
+		const now = new Date();
+		const [current] = await tx
+			.select({
+				status: loomMigrationRequests.status,
+				activeOrganizationId: loomMigrationRequests.activeOrganizationId,
+				activeImportCount: loomMigrationRequests.activeImportCount,
+				activeImportLeaseUntil: loomMigrationRequests.activeImportLeaseUntil,
+			})
+			.from(loomMigrationRequests)
+			.where(eq(loomMigrationRequests.id, requestId))
+			.limit(1)
+			.for("update");
+		const importStarting =
+			!!current &&
+			current.activeImportCount > 0 &&
+			(!current.activeImportLeaseUntil || current.activeImportLeaseUntil > now);
+		if (
+			!current?.activeOrganizationId ||
+			current.status !== request.status ||
+			(nextStatus === "completed" && importStarting)
+		) {
+			throw new LoomMigrationError(
+				"The migration request changed or imports are starting. Refresh and try again.",
+			);
+		}
+		if (nextStatus === "completed") {
+			const [unfinishedImport] = await tx
+				.select({ videoId: videoUploads.videoId })
+				.from(loomMigrationImports)
+				.innerJoin(
+					videoUploads,
+					eq(videoUploads.videoId, loomMigrationImports.videoId),
+				)
+				.where(
+					and(
+						eq(loomMigrationImports.requestId, requestId),
+						inArray(videoUploads.phase, [
+							"uploading",
+							"processing",
+							"generating_thumbnail",
+							"error",
+						]),
+					),
+				)
+				.limit(1)
+				.for("share");
+			if (unfinishedImport) {
+				throw new LoomMigrationError(
+					"Loom imports are still processing or have errors. Resolve them before completion.",
+				);
+			}
+		}
+		await tx
+			.update(loomMigrationRequests)
+			.set({
+				status: nextStatus,
+				capMessage: normalizedMessage || null,
+				expectedVideoCount,
+				importedVideoCount,
+				activeImportCount: nextStatus === "completed" ? 0 : undefined,
+				activeImportLeaseToken: nextStatus === "completed" ? null : undefined,
+				activeImportLeaseUntil: nextStatus === "completed" ? null : undefined,
+				activeOrganizationId:
+					nextStatus === "completed" ? null : request.organizationId,
+				completedAt: nextStatus === "completed" ? now : null,
+				lastOperatorUserId: operator.id,
+				lastOperatorAt: now,
+				updatedAt: now,
+			})
+			.where(eq(loomMigrationRequests.id, requestId));
+	});
 
 	const customerVisibleChange =
 		nextStatus !== request.status ||
diff --git a/apps/web/actions/loom.ts b/apps/web/actions/loom.ts
index 9d3acc866b0..2f8ce51d173 100644
--- a/apps/web/actions/loom.ts
+++ b/apps/web/actions/loom.ts
@@ -1204,11 +1204,16 @@ async function prepareConciergeLoomFileUpload({
 			)
 			.limit(1);
 		if (existing) {
+			const existingRawFileKey =
+				existing.rawFileKey ??
+				(existing.phase === "error" && existing.ownerId
+					? `${existing.ownerId}/${existing.id}/raw-upload.mp4`
+					: null);
 			if (
 				!existing.ownerId ||
 				!existing.ownerEmail ||
 				normalizeImportEmail(existing.ownerEmail) !== normalizedEmail ||
-				!existing.rawFileKey ||
+				!existingRawFileKey ||
 				(existing.phase !== "error" &&
 					(existing.phase !== "uploading" ||
 						existing.processingMessage !== "Uploading Loom video..."))
@@ -1219,7 +1224,7 @@ async function prepareConciergeLoomFileUpload({
 			}
 			const retryUpload = await Storage.createUploadTargetForUser(
 				existing.ownerId,
-				existing.rawFileKey,
+				existingRawFileKey,
 				{
 					contentType: "video/mp4",
 					videoTitle: normalizedTitle,
@@ -1249,7 +1254,7 @@ async function prepareConciergeLoomFileUpload({
 					"This Loom import belongs to another migration request.",
 				);
 			}
-			if (!mapped) {
+			if (!mapped || !existing.rawFileKey) {
 				await db().transaction(async (tx) => {
 					const [reservation] = await tx
 						.select({
@@ -1271,6 +1276,19 @@ async function prepareConciergeLoomFileUpload({
 							"The concierge import expired. Retry this video.",
 						);
 					}
+					if (!existing.rawFileKey) {
+						await tx
+							.update(videoUploads)
+							.set({ rawFileKey: existingRawFileKey, updatedAt: new Date() })
+							.where(
+								and(
+									eq(videoUploads.videoId, Video.VideoId.make(existing.id)),
+									eq(videoUploads.phase, "error"),
+									isNull(videoUploads.rawFileKey),
+								),
+							);
+					}
+					if (mapped) return;
 					await tx.insert(loomMigrationImports).values({
 						videoId: Video.VideoId.make(existing.id),
 						requestId,
diff --git a/apps/web/app/(org)/dashboard/admin/loom-migrations/LoomMigrationQueue.tsx b/apps/web/app/(org)/dashboard/admin/loom-migrations/LoomMigrationQueue.tsx
index b27cc2d6465..f9d860b04d6 100644
--- a/apps/web/app/(org)/dashboard/admin/loom-migrations/LoomMigrationQueue.tsx
+++ b/apps/web/app/(org)/dashboard/admin/loom-migrations/LoomMigrationQueue.tsx
@@ -109,7 +109,9 @@ function QueueItem({ request }: { request: OperatorLoomMigrationView }) {
 					}),
 				);
 				started += result.importedCount;
-				failures.push(...result.results.filter((row) => !row.success));
+				failures.push(
+					...result.results.filter((row) => !row.success || row.error),
+				);
 				setProcessedRows(index + batch.length);
 				setStartedRows(started);
 				setFailedRows([...failures]);
@@ -275,15 +277,19 @@ function QueueItem({ request }: { request: OperatorLoomMigrationView }) {
 				</Button>
 				{processedRows > 0 && (
 					<p className="mt-2 text-xs text-gray-10">
-						{startedRows} jobs started; {failedRows.length} rows failed to
-						start.
+						{startedRows} jobs started;{" "}
+						{failedRows.filter((row) => !row.success).length} rows failed to
+						start; {failedRows.filter((row) => row.success).length} started rows
+						need space mapping.
 					</p>
 				)}
 				{failedRows.length > 0 && (
-					<ul className="mt-3 max-h-48 list-inside list-disc overflow-y-auto text-xs text-red-11">
+					<ul className="mt-3 max-h-48 list-inside list-disc overflow-y-auto text-xs text-red-400">
 						{failedRows.map((row) => (
 							<li key={row.rowNumber}>
-								Row {row.rowNumber}: {row.error || "Could not start import."}
+								Row {row.rowNumber}
+								{row.success && row.spaceName ? ` (${row.spaceName})` : ""}:{" "}
+								{row.error || "Could not start import."}
 							</li>
 						))}
 					</ul>
@@ -520,7 +526,7 @@ export function LoomMigrationQueue() {
 				</p>
 			)}
 			{queueQuery.isError && (
-				<div className="rounded-lg border border-red-7 bg-red-3 p-4 text-sm text-red-11">
+				<div className="rounded-lg border border-red-400/30 bg-red-400/10 p-4 text-sm text-red-400">
 					Could not load the queue. {queueQuery.error.message}
 					<button
 						className="ml-2 underline"
diff --git a/apps/web/app/(org)/dashboard/migrations/loom/LoomMigrationPage.tsx b/apps/web/app/(org)/dashboard/migrations/loom/LoomMigrationPage.tsx
index 57883accaba..6c3cd674224 100644
--- a/apps/web/app/(org)/dashboard/migrations/loom/LoomMigrationPage.tsx
+++ b/apps/web/app/(org)/dashboard/migrations/loom/LoomMigrationPage.tsx
@@ -191,7 +191,7 @@ export function LoomMigrationPage() {
 				</div>
 			)}
 			{migrationQuery.isError && (
-				<div className="rounded-lg border border-red-7 bg-red-3 p-4 text-sm text-red-11">
+				<div className="rounded-lg border border-red-400/30 bg-red-400/10 p-4 text-sm text-red-400">
 					Could not load your migration. {migrationQuery.error.message}
 					<button
 						className="ml-2 underline"

From bead736533970b03db7e4d4d72b945306662a937 Mon Sep 17 00:00:00 2001
From: Richie McIlroy <33632126+richiemcilroy@users.noreply.github.com>
Date: Wed, 21 Oct 2026 01:22:42 +0800
Subject: [PATCH 72/74] fix: make Loom migration status email read correctly
 for every status

---
 packages/database/emails/loom-migration.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/database/emails/loom-migration.tsx b/packages/database/emails/loom-migration.tsx
index f65ffdfaaff..c21ad295b1a 100644
--- a/packages/database/emails/loom-migration.tsx
+++ b/packages/database/emails/loom-migration.tsx
@@ -53,14 +53,14 @@ export function LoomMigrationStatusEmail({
 	return (
 		<Html>
 			<Head />
-			<Preview>Your Loom migration is {statusLabel.toLowerCase()}</Preview>
+			<Preview>{`Loom migration: ${statusLabel}`}</Preview>
 			<Body className="bg-white font-sans">
 				<Container className="mx-auto my-10 max-w-[500px] px-6">
 					<Heading>Loom migration update</Heading>
 					<Text>
-						Your migration for {organizationName} is {statusLabel.toLowerCase()}
-						.
+						There is an update on the Loom migration for {organizationName}.
 					</Text>
+					<Text>{`Status: ${statusLabel}`}</Text>
 					{message && <Text>{message}</Text>}
 					<Link href={dashboardUrl}>View your migration</Link>
 				</Container>

From 8779caaf3dd4c9b886e05112d3dbc562d5f5b824 Mon Sep 17 00:00:00 2001
From: Richie McIlroy <33632126+richiemcilroy@users.noreply.github.com>
Date: Wed, 21 Oct 2026 01:50:33 +0800
Subject: [PATCH 73/74] feat: move Loom concierge migration into the Loom
 import page

---
 .../web/__tests__/unit/loom-import-ui.test.ts |  14 +-
 apps/web/actions/loom-concierge.tsx           |   4 +-
 apps/web/actions/loom.ts                      |   4 +-
 .../dashboard/_components/Navbar/Items.tsx    |  11 -
 .../app/(org)/dashboard/import/ImportPage.tsx |  38 +-
 .../dashboard/import/loom/ImportLoomPage.tsx  |  17 +-
 .../import/loom/LoomConciergeRow.tsx          | 286 +++++++++++++
 .../migrations/loom/LoomMigrationPage.tsx     | 403 ------------------
 .../(org)/dashboard/migrations/loom/page.tsx  |   9 +-
 apps/web/content/docs/migrating-to-cap.mdx    |  13 +-
 10 files changed, 317 insertions(+), 482 deletions(-)
 create mode 100644 apps/web/app/(org)/dashboard/import/loom/LoomConciergeRow.tsx
 delete mode 100644 apps/web/app/(org)/dashboard/migrations/loom/LoomMigrationPage.tsx

diff --git a/apps/web/__tests__/unit/loom-import-ui.test.ts b/apps/web/__tests__/unit/loom-import-ui.test.ts
index 07fd55309d5..09e290dc5a2 100644
--- a/apps/web/__tests__/unit/loom-import-ui.test.ts
+++ b/apps/web/__tests__/unit/loom-import-ui.test.ts
@@ -99,6 +99,12 @@ vi.mock("next/link", () => ({
 vi.mock("@cap/env", () => ({
 	buildEnv: { NEXT_PUBLIC_IS_CAP: "true" },
 }));
+vi.mock("@/actions/loom-concierge", () => ({
+	answerLoomMigrationQuestion: vi.fn(),
+	confirmLoomMigrationInvite: vi.fn(),
+	getLoomMigrationDashboard: vi.fn(async () => ({ isPro: true, requests: [] })),
+	requestLoomMigration: vi.fn(),
+}));
 vi.mock("@/actions/loom", () => ({
 	getLoomImportFolders: mocks.folders,
 	importFromLoom: mocks.import,
@@ -189,11 +195,9 @@ describe("Loom importer component", () => {
 	it("shows the inherited subfolder and submits it then returns there", async () => {
 		await render({ folderId: Folder.FolderId.make("child") });
 		await ready();
-		expect(
-			Array.from(container.querySelectorAll("a")).find(
-				(link) => link.getAttribute("href") === "/dashboard/migrations/loom",
-			)?.textContent,
-		).toContain("Want Cap to move your whole Loom workspace for you?");
+		await waitFor(() =>
+			expect(container.textContent).toContain("Moving a whole Loom workspace?"),
+		);
 		expect(
 			getByRole(container, "combobox", { name: "Import to" }).textContent,
 		).toContain("My Caps / Course / Live Calls - Two");
diff --git a/apps/web/actions/loom-concierge.tsx b/apps/web/actions/loom-concierge.tsx
index b332c0c2e8f..5b9452dd102 100644
--- a/apps/web/actions/loom-concierge.tsx
+++ b/apps/web/actions/loom-concierge.tsx
@@ -47,7 +47,7 @@ function affectedRows(result: unknown) {
 }
 
 function refreshMigrationPages() {
-	revalidatePath("/dashboard/migrations/loom");
+	revalidatePath("/dashboard/import/loom");
 	revalidatePath("/dashboard/admin/loom-migrations");
 }
 
@@ -370,7 +370,7 @@ async function saveMigrationStatus({
 						organizationName={organization?.name ?? "your Cap workspace"}
 						statusLabel={LOOM_MIGRATION_STATUS_LABELS[nextStatus]}
 						message={normalizedMessage || null}
-						dashboardUrl={`${serverEnv().WEB_URL}/dashboard/migrations/loom`}
+						dashboardUrl={`${serverEnv().WEB_URL}/dashboard/import/loom`}
 					/>
 				),
 				replyTo: SUPPORT_EMAIL,
diff --git a/apps/web/actions/loom.ts b/apps/web/actions/loom.ts
index 2f8ce51d173..96dca601f55 100644
--- a/apps/web/actions/loom.ts
+++ b/apps/web/actions/loom.ts
@@ -1094,7 +1094,7 @@ async function importConciergeCsvRows({
 			migrationRequestId: requestId,
 			migrationLeaseToken: leaseToken,
 		});
-		revalidatePath("/dashboard/migrations/loom");
+		revalidatePath("/dashboard/import/loom");
 		revalidatePath("/dashboard/admin/loom-migrations");
 		return result;
 	} finally {
@@ -1506,7 +1506,7 @@ async function startConciergeLoomFileProcessing({
 			processingMessage: "Processing Loom video...",
 			startFailureMessage: "Loom file processing could not start.",
 		});
-		revalidatePath("/dashboard/migrations/loom");
+		revalidatePath("/dashboard/import/loom");
 		revalidatePath("/dashboard/admin/loom-migrations");
 		return { status };
 	} finally {
diff --git a/apps/web/app/(org)/dashboard/_components/Navbar/Items.tsx b/apps/web/app/(org)/dashboard/_components/Navbar/Items.tsx
index d5d0ebfe639..7461c2395d5 100644
--- a/apps/web/app/(org)/dashboard/_components/Navbar/Items.tsx
+++ b/apps/web/app/(org)/dashboard/_components/Navbar/Items.tsx
@@ -111,17 +111,6 @@ const AdminNavItems = ({ toggleMobileNav }: Props) => {
 			icon: <ImportIcon />,
 			subNav: [],
 		},
-		...(buildEnv.NEXT_PUBLIC_IS_CAP
-			? [
-					{
-						name: "Loom Migration",
-						href: "/dashboard/migrations/loom",
-						adminOnly: true,
-						icon: <ImportIcon />,
-						subNav: [],
-					},
-				]
-			: []),
 		{
 			name: "Organization Settings",
 			href: `/dashboard/settings/organization`,
diff --git a/apps/web/app/(org)/dashboard/import/ImportPage.tsx b/apps/web/app/(org)/dashboard/import/ImportPage.tsx
index 1cf0fe84795..9712a3af2ec 100644
--- a/apps/web/app/(org)/dashboard/import/ImportPage.tsx
+++ b/apps/web/app/(org)/dashboard/import/ImportPage.tsx
@@ -1,34 +1,18 @@
 "use client";
 
-import { buildEnv } from "@cap/env";
-import { faArrowsRotate, faUpload } from "@fortawesome/free-solid-svg-icons";
+import { faUpload } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import Link from "next/link";
-import { useDashboardContext } from "@/app/(org)/dashboard/Contexts";
 import {
 	type LoomImportDestination,
 	loomImportPageHref,
 } from "@/lib/loom-import-destination";
-import {
-	canManageOrganizationSettings,
-	getEffectiveOrganizationRole,
-} from "@/lib/permissions/roles";
 
 export const ImportPage = ({
 	initialDestination = {},
 }: {
 	initialDestination?: LoomImportDestination;
 }) => {
-	const { user, activeOrganization } = useDashboardContext();
-	const currentMember = activeOrganization?.members.find(
-		(member) => member.userId === user.id,
-	);
-	const currentRole = getEffectiveOrganizationRole({
-		userId: user.id,
-		ownerId: activeOrganization?.organization.ownerId,
-		memberRole: currentMember?.role,
-	});
-	const canRequestMigration = canManageOrganizationSettings(currentRole);
 	return (
 		<div className="flex flex-col w-full h-full">
 			<div className="mb-8">
@@ -87,26 +71,6 @@ export const ImportPage = ({
 						</p>
 					</div>
 				</Link>
-				{buildEnv.NEXT_PUBLIC_IS_CAP && canRequestMigration && (
-					<Link
-						href="/dashboard/migrations/loom"
-						className="flex overflow-hidden relative flex-col w-full rounded-xl border transition-all duration-200 group border-gray-3 bg-gray-1 hover:border-blue-10 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-blue-8"
-					>
-						<div className="flex justify-center items-center w-full h-32 transition-colors duration-200 bg-gray-3 group-hover:bg-gray-4">
-							<div className="flex justify-center items-center rounded-full transition-all duration-200 size-14 bg-gray-1 text-gray-10 group-hover:text-gray-12 group-hover:scale-110">
-								<FontAwesomeIcon className="size-5" icon={faArrowsRotate} />
-							</div>
-						</div>
-						<div className="flex flex-col gap-1 p-4">
-							<p className="text-sm font-medium text-left text-gray-12">
-								Concierge Loom Migration
-							</p>
-							<p className="text-xs text-left text-gray-10">
-								Let Cap move your Loom workspace. Free with Cap Pro.
-							</p>
-						</div>
-					</Link>
-				)}
 			</div>
 		</div>
 	);
diff --git a/apps/web/app/(org)/dashboard/import/loom/ImportLoomPage.tsx b/apps/web/app/(org)/dashboard/import/loom/ImportLoomPage.tsx
index 8e5db52a251..085577b425c 100644
--- a/apps/web/app/(org)/dashboard/import/loom/ImportLoomPage.tsx
+++ b/apps/web/app/(org)/dashboard/import/loom/ImportLoomPage.tsx
@@ -67,6 +67,7 @@ import {
 	canManageOrganizationSettings,
 	getEffectiveOrganizationRole,
 } from "@/lib/permissions/roles";
+import { LoomConciergeRow } from "./LoomConciergeRow";
 
 type Mode = "single" | "csv";
 
@@ -554,14 +555,6 @@ export const ImportLoomPage = ({
 								? "Bring a single Loom video into Cap, or bulk import recordings for organization members and new users from a CSV."
 								: "Paste a Loom share link to bring it into Cap."}
 						</p>
-						{buildEnv.NEXT_PUBLIC_IS_CAP && canUseCsvImport && (
-							<Link
-								href="/dashboard/migrations/loom"
-								className="mt-2 inline-block text-sm text-blue-11 underline"
-							>
-								Want Cap to move your whole Loom workspace for you?
-							</Link>
-						)}
 					</div>
 				</div>
 			</div>
@@ -1062,6 +1055,14 @@ export const ImportLoomPage = ({
 						)}
 					</div>
 				)}
+
+				{buildEnv.NEXT_PUBLIC_IS_CAP &&
+					canUseCsvImport &&
+					activeOrganization?.organization.id && (
+						<LoomConciergeRow
+							organizationId={activeOrganization.organization.id}
+						/>
+					)}
 			</div>
 
 			<Dialog open={confirmOpen} onOpenChange={setConfirmOpen}>
diff --git a/apps/web/app/(org)/dashboard/import/loom/LoomConciergeRow.tsx b/apps/web/app/(org)/dashboard/import/loom/LoomConciergeRow.tsx
new file mode 100644
index 00000000000..145440abd94
--- /dev/null
+++ b/apps/web/app/(org)/dashboard/import/loom/LoomConciergeRow.tsx
@@ -0,0 +1,286 @@
+"use client";
+
+import {
+	Button,
+	Dialog,
+	DialogContent,
+	DialogFooter,
+	DialogHeader,
+	DialogTitle,
+	Input,
+} from "@cap/ui";
+import type { Organisation } from "@cap/web-domain";
+import { faPeopleCarryBox } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { useId, useState } from "react";
+import { toast } from "sonner";
+import {
+	answerLoomMigrationQuestion,
+	confirmLoomMigrationInvite,
+	getLoomMigrationDashboard,
+	requestLoomMigration,
+} from "@/actions/loom-concierge";
+import type { LoomMigrationView } from "@/lib/loom-concierge";
+import { unwrapLoomMigrationResult } from "@/lib/loom-migration-state";
+
+const textareaClassName =
+	"w-full min-h-20 px-4 py-3 rounded-xl border text-[16px] md:text-[13px] text-gray-12 bg-gray-1 border-gray-4 outline-0 transition-all duration-200 hover:bg-gray-2 hover:border-gray-5 focus:bg-gray-2 focus:border-gray-5 placeholder:text-gray-8";
+
+function statusCopy(request: LoomMigrationView) {
+	if (request.status === "completed") {
+		const finished = request.completedAt
+			? new Date(request.completedAt).toLocaleDateString()
+			: null;
+		return {
+			title: "Loom migration complete",
+			body: `${request.importedVideoCount} ${request.importedVideoCount === 1 ? "video" : "videos"} moved${finished ? ` on ${finished}` : ""}.`,
+		};
+	}
+	if (request.status === "needs_information") {
+		return {
+			title: "We need a little more information",
+			body: "Reply below so we can keep moving your videos.",
+		};
+	}
+	if (request.status === "in_progress") {
+		return {
+			title: "Moving your Loom videos",
+			body: "We'll email you when everything has been checked.",
+		};
+	}
+	if (!request.invitedAt) {
+		return {
+			title: "Loom migration requested",
+			body: "Next, invite hello@cap.so to your Loom workspace with download permission.",
+		};
+	}
+	return {
+		title: "Loom migration requested",
+		body: "We'll review your workspace and email you with next steps.",
+	};
+}
+
+export function LoomConciergeRow({
+	organizationId,
+}: {
+	organizationId: Organisation.OrganisationId;
+}) {
+	const queryClient = useQueryClient();
+	const [dialogOpen, setDialogOpen] = useState(false);
+	const [workspaceName, setWorkspaceName] = useState("");
+	const [note, setNote] = useState("");
+	const [answer, setAnswer] = useState("");
+	const workspaceNameId = useId();
+	const noteId = useId();
+	const answerId = useId();
+
+	const queryKey = ["loom-concierge", organizationId];
+	const migrationQuery = useQuery({
+		queryKey,
+		queryFn: () => getLoomMigrationDashboard(organizationId),
+		refetchInterval: 60_000,
+	});
+	const refresh = () => queryClient.invalidateQueries({ queryKey });
+
+	const requestMutation = useMutation({
+		mutationFn: async () =>
+			unwrapLoomMigrationResult(
+				await requestLoomMigration({ organizationId, workspaceName, note }),
+			),
+		onSuccess: async () => {
+			await refresh();
+			setDialogOpen(false);
+			setWorkspaceName("");
+			setNote("");
+			toast.success("Migration requested");
+		},
+		onError: (error) => toast.error(error.message),
+	});
+	const inviteMutation = useMutation({
+		mutationFn: async (requestId: string) =>
+			unwrapLoomMigrationResult(await confirmLoomMigrationInvite(requestId)),
+		onSuccess: async () => {
+			await refresh();
+			toast.success("Thanks, we'll take it from here");
+		},
+		onError: (error) => toast.error(error.message),
+	});
+	const answerMutation = useMutation({
+		mutationFn: async (input: { requestId: string; answer: string }) =>
+			unwrapLoomMigrationResult(await answerLoomMigrationQuestion(input)),
+		onSuccess: async () => {
+			setAnswer("");
+			await refresh();
+			toast.success("Reply sent");
+		},
+		onError: (error) => toast.error(error.message),
+	});
+
+	if (!migrationQuery.data?.isPro) return null;
+
+	const requests = migrationQuery.data.requests;
+	const request =
+		requests.find((item) => item.status !== "completed") ?? requests[0];
+	const copy = request
+		? statusCopy(request)
+		: {
+				title: "Moving a whole Loom workspace?",
+				body: "We'll move it for you, keeping owners and spaces. Included with Cap Pro.",
+			};
+
+	return (
+		<>
+			<div className="flex flex-col gap-4 p-5 rounded-xl border bg-gray-2 border-gray-3">
+				<div className="flex flex-col gap-4 justify-between sm:flex-row sm:items-center">
+					<div className="flex gap-4 items-start sm:items-center">
+						<div className="flex flex-shrink-0 justify-center items-center rounded-lg size-10 bg-gray-3 text-gray-11">
+							<FontAwesomeIcon className="size-4" icon={faPeopleCarryBox} />
+						</div>
+						<div className="flex flex-col gap-1.5">
+							<p className="text-sm font-medium text-gray-12">{copy.title}</p>
+							<p className="text-xs text-gray-10">{copy.body}</p>
+						</div>
+					</div>
+					{(!request || request.status === "completed") && (
+						<Button
+							type="button"
+							variant="white"
+							size="sm"
+							className="flex-shrink-0"
+							onClick={() => setDialogOpen(true)}
+						>
+							{request ? "Request another" : "Request migration"}
+						</Button>
+					)}
+					{request?.status === "pending" && !request.invitedAt && (
+						<Button
+							type="button"
+							variant="white"
+							size="sm"
+							className="flex-shrink-0"
+							spinner={inviteMutation.isPending}
+							disabled={inviteMutation.isPending}
+							onClick={() => inviteMutation.mutate(request.id)}
+						>
+							I've sent the invite
+						</Button>
+					)}
+				</div>
+
+				{request?.status === "needs_information" && (
+					<form
+						className="flex flex-col gap-3 sm:pl-14"
+						onSubmit={(event) => {
+							event.preventDefault();
+							answerMutation.mutate({ requestId: request.id, answer });
+						}}
+					>
+						{request.capMessage && (
+							<p className="text-sm whitespace-pre-wrap text-gray-12">
+								{request.capMessage}
+							</p>
+						)}
+						<label htmlFor={answerId} className="sr-only">
+							Your reply
+						</label>
+						<textarea
+							id={answerId}
+							className={textareaClassName}
+							maxLength={2000}
+							placeholder="Your reply"
+							value={answer}
+							onChange={(event) => setAnswer(event.target.value)}
+						/>
+						<Button
+							type="submit"
+							variant="dark"
+							size="sm"
+							className="self-end"
+							spinner={answerMutation.isPending}
+							disabled={answerMutation.isPending || !answer.trim()}
+						>
+							Send reply
+						</Button>
+					</form>
+				)}
+			</div>
+
+			<Dialog open={dialogOpen} onOpenChange={setDialogOpen}>
+				<DialogContent className="w-[calc(100%-20px)] max-w-md">
+					<DialogHeader
+						icon={
+							<FontAwesomeIcon icon={faPeopleCarryBox} className="size-3.5" />
+						}
+					>
+						<DialogTitle>Request Loom migration</DialogTitle>
+					</DialogHeader>
+					<form
+						onSubmit={(event) => {
+							event.preventDefault();
+							requestMutation.mutate();
+						}}
+					>
+						<div className="flex flex-col gap-4 p-5">
+							<p className="text-sm text-gray-11">
+								We'll move your Loom videos into this organization. After you
+								request, invite hello@cap.so to your Loom workspace with
+								download permission.
+							</p>
+							<div className="flex flex-col gap-2">
+								<label
+									htmlFor={workspaceNameId}
+									className="text-sm font-medium text-gray-12"
+								>
+									Loom workspace name
+								</label>
+								<Input
+									id={workspaceNameId}
+									maxLength={255}
+									placeholder="Optional"
+									value={workspaceName}
+									onChange={(event) => setWorkspaceName(event.target.value)}
+								/>
+							</div>
+							<div className="flex flex-col gap-2">
+								<label
+									htmlFor={noteId}
+									className="text-sm font-medium text-gray-12"
+								>
+									Notes
+								</label>
+								<textarea
+									id={noteId}
+									className={textareaClassName}
+									maxLength={2000}
+									placeholder="Roughly how many videos, which spaces matter most"
+									value={note}
+									onChange={(event) => setNote(event.target.value)}
+								/>
+							</div>
+						</div>
+						<DialogFooter>
+							<Button
+								type="button"
+								size="sm"
+								variant="gray"
+								onClick={() => setDialogOpen(false)}
+							>
+								Cancel
+							</Button>
+							<Button
+								type="submit"
+								size="sm"
+								variant="dark"
+								spinner={requestMutation.isPending}
+								disabled={requestMutation.isPending}
+							>
+								Request migration
+							</Button>
+						</DialogFooter>
+					</form>
+				</DialogContent>
+			</Dialog>
+		</>
+	);
+}
diff --git a/apps/web/app/(org)/dashboard/migrations/loom/LoomMigrationPage.tsx b/apps/web/app/(org)/dashboard/migrations/loom/LoomMigrationPage.tsx
deleted file mode 100644
index 6c3cd674224..00000000000
--- a/apps/web/app/(org)/dashboard/migrations/loom/LoomMigrationPage.tsx
+++ /dev/null
@@ -1,403 +0,0 @@
-"use client";
-
-import { Button } from "@cap/ui";
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import { CheckCircle2, CircleHelp, Clock3, LoaderCircle } from "lucide-react";
-import Link from "next/link";
-import { useId, useState } from "react";
-import { toast } from "sonner";
-import {
-	answerLoomMigrationQuestion,
-	confirmLoomMigrationInvite,
-	getLoomMigrationDashboard,
-	requestLoomMigration,
-} from "@/actions/loom-concierge";
-import { useDashboardContext } from "@/app/(org)/dashboard/Contexts";
-import type { LoomMigrationView } from "@/lib/loom-concierge";
-import {
-	LOOM_MIGRATION_STATUS_LABELS,
-	type LoomMigrationStatus,
-	unwrapLoomMigrationResult,
-} from "@/lib/loom-migration-state";
-
-const STATUS_STYLE: Record<LoomMigrationStatus, string> = {
-	pending: "bg-amber-500/10 text-amber-600",
-	in_progress: "bg-blue-3 text-blue-11",
-	needs_information: "bg-orange-500/10 text-orange-600",
-	completed: "bg-green-500/10 text-green-600",
-};
-
-function MigrationStatus({ request }: { request: LoomMigrationView }) {
-	return (
-		<div className="rounded-xl border border-gray-4 bg-gray-1 p-5">
-			<div className="flex flex-wrap items-center justify-between gap-3">
-				<div>
-					<h2 className="text-lg font-medium text-gray-12">Your migration</h2>
-					<p className="mt-1 text-sm text-gray-10">
-						Requested on {new Date(request.createdAt).toLocaleDateString()}
-						{request.workspaceName ? ` for ${request.workspaceName}` : ""}
-					</p>
-				</div>
-				<span
-					className={`rounded-full px-3 py-1 text-xs font-medium ${STATUS_STYLE[request.status]}`}
-				>
-					{LOOM_MIGRATION_STATUS_LABELS[request.status]}
-				</span>
-			</div>
-			{request.status === "pending" && (
-				<p className="mt-4 text-sm text-gray-11">
-					Your request is in Cap’s queue. We’ll review your Loom workspace and
-					confirm the migration plan.
-				</p>
-			)}
-			{request.status === "in_progress" && (
-				<p className="mt-4 text-sm text-gray-11">
-					Cap is moving your videos. We’ll mark this complete after checking the
-					imported library.
-				</p>
-			)}
-			{request.status === "completed" && (
-				<div className="mt-4 flex items-start gap-3 text-sm text-gray-11">
-					<CheckCircle2 className="mt-0.5 size-4 shrink-0 text-green-600" />
-					<div>
-						<p>Your migration is complete.</p>
-						{request.expectedVideoCount !== null && (
-							<p className="mt-1">
-								{request.importedVideoCount} of {request.expectedVideoCount}{" "}
-								videos verified in Cap.
-							</p>
-						)}
-						<Link
-							className="mt-2 inline-block text-blue-11 underline"
-							href="/dashboard/caps"
-						>
-							View your Caps
-						</Link>
-					</div>
-				</div>
-			)}
-			{request.capMessage && (
-				<div className="mt-4 rounded-lg bg-gray-3 p-4 text-sm text-gray-12">
-					<p className="font-medium">Update from Cap</p>
-					<p className="mt-1 whitespace-pre-wrap">{request.capMessage}</p>
-				</div>
-			)}
-			{request.customerReply && (
-				<p className="mt-3 text-xs text-gray-10">
-					Your latest reply: {request.customerReply}
-				</p>
-			)}
-		</div>
-	);
-}
-
-export function LoomMigrationPage() {
-	const { activeOrganization, user } = useDashboardContext();
-	const organizationId = activeOrganization?.organization.id;
-	const queryClient = useQueryClient();
-	const [requestFormOpen, setRequestFormOpen] = useState(false);
-	const [workspaceName, setWorkspaceName] = useState("");
-	const [note, setNote] = useState("");
-	const [answer, setAnswer] = useState("");
-	const answerId = useId();
-	const workspaceNameId = useId();
-	const noteId = useId();
-
-	const migrationQuery = useQuery({
-		queryKey: ["loom-concierge", organizationId],
-		queryFn: () => {
-			if (!organizationId) throw new Error("Select a Cap workspace.");
-			return getLoomMigrationDashboard(organizationId);
-		},
-		enabled: Boolean(organizationId),
-		refetchInterval: 30_000,
-	});
-
-	const refresh = () =>
-		queryClient.invalidateQueries({
-			queryKey: ["loom-concierge", organizationId],
-		});
-	const requestMutation = useMutation({
-		mutationFn: async () => {
-			if (!organizationId) throw new Error("Select a Cap workspace.");
-			return unwrapLoomMigrationResult(
-				await requestLoomMigration({ organizationId, workspaceName, note }),
-			);
-		},
-		onSuccess: async (result) => {
-			await refresh();
-			setRequestFormOpen(false);
-			toast.success(
-				result.alreadyRequested
-					? "Your migration request is already in the queue."
-					: "Migration requested. Invite hello@cap.so in Loom next.",
-			);
-		},
-		onError: (error) => toast.error(error.message),
-	});
-	const inviteMutation = useMutation({
-		mutationFn: async (requestId: string) =>
-			unwrapLoomMigrationResult(await confirmLoomMigrationInvite(requestId)),
-		onSuccess: async () => {
-			await refresh();
-			toast.success("Thanks. Cap can now review your Loom invite.");
-		},
-		onError: (error) => toast.error(error.message),
-	});
-	const answerMutation = useMutation({
-		mutationFn: async (input: { requestId: string; answer: string }) =>
-			unwrapLoomMigrationResult(await answerLoomMigrationQuestion(input)),
-		onSuccess: async () => {
-			setAnswer("");
-			await refresh();
-			toast.success("Your answer has been sent to Cap.");
-		},
-		onError: (error) => toast.error(error.message),
-	});
-
-	const requests = migrationQuery.data?.requests ?? [];
-	const activeRequest = requests.find(
-		(request) => request.status !== "completed",
-	);
-	const completedRequest = requests.find(
-		(request) => request.status === "completed",
-	);
-	const isPro = migrationQuery.data?.isPro ?? false;
-
-	return (
-		<div className="flex w-full max-w-5xl flex-col gap-6">
-			<div>
-				<p className="text-xs font-medium uppercase tracking-wide text-blue-11">
-					Switch from Loom
-				</p>
-				<h1 className="mt-2 text-2xl font-medium text-gray-12">
-					Move your Loom library to Cap
-				</h1>
-				<p className="mt-2 max-w-2xl text-sm text-gray-10">
-					Import it yourself, or let Cap handle the move. Concierge migration is
-					included with Cap Pro at no extra cost.
-				</p>
-			</div>
-
-			{!organizationId && (
-				<p className="rounded-lg border border-gray-4 bg-gray-1 p-4 text-sm text-gray-10">
-					Select a Cap workspace to request a Loom migration.
-				</p>
-			)}
-			{organizationId && migrationQuery.isPending && (
-				<div className="flex items-center gap-2 text-sm text-gray-10">
-					<LoaderCircle className="size-4 animate-spin" /> Loading your
-					migration…
-				</div>
-			)}
-			{migrationQuery.isError && (
-				<div className="rounded-lg border border-red-400/30 bg-red-400/10 p-4 text-sm text-red-400">
-					Could not load your migration. {migrationQuery.error.message}
-					<button
-						className="ml-2 underline"
-						onClick={() => migrationQuery.refetch()}
-						type="button"
-					>
-						Try again
-					</button>
-				</div>
-			)}
-
-			{activeRequest && <MigrationStatus request={activeRequest} />}
-			{!activeRequest && completedRequest && (
-				<MigrationStatus request={completedRequest} />
-			)}
-
-			{activeRequest && !activeRequest.invitedAt && (
-				<div className="rounded-xl border border-blue-6 bg-blue-2 p-5">
-					<div className="flex items-start gap-3">
-						<Clock3 className="mt-0.5 size-5 shrink-0 text-blue-11" />
-						<div>
-							<h2 className="font-medium text-gray-12">
-								One step left: invite Cap to Loom
-							</h2>
-							<p className="mt-2 text-sm text-gray-11">
-								In your Loom workspace settings, invite{" "}
-								<strong>hello@cap.so</strong> with video access and download
-								permission. Some private Library videos need access shared
-								separately. If we find any, we’ll ask you here. You can keep
-								using Loom until we confirm the migration is complete.
-							</p>
-							<a
-								className="mt-2 inline-block text-sm text-blue-11 underline"
-								href="https://support.atlassian.com/loom/docs/add-remove-and-manage-members-in-your-workspace/"
-								rel="noreferrer"
-								target="_blank"
-							>
-								Loom’s workspace invite steps
-							</a>
-							<Button
-								className="mt-4"
-								disabled={inviteMutation.isPending}
-								onClick={() => inviteMutation.mutate(activeRequest.id)}
-								size="sm"
-								variant="dark"
-							>
-								I sent the Loom invite
-							</Button>
-						</div>
-					</div>
-				</div>
-			)}
-			{activeRequest?.invitedAt && activeRequest.status !== "completed" && (
-				<p className="text-sm text-gray-10">
-					Loom invite marked as sent. Cap will take it from here.
-				</p>
-			)}
-			{activeRequest?.status === "needs_information" && (
-				<form
-					className="rounded-xl border border-orange-500/30 bg-orange-500/5 p-5"
-					onSubmit={(event) => {
-						event.preventDefault();
-						answerMutation.mutate({ requestId: activeRequest.id, answer });
-					}}
-				>
-					<div className="flex items-center gap-2 font-medium text-gray-12">
-						<CircleHelp className="size-5 text-orange-600" /> Cap needs a little
-						more information
-					</div>
-					<label className="mt-4 block text-sm text-gray-11" htmlFor={answerId}>
-						Your answer
-					</label>
-					<textarea
-						className="mt-2 min-h-24 w-full rounded-lg border border-gray-6 bg-gray-1 p-3 text-sm text-gray-12"
-						id={answerId}
-						maxLength={2000}
-						onChange={(event) => setAnswer(event.target.value)}
-						value={answer}
-					/>
-					<Button
-						disabled={answerMutation.isPending || !answer.trim()}
-						size="sm"
-						type="submit"
-						variant="dark"
-					>
-						Send answer
-					</Button>
-				</form>
-			)}
-
-			<div className="grid gap-5 md:grid-cols-2">
-				<div className="rounded-xl border border-gray-4 bg-gray-1 p-5">
-					<h2 className="text-lg font-medium text-gray-12">Do it yourself</h2>
-					<p className="mt-2 text-sm text-gray-10">
-						Best when you already have a list of Loom links and video owners.
-					</p>
-					<ol className="mt-4 list-inside list-decimal space-y-2 text-sm text-gray-11">
-						<li>
-							Prepare a CSV with loom_video_url and user_email. space_name is
-							optional.
-						</li>
-						<li>
-							Upload up to 500 videos per CSV and review the owner mapping.
-						</li>
-						<li>
-							Check the import results and your Cap library before leaving Loom.
-						</li>
-					</ol>
-					{user.isPro ? (
-						<Link
-							className="mt-5 inline-block rounded-lg bg-gray-12 px-4 py-2 text-sm text-gray-1"
-							href="/dashboard/import/loom?mode=csv"
-						>
-							Open CSV importer
-						</Link>
-					) : (
-						<p className="mt-5 text-sm text-gray-10">
-							The self-service importer requires your own Cap Pro account.
-						</p>
-					)}
-				</div>
-				<div className="rounded-xl border border-blue-6 bg-blue-2 p-5">
-					<div className="flex items-center justify-between gap-2">
-						<h2 className="text-lg font-medium text-gray-12">
-							Cap handles it for you
-						</h2>
-						<span className="rounded-full bg-blue-4 px-2 py-1 text-xs text-blue-11">
-							Free with Pro
-						</span>
-					</div>
-					<p className="mt-2 text-sm text-gray-11">
-						Request the migration and invite hello@cap.so to Loom. We’ll
-						inventory, move, and verify your videos. No CSV preparation needed.
-						If Loom restricts a video, we’ll ask for the specific access we
-						need.
-					</p>
-					{!migrationQuery.isPending && !migrationQuery.isError && !isPro && (
-						<div className="mt-5 text-sm text-gray-11">
-							Your organization owner needs Cap Pro to request this service.
-							<Link
-								className="ml-1 text-blue-11 underline"
-								href="/dashboard/settings/organization/billing"
-							>
-								View billing
-							</Link>
-						</div>
-					)}
-					{isPro && !activeRequest && !requestFormOpen && (
-						<Button
-							className="mt-5"
-							onClick={() => setRequestFormOpen(true)}
-							size="sm"
-							variant="dark"
-						>
-							Enable concierge migration
-						</Button>
-					)}
-					{isPro && !activeRequest && requestFormOpen && (
-						<form
-							className="mt-5 space-y-4"
-							onSubmit={(event) => {
-								event.preventDefault();
-								requestMutation.mutate();
-							}}
-						>
-							<div>
-								<label
-									className="text-sm text-gray-12"
-									htmlFor={workspaceNameId}
-								>
-									Loom workspace name{" "}
-									<span className="text-gray-10">(optional)</span>
-								</label>
-								<input
-									className="mt-2 w-full rounded-lg border border-gray-6 bg-gray-1 px-3 py-2 text-sm text-gray-12"
-									id={workspaceNameId}
-									maxLength={255}
-									onChange={(event) => setWorkspaceName(event.target.value)}
-									value={workspaceName}
-								/>
-							</div>
-							<div>
-								<label className="text-sm text-gray-12" htmlFor={noteId}>
-									Anything we should know?{" "}
-									<span className="text-gray-10">(optional)</span>
-								</label>
-								<textarea
-									className="mt-2 min-h-20 w-full rounded-lg border border-gray-6 bg-gray-1 p-3 text-sm text-gray-12"
-									id={noteId}
-									maxLength={2000}
-									onChange={(event) => setNote(event.target.value)}
-									value={note}
-								/>
-							</div>
-							<Button
-								disabled={requestMutation.isPending}
-								size="sm"
-								type="submit"
-								variant="dark"
-							>
-								Request migration
-							</Button>
-						</form>
-					)}
-				</div>
-			</div>
-		</div>
-	);
-}
diff --git a/apps/web/app/(org)/dashboard/migrations/loom/page.tsx b/apps/web/app/(org)/dashboard/migrations/loom/page.tsx
index bb06782ed70..14b7a491c43 100644
--- a/apps/web/app/(org)/dashboard/migrations/loom/page.tsx
+++ b/apps/web/app/(org)/dashboard/migrations/loom/page.tsx
@@ -1,10 +1,5 @@
-import type { Metadata } from "next";
-import { LoomMigrationPage } from "./LoomMigrationPage";
-
-export const metadata: Metadata = {
-	title: "Loom Migration — Cap",
-};
+import { redirect } from "next/navigation";
 
 export default function Page() {
-	return <LoomMigrationPage />;
+	redirect("/dashboard/import/loom");
 }
diff --git a/apps/web/content/docs/migrating-to-cap.mdx b/apps/web/content/docs/migrating-to-cap.mdx
index dcc74ca840e..0054bdfd803 100644
--- a/apps/web/content/docs/migrating-to-cap.mdx
+++ b/apps/web/content/docs/migrating-to-cap.mdx
@@ -14,19 +14,18 @@ A successful migration is not just a count of accepted URLs. It preserves owners
 |---------|------------------|
 | One Loom video | Paste the Loom URL in **Dashboard > Import > Loom** |
 | Up to 500 mapped videos | Use the organization CSV importer |
-| A library you want Cap to move for you | Request the free Cap Pro concierge migration in **Dashboard > Loom Migration** |
+| A library you want Cap to move for you | Request the free Cap Pro concierge migration in **Dashboard > Import > Loom** |
 | More than 500 videos or a complex hierarchy | Request concierge migration or run controlled batches with an agent |
 
 Loom import is a Cap Pro feature. Bulk CSV import is available to organization owners and admins. Concierge migration is included at no extra cost when the Cap organization owner has Pro.
 
 ## Request concierge migration
 
-1. Open **Dashboard > Loom Migration** and select your Cap organization.
-2. Choose **Enable concierge migration**, then **Request migration**. The request enters Cap's queue as **Pending**.
-3. Invite [hello@cap.so](mailto:hello@cap.so) to your Loom workspace with access and download permission for the videos you want moved, then mark the invite as sent in Cap.
-4. Cap inventories the source, maps owners and spaces, imports in batches, and checks the destination. The dashboard shows **In progress** while this is underway.
-5. If a video needs separate access or another detail, the dashboard shows **Information needed** with Cap's exact request. Reply there so the migration can continue.
-6. Cap marks **Migration complete** only after the agreed source count and imported library are reconciled and checked. Keep Loom available until that confirmation.
+1. Open **Dashboard > Import > Loom** in the Cap organization you are moving to, then choose **Request migration**.
+2. Invite [hello@cap.so](mailto:hello@cap.so) to your Loom workspace with access and download permission for the videos you want moved, then choose **I've sent the invite**.
+3. Cap inventories the source, maps owners and spaces, imports in batches, and checks the destination.
+4. If a video needs separate access or another detail, the Loom import page shows Cap's exact request. Reply there so the migration can continue.
+5. Cap marks the migration complete only after the agreed source count and imported library are reconciled and checked. Keep Loom available until that confirmation.
 
 Loom workspace membership may not expose private Library videos automatically. An account without Loom download rights also cannot export every video. Cap will ask for specific access when the workspace invite does not cover a source video.
 

From c8b86c546a87203295155995570d8817f9cdea49 Mon Sep 17 00:00:00 2001
From: Richie McIlroy <33632126+richiemcilroy@users.noreply.github.com>
Date: Wed, 21 Oct 2026 03:31:23 +0800
Subject: [PATCH 74/74] fix: bill Signed BAA in the customer's currency and
 surface real errors instead of React #441

---
 .../__tests__/unit/signed-baa-card.test.ts    |   9 +-
 apps/web/__tests__/unit/signed-baa.test.ts    | 111 ++++++++++++----
 apps/web/actions/organization/signed-baa.ts   | 122 ++++++++++++------
 .../organization/components/SignedBaaCard.tsx |  10 +-
 4 files changed, 178 insertions(+), 74 deletions(-)

diff --git a/apps/web/__tests__/unit/signed-baa-card.test.ts b/apps/web/__tests__/unit/signed-baa-card.test.ts
index 2a71b78f169..4cba9556995 100644
--- a/apps/web/__tests__/unit/signed-baa-card.test.ts
+++ b/apps/web/__tests__/unit/signed-baa-card.test.ts
@@ -422,11 +422,10 @@ describe("Signed BAA payment and signing", () => {
 
 	it("refreshes payment status after a failed purchase instead of offering another charge", async () => {
 		vi.mocked(getSignedBaaStatus).mockResolvedValue(createStatus({ details }));
-		vi.mocked(purchaseSignedBaa).mockRejectedValue(
-			new Error(
-				"The payment succeeded but the agreement could not be completed.",
-			),
-		);
+		vi.mocked(purchaseSignedBaa).mockResolvedValue({
+			success: false,
+			error: "The payment succeeded but the agreement could not be completed.",
+		});
 		await render();
 		await waitFor(() => expect(button("Get Signed BAA")?.disabled).toBe(false));
 		await click("Get Signed BAA");
diff --git a/apps/web/__tests__/unit/signed-baa.test.ts b/apps/web/__tests__/unit/signed-baa.test.ts
index 2a0320ef10a..6d23bc24520 100644
--- a/apps/web/__tests__/unit/signed-baa.test.ts
+++ b/apps/web/__tests__/unit/signed-baa.test.ts
@@ -103,6 +103,11 @@ vi.mock("@/lib/baa/generate-signed-baa-pdf", () => ({
 
 const mockGetCurrentUser = getCurrentUser as ReturnType<typeof vi.fn>;
 
+const failedWith = (message: string) => ({
+	success: false,
+	error: expect.stringContaining(message),
+});
+
 function resetMockDb() {
 	for (const key of Object.keys(mockDb)) {
 		const fn = mockDb[key as keyof typeof mockDb];
@@ -185,7 +190,7 @@ describe("Signed BAA entitlement", () => {
 				noticesEmail: "legal@acme.com",
 				signatureDataUrl: `data:image/png;base64,${"A".repeat(200)}`,
 			}),
-		).rejects.toThrow("active Cap Pro subscription");
+		).resolves.toEqual(failedWith("active Cap Pro subscription"));
 		expect(mockStripe.subscriptions.create).not.toHaveBeenCalled();
 	});
 
@@ -220,7 +225,7 @@ describe("Signed BAA entitlement", () => {
 				noticesEmail: "legal@acme.com",
 				signatureDataUrl: `data:image/png;base64,${"A".repeat(200)}`,
 			}),
-		).rejects.toThrow("active Cap Pro subscription");
+		).resolves.toEqual(failedWith("active Cap Pro subscription"));
 		expect(mockStripe.subscriptions.create).not.toHaveBeenCalled();
 	});
 
@@ -248,7 +253,7 @@ describe("Signed BAA entitlement", () => {
 				noticesEmail: "legal@acme.com",
 				signatureDataUrl: `data:image/png;base64,${"A".repeat(200)}`,
 			}),
-		).rejects.toThrow("active Cap Pro subscription");
+		).resolves.toEqual(failedWith("active Cap Pro subscription"));
 		expect(mockStripe.subscriptions.create).not.toHaveBeenCalled();
 	});
 
@@ -267,7 +272,7 @@ describe("Signed BAA entitlement", () => {
 		);
 		await expect(
 			purchaseSignedBaa("org-1" as never, VALID_INPUT),
-		).rejects.toThrow("active Cap Pro subscription");
+		).resolves.toEqual(failedWith("active Cap Pro subscription"));
 		expect(mockStripe.subscriptions.create).not.toHaveBeenCalled();
 		expect(mockStripe.subscriptions.cancel).not.toHaveBeenCalled();
 		expect(mockDb.update).not.toHaveBeenCalled();
@@ -315,9 +320,14 @@ describe("Signed BAA Stripe recovery", () => {
 	beforeEach(() => {
 		vi.clearAllMocks();
 		resetMockDb();
+		mockStripe.customers.retrieve.mockReset().mockResolvedValue({
+			id: "cus_1",
+			currency: "usd",
+			invoice_settings: {},
+		});
 	});
 
-	it("uses a stable Stripe idempotency key for the record", async () => {
+	it("scopes the Stripe idempotency key to the purchase claim", async () => {
 		await setupPurchaseAttempt();
 		mockStripe.subscriptions.list.mockResolvedValue({ data: [] });
 		mockStripe.subscriptions.create.mockResolvedValue(recoveredSubscription);
@@ -331,10 +341,53 @@ describe("Signed BAA Stripe recovery", () => {
 			expect.objectContaining({
 				customer: "cus_1",
 			}),
-			{ idempotencyKey: "signed-baa-baa-record-1" },
+			{
+				idempotencyKey: expect.stringMatching(/^signed-baa-baa-record-1-\d+$/),
+			},
 		);
 	});
 
+	it("bills the BAA in the customer's existing currency", async () => {
+		await setupPurchaseAttempt();
+		mockStripe.customers.retrieve.mockResolvedValue({
+			id: "cus_1",
+			currency: "eur",
+			invoice_settings: {},
+		});
+		mockStripe.subscriptions.list.mockResolvedValue({ data: [] });
+		mockStripe.subscriptions.create.mockResolvedValue(recoveredSubscription);
+		const { purchaseSignedBaa } = await import(
+			"@/actions/organization/signed-baa"
+		);
+
+		await expect(
+			purchaseSignedBaa("org-1" as never, VALID_INPUT),
+		).resolves.toEqual({ success: true, emailSent: true });
+
+		expect(mockStripe.subscriptions.create).toHaveBeenCalledWith(
+			expect.objectContaining({ currency: "eur" }),
+			expect.anything(),
+		);
+	});
+
+	it("returns a generic message instead of leaking unexpected errors", async () => {
+		await setupPurchaseAttempt();
+		mockDb.limit.mockReset();
+		mockDb.limit
+			.mockResolvedValueOnce([{ id: "org-1", ownerId: "owner-1" }])
+			.mockRejectedValueOnce(
+				new Error("Deadlock found when trying to get lock"),
+			);
+		const { purchaseSignedBaa } = await import(
+			"@/actions/organization/signed-baa"
+		);
+
+		const result = await purchaseSignedBaa("org-1" as never, VALID_INPUT);
+
+		expect(result).toEqual(failedWith("couldn't complete your Signed BAA"));
+		expect(JSON.stringify(result)).not.toContain("Deadlock");
+	});
+
 	it("activates an existing Stripe subscription after a lost create response", async () => {
 		await setupPurchaseAttempt();
 		mockStripe.subscriptions.list
@@ -370,7 +423,9 @@ describe("Signed BAA Stripe recovery", () => {
 
 		await expect(
 			purchaseSignedBaa("org-1" as never, VALID_INPUT),
-		).rejects.toThrow("couldn't confirm the Signed BAA subscription");
+		).resolves.toEqual(
+			failedWith("couldn't confirm the Signed BAA subscription"),
+		);
 		expect(mockDb.set).toHaveBeenCalledWith(
 			expect.objectContaining({ status: "pending" }),
 		);
@@ -452,7 +507,7 @@ describe("Signed BAA Stripe recovery", () => {
 		);
 		await expect(
 			purchaseSignedBaa("org-1" as never, VALID_INPUT),
-		).rejects.toThrow("Cap Pro ended");
+		).resolves.toEqual(failedWith("Cap Pro ended"));
 		expect(mockStripe.subscriptions.cancel).toHaveBeenCalledWith(
 			recoveredSubscription.id,
 		);
@@ -498,7 +553,7 @@ describe("Signed BAA Stripe recovery", () => {
 		);
 		await expect(
 			purchaseSignedBaa("org-1" as never, VALID_INPUT),
-		).rejects.toThrow("couldn't confirm");
+		).resolves.toEqual(failedWith("couldn't confirm"));
 		expect(mockDb.set).toHaveBeenCalledWith({ status: "paid" });
 		expect(mockDb.set).not.toHaveBeenCalledWith({ status: "pending" });
 	});
@@ -519,7 +574,7 @@ describe("Signed BAA Stripe recovery", () => {
 		);
 		await expect(
 			purchaseSignedBaa("org-1" as never, VALID_INPUT),
-		).rejects.toThrow("changed while confirming");
+		).resolves.toEqual(failedWith("changed while confirming"));
 		expect(mockStripe.subscriptions.cancel).toHaveBeenCalledExactlyOnceWith(
 			recoveredSubscription.id,
 		);
@@ -733,8 +788,8 @@ describe("Paid BAA signing", () => {
 				stripeSubscriptionId: "12345",
 			},
 		);
-		await expect(signPaidBaa("org-1" as never, VALID_INPUT)).rejects.toThrow(
-			"active Cap Pro subscription",
+		await expect(signPaidBaa("org-1" as never, VALID_INPUT)).resolves.toEqual(
+			failedWith("active Cap Pro subscription"),
 		);
 		expect(mockDb.update).not.toHaveBeenCalled();
 		expect(mockStripe.subscriptions.create).not.toHaveBeenCalled();
@@ -754,8 +809,8 @@ describe("Paid BAA signing", () => {
 			},
 			{ stripeSubscriptionId: "12345" },
 		);
-		await expect(signPaidBaa("org-1" as never, VALID_INPUT)).rejects.toThrow(
-			"active Cap Pro subscription",
+		await expect(signPaidBaa("org-1" as never, VALID_INPUT)).resolves.toEqual(
+			failedWith("active Cap Pro subscription"),
 		);
 		expect(mockDb.update).not.toHaveBeenCalled();
 		expect(mockStripe.subscriptions.create).not.toHaveBeenCalled();
@@ -770,8 +825,8 @@ describe("Paid BAA signing", () => {
 			},
 			{ stripeSubscriptionId: "12345" },
 		);
-		await expect(signPaidBaa("org-1" as never, VALID_INPUT)).rejects.toThrow(
-			"payment is not confirmed",
+		await expect(signPaidBaa("org-1" as never, VALID_INPUT)).resolves.toEqual(
+			failedWith("payment is not confirmed"),
 		);
 		expect(mockDb.update).not.toHaveBeenCalled();
 		expect(mockStripe.subscriptions.create).not.toHaveBeenCalled();
@@ -786,8 +841,8 @@ describe("Paid BAA signing", () => {
 				{ ...waivedSubscription, status },
 				{ stripeSubscriptionId: "12345" },
 			);
-			await expect(signPaidBaa("org-1" as never, VALID_INPUT)).rejects.toThrow(
-				"payment is not confirmed",
+			await expect(signPaidBaa("org-1" as never, VALID_INPUT)).resolves.toEqual(
+				failedWith("payment is not confirmed"),
 			);
 			expect(mockDb.update).not.toHaveBeenCalled();
 			expect(mockStripe.subscriptions.create).not.toHaveBeenCalled();
@@ -860,8 +915,8 @@ describe("Paid BAA signing", () => {
 	it("keeps payment when the new signature cannot generate a PDF", async () => {
 		const { signPaidBaa } = await setupPaidSigning();
 		vi.mocked(generateSignedBaaPdf).mockRejectedValueOnce(new Error("bad PNG"));
-		await expect(signPaidBaa("org-1" as never, VALID_INPUT)).rejects.toThrow(
-			"generate the agreement",
+		await expect(signPaidBaa("org-1" as never, VALID_INPUT)).resolves.toEqual(
+			failedWith("generate the agreement"),
 		);
 		expect(mockDb.set).toHaveBeenCalledWith({ status: "paid" });
 		expect(mockStripe.subscriptions.create).not.toHaveBeenCalled();
@@ -873,8 +928,8 @@ describe("Paid BAA signing", () => {
 			status: "pending",
 			stripeSubscriptionId: null,
 		});
-		await expect(signPaidBaa("org-1" as never, VALID_INPUT)).rejects.toThrow(
-			"confirmed BAA payment is required",
+		await expect(signPaidBaa("org-1" as never, VALID_INPUT)).resolves.toEqual(
+			failedWith("confirmed BAA payment is required"),
 		);
 		expect(mockStripe.subscriptions.create).not.toHaveBeenCalled();
 		expect(mockDb.update).not.toHaveBeenCalled();
@@ -887,8 +942,8 @@ describe("Paid BAA signing", () => {
 			...paidSubscription,
 			status: "canceled",
 		});
-		await expect(signPaidBaa("org-1" as never, VALID_INPUT)).rejects.toThrow(
-			"payment is not confirmed",
+		await expect(signPaidBaa("org-1" as never, VALID_INPUT)).resolves.toEqual(
+			failedWith("payment is not confirmed"),
 		);
 		expect(mockStripe.subscriptions.create).not.toHaveBeenCalled();
 	});
@@ -901,8 +956,8 @@ describe("Paid BAA signing", () => {
 			.mockReturnValueOnce({ affectedRows: 1 })
 			.mockReturnValueOnce({ affectedRows: 1 })
 			.mockReturnValueOnce({ affectedRows: 0 });
-		await expect(signPaidBaa("org-1" as never, VALID_INPUT)).rejects.toThrow(
-			"changed while signing",
+		await expect(signPaidBaa("org-1" as never, VALID_INPUT)).resolves.toEqual(
+			failedWith("changed while signing"),
 		);
 		expect(sendEmail).not.toHaveBeenCalled();
 	});
@@ -929,8 +984,8 @@ describe("Paid BAA signing", () => {
 			.mockReturnValueOnce(mockDb)
 			.mockReturnValueOnce(mockDb)
 			.mockReturnValueOnce({ affectedRows: 0 });
-		await expect(signPaidBaa("org-1" as never, VALID_INPUT)).rejects.toThrow(
-			"already in progress",
+		await expect(signPaidBaa("org-1" as never, VALID_INPUT)).resolves.toEqual(
+			failedWith("already in progress"),
 		);
 		expect(mockDb.where).toHaveBeenCalledWith([
 			{ field: "signedBaaId", value: "baa-record-1" },
diff --git a/apps/web/actions/organization/signed-baa.ts b/apps/web/actions/organization/signed-baa.ts
index 2b00763176e..f5a8c5bcddd 100644
--- a/apps/web/actions/organization/signed-baa.ts
+++ b/apps/web/actions/organization/signed-baa.ts
@@ -40,6 +40,10 @@ const CAP_PRO_STATUSES = new Set([
 	"past_due",
 ]);
 
+// Production server actions replace thrown messages with a generic React error,
+// so customer-facing failures are thrown as this type and returned as results.
+class SignedBaaError extends Error {}
+
 function ownerCanPurchaseSignedBaa(user: {
 	stripeCustomerId?: string | null;
 	stripeSubscriptionStatus?: string | null;
@@ -84,7 +88,7 @@ function getBaaPriceId() {
 		serverEnv().VERCEL_ENV === "production" ? "production" : "development";
 	const priceId = STRIPE_SIGNED_BAA_PRICE_IDS[environment];
 	if (!priceId || priceId.includes("REPLACE")) {
-		throw new Error(
+		throw new SignedBaaError(
 			"Signed BAA billing is not configured. Please contact support.",
 		);
 	}
@@ -93,7 +97,7 @@ function getBaaPriceId() {
 
 async function getOwnerContext(organizationId: Organisation.OrganisationId) {
 	const user = await getCurrentUser();
-	if (!user) throw new Error("Unauthorized");
+	if (!user) throw new SignedBaaError("Unauthorized");
 
 	const [organization] = await db()
 		.select()
@@ -101,9 +105,11 @@ async function getOwnerContext(organizationId: Organisation.OrganisationId) {
 		.where(eq(organizations.id, organizationId))
 		.limit(1);
 
-	if (!organization) throw new Error("Organization not found");
+	if (!organization) throw new SignedBaaError("Organization not found");
 	if (organization.ownerId !== user.id)
-		throw new Error("Only the organization owner can manage the Signed BAA");
+		throw new SignedBaaError(
+			"Only the organization owner can manage the Signed BAA",
+		);
 
 	return { user, organization };
 }
@@ -166,7 +172,9 @@ export async function confirmSignedBaaPayment(
 ): Promise<SignedBaaStatus> {
 	const { user } = await getOwnerContext(organizationId);
 	if (!sessionId.startsWith("cs_") || sessionId.length > 255) {
-		throw new Error("Invalid payment confirmation. Please contact support.");
+		throw new SignedBaaError(
+			"Invalid payment confirmation. Please contact support.",
+		);
 	}
 	const session = await stripe().checkout.sessions.retrieve(sessionId);
 	const subscriptionId =
@@ -174,7 +182,7 @@ export async function confirmSignedBaaPayment(
 			? session.subscription
 			: session.subscription?.id;
 	if (!subscriptionId) {
-		throw new Error("No BAA subscription was found for this payment.");
+		throw new SignedBaaError("No BAA subscription was found for this payment.");
 	}
 	const subscription = await stripe().subscriptions.retrieve(subscriptionId);
 	const record = await attachPaidBaaCheckout(session, subscription, {
@@ -182,7 +190,7 @@ export async function confirmSignedBaaPayment(
 		organizationId,
 	});
 	if (!record) {
-		throw new Error(
+		throw new SignedBaaError(
 			"We couldn't confirm a paid BAA for this organization. Please retry once payment completes, or contact support. Do not pay again.",
 		);
 	}
@@ -206,7 +214,9 @@ function validateInput(input: SignedBaaInput) {
 
 	const requireLength = (value: string, label: string, max: number) => {
 		if (value.length < 2 || value.length > max) {
-			throw new Error(`${label} must be between 2 and ${max} characters`);
+			throw new SignedBaaError(
+				`${label} must be between 2 and ${max} characters`,
+			);
 		}
 	};
 
@@ -219,21 +229,21 @@ function validateInput(input: SignedBaaInput) {
 		!EMAIL_REGEX.test(trimmed.noticesEmail) ||
 		trimmed.noticesEmail.length > 255
 	) {
-		throw new Error("Please provide a valid notices email address");
+		throw new SignedBaaError("Please provide a valid notices email address");
 	}
 	if (
 		!trimmed.signatureDataUrl.startsWith(SIGNATURE_PREFIX) ||
 		trimmed.signatureDataUrl.length < 200 ||
 		trimmed.signatureDataUrl.length > 700_000
 	) {
-		throw new Error("Please provide a valid signature");
+		throw new SignedBaaError("Please provide a valid signature");
 	}
 
 	return trimmed;
 }
 
 async function resolvePaymentMethod(
-	customerId: string,
+	customer: Stripe.Customer | Stripe.DeletedCustomer,
 	proSubscriptionId: string | null,
 ): Promise<{ paymentMethod?: string }> {
 	if (proSubscriptionId) {
@@ -249,7 +259,6 @@ async function resolvePaymentMethod(
 		}
 	}
 
-	const customer = await stripe().customers.retrieve(customerId);
 	if (!customer.deleted) {
 		const invoiceDefault = customer.invoice_settings?.default_payment_method;
 		// A customer-level default (payment method or legacy source) is applied
@@ -258,14 +267,14 @@ async function resolvePaymentMethod(
 	}
 
 	const methods = await stripe().paymentMethods.list({
-		customer: customerId,
+		customer: customer.id,
 		type: "card",
 		limit: 1,
 	});
 	const method = methods.data[0];
 	if (method) return { paymentMethod: method.id };
 
-	throw new Error(
+	throw new SignedBaaError(
 		"No payment method on file. Add a card via Manage Billing first, then try again.",
 	);
 }
@@ -292,15 +301,17 @@ async function findExistingBaaSubscription(
 function throwSignedBaaStripeError(error: unknown): never {
 	const stripeError = error as { type?: string; message?: string };
 	if (stripeError.type === "StripeCardError") {
-		throw new Error(
+		throw new SignedBaaError(
 			`Your card was declined: ${stripeError.message ?? "payment failed"}. No subscription was started.`,
 		);
 	}
 	if (error instanceof Error && error.message.includes("payment method")) {
-		throw error;
+		throw error instanceof SignedBaaError
+			? error
+			: new SignedBaaError(error.message);
 	}
 	console.error("Signed BAA: subscription creation failed", error);
-	throw new Error(
+	throw new SignedBaaError(
 		"We couldn't confirm the Signed BAA subscription. Please try again or contact support if you were charged.",
 	);
 }
@@ -310,6 +321,7 @@ async function createBaaSubscription({
 	organizationId,
 	userId,
 	recordId,
+	claimedAt,
 	proSubscriptionId,
 	priceId,
 }: {
@@ -317,6 +329,7 @@ async function createBaaSubscription({
 	organizationId: string;
 	userId: string;
 	recordId: string;
+	claimedAt: Date;
 	proSubscriptionId: string | null;
 	priceId: string;
 }): Promise<Stripe.Subscription> {
@@ -326,14 +339,19 @@ async function createBaaSubscription({
 	);
 	if (existing) return existing;
 
+	const customer = await stripe().customers.retrieve(customerId);
 	const { paymentMethod } = await resolvePaymentMethod(
-		customerId,
+		customer,
 		proSubscriptionId,
 	);
+	// Stripe bills new subscriptions in the price's default currency (USD)
+	// unless told otherwise, which a customer already billed in EUR/GBP rejects.
+	const currency = customer.deleted ? null : customer.currency;
 	return stripe().subscriptions.create(
 		{
 			customer: customerId,
 			items: [{ price: priceId, quantity: 1 }],
+			...(currency ? { currency } : {}),
 			...(paymentMethod ? { default_payment_method: paymentMethod } : {}),
 			payment_behavior: "error_if_incomplete",
 			metadata: {
@@ -342,22 +360,46 @@ async function createBaaSubscription({
 				userId,
 			},
 		},
-		{ idempotencyKey: `signed-baa-${recordId}` },
+		// Scoped to the claim so a failed attempt's stored Stripe error isn't
+		// replayed on retry; findExistingBaaSubscription covers lost responses.
+		{ idempotencyKey: `signed-baa-${recordId}-${claimedAt.getTime()}` },
 	);
 }
 
+export type SignedBaaResult =
+	| { success: true; emailSent: boolean }
+	| { success: false; error: string };
+
+async function toSignedBaaResult(
+	complete: Promise<{ success: true; emailSent: boolean }>,
+): Promise<SignedBaaResult> {
+	try {
+		return await complete;
+	} catch (error) {
+		if (error instanceof SignedBaaError) {
+			return { success: false, error: error.message };
+		}
+		console.error("Signed BAA: unexpected failure", error);
+		return {
+			success: false,
+			error:
+				"We couldn't complete your Signed BAA. Please try again or contact hello@cap.so.",
+		};
+	}
+}
+
 export async function purchaseSignedBaa(
 	organizationId: Organisation.OrganisationId,
 	input: SignedBaaInput,
-): Promise<{ success: true; emailSent: boolean }> {
-	return completeSignedBaa(organizationId, input, false);
+): Promise<SignedBaaResult> {
+	return toSignedBaaResult(completeSignedBaa(organizationId, input, false));
 }
 
 export async function signPaidBaa(
 	organizationId: Organisation.OrganisationId,
 	input: SignedBaaInput,
-): Promise<{ success: true; emailSent: boolean }> {
-	return completeSignedBaa(organizationId, input, true);
+): Promise<SignedBaaResult> {
+	return toSignedBaaResult(completeSignedBaa(organizationId, input, true));
 }
 
 async function completeSignedBaa(
@@ -377,7 +419,9 @@ async function completeSignedBaa(
 		.limit(1);
 
 	if (existing?.status === "active" && existing.emailSentAt) {
-		throw new Error("A Signed BAA is already active for this organization.");
+		throw new SignedBaaError(
+			"A Signed BAA is already active for this organization.",
+		);
 	}
 	let paidSubscription: Stripe.Subscription | null = null;
 	if (existing?.stripeSubscriptionId && existing.status !== "canceled") {
@@ -392,13 +436,15 @@ async function completeSignedBaa(
 				existing.status !== "paid" &&
 				!hasPaidBaaInvoice(paidSubscription))
 		) {
-			throw new Error(
+			throw new SignedBaaError(
 				"The existing BAA payment is not confirmed. Please contact support; no additional payment was taken.",
 			);
 		}
 	}
 	if (requirePaid && !paidSubscription) {
-		throw new Error("A confirmed BAA payment is required before signing.");
+		throw new SignedBaaError(
+			"A confirmed BAA payment is required before signing.",
+		);
 	}
 
 	const proRequirementWaived =
@@ -411,7 +457,7 @@ async function completeSignedBaa(
 			!user.stripeSubscriptionId ||
 			!ownerCanPurchaseSignedBaa(user)
 		) {
-			throw new Error(
+			throw new SignedBaaError(
 				"Your organization needs an active Cap Pro subscription before adding the Signed BAA add-on.",
 			);
 		}
@@ -422,7 +468,7 @@ async function completeSignedBaa(
 				user.stripeSubscriptionId,
 			);
 		} catch {
-			throw new Error(
+			throw new SignedBaaError(
 				"Your organization needs an active Cap Pro subscription before adding the Signed BAA add-on.",
 			);
 		}
@@ -430,7 +476,7 @@ async function completeSignedBaa(
 			!CAP_PRO_STATUSES.has(liveProSubscription.status) ||
 			!isProSubscription(liveProSubscription)
 		) {
-			throw new Error(
+			throw new SignedBaaError(
 				"Your organization needs an active Cap Pro subscription before adding the Signed BAA add-on.",
 			);
 		}
@@ -476,7 +522,7 @@ async function completeSignedBaa(
 				),
 			);
 		if (getAffectedRows(claim) === 0) {
-			throw new Error(
+			throw new SignedBaaError(
 				"A Signed BAA purchase is already in progress. Please wait a moment and refresh.",
 			);
 		}
@@ -494,7 +540,7 @@ async function completeSignedBaa(
 					...recordFields,
 				});
 		} catch {
-			throw new Error(
+			throw new SignedBaaError(
 				"A Signed BAA purchase is already in progress. Please wait a moment and refresh.",
 			);
 		}
@@ -562,7 +608,7 @@ async function completeSignedBaa(
 	} catch (error) {
 		console.error("Signed BAA: PDF generation failed", error);
 		await revertToPending();
-		throw new Error(
+		throw new SignedBaaError(
 			"We couldn't generate the agreement from your signature. Please clear the signature and try again.",
 		);
 	}
@@ -575,6 +621,7 @@ async function completeSignedBaa(
 				organizationId,
 				userId: user.id,
 				recordId,
+				claimedAt,
 				proSubscriptionId: user.stripeSubscriptionId,
 				priceId,
 			});
@@ -585,6 +632,7 @@ async function completeSignedBaa(
 					organizationId,
 					userId: user.id,
 					recordId,
+					claimedAt,
 					proSubscriptionId: user.stripeSubscriptionId,
 					priceId,
 				});
@@ -597,7 +645,7 @@ async function completeSignedBaa(
 
 	if (!subscription) {
 		await revertToPending();
-		throw new Error(
+		throw new SignedBaaError(
 			"We couldn't confirm the Signed BAA subscription. Please try again or contact support if you were charged.",
 		);
 	}
@@ -636,13 +684,13 @@ async function completeSignedBaa(
 			current.status !== "processing" ||
 			current.updatedAt.getTime() !== claimedAt.getTime()
 		) {
-			throw new Error(
+			throw new SignedBaaError(
 				"The BAA changed while confirming payment. Please refresh or contact support; do not pay again.",
 			);
 		}
 	}
 	if (!(await ensureBaaHasPro(user, subscription, recordIdentity))) {
-		throw new Error(
+		throw new SignedBaaError(
 			"Cap Pro ended before the BAA could be signed. The BAA subscription has been canceled; please contact support about your payment.",
 		);
 	}
@@ -664,7 +712,7 @@ async function completeSignedBaa(
 		);
 	if (getAffectedRows(finalized) === 0) {
 		await cancelIfUnlinked();
-		throw new Error(
+		throw new SignedBaaError(
 			"The BAA changed while signing. Please refresh or contact support; do not pay again.",
 		);
 	}
@@ -698,7 +746,7 @@ async function completeSignedBaa(
 				idempotencyKey: `signed-baa-email-${recordId}`,
 			});
 			if (!delivery?.data?.id || delivery.error) {
-				throw new Error(
+				throw new SignedBaaError(
 					delivery?.error?.message ??
 						"The email provider did not confirm delivery.",
 				);
diff --git a/apps/web/app/(org)/dashboard/settings/organization/components/SignedBaaCard.tsx b/apps/web/app/(org)/dashboard/settings/organization/components/SignedBaaCard.tsx
index 018cea81f9a..ef9905ff188 100644
--- a/apps/web/app/(org)/dashboard/settings/organization/components/SignedBaaCard.tsx
+++ b/apps/web/app/(org)/dashboard/settings/organization/components/SignedBaaCard.tsx
@@ -148,7 +148,7 @@ function SignedBaaCardContent() {
 		(!isPaid && !canPurchase);
 
 	const signatureMutation = useMutation({
-		mutationFn: () => {
+		mutationFn: async () => {
 			if (!organizationId) throw new Error("No organization");
 			if (actionsBlocked) throw new Error("Please wait for your BAA status.");
 			if (!signatureDataUrl) throw new Error("Please add your signature");
@@ -156,9 +156,11 @@ function SignedBaaCardContent() {
 				...form,
 				signatureDataUrl,
 			};
-			return isPaid
-				? signPaidBaa(organizationId, input)
-				: purchaseSignedBaa(organizationId, input);
+			const result = isPaid
+				? await signPaidBaa(organizationId, input)
+				: await purchaseSignedBaa(organizationId, input);
+			if (!result.success) throw new Error(result.error);
+			return result;
 		},
 		onSuccess: (result) => {
 			toast.success(