From ab9e0727405562e54a5ba7390a33c0e92e04acbd Mon Sep 17 00:00:00 2001
From: Oscar Beaumont <oscar@otbeaumont.me>
Date: Thu, 25 Sep 2025 10:40:38 +0800
Subject: [PATCH 01/27] wip

---
 apps/web/actions/video/upload.ts                          | 3 +++
 .../(org)/dashboard/caps/components/UploadCapButton.tsx   | 8 +++++++-
 apps/web/app/api/desktop/[...route]/video.ts              | 6 ++----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/apps/web/actions/video/upload.ts b/apps/web/actions/video/upload.ts
index 2bfa2f541..69583d12d 100644
--- a/apps/web/actions/video/upload.ts
+++ b/apps/web/actions/video/upload.ts
@@ -164,6 +164,7 @@ export async function createVideoAndGetUploadUrl({
 	isScreenshot = false,
 	isUpload = false,
 	folderId,
+	orgId: orgId,
 }: {
 	videoId?: Video.VideoId;
 	duration?: number;
@@ -173,6 +174,7 @@ export async function createVideoAndGetUploadUrl({
 	isScreenshot?: boolean;
 	isUpload?: boolean;
 	folderId?: Folder.FolderId;
+	orgId: string;
 }) {
 	const user = await getCurrentUser();
 
@@ -228,6 +230,7 @@ export async function createVideoAndGetUploadUrl({
 				isScreenshot ? "Screenshot" : isUpload ? "Upload" : "Recording"
 			} - ${formattedDate}`,
 			ownerId: user.id,
+			orgId: orgId,
 			source: { type: "desktopMP4" as const },
 			isScreenshot,
 			bucket: customBucket?.id,
diff --git a/apps/web/app/(org)/dashboard/caps/components/UploadCapButton.tsx b/apps/web/app/(org)/dashboard/caps/components/UploadCapButton.tsx
index 80931b4c3..8d5c5c8aa 100644
--- a/apps/web/app/(org)/dashboard/caps/components/UploadCapButton.tsx
+++ b/apps/web/app/(org)/dashboard/caps/components/UploadCapButton.tsx
@@ -27,7 +27,7 @@ export const UploadCapButton = ({
 	grey?: boolean;
 	folderId?: Folder.FolderId;
 }) => {
-	const { user } = useDashboardContext();
+	const { user, activeOrganization } = useDashboardContext();
 	const inputRef = useRef<HTMLInputElement>(null);
 	const { uploadingStore, setUploadStatus } = useUploadingContext();
 	const isUploading = useStore(uploadingStore, (s) => !!s.uploadStatus);
@@ -52,9 +52,13 @@ export const UploadCapButton = ({
 		const file = e.target.files?.[0];
 		if (!file || !user) return;
 
+		// This should be unreachable.
+		if (activeOrganization === null) alert("No organization active!");
+
 		const ok = await legacyUploadCap(
 			file,
 			folderId,
+			activeOrganization.organization.id,
 			setUploadStatus,
 			queryClient,
 		);
@@ -93,6 +97,7 @@ export const UploadCapButton = ({
 async function legacyUploadCap(
 	file: File,
 	folderId: Folder.FolderId | undefined,
+	orgId: string,
 	setUploadStatus: (state: UploadStatus | undefined) => void,
 	queryClient: QueryClient,
 ) {
@@ -127,6 +132,7 @@ async function legacyUploadCap(
 			isScreenshot: false,
 			isUpload: true,
 			folderId,
+			orgId,
 		});
 
 		const uploadId = videoData.id;
diff --git a/apps/web/app/api/desktop/[...route]/video.ts b/apps/web/app/api/desktop/[...route]/video.ts
index 29a007422..21b84e94d 100644
--- a/apps/web/app/api/desktop/[...route]/video.ts
+++ b/apps/web/app/api/desktop/[...route]/video.ts
@@ -71,8 +71,6 @@ app.get(
 				.from(s3Buckets)
 				.where(eq(s3Buckets.ownerId, user.id));
 
-			console.log("User bucket:", customBucket ? "found" : "not found");
-
 			const date = new Date();
 			const formattedDate = `${date.getDate()} ${date.toLocaleString(
 				"default",
@@ -85,7 +83,7 @@ app.get(
 					.from(videos)
 					.where(eq(videos.id, Video.VideoId.make(videoId)));
 
-				if (video) {
+				if (video)
 					return c.json({
 						id: video.id,
 						// All deprecated
@@ -93,7 +91,6 @@ app.get(
 						aws_region: "n/a",
 						aws_bucket: "n/a",
 					});
-				}
 			}
 
 			const idToUse = Video.VideoId.make(nanoId());
@@ -108,6 +105,7 @@ app.get(
 					id: idToUse,
 					name: videoName,
 					ownerId: user.id,
+					orgId: undefined,
 					source:
 						recordingMode === "hls"
 							? { type: "local" as const }

From c501a4252eaf2129af8e57bf02018c7f1f2fe655 Mon Sep 17 00:00:00 2001
From: Oscar Beaumont <oscar@otbeaumont.me>
Date: Thu, 25 Sep 2025 20:49:45 +1000
Subject: [PATCH 02/27] wip

---
 .../(org)/dashboard/settings/account/Settings.tsx   | 13 +++++++++++++
 packages/database/schema.ts                         |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/apps/web/app/(org)/dashboard/settings/account/Settings.tsx b/apps/web/app/(org)/dashboard/settings/account/Settings.tsx
index e97793dfe..47b8e5dfb 100644
--- a/apps/web/app/(org)/dashboard/settings/account/Settings.tsx
+++ b/apps/web/app/(org)/dashboard/settings/account/Settings.tsx
@@ -91,6 +91,19 @@ export const Settings = ({
 						disabled
 					/>
 				</Card>
+				<Card className="flex flex-col flex-1 gap-4 justify-between items-stretch">
+					<div className="space-y-1">
+						<CardTitle>Default organization</CardTitle>
+						<CardDescription>This is the default organization</CardDescription>
+					</div>
+					{/*<Input
+						type="email"
+						value={user?.email as string}
+						id="contactEmail"
+						name="contactEmail"
+						disabled
+					/>*/}
+				</Card>
 			</div>
 			<Button
 				disabled={!firstName || updateNamePending}
diff --git a/packages/database/schema.ts b/packages/database/schema.ts
index ccf63a2cc..58486b22c 100644
--- a/packages/database/schema.ts
+++ b/packages/database/schema.ts
@@ -11,7 +11,6 @@ import {
 	primaryKey,
 	text,
 	timestamp,
-	tinyint,
 	uniqueIndex,
 	varchar,
 } from "drizzle-orm/mysql-core";
@@ -89,6 +88,7 @@ export const users = mysqlTable(
 		onboarding_completed_at: timestamp("onboarding_completed_at"),
 		customBucket: nanoIdNullable("customBucket"),
 		inviteQuota: int("inviteQuota").notNull().default(1),
+		defaultOrgId: nanoId("defaultOrgId"),
 	},
 	(table) => ({
 		emailIndex: uniqueIndex("email_idx").on(table.email),

From 52729f4ac569e5fdaba421c215c79edb5219779b Mon Sep 17 00:00:00 2001
From: Oscar Beaumont <oscar@otbeaumont.me>
Date: Thu, 25 Sep 2025 20:52:52 +1000
Subject: [PATCH 03/27] wip

---
 .../web/app/(org)/dashboard/settings/account/Settings.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/web/app/(org)/dashboard/settings/account/Settings.tsx b/apps/web/app/(org)/dashboard/settings/account/Settings.tsx
index 47b8e5dfb..e8d713934 100644
--- a/apps/web/app/(org)/dashboard/settings/account/Settings.tsx
+++ b/apps/web/app/(org)/dashboard/settings/account/Settings.tsx
@@ -6,15 +6,17 @@ import { useMutation } from "@tanstack/react-query";
 import { useRouter } from "next/navigation";
 import { useState } from "react";
 import { toast } from "sonner";
+import { useDashboardContext } from "../../Contexts";
 
 export const Settings = ({
 	user,
 }: {
 	user?: typeof users.$inferSelect | null;
 }) => {
+	const router = useRouter();
+	const { organizationData } = useDashboardContext();
 	const [firstName, setFirstName] = useState(user?.name || "");
 	const [lastName, setLastName] = useState(user?.lastName || "");
-	const router = useRouter();
 
 	const { mutate: updateName, isPending: updateNamePending } = useMutation({
 		mutationFn: async () => {
@@ -26,9 +28,7 @@ export const Settings = ({
 					lastName: lastName.trim() ? lastName.trim() : null,
 				}),
 			});
-			if (!res.ok) {
-				throw new Error("Failed to update name");
-			}
+			if (!res.ok) throw new Error("Failed to update name");
 		},
 		onSuccess: () => {
 			toast.success("Name updated successfully");

From 797fca5a5b319bbc203143ca0cca44643f335904 Mon Sep 17 00:00:00 2001
From: Oscar Beaumont <oscar@otbeaumont.me>
Date: Tue, 30 Sep 2025 21:00:03 +1000
Subject: [PATCH 04/27] configure default org id

---
 apps/web/actions/video/upload.ts              |  2 +-
 .../caps/components/UploadCapButton.tsx       |  5 +-
 .../dashboard/settings/account/Settings.tsx   | 48 ++++++++++++-------
 .../dashboard/settings/account/server.ts      | 24 ++++++++++
 4 files changed, 60 insertions(+), 19 deletions(-)
 create mode 100644 apps/web/app/(org)/dashboard/settings/account/server.ts

diff --git a/apps/web/actions/video/upload.ts b/apps/web/actions/video/upload.ts
index 69583d12d..3dbad5ada 100644
--- a/apps/web/actions/video/upload.ts
+++ b/apps/web/actions/video/upload.ts
@@ -230,7 +230,7 @@ export async function createVideoAndGetUploadUrl({
 				isScreenshot ? "Screenshot" : isUpload ? "Upload" : "Recording"
 			} - ${formattedDate}`,
 			ownerId: user.id,
-			orgId: orgId,
+			orgId,
 			source: { type: "desktopMP4" as const },
 			isScreenshot,
 			bucket: customBucket?.id,
diff --git a/apps/web/app/(org)/dashboard/caps/components/UploadCapButton.tsx b/apps/web/app/(org)/dashboard/caps/components/UploadCapButton.tsx
index 8d5c5c8aa..f91e4988e 100644
--- a/apps/web/app/(org)/dashboard/caps/components/UploadCapButton.tsx
+++ b/apps/web/app/(org)/dashboard/caps/components/UploadCapButton.tsx
@@ -53,7 +53,10 @@ export const UploadCapButton = ({
 		if (!file || !user) return;
 
 		// This should be unreachable.
-		if (activeOrganization === null) alert("No organization active!");
+		if (activeOrganization === null) {
+			alert("No organization active!");
+			return;
+		}
 
 		const ok = await legacyUploadCap(
 			file,
diff --git a/apps/web/app/(org)/dashboard/settings/account/Settings.tsx b/apps/web/app/(org)/dashboard/settings/account/Settings.tsx
index e8d713934..48a679b25 100644
--- a/apps/web/app/(org)/dashboard/settings/account/Settings.tsx
+++ b/apps/web/app/(org)/dashboard/settings/account/Settings.tsx
@@ -1,12 +1,20 @@
 "use client";
 
 import type { users } from "@cap/database/schema";
-import { Button, Card, CardDescription, CardTitle, Input } from "@cap/ui";
+import {
+	Button,
+	Card,
+	CardDescription,
+	CardTitle,
+	Input,
+	Select,
+} from "@cap/ui";
 import { useMutation } from "@tanstack/react-query";
 import { useRouter } from "next/navigation";
 import { useState } from "react";
 import { toast } from "sonner";
 import { useDashboardContext } from "../../Contexts";
+import { patchAccountSettings } from "./server";
 
 export const Settings = ({
 	user,
@@ -17,18 +25,17 @@ export const Settings = ({
 	const { organizationData } = useDashboardContext();
 	const [firstName, setFirstName] = useState(user?.name || "");
 	const [lastName, setLastName] = useState(user?.lastName || "");
+	const [defaultOrgId, setDefaultOrgId] = useState<string | undefined>(
+		user?.defaultOrgId,
+	);
 
 	const { mutate: updateName, isPending: updateNamePending } = useMutation({
 		mutationFn: async () => {
-			const res = await fetch("/api/settings/user/name", {
-				method: "POST",
-				headers: { "Content-Type": "application/json" },
-				body: JSON.stringify({
-					firstName: firstName.trim(),
-					lastName: lastName.trim() ? lastName.trim() : null,
-				}),
-			});
-			if (!res.ok) throw new Error("Failed to update name");
+			await patchAccountSettings(
+				firstName.trim(),
+				lastName.trim() ? lastName.trim() : undefined,
+				defaultOrgId,
+			);
 		},
 		onSuccess: () => {
 			toast.success("Name updated successfully");
@@ -96,13 +103,20 @@ export const Settings = ({
 						<CardTitle>Default organization</CardTitle>
 						<CardDescription>This is the default organization</CardDescription>
 					</div>
-					{/*<Input
-						type="email"
-						value={user?.email as string}
-						id="contactEmail"
-						name="contactEmail"
-						disabled
-					/>*/}
+
+					<Select
+						value={
+							defaultOrgId ??
+							user?.defaultOrgId ??
+							organizationData?.[0]?.organization.id ??
+							""
+						}
+						onChange={(value) => setDefaultOrgId(value)}
+						options={(organizationData || []).map((org) => ({
+							value: org.organization.id,
+							label: org.organization.name,
+						}))}
+					/>
 				</Card>
 			</div>
 			<Button
diff --git a/apps/web/app/(org)/dashboard/settings/account/server.ts b/apps/web/app/(org)/dashboard/settings/account/server.ts
new file mode 100644
index 000000000..ffb6b4e4f
--- /dev/null
+++ b/apps/web/app/(org)/dashboard/settings/account/server.ts
@@ -0,0 +1,24 @@
+"use server";
+
+import { db } from "@cap/database";
+import { getCurrentUser } from "@cap/database/auth/session";
+import { users } from "@cap/database/schema";
+import { eq } from "drizzle-orm";
+
+export async function patchAccountSettings(
+	firstName?: string,
+	lastName?: string,
+	defaultOrgId?: string,
+) {
+	const currentUser = await getCurrentUser();
+	if (!currentUser) throw new Error("Unauthorized");
+
+	await db()
+		.update(users)
+		.set({
+			name: firstName,
+			lastName,
+			defaultOrgId,
+		})
+		.where(eq(users.id, currentUser.id));
+}

From 696a6cda263d40bcb0249b456e027c45c0bb8d94 Mon Sep 17 00:00:00 2001
From: Oscar Beaumont <oscar@otbeaumont.me>
Date: Tue, 30 Sep 2025 21:19:32 +1000
Subject: [PATCH 05/27] fixes

---
 apps/web/app/(org)/dashboard/dashboard-data.ts         | 1 +
 apps/web/app/(org)/dashboard/settings/account/page.tsx | 1 +
 apps/web/app/api/webhooks/stripe/route.ts              | 1 +
 packages/database/schema.ts                            | 2 +-
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/web/app/(org)/dashboard/dashboard-data.ts b/apps/web/app/(org)/dashboard/dashboard-data.ts
index 7b8392c38..c581a783d 100644
--- a/apps/web/app/(org)/dashboard/dashboard-data.ts
+++ b/apps/web/app/(org)/dashboard/dashboard-data.ts
@@ -48,6 +48,7 @@ export async function getDashboardData(user: typeof userSelectProps) {
 					email: users.email,
 					inviteQuota: users.inviteQuota,
 					image: users.image,
+					defaultOrgId: users.defaultOrgId,
 				},
 			})
 			.from(organizations)
diff --git a/apps/web/app/(org)/dashboard/settings/account/page.tsx b/apps/web/app/(org)/dashboard/settings/account/page.tsx
index daed483fd..57536b9e2 100644
--- a/apps/web/app/(org)/dashboard/settings/account/page.tsx
+++ b/apps/web/app/(org)/dashboard/settings/account/page.tsx
@@ -1,6 +1,7 @@
 import { getCurrentUser } from "@cap/database/auth/session";
 import type { Metadata } from "next";
 import { Settings } from "./Settings";
+import { organizations } from "@cap/database/schema";
 
 export const metadata: Metadata = {
 	title: "Settings — Cap",
diff --git a/apps/web/app/api/webhooks/stripe/route.ts b/apps/web/app/api/webhooks/stripe/route.ts
index 9b3198486..78c1800f2 100644
--- a/apps/web/app/api/webhooks/stripe/route.ts
+++ b/apps/web/app/api/webhooks/stripe/route.ts
@@ -26,6 +26,7 @@ async function createGuestUser(
 		name: null,
 		image: null,
 		activeOrganizationId: "",
+		defaultOrgId: undefined,
 	});
 
 	const result = await db()
diff --git a/packages/database/schema.ts b/packages/database/schema.ts
index 58486b22c..93506b024 100644
--- a/packages/database/schema.ts
+++ b/packages/database/schema.ts
@@ -88,7 +88,7 @@ export const users = mysqlTable(
 		onboarding_completed_at: timestamp("onboarding_completed_at"),
 		customBucket: nanoIdNullable("customBucket"),
 		inviteQuota: int("inviteQuota").notNull().default(1),
-		defaultOrgId: nanoId("defaultOrgId"),
+		defaultOrgId: nanoIdNullable("defaultOrgId"),
 	},
 	(table) => ({
 		emailIndex: uniqueIndex("email_idx").on(table.email),

From 46b0ff2ef46389688f7b3f007d5634cb6e4ac3d6 Mon Sep 17 00:00:00 2001
From: Oscar Beaumont <oscar@otbeaumont.me>
Date: Tue, 30 Sep 2025 22:47:59 +1000
Subject: [PATCH 06/27] fix

---
 apps/web/app/api/webhooks/stripe/route.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/web/app/api/webhooks/stripe/route.ts b/apps/web/app/api/webhooks/stripe/route.ts
index 78c1800f2..9b3198486 100644
--- a/apps/web/app/api/webhooks/stripe/route.ts
+++ b/apps/web/app/api/webhooks/stripe/route.ts
@@ -26,7 +26,6 @@ async function createGuestUser(
 		name: null,
 		image: null,
 		activeOrganizationId: "",
-		defaultOrgId: undefined,
 	});
 
 	const result = await db()

From 29325e2ae58dcbd1fa8f1ec5aef814fa66afec2c Mon Sep 17 00:00:00 2001
From: Oscar Beaumont <oscar@otbeaumont.me>
Date: Tue, 30 Sep 2025 22:56:50 +1000
Subject: [PATCH 07/27] fix

---
 apps/web/actions/video/upload.ts                       | 2 +-
 apps/web/app/(org)/dashboard/settings/account/page.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/web/actions/video/upload.ts b/apps/web/actions/video/upload.ts
index 3dbad5ada..9bcd05a7c 100644
--- a/apps/web/actions/video/upload.ts
+++ b/apps/web/actions/video/upload.ts
@@ -164,7 +164,7 @@ export async function createVideoAndGetUploadUrl({
 	isScreenshot = false,
 	isUpload = false,
 	folderId,
-	orgId: orgId,
+	orgId,
 }: {
 	videoId?: Video.VideoId;
 	duration?: number;
diff --git a/apps/web/app/(org)/dashboard/settings/account/page.tsx b/apps/web/app/(org)/dashboard/settings/account/page.tsx
index 57536b9e2..15de0586d 100644
--- a/apps/web/app/(org)/dashboard/settings/account/page.tsx
+++ b/apps/web/app/(org)/dashboard/settings/account/page.tsx
@@ -1,7 +1,7 @@
 import { getCurrentUser } from "@cap/database/auth/session";
+import { organizations } from "@cap/database/schema";
 import type { Metadata } from "next";
 import { Settings } from "./Settings";
-import { organizations } from "@cap/database/schema";
 
 export const metadata: Metadata = {
 	title: "Settings — Cap",

From 8e435a1dc266ba574e1a1e96bf60182e511d78b4 Mon Sep 17 00:00:00 2001
From: Oscar Beaumont <oscar@otbeaumont.me>
Date: Tue, 30 Sep 2025 22:58:26 +1000
Subject: [PATCH 08/27] fix

---
 .../web/app/(org)/dashboard/caps/components/UploadCapButton.tsx | 1 +
 apps/web/app/(org)/dashboard/settings/account/Settings.tsx      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/web/app/(org)/dashboard/caps/components/UploadCapButton.tsx b/apps/web/app/(org)/dashboard/caps/components/UploadCapButton.tsx
index f91e4988e..085d0dfb9 100644
--- a/apps/web/app/(org)/dashboard/caps/components/UploadCapButton.tsx
+++ b/apps/web/app/(org)/dashboard/caps/components/UploadCapButton.tsx
@@ -460,6 +460,7 @@ async function legacyUploadCap(
 				videoId: uploadId,
 				isScreenshot: true,
 				isUpload: true,
+				orgId,
 			});
 
 			const screenshotFormData = new FormData();
diff --git a/apps/web/app/(org)/dashboard/settings/account/Settings.tsx b/apps/web/app/(org)/dashboard/settings/account/Settings.tsx
index 48a679b25..484a188d5 100644
--- a/apps/web/app/(org)/dashboard/settings/account/Settings.tsx
+++ b/apps/web/app/(org)/dashboard/settings/account/Settings.tsx
@@ -26,7 +26,7 @@ export const Settings = ({
 	const [firstName, setFirstName] = useState(user?.name || "");
 	const [lastName, setLastName] = useState(user?.lastName || "");
 	const [defaultOrgId, setDefaultOrgId] = useState<string | undefined>(
-		user?.defaultOrgId,
+		user?.defaultOrgId || undefined,
 	);
 
 	const { mutate: updateName, isPending: updateNamePending } = useMutation({

From ecb8f498ae72fd49157b02896ab654668ae9de0c Mon Sep 17 00:00:00 2001
From: Oscar Beaumont <oscar@otbeaumont.me>
Date: Wed, 1 Oct 2025 13:39:21 +1000
Subject: [PATCH 09/27] permission checks on `orgId` assignment for video
 upload

---
 apps/web/app/api/desktop/[...route]/video.ts | 62 +++++++++++++++++++-
 1 file changed, 59 insertions(+), 3 deletions(-)

diff --git a/apps/web/app/api/desktop/[...route]/video.ts b/apps/web/app/api/desktop/[...route]/video.ts
index 21b84e94d..ff8afd5c4 100644
--- a/apps/web/app/api/desktop/[...route]/video.ts
+++ b/apps/web/app/api/desktop/[...route]/video.ts
@@ -2,13 +2,20 @@ import { db } from "@cap/database";
 import { sendEmail } from "@cap/database/emails/config";
 import { FirstShareableLink } from "@cap/database/emails/first-shareable-link";
 import { nanoId } from "@cap/database/helpers";
-import { s3Buckets, videos, videoUploads } from "@cap/database/schema";
+import {
+	organizationMembers,
+	organizations,
+	s3Buckets,
+	users,
+	videos,
+	videoUploads,
+} from "@cap/database/schema";
 import { buildEnv, NODE_ENV, serverEnv } from "@cap/env";
 import { userIsPro } from "@cap/utils";
 import { S3Buckets } from "@cap/web-backend";
 import { Video } from "@cap/web-domain";
 import { zValidator } from "@hono/zod-validator";
-import { and, count, eq, gt, gte, lt, lte } from "drizzle-orm";
+import { and, count, eq, gt, gte, lt, lte, or } from "drizzle-orm";
 import { Effect, Option } from "effect";
 import { Hono } from "hono";
 import { z } from "zod";
@@ -34,6 +41,7 @@ app.get(
 			width: stringOrNumberOptional,
 			height: stringOrNumberOptional,
 			fps: stringOrNumberOptional,
+			orgId: z.string().optional(),
 		}),
 	),
 	async (c) => {
@@ -47,6 +55,7 @@ app.get(
 				width,
 				height,
 				fps,
+				orgId,
 			} = c.req.valid("query");
 			const user = c.get("user");
 
@@ -93,6 +102,53 @@ app.get(
 					});
 			}
 
+			const userOrganizations = await db()
+				.select({
+					id: organizations.id,
+					name: organizations.name,
+				})
+				.from(organizations)
+				.leftJoin(
+					organizationMembers,
+					eq(organizations.id, organizationMembers.organizationId),
+				)
+				.where(
+					or(
+						// User owns the organization
+						eq(organizations.ownerId, user.id),
+						// User is a member of the organization
+						eq(organizationMembers.userId, user.id),
+					),
+				)
+				// Remove duplicates if user is both owner and member
+				.groupBy(organizations.id)
+				.orderBy(organizations.createdAt);
+			const userOrgIds = userOrganizations.map((org) => org.id);
+
+			let videoOrgId: string | undefined;
+			if (orgId) {
+				// Hard error if the user requested org is non-existent or they don't have access.
+				if (!userOrgIds.includes(orgId))
+					return c.json({ error: "forbidden_org" }, { status: 403 });
+				videoOrgId = orgId;
+			} else if (user.defaultOrgId) {
+				// User's defaultOrgId is no longer valid, switch to first available org
+				if (!userOrgIds.includes(user.defaultOrgId)) {
+					if (!userOrganizations[0])
+						return c.json({ error: "no_valid_org" }, { status: 403 });
+
+					videoOrgId = userOrganizations[0].id;
+
+					// Update user's defaultOrgId to the new valid org
+					await db()
+						.update(users)
+						.set({
+							defaultOrgId: videoOrgId,
+						})
+						.where(eq(users.id, user.id));
+				} else videoOrgId = user.defaultOrgId;
+			}
+
 			const idToUse = Video.VideoId.make(nanoId());
 
 			const videoName =
@@ -105,7 +161,7 @@ app.get(
 					id: idToUse,
 					name: videoName,
 					ownerId: user.id,
-					orgId: undefined,
+					orgId: videoOrgId,
 					source:
 						recordingMode === "hls"
 							? { type: "local" as const }

From 0a0372c1608eaae324b11095f9c1f04896321de1 Mon Sep 17 00:00:00 2001
From: Oscar Beaumont <oscar@otbeaumont.me>
Date: Wed, 1 Oct 2025 13:39:42 +1000
Subject: [PATCH 10/27] cleanup

---
 apps/web/app/(org)/dashboard/settings/account/page.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/web/app/(org)/dashboard/settings/account/page.tsx b/apps/web/app/(org)/dashboard/settings/account/page.tsx
index 15de0586d..daed483fd 100644
--- a/apps/web/app/(org)/dashboard/settings/account/page.tsx
+++ b/apps/web/app/(org)/dashboard/settings/account/page.tsx
@@ -1,5 +1,4 @@
 import { getCurrentUser } from "@cap/database/auth/session";
-import { organizations } from "@cap/database/schema";
 import type { Metadata } from "next";
 import { Settings } from "./Settings";
 

From 6204ec4964d7f3106dd585d9feab5fe757b0882d Mon Sep 17 00:00:00 2001
From: Oscar Beaumont <oscar@otbeaumont.me>
Date: Wed, 1 Oct 2025 14:00:37 +1000
Subject: [PATCH 11/27] backfill script

---
 pnpm-lock.yaml                      |  33 ++++
 pnpm-workspace.yaml                 |   1 +
 scripts/orgid_backfill/index.ts     | 270 ++++++++++++++++++++++++++++
 scripts/orgid_backfill/package.json |  13 ++
 4 files changed, 317 insertions(+)
 create mode 100644 scripts/orgid_backfill/index.ts
 create mode 100644 scripts/orgid_backfill/package.json

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 02c721ab6..a3161b459 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1356,6 +1356,21 @@ importers:
         specifier: ^3.17.14
         version: 3.17.14
 
+  scripts/orgid_backfill:
+    dependencies:
+      '@cap/database':
+        specifier: workspace:^
+        version: link:../../packages/database
+      dotenv:
+        specifier: ^17.2.3
+        version: 17.2.3
+      drizzle-orm:
+        specifier: 0.44.5
+        version: 0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1)
+      tsx:
+        specifier: ^4.20.6
+        version: 4.20.6
+
 packages:
 
   '@adobe/css-tools@4.4.2':
@@ -8433,6 +8448,10 @@ packages:
     resolution: {integrity: sha512-kQhDYKZecqnM0fCnzI5eIv5L4cAe/iRI+HqMbO/hbRdTAeXDG+M9FjipUxNfbARuEg4iHIbhnhs78BCHNbSxEQ==}
     engines: {node: '>=12'}
 
+  dotenv@17.2.3:
+    resolution: {integrity: sha512-JVUnt+DUIzu87TABbhPmNfVdBDt18BLOWjMUFJMSi/Qqg7NTYtabbvSNJGOJ7afbRuv9D/lngizHtP7QyLQ+9w==}
+    engines: {node: '>=12'}
+
   drizzle-kit@0.31.0:
     resolution: {integrity: sha512-pcKVT+GbfPA+bUovPIilgVOoq+onNBo/YQBG86sf3/GFHkN6lRJPm1l7dKN0IMAk57RQoIm4GUllRrasLlcaSg==}
     hasBin: true
@@ -13211,6 +13230,11 @@ packages:
     peerDependencies:
       typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta'
 
+  tsx@4.20.6:
+    resolution: {integrity: sha512-ytQKuwgmrrkDTFP4LjR0ToE2nqgy886GpvRSpU0JAnrdBYppuY5rLkRUYPU1yCryb24SsKBTL/hlDQAEFVwtZg==}
+    engines: {node: '>=18.0.0'}
+    hasBin: true
+
   tuf-js@2.2.1:
     resolution: {integrity: sha512-GwIJau9XaA8nLVbUXsN3IlFi7WmQ48gBUrl3FTkkL/XLu/POhBzfmX9hd33FNMX1qAsfl6ozO1iMmW9NC8YniA==}
     engines: {node: ^16.14.0 || >=18.0.0}
@@ -22281,6 +22305,8 @@ snapshots:
 
   dotenv@17.2.1: {}
 
+  dotenv@17.2.3: {}
+
   drizzle-kit@0.31.0:
     dependencies:
       '@drizzle-team/brocli': 0.10.2
@@ -28529,6 +28555,13 @@ snapshots:
       tslib: 1.14.1
       typescript: 5.8.3
 
+  tsx@4.20.6:
+    dependencies:
+      esbuild: 0.25.5
+      get-tsconfig: 4.10.0
+    optionalDependencies:
+      fsevents: 2.3.3
+
   tuf-js@2.2.1:
     dependencies:
       '@tufjs/models': 2.0.1
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 474890b30..614993f77 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -3,3 +3,4 @@ packages:
   - "packages/*"
   - "crates/tauri-plugin-*"
   - "infra"
+  - "scripts/orgIdBackfill"
diff --git a/scripts/orgid_backfill/index.ts b/scripts/orgid_backfill/index.ts
new file mode 100644
index 000000000..e94873b61
--- /dev/null
+++ b/scripts/orgid_backfill/index.ts
@@ -0,0 +1,270 @@
+import { db } from "@cap/database";
+import { users, videos } from "@cap/database/schema";
+import { eq, and, isNull, isNotNull, sql } from "drizzle-orm";
+
+const CHUNK_SIZE = 100;
+
+interface BackfillStats {
+	videosProcessed: number;
+	videosUpdated: number;
+	usersProcessed: number;
+	usersUpdated: number;
+}
+
+async function backfillVideoOrgIds(): Promise<{
+	processed: number;
+	updated: number;
+}> {
+	console.log("🎬 Starting video orgId backfill...");
+
+	let processed = 0;
+	let updated = 0;
+
+	while (true) {
+		// Find videos that need orgId backfilled
+		const videosToUpdate = await db()
+			.select({
+				id: videos.id,
+				ownerId: videos.ownerId,
+				orgId: videos.orgId,
+			})
+			.from(videos)
+			.innerJoin(users, eq(videos.ownerId, users.id))
+			.where(and(isNull(videos.orgId), isNotNull(users.activeOrganizationId)))
+			.limit(CHUNK_SIZE);
+
+		if (videosToUpdate.length === 0) break;
+
+		// Update videos in batch using subquery
+		const videoIds = videosToUpdate.map((v) => v.id);
+
+		const updateResult = await db()
+			.update(videos)
+			.set({
+				orgId: sql`(
+          SELECT u.activeOrganizationId
+          FROM users u
+          WHERE u.id = videos.ownerId
+        )`,
+			})
+			.where(
+				and(
+					sql`videos.id IN (${sql.join(
+						videoIds.map((id) => sql`${id}`),
+						sql`, `,
+					)})`,
+					isNull(videos.orgId),
+				),
+			);
+
+		const rowsUpdated = updateResult.rowsAffected || 0;
+		processed += videosToUpdate.length;
+		updated += rowsUpdated;
+
+		console.log(
+			`📹 Processed ${processed} videos, updated ${updated} (chunk: ${videosToUpdate.length}/${rowsUpdated})`,
+		);
+
+		// If we got less than CHUNK_SIZE, we're done
+		if (videosToUpdate.length < CHUNK_SIZE) break;
+	}
+
+	return { processed, updated };
+}
+
+async function backfillUserDefaultOrgIds(): Promise<{
+	processed: number;
+	updated: number;
+}> {
+	console.log("👤 Starting user defaultOrgId backfill...");
+
+	let processed = 0;
+	let updated = 0;
+
+	while (true) {
+		// Find users that need defaultOrgId backfilled
+		const usersToUpdate = await db()
+			.select({
+				id: users.id,
+				activeOrganizationId: users.activeOrganizationId,
+				defaultOrgId: users.defaultOrgId,
+			})
+			.from(users)
+			.where(
+				and(isNull(users.defaultOrgId), isNotNull(users.activeOrganizationId)),
+			)
+			.limit(CHUNK_SIZE);
+
+		if (usersToUpdate.length === 0) break;
+
+		// Update users individually to ensure idempotency
+		for (const user of usersToUpdate)
+			await db()
+				.update(users)
+				.set({ defaultOrgId: user.activeOrganizationId })
+				.where(and(eq(users.id, user.id), isNull(users.defaultOrgId)));
+
+		processed += usersToUpdate.length;
+		updated += usersToUpdate.length;
+
+		console.log(
+			`👥 Processed ${processed} users, updated ${updated} (chunk: ${usersToUpdate.length})`,
+		);
+
+		// If we got less than CHUNK_SIZE, we're done
+		if (usersToUpdate.length < CHUNK_SIZE) break;
+	}
+
+	return { processed, updated };
+}
+
+async function validateBackfill(): Promise<void> {
+	console.log("🔍 Validating backfill results...");
+
+	// Count videos still missing orgId where owner has activeOrganizationId
+	const videosWithoutOrgId = await db()
+		.select({ count: sql<number>`count(*)` })
+		.from(videos)
+		.innerJoin(users, eq(videos.ownerId, users.id))
+		.where(and(isNull(videos.orgId), isNotNull(users.activeOrganizationId)));
+
+	// Count users still missing defaultOrgId where they have activeOrganizationId
+	const usersWithoutDefaultOrgId = await db()
+		.select({ count: sql<number>`count(*)` })
+		.from(users)
+		.where(
+			and(isNull(users.defaultOrgId), isNotNull(users.activeOrganizationId)),
+		);
+
+	// Count videos with mismatched orgId (different from owner's activeOrganizationId)
+	const videosWithMismatchedOrgId = await db()
+		.select({ count: sql<number>`count(*)` })
+		.from(videos)
+		.innerJoin(users, eq(videos.ownerId, users.id))
+		.where(
+			and(
+				isNotNull(videos.orgId),
+				isNotNull(users.activeOrganizationId),
+				sql`videos.orgId != users.activeOrganizationId`,
+			),
+		);
+
+	// Count users with mismatched defaultOrgId (different from activeOrganizationId)
+	const usersWithMismatchedDefaultOrgId = await db()
+		.select({ count: sql<number>`count(*)` })
+		.from(users)
+		.where(
+			and(
+				isNotNull(users.defaultOrgId),
+				isNotNull(users.activeOrganizationId),
+				sql`users.defaultOrgId != users.activeOrganizationId`,
+			),
+		);
+
+	console.log("📊 Validation results:");
+	console.log(
+		`  Videos still missing orgId: ${videosWithoutOrgId[0]?.count || 0}`,
+	);
+	console.log(
+		`  Users still missing defaultOrgId: ${usersWithoutDefaultOrgId[0]?.count || 0}`,
+	);
+	console.log(
+		`  Videos with mismatched orgId: ${videosWithMismatchedOrgId[0]?.count || 0}`,
+	);
+	console.log(
+		`  Users with mismatched defaultOrgId: ${usersWithMismatchedDefaultOrgId[0]?.count || 0}`,
+	);
+}
+
+async function getInitialStats(): Promise<void> {
+	console.log("📈 Getting initial stats...");
+
+	const totalVideos = await db()
+		.select({ count: sql<number>`count(*)` })
+		.from(videos);
+
+	const videosWithOrgId = await db()
+		.select({ count: sql<number>`count(*)` })
+		.from(videos)
+		.where(isNotNull(videos.orgId));
+
+	const videosNeedingOrgId = await db()
+		.select({ count: sql<number>`count(*)` })
+		.from(videos)
+		.innerJoin(users, eq(videos.ownerId, users.id))
+		.where(and(isNull(videos.orgId), isNotNull(users.activeOrganizationId)));
+
+	const totalUsers = await db()
+		.select({ count: sql<number>`count(*)` })
+		.from(users);
+
+	const usersWithDefaultOrgId = await db()
+		.select({ count: sql<number>`count(*)` })
+		.from(users)
+		.where(isNotNull(users.defaultOrgId));
+
+	const usersNeedingDefaultOrgId = await db()
+		.select({ count: sql<number>`count(*)` })
+		.from(users)
+		.where(
+			and(isNull(users.defaultOrgId), isNotNull(users.activeOrganizationId)),
+		);
+
+	console.log("📊 Initial stats:");
+	console.log(`  Total videos: ${totalVideos[0]?.count || 0}`);
+	console.log(`  Videos with orgId: ${videosWithOrgId[0]?.count || 0}`);
+	console.log(`  Videos needing orgId: ${videosNeedingOrgId[0]?.count || 0}`);
+	console.log(`  Total users: ${totalUsers[0]?.count || 0}`);
+	console.log(
+		`  Users with defaultOrgId: ${usersWithDefaultOrgId[0]?.count || 0}`,
+	);
+	console.log(
+		`  Users needing defaultOrgId: ${usersNeedingDefaultOrgId[0]?.count || 0}`,
+	);
+	console.log("");
+}
+
+async function main(): Promise<void> {
+	console.log("🚀 Starting orgId backfill script");
+	console.log(`📦 Processing in chunks of ${CHUNK_SIZE} rows\n`);
+
+	try {
+		await getInitialStats();
+
+		const videoResults = await backfillVideoOrgIds();
+		console.log(
+			`✅ Video backfill complete: ${videoResults.updated}/${videoResults.processed} videos updated\n`,
+		);
+
+		const userResults = await backfillUserDefaultOrgIds();
+		console.log(
+			`✅ User backfill complete: ${userResults.updated}/${userResults.processed} users updated\n`,
+		);
+
+		await validateBackfill();
+
+		const totalStats: BackfillStats = {
+			videosProcessed: videoResults.processed,
+			videosUpdated: videoResults.updated,
+			usersProcessed: userResults.processed,
+			usersUpdated: userResults.updated,
+		};
+
+		console.log("\n🎉 Backfill completed successfully!");
+		console.log("📋 Final summary:");
+		console.log(`  Videos processed: ${totalStats.videosProcessed}`);
+		console.log(`  Videos updated: ${totalStats.videosUpdated}`);
+		console.log(`  Users processed: ${totalStats.usersProcessed}`);
+		console.log(`  Users updated: ${totalStats.usersUpdated}`);
+		process.exit(0);
+	} catch (error) {
+		console.error("❌ Error during backfill:", error);
+		process.exit(1);
+	}
+}
+
+// Run the script
+main().catch((error) => {
+	console.error("❌ Unhandled error:", error);
+	process.exit(1);
+});
diff --git a/scripts/orgid_backfill/package.json b/scripts/orgid_backfill/package.json
new file mode 100644
index 000000000..26e987c5a
--- /dev/null
+++ b/scripts/orgid_backfill/package.json
@@ -0,0 +1,13 @@
+{
+	"name": "@cap/orgid_backfill",
+	"private": true,
+	"scripts": {
+		"backfill": "npx dotenv -e ../../.env -- npx tsx index.ts"
+	},
+	"dependencies": {
+		"@cap/database": "workspace:^",
+		"dotenv": "^17.2.3",
+		"drizzle-orm": "0.44.5",
+		"tsx": "^4.20.6"
+	}
+}

From 890c794d5c6e03505bd121666f25ed9f90b2cb47 Mon Sep 17 00:00:00 2001
From: Oscar Beaumont <oscar@otbeaumont.me>
Date: Wed, 1 Oct 2025 14:45:02 +1000
Subject: [PATCH 12/27] improve backfill script

---
 scripts/orgid_backfill/index.ts | 78 +++++++--------------------------
 1 file changed, 16 insertions(+), 62 deletions(-)

diff --git a/scripts/orgid_backfill/index.ts b/scripts/orgid_backfill/index.ts
index e94873b61..77ddf9db2 100644
--- a/scripts/orgid_backfill/index.ts
+++ b/scripts/orgid_backfill/index.ts
@@ -2,7 +2,7 @@ import { db } from "@cap/database";
 import { users, videos } from "@cap/database/schema";
 import { eq, and, isNull, isNotNull, sql } from "drizzle-orm";
 
-const CHUNK_SIZE = 100;
+const CHUNK_SIZE = 500;
 
 interface BackfillStats {
 	videosProcessed: number;
@@ -17,7 +17,6 @@ async function backfillVideoOrgIds(): Promise<{
 }> {
 	console.log("🎬 Starting video orgId backfill...");
 
-	let processed = 0;
 	let updated = 0;
 
 	while (true) {
@@ -45,6 +44,7 @@ async function backfillVideoOrgIds(): Promise<{
           SELECT u.activeOrganizationId
           FROM users u
           WHERE u.id = videos.ownerId
+          AND u.activeOrganizationId IS NOT NULL
         )`,
 			})
 			.where(
@@ -58,18 +58,12 @@ async function backfillVideoOrgIds(): Promise<{
 			);
 
 		const rowsUpdated = updateResult.rowsAffected || 0;
-		processed += videosToUpdate.length;
 		updated += rowsUpdated;
 
-		console.log(
-			`📹 Processed ${processed} videos, updated ${updated} (chunk: ${videosToUpdate.length}/${rowsUpdated})`,
-		);
-
-		// If we got less than CHUNK_SIZE, we're done
-		if (videosToUpdate.length < CHUNK_SIZE) break;
+		console.log(`📹 Assigned orgId to ${updated} videos`);
 	}
 
-	return { processed, updated };
+	return { updated };
 }
 
 async function backfillUserDefaultOrgIds(): Promise<{
@@ -78,44 +72,22 @@ async function backfillUserDefaultOrgIds(): Promise<{
 }> {
 	console.log("👤 Starting user defaultOrgId backfill...");
 
-	let processed = 0;
 	let updated = 0;
 
 	while (true) {
-		// Find users that need defaultOrgId backfilled
-		const usersToUpdate = await db()
-			.select({
-				id: users.id,
-				activeOrganizationId: users.activeOrganizationId,
-				defaultOrgId: users.defaultOrgId,
+		const updateResult = await db()
+			.update(users)
+			.set({
+				defaultOrgId: users.activeOrganizationId,
 			})
-			.from(users)
 			.where(
 				and(isNull(users.defaultOrgId), isNotNull(users.activeOrganizationId)),
-			)
-			.limit(CHUNK_SIZE);
-
-		if (usersToUpdate.length === 0) break;
-
-		// Update users individually to ensure idempotency
-		for (const user of usersToUpdate)
-			await db()
-				.update(users)
-				.set({ defaultOrgId: user.activeOrganizationId })
-				.where(and(eq(users.id, user.id), isNull(users.defaultOrgId)));
-
-		processed += usersToUpdate.length;
-		updated += usersToUpdate.length;
-
-		console.log(
-			`👥 Processed ${processed} users, updated ${updated} (chunk: ${usersToUpdate.length})`,
-		);
+			);
+		const rowsUpdated = updateResult.rowsAffected || 0;
+		updated += rowsUpdated;
 
-		// If we got less than CHUNK_SIZE, we're done
-		if (usersToUpdate.length < CHUNK_SIZE) break;
+		console.log(`👥 Assigned defaultOrgId to ${updated} users`);
 	}
-
-	return { processed, updated };
 }
 
 async function validateBackfill(): Promise<void> {
@@ -231,31 +203,13 @@ async function main(): Promise<void> {
 	try {
 		await getInitialStats();
 
-		const videoResults = await backfillVideoOrgIds();
-		console.log(
-			`✅ Video backfill complete: ${videoResults.updated}/${videoResults.processed} videos updated\n`,
-		);
+		await backfillVideoOrgIds();
+		console.log(`✅ Video backfill complete\n`);
 
-		const userResults = await backfillUserDefaultOrgIds();
-		console.log(
-			`✅ User backfill complete: ${userResults.updated}/${userResults.processed} users updated\n`,
-		);
+		await backfillUserDefaultOrgIds();
+		console.log(`✅ User backfill complete\n`);
 
 		await validateBackfill();
-
-		const totalStats: BackfillStats = {
-			videosProcessed: videoResults.processed,
-			videosUpdated: videoResults.updated,
-			usersProcessed: userResults.processed,
-			usersUpdated: userResults.updated,
-		};
-
-		console.log("\n🎉 Backfill completed successfully!");
-		console.log("📋 Final summary:");
-		console.log(`  Videos processed: ${totalStats.videosProcessed}`);
-		console.log(`  Videos updated: ${totalStats.videosUpdated}`);
-		console.log(`  Users processed: ${totalStats.usersProcessed}`);
-		console.log(`  Users updated: ${totalStats.usersUpdated}`);
 		process.exit(0);
 	} catch (error) {
 		console.error("❌ Error during backfill:", error);

From 17a36e43d60c80d4f709b9ca7fc520fec452c3a1 Mon Sep 17 00:00:00 2001
From: Oscar Beaumont <oscar@otbeaumont.me>
Date: Wed, 1 Oct 2025 14:51:29 +1000
Subject: [PATCH 13/27] filter cluser tables + improve backfill script

---
 packages/database/drizzle.config.ts |  1 +
 scripts/orgid_backfill/index.ts     | 24 +++++++++++-------------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/packages/database/drizzle.config.ts b/packages/database/drizzle.config.ts
index 9cc481386..ebd65b350 100644
--- a/packages/database/drizzle.config.ts
+++ b/packages/database/drizzle.config.ts
@@ -15,4 +15,5 @@ export default {
 	dialect: "mysql",
 	dbCredentials: { url: URL },
 	casing: "snake_case",
+	tablesFilter: ["*", "!cluster_*"],
 } satisfies Config;
diff --git a/scripts/orgid_backfill/index.ts b/scripts/orgid_backfill/index.ts
index 77ddf9db2..52f086caf 100644
--- a/scripts/orgid_backfill/index.ts
+++ b/scripts/orgid_backfill/index.ts
@@ -74,20 +74,18 @@ async function backfillUserDefaultOrgIds(): Promise<{
 
 	let updated = 0;
 
-	while (true) {
-		const updateResult = await db()
-			.update(users)
-			.set({
-				defaultOrgId: users.activeOrganizationId,
-			})
-			.where(
-				and(isNull(users.defaultOrgId), isNotNull(users.activeOrganizationId)),
-			);
-		const rowsUpdated = updateResult.rowsAffected || 0;
-		updated += rowsUpdated;
+	const updateResult = await db()
+		.update(users)
+		.set({
+			defaultOrgId: users.activeOrganizationId,
+		})
+		.where(
+			and(isNull(users.defaultOrgId), isNotNull(users.activeOrganizationId)),
+		);
+	const rowsUpdated = updateResult.rowsAffected || 0;
+	updated += rowsUpdated;
 
-		console.log(`👥 Assigned defaultOrgId to ${updated} users`);
-	}
+	console.log(`👥 Assigned defaultOrgId to ${updated} users`);
 }
 
 async function validateBackfill(): Promise<void> {

From fecf7de5be654475e5b99262594f21518098e124 Mon Sep 17 00:00:00 2001
From: Oscar Beaumont <oscar@otbeaumont.me>
Date: Wed, 1 Oct 2025 14:56:42 +1000
Subject: [PATCH 14/27] format

---
 scripts/orgid_backfill/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/orgid_backfill/index.ts b/scripts/orgid_backfill/index.ts
index 52f086caf..67f13aef4 100644
--- a/scripts/orgid_backfill/index.ts
+++ b/scripts/orgid_backfill/index.ts
@@ -1,6 +1,6 @@
 import { db } from "@cap/database";
 import { users, videos } from "@cap/database/schema";
-import { eq, and, isNull, isNotNull, sql } from "drizzle-orm";
+import { and, eq, isNotNull, isNull, sql } from "drizzle-orm";
 
 const CHUNK_SIZE = 500;
 

From fc0114efb5849a90f587caea548ec32be03cdb35 Mon Sep 17 00:00:00 2001
From: Oscar Beaumont <oscar@otbeaumont.me>
Date: Wed, 1 Oct 2025 16:13:38 +1000
Subject: [PATCH 15/27] fix backfill script

---
 scripts/orgid_backfill/index.ts | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/scripts/orgid_backfill/index.ts b/scripts/orgid_backfill/index.ts
index 67f13aef4..50d52bfec 100644
--- a/scripts/orgid_backfill/index.ts
+++ b/scripts/orgid_backfill/index.ts
@@ -4,17 +4,7 @@ import { and, eq, isNotNull, isNull, sql } from "drizzle-orm";
 
 const CHUNK_SIZE = 500;
 
-interface BackfillStats {
-	videosProcessed: number;
-	videosUpdated: number;
-	usersProcessed: number;
-	usersUpdated: number;
-}
-
-async function backfillVideoOrgIds(): Promise<{
-	processed: number;
-	updated: number;
-}> {
+async function backfillVideoOrgIds() {
 	console.log("🎬 Starting video orgId backfill...");
 
 	let updated = 0;
@@ -62,14 +52,9 @@ async function backfillVideoOrgIds(): Promise<{
 
 		console.log(`📹 Assigned orgId to ${updated} videos`);
 	}
-
-	return { updated };
 }
 
-async function backfillUserDefaultOrgIds(): Promise<{
-	processed: number;
-	updated: number;
-}> {
+async function backfillUserDefaultOrgIds() {
 	console.log("👤 Starting user defaultOrgId backfill...");
 
 	let updated = 0;

From 2139d55211809c2729528bf8b002350ace419e65 Mon Sep 17 00:00:00 2001
From: Oscar Beaumont <oscar@otbeaumont.me>
Date: Wed, 1 Oct 2025 16:37:35 +1000
Subject: [PATCH 16/27] auth when updating `defaultOrgId`'s

---
 .../dashboard/settings/account/server.ts      | 41 ++++++++++++++++++-
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/apps/web/app/(org)/dashboard/settings/account/server.ts b/apps/web/app/(org)/dashboard/settings/account/server.ts
index ffb6b4e4f..dcaad6478 100644
--- a/apps/web/app/(org)/dashboard/settings/account/server.ts
+++ b/apps/web/app/(org)/dashboard/settings/account/server.ts
@@ -2,8 +2,13 @@
 
 import { db } from "@cap/database";
 import { getCurrentUser } from "@cap/database/auth/session";
-import { users } from "@cap/database/schema";
-import { eq } from "drizzle-orm";
+import {
+	users,
+	organizations,
+	organizationMembers,
+} from "@cap/database/schema";
+import { eq, or } from "drizzle-orm";
+import { revalidatePath } from "next/cache";
 
 export async function patchAccountSettings(
 	firstName?: string,
@@ -13,6 +18,36 @@ export async function patchAccountSettings(
 	const currentUser = await getCurrentUser();
 	if (!currentUser) throw new Error("Unauthorized");
 
+	// If defaultOrgId is being updated, verify user has access to that organization
+	if (defaultOrgId) {
+		const userOrganizations = await db()
+			.select({
+				id: organizations.id,
+			})
+			.from(organizations)
+			.leftJoin(
+				organizationMembers,
+				eq(organizations.id, organizationMembers.organizationId),
+			)
+			.where(
+				or(
+					// User owns the organization
+					eq(organizations.ownerId, currentUser.id),
+					// User is a member of the organization
+					eq(organizationMembers.userId, currentUser.id),
+				),
+			)
+			// Remove duplicates if user is both owner and member
+			.groupBy(organizations.id);
+
+		const userOrgIds = userOrganizations.map((org) => org.id);
+
+		if (!userOrgIds.includes(defaultOrgId))
+			throw new Error(
+				"Forbidden: User does not have access to the specified organization",
+			);
+	}
+
 	await db()
 		.update(users)
 		.set({
@@ -21,4 +56,6 @@ export async function patchAccountSettings(
 			defaultOrgId,
 		})
 		.where(eq(users.id, currentUser.id));
+
+	revalidatePath("/dashboard/settings/account");
 }

From 355f3b55e955940931abf55928f53abc2f5d865d Mon Sep 17 00:00:00 2001
From: Oscar Beaumont <oscar@otbeaumont.me>
Date: Wed, 1 Oct 2025 16:39:18 +1000
Subject: [PATCH 17/27] don't navigate with changes

---
 .../dashboard/settings/account/Settings.tsx   | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/apps/web/app/(org)/dashboard/settings/account/Settings.tsx b/apps/web/app/(org)/dashboard/settings/account/Settings.tsx
index 484a188d5..88504b27b 100644
--- a/apps/web/app/(org)/dashboard/settings/account/Settings.tsx
+++ b/apps/web/app/(org)/dashboard/settings/account/Settings.tsx
@@ -11,7 +11,7 @@ import {
 } from "@cap/ui";
 import { useMutation } from "@tanstack/react-query";
 import { useRouter } from "next/navigation";
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import { toast } from "sonner";
 import { useDashboardContext } from "../../Contexts";
 import { patchAccountSettings } from "./server";
@@ -29,6 +29,12 @@ export const Settings = ({
 		user?.defaultOrgId || undefined,
 	);
 
+	// Track if form has unsaved changes
+	const hasChanges =
+		firstName !== (user?.name || "") ||
+		lastName !== (user?.lastName || "") ||
+		defaultOrgId !== user?.defaultOrgId;
+
 	const { mutate: updateName, isPending: updateNamePending } = useMutation({
 		mutationFn: async () => {
 			await patchAccountSettings(
@@ -46,6 +52,19 @@ export const Settings = ({
 		},
 	});
 
+	// Prevent navigation when there are unsaved changes
+	useEffect(() => {
+		const handleBeforeUnload = (e: BeforeUnloadEvent) => {
+			if (hasChanges) {
+				e.preventDefault();
+				e.returnValue = "";
+			}
+		};
+
+		window.addEventListener("beforeunload", handleBeforeUnload);
+		return () => window.removeEventListener("beforeunload", handleBeforeUnload);
+	}, [hasChanges]);
+
 	return (
 		<form
 			onSubmit={(e) => {

From 58ca31644b8233d9b5d6e87bd7a6ba633a59356c Mon Sep 17 00:00:00 2001
From: Oscar Beaumont <oscar@otbeaumont.me>
Date: Wed, 1 Oct 2025 16:39:43 +1000
Subject: [PATCH 18/27] format

---
 apps/web/app/(org)/dashboard/settings/account/server.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/web/app/(org)/dashboard/settings/account/server.ts b/apps/web/app/(org)/dashboard/settings/account/server.ts
index dcaad6478..4968415ae 100644
--- a/apps/web/app/(org)/dashboard/settings/account/server.ts
+++ b/apps/web/app/(org)/dashboard/settings/account/server.ts
@@ -3,9 +3,9 @@
 import { db } from "@cap/database";
 import { getCurrentUser } from "@cap/database/auth/session";
 import {
-	users,
-	organizations,
 	organizationMembers,
+	organizations,
+	users,
 } from "@cap/database/schema";
 import { eq, or } from "drizzle-orm";
 import { revalidatePath } from "next/cache";

From 1ae12d28117067cdf9cb7f14dbb84566ca300160 Mon Sep 17 00:00:00 2001
From: Oscar Beaumont <oscar@otbeaumont.me>
Date: Wed, 1 Oct 2025 16:50:05 +1000
Subject: [PATCH 19/27] fix

---
 apps/web/app/(org)/dashboard/settings/account/Settings.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/app/(org)/dashboard/settings/account/Settings.tsx b/apps/web/app/(org)/dashboard/settings/account/Settings.tsx
index 88504b27b..c763be08d 100644
--- a/apps/web/app/(org)/dashboard/settings/account/Settings.tsx
+++ b/apps/web/app/(org)/dashboard/settings/account/Settings.tsx
@@ -33,7 +33,7 @@ export const Settings = ({
 	const hasChanges =
 		firstName !== (user?.name || "") ||
 		lastName !== (user?.lastName || "") ||
-		defaultOrgId !== user?.defaultOrgId;
+		(defaultOrgId ?? null) !== (user?.defaultOrgId ?? null);
 
 	const { mutate: updateName, isPending: updateNamePending } = useMutation({
 		mutationFn: async () => {

From ffd86c7b5136201f04e88b1dff5bf7fa235ce2c7 Mon Sep 17 00:00:00 2001
From: Oscar Beaumont <oscar@otbeaumont.me>
Date: Wed, 1 Oct 2025 16:51:39 +1000
Subject: [PATCH 20/27] fix

---
 .../dashboard/settings/account/server.ts      | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/apps/web/app/(org)/dashboard/settings/account/server.ts b/apps/web/app/(org)/dashboard/settings/account/server.ts
index 4968415ae..b0a8bceae 100644
--- a/apps/web/app/(org)/dashboard/settings/account/server.ts
+++ b/apps/web/app/(org)/dashboard/settings/account/server.ts
@@ -18,8 +18,15 @@ export async function patchAccountSettings(
 	const currentUser = await getCurrentUser();
 	if (!currentUser) throw new Error("Unauthorized");
 
-	// If defaultOrgId is being updated, verify user has access to that organization
-	if (defaultOrgId) {
+	const updatePayload: Partial<{
+		name: string;
+		lastName: string;
+		defaultOrgId: string;
+	}> = {};
+
+	if (firstName !== undefined) updatePayload.name = firstName;
+	if (lastName !== undefined) updatePayload.lastName = lastName;
+	if (defaultOrgId !== undefined) {
 		const userOrganizations = await db()
 			.select({
 				id: organizations.id,
@@ -46,15 +53,13 @@ export async function patchAccountSettings(
 			throw new Error(
 				"Forbidden: User does not have access to the specified organization",
 			);
+
+		updatePayload.defaultOrgId = defaultOrgId;
 	}
 
 	await db()
 		.update(users)
-		.set({
-			name: firstName,
-			lastName,
-			defaultOrgId,
-		})
+		.set(updatePayload)
 		.where(eq(users.id, currentUser.id));
 
 	revalidatePath("/dashboard/settings/account");

From 61713b8261c2d86efca2445af509d5c27e26a065 Mon Sep 17 00:00:00 2001
From: Oscar Beaumont <oscar@otbeaumont.me>
Date: Wed, 1 Oct 2025 16:54:24 +1000
Subject: [PATCH 21/27] fix

---
 apps/web/app/(org)/dashboard/settings/account/Settings.tsx | 4 ++--
 apps/web/app/api/desktop/[...route]/video.ts               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/web/app/(org)/dashboard/settings/account/Settings.tsx b/apps/web/app/(org)/dashboard/settings/account/Settings.tsx
index c763be08d..688172bd0 100644
--- a/apps/web/app/(org)/dashboard/settings/account/Settings.tsx
+++ b/apps/web/app/(org)/dashboard/settings/account/Settings.tsx
@@ -33,7 +33,7 @@ export const Settings = ({
 	const hasChanges =
 		firstName !== (user?.name || "") ||
 		lastName !== (user?.lastName || "") ||
-		(defaultOrgId ?? null) !== (user?.defaultOrgId ?? null);
+		defaultOrgId !== user?.defaultOrgId;
 
 	const { mutate: updateName, isPending: updateNamePending } = useMutation({
 		mutationFn: async () => {
@@ -139,7 +139,7 @@ export const Settings = ({
 				</Card>
 			</div>
 			<Button
-				disabled={!firstName || updateNamePending}
+				disabled={!firstName || updateNamePending || !hasChanges}
 				className="mt-6"
 				type="submit"
 				size="sm"
diff --git a/apps/web/app/api/desktop/[...route]/video.ts b/apps/web/app/api/desktop/[...route]/video.ts
index ff8afd5c4..b28c7352c 100644
--- a/apps/web/app/api/desktop/[...route]/video.ts
+++ b/apps/web/app/api/desktop/[...route]/video.ts
@@ -125,7 +125,7 @@ app.get(
 				.orderBy(organizations.createdAt);
 			const userOrgIds = userOrganizations.map((org) => org.id);
 
-			let videoOrgId: string | undefined;
+			let videoOrgId: string;
 			if (orgId) {
 				// Hard error if the user requested org is non-existent or they don't have access.
 				if (!userOrgIds.includes(orgId))

From 0d8587ba1d1899f6d8d6f99ab84be092316565cd Mon Sep 17 00:00:00 2001
From: Oscar Beaumont <oscar@otbeaumont.me>
Date: Wed, 1 Oct 2025 17:03:53 +1000
Subject: [PATCH 22/27] assign default properly

---
 apps/web/app/(org)/dashboard/settings/account/Settings.tsx | 4 ++++
 apps/web/app/api/desktop/[...route]/video.ts               | 1 +
 2 files changed, 5 insertions(+)

diff --git a/apps/web/app/(org)/dashboard/settings/account/Settings.tsx b/apps/web/app/(org)/dashboard/settings/account/Settings.tsx
index 688172bd0..3ad5ab8cc 100644
--- a/apps/web/app/(org)/dashboard/settings/account/Settings.tsx
+++ b/apps/web/app/(org)/dashboard/settings/account/Settings.tsx
@@ -29,6 +29,10 @@ export const Settings = ({
 		user?.defaultOrgId || undefined,
 	);
 
+	if (!defaultOrgId && user?.defaultOrgId) setDefaultOrgId(user.defaultOrgId);
+	if (!defaultOrgId && organizationData?.[0])
+		setDefaultOrgId(organizationData[0].organization.id);
+
 	// Track if form has unsaved changes
 	const hasChanges =
 		firstName !== (user?.name || "") ||
diff --git a/apps/web/app/api/desktop/[...route]/video.ts b/apps/web/app/api/desktop/[...route]/video.ts
index b28c7352c..7d401e702 100644
--- a/apps/web/app/api/desktop/[...route]/video.ts
+++ b/apps/web/app/api/desktop/[...route]/video.ts
@@ -148,6 +148,7 @@ app.get(
 						.where(eq(users.id, user.id));
 				} else videoOrgId = user.defaultOrgId;
 			}
+			if (!videoOrgId) throw new Error("Unreachable");
 
 			const idToUse = Video.VideoId.make(nanoId());
 

From a6ff99c382ea897bcacbcd92abebb5a1b4d2b2be Mon Sep 17 00:00:00 2001
From: Oscar Beaumont <oscar@otbeaumont.me>
Date: Wed, 1 Oct 2025 17:05:01 +1000
Subject: [PATCH 23/27] nahhhh

---
 apps/web/app/(org)/dashboard/settings/account/Settings.tsx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/apps/web/app/(org)/dashboard/settings/account/Settings.tsx b/apps/web/app/(org)/dashboard/settings/account/Settings.tsx
index 3ad5ab8cc..688172bd0 100644
--- a/apps/web/app/(org)/dashboard/settings/account/Settings.tsx
+++ b/apps/web/app/(org)/dashboard/settings/account/Settings.tsx
@@ -29,10 +29,6 @@ export const Settings = ({
 		user?.defaultOrgId || undefined,
 	);
 
-	if (!defaultOrgId && user?.defaultOrgId) setDefaultOrgId(user.defaultOrgId);
-	if (!defaultOrgId && organizationData?.[0])
-		setDefaultOrgId(organizationData[0].organization.id);
-
 	// Track if form has unsaved changes
 	const hasChanges =
 		firstName !== (user?.name || "") ||

From 88bf9dffa02d90de0df4ea34d81c98a895521eea Mon Sep 17 00:00:00 2001
From: Oscar Beaumont <oscar@otbeaumont.me>
Date: Wed, 1 Oct 2025 20:40:54 +1000
Subject: [PATCH 24/27] fix types

---
 apps/web/app/api/desktop/[...route]/video.ts |   3 +-
 pnpm-lock.yaml                               | 149 ++++++++-----------
 2 files changed, 67 insertions(+), 85 deletions(-)

diff --git a/apps/web/app/api/desktop/[...route]/video.ts b/apps/web/app/api/desktop/[...route]/video.ts
index 7d401e702..140240eff 100644
--- a/apps/web/app/api/desktop/[...route]/video.ts
+++ b/apps/web/app/api/desktop/[...route]/video.ts
@@ -125,7 +125,7 @@ app.get(
 				.orderBy(organizations.createdAt);
 			const userOrgIds = userOrganizations.map((org) => org.id);
 
-			let videoOrgId: string;
+			let videoOrgId!: string;
 			if (orgId) {
 				// Hard error if the user requested org is non-existent or they don't have access.
 				if (!userOrgIds.includes(orgId))
@@ -148,7 +148,6 @@ app.get(
 						.where(eq(users.id, user.id));
 				} else videoOrgId = user.defaultOrgId;
 			}
-			if (!videoOrgId) throw new Error("Unreachable");
 
 			const idToUse = Video.VideoId.make(nanoId());
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a3161b459..d7ad0a9df 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -112,7 +112,7 @@ importers:
         version: 0.14.10(solid-js@1.9.6)
       '@solidjs/start':
         specifier: ^1.1.3
-        version: 1.1.3(@testing-library/jest-dom@6.5.0)(@types/node@22.15.17)(jiti@2.4.2)(solid-js@1.9.6)(terser@5.44.0)(vinxi@0.5.6(@planetscale/database@1.19.0)(@types/node@22.15.17)(db0@0.3.2(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(mysql2@3.14.1))(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(encoding@0.1.13)(ioredis@5.6.1)(jiti@2.4.2)(mysql2@3.14.1)(terser@5.44.0)(xml2js@0.6.2)(yaml@2.8.1))(vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1))(yaml@2.8.1)
+        version: 1.1.3(@testing-library/jest-dom@6.5.0)(@types/node@22.15.17)(jiti@2.4.2)(solid-js@1.9.6)(terser@5.44.0)(tsx@4.20.6)(vinxi@0.5.6(@planetscale/database@1.19.0)(@types/node@22.15.17)(db0@0.3.2(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(mysql2@3.14.1))(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(encoding@0.1.13)(ioredis@5.6.1)(jiti@2.4.2)(mysql2@3.14.1)(terser@5.44.0)(tsx@4.20.6)(xml2js@0.6.2)(yaml@2.8.1))(vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1))(yaml@2.8.1)
       '@tanstack/solid-query':
         specifier: ^5.51.21
         version: 5.75.4(solid-js@1.9.6)
@@ -199,7 +199,7 @@ importers:
         version: 9.0.1
       vinxi:
         specifier: ^0.5.6
-        version: 0.5.6(@planetscale/database@1.19.0)(@types/node@22.15.17)(db0@0.3.2(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(mysql2@3.14.1))(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(encoding@0.1.13)(ioredis@5.6.1)(jiti@2.4.2)(mysql2@3.14.1)(terser@5.44.0)(xml2js@0.6.2)(yaml@2.8.1)
+        version: 0.5.6(@planetscale/database@1.19.0)(@types/node@22.15.17)(db0@0.3.2(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(mysql2@3.14.1))(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(encoding@0.1.13)(ioredis@5.6.1)(jiti@2.4.2)(mysql2@3.14.1)(terser@5.44.0)(tsx@4.20.6)(xml2js@0.6.2)(yaml@2.8.1)
       webcodecs:
         specifier: ^0.1.0
         version: 0.1.0
@@ -233,10 +233,10 @@ importers:
         version: 5.8.3
       vite:
         specifier: ^6.3.5
-        version: 6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1)
+        version: 6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1)
       vite-tsconfig-paths:
         specifier: ^5.0.1
-        version: 5.1.4(typescript@5.8.3)(vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1))
+        version: 5.1.4(typescript@5.8.3)(vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1))
       vitest:
         specifier: ~2.1.9
         version: 2.1.9(@types/node@22.15.17)(jsdom@26.1.0)(terser@5.44.0)
@@ -328,16 +328,16 @@ importers:
         version: 1.0.0-beta.7(@storybook/test@8.6.12(storybook@8.6.12(prettier@3.5.3)))(solid-js@1.9.6)(storybook@8.6.12(prettier@3.5.3))
       storybook-solidjs-vite:
         specifier: ^1.0.0-beta.2
-        version: 1.0.0-beta.7(@storybook/test@8.6.12(storybook@8.6.12(prettier@3.5.3)))(esbuild@0.25.4)(rollup@4.40.2)(solid-js@1.9.6)(storybook@8.6.12(prettier@3.5.3))(vite-plugin-solid@2.11.6(@testing-library/jest-dom@6.5.0)(solid-js@1.9.6)(vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1)))(vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1))(webpack@5.101.3(esbuild@0.25.4))
+        version: 1.0.0-beta.7(@storybook/test@8.6.12(storybook@8.6.12(prettier@3.5.3)))(esbuild@0.25.4)(rollup@4.40.2)(solid-js@1.9.6)(storybook@8.6.12(prettier@3.5.3))(vite-plugin-solid@2.11.6(@testing-library/jest-dom@6.5.0)(solid-js@1.9.6)(vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1)))(vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1))(webpack@5.101.3(esbuild@0.25.4))
       typescript:
         specifier: ^5.8.3
         version: 5.8.3
       vite:
         specifier: ^6.3.5
-        version: 6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1)
+        version: 6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1)
       vite-plugin-solid:
         specifier: ^2.10.2
-        version: 2.11.6(@testing-library/jest-dom@6.5.0)(solid-js@1.9.6)(vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1))
+        version: 2.11.6(@testing-library/jest-dom@6.5.0)(solid-js@1.9.6)(vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1))
 
   apps/tasks:
     dependencies:
@@ -897,13 +897,13 @@ importers:
     dependencies:
       '@vitejs/plugin-react':
         specifier: ^4.0.3
-        version: 4.4.1(vite@6.3.5(@types/node@20.17.43)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1))
+        version: 4.4.1(vite@6.3.5(@types/node@20.17.43)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1))
       vite:
         specifier: ^6.3.5
-        version: 6.3.5(@types/node@20.17.43)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1)
+        version: 6.3.5(@types/node@20.17.43)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1)
       vite-tsconfig-paths:
         specifier: ^4.2.0
-        version: 4.3.2(typescript@5.8.3)(vite@6.3.5(@types/node@20.17.43)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1))
+        version: 4.3.2(typescript@5.8.3)(vite@6.3.5(@types/node@20.17.43)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1))
       zod:
         specifier: ^3
         version: 3.25.76
@@ -1130,7 +1130,7 @@ importers:
         version: 19.1.9(@types/react@19.1.13)
       '@vitejs/plugin-react':
         specifier: ^4.0.3
-        version: 4.4.1(vite@6.3.5(@types/node@20.17.43)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1))
+        version: 4.4.1(vite@6.3.5(@types/node@20.17.43)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1))
       autoprefixer:
         specifier: ^10.4.16
         version: 10.4.21(postcss@8.5.3)
@@ -1172,10 +1172,10 @@ importers:
         version: 5.8.3
       vite:
         specifier: ^6.3.5
-        version: 6.3.5(@types/node@20.17.43)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1)
+        version: 6.3.5(@types/node@20.17.43)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1)
       vite-tsconfig-paths:
         specifier: ^4.2.1
-        version: 4.3.2(typescript@5.8.3)(vite@6.3.5(@types/node@20.17.43)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1))
+        version: 4.3.2(typescript@5.8.3)(vite@6.3.5(@types/node@20.17.43)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1))
 
   packages/ui-solid:
     dependencies:
@@ -1227,7 +1227,7 @@ importers:
         version: 0.18.6(rollup@4.40.2)
       unplugin-fonts:
         specifier: ^1.1.1
-        version: 1.3.1(vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1))
+        version: 1.3.1(vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1))
       unplugin-icons:
         specifier: ^0.19.2
         version: 0.19.3
@@ -1356,21 +1356,6 @@ importers:
         specifier: ^3.17.14
         version: 3.17.14
 
-  scripts/orgid_backfill:
-    dependencies:
-      '@cap/database':
-        specifier: workspace:^
-        version: link:../../packages/database
-      dotenv:
-        specifier: ^17.2.3
-        version: 17.2.3
-      drizzle-orm:
-        specifier: 0.44.5
-        version: 0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1)
-      tsx:
-        specifier: ^4.20.6
-        version: 4.20.6
-
 packages:
 
   '@adobe/css-tools@4.4.2':
@@ -5986,10 +5971,10 @@ packages:
       react-dom:
         optional: true
 
-  '@storybook/builder-vite@10.0.0-beta.7':
-    resolution: {integrity: sha512-Bo7HKAuwSVfz3VRmlAPRwT7us7LPeXj2aJ5Mh4qmTHYpctEXDJufoXAAtXV1oMS/I512k/S2XlX6djbNpoFSlw==}
+  '@storybook/builder-vite@10.0.0-beta.8':
+    resolution: {integrity: sha512-KlIdcmvjbB9WgrjSml9vmCDKqnLu6s88K9V/BsTklfKr71Nh0LEiltpiIsVabXmk8FcxWsVbvecoui0NcawWtA==}
     peerDependencies:
-      storybook: ^10.0.0-beta.7
+      storybook: ^10.0.0-beta.8
       vite: ^5.0.0 || ^6.0.0 || ^7.0.0
 
   '@storybook/core@8.6.12':
@@ -6000,12 +5985,12 @@ packages:
       prettier:
         optional: true
 
-  '@storybook/csf-plugin@10.0.0-beta.7':
-    resolution: {integrity: sha512-1nkH+vriwFbwqeCItJE2mUfw3vYECgDrwBWlSpKenVrgTNjU6KnbHLrYlLUmSivabtXAhl/3NH3XlxNjaCpFfA==}
+  '@storybook/csf-plugin@10.0.0-beta.8':
+    resolution: {integrity: sha512-nwMQ51ZTI8bPy15iar49frYByW9Fwq+UM6RkF0ExoPaDqV32VPZW46ChhTGVaKH6mHmZR7sNAXdboxulXGTP0Q==}
     peerDependencies:
       esbuild: '*'
       rollup: '*'
-      storybook: ^10.0.0-beta.7
+      storybook: ^10.0.0-beta.8
       vite: '*'
       webpack: '*'
     peerDependenciesMeta:
@@ -8448,10 +8433,6 @@ packages:
     resolution: {integrity: sha512-kQhDYKZecqnM0fCnzI5eIv5L4cAe/iRI+HqMbO/hbRdTAeXDG+M9FjipUxNfbARuEg4iHIbhnhs78BCHNbSxEQ==}
     engines: {node: '>=12'}
 
-  dotenv@17.2.3:
-    resolution: {integrity: sha512-JVUnt+DUIzu87TABbhPmNfVdBDt18BLOWjMUFJMSi/Qqg7NTYtabbvSNJGOJ7afbRuv9D/lngizHtP7QyLQ+9w==}
-    engines: {node: '>=12'}
-
   drizzle-kit@0.31.0:
     resolution: {integrity: sha512-pcKVT+GbfPA+bUovPIilgVOoq+onNBo/YQBG86sf3/GFHkN6lRJPm1l7dKN0IMAk57RQoIm4GUllRrasLlcaSg==}
     hasBin: true
@@ -19371,11 +19352,11 @@ snapshots:
     dependencies:
       solid-js: 1.9.6
 
-  '@solidjs/start@1.1.3(@testing-library/jest-dom@6.5.0)(@types/node@22.15.17)(jiti@2.4.2)(solid-js@1.9.6)(terser@5.44.0)(vinxi@0.5.6(@planetscale/database@1.19.0)(@types/node@22.15.17)(db0@0.3.2(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(mysql2@3.14.1))(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(encoding@0.1.13)(ioredis@5.6.1)(jiti@2.4.2)(mysql2@3.14.1)(terser@5.44.0)(xml2js@0.6.2)(yaml@2.8.1))(vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1))(yaml@2.8.1)':
+  '@solidjs/start@1.1.3(@testing-library/jest-dom@6.5.0)(@types/node@22.15.17)(jiti@2.4.2)(solid-js@1.9.6)(terser@5.44.0)(tsx@4.20.6)(vinxi@0.5.6(@planetscale/database@1.19.0)(@types/node@22.15.17)(db0@0.3.2(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(mysql2@3.14.1))(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(encoding@0.1.13)(ioredis@5.6.1)(jiti@2.4.2)(mysql2@3.14.1)(terser@5.44.0)(tsx@4.20.6)(xml2js@0.6.2)(yaml@2.8.1))(vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1))(yaml@2.8.1)':
     dependencies:
-      '@tanstack/server-functions-plugin': 1.119.2(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1)
-      '@vinxi/plugin-directives': 0.5.1(vinxi@0.5.6(@planetscale/database@1.19.0)(@types/node@22.15.17)(db0@0.3.2(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(mysql2@3.14.1))(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(encoding@0.1.13)(ioredis@5.6.1)(jiti@2.4.2)(mysql2@3.14.1)(terser@5.44.0)(xml2js@0.6.2)(yaml@2.8.1))
-      '@vinxi/server-components': 0.5.1(vinxi@0.5.6(@planetscale/database@1.19.0)(@types/node@22.15.17)(db0@0.3.2(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(mysql2@3.14.1))(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(encoding@0.1.13)(ioredis@5.6.1)(jiti@2.4.2)(mysql2@3.14.1)(terser@5.44.0)(xml2js@0.6.2)(yaml@2.8.1))
+      '@tanstack/server-functions-plugin': 1.119.2(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1)
+      '@vinxi/plugin-directives': 0.5.1(vinxi@0.5.6(@planetscale/database@1.19.0)(@types/node@22.15.17)(db0@0.3.2(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(mysql2@3.14.1))(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(encoding@0.1.13)(ioredis@5.6.1)(jiti@2.4.2)(mysql2@3.14.1)(terser@5.44.0)(tsx@4.20.6)(xml2js@0.6.2)(yaml@2.8.1))
+      '@vinxi/server-components': 0.5.1(vinxi@0.5.6(@planetscale/database@1.19.0)(@types/node@22.15.17)(db0@0.3.2(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(mysql2@3.14.1))(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(encoding@0.1.13)(ioredis@5.6.1)(jiti@2.4.2)(mysql2@3.14.1)(terser@5.44.0)(tsx@4.20.6)(xml2js@0.6.2)(yaml@2.8.1))
       defu: 6.1.4
       error-stack-parser: 2.1.4
       html-to-image: 1.11.13
@@ -19386,8 +19367,8 @@ snapshots:
       source-map-js: 1.2.1
       terracotta: 1.0.6(solid-js@1.9.6)
       tinyglobby: 0.2.13
-      vinxi: 0.5.6(@planetscale/database@1.19.0)(@types/node@22.15.17)(db0@0.3.2(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(mysql2@3.14.1))(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(encoding@0.1.13)(ioredis@5.6.1)(jiti@2.4.2)(mysql2@3.14.1)(terser@5.44.0)(xml2js@0.6.2)(yaml@2.8.1)
-      vite-plugin-solid: 2.11.6(@testing-library/jest-dom@6.5.0)(solid-js@1.9.6)(vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1))
+      vinxi: 0.5.6(@planetscale/database@1.19.0)(@types/node@22.15.17)(db0@0.3.2(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(mysql2@3.14.1))(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(encoding@0.1.13)(ioredis@5.6.1)(jiti@2.4.2)(mysql2@3.14.1)(terser@5.44.0)(tsx@4.20.6)(xml2js@0.6.2)(yaml@2.8.1)
+      vite-plugin-solid: 2.11.6(@testing-library/jest-dom@6.5.0)(solid-js@1.9.6)(vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1))
     transitivePeerDependencies:
       - '@testing-library/jest-dom'
       - '@types/node'
@@ -19514,12 +19495,12 @@ snapshots:
       react: 19.1.1
       react-dom: 19.1.1(react@19.1.1)
 
-  '@storybook/builder-vite@10.0.0-beta.7(esbuild@0.25.4)(rollup@4.40.2)(storybook@8.6.12(prettier@3.5.3))(vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1))(webpack@5.101.3(esbuild@0.25.4))':
+  '@storybook/builder-vite@10.0.0-beta.8(esbuild@0.25.4)(rollup@4.40.2)(storybook@8.6.12(prettier@3.5.3))(vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1))(webpack@5.101.3(esbuild@0.25.4))':
     dependencies:
-      '@storybook/csf-plugin': 10.0.0-beta.7(esbuild@0.25.4)(rollup@4.40.2)(storybook@8.6.12(prettier@3.5.3))(vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1))(webpack@5.101.3(esbuild@0.25.4))
+      '@storybook/csf-plugin': 10.0.0-beta.8(esbuild@0.25.4)(rollup@4.40.2)(storybook@8.6.12(prettier@3.5.3))(vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1))(webpack@5.101.3(esbuild@0.25.4))
       storybook: 8.6.12(prettier@3.5.3)
       ts-dedent: 2.2.0
-      vite: 6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1)
+      vite: 6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1)
     transitivePeerDependencies:
       - esbuild
       - rollup
@@ -19546,14 +19527,14 @@ snapshots:
       - supports-color
       - utf-8-validate
 
-  '@storybook/csf-plugin@10.0.0-beta.7(esbuild@0.25.4)(rollup@4.40.2)(storybook@8.6.12(prettier@3.5.3))(vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1))(webpack@5.101.3(esbuild@0.25.4))':
+  '@storybook/csf-plugin@10.0.0-beta.8(esbuild@0.25.4)(rollup@4.40.2)(storybook@8.6.12(prettier@3.5.3))(vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1))(webpack@5.101.3(esbuild@0.25.4))':
     dependencies:
       storybook: 8.6.12(prettier@3.5.3)
       unplugin: 2.3.10
     optionalDependencies:
       esbuild: 0.25.4
       rollup: 4.40.2
-      vite: 6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1)
+      vite: 6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1)
       webpack: 5.101.3(esbuild@0.25.4)
 
   '@storybook/csf-plugin@8.6.12(storybook@8.6.12(prettier@3.5.3))':
@@ -19689,7 +19670,7 @@ snapshots:
       - csstype
       - utf-8-validate
 
-  '@tanstack/directive-functions-plugin@1.119.2(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1)':
+  '@tanstack/directive-functions-plugin@1.119.2(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1)':
     dependencies:
       '@babel/code-frame': 7.26.2
       '@babel/core': 7.27.1
@@ -19702,7 +19683,7 @@ snapshots:
       babel-dead-code-elimination: 1.0.10
       dedent: 1.6.0
       tiny-invariant: 1.3.3
-      vite: 6.1.4(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1)
+      vite: 6.1.4(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1)
     transitivePeerDependencies:
       - '@types/node'
       - babel-plugin-macros
@@ -19774,7 +19755,7 @@ snapshots:
       ansis: 3.17.0
       diff: 7.0.0
 
-  '@tanstack/server-functions-plugin@1.119.2(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1)':
+  '@tanstack/server-functions-plugin@1.119.2(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1)':
     dependencies:
       '@babel/code-frame': 7.26.2
       '@babel/core': 7.27.1
@@ -19783,7 +19764,7 @@ snapshots:
       '@babel/template': 7.27.2
       '@babel/traverse': 7.27.1
       '@babel/types': 7.27.1
-      '@tanstack/directive-functions-plugin': 1.119.2(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1)
+      '@tanstack/directive-functions-plugin': 1.119.2(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1)
       babel-dead-code-elimination: 1.0.10
       dedent: 1.6.0
       tiny-invariant: 1.3.3
@@ -20710,7 +20691,7 @@ snapshots:
       untun: 0.1.3
       uqr: 0.1.2
 
-  '@vinxi/plugin-directives@0.5.1(vinxi@0.5.6(@planetscale/database@1.19.0)(@types/node@22.15.17)(db0@0.3.2(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(mysql2@3.14.1))(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(encoding@0.1.13)(ioredis@5.6.1)(jiti@2.4.2)(mysql2@3.14.1)(terser@5.44.0)(xml2js@0.6.2)(yaml@2.8.1))':
+  '@vinxi/plugin-directives@0.5.1(vinxi@0.5.6(@planetscale/database@1.19.0)(@types/node@22.15.17)(db0@0.3.2(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(mysql2@3.14.1))(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(encoding@0.1.13)(ioredis@5.6.1)(jiti@2.4.2)(mysql2@3.14.1)(terser@5.44.0)(tsx@4.20.6)(xml2js@0.6.2)(yaml@2.8.1))':
     dependencies:
       '@babel/parser': 7.27.2
       acorn: 8.14.1
@@ -20721,18 +20702,18 @@ snapshots:
       magicast: 0.2.11
       recast: 0.23.11
       tslib: 2.8.1
-      vinxi: 0.5.6(@planetscale/database@1.19.0)(@types/node@22.15.17)(db0@0.3.2(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(mysql2@3.14.1))(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(encoding@0.1.13)(ioredis@5.6.1)(jiti@2.4.2)(mysql2@3.14.1)(terser@5.44.0)(xml2js@0.6.2)(yaml@2.8.1)
+      vinxi: 0.5.6(@planetscale/database@1.19.0)(@types/node@22.15.17)(db0@0.3.2(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(mysql2@3.14.1))(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(encoding@0.1.13)(ioredis@5.6.1)(jiti@2.4.2)(mysql2@3.14.1)(terser@5.44.0)(tsx@4.20.6)(xml2js@0.6.2)(yaml@2.8.1)
 
-  '@vinxi/server-components@0.5.1(vinxi@0.5.6(@planetscale/database@1.19.0)(@types/node@22.15.17)(db0@0.3.2(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(mysql2@3.14.1))(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(encoding@0.1.13)(ioredis@5.6.1)(jiti@2.4.2)(mysql2@3.14.1)(terser@5.44.0)(xml2js@0.6.2)(yaml@2.8.1))':
+  '@vinxi/server-components@0.5.1(vinxi@0.5.6(@planetscale/database@1.19.0)(@types/node@22.15.17)(db0@0.3.2(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(mysql2@3.14.1))(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(encoding@0.1.13)(ioredis@5.6.1)(jiti@2.4.2)(mysql2@3.14.1)(terser@5.44.0)(tsx@4.20.6)(xml2js@0.6.2)(yaml@2.8.1))':
     dependencies:
-      '@vinxi/plugin-directives': 0.5.1(vinxi@0.5.6(@planetscale/database@1.19.0)(@types/node@22.15.17)(db0@0.3.2(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(mysql2@3.14.1))(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(encoding@0.1.13)(ioredis@5.6.1)(jiti@2.4.2)(mysql2@3.14.1)(terser@5.44.0)(xml2js@0.6.2)(yaml@2.8.1))
+      '@vinxi/plugin-directives': 0.5.1(vinxi@0.5.6(@planetscale/database@1.19.0)(@types/node@22.15.17)(db0@0.3.2(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(mysql2@3.14.1))(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(encoding@0.1.13)(ioredis@5.6.1)(jiti@2.4.2)(mysql2@3.14.1)(terser@5.44.0)(tsx@4.20.6)(xml2js@0.6.2)(yaml@2.8.1))
       acorn: 8.14.1
       acorn-loose: 8.5.0
       acorn-typescript: 1.4.13(acorn@8.14.1)
       astring: 1.9.0
       magicast: 0.2.11
       recast: 0.23.11
-      vinxi: 0.5.6(@planetscale/database@1.19.0)(@types/node@22.15.17)(db0@0.3.2(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(mysql2@3.14.1))(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(encoding@0.1.13)(ioredis@5.6.1)(jiti@2.4.2)(mysql2@3.14.1)(terser@5.44.0)(xml2js@0.6.2)(yaml@2.8.1)
+      vinxi: 0.5.6(@planetscale/database@1.19.0)(@types/node@22.15.17)(db0@0.3.2(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(mysql2@3.14.1))(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(encoding@0.1.13)(ioredis@5.6.1)(jiti@2.4.2)(mysql2@3.14.1)(terser@5.44.0)(tsx@4.20.6)(xml2js@0.6.2)(yaml@2.8.1)
 
   '@virtual-grid/core@2.0.1': {}
 
@@ -20750,14 +20731,14 @@ snapshots:
 
   '@virtual-grid/shared@2.0.1': {}
 
-  '@vitejs/plugin-react@4.4.1(vite@6.3.5(@types/node@20.17.43)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1))':
+  '@vitejs/plugin-react@4.4.1(vite@6.3.5(@types/node@20.17.43)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1))':
     dependencies:
       '@babel/core': 7.27.1
       '@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/core@7.27.1)
       '@babel/plugin-transform-react-jsx-source': 7.27.1(@babel/core@7.27.1)
       '@types/babel__core': 7.20.5
       react-refresh: 0.17.0
-      vite: 6.3.5(@types/node@20.17.43)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1)
+      vite: 6.3.5(@types/node@20.17.43)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -22305,8 +22286,6 @@ snapshots:
 
   dotenv@17.2.1: {}
 
-  dotenv@17.2.3: {}
-
   drizzle-kit@0.31.0:
     dependencies:
       '@drizzle-team/brocli': 0.10.2
@@ -27950,16 +27929,16 @@ snapshots:
 
   stoppable@1.1.0: {}
 
-  storybook-solidjs-vite@1.0.0-beta.7(@storybook/test@8.6.12(storybook@8.6.12(prettier@3.5.3)))(esbuild@0.25.4)(rollup@4.40.2)(solid-js@1.9.6)(storybook@8.6.12(prettier@3.5.3))(vite-plugin-solid@2.11.6(@testing-library/jest-dom@6.5.0)(solid-js@1.9.6)(vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1)))(vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1))(webpack@5.101.3(esbuild@0.25.4)):
+  storybook-solidjs-vite@1.0.0-beta.7(@storybook/test@8.6.12(storybook@8.6.12(prettier@3.5.3)))(esbuild@0.25.4)(rollup@4.40.2)(solid-js@1.9.6)(storybook@8.6.12(prettier@3.5.3))(vite-plugin-solid@2.11.6(@testing-library/jest-dom@6.5.0)(solid-js@1.9.6)(vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1)))(vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1))(webpack@5.101.3(esbuild@0.25.4)):
     dependencies:
-      '@storybook/builder-vite': 10.0.0-beta.7(esbuild@0.25.4)(rollup@4.40.2)(storybook@8.6.12(prettier@3.5.3))(vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1))(webpack@5.101.3(esbuild@0.25.4))
+      '@storybook/builder-vite': 10.0.0-beta.8(esbuild@0.25.4)(rollup@4.40.2)(storybook@8.6.12(prettier@3.5.3))(vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1))(webpack@5.101.3(esbuild@0.25.4))
       '@storybook/types': 9.0.0-alpha.1(storybook@8.6.12(prettier@3.5.3))
       magic-string: 0.30.17
       solid-js: 1.9.6
       storybook: 8.6.12(prettier@3.5.3)
       storybook-solidjs: 1.0.0-beta.7(@storybook/test@8.6.12(storybook@8.6.12(prettier@3.5.3)))(solid-js@1.9.6)(storybook@8.6.12(prettier@3.5.3))
-      vite: 6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1)
-      vite-plugin-solid: 2.11.6(@testing-library/jest-dom@6.5.0)(solid-js@1.9.6)(vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1))
+      vite: 6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1)
+      vite-plugin-solid: 2.11.6(@testing-library/jest-dom@6.5.0)(solid-js@1.9.6)(vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1))
     transitivePeerDependencies:
       - '@storybook/test'
       - esbuild
@@ -28561,6 +28540,7 @@ snapshots:
       get-tsconfig: 4.10.0
     optionalDependencies:
       fsevents: 2.3.3
+    optional: true
 
   tuf-js@2.2.1:
     dependencies:
@@ -28860,11 +28840,11 @@ snapshots:
     transitivePeerDependencies:
       - rollup
 
-  unplugin-fonts@1.3.1(vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1)):
+  unplugin-fonts@1.3.1(vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1)):
     dependencies:
       fast-glob: 3.3.3
       unplugin: 2.0.0-beta.1
-      vite: 6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1)
+      vite: 6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1)
 
   unplugin-icons@0.19.3:
     dependencies:
@@ -29087,7 +29067,7 @@ snapshots:
       '@types/unist': 3.0.3
       vfile-message: 4.0.2
 
-  vinxi@0.5.6(@planetscale/database@1.19.0)(@types/node@22.15.17)(db0@0.3.2(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(mysql2@3.14.1))(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(encoding@0.1.13)(ioredis@5.6.1)(jiti@2.4.2)(mysql2@3.14.1)(terser@5.44.0)(xml2js@0.6.2)(yaml@2.8.1):
+  vinxi@0.5.6(@planetscale/database@1.19.0)(@types/node@22.15.17)(db0@0.3.2(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(mysql2@3.14.1))(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(encoding@0.1.13)(ioredis@5.6.1)(jiti@2.4.2)(mysql2@3.14.1)(terser@5.44.0)(tsx@4.20.6)(xml2js@0.6.2)(yaml@2.8.1):
     dependencies:
       '@babel/core': 7.27.1
       '@babel/plugin-syntax-jsx': 7.27.1(@babel/core@7.27.1)
@@ -29121,7 +29101,7 @@ snapshots:
       unctx: 2.4.1
       unenv: 1.10.0
       unstorage: 1.16.0(@planetscale/database@1.19.0)(db0@0.3.2(drizzle-orm@0.44.5(@cloudflare/workers-types@4.20250507.0)(@opentelemetry/api@1.9.0)(@planetscale/database@1.19.0)(mysql2@3.14.1))(mysql2@3.14.1))(ioredis@5.6.1)
-      vite: 6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1)
+      vite: 6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1)
       zod: 3.25.76
     transitivePeerDependencies:
       - '@azure/app-configuration'
@@ -29183,7 +29163,7 @@ snapshots:
       - supports-color
       - terser
 
-  vite-plugin-solid@2.11.6(@testing-library/jest-dom@6.5.0)(solid-js@1.9.6)(vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1)):
+  vite-plugin-solid@2.11.6(@testing-library/jest-dom@6.5.0)(solid-js@1.9.6)(vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1)):
     dependencies:
       '@babel/core': 7.27.1
       '@types/babel__core': 7.20.5
@@ -29191,31 +29171,31 @@ snapshots:
       merge-anything: 5.1.7
       solid-js: 1.9.6
       solid-refresh: 0.6.3(solid-js@1.9.6)
-      vite: 6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1)
-      vitefu: 1.0.6(vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1))
+      vite: 6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1)
+      vitefu: 1.0.6(vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1))
     optionalDependencies:
       '@testing-library/jest-dom': 6.5.0
     transitivePeerDependencies:
       - supports-color
 
-  vite-tsconfig-paths@4.3.2(typescript@5.8.3)(vite@6.3.5(@types/node@20.17.43)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1)):
+  vite-tsconfig-paths@4.3.2(typescript@5.8.3)(vite@6.3.5(@types/node@20.17.43)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1)):
     dependencies:
       debug: 4.4.0(supports-color@5.5.0)
       globrex: 0.1.2
       tsconfck: 3.1.5(typescript@5.8.3)
     optionalDependencies:
-      vite: 6.3.5(@types/node@20.17.43)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1)
+      vite: 6.3.5(@types/node@20.17.43)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1)
     transitivePeerDependencies:
       - supports-color
       - typescript
 
-  vite-tsconfig-paths@5.1.4(typescript@5.8.3)(vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1)):
+  vite-tsconfig-paths@5.1.4(typescript@5.8.3)(vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1)):
     dependencies:
       debug: 4.4.0(supports-color@5.5.0)
       globrex: 0.1.2
       tsconfck: 3.1.5(typescript@5.8.3)
     optionalDependencies:
-      vite: 6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1)
+      vite: 6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1)
     transitivePeerDependencies:
       - supports-color
       - typescript
@@ -29230,7 +29210,7 @@ snapshots:
       fsevents: 2.3.3
       terser: 5.44.0
 
-  vite@6.1.4(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1):
+  vite@6.1.4(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1):
     dependencies:
       esbuild: 0.24.2
       postcss: 8.5.3
@@ -29240,9 +29220,10 @@ snapshots:
       fsevents: 2.3.3
       jiti: 2.4.2
       terser: 5.44.0
+      tsx: 4.20.6
       yaml: 2.8.1
 
-  vite@6.3.5(@types/node@20.17.43)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1):
+  vite@6.3.5(@types/node@20.17.43)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1):
     dependencies:
       esbuild: 0.25.4
       fdir: 6.4.4(picomatch@4.0.2)
@@ -29255,9 +29236,10 @@ snapshots:
       fsevents: 2.3.3
       jiti: 2.4.2
       terser: 5.44.0
+      tsx: 4.20.6
       yaml: 2.8.1
 
-  vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1):
+  vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1):
     dependencies:
       esbuild: 0.25.4
       fdir: 6.4.4(picomatch@4.0.2)
@@ -29270,11 +29252,12 @@ snapshots:
       fsevents: 2.3.3
       jiti: 2.4.2
       terser: 5.44.0
+      tsx: 4.20.6
       yaml: 2.8.1
 
-  vitefu@1.0.6(vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1)):
+  vitefu@1.0.6(vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1)):
     optionalDependencies:
-      vite: 6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1)
+      vite: 6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1)
 
   vitest@2.1.9(@types/node@22.15.17)(jsdom@26.1.0)(terser@5.44.0):
     dependencies:

From 932cd33859845a12c719e27347d4d58917791cb1 Mon Sep 17 00:00:00 2001
From: Oscar Beaumont <oscar@otbeaumont.me>
Date: Wed, 1 Oct 2025 20:41:27 +1000
Subject: [PATCH 25/27] fix

---
 apps/web/app/api/desktop/[...route]/video.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/app/api/desktop/[...route]/video.ts b/apps/web/app/api/desktop/[...route]/video.ts
index 140240eff..28c61c5ed 100644
--- a/apps/web/app/api/desktop/[...route]/video.ts
+++ b/apps/web/app/api/desktop/[...route]/video.ts
@@ -121,7 +121,7 @@ app.get(
 					),
 				)
 				// Remove duplicates if user is both owner and member
-				.groupBy(organizations.id)
+				.groupBy(organizations.id, organizations.name)
 				.orderBy(organizations.createdAt);
 			const userOrgIds = userOrganizations.map((org) => org.id);
 

From f910ca791cb627db09d94171488c24dd388625f6 Mon Sep 17 00:00:00 2001
From: Oscar Beaumont <oscar@otbeaumont.me>
Date: Wed, 1 Oct 2025 20:56:46 +1000
Subject: [PATCH 26/27] fix

---
 apps/web/app/api/desktop/[...route]/video.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/web/app/api/desktop/[...route]/video.ts b/apps/web/app/api/desktop/[...route]/video.ts
index 28c61c5ed..3f4d7d22b 100644
--- a/apps/web/app/api/desktop/[...route]/video.ts
+++ b/apps/web/app/api/desktop/[...route]/video.ts
@@ -125,7 +125,7 @@ app.get(
 				.orderBy(organizations.createdAt);
 			const userOrgIds = userOrganizations.map((org) => org.id);
 
-			let videoOrgId!: string;
+			let videoOrgId: string;
 			if (orgId) {
 				// Hard error if the user requested org is non-existent or they don't have access.
 				if (!userOrgIds.includes(orgId))
@@ -147,6 +147,11 @@ app.get(
 						})
 						.where(eq(users.id, user.id));
 				} else videoOrgId = user.defaultOrgId;
+			} else {
+				// No orgId provided and no defaultOrgId, use first available org
+				if (!userOrganizations[0])
+					return c.json({ error: "no_valid_org" }, { status: 403 });
+				videoOrgId = userOrganizations[0].id;
 			}
 
 			const idToUse = Video.VideoId.make(nanoId());

From 057da338401a536b5b3e2ec7389c311a88e574db Mon Sep 17 00:00:00 2001
From: ameer2468 <33054370+ameer2468@users.noreply.github.com>
Date: Thu, 2 Oct 2025 11:44:12 +0300
Subject: [PATCH 27/27] update select component

---
 .../dashboard/settings/account/Settings.tsx   |   3 +-
 apps/web/app/globals.css                      |   2 +-
 packages/ui/src/components/Select.tsx         | 270 ++++++++++++++----
 3 files changed, 222 insertions(+), 53 deletions(-)

diff --git a/apps/web/app/(org)/dashboard/settings/account/Settings.tsx b/apps/web/app/(org)/dashboard/settings/account/Settings.tsx
index 688172bd0..384c78438 100644
--- a/apps/web/app/(org)/dashboard/settings/account/Settings.tsx
+++ b/apps/web/app/(org)/dashboard/settings/account/Settings.tsx
@@ -124,13 +124,14 @@ export const Settings = ({
 					</div>
 
 					<Select
+						placeholder="Default organization"
 						value={
 							defaultOrgId ??
 							user?.defaultOrgId ??
 							organizationData?.[0]?.organization.id ??
 							""
 						}
-						onChange={(value) => setDefaultOrgId(value)}
+						onValueChange={(value) => setDefaultOrgId(value)}
 						options={(organizationData || []).map((org) => ({
 							value: org.organization.id,
 							label: org.organization.name,
diff --git a/apps/web/app/globals.css b/apps/web/app/globals.css
index 02c080b22..bff65ab6a 100644
--- a/apps/web/app/globals.css
+++ b/apps/web/app/globals.css
@@ -342,7 +342,7 @@ span,
 input,
 label,
 button {
-	@apply tracking-normal text-gray-10 font-normal leading-[1.5rem];
+	@apply tracking-normal font-normal leading-[1.5rem];
 }
 
 a {
diff --git a/packages/ui/src/components/Select.tsx b/packages/ui/src/components/Select.tsx
index 3a7fcaa40..b438b088c 100644
--- a/packages/ui/src/components/Select.tsx
+++ b/packages/ui/src/components/Select.tsx
@@ -1,66 +1,234 @@
 "use client";
 
-import * as RadixSelect from "@radix-ui/react-select";
-import clsx from "clsx";
-import { ChevronDown } from "lucide-react";
+import { classNames } from "@cap/utils";
+import * as SelectPrimitive from "@radix-ui/react-select";
+import { CheckIcon, ChevronDownIcon, ChevronUpIcon } from "lucide-react";
 import type * as React from "react";
 
-export interface SelectOption {
-	value: string;
-	label: string;
-	icon?: React.ReactNode;
+function Select({
+	options,
+	placeholder,
+	onValueChange,
+	value,
+	...props
+}: React.ComponentProps<typeof SelectPrimitive.Root> & {
+	options: { value: string; label: string }[];
+	onValueChange: (value: string) => void;
+	placeholder: string;
+}) {
+	return (
+		<SelectRoot
+			onValueChange={onValueChange}
+			value={value}
+			data-slot="select"
+			{...props}
+		>
+			<SelectTrigger>
+				<SelectValue placeholder={placeholder} />
+			</SelectTrigger>
+			<SelectContent>
+				{options.map((option) => (
+					<SelectItem key={option.value} value={option.value}>
+						{option.label}
+					</SelectItem>
+				))}
+			</SelectContent>
+		</SelectRoot>
+	);
 }
 
-export interface SelectProps {
-	value: string;
-	onChange: (value: string) => void;
-	options: SelectOption[];
-	placeholder?: string;
-	disabled?: boolean;
-	className?: string;
+function SelectRoot({
+	...props
+}: React.ComponentProps<typeof SelectPrimitive.Root>) {
+	return <SelectPrimitive.Root data-slot="select" {...props} />;
 }
 
-export const Select: React.FC<SelectProps> = ({
-	value,
-	onChange,
-	options,
-	placeholder = "Select...",
-	disabled = false,
-	className = "",
-}) => {
+function SelectGroup({
+	...props
+}: React.ComponentProps<typeof SelectPrimitive.Group>) {
+	return <SelectPrimitive.Group data-slot="select-group" {...props} />;
+}
+
+function SelectValue({
+	...props
+}: React.ComponentProps<typeof SelectPrimitive.Value>) {
+	return <SelectPrimitive.Value data-slot="select-value" {...props} />;
+}
+
+function SelectTrigger({
+	className,
+	size = "default",
+	children,
+	...props
+}: React.ComponentProps<typeof SelectPrimitive.Trigger> & {
+	size?: "sm" | "default";
+}) {
 	return (
-		<RadixSelect.Root
-			value={value}
-			onValueChange={onChange}
-			disabled={disabled}
+		<SelectPrimitive.Trigger
+			data-slot="select-trigger"
+			data-size={size}
+			className={classNames(
+				"flex px-4 w-full font-thin transition-all duration-200 text-[13px] text-gray-12 bg-gray-2 border-gray-5 outline-0 focus:bg-gray-3",
+				"rounded-xl hover:bg-gray-3 hover:border-gray-6 border-[1px] focus:border-gray-6 items-center justify-between gap-2 whitespace-nowrap",
+				"disabled:pointer-events-none disabled:cursor-not-allowed disabled:bg-gray-3 disabled:text-gray-9",
+				"ring-0 ring-gray-3 focus:ring-1 focus:ring-gray-12 focus:ring-offset-2 ring-offset-gray-4",
+				"data-[placeholder]:text-gray-9 data-[size=default]:h-[44px] data-[size=sm]:h-[40px]",
+				"*:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center *:data-[slot=select-value]:gap-2",
+				"[&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+				className,
+			)}
+			{...props}
 		>
-			<RadixSelect.Trigger
-				className={clsx(
-					"flex items-center px-2 h-10 rounded-xl border bg-gray-3 border-gray-4 hover:bg-gray-5 group hover:border-gray-6 focus:ring-0 focus:ring-offset-0 focus:outline-0 text-[15px]",
-					disabled && "opacity-50 cursor-not-allowed",
+			{children}
+			<SelectPrimitive.Icon asChild>
+				<ChevronDownIcon className="opacity-50 size-4" />
+			</SelectPrimitive.Icon>
+		</SelectPrimitive.Trigger>
+	);
+}
+
+function SelectContent({
+	className,
+	children,
+	position = "popper",
+	...props
+}: React.ComponentProps<typeof SelectPrimitive.Content>) {
+	return (
+		<SelectPrimitive.Portal>
+			<SelectPrimitive.Content
+				data-slot="select-content"
+				className={classNames(
+					"bg-gray-2 text-gray-12 border-gray-5 relative z-50 max-h-(--radix-select-content-available-height) min-w-[8rem]",
+					"origin-(--radix-select-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-xl border-[1px] shadow-md",
+					"data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",
+					"data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95",
+					"data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
+					position === "popper" &&
+						"data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1",
 					className,
 				)}
-				aria-label={placeholder}
+				position={position}
+				{...props}
 			>
-				<RadixSelect.Value placeholder={placeholder} />
-				<RadixSelect.Icon asChild>
-					<ChevronDown className="ml-2 text-gray-9" size={18} />
-				</RadixSelect.Icon>
-			</RadixSelect.Trigger>
-			<RadixSelect.Content className="z-50 mt-2 rounded-xl border shadow-lg bg-gray-3 border-gray-4">
-				<RadixSelect.Viewport>
-					{options.map((opt) => (
-						<RadixSelect.Item
-							key={opt.value}
-							value={opt.value}
-							className="flex gap-2 items-center justify-start p-2 text-[15px] rounded-xl cursor-pointer text-gray-12 hover:bg-gray-4"
-						>
-							{opt.icon && <span className="mr-2">{opt.icon}</span>}
-							<RadixSelect.ItemText>{opt.label}</RadixSelect.ItemText>
-						</RadixSelect.Item>
-					))}
-				</RadixSelect.Viewport>
-			</RadixSelect.Content>
-		</RadixSelect.Root>
+				<SelectScrollUpButton />
+				<SelectPrimitive.Viewport
+					className={classNames(
+						"p-1",
+						position === "popper" &&
+							"h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)] scroll-my-1",
+					)}
+				>
+					{children}
+				</SelectPrimitive.Viewport>
+				<SelectScrollDownButton />
+			</SelectPrimitive.Content>
+		</SelectPrimitive.Portal>
+	);
+}
+
+function SelectLabel({
+	className,
+	...props
+}: React.ComponentProps<typeof SelectPrimitive.Label>) {
+	return (
+		<SelectPrimitive.Label
+			data-slot="select-label"
+			className={classNames("text-gray-10 px-3 py-1.5 text-xs", className)}
+			{...props}
+		/>
 	);
+}
+
+function SelectItem({
+	className,
+	children,
+	...props
+}: React.ComponentProps<typeof SelectPrimitive.Item>) {
+	return (
+		<SelectPrimitive.Item
+			data-slot="select-item"
+			className={classNames(
+				"relative flex w-full cursor-default items-center gap-2 py-2 pr-8 pl-3 text-[13px] text-gray-12",
+				"rounded-lg outline-none select-none transition-colors duration-200",
+				"hover:bg-gray-3 focus:bg-gray-3",
+				"data-[disabled]:pointer-events-none data-[disabled]:opacity-50 data-[disabled]:text-gray-9",
+				"[&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+				className,
+			)}
+			{...props}
+		>
+			<span className="absolute right-2 flex size-3.5 items-center justify-center">
+				<SelectPrimitive.ItemIndicator>
+					<CheckIcon className="size-4" />
+				</SelectPrimitive.ItemIndicator>
+			</span>
+			<SelectPrimitive.ItemText>{children}</SelectPrimitive.ItemText>
+		</SelectPrimitive.Item>
+	);
+}
+
+function SelectSeparator({
+	className,
+	...props
+}: React.ComponentProps<typeof SelectPrimitive.Separator>) {
+	return (
+		<SelectPrimitive.Separator
+			data-slot="select-separator"
+			className={classNames(
+				"-mx-1 my-1 h-px pointer-events-none bg-gray-5",
+				className,
+			)}
+			{...props}
+		/>
+	);
+}
+
+function SelectScrollUpButton({
+	className,
+	...props
+}: React.ComponentProps<typeof SelectPrimitive.ScrollUpButton>) {
+	return (
+		<SelectPrimitive.ScrollUpButton
+			data-slot="select-scroll-up-button"
+			className={classNames(
+				"flex justify-center items-center py-1 cursor-default",
+				className,
+			)}
+			{...props}
+		>
+			<ChevronUpIcon className="size-4" />
+		</SelectPrimitive.ScrollUpButton>
+	);
+}
+
+function SelectScrollDownButton({
+	className,
+	...props
+}: React.ComponentProps<typeof SelectPrimitive.ScrollDownButton>) {
+	return (
+		<SelectPrimitive.ScrollDownButton
+			data-slot="select-scroll-down-button"
+			className={classNames(
+				"flex justify-center items-center py-1 cursor-default",
+				className,
+			)}
+			{...props}
+		>
+			<ChevronDownIcon className="size-4" />
+		</SelectPrimitive.ScrollDownButton>
+	);
+}
+
+export {
+	Select,
+	SelectRoot,
+	SelectContent,
+	SelectGroup,
+	SelectItem,
+	SelectLabel,
+	SelectScrollDownButton,
+	SelectScrollUpButton,
+	SelectSeparator,
+	SelectTrigger,
+	SelectValue,
 };