From e0c031f0df500f4f44081a1975bc392203e82c7f Mon Sep 17 00:00:00 2001
From: Satya Patel <satyapatel111@gmail.com>
Date: Fri, 6 Mar 2026 17:31:54 -0800
Subject: [PATCH 1/9] WIP

---
 .../NewWorkspaceModal.tsx                     | 469 +++++++++++++++++
 .../ExistingWorktreesList.tsx                 |   0
 .../components/BranchesSection.tsx            |   0
 .../components/PrUrlSection.tsx               |   0
 .../components/WorktreesSection.tsx           |   0
 .../ExistingWorktreesList/components/index.ts |   0
 .../components/ExistingWorktreesList/index.ts |   0
 .../components/ImportFlow/ImportFlow.tsx      |   0
 .../components/ImportFlow/index.ts            |   0
 .../NewWorkspaceAdvancedOptions.tsx           |   0
 .../NewWorkspaceAdvancedOptions/index.ts      |   0
 .../NewWorkspaceCreateFlow.tsx                |   0
 .../NewWorkspaceCreateFlow/index.ts           |   0
 .../NewWorkspaceHeader/NewWorkspaceHeader.tsx |   0
 .../components/NewWorkspaceHeader/index.ts    |   0
 .../ProjectSelector/ProjectSelector.tsx       |  74 +++
 .../components/ProjectSelector/index.ts       |   1 +
 .../components/NewWorkspaceModal.old/index.ts |   1 +
 .../NewWorkspaceModal/NewWorkspaceModal.tsx   | 480 +++---------------
 .../BranchesGroup/BranchesGroup.tsx           |  95 ++++
 .../components/BranchesGroup/index.ts         |   1 +
 .../components/IssuesGroup/IssuesGroup.tsx    |  69 +++
 .../components/IssuesGroup/index.ts           |   1 +
 .../ProjectSelector/ProjectSelector.tsx       |  49 +-
 .../components/PromptGroup/PromptGroup.tsx    | 108 ++++
 .../components/PromptGroup/index.ts           |   1 +
 .../PullRequestsGroup/PullRequestsGroup.tsx   |  70 +++
 .../components/PullRequestsGroup/index.ts     |   1 +
 apps/desktop/src/renderer/lib/slug-width.ts   |  15 +
 .../hooks/useTasksTable/useTasksTable.tsx     |  20 +-
 .../NewWorkspaceButton.tsx                    |   2 -
 31 files changed, 1004 insertions(+), 453 deletions(-)
 create mode 100644 apps/desktop/src/renderer/components/NewWorkspaceModal.old/NewWorkspaceModal.tsx
 rename apps/desktop/src/renderer/components/{NewWorkspaceModal => NewWorkspaceModal.old}/components/ExistingWorktreesList/ExistingWorktreesList.tsx (100%)
 rename apps/desktop/src/renderer/components/{NewWorkspaceModal => NewWorkspaceModal.old}/components/ExistingWorktreesList/components/BranchesSection.tsx (100%)
 rename apps/desktop/src/renderer/components/{NewWorkspaceModal => NewWorkspaceModal.old}/components/ExistingWorktreesList/components/PrUrlSection.tsx (100%)
 rename apps/desktop/src/renderer/components/{NewWorkspaceModal => NewWorkspaceModal.old}/components/ExistingWorktreesList/components/WorktreesSection.tsx (100%)
 rename apps/desktop/src/renderer/components/{NewWorkspaceModal => NewWorkspaceModal.old}/components/ExistingWorktreesList/components/index.ts (100%)
 rename apps/desktop/src/renderer/components/{NewWorkspaceModal => NewWorkspaceModal.old}/components/ExistingWorktreesList/index.ts (100%)
 rename apps/desktop/src/renderer/components/{NewWorkspaceModal => NewWorkspaceModal.old}/components/ImportFlow/ImportFlow.tsx (100%)
 rename apps/desktop/src/renderer/components/{NewWorkspaceModal => NewWorkspaceModal.old}/components/ImportFlow/index.ts (100%)
 rename apps/desktop/src/renderer/components/{NewWorkspaceModal => NewWorkspaceModal.old}/components/NewWorkspaceAdvancedOptions/NewWorkspaceAdvancedOptions.tsx (100%)
 rename apps/desktop/src/renderer/components/{NewWorkspaceModal => NewWorkspaceModal.old}/components/NewWorkspaceAdvancedOptions/index.ts (100%)
 rename apps/desktop/src/renderer/components/{NewWorkspaceModal => NewWorkspaceModal.old}/components/NewWorkspaceCreateFlow/NewWorkspaceCreateFlow.tsx (100%)
 rename apps/desktop/src/renderer/components/{NewWorkspaceModal => NewWorkspaceModal.old}/components/NewWorkspaceCreateFlow/index.ts (100%)
 rename apps/desktop/src/renderer/components/{NewWorkspaceModal => NewWorkspaceModal.old}/components/NewWorkspaceHeader/NewWorkspaceHeader.tsx (100%)
 rename apps/desktop/src/renderer/components/{NewWorkspaceModal => NewWorkspaceModal.old}/components/NewWorkspaceHeader/index.ts (100%)
 create mode 100644 apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ProjectSelector/ProjectSelector.tsx
 create mode 100644 apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ProjectSelector/index.ts
 create mode 100644 apps/desktop/src/renderer/components/NewWorkspaceModal.old/index.ts
 create mode 100644 apps/desktop/src/renderer/components/NewWorkspaceModal/components/BranchesGroup/BranchesGroup.tsx
 create mode 100644 apps/desktop/src/renderer/components/NewWorkspaceModal/components/BranchesGroup/index.ts
 create mode 100644 apps/desktop/src/renderer/components/NewWorkspaceModal/components/IssuesGroup/IssuesGroup.tsx
 create mode 100644 apps/desktop/src/renderer/components/NewWorkspaceModal/components/IssuesGroup/index.ts
 create mode 100644 apps/desktop/src/renderer/components/NewWorkspaceModal/components/PromptGroup/PromptGroup.tsx
 create mode 100644 apps/desktop/src/renderer/components/NewWorkspaceModal/components/PromptGroup/index.ts
 create mode 100644 apps/desktop/src/renderer/components/NewWorkspaceModal/components/PullRequestsGroup/PullRequestsGroup.tsx
 create mode 100644 apps/desktop/src/renderer/components/NewWorkspaceModal/components/PullRequestsGroup/index.ts
 create mode 100644 apps/desktop/src/renderer/lib/slug-width.ts

diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal.old/NewWorkspaceModal.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal.old/NewWorkspaceModal.tsx
new file mode 100644
index 00000000000..e6831844e83
--- /dev/null
+++ b/apps/desktop/src/renderer/components/NewWorkspaceModal.old/NewWorkspaceModal.tsx
@@ -0,0 +1,469 @@
+import {
+	AGENT_PRESET_COMMANDS,
+	buildAgentPromptCommand,
+} from "@superset/shared/agent-command";
+import {
+	type AgentLaunchRequest,
+	STARTABLE_AGENT_TYPES,
+	type StartableAgentType,
+} from "@superset/shared/agent-launch";
+import { Dialog, DialogContent } from "@superset/ui/dialog";
+import { toast } from "@superset/ui/sonner";
+import { useNavigate } from "@tanstack/react-router";
+import { useEffect, useMemo, useRef, useState } from "react";
+import { launchAgentSession } from "renderer/lib/agent-session-orchestrator";
+import { electronTrpc } from "renderer/lib/electron-trpc";
+import { resolveEffectiveWorkspaceBaseBranch } from "renderer/lib/workspaceBaseBranch";
+import { useOpenProject } from "renderer/react-query/projects";
+import { useCreateWorkspace } from "renderer/react-query/workspaces";
+import {
+	useCloseNewWorkspaceModal,
+	useNewWorkspaceModalOpen,
+	usePreSelectedProjectId,
+} from "renderer/stores/new-workspace-modal";
+import {
+	resolveBranchPrefix,
+	sanitizeBranchNameWithMaxLength,
+} from "shared/utils/branch";
+import type { ImportSourceTab } from "./components/ExistingWorktreesList";
+import { ImportFlow } from "./components/ImportFlow";
+import { NewWorkspaceAdvancedOptions } from "./components/NewWorkspaceAdvancedOptions";
+import {
+	NewWorkspaceCreateFlow,
+	type WorkspaceCreateAgent,
+} from "./components/NewWorkspaceCreateFlow";
+import { NewWorkspaceHeader } from "./components/NewWorkspaceHeader";
+import { ProjectSelector } from "./components/ProjectSelector";
+
+type Mode = "existing" | "new";
+const WORKSPACE_AGENT_STORAGE_KEY = "lastSelectedWorkspaceCreateAgent";
+
+export function NewWorkspaceModal() {
+	const navigate = useNavigate();
+	const isOpen = useNewWorkspaceModalOpen();
+	const closeModal = useCloseNewWorkspaceModal();
+	const preSelectedProjectId = usePreSelectedProjectId();
+	const [selectedProjectId, setSelectedProjectId] = useState<string | null>(
+		null,
+	);
+	const [title, setTitle] = useState("");
+	const [branchName, setBranchName] = useState("");
+	const [branchNameEdited, setBranchNameEdited] = useState(false);
+	const [mode, setMode] = useState<Mode>("new");
+	const [baseBranch, setBaseBranch] = useState<string | null>(null);
+	const [baseBranchOpen, setBaseBranchOpen] = useState(false);
+	const [branchSearch, setBranchSearch] = useState("");
+	const [showAdvanced, setShowAdvanced] = useState(false);
+	const [runSetupScript, setRunSetupScript] = useState(true);
+	const [importTab, setImportTab] = useState<ImportSourceTab>("pull-request");
+	const [selectedAgent, setSelectedAgent] = useState<WorkspaceCreateAgent>(
+		() => {
+			if (typeof window === "undefined") return "none";
+			const stored = window.localStorage.getItem(WORKSPACE_AGENT_STORAGE_KEY);
+			if (stored === "none") return "none";
+			return stored &&
+				(STARTABLE_AGENT_TYPES as readonly string[]).includes(stored)
+				? (stored as WorkspaceCreateAgent)
+				: "none";
+		},
+	);
+	const runSetupScriptRef = useRef(true);
+	runSetupScriptRef.current = runSetupScript;
+	const titleInputRef = useRef<HTMLTextAreaElement>(null);
+
+	const { data: recentProjects = [] } =
+		electronTrpc.projects.getRecents.useQuery();
+	const { data: project } = electronTrpc.projects.get.useQuery(
+		{ id: selectedProjectId ?? "" },
+		{ enabled: !!selectedProjectId },
+	);
+	const {
+		data: branchData,
+		isLoading: isBranchesLoading,
+		isError: isBranchesError,
+	} = electronTrpc.projects.getBranches.useQuery(
+		{ projectId: selectedProjectId ?? "" },
+		{ enabled: !!selectedProjectId },
+	);
+	const { data: gitAuthor } = electronTrpc.projects.getGitAuthor.useQuery(
+		{ id: selectedProjectId ?? "" },
+		{ enabled: !!selectedProjectId },
+	);
+	const { data: globalBranchPrefix } =
+		electronTrpc.settings.getBranchPrefix.useQuery();
+	const { data: gitInfo } = electronTrpc.settings.getGitInfo.useQuery();
+	const terminalCreateOrAttach =
+		electronTrpc.terminal.createOrAttach.useMutation();
+	const terminalWrite = electronTrpc.terminal.write.useMutation();
+	const createWorkspace = useCreateWorkspace({
+		resolveInitialCommands: (commands) =>
+			runSetupScriptRef.current ? commands : null,
+	});
+	const { openNew } = useOpenProject();
+	const selectableAgents =
+		STARTABLE_AGENT_TYPES as readonly StartableAgentType[];
+
+	const resolvedPrefix = useMemo(() => {
+		const projectOverrides = project?.branchPrefixMode != null;
+		return resolveBranchPrefix({
+			mode: projectOverrides
+				? project?.branchPrefixMode
+				: (globalBranchPrefix?.mode ?? "none"),
+			customPrefix: projectOverrides
+				? project?.branchPrefixCustom
+				: globalBranchPrefix?.customPrefix,
+			authorPrefix: gitAuthor?.prefix,
+			githubUsername: gitInfo?.githubUsername,
+		});
+	}, [project, globalBranchPrefix, gitAuthor, gitInfo]);
+
+	const filteredBranches = useMemo(() => {
+		if (!branchData?.branches) return [];
+		if (!branchSearch) return branchData.branches;
+		const searchLower = branchSearch.toLowerCase();
+		return branchData.branches.filter((b) =>
+			b.name.toLowerCase().includes(searchLower),
+		);
+	}, [branchData?.branches, branchSearch]);
+
+	// biome-ignore lint/correctness/useExhaustiveDependencies: reset form each time the modal opens
+	useEffect(() => {
+		if (!isOpen) return;
+		resetForm();
+		if (preSelectedProjectId) {
+			setSelectedProjectId(preSelectedProjectId);
+		}
+	}, [isOpen]);
+
+	useEffect(() => {
+		if (selectedAgent === "none") return;
+		if ((STARTABLE_AGENT_TYPES as readonly string[]).includes(selectedAgent)) {
+			return;
+		}
+		setSelectedAgent("none");
+		window.localStorage.setItem(WORKSPACE_AGENT_STORAGE_KEY, "none");
+	}, [selectedAgent]);
+
+	const effectiveBaseBranch = resolveEffectiveWorkspaceBaseBranch({
+		explicitBaseBranch: baseBranch,
+		workspaceBaseBranch: project?.workspaceBaseBranch,
+		defaultBranch: branchData?.defaultBranch,
+		branches: branchData?.branches,
+	});
+
+	// biome-ignore lint/correctness/useExhaustiveDependencies: intentionally reset when project changes
+	useEffect(() => {
+		setBaseBranch(null);
+	}, [selectedProjectId]);
+
+	const branchSlug = branchNameEdited
+		? sanitizeBranchNameWithMaxLength(branchName, undefined, {
+				preserveFirstSegmentCase: true,
+			})
+		: "";
+
+	const applyPrefix = !branchNameEdited;
+
+	const branchPreview =
+		branchSlug && applyPrefix && resolvedPrefix
+			? sanitizeBranchNameWithMaxLength(`${resolvedPrefix}/${branchSlug}`)
+			: branchSlug;
+
+	const resetForm = () => {
+		setSelectedProjectId(null);
+		setTitle("");
+		setBranchName("");
+		setBranchNameEdited(false);
+		setMode("new");
+		setImportTab("pull-request");
+		setBaseBranch(null);
+		setBranchSearch("");
+		setShowAdvanced(false);
+		setRunSetupScript(true);
+	};
+
+	useEffect(() => {
+		if (isOpen && selectedProjectId && mode === "new") {
+			const timer = setTimeout(() => titleInputRef.current?.focus(), 50);
+			return () => clearTimeout(timer);
+		}
+	}, [isOpen, selectedProjectId, mode]);
+
+	const handleKeyDown = (e: React.KeyboardEvent) => {
+		if (e.defaultPrevented) return;
+
+		const isTextareaTarget = e.target instanceof HTMLTextAreaElement;
+		const isSubmitShortcutInTextarea =
+			isTextareaTarget && (e.metaKey || e.ctrlKey);
+
+		if (isTextareaTarget && !isSubmitShortcutInTextarea) {
+			return;
+		}
+
+		if (
+			e.key === "Enter" &&
+			!e.shiftKey &&
+			mode === "new" &&
+			selectedProjectId &&
+			!createWorkspace.isPending
+		) {
+			e.preventDefault();
+			handleCreateWorkspace();
+		}
+	};
+
+	const handleClose = () => {
+		closeModal();
+		resetForm();
+	};
+
+	const handleBranchNameChange = (value: string) => {
+		setBranchName(value);
+		setBranchNameEdited(true);
+	};
+
+	const handleBranchNameBlur = () => {
+		if (!branchName.trim()) {
+			setBranchName("");
+			setBranchNameEdited(false);
+		}
+	};
+
+	const handleImportRepo = async () => {
+		try {
+			const projects = await openNew();
+
+			if (projects.length > 1) {
+				toast.success(`${projects.length} projects imported`);
+			}
+
+			if (projects.length > 0) {
+				setSelectedProjectId(projects[0].id);
+			}
+		} catch (error) {
+			toast.error("Failed to open project", {
+				description:
+					error instanceof Error ? error.message : "An unknown error occurred",
+			});
+		}
+	};
+
+	const selectedProject = recentProjects.find(
+		(p) => p.id === selectedProjectId,
+	);
+	const projectSelector = (
+		<ProjectSelector
+			selectedProjectId={selectedProjectId}
+			selectedProjectName={selectedProject?.name ?? null}
+			recentProjects={recentProjects.filter((project) => Boolean(project.id))}
+			onSelectProject={setSelectedProjectId}
+			onImportRepo={handleImportRepo}
+		/>
+	);
+	const isCreateDisabled = createWorkspace.isPending || isBranchesError;
+	const buildLaunchRequestForWorkspace = (
+		workspaceId: string,
+		prompt: string,
+	): AgentLaunchRequest | null => {
+		if (selectedAgent === "none") {
+			return null;
+		}
+
+		if (selectedAgent === "superset-chat") {
+			return {
+				kind: "chat",
+				workspaceId,
+				agentType: "superset-chat",
+				source: "new-workspace",
+				chat: {
+					initialPrompt: prompt || undefined,
+					retryCount: 1,
+				},
+			};
+		}
+
+		const command = prompt
+			? buildAgentPromptCommand({
+					prompt,
+					randomId: window.crypto.randomUUID(),
+					agent: selectedAgent,
+				})
+			: (AGENT_PRESET_COMMANDS[selectedAgent][0] ?? null);
+
+		if (!command) {
+			return null;
+		}
+
+		return {
+			kind: "terminal",
+			workspaceId,
+			agentType: selectedAgent,
+			source: "new-workspace",
+			terminal: {
+				command,
+				name: "Agent",
+			},
+		};
+	};
+
+	const handleCreateWorkspace = async () => {
+		if (!selectedProjectId) return;
+		// Keep the agent prompt uncapped; only trim surrounding whitespace.
+		const prompt = title.trim();
+
+		const workspaceName = undefined;
+		const launchRequestTemplate = buildLaunchRequestForWorkspace(
+			"pending-workspace",
+			prompt,
+		);
+
+		closeModal();
+
+		try {
+			const result = await createWorkspace.mutateAsyncWithPendingSetup(
+				{
+					projectId: selectedProjectId,
+					name: workspaceName,
+					prompt: prompt || undefined,
+					branchName: branchSlug || undefined,
+					baseBranch: baseBranch || undefined,
+					applyPrefix,
+				},
+				launchRequestTemplate
+					? { agentLaunchRequest: launchRequestTemplate }
+					: undefined,
+			);
+
+			const launchRequest = launchRequestTemplate
+				? {
+						...launchRequestTemplate,
+						workspaceId: result.workspace.id,
+					}
+				: null;
+
+			if (launchRequest && result.wasExisting) {
+				const launchResult = await launchAgentSession(launchRequest, {
+					source: "new-workspace",
+					createOrAttach: (input) => terminalCreateOrAttach.mutateAsync(input),
+					write: (input) => terminalWrite.mutateAsync(input),
+				});
+				if (launchResult.status === "failed") {
+					toast.error("Failed to start agent", {
+						description: launchResult.error ?? "Failed to start agent session.",
+					});
+				}
+			}
+
+			if (result.wasExisting) {
+				toast.success("Opened existing workspace");
+			} else if (result.isInitializing) {
+				toast.success("Workspace created", {
+					description: "Setting up in the background...",
+				});
+			} else {
+				toast.success("Workspace created");
+			}
+		} catch (err) {
+			toast.error(
+				err instanceof Error ? err.message : "Failed to create workspace",
+			);
+		}
+	};
+
+	const handleAgentChange = (value: WorkspaceCreateAgent) => {
+		setSelectedAgent(value);
+		window.localStorage.setItem(WORKSPACE_AGENT_STORAGE_KEY, value);
+	};
+
+	const handleBaseBranchSelect = (branchName: string) => {
+		setBaseBranch(branchName);
+		setBaseBranchOpen(false);
+		setBranchSearch("");
+	};
+
+	const advancedOptions = (
+		<NewWorkspaceAdvancedOptions
+			showAdvanced={showAdvanced}
+			onShowAdvancedChange={setShowAdvanced}
+			branchInputValue={branchNameEdited ? branchName : branchPreview}
+			onBranchInputChange={handleBranchNameChange}
+			onBranchInputBlur={handleBranchNameBlur}
+			onEditPrefix={() => {
+				handleClose();
+				navigate({ to: "/settings/behavior" });
+			}}
+			isBranchesError={isBranchesError}
+			isBranchesLoading={isBranchesLoading}
+			baseBranchOpen={baseBranchOpen}
+			onBaseBranchOpenChange={setBaseBranchOpen}
+			effectiveBaseBranch={effectiveBaseBranch}
+			defaultBranch={branchData?.defaultBranch}
+			branchSearch={branchSearch}
+			onBranchSearchChange={setBranchSearch}
+			filteredBranches={filteredBranches}
+			onSelectBaseBranch={handleBaseBranchSelect}
+			runSetupScript={runSetupScript}
+			onRunSetupScriptChange={setRunSetupScript}
+		/>
+	);
+
+	return (
+		<Dialog modal open={isOpen} onOpenChange={(open) => !open && handleClose()}>
+			<DialogContent
+				className="sm:max-w-[440px] gap-0 p-0 overflow-hidden"
+				onKeyDown={handleKeyDown}
+				showCloseButton={false}
+			>
+				<NewWorkspaceHeader
+					mode={mode}
+					hasSelectedProject={!!selectedProjectId}
+					onBackToNew={() => setMode("new")}
+					onOpenImport={() => setMode("existing")}
+				/>
+
+				{!selectedProjectId && (
+					<div className="px-4 pb-3">{projectSelector}</div>
+				)}
+
+				{selectedProjectId && (
+					<div className="px-4 pb-4 min-w-0">
+						{mode === "new" && (
+							<NewWorkspaceCreateFlow
+								projectSelector={projectSelector}
+								selectedAgent={selectedAgent}
+								agentOptions={selectableAgents}
+								onSelectedAgentChange={handleAgentChange}
+								title={title}
+								onTitleChange={setTitle}
+								titleInputRef={titleInputRef}
+								showBranchPreview={branchNameEdited}
+								branchPreview={branchPreview}
+								effectiveBaseBranch={effectiveBaseBranch}
+								onCreateWorkspace={handleCreateWorkspace}
+								isCreateDisabled={isCreateDisabled}
+								advancedOptions={advancedOptions}
+							/>
+						)}
+						{mode === "existing" && (
+							<ImportFlow
+								projectId={selectedProjectId}
+								projectSelector={projectSelector}
+								onOpenSuccess={handleClose}
+								activeTab={importTab}
+								onActiveTabChange={setImportTab}
+							/>
+						)}
+					</div>
+				)}
+
+				{!selectedProjectId && (
+					<div className="px-4 pb-4 pt-2">
+						<div className="text-center text-sm text-muted-foreground py-8">
+							Select a project to get started
+						</div>
+					</div>
+				)}
+			</DialogContent>
+		</Dialog>
+	);
+}
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/ExistingWorktreesList/ExistingWorktreesList.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ExistingWorktreesList/ExistingWorktreesList.tsx
similarity index 100%
rename from apps/desktop/src/renderer/components/NewWorkspaceModal/components/ExistingWorktreesList/ExistingWorktreesList.tsx
rename to apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ExistingWorktreesList/ExistingWorktreesList.tsx
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/ExistingWorktreesList/components/BranchesSection.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ExistingWorktreesList/components/BranchesSection.tsx
similarity index 100%
rename from apps/desktop/src/renderer/components/NewWorkspaceModal/components/ExistingWorktreesList/components/BranchesSection.tsx
rename to apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ExistingWorktreesList/components/BranchesSection.tsx
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/ExistingWorktreesList/components/PrUrlSection.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ExistingWorktreesList/components/PrUrlSection.tsx
similarity index 100%
rename from apps/desktop/src/renderer/components/NewWorkspaceModal/components/ExistingWorktreesList/components/PrUrlSection.tsx
rename to apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ExistingWorktreesList/components/PrUrlSection.tsx
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/ExistingWorktreesList/components/WorktreesSection.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ExistingWorktreesList/components/WorktreesSection.tsx
similarity index 100%
rename from apps/desktop/src/renderer/components/NewWorkspaceModal/components/ExistingWorktreesList/components/WorktreesSection.tsx
rename to apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ExistingWorktreesList/components/WorktreesSection.tsx
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/ExistingWorktreesList/components/index.ts b/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ExistingWorktreesList/components/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/components/NewWorkspaceModal/components/ExistingWorktreesList/components/index.ts
rename to apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ExistingWorktreesList/components/index.ts
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/ExistingWorktreesList/index.ts b/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ExistingWorktreesList/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/components/NewWorkspaceModal/components/ExistingWorktreesList/index.ts
rename to apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ExistingWorktreesList/index.ts
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/ImportFlow/ImportFlow.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ImportFlow/ImportFlow.tsx
similarity index 100%
rename from apps/desktop/src/renderer/components/NewWorkspaceModal/components/ImportFlow/ImportFlow.tsx
rename to apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ImportFlow/ImportFlow.tsx
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/ImportFlow/index.ts b/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ImportFlow/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/components/NewWorkspaceModal/components/ImportFlow/index.ts
rename to apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ImportFlow/index.ts
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/NewWorkspaceAdvancedOptions/NewWorkspaceAdvancedOptions.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/NewWorkspaceAdvancedOptions/NewWorkspaceAdvancedOptions.tsx
similarity index 100%
rename from apps/desktop/src/renderer/components/NewWorkspaceModal/components/NewWorkspaceAdvancedOptions/NewWorkspaceAdvancedOptions.tsx
rename to apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/NewWorkspaceAdvancedOptions/NewWorkspaceAdvancedOptions.tsx
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/NewWorkspaceAdvancedOptions/index.ts b/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/NewWorkspaceAdvancedOptions/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/components/NewWorkspaceModal/components/NewWorkspaceAdvancedOptions/index.ts
rename to apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/NewWorkspaceAdvancedOptions/index.ts
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/NewWorkspaceCreateFlow/NewWorkspaceCreateFlow.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/NewWorkspaceCreateFlow/NewWorkspaceCreateFlow.tsx
similarity index 100%
rename from apps/desktop/src/renderer/components/NewWorkspaceModal/components/NewWorkspaceCreateFlow/NewWorkspaceCreateFlow.tsx
rename to apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/NewWorkspaceCreateFlow/NewWorkspaceCreateFlow.tsx
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/NewWorkspaceCreateFlow/index.ts b/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/NewWorkspaceCreateFlow/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/components/NewWorkspaceModal/components/NewWorkspaceCreateFlow/index.ts
rename to apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/NewWorkspaceCreateFlow/index.ts
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/NewWorkspaceHeader/NewWorkspaceHeader.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/NewWorkspaceHeader/NewWorkspaceHeader.tsx
similarity index 100%
rename from apps/desktop/src/renderer/components/NewWorkspaceModal/components/NewWorkspaceHeader/NewWorkspaceHeader.tsx
rename to apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/NewWorkspaceHeader/NewWorkspaceHeader.tsx
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/NewWorkspaceHeader/index.ts b/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/NewWorkspaceHeader/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/components/NewWorkspaceModal/components/NewWorkspaceHeader/index.ts
rename to apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/NewWorkspaceHeader/index.ts
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ProjectSelector/ProjectSelector.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ProjectSelector/ProjectSelector.tsx
new file mode 100644
index 00000000000..f4629c821bd
--- /dev/null
+++ b/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ProjectSelector/ProjectSelector.tsx
@@ -0,0 +1,74 @@
+import { Button } from "@superset/ui/button";
+import {
+	DropdownMenu,
+	DropdownMenuContent,
+	DropdownMenuItem,
+	DropdownMenuSeparator,
+	DropdownMenuTrigger,
+} from "@superset/ui/dropdown-menu";
+import { HiCheck, HiChevronDown } from "react-icons/hi2";
+import { LuFolderOpen } from "react-icons/lu";
+
+interface ProjectOption {
+	id: string;
+	name: string;
+}
+
+interface ProjectSelectorProps {
+	selectedProjectId: string | null;
+	selectedProjectName: string | null;
+	recentProjects: ProjectOption[];
+	onSelectProject: (projectId: string) => void;
+	onImportRepo: () => void;
+	className?: string;
+}
+
+export function ProjectSelector({
+	selectedProjectId,
+	selectedProjectName,
+	recentProjects,
+	onSelectProject,
+	onImportRepo,
+	className,
+}: ProjectSelectorProps) {
+	return (
+		<DropdownMenu>
+			<DropdownMenuTrigger asChild>
+				<Button
+					variant="outline"
+					className={`w-full h-8 text-sm justify-between font-normal min-w-0 ${className ?? ""}`}
+				>
+					<span
+						className={`truncate ${
+							selectedProjectName ? "" : "text-muted-foreground"
+						}`}
+					>
+						{selectedProjectName ?? "Select project"}
+					</span>
+					<HiChevronDown className="size-4 text-muted-foreground shrink-0" />
+				</Button>
+			</DropdownMenuTrigger>
+			<DropdownMenuContent
+				align="start"
+				className="w-[--radix-dropdown-menu-trigger-width]"
+			>
+				{recentProjects.map((project) => (
+					<DropdownMenuItem
+						key={project.id}
+						onClick={() => onSelectProject(project.id)}
+					>
+						{project.name}
+						{project.id === selectedProjectId && (
+							<HiCheck className="ml-auto size-4" />
+						)}
+					</DropdownMenuItem>
+				))}
+				<DropdownMenuSeparator />
+				<DropdownMenuItem onClick={onImportRepo}>
+					<LuFolderOpen className="size-4" />
+					Import repo
+				</DropdownMenuItem>
+			</DropdownMenuContent>
+		</DropdownMenu>
+	);
+}
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ProjectSelector/index.ts b/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ProjectSelector/index.ts
new file mode 100644
index 00000000000..a524b03c166
--- /dev/null
+++ b/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ProjectSelector/index.ts
@@ -0,0 +1 @@
+export { ProjectSelector } from "./ProjectSelector";
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal.old/index.ts b/apps/desktop/src/renderer/components/NewWorkspaceModal.old/index.ts
new file mode 100644
index 00000000000..6267ce7fe48
--- /dev/null
+++ b/apps/desktop/src/renderer/components/NewWorkspaceModal.old/index.ts
@@ -0,0 +1 @@
+export { NewWorkspaceModal } from "./NewWorkspaceModal";
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/NewWorkspaceModal.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal/NewWorkspaceModal.tsx
index e6831844e83..e2b9af81919 100644
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal/NewWorkspaceModal.tsx
+++ b/apps/desktop/src/renderer/components/NewWorkspaceModal/NewWorkspaceModal.tsx
@@ -1,242 +1,58 @@
 import {
-	AGENT_PRESET_COMMANDS,
-	buildAgentPromptCommand,
-} from "@superset/shared/agent-command";
-import {
-	type AgentLaunchRequest,
-	STARTABLE_AGENT_TYPES,
-	type StartableAgentType,
-} from "@superset/shared/agent-launch";
-import { Dialog, DialogContent } from "@superset/ui/dialog";
+	CommandDialog,
+	CommandInput,
+	CommandList,
+} from "@superset/ui/command";
+import { Tabs, TabsList, TabsTrigger } from "@superset/ui/tabs";
 import { toast } from "@superset/ui/sonner";
-import { useNavigate } from "@tanstack/react-router";
-import { useEffect, useMemo, useRef, useState } from "react";
-import { launchAgentSession } from "renderer/lib/agent-session-orchestrator";
+import { useEffect, useState } from "react";
 import { electronTrpc } from "renderer/lib/electron-trpc";
-import { resolveEffectiveWorkspaceBaseBranch } from "renderer/lib/workspaceBaseBranch";
 import { useOpenProject } from "renderer/react-query/projects";
-import { useCreateWorkspace } from "renderer/react-query/workspaces";
 import {
 	useCloseNewWorkspaceModal,
 	useNewWorkspaceModalOpen,
 	usePreSelectedProjectId,
 } from "renderer/stores/new-workspace-modal";
-import {
-	resolveBranchPrefix,
-	sanitizeBranchNameWithMaxLength,
-} from "shared/utils/branch";
-import type { ImportSourceTab } from "./components/ExistingWorktreesList";
-import { ImportFlow } from "./components/ImportFlow";
-import { NewWorkspaceAdvancedOptions } from "./components/NewWorkspaceAdvancedOptions";
-import {
-	NewWorkspaceCreateFlow,
-	type WorkspaceCreateAgent,
-} from "./components/NewWorkspaceCreateFlow";
-import { NewWorkspaceHeader } from "./components/NewWorkspaceHeader";
+import { BranchesGroup } from "./components/BranchesGroup";
+import { IssuesGroup } from "./components/IssuesGroup";
 import { ProjectSelector } from "./components/ProjectSelector";
+import { PromptGroup } from "./components/PromptGroup";
+import { PullRequestsGroup } from "./components/PullRequestsGroup";
 
-type Mode = "existing" | "new";
-const WORKSPACE_AGENT_STORAGE_KEY = "lastSelectedWorkspaceCreateAgent";
+type Tab = "pull-requests" | "branches" | "issues" | "prompt";
 
 export function NewWorkspaceModal() {
-	const navigate = useNavigate();
 	const isOpen = useNewWorkspaceModalOpen();
 	const closeModal = useCloseNewWorkspaceModal();
 	const preSelectedProjectId = usePreSelectedProjectId();
+	const [activeTab, setActiveTab] = useState<Tab>("pull-requests");
 	const [selectedProjectId, setSelectedProjectId] = useState<string | null>(
 		null,
 	);
-	const [title, setTitle] = useState("");
-	const [branchName, setBranchName] = useState("");
-	const [branchNameEdited, setBranchNameEdited] = useState(false);
-	const [mode, setMode] = useState<Mode>("new");
-	const [baseBranch, setBaseBranch] = useState<string | null>(null);
-	const [baseBranchOpen, setBaseBranchOpen] = useState(false);
-	const [branchSearch, setBranchSearch] = useState("");
-	const [showAdvanced, setShowAdvanced] = useState(false);
-	const [runSetupScript, setRunSetupScript] = useState(true);
-	const [importTab, setImportTab] = useState<ImportSourceTab>("pull-request");
-	const [selectedAgent, setSelectedAgent] = useState<WorkspaceCreateAgent>(
-		() => {
-			if (typeof window === "undefined") return "none";
-			const stored = window.localStorage.getItem(WORKSPACE_AGENT_STORAGE_KEY);
-			if (stored === "none") return "none";
-			return stored &&
-				(STARTABLE_AGENT_TYPES as readonly string[]).includes(stored)
-				? (stored as WorkspaceCreateAgent)
-				: "none";
-		},
-	);
-	const runSetupScriptRef = useRef(true);
-	runSetupScriptRef.current = runSetupScript;
-	const titleInputRef = useRef<HTMLTextAreaElement>(null);
+	const { openNew } = useOpenProject();
 
 	const { data: recentProjects = [] } =
 		electronTrpc.projects.getRecents.useQuery();
-	const { data: project } = electronTrpc.projects.get.useQuery(
-		{ id: selectedProjectId ?? "" },
-		{ enabled: !!selectedProjectId },
-	);
-	const {
-		data: branchData,
-		isLoading: isBranchesLoading,
-		isError: isBranchesError,
-	} = electronTrpc.projects.getBranches.useQuery(
-		{ projectId: selectedProjectId ?? "" },
-		{ enabled: !!selectedProjectId },
-	);
-	const { data: gitAuthor } = electronTrpc.projects.getGitAuthor.useQuery(
-		{ id: selectedProjectId ?? "" },
-		{ enabled: !!selectedProjectId },
-	);
-	const { data: globalBranchPrefix } =
-		electronTrpc.settings.getBranchPrefix.useQuery();
-	const { data: gitInfo } = electronTrpc.settings.getGitInfo.useQuery();
-	const terminalCreateOrAttach =
-		electronTrpc.terminal.createOrAttach.useMutation();
-	const terminalWrite = electronTrpc.terminal.write.useMutation();
-	const createWorkspace = useCreateWorkspace({
-		resolveInitialCommands: (commands) =>
-			runSetupScriptRef.current ? commands : null,
-	});
-	const { openNew } = useOpenProject();
-	const selectableAgents =
-		STARTABLE_AGENT_TYPES as readonly StartableAgentType[];
-
-	const resolvedPrefix = useMemo(() => {
-		const projectOverrides = project?.branchPrefixMode != null;
-		return resolveBranchPrefix({
-			mode: projectOverrides
-				? project?.branchPrefixMode
-				: (globalBranchPrefix?.mode ?? "none"),
-			customPrefix: projectOverrides
-				? project?.branchPrefixCustom
-				: globalBranchPrefix?.customPrefix,
-			authorPrefix: gitAuthor?.prefix,
-			githubUsername: gitInfo?.githubUsername,
-		});
-	}, [project, globalBranchPrefix, gitAuthor, gitInfo]);
 
-	const filteredBranches = useMemo(() => {
-		if (!branchData?.branches) return [];
-		if (!branchSearch) return branchData.branches;
-		const searchLower = branchSearch.toLowerCase();
-		return branchData.branches.filter((b) =>
-			b.name.toLowerCase().includes(searchLower),
-		);
-	}, [branchData?.branches, branchSearch]);
-
-	// biome-ignore lint/correctness/useExhaustiveDependencies: reset form each time the modal opens
+	// Sync pre-selected project when modal opens
+	// biome-ignore lint/correctness/useExhaustiveDependencies: reset on modal open
 	useEffect(() => {
 		if (!isOpen) return;
-		resetForm();
 		if (preSelectedProjectId) {
 			setSelectedProjectId(preSelectedProjectId);
+		} else if (recentProjects.length > 0 && !selectedProjectId) {
+			setSelectedProjectId(recentProjects[0].id);
 		}
 	}, [isOpen]);
 
-	useEffect(() => {
-		if (selectedAgent === "none") return;
-		if ((STARTABLE_AGENT_TYPES as readonly string[]).includes(selectedAgent)) {
-			return;
-		}
-		setSelectedAgent("none");
-		window.localStorage.setItem(WORKSPACE_AGENT_STORAGE_KEY, "none");
-	}, [selectedAgent]);
-
-	const effectiveBaseBranch = resolveEffectiveWorkspaceBaseBranch({
-		explicitBaseBranch: baseBranch,
-		workspaceBaseBranch: project?.workspaceBaseBranch,
-		defaultBranch: branchData?.defaultBranch,
-		branches: branchData?.branches,
-	});
-
-	// biome-ignore lint/correctness/useExhaustiveDependencies: intentionally reset when project changes
-	useEffect(() => {
-		setBaseBranch(null);
-	}, [selectedProjectId]);
-
-	const branchSlug = branchNameEdited
-		? sanitizeBranchNameWithMaxLength(branchName, undefined, {
-				preserveFirstSegmentCase: true,
-			})
-		: "";
-
-	const applyPrefix = !branchNameEdited;
-
-	const branchPreview =
-		branchSlug && applyPrefix && resolvedPrefix
-			? sanitizeBranchNameWithMaxLength(`${resolvedPrefix}/${branchSlug}`)
-			: branchSlug;
-
-	const resetForm = () => {
-		setSelectedProjectId(null);
-		setTitle("");
-		setBranchName("");
-		setBranchNameEdited(false);
-		setMode("new");
-		setImportTab("pull-request");
-		setBaseBranch(null);
-		setBranchSearch("");
-		setShowAdvanced(false);
-		setRunSetupScript(true);
-	};
-
-	useEffect(() => {
-		if (isOpen && selectedProjectId && mode === "new") {
-			const timer = setTimeout(() => titleInputRef.current?.focus(), 50);
-			return () => clearTimeout(timer);
-		}
-	}, [isOpen, selectedProjectId, mode]);
-
-	const handleKeyDown = (e: React.KeyboardEvent) => {
-		if (e.defaultPrevented) return;
-
-		const isTextareaTarget = e.target instanceof HTMLTextAreaElement;
-		const isSubmitShortcutInTextarea =
-			isTextareaTarget && (e.metaKey || e.ctrlKey);
-
-		if (isTextareaTarget && !isSubmitShortcutInTextarea) {
-			return;
-		}
-
-		if (
-			e.key === "Enter" &&
-			!e.shiftKey &&
-			mode === "new" &&
-			selectedProjectId &&
-			!createWorkspace.isPending
-		) {
-			e.preventDefault();
-			handleCreateWorkspace();
-		}
-	};
-
-	const handleClose = () => {
-		closeModal();
-		resetForm();
-	};
-
-	const handleBranchNameChange = (value: string) => {
-		setBranchName(value);
-		setBranchNameEdited(true);
-	};
-
-	const handleBranchNameBlur = () => {
-		if (!branchName.trim()) {
-			setBranchName("");
-			setBranchNameEdited(false);
-		}
-	};
+	const selectedProject = recentProjects.find(
+		(p) => p.id === selectedProjectId,
+	);
+	const isListTab = activeTab !== "prompt";
 
 	const handleImportRepo = async () => {
 		try {
 			const projects = await openNew();
-
-			if (projects.length > 1) {
-				toast.success(`${projects.length} projects imported`);
-			}
-
 			if (projects.length > 0) {
 				setSelectedProjectId(projects[0].id);
 			}
@@ -248,222 +64,46 @@ export function NewWorkspaceModal() {
 		}
 	};
 
-	const selectedProject = recentProjects.find(
-		(p) => p.id === selectedProjectId,
-	);
-	const projectSelector = (
-		<ProjectSelector
-			selectedProjectId={selectedProjectId}
-			selectedProjectName={selectedProject?.name ?? null}
-			recentProjects={recentProjects.filter((project) => Boolean(project.id))}
-			onSelectProject={setSelectedProjectId}
-			onImportRepo={handleImportRepo}
-		/>
-	);
-	const isCreateDisabled = createWorkspace.isPending || isBranchesError;
-	const buildLaunchRequestForWorkspace = (
-		workspaceId: string,
-		prompt: string,
-	): AgentLaunchRequest | null => {
-		if (selectedAgent === "none") {
-			return null;
-		}
-
-		if (selectedAgent === "superset-chat") {
-			return {
-				kind: "chat",
-				workspaceId,
-				agentType: "superset-chat",
-				source: "new-workspace",
-				chat: {
-					initialPrompt: prompt || undefined,
-					retryCount: 1,
-				},
-			};
-		}
-
-		const command = prompt
-			? buildAgentPromptCommand({
-					prompt,
-					randomId: window.crypto.randomUUID(),
-					agent: selectedAgent,
-				})
-			: (AGENT_PRESET_COMMANDS[selectedAgent][0] ?? null);
-
-		if (!command) {
-			return null;
-		}
-
-		return {
-			kind: "terminal",
-			workspaceId,
-			agentType: selectedAgent,
-			source: "new-workspace",
-			terminal: {
-				command,
-				name: "Agent",
-			},
-		};
-	};
-
-	const handleCreateWorkspace = async () => {
-		if (!selectedProjectId) return;
-		// Keep the agent prompt uncapped; only trim surrounding whitespace.
-		const prompt = title.trim();
-
-		const workspaceName = undefined;
-		const launchRequestTemplate = buildLaunchRequestForWorkspace(
-			"pending-workspace",
-			prompt,
-		);
-
-		closeModal();
-
-		try {
-			const result = await createWorkspace.mutateAsyncWithPendingSetup(
-				{
-					projectId: selectedProjectId,
-					name: workspaceName,
-					prompt: prompt || undefined,
-					branchName: branchSlug || undefined,
-					baseBranch: baseBranch || undefined,
-					applyPrefix,
-				},
-				launchRequestTemplate
-					? { agentLaunchRequest: launchRequestTemplate }
-					: undefined,
-			);
-
-			const launchRequest = launchRequestTemplate
-				? {
-						...launchRequestTemplate,
-						workspaceId: result.workspace.id,
-					}
-				: null;
-
-			if (launchRequest && result.wasExisting) {
-				const launchResult = await launchAgentSession(launchRequest, {
-					source: "new-workspace",
-					createOrAttach: (input) => terminalCreateOrAttach.mutateAsync(input),
-					write: (input) => terminalWrite.mutateAsync(input),
-				});
-				if (launchResult.status === "failed") {
-					toast.error("Failed to start agent", {
-						description: launchResult.error ?? "Failed to start agent session.",
-					});
-				}
-			}
-
-			if (result.wasExisting) {
-				toast.success("Opened existing workspace");
-			} else if (result.isInitializing) {
-				toast.success("Workspace created", {
-					description: "Setting up in the background...",
-				});
-			} else {
-				toast.success("Workspace created");
-			}
-		} catch (err) {
-			toast.error(
-				err instanceof Error ? err.message : "Failed to create workspace",
-			);
-		}
-	};
-
-	const handleAgentChange = (value: WorkspaceCreateAgent) => {
-		setSelectedAgent(value);
-		window.localStorage.setItem(WORKSPACE_AGENT_STORAGE_KEY, value);
-	};
-
-	const handleBaseBranchSelect = (branchName: string) => {
-		setBaseBranch(branchName);
-		setBaseBranchOpen(false);
-		setBranchSearch("");
-	};
-
-	const advancedOptions = (
-		<NewWorkspaceAdvancedOptions
-			showAdvanced={showAdvanced}
-			onShowAdvancedChange={setShowAdvanced}
-			branchInputValue={branchNameEdited ? branchName : branchPreview}
-			onBranchInputChange={handleBranchNameChange}
-			onBranchInputBlur={handleBranchNameBlur}
-			onEditPrefix={() => {
-				handleClose();
-				navigate({ to: "/settings/behavior" });
-			}}
-			isBranchesError={isBranchesError}
-			isBranchesLoading={isBranchesLoading}
-			baseBranchOpen={baseBranchOpen}
-			onBaseBranchOpenChange={setBaseBranchOpen}
-			effectiveBaseBranch={effectiveBaseBranch}
-			defaultBranch={branchData?.defaultBranch}
-			branchSearch={branchSearch}
-			onBranchSearchChange={setBranchSearch}
-			filteredBranches={filteredBranches}
-			onSelectBaseBranch={handleBaseBranchSelect}
-			runSetupScript={runSetupScript}
-			onRunSetupScriptChange={setRunSetupScript}
-		/>
-	);
-
 	return (
-		<Dialog modal open={isOpen} onOpenChange={(open) => !open && handleClose()}>
-			<DialogContent
-				className="sm:max-w-[440px] gap-0 p-0 overflow-hidden"
-				onKeyDown={handleKeyDown}
-				showCloseButton={false}
-			>
-				<NewWorkspaceHeader
-					mode={mode}
-					hasSelectedProject={!!selectedProjectId}
-					onBackToNew={() => setMode("new")}
-					onOpenImport={() => setMode("existing")}
+		<CommandDialog
+			open={isOpen}
+			onOpenChange={(open) => !open && closeModal()}
+			title="New Workspace"
+			description="Create a new workspace from a PR, branch, issue, or prompt."
+			showCloseButton={false}
+			className="sm:max-w-[540px] max-h-[min(70vh,600px)] !top-[calc(50%-min(35vh,300px))] !-translate-y-0"
+		>
+			<div className="flex items-center justify-between border-b px-3 py-2">
+				<Tabs
+					value={activeTab}
+					onValueChange={(value) => setActiveTab(value as Tab)}
+				>
+					<TabsList>
+						<TabsTrigger value="pull-requests">Pull requests</TabsTrigger>
+						<TabsTrigger value="branches">Branches</TabsTrigger>
+						<TabsTrigger value="issues">Issues</TabsTrigger>
+						<TabsTrigger value="prompt">Prompt</TabsTrigger>
+					</TabsList>
+				</Tabs>
+				<ProjectSelector
+					selectedProjectId={selectedProjectId}
+					selectedProjectName={selectedProject?.name ?? null}
+					recentProjects={recentProjects.filter((p) => Boolean(p.id))}
+					onSelectProject={setSelectedProjectId}
+					onImportRepo={handleImportRepo}
 				/>
-
-				{!selectedProjectId && (
-					<div className="px-4 pb-3">{projectSelector}</div>
-				)}
-
-				{selectedProjectId && (
-					<div className="px-4 pb-4 min-w-0">
-						{mode === "new" && (
-							<NewWorkspaceCreateFlow
-								projectSelector={projectSelector}
-								selectedAgent={selectedAgent}
-								agentOptions={selectableAgents}
-								onSelectedAgentChange={handleAgentChange}
-								title={title}
-								onTitleChange={setTitle}
-								titleInputRef={titleInputRef}
-								showBranchPreview={branchNameEdited}
-								branchPreview={branchPreview}
-								effectiveBaseBranch={effectiveBaseBranch}
-								onCreateWorkspace={handleCreateWorkspace}
-								isCreateDisabled={isCreateDisabled}
-								advancedOptions={advancedOptions}
-							/>
-						)}
-						{mode === "existing" && (
-							<ImportFlow
-								projectId={selectedProjectId}
-								projectSelector={projectSelector}
-								onOpenSuccess={handleClose}
-								activeTab={importTab}
-								onActiveTabChange={setImportTab}
-							/>
-						)}
-					</div>
-				)}
-
-				{!selectedProjectId && (
-					<div className="px-4 pb-4 pt-2">
-						<div className="text-center text-sm text-muted-foreground py-8">
-							Select a project to get started
-						</div>
-					</div>
-				)}
-			</DialogContent>
-		</Dialog>
+			</div>
+
+			{isListTab && (
+				<CommandInput placeholder="Search by title, number, or author..." />
+			)}
+
+			<CommandList className="!max-h-none flex-1 overflow-y-auto">
+				{activeTab === "pull-requests" && <PullRequestsGroup />}
+				{activeTab === "branches" && <BranchesGroup />}
+				{activeTab === "issues" && <IssuesGroup />}
+				{activeTab === "prompt" && <PromptGroup />}
+			</CommandList>
+		</CommandDialog>
 	);
 }
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/BranchesGroup/BranchesGroup.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/BranchesGroup/BranchesGroup.tsx
new file mode 100644
index 00000000000..de6b81ef221
--- /dev/null
+++ b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/BranchesGroup/BranchesGroup.tsx
@@ -0,0 +1,95 @@
+import { CommandEmpty, CommandGroup, CommandItem } from "@superset/ui/command";
+import { GoGitBranch } from "react-icons/go";
+
+const MOCK_BRANCHES = [
+	{
+		name: "main",
+		lastCommitDate: Date.now() - 1000 * 60 * 30,
+		isLocal: true,
+		isRemote: true,
+		isDefault: true,
+	},
+	{
+		name: "develop",
+		lastCommitDate: Date.now() - 1000 * 60 * 60 * 2,
+		isLocal: true,
+		isRemote: true,
+		isDefault: false,
+	},
+	{
+		name: "feat/new-dashboard",
+		lastCommitDate: Date.now() - 1000 * 60 * 60 * 5,
+		isLocal: true,
+		isRemote: true,
+		isDefault: false,
+	},
+	{
+		name: "fix/login-redirect",
+		lastCommitDate: Date.now() - 1000 * 60 * 60 * 24,
+		isLocal: false,
+		isRemote: true,
+		isDefault: false,
+	},
+	{
+		name: "chore/update-ci",
+		lastCommitDate: Date.now() - 1000 * 60 * 60 * 24 * 3,
+		isLocal: true,
+		isRemote: false,
+		isDefault: false,
+	},
+	{
+		name: "refactor/auth-module",
+		lastCommitDate: Date.now() - 1000 * 60 * 60 * 24 * 7,
+		isLocal: false,
+		isRemote: true,
+		isDefault: false,
+	},
+];
+
+function formatRelative(timestamp: number): string {
+	const seconds = Math.floor((Date.now() - timestamp) / 1000);
+	if (seconds < 60) return "just now";
+	const minutes = Math.floor(seconds / 60);
+	if (minutes < 60) return `${minutes}m ago`;
+	const hours = Math.floor(minutes / 60);
+	if (hours < 24) return `${hours}h ago`;
+	const days = Math.floor(hours / 24);
+	return `${days}d ago`;
+}
+
+export function BranchesGroup() {
+	return (
+		<CommandGroup>
+			<CommandEmpty>No branches found.</CommandEmpty>
+			{MOCK_BRANCHES.map((branch) => (
+				<CommandItem
+					key={branch.name}
+					value={branch.name}
+					onSelect={() => {
+						console.log("[mock] Create workspace from branch", branch.name);
+					}}
+					className="group"
+				>
+					<GoGitBranch className="size-4 shrink-0 text-muted-foreground" />
+					<span className="truncate flex-1">{branch.name}</span>
+					{branch.isDefault && (
+						<span className="text-[10px] text-muted-foreground bg-muted px-1.5 py-0.5 rounded shrink-0">
+							default
+						</span>
+					)}
+					{!branch.isLocal && branch.isRemote && (
+						<span className="text-[10px] text-muted-foreground/60 bg-muted/50 px-1.5 py-0.5 rounded shrink-0">
+							remote
+						</span>
+					)}
+					<span className="text-xs text-muted-foreground shrink-0 group-data-[selected=true]:hidden">
+						{formatRelative(branch.lastCommitDate)}
+					</span>
+					<span className="text-xs text-muted-foreground shrink-0 hidden group-data-[selected=true]:inline">
+						Open →
+					</span>
+				</CommandItem>
+			))}
+		</CommandGroup>
+	);
+}
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/BranchesGroup/index.ts b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/BranchesGroup/index.ts
new file mode 100644
index 00000000000..75953e3d249
--- /dev/null
+++ b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/BranchesGroup/index.ts
@@ -0,0 +1 @@
+export { BranchesGroup } from "./BranchesGroup";
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/IssuesGroup/IssuesGroup.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/IssuesGroup/IssuesGroup.tsx
new file mode 100644
index 00000000000..a18520a6c75
--- /dev/null
+++ b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/IssuesGroup/IssuesGroup.tsx
@@ -0,0 +1,69 @@
+import { CommandEmpty, CommandGroup, CommandItem } from "@superset/ui/command";
+import { eq, isNull } from "@tanstack/db";
+import { useLiveQuery } from "@tanstack/react-db";
+import { useMemo } from "react";
+import { getSlugColumnWidth } from "renderer/lib/slug-width";
+import { useCollections } from "renderer/routes/_authenticated/providers/CollectionsProvider";
+import {
+	StatusIcon,
+	type StatusType,
+} from "renderer/routes/_authenticated/_dashboard/tasks/components/TasksView/components/shared/StatusIcon";
+
+export function IssuesGroup() {
+	const collections = useCollections();
+
+	const { data } = useLiveQuery(
+		(q) =>
+			q
+				.from({ tasks: collections.tasks })
+				.innerJoin(
+					{ status: collections.taskStatuses },
+					({ tasks, status }) => eq(tasks.statusId, status.id),
+				)
+				.select(({ tasks, status }) => ({
+					...tasks,
+					status,
+				}))
+				.where(({ tasks }) => isNull(tasks.deletedAt)),
+		[collections],
+	);
+
+	const tasks = useMemo(() => data ?? [], [data]);
+
+	const slugWidth = useMemo(
+		() => getSlugColumnWidth(tasks.map((t) => t.slug)),
+		[tasks],
+	);
+
+	return (
+		<CommandGroup>
+			<CommandEmpty>No issues found.</CommandEmpty>
+			{tasks.map((task) => (
+				<CommandItem
+					key={task.id}
+					value={`${task.slug} ${task.title}`}
+					onSelect={() => {
+						console.log("[mock] Create workspace from issue", task.slug);
+					}}
+					className="group"
+				>
+					<StatusIcon
+						type={task.status.type as StatusType}
+						color={task.status.color}
+						className="size-4 shrink-0"
+					/>
+					<span
+						className="text-muted-foreground shrink-0 text-xs tabular-nums truncate"
+						style={{ width: slugWidth }}
+					>
+						{task.slug}
+					</span>
+					<span className="truncate flex-1">{task.title}</span>
+					<span className="text-xs text-muted-foreground shrink-0 hidden group-data-[selected=true]:inline">
+						Open →
+					</span>
+				</CommandItem>
+			))}
+		</CommandGroup>
+	);
+}
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/IssuesGroup/index.ts b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/IssuesGroup/index.ts
new file mode 100644
index 00000000000..c0762c8495d
--- /dev/null
+++ b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/IssuesGroup/index.ts
@@ -0,0 +1 @@
+export { IssuesGroup } from "./IssuesGroup";
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/ProjectSelector/ProjectSelector.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/ProjectSelector/ProjectSelector.tsx
index f4629c821bd..be774c855cf 100644
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/ProjectSelector/ProjectSelector.tsx
+++ b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/ProjectSelector/ProjectSelector.tsx
@@ -6,12 +6,17 @@ import {
 	DropdownMenuSeparator,
 	DropdownMenuTrigger,
 } from "@superset/ui/dropdown-menu";
-import { HiCheck, HiChevronDown } from "react-icons/hi2";
+import { HiCheck, HiChevronUpDown } from "react-icons/hi2";
 import { LuFolderOpen } from "react-icons/lu";
+import { ProjectThumbnail } from "renderer/screens/main/components/WorkspaceSidebar/ProjectSection/ProjectThumbnail";
 
 interface ProjectOption {
 	id: string;
 	name: string;
+	color: string;
+	githubOwner: string | null;
+	iconUrl: string | null;
+	hideImage: boolean | null;
 }
 
 interface ProjectSelectorProps {
@@ -20,7 +25,6 @@ interface ProjectSelectorProps {
 	recentProjects: ProjectOption[];
 	onSelectProject: (projectId: string) => void;
 	onImportRepo: () => void;
-	className?: string;
 }
 
 export function ProjectSelector({
@@ -29,34 +33,45 @@ export function ProjectSelector({
 	recentProjects,
 	onSelectProject,
 	onImportRepo,
-	className,
 }: ProjectSelectorProps) {
+	const selectedProject = recentProjects.find(
+		(p) => p.id === selectedProjectId,
+	);
+
 	return (
 		<DropdownMenu>
 			<DropdownMenuTrigger asChild>
-				<Button
-					variant="outline"
-					className={`w-full h-8 text-sm justify-between font-normal min-w-0 ${className ?? ""}`}
-				>
-					<span
-						className={`truncate ${
-							selectedProjectName ? "" : "text-muted-foreground"
-						}`}
-					>
+				<Button variant="ghost" size="sm">
+					{selectedProject && (
+						<ProjectThumbnail
+							projectId={selectedProject.id}
+							projectName={selectedProject.name}
+							projectColor={selectedProject.color}
+							githubOwner={selectedProject.githubOwner}
+							iconUrl={selectedProject.iconUrl}
+							hideImage={selectedProject.hideImage ?? false}
+						/>
+					)}
+					<span className="truncate max-w-[140px]">
 						{selectedProjectName ?? "Select project"}
 					</span>
-					<HiChevronDown className="size-4 text-muted-foreground shrink-0" />
+					<HiChevronUpDown className="size-3.5" />
 				</Button>
 			</DropdownMenuTrigger>
-			<DropdownMenuContent
-				align="start"
-				className="w-[--radix-dropdown-menu-trigger-width]"
-			>
+			<DropdownMenuContent align="end">
 				{recentProjects.map((project) => (
 					<DropdownMenuItem
 						key={project.id}
 						onClick={() => onSelectProject(project.id)}
 					>
+						<ProjectThumbnail
+							projectId={project.id}
+							projectName={project.name}
+							projectColor={project.color}
+							githubOwner={project.githubOwner}
+							iconUrl={project.iconUrl}
+							hideImage={project.hideImage ?? false}
+						/>
 						{project.name}
 						{project.id === selectedProjectId && (
 							<HiCheck className="ml-auto size-4" />
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PromptGroup/PromptGroup.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PromptGroup/PromptGroup.tsx
new file mode 100644
index 00000000000..46434adab00
--- /dev/null
+++ b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PromptGroup/PromptGroup.tsx
@@ -0,0 +1,108 @@
+import {
+	STARTABLE_AGENT_LABELS,
+	STARTABLE_AGENT_TYPES,
+	type StartableAgentType,
+} from "@superset/shared/agent-launch";
+import { Button } from "@superset/ui/button";
+import { Kbd, KbdGroup } from "@superset/ui/kbd";
+import {
+	Select,
+	SelectContent,
+	SelectItem,
+	SelectTrigger,
+	SelectValue,
+} from "@superset/ui/select";
+import { Textarea } from "@superset/ui/textarea";
+import { useRef, useState } from "react";
+import {
+	getPresetIcon,
+	useIsDarkTheme,
+} from "renderer/assets/app-icons/preset-icons";
+
+type WorkspaceCreateAgent = StartableAgentType | "none";
+
+const AGENT_STORAGE_KEY = "lastSelectedWorkspaceCreateAgent";
+
+export function PromptGroup() {
+	const isDark = useIsDarkTheme();
+	const textareaRef = useRef<HTMLTextAreaElement>(null);
+	const [prompt, setPrompt] = useState("");
+	const [selectedAgent, setSelectedAgent] = useState<WorkspaceCreateAgent>(
+		() => {
+			if (typeof window === "undefined") return "none";
+			const stored = window.localStorage.getItem(AGENT_STORAGE_KEY);
+			if (stored === "none") return "none";
+			return stored &&
+				(STARTABLE_AGENT_TYPES as readonly string[]).includes(stored)
+				? (stored as WorkspaceCreateAgent)
+				: "none";
+		},
+	);
+
+	const handleAgentChange = (value: WorkspaceCreateAgent) => {
+		setSelectedAgent(value);
+		window.localStorage.setItem(AGENT_STORAGE_KEY, value);
+	};
+
+	return (
+		<div className="p-3 space-y-3" cmdk-group="">
+			<Select
+				value={selectedAgent}
+				onValueChange={(value: WorkspaceCreateAgent) =>
+					handleAgentChange(value)
+				}
+			>
+				<SelectTrigger className="h-8 text-xs w-full">
+					<SelectValue placeholder="No agent" />
+				</SelectTrigger>
+				<SelectContent>
+					<SelectItem value="none">No agent</SelectItem>
+					{(STARTABLE_AGENT_TYPES as readonly StartableAgentType[]).map(
+						(agent) => {
+							const icon = getPresetIcon(agent, isDark);
+							return (
+								<SelectItem key={agent} value={agent}>
+									<span className="flex items-center gap-2">
+										{icon && (
+											<img
+												src={icon}
+												alt=""
+												className="size-3.5 object-contain"
+											/>
+										)}
+										{STARTABLE_AGENT_LABELS[agent]}
+									</span>
+								</SelectItem>
+							);
+						},
+					)}
+				</SelectContent>
+			</Select>
+
+			<Textarea
+				ref={textareaRef}
+				className="min-h-24 text-sm resize-y field-sizing-fixed"
+				placeholder="What do you want to do?"
+				value={prompt}
+				onChange={(e) => setPrompt(e.target.value)}
+			/>
+
+			<Button
+				className="w-full h-8 text-sm"
+				onClick={() => {
+					console.log("[mock] Create workspace with prompt:", prompt);
+				}}
+			>
+				Create Workspace
+				<KbdGroup className="ml-1.5 opacity-70">
+					<Kbd className="bg-primary-foreground/15 text-primary-foreground h-4 min-w-4 text-[10px]">
+						⌘
+					</Kbd>
+					<Kbd className="bg-primary-foreground/15 text-primary-foreground h-4 min-w-4 text-[10px]">
+						↵
+					</Kbd>
+				</KbdGroup>
+			</Button>
+		</div>
+	);
+}
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PromptGroup/index.ts b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PromptGroup/index.ts
new file mode 100644
index 00000000000..61433e9463c
--- /dev/null
+++ b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PromptGroup/index.ts
@@ -0,0 +1 @@
+export { PromptGroup } from "./PromptGroup";
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PullRequestsGroup/PullRequestsGroup.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PullRequestsGroup/PullRequestsGroup.tsx
new file mode 100644
index 00000000000..c10771a107d
--- /dev/null
+++ b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PullRequestsGroup/PullRequestsGroup.tsx
@@ -0,0 +1,70 @@
+import { CommandEmpty, CommandGroup, CommandItem } from "@superset/ui/command";
+import { GoGitPullRequest } from "react-icons/go";
+
+const MOCK_PRS = [
+	{
+		number: 197,
+		title: "docs: update root README with contribution guide",
+		author: "satyapatel",
+		url: "https://github.com/org/repo/pull/197",
+		branch: "docs/update-readme",
+	},
+	{
+		number: 196,
+		title: "fix(api/users): make discoverable flag nullable",
+		author: "jsmith",
+		url: "https://github.com/org/repo/pull/196",
+		branch: "fix/discoverable-nullable",
+	},
+	{
+		number: 192,
+		title: "ux(mobile): keep reps and sets visible during rest timer",
+		author: "amelia",
+		url: "https://github.com/org/repo/pull/192",
+		branch: "ux/rest-timer-visibility",
+	},
+	{
+		number: 189,
+		title: "feat(desktop): add keyboard shortcut for quick switcher",
+		author: "satyapatel",
+		url: "https://github.com/org/repo/pull/189",
+		branch: "feat/quick-switcher-shortcut",
+	},
+	{
+		number: 185,
+		title: "chore: bump dependencies to latest stable versions",
+		author: "dependabot",
+		url: "https://github.com/org/repo/pull/185",
+		branch: "chore/bump-deps",
+	},
+];
+
+export function PullRequestsGroup() {
+	return (
+		<CommandGroup>
+			<CommandEmpty>No pull requests found.</CommandEmpty>
+			{MOCK_PRS.map((pr) => (
+				<CommandItem
+					key={pr.number}
+					value={`#${pr.number} ${pr.title} ${pr.author} ${pr.url}`}
+					onSelect={() => {
+						console.log("[mock] Create workspace from PR", pr.number);
+					}}
+					className="group"
+				>
+					<GoGitPullRequest className="size-4 shrink-0 text-emerald-500" />
+					<span className="text-muted-foreground shrink-0 text-xs tabular-nums">
+						#{pr.number}
+					</span>
+					<span className="truncate flex-1">{pr.title}</span>
+					<span className="text-xs text-muted-foreground shrink-0 group-data-[selected=true]:hidden">
+						{pr.author}
+					</span>
+					<span className="text-xs text-muted-foreground shrink-0 hidden group-data-[selected=true]:inline">
+						Open →
+					</span>
+				</CommandItem>
+			))}
+		</CommandGroup>
+	);
+}
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PullRequestsGroup/index.ts b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PullRequestsGroup/index.ts
new file mode 100644
index 00000000000..51ab880114f
--- /dev/null
+++ b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PullRequestsGroup/index.ts
@@ -0,0 +1 @@
+export { PullRequestsGroup } from "./PullRequestsGroup";
diff --git a/apps/desktop/src/renderer/lib/slug-width.ts b/apps/desktop/src/renderer/lib/slug-width.ts
new file mode 100644
index 00000000000..859728cbe47
--- /dev/null
+++ b/apps/desktop/src/renderer/lib/slug-width.ts
@@ -0,0 +1,15 @@
+const REM_PER_CHAR = 0.5 * 0.75;
+const PADDING_REM = 0.5;
+const MAX_SLUG_LENGTH = 11; // "SUPER-XXXXX"
+
+export function getSlugColumnWidth(slugs: string[]): string {
+	if (slugs.length === 0) return "5rem";
+
+	const longestLength = Math.min(
+		slugs.reduce((max, slug) => Math.max(max, slug.length), 0),
+		MAX_SLUG_LENGTH,
+	);
+
+	const width = longestLength * REM_PER_CHAR + PADDING_REM;
+	return `${Math.ceil(width * 10) / 10}rem`;
+}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/tasks/components/TasksView/hooks/useTasksTable/useTasksTable.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/tasks/components/TasksView/hooks/useTasksTable/useTasksTable.tsx
index e56458cef29..11322e050a1 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/tasks/components/TasksView/hooks/useTasksTable/useTasksTable.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/tasks/components/TasksView/hooks/useTasksTable/useTasksTable.tsx
@@ -23,6 +23,7 @@ import { format } from "date-fns";
 import { useEffect, useMemo, useRef, useState } from "react";
 import { HiChevronRight } from "react-icons/hi2";
 import { useCollections } from "renderer/routes/_authenticated/providers/CollectionsProvider";
+import { getSlugColumnWidth } from "renderer/lib/slug-width";
 import { create } from "zustand";
 import {
 	StatusIcon,
@@ -143,19 +144,10 @@ export function useTasksTable({
 		}
 	}, [filterTab, assigneeFilter, setRowSelection]);
 
-	const slugColumnWidth = useMemo(() => {
-		if (!data || data.length === 0) return "5rem";
-
-		const longestSlug = data.reduce((longest, task) => {
-			return task.slug.length > longest.length ? task.slug : longest;
-		}, "");
-
-		const REM_PER_CHAR = 0.5 * 0.75;
-		const PADDING_REM = 0.5;
-		const width = longestSlug.length * REM_PER_CHAR + PADDING_REM;
-
-		return `${Math.ceil(width * 10) / 10}rem`;
-	}, [data]);
+	const slugColumnWidth = useMemo(
+		() => getSlugColumnWidth((data ?? []).map((t) => t.slug)),
+		[data],
+	);
 
 	const columns = useMemo(
 		() => [
@@ -249,7 +241,7 @@ export function useTasksTable({
 				cell: (info) => {
 					if (info.cell.getIsPlaceholder()) return null;
 					return (
-						<span className="text-xs text-muted-foreground shrink-0">
+						<span className="text-xs text-muted-foreground truncate min-w-0">
 							{info.getValue()}
 						</span>
 					);
diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/NewWorkspaceButton.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/NewWorkspaceButton.tsx
index 3792b04ad85..58729c0d3fd 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/NewWorkspaceButton.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/NewWorkspaceButton.tsx
@@ -38,8 +38,6 @@ export function NewWorkspaceButton({
 	);
 
 	const handleClick = () => {
-		// projectId may be undefined if no workspace is active in route
-		// openModal handles undefined by opening without a pre-selected project
 		const projectId = currentWorkspace?.projectId;
 		openModal(projectId);
 	};

From 6481324dad7cbdec9ae44c343f9e0d3adc20ac50 Mon Sep 17 00:00:00 2001
From: Satya Patel <satyapatel111@gmail.com>
Date: Fri, 6 Mar 2026 18:03:04 -0800
Subject: [PATCH 2/9] WIP

---
 .../NewWorkspaceModal/NewWorkspaceModal.tsx   |  38 ++++--
 .../components/IssuesGroup/IssuesGroup.tsx    |  99 +++++++++++++++-
 .../ProjectSelector/ProjectSelector.tsx       | 112 ++++++++++++------
 .../components/PromptGroup/PromptGroup.tsx    |  98 +++++++++++++--
 4 files changed, 288 insertions(+), 59 deletions(-)

diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/NewWorkspaceModal.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal/NewWorkspaceModal.tsx
index e2b9af81919..faf2785c6d4 100644
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal/NewWorkspaceModal.tsx
+++ b/apps/desktop/src/renderer/components/NewWorkspaceModal/NewWorkspaceModal.tsx
@@ -5,6 +5,7 @@ import {
 } from "@superset/ui/command";
 import { Tabs, TabsList, TabsTrigger } from "@superset/ui/tabs";
 import { toast } from "@superset/ui/sonner";
+import { useNavigate } from "@tanstack/react-router";
 import { useEffect, useState } from "react";
 import { electronTrpc } from "renderer/lib/electron-trpc";
 import { useOpenProject } from "renderer/react-query/projects";
@@ -19,16 +20,17 @@ import { ProjectSelector } from "./components/ProjectSelector";
 import { PromptGroup } from "./components/PromptGroup";
 import { PullRequestsGroup } from "./components/PullRequestsGroup";
 
-type Tab = "pull-requests" | "branches" | "issues" | "prompt";
+type Tab = "prompt" | "issues" | "pull-requests" | "branches";
 
 export function NewWorkspaceModal() {
 	const isOpen = useNewWorkspaceModalOpen();
 	const closeModal = useCloseNewWorkspaceModal();
 	const preSelectedProjectId = usePreSelectedProjectId();
-	const [activeTab, setActiveTab] = useState<Tab>("pull-requests");
+	const [activeTab, setActiveTab] = useState<Tab>("prompt");
 	const [selectedProjectId, setSelectedProjectId] = useState<string | null>(
 		null,
 	);
+	const navigate = useNavigate();
 	const { openNew } = useOpenProject();
 
 	const { data: recentProjects = [] } =
@@ -51,11 +53,9 @@ export function NewWorkspaceModal() {
 	const isListTab = activeTab !== "prompt";
 
 	const handleImportRepo = async () => {
+		closeModal();
 		try {
-			const projects = await openNew();
-			if (projects.length > 0) {
-				setSelectedProjectId(projects[0].id);
-			}
+			await openNew();
 		} catch (error) {
 			toast.error("Failed to open project", {
 				description:
@@ -64,6 +64,11 @@ export function NewWorkspaceModal() {
 		}
 	};
 
+	const handleNewProject = () => {
+		closeModal();
+		navigate({ to: "/new-project" });
+	};
+
 	return (
 		<CommandDialog
 			open={isOpen}
@@ -71,7 +76,7 @@ export function NewWorkspaceModal() {
 			title="New Workspace"
 			description="Create a new workspace from a PR, branch, issue, or prompt."
 			showCloseButton={false}
-			className="sm:max-w-[540px] max-h-[min(70vh,600px)] !top-[calc(50%-min(35vh,300px))] !-translate-y-0"
+			className="sm:max-w-[540px] max-h-[min(70vh,600px)] !top-[calc(50%-min(35vh,300px))] !-translate-y-0 flex flex-col"
 		>
 			<div className="flex items-center justify-between border-b px-3 py-2">
 				<Tabs
@@ -79,10 +84,10 @@ export function NewWorkspaceModal() {
 					onValueChange={(value) => setActiveTab(value as Tab)}
 				>
 					<TabsList>
+						<TabsTrigger value="prompt">Prompt</TabsTrigger>
+						<TabsTrigger value="issues">Issues</TabsTrigger>
 						<TabsTrigger value="pull-requests">Pull requests</TabsTrigger>
 						<TabsTrigger value="branches">Branches</TabsTrigger>
-						<TabsTrigger value="issues">Issues</TabsTrigger>
-						<TabsTrigger value="prompt">Prompt</TabsTrigger>
 					</TabsList>
 				</Tabs>
 				<ProjectSelector
@@ -91,6 +96,7 @@ export function NewWorkspaceModal() {
 					recentProjects={recentProjects.filter((p) => Boolean(p.id))}
 					onSelectProject={setSelectedProjectId}
 					onImportRepo={handleImportRepo}
+					onNewProject={handleNewProject}
 				/>
 			</div>
 
@@ -101,8 +107,18 @@ export function NewWorkspaceModal() {
 			<CommandList className="!max-h-none flex-1 overflow-y-auto">
 				{activeTab === "pull-requests" && <PullRequestsGroup />}
 				{activeTab === "branches" && <BranchesGroup />}
-				{activeTab === "issues" && <IssuesGroup />}
-				{activeTab === "prompt" && <PromptGroup />}
+				{activeTab === "issues" && (
+						<IssuesGroup
+							projectId={selectedProjectId}
+							onClose={closeModal}
+						/>
+					)}
+				{activeTab === "prompt" && (
+						<PromptGroup
+							projectId={selectedProjectId}
+							onClose={closeModal}
+						/>
+					)}
 			</CommandList>
 		</CommandDialog>
 	);
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/IssuesGroup/IssuesGroup.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/IssuesGroup/IssuesGroup.tsx
index a18520a6c75..dc628afbd41 100644
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/IssuesGroup/IssuesGroup.tsx
+++ b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/IssuesGroup/IssuesGroup.tsx
@@ -1,16 +1,46 @@
+import { Avatar } from "@superset/ui/atoms/Avatar";
+import { Button } from "@superset/ui/button";
 import { CommandEmpty, CommandGroup, CommandItem } from "@superset/ui/command";
+import { toast } from "@superset/ui/sonner";
+import { useNavigate } from "@tanstack/react-router";
+import { HiOutlineUserCircle } from "react-icons/hi2";
+import { SiLinear } from "react-icons/si";
+import { GATED_FEATURES, usePaywall } from "renderer/components/Paywall";
 import { eq, isNull } from "@tanstack/db";
 import { useLiveQuery } from "@tanstack/react-db";
 import { useMemo } from "react";
 import { getSlugColumnWidth } from "renderer/lib/slug-width";
+import { useCreateWorkspace } from "renderer/react-query/workspaces";
 import { useCollections } from "renderer/routes/_authenticated/providers/CollectionsProvider";
 import {
 	StatusIcon,
 	type StatusType,
 } from "renderer/routes/_authenticated/_dashboard/tasks/components/TasksView/components/shared/StatusIcon";
 
-export function IssuesGroup() {
+interface IssuesGroupProps {
+	projectId: string | null;
+	onClose: () => void;
+}
+
+export function IssuesGroup({ projectId, onClose }: IssuesGroupProps) {
 	const collections = useCollections();
+	const navigate = useNavigate();
+	const { gateFeature } = usePaywall();
+	const createWorkspace = useCreateWorkspace();
+
+	const { data: integrations } = useLiveQuery(
+		(q) =>
+			q
+				.from({
+					integrationConnections: collections.integrationConnections,
+				})
+				.select(({ integrationConnections }) => ({
+					...integrationConnections,
+				})),
+		[collections],
+	);
+
+	const isLinearConnected = false; // TODO: restore — integrations?.some((i) => i.provider === "linear") ?? false;
 
 	const { data } = useLiveQuery(
 		(q) =>
@@ -20,9 +50,14 @@ export function IssuesGroup() {
 					{ status: collections.taskStatuses },
 					({ tasks, status }) => eq(tasks.statusId, status.id),
 				)
-				.select(({ tasks, status }) => ({
+				.leftJoin(
+					{ assignee: collections.users },
+					({ tasks, assignee }) => eq(tasks.assigneeId, assignee.id),
+				)
+				.select(({ tasks, status, assignee }) => ({
 					...tasks,
 					status,
+					assignee: assignee ?? null,
 				}))
 				.where(({ tasks }) => isNull(tasks.deletedAt)),
 		[collections],
@@ -35,15 +70,60 @@ export function IssuesGroup() {
 		[tasks],
 	);
 
+	if (!isLinearConnected) {
+		return (
+			<div className="flex flex-col items-center gap-3 py-8 px-4 text-center">
+				<SiLinear className="size-6 text-muted-foreground" />
+				<div className="space-y-1">
+					<p className="text-sm font-medium">Connect Linear</p>
+					<p className="text-xs text-muted-foreground">
+						Sync issues from Linear to create workspaces
+					</p>
+				</div>
+				<Button
+					size="sm"
+					variant="outline"
+					onClick={() => {
+						gateFeature(GATED_FEATURES.INTEGRATIONS, () => {
+							onClose();
+							navigate({ to: "/settings/integrations" });
+						});
+					}}
+				>
+					Connect
+				</Button>
+			</div>
+		);
+	}
+
 	return (
 		<CommandGroup>
 			<CommandEmpty>No issues found.</CommandEmpty>
-			{tasks.map((task) => (
+			{tasks.slice(0, 30).map((task) => (
 				<CommandItem
 					key={task.id}
 					value={`${task.slug} ${task.title}`}
 					onSelect={() => {
-						console.log("[mock] Create workspace from issue", task.slug);
+						if (!projectId) {
+							toast.error("Select a project first");
+							return;
+						}
+						onClose();
+						toast.promise(
+							createWorkspace.mutateAsync({
+								projectId,
+								name: task.title,
+								branchName: task.slug.toLowerCase(),
+							}),
+							{
+								loading: "Creating workspace...",
+								success: "Workspace created",
+								error: (err) =>
+									err instanceof Error
+										? err.message
+										: "Failed to create workspace",
+							},
+						);
 					}}
 					className="group"
 				>
@@ -59,6 +139,17 @@ export function IssuesGroup() {
 						{task.slug}
 					</span>
 					<span className="truncate flex-1">{task.title}</span>
+					<span className="shrink-0 group-data-[selected=true]:hidden">
+						{task.assignee ? (
+							<Avatar
+								size="xs"
+								fullName={task.assignee.name}
+								image={task.assignee.image}
+							/>
+						) : (
+							<HiOutlineUserCircle className="size-5 text-muted-foreground" />
+						)}
+					</span>
 					<span className="text-xs text-muted-foreground shrink-0 hidden group-data-[selected=true]:inline">
 						Open →
 					</span>
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/ProjectSelector/ProjectSelector.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/ProjectSelector/ProjectSelector.tsx
index be774c855cf..5fdfdcba34b 100644
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/ProjectSelector/ProjectSelector.tsx
+++ b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/ProjectSelector/ProjectSelector.tsx
@@ -1,13 +1,17 @@
 import { Button } from "@superset/ui/button";
 import {
-	DropdownMenu,
-	DropdownMenuContent,
-	DropdownMenuItem,
-	DropdownMenuSeparator,
-	DropdownMenuTrigger,
-} from "@superset/ui/dropdown-menu";
+	Command,
+	CommandEmpty,
+	CommandGroup,
+	CommandInput,
+	CommandItem,
+	CommandList,
+	CommandSeparator,
+} from "@superset/ui/command";
+import { Popover, PopoverContent, PopoverTrigger } from "@superset/ui/popover";
+import { useState } from "react";
 import { HiCheck, HiChevronUpDown } from "react-icons/hi2";
-import { LuFolderOpen } from "react-icons/lu";
+import { LuFolderGit, LuFolderOpen } from "react-icons/lu";
 import { ProjectThumbnail } from "renderer/screens/main/components/WorkspaceSidebar/ProjectSection/ProjectThumbnail";
 
 interface ProjectOption {
@@ -25,6 +29,7 @@ interface ProjectSelectorProps {
 	recentProjects: ProjectOption[];
 	onSelectProject: (projectId: string) => void;
 	onImportRepo: () => void;
+	onNewProject: () => void;
 }
 
 export function ProjectSelector({
@@ -33,14 +38,17 @@ export function ProjectSelector({
 	recentProjects,
 	onSelectProject,
 	onImportRepo,
+	onNewProject,
 }: ProjectSelectorProps) {
+	const [open, setOpen] = useState(false);
+
 	const selectedProject = recentProjects.find(
 		(p) => p.id === selectedProjectId,
 	);
 
 	return (
-		<DropdownMenu>
-			<DropdownMenuTrigger asChild>
+		<Popover open={open} onOpenChange={setOpen}>
+			<PopoverTrigger asChild>
 				<Button variant="ghost" size="sm">
 					{selectedProject && (
 						<ProjectThumbnail
@@ -57,33 +65,63 @@ export function ProjectSelector({
 					</span>
 					<HiChevronUpDown className="size-3.5" />
 				</Button>
-			</DropdownMenuTrigger>
-			<DropdownMenuContent align="end">
-				{recentProjects.map((project) => (
-					<DropdownMenuItem
-						key={project.id}
-						onClick={() => onSelectProject(project.id)}
-					>
-						<ProjectThumbnail
-							projectId={project.id}
-							projectName={project.name}
-							projectColor={project.color}
-							githubOwner={project.githubOwner}
-							iconUrl={project.iconUrl}
-							hideImage={project.hideImage ?? false}
-						/>
-						{project.name}
-						{project.id === selectedProjectId && (
-							<HiCheck className="ml-auto size-4" />
-						)}
-					</DropdownMenuItem>
-				))}
-				<DropdownMenuSeparator />
-				<DropdownMenuItem onClick={onImportRepo}>
-					<LuFolderOpen className="size-4" />
-					Import repo
-				</DropdownMenuItem>
-			</DropdownMenuContent>
-		</DropdownMenu>
+			</PopoverTrigger>
+			<PopoverContent align="end" className="w-60 p-0">
+				<Command>
+					<CommandInput placeholder="Search projects..." />
+					<CommandList>
+						<CommandEmpty>No projects found.</CommandEmpty>
+						<CommandGroup>
+							{recentProjects.map((project) => (
+								<CommandItem
+									key={project.id}
+									value={project.name}
+									onSelect={() => {
+										onSelectProject(project.id);
+										setOpen(false);
+									}}
+								>
+									<ProjectThumbnail
+										projectId={project.id}
+										projectName={project.name}
+										projectColor={project.color}
+										githubOwner={project.githubOwner}
+										iconUrl={project.iconUrl}
+										hideImage={project.hideImage ?? false}
+									/>
+									{project.name}
+									{project.id === selectedProjectId && (
+										<HiCheck className="ml-auto size-4" />
+									)}
+								</CommandItem>
+							))}
+						</CommandGroup>
+						<CommandSeparator alwaysRender />
+						<CommandGroup forceMount>
+							<CommandItem
+								forceMount
+								onSelect={() => {
+									setOpen(false);
+									onImportRepo();
+								}}
+							>
+								<LuFolderOpen className="size-4" />
+								Open project
+							</CommandItem>
+							<CommandItem
+								forceMount
+								onSelect={() => {
+									setOpen(false);
+									onNewProject();
+								}}
+							>
+								<LuFolderGit className="size-4" />
+								New project
+							</CommandItem>
+						</CommandGroup>
+					</CommandList>
+				</Command>
+			</PopoverContent>
+		</Popover>
 	);
 }
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PromptGroup/PromptGroup.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PromptGroup/PromptGroup.tsx
index 46434adab00..4ec8d5baa7f 100644
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PromptGroup/PromptGroup.tsx
+++ b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PromptGroup/PromptGroup.tsx
@@ -1,4 +1,9 @@
 import {
+	AGENT_PRESET_COMMANDS,
+	buildAgentPromptCommand,
+} from "@superset/shared/agent-command";
+import {
+	type AgentLaunchRequest,
 	STARTABLE_AGENT_LABELS,
 	STARTABLE_AGENT_TYPES,
 	type StartableAgentType,
@@ -12,21 +17,29 @@ import {
 	SelectTrigger,
 	SelectValue,
 } from "@superset/ui/select";
+import { toast } from "@superset/ui/sonner";
 import { Textarea } from "@superset/ui/textarea";
 import { useRef, useState } from "react";
 import {
 	getPresetIcon,
 	useIsDarkTheme,
 } from "renderer/assets/app-icons/preset-icons";
+import { useCreateWorkspace } from "renderer/react-query/workspaces";
 
 type WorkspaceCreateAgent = StartableAgentType | "none";
 
 const AGENT_STORAGE_KEY = "lastSelectedWorkspaceCreateAgent";
 
-export function PromptGroup() {
+interface PromptGroupProps {
+	projectId: string | null;
+	onClose: () => void;
+}
+
+export function PromptGroup({ projectId, onClose }: PromptGroupProps) {
 	const isDark = useIsDarkTheme();
 	const textareaRef = useRef<HTMLTextAreaElement>(null);
 	const [prompt, setPrompt] = useState("");
+	const createWorkspace = useCreateWorkspace();
 	const [selectedAgent, setSelectedAgent] = useState<WorkspaceCreateAgent>(
 		() => {
 			if (typeof window === "undefined") return "none";
@@ -44,6 +57,73 @@ export function PromptGroup() {
 		window.localStorage.setItem(AGENT_STORAGE_KEY, value);
 	};
 
+	const buildLaunchRequest = (
+		trimmedPrompt: string,
+	): AgentLaunchRequest | null => {
+		if (selectedAgent === "none") return null;
+
+		if (selectedAgent === "superset-chat") {
+			return {
+				kind: "chat",
+				workspaceId: "pending-workspace",
+				agentType: "superset-chat",
+				source: "new-workspace",
+				chat: {
+					initialPrompt: trimmedPrompt || undefined,
+				},
+			};
+		}
+
+		const command = trimmedPrompt
+			? buildAgentPromptCommand({
+					prompt: trimmedPrompt,
+					randomId: window.crypto.randomUUID(),
+					agent: selectedAgent,
+				})
+			: (AGENT_PRESET_COMMANDS[selectedAgent][0] ?? null);
+
+		if (!command) return null;
+
+		return {
+			kind: "terminal",
+			workspaceId: "pending-workspace",
+			agentType: selectedAgent,
+			source: "new-workspace",
+			terminal: {
+				command,
+				name: "Agent",
+			},
+		};
+	};
+
+	const handleCreate = () => {
+		if (!projectId) {
+			toast.error("Select a project first");
+			return;
+		}
+		const trimmedPrompt = prompt.trim();
+		const launchRequest = buildLaunchRequest(trimmedPrompt);
+
+		onClose();
+		toast.promise(
+			createWorkspace.mutateAsyncWithPendingSetup(
+				{
+					projectId,
+					prompt: trimmedPrompt || undefined,
+				},
+				launchRequest
+					? { agentLaunchRequest: launchRequest }
+					: undefined,
+			),
+			{
+				loading: "Creating workspace...",
+				success: "Workspace created",
+				error: (err) =>
+					err instanceof Error ? err.message : "Failed to create workspace",
+			},
+		);
+	};
+
 	return (
 		<div className="p-3 space-y-3" cmdk-group="">
 			<Select
@@ -67,10 +147,10 @@ export function PromptGroup() {
 											<img
 												src={icon}
 												alt=""
-												className="size-3.5 object-contain"
+												className="size-5 object-contain"
 											/>
 										)}
-										{STARTABLE_AGENT_LABELS[agent]}
+										{agent === "superset-chat" ? "Superset" : STARTABLE_AGENT_LABELS[agent]}
 									</span>
 								</SelectItem>
 							);
@@ -81,17 +161,21 @@ export function PromptGroup() {
 
 			<Textarea
 				ref={textareaRef}
-				className="min-h-24 text-sm resize-y field-sizing-fixed"
+				className="min-h-24 max-h-48 text-sm resize-y field-sizing-fixed"
 				placeholder="What do you want to do?"
 				value={prompt}
 				onChange={(e) => setPrompt(e.target.value)}
+				onKeyDown={(e) => {
+					if (e.key === "Enter" && e.metaKey) {
+						e.preventDefault();
+						handleCreate();
+					}
+				}}
 			/>
 
 			<Button
 				className="w-full h-8 text-sm"
-				onClick={() => {
-					console.log("[mock] Create workspace with prompt:", prompt);
-				}}
+				onClick={handleCreate}
 			>
 				Create Workspace
 				<KbdGroup className="ml-1.5 opacity-70">

From 6a2904689748eec1cb49676fbe60335d422a82d2 Mon Sep 17 00:00:00 2001
From: Satya Patel <satyapatel111@gmail.com>
Date: Fri, 6 Mar 2026 19:07:37 -0800
Subject: [PATCH 3/9] WIP

---
 .../src/app/api/electric/[...path]/utils.ts   |   20 +-
 .../app/api/github/jobs/initial-sync/route.ts |    5 +-
 apps/api/src/app/api/github/sync/route.ts     |    3 +
 .../src/app/api/github/webhook/webhooks.ts    |    2 +
 .../NewWorkspaceModal/NewWorkspaceModal.tsx   |   19 +-
 .../components/IssuesGroup/IssuesGroup.tsx    |    3 +-
 .../PullRequestsGroup/PullRequestsGroup.tsx   |  169 +-
 .../CollectionsProvider/collections.ts        |   38 +
 apps/electric-proxy/src/where.ts              |   16 +
 .../0025_add_org_id_to_github_tables.sql      |   29 +
 packages/db/drizzle/meta/0025_snapshot.json   | 4420 +++++++++++++++++
 packages/db/drizzle/meta/_journal.json        |    7 +
 packages/db/src/schema/github.ts              |   12 +
 packages/db/src/schema/relations.ts           |   10 +
 14 files changed, 4701 insertions(+), 52 deletions(-)
 create mode 100644 packages/db/drizzle/0025_add_org_id_to_github_tables.sql
 create mode 100644 packages/db/drizzle/meta/0025_snapshot.json

diff --git a/apps/api/src/app/api/electric/[...path]/utils.ts b/apps/api/src/app/api/electric/[...path]/utils.ts
index 222c46cd6a4..f9ad7f86010 100644
--- a/apps/api/src/app/api/electric/[...path]/utils.ts
+++ b/apps/api/src/app/api/electric/[...path]/utils.ts
@@ -3,6 +3,8 @@ import {
 	agentCommands,
 	chatSessions,
 	devicePresence,
+	githubPullRequests,
+	githubRepositories,
 	integrationConnections,
 	invitations,
 	members,
@@ -33,7 +35,9 @@ export type AllowedTable =
 	| "subscriptions"
 	| "workspaces"
 	| "chat_sessions"
-	| "session_hosts";
+	| "session_hosts"
+	| "github_repositories"
+	| "github_pull_requests";
 
 interface WhereClause {
 	fragment: string;
@@ -138,6 +142,20 @@ export async function buildWhereClause(
 		case "session_hosts":
 			return build(sessionHosts, sessionHosts.organizationId, organizationId);
 
+		case "github_repositories":
+			return build(
+				githubRepositories,
+				githubRepositories.organizationId,
+				organizationId,
+			);
+
+		case "github_pull_requests":
+			return build(
+				githubPullRequests,
+				githubPullRequests.organizationId,
+				organizationId,
+			);
+
 		default:
 			return null;
 	}
diff --git a/apps/api/src/app/api/github/jobs/initial-sync/route.ts b/apps/api/src/app/api/github/jobs/initial-sync/route.ts
index 7b615d7a4ee..4b3b5a843dd 100644
--- a/apps/api/src/app/api/github/jobs/initial-sync/route.ts
+++ b/apps/api/src/app/api/github/jobs/initial-sync/route.ts
@@ -64,7 +64,7 @@ export async function POST(request: Request) {
 		return Response.json({ error: "Invalid payload" }, { status: 400 });
 	}
 
-	const { installationDbId } = parsed.data;
+	const { installationDbId, organizationId } = parsed.data;
 
 	const [installation] = await db
 		.select()
@@ -98,6 +98,7 @@ export async function POST(request: Request) {
 				.insert(githubRepositories)
 				.values({
 					installationId: installationDbId,
+					organizationId,
 					repoId: String(repo.id),
 					owner: repo.owner.login,
 					name: repo.name,
@@ -108,6 +109,7 @@ export async function POST(request: Request) {
 				.onConflictDoUpdate({
 					target: [githubRepositories.repoId],
 					set: {
+						organizationId,
 						owner: repo.owner.login,
 						name: repo.name,
 						fullName: repo.full_name,
@@ -187,6 +189,7 @@ export async function POST(request: Request) {
 					.insert(githubPullRequests)
 					.values({
 						repositoryId: dbRepo.id,
+						organizationId,
 						prNumber: pr.number,
 						nodeId: pr.node_id,
 						headBranch: pr.head.ref,
diff --git a/apps/api/src/app/api/github/sync/route.ts b/apps/api/src/app/api/github/sync/route.ts
index 1d8e8f9fbfa..644fa3d5857 100644
--- a/apps/api/src/app/api/github/sync/route.ts
+++ b/apps/api/src/app/api/github/sync/route.ts
@@ -70,6 +70,7 @@ export async function POST(request: Request) {
 				.insert(githubRepositories)
 				.values({
 					installationId: installation.id,
+					organizationId,
 					repoId: String(repo.id),
 					owner: repo.owner.login,
 					name: repo.name,
@@ -80,6 +81,7 @@ export async function POST(request: Request) {
 				.onConflictDoUpdate({
 					target: [githubRepositories.repoId],
 					set: {
+						organizationId,
 						owner: repo.owner.login,
 						name: repo.name,
 						fullName: repo.full_name,
@@ -159,6 +161,7 @@ export async function POST(request: Request) {
 					.insert(githubPullRequests)
 					.values({
 						repositoryId: dbRepo.id,
+						organizationId,
 						prNumber: pr.number,
 						nodeId: pr.node_id,
 						headBranch: pr.head.ref,
diff --git a/apps/api/src/app/api/github/webhook/webhooks.ts b/apps/api/src/app/api/github/webhook/webhooks.ts
index 091e3e98363..88c9ee78a0b 100644
--- a/apps/api/src/app/api/github/webhook/webhooks.ts
+++ b/apps/api/src/app/api/github/webhook/webhooks.ts
@@ -90,6 +90,7 @@ webhooks.on(
 				.insert(githubRepositories)
 				.values({
 					installationId: installation.id,
+					organizationId: installation.organizationId,
 					repoId: String(repo.id),
 					owner: owner ?? "",
 					name: name ?? repo.name,
@@ -158,6 +159,7 @@ webhooks.on(
 			.insert(githubPullRequests)
 			.values({
 				repositoryId: repo.id,
+				organizationId: repo.organizationId,
 				prNumber: pr.number,
 				nodeId: pr.node_id,
 				headBranch: pr.head.ref,
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/NewWorkspaceModal.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal/NewWorkspaceModal.tsx
index faf2785c6d4..2180b5dc395 100644
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal/NewWorkspaceModal.tsx
+++ b/apps/desktop/src/renderer/components/NewWorkspaceModal/NewWorkspaceModal.tsx
@@ -101,11 +101,26 @@ export function NewWorkspaceModal() {
 			</div>
 
 			{isListTab && (
-				<CommandInput placeholder="Search by title, number, or author..." />
+				<CommandInput
+					placeholder={
+						activeTab === "issues"
+							? "Search by slug, title, or description"
+							: activeTab === "branches"
+								? "Search by name"
+								: "Search by title, number, or author"
+					}
+				/>
 			)}
 
 			<CommandList className="!max-h-none flex-1 overflow-y-auto">
-				{activeTab === "pull-requests" && <PullRequestsGroup />}
+				{activeTab === "pull-requests" && (
+						<PullRequestsGroup
+							projectId={selectedProjectId}
+							githubOwner={selectedProject?.githubOwner ?? null}
+							repoName={selectedProject?.name ?? null}
+							onClose={closeModal}
+						/>
+					)}
 				{activeTab === "branches" && <BranchesGroup />}
 				{activeTab === "issues" && (
 						<IssuesGroup
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/IssuesGroup/IssuesGroup.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/IssuesGroup/IssuesGroup.tsx
index dc628afbd41..dfe7fe4d1f4 100644
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/IssuesGroup/IssuesGroup.tsx
+++ b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/IssuesGroup/IssuesGroup.tsx
@@ -40,7 +40,8 @@ export function IssuesGroup({ projectId, onClose }: IssuesGroupProps) {
 		[collections],
 	);
 
-	const isLinearConnected = false; // TODO: restore — integrations?.some((i) => i.provider === "linear") ?? false;
+	const isLinearConnected =
+		integrations?.some((i) => i.provider === "linear") ?? false;
 
 	const { data } = useLiveQuery(
 		(q) =>
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PullRequestsGroup/PullRequestsGroup.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PullRequestsGroup/PullRequestsGroup.tsx
index c10771a107d..c9c4f168ca3 100644
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PullRequestsGroup/PullRequestsGroup.tsx
+++ b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PullRequestsGroup/PullRequestsGroup.tsx
@@ -1,64 +1,139 @@
 import { CommandEmpty, CommandGroup, CommandItem } from "@superset/ui/command";
-import { GoGitPullRequest } from "react-icons/go";
+import { toast } from "@superset/ui/sonner";
+import { and, eq } from "@tanstack/db";
+import { useLiveQuery } from "@tanstack/react-db";
+import { useMemo } from "react";
+import { GoGitPullRequest, GoGitPullRequestDraft } from "react-icons/go";
+import { useCreateFromPr } from "renderer/react-query/workspaces/useCreateFromPr";
+import { useCollections } from "renderer/routes/_authenticated/providers/CollectionsProvider";
 
-const MOCK_PRS = [
-	{
-		number: 197,
-		title: "docs: update root README with contribution guide",
-		author: "satyapatel",
-		url: "https://github.com/org/repo/pull/197",
-		branch: "docs/update-readme",
-	},
-	{
-		number: 196,
-		title: "fix(api/users): make discoverable flag nullable",
-		author: "jsmith",
-		url: "https://github.com/org/repo/pull/196",
-		branch: "fix/discoverable-nullable",
-	},
-	{
-		number: 192,
-		title: "ux(mobile): keep reps and sets visible during rest timer",
-		author: "amelia",
-		url: "https://github.com/org/repo/pull/192",
-		branch: "ux/rest-timer-visibility",
-	},
-	{
-		number: 189,
-		title: "feat(desktop): add keyboard shortcut for quick switcher",
-		author: "satyapatel",
-		url: "https://github.com/org/repo/pull/189",
-		branch: "feat/quick-switcher-shortcut",
-	},
-	{
-		number: 185,
-		title: "chore: bump dependencies to latest stable versions",
-		author: "dependabot",
-		url: "https://github.com/org/repo/pull/185",
-		branch: "chore/bump-deps",
-	},
-];
+interface PullRequestsGroupProps {
+	projectId: string | null;
+	githubOwner: string | null;
+	repoName: string | null;
+	onClose: () => void;
+}
+
+export function PullRequestsGroup({
+	projectId,
+	githubOwner,
+	repoName,
+	onClose,
+}: PullRequestsGroupProps) {
+	const collections = useCollections();
+	const createFromPr = useCreateFromPr();
+
+	// Match GitHub repository by owner + name from the local project
+	const { data: repoData } = useLiveQuery(
+		(q) =>
+			q
+				.from({ repos: collections.githubRepositories })
+				.where(({ repos }) =>
+					and(
+						eq(repos.owner, githubOwner ?? ""),
+						eq(repos.name, repoName ?? ""),
+					),
+				)
+				.select(({ repos }) => ({
+					id: repos.id,
+				})),
+		[collections, githubOwner, repoName],
+	);
+
+	const githubRepositoryId = repoData?.[0]?.id ?? null;
+
+	// Query open PRs for this repository
+	const { data: pullRequests } = useLiveQuery(
+		(q) =>
+			q
+				.from({ prs: collections.githubPullRequests })
+				.where(({ prs }) =>
+					eq(prs.repositoryId, githubRepositoryId ?? ""),
+				)
+				.select(({ prs }) => ({ ...prs })),
+		[collections, githubRepositoryId],
+	);
+
+	const openPrs = useMemo(
+		() =>
+			(pullRequests ?? [])
+				.filter((pr) => pr.state === "open")
+				.slice(0, 30),
+		[pullRequests],
+	);
+
+	if (!projectId) {
+		return (
+			<CommandGroup>
+				<CommandEmpty>Select a project to view pull requests.</CommandEmpty>
+			</CommandGroup>
+		);
+	}
+
+	if (!githubOwner) {
+		return (
+			<CommandGroup>
+				<CommandEmpty>
+					Connect GitHub to view pull requests.
+				</CommandEmpty>
+			</CommandGroup>
+		);
+	}
+
+	if (!githubRepositoryId) {
+		return (
+			<CommandGroup>
+				<CommandEmpty>
+					No GitHub repository found.
+				</CommandEmpty>
+			</CommandGroup>
+		);
+	}
 
-export function PullRequestsGroup() {
 	return (
 		<CommandGroup>
 			<CommandEmpty>No pull requests found.</CommandEmpty>
-			{MOCK_PRS.map((pr) => (
+			{openPrs.map((pr) => (
 				<CommandItem
-					key={pr.number}
-					value={`#${pr.number} ${pr.title} ${pr.author} ${pr.url}`}
+					key={pr.id}
+					value={`#${pr.prNumber} ${pr.title} ${pr.authorLogin} ${pr.url}`}
 					onSelect={() => {
-						console.log("[mock] Create workspace from PR", pr.number);
+						if (!projectId) {
+							toast.error("Select a project first");
+							return;
+						}
+						onClose();
+						toast.promise(
+							createFromPr.mutateAsync({
+								projectId,
+								prUrl: pr.url,
+							}),
+							{
+								loading: "Creating workspace from PR...",
+								success: "Workspace created",
+								error: (err) =>
+									err instanceof Error
+										? err.message
+										: "Failed to create workspace",
+							},
+						);
 					}}
 					className="group"
 				>
-					<GoGitPullRequest className="size-4 shrink-0 text-emerald-500" />
-					<span className="text-muted-foreground shrink-0 text-xs tabular-nums">
-						#{pr.number}
+					{pr.isDraft ? (
+						<GoGitPullRequestDraft className="size-4 shrink-0 text-muted-foreground" />
+					) : (
+						<GoGitPullRequest className="size-4 shrink-0 text-emerald-500" />
+					)}
+					<span
+						className="text-muted-foreground shrink-0 text-xs tabular-nums truncate"
+						style={{ width: "2.8rem" }}
+					>
+						#{pr.prNumber}
 					</span>
 					<span className="truncate flex-1">{pr.title}</span>
 					<span className="text-xs text-muted-foreground shrink-0 group-data-[selected=true]:hidden">
-						{pr.author}
+						{pr.authorLogin}
 					</span>
 					<span className="text-xs text-muted-foreground shrink-0 hidden group-data-[selected=true]:inline">
 						Open →
diff --git a/apps/desktop/src/renderer/routes/_authenticated/providers/CollectionsProvider/collections.ts b/apps/desktop/src/renderer/routes/_authenticated/providers/CollectionsProvider/collections.ts
index 60a6bb422b7..2ea978f8e23 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/providers/CollectionsProvider/collections.ts
+++ b/apps/desktop/src/renderer/routes/_authenticated/providers/CollectionsProvider/collections.ts
@@ -3,6 +3,8 @@ import type {
 	SelectAgentCommand,
 	SelectChatSession,
 	SelectDevicePresence,
+	SelectGithubPullRequest,
+	SelectGithubRepository,
 	SelectIntegrationConnection,
 	SelectInvitation,
 	SelectMember,
@@ -63,6 +65,8 @@ interface OrgCollections {
 	apiKeys: Collection<ApiKeyDisplay>;
 	chatSessions: Collection<SelectChatSession>;
 	sessionHosts: Collection<SelectSessionHost>;
+	githubRepositories: Collection<SelectGithubRepository>;
+	githubPullRequests: Collection<SelectGithubPullRequest>;
 }
 
 // Per-org collections cache
@@ -360,6 +364,38 @@ function createOrgCollections(organizationId: string): OrgCollections {
 		}),
 	);
 
+	const githubRepositories = createCollection(
+		electricCollectionOptions<SelectGithubRepository>({
+			id: `github_repositories-${organizationId}`,
+			shapeOptions: {
+				url: electricUrl,
+				params: {
+					table: "github_repositories",
+					organizationId,
+				},
+				headers: electricHeaders,
+				columnMapper,
+			},
+			getKey: (item) => item.id,
+		}),
+	);
+
+	const githubPullRequests = createCollection(
+		electricCollectionOptions<SelectGithubPullRequest>({
+			id: `github_pull_requests-${organizationId}`,
+			shapeOptions: {
+				url: electricUrl,
+				params: {
+					table: "github_pull_requests",
+					organizationId,
+				},
+				headers: electricHeaders,
+				columnMapper,
+			},
+			getKey: (item) => item.id,
+		}),
+	);
+
 	return {
 		tasks,
 		taskStatuses,
@@ -375,6 +411,8 @@ function createOrgCollections(organizationId: string): OrgCollections {
 		apiKeys,
 		chatSessions,
 		sessionHosts,
+		githubRepositories,
+		githubPullRequests,
 	};
 }
 
diff --git a/apps/electric-proxy/src/where.ts b/apps/electric-proxy/src/where.ts
index ff3bad74173..ec1814fca06 100644
--- a/apps/electric-proxy/src/where.ts
+++ b/apps/electric-proxy/src/where.ts
@@ -2,6 +2,8 @@ import {
 	agentCommands,
 	chatSessions,
 	devicePresence,
+	githubPullRequests,
+	githubRepositories,
 	integrationConnections,
 	invitations,
 	members,
@@ -108,6 +110,20 @@ export function buildWhereClause(
 		case "session_hosts":
 			return build(sessionHosts, sessionHosts.organizationId, organizationId);
 
+		case "github_repositories":
+			return build(
+				githubRepositories,
+				githubRepositories.organizationId,
+				organizationId,
+			);
+
+		case "github_pull_requests":
+			return build(
+				githubPullRequests,
+				githubPullRequests.organizationId,
+				organizationId,
+			);
+
 		default:
 			return null;
 	}
diff --git a/packages/db/drizzle/0025_add_org_id_to_github_tables.sql b/packages/db/drizzle/0025_add_org_id_to_github_tables.sql
new file mode 100644
index 00000000000..9b057f4a315
--- /dev/null
+++ b/packages/db/drizzle/0025_add_org_id_to_github_tables.sql
@@ -0,0 +1,29 @@
+-- 1. Add columns as nullable
+ALTER TABLE "github_repositories" ADD COLUMN "organization_id" uuid;--> statement-breakpoint
+ALTER TABLE "github_pull_requests" ADD COLUMN "organization_id" uuid;--> statement-breakpoint
+
+-- 2. Backfill github_repositories from github_installations
+UPDATE "github_repositories" r
+SET "organization_id" = i."organization_id"
+FROM "github_installations" i
+WHERE r."installation_id" = i."id";--> statement-breakpoint
+
+-- 3. Backfill github_pull_requests from github_repositories
+UPDATE "github_pull_requests" pr
+SET "organization_id" = r."organization_id"
+FROM "github_repositories" r
+WHERE pr."repository_id" = r."id";--> statement-breakpoint
+
+-- 4. Set NOT NULL
+ALTER TABLE "github_repositories" ALTER COLUMN "organization_id" SET NOT NULL;--> statement-breakpoint
+ALTER TABLE "github_pull_requests" ALTER COLUMN "organization_id" SET NOT NULL;--> statement-breakpoint
+
+-- 5. Add FK constraints
+ALTER TABLE "github_repositories" ADD CONSTRAINT "github_repositories_organization_id_organizations_id_fk"
+  FOREIGN KEY ("organization_id") REFERENCES "auth"."organizations"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "github_pull_requests" ADD CONSTRAINT "github_pull_requests_organization_id_organizations_id_fk"
+  FOREIGN KEY ("organization_id") REFERENCES "auth"."organizations"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+
+-- 6. Add indexes
+CREATE INDEX "github_repositories_org_id_idx" ON "github_repositories" USING btree ("organization_id");--> statement-breakpoint
+CREATE INDEX "github_pull_requests_org_id_idx" ON "github_pull_requests" USING btree ("organization_id");
diff --git a/packages/db/drizzle/meta/0025_snapshot.json b/packages/db/drizzle/meta/0025_snapshot.json
new file mode 100644
index 00000000000..91687c02e85
--- /dev/null
+++ b/packages/db/drizzle/meta/0025_snapshot.json
@@ -0,0 +1,4420 @@
+{
+  "id": "934fa292-7198-4713-943a-d4562b4111f2",
+  "prevId": "7737e571-4fd4-4034-a673-b8d5241b4873",
+  "version": "7",
+  "dialect": "postgresql",
+  "tables": {
+    "auth.accounts": {
+      "name": "accounts",
+      "schema": "auth",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "account_id": {
+          "name": "account_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "access_token": {
+          "name": "access_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "refresh_token": {
+          "name": "refresh_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "id_token": {
+          "name": "id_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "access_token_expires_at": {
+          "name": "access_token_expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "refresh_token_expires_at": {
+          "name": "refresh_token_expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "scope": {
+          "name": "scope",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "password": {
+          "name": "password",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "accounts_user_id_idx": {
+          "name": "accounts_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "accounts_user_id_users_id_fk": {
+          "name": "accounts_user_id_users_id_fk",
+          "tableFrom": "accounts",
+          "tableTo": "users",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "auth.apikeys": {
+      "name": "apikeys",
+      "schema": "auth",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "start": {
+          "name": "start",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "prefix": {
+          "name": "prefix",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "refill_interval": {
+          "name": "refill_interval",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "refill_amount": {
+          "name": "refill_amount",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_refill_at": {
+          "name": "last_refill_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "enabled": {
+          "name": "enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false,
+          "default": true
+        },
+        "rate_limit_enabled": {
+          "name": "rate_limit_enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false,
+          "default": true
+        },
+        "rate_limit_time_window": {
+          "name": "rate_limit_time_window",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "default": 86400000
+        },
+        "rate_limit_max": {
+          "name": "rate_limit_max",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "default": 10
+        },
+        "request_count": {
+          "name": "request_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "default": 0
+        },
+        "remaining": {
+          "name": "remaining",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_request": {
+          "name": "last_request",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "permissions": {
+          "name": "permissions",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "apikeys_key_idx": {
+          "name": "apikeys_key_idx",
+          "columns": [
+            {
+              "expression": "key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "apikeys_user_id_idx": {
+          "name": "apikeys_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "apikeys_user_id_users_id_fk": {
+          "name": "apikeys_user_id_users_id_fk",
+          "tableFrom": "apikeys",
+          "tableTo": "users",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "auth.invitations": {
+      "name": "invitations",
+      "schema": "auth",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "inviter_id": {
+          "name": "inviter_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "invitations_organization_id_idx": {
+          "name": "invitations_organization_id_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "invitations_email_idx": {
+          "name": "invitations_email_idx",
+          "columns": [
+            {
+              "expression": "email",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "invitations_organization_id_organizations_id_fk": {
+          "name": "invitations_organization_id_organizations_id_fk",
+          "tableFrom": "invitations",
+          "tableTo": "organizations",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "organization_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "invitations_inviter_id_users_id_fk": {
+          "name": "invitations_inviter_id_users_id_fk",
+          "tableFrom": "invitations",
+          "tableTo": "users",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "inviter_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "auth.jwkss": {
+      "name": "jwkss",
+      "schema": "auth",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "public_key": {
+          "name": "public_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "private_key": {
+          "name": "private_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "auth.members": {
+      "name": "members",
+      "schema": "auth",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'member'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "members_organization_id_idx": {
+          "name": "members_organization_id_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "members_user_id_idx": {
+          "name": "members_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "members_organization_id_organizations_id_fk": {
+          "name": "members_organization_id_organizations_id_fk",
+          "tableFrom": "members",
+          "tableTo": "organizations",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "organization_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "members_user_id_users_id_fk": {
+          "name": "members_user_id_users_id_fk",
+          "tableFrom": "members",
+          "tableTo": "users",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "auth.oauth_access_tokens": {
+      "name": "oauth_access_tokens",
+      "schema": "auth",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "client_id": {
+          "name": "client_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "session_id": {
+          "name": "session_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "reference_id": {
+          "name": "reference_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "refresh_id": {
+          "name": "refresh_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "scopes": {
+          "name": "scopes",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "oauth_access_tokens_client_id_oauth_clients_client_id_fk": {
+          "name": "oauth_access_tokens_client_id_oauth_clients_client_id_fk",
+          "tableFrom": "oauth_access_tokens",
+          "tableTo": "oauth_clients",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "client_id"
+          ],
+          "columnsTo": [
+            "client_id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "oauth_access_tokens_session_id_sessions_id_fk": {
+          "name": "oauth_access_tokens_session_id_sessions_id_fk",
+          "tableFrom": "oauth_access_tokens",
+          "tableTo": "sessions",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "session_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "oauth_access_tokens_user_id_users_id_fk": {
+          "name": "oauth_access_tokens_user_id_users_id_fk",
+          "tableFrom": "oauth_access_tokens",
+          "tableTo": "users",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "oauth_access_tokens_refresh_id_oauth_refresh_tokens_id_fk": {
+          "name": "oauth_access_tokens_refresh_id_oauth_refresh_tokens_id_fk",
+          "tableFrom": "oauth_access_tokens",
+          "tableTo": "oauth_refresh_tokens",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "refresh_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "oauth_access_tokens_token_unique": {
+          "name": "oauth_access_tokens_token_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "token"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "auth.oauth_clients": {
+      "name": "oauth_clients",
+      "schema": "auth",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "client_id": {
+          "name": "client_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "client_secret": {
+          "name": "client_secret",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "disabled": {
+          "name": "disabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false,
+          "default": false
+        },
+        "skip_consent": {
+          "name": "skip_consent",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "enable_end_session": {
+          "name": "enable_end_session",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "scopes": {
+          "name": "scopes",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "uri": {
+          "name": "uri",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "icon": {
+          "name": "icon",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "contacts": {
+          "name": "contacts",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tos": {
+          "name": "tos",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "policy": {
+          "name": "policy",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "software_id": {
+          "name": "software_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "software_version": {
+          "name": "software_version",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "software_statement": {
+          "name": "software_statement",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "redirect_uris": {
+          "name": "redirect_uris",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "post_logout_redirect_uris": {
+          "name": "post_logout_redirect_uris",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "token_endpoint_auth_method": {
+          "name": "token_endpoint_auth_method",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "grant_types": {
+          "name": "grant_types",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "response_types": {
+          "name": "response_types",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "public": {
+          "name": "public",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "reference_id": {
+          "name": "reference_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "oauth_clients_user_id_users_id_fk": {
+          "name": "oauth_clients_user_id_users_id_fk",
+          "tableFrom": "oauth_clients",
+          "tableTo": "users",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "oauth_clients_client_id_unique": {
+          "name": "oauth_clients_client_id_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "client_id"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "auth.oauth_consents": {
+      "name": "oauth_consents",
+      "schema": "auth",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "client_id": {
+          "name": "client_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "reference_id": {
+          "name": "reference_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "scopes": {
+          "name": "scopes",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "oauth_consents_client_id_oauth_clients_client_id_fk": {
+          "name": "oauth_consents_client_id_oauth_clients_client_id_fk",
+          "tableFrom": "oauth_consents",
+          "tableTo": "oauth_clients",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "client_id"
+          ],
+          "columnsTo": [
+            "client_id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "oauth_consents_user_id_users_id_fk": {
+          "name": "oauth_consents_user_id_users_id_fk",
+          "tableFrom": "oauth_consents",
+          "tableTo": "users",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "auth.oauth_refresh_tokens": {
+      "name": "oauth_refresh_tokens",
+      "schema": "auth",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "client_id": {
+          "name": "client_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "session_id": {
+          "name": "session_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "reference_id": {
+          "name": "reference_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "revoked": {
+          "name": "revoked",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "scopes": {
+          "name": "scopes",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "oauth_refresh_tokens_client_id_oauth_clients_client_id_fk": {
+          "name": "oauth_refresh_tokens_client_id_oauth_clients_client_id_fk",
+          "tableFrom": "oauth_refresh_tokens",
+          "tableTo": "oauth_clients",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "client_id"
+          ],
+          "columnsTo": [
+            "client_id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "oauth_refresh_tokens_session_id_sessions_id_fk": {
+          "name": "oauth_refresh_tokens_session_id_sessions_id_fk",
+          "tableFrom": "oauth_refresh_tokens",
+          "tableTo": "sessions",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "session_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "oauth_refresh_tokens_user_id_users_id_fk": {
+          "name": "oauth_refresh_tokens_user_id_users_id_fk",
+          "tableFrom": "oauth_refresh_tokens",
+          "tableTo": "users",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "auth.organizations": {
+      "name": "organizations",
+      "schema": "auth",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "slug": {
+          "name": "slug",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "logo": {
+          "name": "logo",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "stripe_customer_id": {
+          "name": "stripe_customer_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "allowed_domains": {
+          "name": "allowed_domains",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        }
+      },
+      "indexes": {
+        "organizations_slug_idx": {
+          "name": "organizations_slug_idx",
+          "columns": [
+            {
+              "expression": "slug",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "organizations_allowed_domains_idx": {
+          "name": "organizations_allowed_domains_idx",
+          "columns": [
+            {
+              "expression": "allowed_domains",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "gin",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "organizations_slug_unique": {
+          "name": "organizations_slug_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "slug"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "auth.sessions": {
+      "name": "sessions",
+      "schema": "auth",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "ip_address": {
+          "name": "ip_address",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_agent": {
+          "name": "user_agent",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "active_organization_id": {
+          "name": "active_organization_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "sessions_user_id_idx": {
+          "name": "sessions_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "sessions_user_id_users_id_fk": {
+          "name": "sessions_user_id_users_id_fk",
+          "tableFrom": "sessions",
+          "tableTo": "users",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "sessions_token_unique": {
+          "name": "sessions_token_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "token"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "auth.users": {
+      "name": "users",
+      "schema": "auth",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "email_verified": {
+          "name": "email_verified",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "image": {
+          "name": "image",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "organization_ids": {
+          "name": "organization_ids",
+          "type": "uuid[]",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "users_email_unique": {
+          "name": "users_email_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "email"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "auth.verifications": {
+      "name": "verifications",
+      "schema": "auth",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "identifier": {
+          "name": "identifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "value": {
+          "name": "value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "verifications_identifier_idx": {
+          "name": "verifications_identifier_idx",
+          "columns": [
+            {
+              "expression": "identifier",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.github_installations": {
+      "name": "github_installations",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "connected_by_user_id": {
+          "name": "connected_by_user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "installation_id": {
+          "name": "installation_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "account_login": {
+          "name": "account_login",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "account_type": {
+          "name": "account_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "permissions": {
+          "name": "permissions",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "suspended": {
+          "name": "suspended",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "suspended_at": {
+          "name": "suspended_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_synced_at": {
+          "name": "last_synced_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "github_installations_installation_id_idx": {
+          "name": "github_installations_installation_id_idx",
+          "columns": [
+            {
+              "expression": "installation_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "github_installations_organization_id_organizations_id_fk": {
+          "name": "github_installations_organization_id_organizations_id_fk",
+          "tableFrom": "github_installations",
+          "tableTo": "organizations",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "organization_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "github_installations_connected_by_user_id_users_id_fk": {
+          "name": "github_installations_connected_by_user_id_users_id_fk",
+          "tableFrom": "github_installations",
+          "tableTo": "users",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "connected_by_user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "github_installations_installation_id_unique": {
+          "name": "github_installations_installation_id_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "installation_id"
+          ]
+        },
+        "github_installations_org_unique": {
+          "name": "github_installations_org_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "organization_id"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.github_pull_requests": {
+      "name": "github_pull_requests",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "repository_id": {
+          "name": "repository_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "pr_number": {
+          "name": "pr_number",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "node_id": {
+          "name": "node_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "head_branch": {
+          "name": "head_branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "head_sha": {
+          "name": "head_sha",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "base_branch": {
+          "name": "base_branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "url": {
+          "name": "url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "author_login": {
+          "name": "author_login",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "author_avatar_url": {
+          "name": "author_avatar_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "state": {
+          "name": "state",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "is_draft": {
+          "name": "is_draft",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "additions": {
+          "name": "additions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "deletions": {
+          "name": "deletions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "changed_files": {
+          "name": "changed_files",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "review_decision": {
+          "name": "review_decision",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "checks_status": {
+          "name": "checks_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'none'"
+        },
+        "checks": {
+          "name": "checks",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'[]'::jsonb"
+        },
+        "merged_at": {
+          "name": "merged_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "closed_at": {
+          "name": "closed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_synced_at": {
+          "name": "last_synced_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "github_pull_requests_repository_id_idx": {
+          "name": "github_pull_requests_repository_id_idx",
+          "columns": [
+            {
+              "expression": "repository_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "github_pull_requests_state_idx": {
+          "name": "github_pull_requests_state_idx",
+          "columns": [
+            {
+              "expression": "state",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "github_pull_requests_head_branch_idx": {
+          "name": "github_pull_requests_head_branch_idx",
+          "columns": [
+            {
+              "expression": "head_branch",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "github_pull_requests_org_id_idx": {
+          "name": "github_pull_requests_org_id_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "github_pull_requests_repository_id_github_repositories_id_fk": {
+          "name": "github_pull_requests_repository_id_github_repositories_id_fk",
+          "tableFrom": "github_pull_requests",
+          "tableTo": "github_repositories",
+          "columnsFrom": [
+            "repository_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "github_pull_requests_organization_id_organizations_id_fk": {
+          "name": "github_pull_requests_organization_id_organizations_id_fk",
+          "tableFrom": "github_pull_requests",
+          "tableTo": "organizations",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "organization_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "github_pull_requests_repo_pr_unique": {
+          "name": "github_pull_requests_repo_pr_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "repository_id",
+            "pr_number"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.github_repositories": {
+      "name": "github_repositories",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "installation_id": {
+          "name": "installation_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "repo_id": {
+          "name": "repo_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "owner": {
+          "name": "owner",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "full_name": {
+          "name": "full_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "default_branch": {
+          "name": "default_branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'main'"
+        },
+        "is_private": {
+          "name": "is_private",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "github_repositories_installation_id_idx": {
+          "name": "github_repositories_installation_id_idx",
+          "columns": [
+            {
+              "expression": "installation_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "github_repositories_full_name_idx": {
+          "name": "github_repositories_full_name_idx",
+          "columns": [
+            {
+              "expression": "full_name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "github_repositories_org_id_idx": {
+          "name": "github_repositories_org_id_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "github_repositories_installation_id_github_installations_id_fk": {
+          "name": "github_repositories_installation_id_github_installations_id_fk",
+          "tableFrom": "github_repositories",
+          "tableTo": "github_installations",
+          "columnsFrom": [
+            "installation_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "github_repositories_organization_id_organizations_id_fk": {
+          "name": "github_repositories_organization_id_organizations_id_fk",
+          "tableFrom": "github_repositories",
+          "tableTo": "organizations",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "organization_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "github_repositories_repo_id_unique": {
+          "name": "github_repositories_repo_id_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "repo_id"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "ingest.webhook_events": {
+      "name": "webhook_events",
+      "schema": "ingest",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "provider": {
+          "name": "provider",
+          "type": "integration_provider",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "event_id": {
+          "name": "event_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "event_type": {
+          "name": "event_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "payload": {
+          "name": "payload",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "processed_at": {
+          "name": "processed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "error": {
+          "name": "error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "retry_count": {
+          "name": "retry_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "received_at": {
+          "name": "received_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "webhook_events_provider_status_idx": {
+          "name": "webhook_events_provider_status_idx",
+          "columns": [
+            {
+              "expression": "provider",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "webhook_events_provider_event_id_idx": {
+          "name": "webhook_events_provider_event_id_idx",
+          "columns": [
+            {
+              "expression": "provider",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "event_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "webhook_events_received_at_idx": {
+          "name": "webhook_events_received_at_idx",
+          "columns": [
+            {
+              "expression": "received_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.agent_commands": {
+      "name": "agent_commands",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "target_device_id": {
+          "name": "target_device_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "target_device_type": {
+          "name": "target_device_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tool": {
+          "name": "tool",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "params": {
+          "name": "params",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "parent_command_id": {
+          "name": "parent_command_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "command_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "result": {
+          "name": "result",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "error": {
+          "name": "error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "executed_at": {
+          "name": "executed_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "timeout_at": {
+          "name": "timeout_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "agent_commands_user_status_idx": {
+          "name": "agent_commands_user_status_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "agent_commands_target_device_status_idx": {
+          "name": "agent_commands_target_device_status_idx",
+          "columns": [
+            {
+              "expression": "target_device_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "agent_commands_org_created_idx": {
+          "name": "agent_commands_org_created_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "agent_commands_user_id_users_id_fk": {
+          "name": "agent_commands_user_id_users_id_fk",
+          "tableFrom": "agent_commands",
+          "tableTo": "users",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "agent_commands_organization_id_organizations_id_fk": {
+          "name": "agent_commands_organization_id_organizations_id_fk",
+          "tableFrom": "agent_commands",
+          "tableTo": "organizations",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "organization_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.chat_sessions": {
+      "name": "chat_sessions",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_active_at": {
+          "name": "last_active_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "chat_sessions_org_idx": {
+          "name": "chat_sessions_org_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "chat_sessions_created_by_idx": {
+          "name": "chat_sessions_created_by_idx",
+          "columns": [
+            {
+              "expression": "created_by",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "chat_sessions_last_active_idx": {
+          "name": "chat_sessions_last_active_idx",
+          "columns": [
+            {
+              "expression": "last_active_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "chat_sessions_organization_id_organizations_id_fk": {
+          "name": "chat_sessions_organization_id_organizations_id_fk",
+          "tableFrom": "chat_sessions",
+          "tableTo": "organizations",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "organization_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "chat_sessions_created_by_users_id_fk": {
+          "name": "chat_sessions_created_by_users_id_fk",
+          "tableFrom": "chat_sessions",
+          "tableTo": "users",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "created_by"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "chat_sessions_workspace_id_workspaces_id_fk": {
+          "name": "chat_sessions_workspace_id_workspaces_id_fk",
+          "tableFrom": "chat_sessions",
+          "tableTo": "workspaces",
+          "columnsFrom": [
+            "workspace_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.device_presence": {
+      "name": "device_presence",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "device_id": {
+          "name": "device_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "device_name": {
+          "name": "device_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "device_type": {
+          "name": "device_type",
+          "type": "device_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "last_seen_at": {
+          "name": "last_seen_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "device_presence_user_org_idx": {
+          "name": "device_presence_user_org_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "device_presence_user_device_idx": {
+          "name": "device_presence_user_device_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "device_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "device_presence_last_seen_idx": {
+          "name": "device_presence_last_seen_idx",
+          "columns": [
+            {
+              "expression": "last_seen_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "device_presence_user_id_users_id_fk": {
+          "name": "device_presence_user_id_users_id_fk",
+          "tableFrom": "device_presence",
+          "tableTo": "users",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "device_presence_organization_id_organizations_id_fk": {
+          "name": "device_presence_organization_id_organizations_id_fk",
+          "tableFrom": "device_presence",
+          "tableTo": "organizations",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "organization_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.integration_connections": {
+      "name": "integration_connections",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "connected_by_user_id": {
+          "name": "connected_by_user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider": {
+          "name": "provider",
+          "type": "integration_provider",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "access_token": {
+          "name": "access_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "refresh_token": {
+          "name": "refresh_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "token_expires_at": {
+          "name": "token_expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "external_org_id": {
+          "name": "external_org_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "external_org_name": {
+          "name": "external_org_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "config": {
+          "name": "config",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "integration_connections_org_idx": {
+          "name": "integration_connections_org_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "integration_connections_organization_id_organizations_id_fk": {
+          "name": "integration_connections_organization_id_organizations_id_fk",
+          "tableFrom": "integration_connections",
+          "tableTo": "organizations",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "organization_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "integration_connections_connected_by_user_id_users_id_fk": {
+          "name": "integration_connections_connected_by_user_id_users_id_fk",
+          "tableFrom": "integration_connections",
+          "tableTo": "users",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "connected_by_user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "integration_connections_unique": {
+          "name": "integration_connections_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "organization_id",
+            "provider"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.projects": {
+      "name": "projects",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "slug": {
+          "name": "slug",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "github_repository_id": {
+          "name": "github_repository_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "repo_owner": {
+          "name": "repo_owner",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "repo_name": {
+          "name": "repo_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "repo_url": {
+          "name": "repo_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "default_branch": {
+          "name": "default_branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'main'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "projects_organization_id_idx": {
+          "name": "projects_organization_id_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "projects_organization_id_organizations_id_fk": {
+          "name": "projects_organization_id_organizations_id_fk",
+          "tableFrom": "projects",
+          "tableTo": "organizations",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "organization_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "projects_github_repository_id_github_repositories_id_fk": {
+          "name": "projects_github_repository_id_github_repositories_id_fk",
+          "tableFrom": "projects",
+          "tableTo": "github_repositories",
+          "columnsFrom": [
+            "github_repository_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "projects_org_slug_unique": {
+          "name": "projects_org_slug_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "organization_id",
+            "slug"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.sandbox_images": {
+      "name": "sandbox_images",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "setup_commands": {
+          "name": "setup_commands",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'[]'::jsonb"
+        },
+        "base_image": {
+          "name": "base_image",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "system_packages": {
+          "name": "system_packages",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'[]'::jsonb"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "sandbox_images_organization_id_idx": {
+          "name": "sandbox_images_organization_id_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "sandbox_images_organization_id_organizations_id_fk": {
+          "name": "sandbox_images_organization_id_organizations_id_fk",
+          "tableFrom": "sandbox_images",
+          "tableTo": "organizations",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "organization_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "sandbox_images_project_id_projects_id_fk": {
+          "name": "sandbox_images_project_id_projects_id_fk",
+          "tableFrom": "sandbox_images",
+          "tableTo": "projects",
+          "columnsFrom": [
+            "project_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "sandbox_images_project_unique": {
+          "name": "sandbox_images_project_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "project_id"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.secrets": {
+      "name": "secrets",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "encrypted_value": {
+          "name": "encrypted_value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "sensitive": {
+          "name": "sensitive",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "created_by_user_id": {
+          "name": "created_by_user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "secrets_project_id_idx": {
+          "name": "secrets_project_id_idx",
+          "columns": [
+            {
+              "expression": "project_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "secrets_organization_id_idx": {
+          "name": "secrets_organization_id_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "secrets_organization_id_organizations_id_fk": {
+          "name": "secrets_organization_id_organizations_id_fk",
+          "tableFrom": "secrets",
+          "tableTo": "organizations",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "organization_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "secrets_project_id_projects_id_fk": {
+          "name": "secrets_project_id_projects_id_fk",
+          "tableFrom": "secrets",
+          "tableTo": "projects",
+          "columnsFrom": [
+            "project_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "secrets_created_by_user_id_users_id_fk": {
+          "name": "secrets_created_by_user_id_users_id_fk",
+          "tableFrom": "secrets",
+          "tableTo": "users",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "created_by_user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "secrets_project_key_unique": {
+          "name": "secrets_project_key_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "project_id",
+            "key"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.session_hosts": {
+      "name": "session_hosts",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "session_id": {
+          "name": "session_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "device_id": {
+          "name": "device_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "session_hosts_session_id_idx": {
+          "name": "session_hosts_session_id_idx",
+          "columns": [
+            {
+              "expression": "session_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "session_hosts_org_idx": {
+          "name": "session_hosts_org_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "session_hosts_device_id_idx": {
+          "name": "session_hosts_device_id_idx",
+          "columns": [
+            {
+              "expression": "device_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "session_hosts_session_id_chat_sessions_id_fk": {
+          "name": "session_hosts_session_id_chat_sessions_id_fk",
+          "tableFrom": "session_hosts",
+          "tableTo": "chat_sessions",
+          "columnsFrom": [
+            "session_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "session_hosts_organization_id_organizations_id_fk": {
+          "name": "session_hosts_organization_id_organizations_id_fk",
+          "tableFrom": "session_hosts",
+          "tableTo": "organizations",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "organization_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.subscriptions": {
+      "name": "subscriptions",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "plan": {
+          "name": "plan",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "reference_id": {
+          "name": "reference_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "stripe_customer_id": {
+          "name": "stripe_customer_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "stripe_subscription_id": {
+          "name": "stripe_subscription_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'incomplete'"
+        },
+        "period_start": {
+          "name": "period_start",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "period_end": {
+          "name": "period_end",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "trial_start": {
+          "name": "trial_start",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "trial_end": {
+          "name": "trial_end",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cancel_at_period_end": {
+          "name": "cancel_at_period_end",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false,
+          "default": false
+        },
+        "cancel_at": {
+          "name": "cancel_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "canceled_at": {
+          "name": "canceled_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "ended_at": {
+          "name": "ended_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "seats": {
+          "name": "seats",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "subscriptions_reference_id_idx": {
+          "name": "subscriptions_reference_id_idx",
+          "columns": [
+            {
+              "expression": "reference_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "subscriptions_stripe_customer_id_idx": {
+          "name": "subscriptions_stripe_customer_id_idx",
+          "columns": [
+            {
+              "expression": "stripe_customer_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "subscriptions_status_idx": {
+          "name": "subscriptions_status_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "subscriptions_reference_id_organizations_id_fk": {
+          "name": "subscriptions_reference_id_organizations_id_fk",
+          "tableFrom": "subscriptions",
+          "tableTo": "organizations",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "reference_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.task_statuses": {
+      "name": "task_statuses",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "color": {
+          "name": "color",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "position": {
+          "name": "position",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "progress_percent": {
+          "name": "progress_percent",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "external_provider": {
+          "name": "external_provider",
+          "type": "integration_provider",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "external_id": {
+          "name": "external_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "task_statuses_organization_id_idx": {
+          "name": "task_statuses_organization_id_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "task_statuses_type_idx": {
+          "name": "task_statuses_type_idx",
+          "columns": [
+            {
+              "expression": "type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "task_statuses_organization_id_organizations_id_fk": {
+          "name": "task_statuses_organization_id_organizations_id_fk",
+          "tableFrom": "task_statuses",
+          "tableTo": "organizations",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "organization_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "task_statuses_org_external_unique": {
+          "name": "task_statuses_org_external_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "organization_id",
+            "external_provider",
+            "external_id"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.tasks": {
+      "name": "tasks",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "slug": {
+          "name": "slug",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status_id": {
+          "name": "status_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "priority": {
+          "name": "priority",
+          "type": "task_priority",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'none'"
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "assignee_id": {
+          "name": "assignee_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "creator_id": {
+          "name": "creator_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "estimate": {
+          "name": "estimate",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "due_date": {
+          "name": "due_date",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "labels": {
+          "name": "labels",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'[]'::jsonb"
+        },
+        "branch": {
+          "name": "branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "pr_url": {
+          "name": "pr_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "external_provider": {
+          "name": "external_provider",
+          "type": "integration_provider",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "external_id": {
+          "name": "external_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "external_key": {
+          "name": "external_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "external_url": {
+          "name": "external_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_synced_at": {
+          "name": "last_synced_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "sync_error": {
+          "name": "sync_error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "tasks_slug_idx": {
+          "name": "tasks_slug_idx",
+          "columns": [
+            {
+              "expression": "slug",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "tasks_organization_id_idx": {
+          "name": "tasks_organization_id_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "tasks_assignee_id_idx": {
+          "name": "tasks_assignee_id_idx",
+          "columns": [
+            {
+              "expression": "assignee_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "tasks_creator_id_idx": {
+          "name": "tasks_creator_id_idx",
+          "columns": [
+            {
+              "expression": "creator_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "tasks_status_id_idx": {
+          "name": "tasks_status_id_idx",
+          "columns": [
+            {
+              "expression": "status_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "tasks_created_at_idx": {
+          "name": "tasks_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "tasks_external_provider_idx": {
+          "name": "tasks_external_provider_idx",
+          "columns": [
+            {
+              "expression": "external_provider",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "tasks_status_id_task_statuses_id_fk": {
+          "name": "tasks_status_id_task_statuses_id_fk",
+          "tableFrom": "tasks",
+          "tableTo": "task_statuses",
+          "columnsFrom": [
+            "status_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "tasks_organization_id_organizations_id_fk": {
+          "name": "tasks_organization_id_organizations_id_fk",
+          "tableFrom": "tasks",
+          "tableTo": "organizations",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "organization_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "tasks_assignee_id_users_id_fk": {
+          "name": "tasks_assignee_id_users_id_fk",
+          "tableFrom": "tasks",
+          "tableTo": "users",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "assignee_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "tasks_creator_id_users_id_fk": {
+          "name": "tasks_creator_id_users_id_fk",
+          "tableFrom": "tasks",
+          "tableTo": "users",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "creator_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "tasks_external_unique": {
+          "name": "tasks_external_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "organization_id",
+            "external_provider",
+            "external_id"
+          ]
+        },
+        "tasks_org_slug_unique": {
+          "name": "tasks_org_slug_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "organization_id",
+            "slug"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.users__slack_users": {
+      "name": "users__slack_users",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "slack_user_id": {
+          "name": "slack_user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "team_id": {
+          "name": "team_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "model_preference": {
+          "name": "model_preference",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "users__slack_users_user_idx": {
+          "name": "users__slack_users_user_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "users__slack_users_org_idx": {
+          "name": "users__slack_users_org_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "users__slack_users_user_id_users_id_fk": {
+          "name": "users__slack_users_user_id_users_id_fk",
+          "tableFrom": "users__slack_users",
+          "tableTo": "users",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "users__slack_users_organization_id_organizations_id_fk": {
+          "name": "users__slack_users_organization_id_organizations_id_fk",
+          "tableFrom": "users__slack_users",
+          "tableTo": "organizations",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "organization_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "users__slack_users_unique": {
+          "name": "users__slack_users_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "slack_user_id",
+            "team_id"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workspaces": {
+      "name": "workspaces",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "workspace_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "config": {
+          "name": "config",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_by_user_id": {
+          "name": "created_by_user_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workspaces_project_id_idx": {
+          "name": "workspaces_project_id_idx",
+          "columns": [
+            {
+              "expression": "project_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspaces_organization_id_idx": {
+          "name": "workspaces_organization_id_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspaces_type_idx": {
+          "name": "workspaces_type_idx",
+          "columns": [
+            {
+              "expression": "type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workspaces_organization_id_organizations_id_fk": {
+          "name": "workspaces_organization_id_organizations_id_fk",
+          "tableFrom": "workspaces",
+          "tableTo": "organizations",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "organization_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspaces_project_id_projects_id_fk": {
+          "name": "workspaces_project_id_projects_id_fk",
+          "tableFrom": "workspaces",
+          "tableTo": "projects",
+          "columnsFrom": [
+            "project_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspaces_created_by_user_id_users_id_fk": {
+          "name": "workspaces_created_by_user_id_users_id_fk",
+          "tableFrom": "workspaces",
+          "tableTo": "users",
+          "schemaTo": "auth",
+          "columnsFrom": [
+            "created_by_user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    }
+  },
+  "enums": {
+    "public.command_status": {
+      "name": "command_status",
+      "schema": "public",
+      "values": [
+        "pending",
+        "completed",
+        "failed",
+        "timeout"
+      ]
+    },
+    "public.device_type": {
+      "name": "device_type",
+      "schema": "public",
+      "values": [
+        "desktop",
+        "mobile",
+        "web"
+      ]
+    },
+    "public.integration_provider": {
+      "name": "integration_provider",
+      "schema": "public",
+      "values": [
+        "linear",
+        "github",
+        "slack"
+      ]
+    },
+    "public.task_priority": {
+      "name": "task_priority",
+      "schema": "public",
+      "values": [
+        "urgent",
+        "high",
+        "medium",
+        "low",
+        "none"
+      ]
+    },
+    "public.task_status": {
+      "name": "task_status",
+      "schema": "public",
+      "values": [
+        "backlog",
+        "todo",
+        "planning",
+        "working",
+        "needs-feedback",
+        "ready-to-merge",
+        "completed",
+        "canceled"
+      ]
+    },
+    "public.workspace_type": {
+      "name": "workspace_type",
+      "schema": "public",
+      "values": [
+        "local",
+        "cloud"
+      ]
+    }
+  },
+  "schemas": {
+    "auth": "auth",
+    "ingest": "ingest"
+  },
+  "sequences": {},
+  "roles": {},
+  "policies": {},
+  "views": {},
+  "_meta": {
+    "columns": {},
+    "schemas": {},
+    "tables": {}
+  }
+}
\ No newline at end of file
diff --git a/packages/db/drizzle/meta/_journal.json b/packages/db/drizzle/meta/_journal.json
index 464918d982c..bbfd5c987a0 100644
--- a/packages/db/drizzle/meta/_journal.json
+++ b/packages/db/drizzle/meta/_journal.json
@@ -176,6 +176,13 @@
       "when": 1772675221034,
       "tag": "0024_add_allowed_domains_to_organizations",
       "breakpoints": true
+    },
+    {
+      "idx": 25,
+      "version": "7",
+      "when": 1772851349454,
+      "tag": "0025_add_org_id_to_github_tables",
+      "breakpoints": true
     }
   ]
 }
\ No newline at end of file
diff --git a/packages/db/src/schema/github.ts b/packages/db/src/schema/github.ts
index f1d2f9ca199..261bdb96118 100644
--- a/packages/db/src/schema/github.ts
+++ b/packages/db/src/schema/github.ts
@@ -73,6 +73,11 @@ export const githubRepositories = pgTable(
 			.notNull()
 			.references(() => githubInstallations.id, { onDelete: "cascade" }),
 
+		// Link to organization (denormalized from installation for Electric SQL filtering)
+		organizationId: uuid("organization_id")
+			.notNull()
+			.references(() => organizations.id, { onDelete: "cascade" }),
+
 		// GitHub repo info
 		repoId: text("repo_id").notNull().unique(), // GitHub's numeric ID as string
 		owner: text().notNull(),
@@ -91,6 +96,7 @@ export const githubRepositories = pgTable(
 	(table) => [
 		index("github_repositories_installation_id_idx").on(table.installationId),
 		index("github_repositories_full_name_idx").on(table.fullName),
+		index("github_repositories_org_id_idx").on(table.organizationId),
 	],
 );
 
@@ -110,6 +116,11 @@ export const githubPullRequests = pgTable(
 			.notNull()
 			.references(() => githubRepositories.id, { onDelete: "cascade" }),
 
+		// Link to organization (denormalized from repository for Electric SQL filtering)
+		organizationId: uuid("organization_id")
+			.notNull()
+			.references(() => organizations.id, { onDelete: "cascade" }),
+
 		// PR identification
 		prNumber: integer("pr_number").notNull(),
 		nodeId: text("node_id").notNull(), // GitHub's GraphQL node ID
@@ -170,6 +181,7 @@ export const githubPullRequests = pgTable(
 		index("github_pull_requests_repository_id_idx").on(table.repositoryId),
 		index("github_pull_requests_state_idx").on(table.state),
 		index("github_pull_requests_head_branch_idx").on(table.headBranch),
+		index("github_pull_requests_org_id_idx").on(table.organizationId),
 	],
 );
 
diff --git a/packages/db/src/schema/relations.ts b/packages/db/src/schema/relations.ts
index 7a49e47062f..ed4d0d97228 100644
--- a/packages/db/src/schema/relations.ts
+++ b/packages/db/src/schema/relations.ts
@@ -69,6 +69,8 @@ export const organizationsRelations = relations(organizations, ({ many }) => ({
 	taskStatuses: many(taskStatuses),
 	integrations: many(integrationConnections),
 	githubInstallations: many(githubInstallations),
+	githubRepositories: many(githubRepositories),
+	githubPullRequests: many(githubPullRequests),
 	devicePresence: many(devicePresence),
 	agentCommands: many(agentCommands),
 	chatSessions: many(chatSessions),
@@ -172,6 +174,10 @@ export const githubRepositoriesRelations = relations(
 			fields: [githubRepositories.installationId],
 			references: [githubInstallations.id],
 		}),
+		organization: one(organizations, {
+			fields: [githubRepositories.organizationId],
+			references: [organizations.id],
+		}),
 		pullRequests: many(githubPullRequests),
 		projects: many(projects),
 	}),
@@ -184,6 +190,10 @@ export const githubPullRequestsRelations = relations(
 			fields: [githubPullRequests.repositoryId],
 			references: [githubRepositories.id],
 		}),
+		organization: one(organizations, {
+			fields: [githubPullRequests.organizationId],
+			references: [organizations.id],
+		}),
 	}),
 );
 

From 75f46bd9e7653e108ff4e2753f51a80fe584ee4d Mon Sep 17 00:00:00 2001
From: Satya Patel <satyapatel111@gmail.com>
Date: Fri, 6 Mar 2026 19:23:34 -0800
Subject: [PATCH 4/9] WIP

---
 .../NewWorkspaceModal/NewWorkspaceModal.tsx   |   7 +-
 .../BranchesGroup/BranchesGroup.tsx           | 130 ++++++++----------
 .../PullRequestsGroup/PullRequestsGroup.tsx   |  32 ++++-
 3 files changed, 91 insertions(+), 78 deletions(-)

diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/NewWorkspaceModal.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal/NewWorkspaceModal.tsx
index 2180b5dc395..3c333346dfc 100644
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal/NewWorkspaceModal.tsx
+++ b/apps/desktop/src/renderer/components/NewWorkspaceModal/NewWorkspaceModal.tsx
@@ -121,7 +121,12 @@ export function NewWorkspaceModal() {
 							onClose={closeModal}
 						/>
 					)}
-				{activeTab === "branches" && <BranchesGroup />}
+				{activeTab === "branches" && (
+						<BranchesGroup
+							projectId={selectedProjectId}
+							onClose={closeModal}
+						/>
+					)}
 				{activeTab === "issues" && (
 						<IssuesGroup
 							projectId={selectedProjectId}
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/BranchesGroup/BranchesGroup.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/BranchesGroup/BranchesGroup.tsx
index de6b81ef221..71406d77581 100644
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/BranchesGroup/BranchesGroup.tsx
+++ b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/BranchesGroup/BranchesGroup.tsx
@@ -1,90 +1,76 @@
 import { CommandEmpty, CommandGroup, CommandItem } from "@superset/ui/command";
-import { GoGitBranch } from "react-icons/go";
+import { toast } from "@superset/ui/sonner";
+import { GoGitBranch, GoGlobe } from "react-icons/go";
+import { electronTrpc } from "renderer/lib/electron-trpc";
+import { useCreateBranchWorkspace } from "renderer/react-query/workspaces";
 
-const MOCK_BRANCHES = [
-	{
-		name: "main",
-		lastCommitDate: Date.now() - 1000 * 60 * 30,
-		isLocal: true,
-		isRemote: true,
-		isDefault: true,
-	},
-	{
-		name: "develop",
-		lastCommitDate: Date.now() - 1000 * 60 * 60 * 2,
-		isLocal: true,
-		isRemote: true,
-		isDefault: false,
-	},
-	{
-		name: "feat/new-dashboard",
-		lastCommitDate: Date.now() - 1000 * 60 * 60 * 5,
-		isLocal: true,
-		isRemote: true,
-		isDefault: false,
-	},
-	{
-		name: "fix/login-redirect",
-		lastCommitDate: Date.now() - 1000 * 60 * 60 * 24,
-		isLocal: false,
-		isRemote: true,
-		isDefault: false,
-	},
-	{
-		name: "chore/update-ci",
-		lastCommitDate: Date.now() - 1000 * 60 * 60 * 24 * 3,
-		isLocal: true,
-		isRemote: false,
-		isDefault: false,
-	},
-	{
-		name: "refactor/auth-module",
-		lastCommitDate: Date.now() - 1000 * 60 * 60 * 24 * 7,
-		isLocal: false,
-		isRemote: true,
-		isDefault: false,
-	},
-];
-
-function formatRelative(timestamp: number): string {
-	const seconds = Math.floor((Date.now() - timestamp) / 1000);
-	if (seconds < 60) return "just now";
-	const minutes = Math.floor(seconds / 60);
-	if (minutes < 60) return `${minutes}m ago`;
-	const hours = Math.floor(minutes / 60);
-	if (hours < 24) return `${hours}h ago`;
-	const days = Math.floor(hours / 24);
-	return `${days}d ago`;
+interface BranchesGroupProps {
+	projectId: string | null;
+	onClose: () => void;
 }
 
-export function BranchesGroup() {
+export function BranchesGroup({ projectId, onClose }: BranchesGroupProps) {
+	const createBranchWorkspace = useCreateBranchWorkspace();
+
+	const { data } = electronTrpc.projects.getBranches.useQuery(
+		{ projectId: projectId ?? "" },
+		{ enabled: !!projectId },
+	);
+
+	const defaultBranch = data?.defaultBranch ?? "main";
+
+	const branches = (data?.branches ?? [])
+		.sort((a, b) => {
+			// Default branch first
+			if (a.name === defaultBranch) return -1;
+			if (b.name === defaultBranch) return 1;
+			// Local before remote-only
+			if (a.isLocal !== b.isLocal) return a.isLocal ? -1 : 1;
+			// Then alphabetically
+			return a.name.localeCompare(b.name);
+		})
+		.slice(0, 40);
+
+	if (!projectId) {
+		return (
+			<CommandGroup>
+				<CommandEmpty>Select a project to view branches.</CommandEmpty>
+			</CommandGroup>
+		);
+	}
+
 	return (
 		<CommandGroup>
 			<CommandEmpty>No branches found.</CommandEmpty>
-			{MOCK_BRANCHES.map((branch) => (
+			{branches.map((branch) => (
 				<CommandItem
 					key={branch.name}
 					value={branch.name}
 					onSelect={() => {
-						console.log("[mock] Create workspace from branch", branch.name);
+						onClose();
+						toast.promise(
+							createBranchWorkspace.mutateAsync({
+								projectId,
+								branch: branch.name,
+							}),
+							{
+								loading: "Creating workspace from branch...",
+								success: "Workspace created",
+								error: (err) =>
+									err instanceof Error
+										? err.message
+										: "Failed to create workspace",
+							},
+						);
 					}}
 					className="group"
 				>
-					<GoGitBranch className="size-4 shrink-0 text-muted-foreground" />
-					<span className="truncate flex-1">{branch.name}</span>
-					{branch.isDefault && (
-						<span className="text-[10px] text-muted-foreground bg-muted px-1.5 py-0.5 rounded shrink-0">
-							default
-						</span>
-					)}
-					{!branch.isLocal && branch.isRemote && (
-						<span className="text-[10px] text-muted-foreground/60 bg-muted/50 px-1.5 py-0.5 rounded shrink-0">
-							remote
-						</span>
+					{branch.isLocal ? (
+						<GoGitBranch className="size-4 shrink-0 text-muted-foreground" />
+					) : (
+						<GoGlobe className="size-4 shrink-0 text-muted-foreground" />
 					)}
-					<span className="text-xs text-muted-foreground shrink-0 group-data-[selected=true]:hidden">
-						{formatRelative(branch.lastCommitDate)}
-					</span>
+					<span className="truncate flex-1">{branch.name}</span>
 					<span className="text-xs text-muted-foreground shrink-0 hidden group-data-[selected=true]:inline">
 						Open →
 					</span>
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PullRequestsGroup/PullRequestsGroup.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PullRequestsGroup/PullRequestsGroup.tsx
index c9c4f168ca3..b8ab87658ba 100644
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PullRequestsGroup/PullRequestsGroup.tsx
+++ b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PullRequestsGroup/PullRequestsGroup.tsx
@@ -1,9 +1,13 @@
+import { Button } from "@superset/ui/button";
 import { CommandEmpty, CommandGroup, CommandItem } from "@superset/ui/command";
 import { toast } from "@superset/ui/sonner";
 import { and, eq } from "@tanstack/db";
 import { useLiveQuery } from "@tanstack/react-db";
+import { useNavigate } from "@tanstack/react-router";
 import { useMemo } from "react";
 import { GoGitPullRequest, GoGitPullRequestDraft } from "react-icons/go";
+import { SiGithub } from "react-icons/si";
+import { GATED_FEATURES, usePaywall } from "renderer/components/Paywall";
 import { useCreateFromPr } from "renderer/react-query/workspaces/useCreateFromPr";
 import { useCollections } from "renderer/routes/_authenticated/providers/CollectionsProvider";
 
@@ -21,6 +25,8 @@ export function PullRequestsGroup({
 	onClose,
 }: PullRequestsGroupProps) {
 	const collections = useCollections();
+	const navigate = useNavigate();
+	const { gateFeature } = usePaywall();
 	const createFromPr = useCreateFromPr();
 
 	// Match GitHub repository by owner + name from the local project
@@ -72,11 +78,27 @@ export function PullRequestsGroup({
 
 	if (!githubOwner) {
 		return (
-			<CommandGroup>
-				<CommandEmpty>
-					Connect GitHub to view pull requests.
-				</CommandEmpty>
-			</CommandGroup>
+			<div className="flex flex-col items-center gap-3 py-8 px-4 text-center">
+				<SiGithub className="size-6 text-muted-foreground" />
+				<div className="space-y-1">
+					<p className="text-sm font-medium">Connect GitHub</p>
+					<p className="text-xs text-muted-foreground">
+						Sync pull requests from GitHub to create workspaces
+					</p>
+				</div>
+				<Button
+					size="sm"
+					variant="outline"
+					onClick={() => {
+						gateFeature(GATED_FEATURES.INTEGRATIONS, () => {
+							onClose();
+							navigate({ to: "/settings/integrations" });
+						});
+					}}
+				>
+					Connect
+				</Button>
+			</div>
 		);
 	}
 

From 3fd3a4b43bb12ffabf356bf6fdbb2c0ffb776fab Mon Sep 17 00:00:00 2001
From: Satya Patel <satyapatel111@gmail.com>
Date: Fri, 6 Mar 2026 19:49:24 -0800
Subject: [PATCH 5/9] WIP

---
 .../BranchesGroup/BranchesGroup.tsx           | 157 +++++++++++++-----
 .../components/IssuesGroup/IssuesGroup.tsx    |  34 +++-
 .../PullRequestsGroup/PullRequestsGroup.tsx   |  24 ++-
 3 files changed, 165 insertions(+), 50 deletions(-)

diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/BranchesGroup/BranchesGroup.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/BranchesGroup/BranchesGroup.tsx
index 71406d77581..9c3a7a3a432 100644
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/BranchesGroup/BranchesGroup.tsx
+++ b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/BranchesGroup/BranchesGroup.tsx
@@ -1,8 +1,12 @@
+import { Button } from "@superset/ui/button";
 import { CommandEmpty, CommandGroup, CommandItem } from "@superset/ui/command";
 import { toast } from "@superset/ui/sonner";
-import { GoGitBranch, GoGlobe } from "react-icons/go";
+import { useNavigate } from "@tanstack/react-router";
+import { useCallback, useMemo } from "react";
+import { GoArrowUpRight, GoGitBranch, GoGlobe } from "react-icons/go";
 import { electronTrpc } from "renderer/lib/electron-trpc";
 import { useCreateBranchWorkspace } from "renderer/react-query/workspaces";
+import { navigateToWorkspace } from "renderer/routes/_authenticated/_dashboard/utils/workspace-navigation";
 
 interface BranchesGroupProps {
 	projectId: string | null;
@@ -10,27 +14,68 @@ interface BranchesGroupProps {
 }
 
 export function BranchesGroup({ projectId, onClose }: BranchesGroupProps) {
+	const navigate = useNavigate();
 	const createBranchWorkspace = useCreateBranchWorkspace();
 
-	const { data } = electronTrpc.projects.getBranches.useQuery(
+	const { data, isLoading } = electronTrpc.projects.getBranches.useQuery(
 		{ projectId: projectId ?? "" },
 		{ enabled: !!projectId },
 	);
 
+	const { data: allWorkspaces = [] } =
+		electronTrpc.workspaces.getAll.useQuery();
+
+	const workspaceByBranch = useMemo(() => {
+		const map = new Map<string, string>();
+		for (const w of allWorkspaces) {
+			if (w.projectId === projectId) {
+				map.set(w.branch, w.id);
+			}
+		}
+		return map;
+	}, [allWorkspaces, projectId]);
+
 	const defaultBranch = data?.defaultBranch ?? "main";
 
 	const branches = (data?.branches ?? [])
 		.sort((a, b) => {
-			// Default branch first
 			if (a.name === defaultBranch) return -1;
 			if (b.name === defaultBranch) return 1;
-			// Local before remote-only
 			if (a.isLocal !== b.isLocal) return a.isLocal ? -1 : 1;
-			// Then alphabetically
 			return a.name.localeCompare(b.name);
 		})
 		.slice(0, 40);
 
+	const handleCreate = useCallback(
+		(branchName: string) => {
+			if (!projectId) return;
+			onClose();
+			toast.promise(
+				createBranchWorkspace.mutateAsync({
+					projectId,
+					branch: branchName,
+				}),
+				{
+					loading: "Creating workspace from branch...",
+					success: "Workspace created",
+					error: (err) =>
+						err instanceof Error
+							? err.message
+							: "Failed to create workspace",
+				},
+			);
+		},
+		[projectId, onClose, createBranchWorkspace],
+	);
+
+	const handleOpen = useCallback(
+		(workspaceId: string) => {
+			onClose();
+			navigateToWorkspace(workspaceId, navigate);
+		},
+		[onClose, navigate],
+	);
+
 	if (!projectId) {
 		return (
 			<CommandGroup>
@@ -39,43 +84,77 @@ export function BranchesGroup({ projectId, onClose }: BranchesGroupProps) {
 		);
 	}
 
+	if (isLoading) {
+		return (
+			<CommandGroup>
+				<CommandEmpty>Loading branches...</CommandEmpty>
+			</CommandGroup>
+		);
+	}
+
 	return (
 		<CommandGroup>
 			<CommandEmpty>No branches found.</CommandEmpty>
-			{branches.map((branch) => (
-				<CommandItem
-					key={branch.name}
-					value={branch.name}
-					onSelect={() => {
-						onClose();
-						toast.promise(
-							createBranchWorkspace.mutateAsync({
-								projectId,
-								branch: branch.name,
-							}),
-							{
-								loading: "Creating workspace from branch...",
-								success: "Workspace created",
-								error: (err) =>
-									err instanceof Error
-										? err.message
-										: "Failed to create workspace",
-							},
-						);
-					}}
-					className="group"
-				>
-					{branch.isLocal ? (
-						<GoGitBranch className="size-4 shrink-0 text-muted-foreground" />
-					) : (
-						<GoGlobe className="size-4 shrink-0 text-muted-foreground" />
-					)}
-					<span className="truncate flex-1">{branch.name}</span>
-					<span className="text-xs text-muted-foreground shrink-0 hidden group-data-[selected=true]:inline">
-						Open →
-					</span>
-				</CommandItem>
-			))}
+			{branches.map((branch) => {
+				const existingWorkspaceId = workspaceByBranch.get(branch.name);
+				return (
+					<CommandItem
+						key={branch.name}
+						value={branch.name}
+						onSelect={() => {
+							if (existingWorkspaceId) {
+								handleOpen(existingWorkspaceId);
+							} else {
+								handleCreate(branch.name);
+							}
+						}}
+						className="group h-12"
+					>
+						{existingWorkspaceId ? (
+							<GoArrowUpRight className="size-4 shrink-0 text-muted-foreground" />
+						) : branch.isLocal ? (
+							<GoGitBranch className="size-4 shrink-0 text-muted-foreground" />
+						) : (
+							<GoGlobe className="size-4 shrink-0 text-muted-foreground" />
+						)}
+						<span className="truncate flex-1">{branch.name}</span>
+						{existingWorkspaceId ? (
+							<span className="shrink-0 hidden group-data-[selected=true]:inline-flex items-center gap-1.5">
+								<Button
+									size="xs"
+									variant="outline"
+									onClick={(e) => {
+										e.stopPropagation();
+										handleOpen(existingWorkspaceId);
+									}}
+								>
+									Open ↵
+								</Button>
+								<Button
+									size="xs"
+									onClick={(e) => {
+										e.stopPropagation();
+										handleCreate(branch.name);
+									}}
+								>
+									Duplicate branch ⌘↵
+								</Button>
+							</span>
+						) : (
+							<Button
+								size="xs"
+								className="shrink-0 hidden group-data-[selected=true]:inline-flex"
+								onClick={(e) => {
+									e.stopPropagation();
+									handleCreate(branch.name);
+								}}
+							>
+								Create ↵
+							</Button>
+						)}
+					</CommandItem>
+				);
+			})}
 		</CommandGroup>
 	);
 }
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/IssuesGroup/IssuesGroup.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/IssuesGroup/IssuesGroup.tsx
index dfe7fe4d1f4..acfa6217638 100644
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/IssuesGroup/IssuesGroup.tsx
+++ b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/IssuesGroup/IssuesGroup.tsx
@@ -3,12 +3,14 @@ import { Button } from "@superset/ui/button";
 import { CommandEmpty, CommandGroup, CommandItem } from "@superset/ui/command";
 import { toast } from "@superset/ui/sonner";
 import { useNavigate } from "@tanstack/react-router";
+import { GoArrowUpRight } from "react-icons/go";
 import { HiOutlineUserCircle } from "react-icons/hi2";
 import { SiLinear } from "react-icons/si";
 import { GATED_FEATURES, usePaywall } from "renderer/components/Paywall";
 import { eq, isNull } from "@tanstack/db";
 import { useLiveQuery } from "@tanstack/react-db";
 import { useMemo } from "react";
+import { electronTrpc } from "renderer/lib/electron-trpc";
 import { getSlugColumnWidth } from "renderer/lib/slug-width";
 import { useCreateWorkspace } from "renderer/react-query/workspaces";
 import { useCollections } from "renderer/routes/_authenticated/providers/CollectionsProvider";
@@ -64,6 +66,19 @@ export function IssuesGroup({ projectId, onClose }: IssuesGroupProps) {
 		[collections],
 	);
 
+	const { data: allWorkspaces = [] } =
+		electronTrpc.workspaces.getAll.useQuery();
+
+	const openBranches = useMemo(
+		() =>
+			new Set(
+				allWorkspaces
+					.filter((w) => w.projectId === projectId)
+					.map((w) => w.branch),
+			),
+		[allWorkspaces, projectId],
+	);
+
 	const tasks = useMemo(() => data ?? [], [data]);
 
 	const slugWidth = useMemo(
@@ -126,13 +141,18 @@ export function IssuesGroup({ projectId, onClose }: IssuesGroupProps) {
 							},
 						);
 					}}
-					className="group"
+					className="group h-12"
 				>
-					<StatusIcon
-						type={task.status.type as StatusType}
-						color={task.status.color}
-						className="size-4 shrink-0"
-					/>
+					{openBranches.has(task.slug.toLowerCase()) ? (
+						<GoArrowUpRight className="size-4 shrink-0 text-muted-foreground" />
+					) : (
+						<StatusIcon
+							type={task.status.type as StatusType}
+							color={task.status.color}
+							progress={task.status.progressPercent ?? undefined}
+							className="size-4 shrink-0"
+						/>
+					)}
 					<span
 						className="text-muted-foreground shrink-0 text-xs tabular-nums truncate"
 						style={{ width: slugWidth }}
@@ -152,7 +172,7 @@ export function IssuesGroup({ projectId, onClose }: IssuesGroupProps) {
 						)}
 					</span>
 					<span className="text-xs text-muted-foreground shrink-0 hidden group-data-[selected=true]:inline">
-						Open →
+						{openBranches.has(task.slug.toLowerCase()) ? "Open" : "Create"} ↵
 					</span>
 				</CommandItem>
 			))}
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PullRequestsGroup/PullRequestsGroup.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PullRequestsGroup/PullRequestsGroup.tsx
index b8ab87658ba..1a60544edcc 100644
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PullRequestsGroup/PullRequestsGroup.tsx
+++ b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PullRequestsGroup/PullRequestsGroup.tsx
@@ -5,8 +5,9 @@ import { and, eq } from "@tanstack/db";
 import { useLiveQuery } from "@tanstack/react-db";
 import { useNavigate } from "@tanstack/react-router";
 import { useMemo } from "react";
-import { GoGitPullRequest, GoGitPullRequestDraft } from "react-icons/go";
+import { GoArrowUpRight, GoGitPullRequest, GoGitPullRequestDraft } from "react-icons/go";
 import { SiGithub } from "react-icons/si";
+import { electronTrpc } from "renderer/lib/electron-trpc";
 import { GATED_FEATURES, usePaywall } from "renderer/components/Paywall";
 import { useCreateFromPr } from "renderer/react-query/workspaces/useCreateFromPr";
 import { useCollections } from "renderer/routes/_authenticated/providers/CollectionsProvider";
@@ -60,6 +61,19 @@ export function PullRequestsGroup({
 		[collections, githubRepositoryId],
 	);
 
+	const { data: allWorkspaces = [] } =
+		electronTrpc.workspaces.getAll.useQuery();
+
+	const openBranches = useMemo(
+		() =>
+			new Set(
+				allWorkspaces
+					.filter((w) => w.projectId === projectId)
+					.map((w) => w.branch),
+			),
+		[allWorkspaces, projectId],
+	);
+
 	const openPrs = useMemo(
 		() =>
 			(pullRequests ?? [])
@@ -140,9 +154,11 @@ export function PullRequestsGroup({
 							},
 						);
 					}}
-					className="group"
+					className="group h-12"
 				>
-					{pr.isDraft ? (
+					{openBranches.has(pr.headBranch) ? (
+						<GoArrowUpRight className="size-4 shrink-0 text-muted-foreground" />
+					) : pr.isDraft ? (
 						<GoGitPullRequestDraft className="size-4 shrink-0 text-muted-foreground" />
 					) : (
 						<GoGitPullRequest className="size-4 shrink-0 text-emerald-500" />
@@ -158,7 +174,7 @@ export function PullRequestsGroup({
 						{pr.authorLogin}
 					</span>
 					<span className="text-xs text-muted-foreground shrink-0 hidden group-data-[selected=true]:inline">
-						Open →
+						{openBranches.has(pr.headBranch) ? "Open" : "Create"} ↵
 					</span>
 				</CommandItem>
 			))}

From 0a5bb0be09e00aff199f8915d45df2556450494e Mon Sep 17 00:00:00 2001
From: Satya Patel <satyapatel111@gmail.com>
Date: Fri, 6 Mar 2026 20:13:19 -0800
Subject: [PATCH 6/9] WIP

---
 .../NewWorkspaceModal/NewWorkspaceModal.tsx   |   2 +-
 .../BranchesGroup/BranchesGroup.tsx           |   5 +-
 .../components/PromptGroup/PromptGroup.tsx    |   5 +-
 .../ProjectSettings/ProjectSettings.tsx       | 154 +++++++++++++++++-
 4 files changed, 161 insertions(+), 5 deletions(-)

diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/NewWorkspaceModal.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal/NewWorkspaceModal.tsx
index 3c333346dfc..3a86a8aefed 100644
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal/NewWorkspaceModal.tsx
+++ b/apps/desktop/src/renderer/components/NewWorkspaceModal/NewWorkspaceModal.tsx
@@ -76,7 +76,7 @@ export function NewWorkspaceModal() {
 			title="New Workspace"
 			description="Create a new workspace from a PR, branch, issue, or prompt."
 			showCloseButton={false}
-			className="sm:max-w-[540px] max-h-[min(70vh,600px)] !top-[calc(50%-min(35vh,300px))] !-translate-y-0 flex flex-col"
+			className="sm:max-w-[560px] max-h-[min(70vh,600px)] !top-[calc(50%-min(35vh,300px))] !-translate-y-0 flex flex-col"
 		>
 			<div className="flex items-center justify-between border-b px-3 py-2">
 				<Tabs
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/BranchesGroup/BranchesGroup.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/BranchesGroup/BranchesGroup.tsx
index 9c3a7a3a432..65822b8811e 100644
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/BranchesGroup/BranchesGroup.tsx
+++ b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/BranchesGroup/BranchesGroup.tsx
@@ -7,6 +7,7 @@ import { GoArrowUpRight, GoGitBranch, GoGlobe } from "react-icons/go";
 import { electronTrpc } from "renderer/lib/electron-trpc";
 import { useCreateBranchWorkspace } from "renderer/react-query/workspaces";
 import { navigateToWorkspace } from "renderer/routes/_authenticated/_dashboard/utils/workspace-navigation";
+import { useHotkeysStore } from "renderer/stores/hotkeys/store";
 
 interface BranchesGroupProps {
 	projectId: string | null;
@@ -14,6 +15,8 @@ interface BranchesGroupProps {
 }
 
 export function BranchesGroup({ projectId, onClose }: BranchesGroupProps) {
+	const platform = useHotkeysStore((state) => state.platform);
+	const modKey = platform === "darwin" ? "⌘" : "Ctrl";
 	const navigate = useNavigate();
 	const createBranchWorkspace = useCreateBranchWorkspace();
 
@@ -137,7 +140,7 @@ export function BranchesGroup({ projectId, onClose }: BranchesGroupProps) {
 										handleCreate(branch.name);
 									}}
 								>
-									Duplicate branch ⌘↵
+									Duplicate branch {modKey}↵
 								</Button>
 							</span>
 						) : (
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PromptGroup/PromptGroup.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PromptGroup/PromptGroup.tsx
index 4ec8d5baa7f..a9ef427c541 100644
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PromptGroup/PromptGroup.tsx
+++ b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PromptGroup/PromptGroup.tsx
@@ -25,6 +25,7 @@ import {
 	useIsDarkTheme,
 } from "renderer/assets/app-icons/preset-icons";
 import { useCreateWorkspace } from "renderer/react-query/workspaces";
+import { useHotkeysStore } from "renderer/stores/hotkeys/store";
 
 type WorkspaceCreateAgent = StartableAgentType | "none";
 
@@ -36,6 +37,8 @@ interface PromptGroupProps {
 }
 
 export function PromptGroup({ projectId, onClose }: PromptGroupProps) {
+	const platform = useHotkeysStore((state) => state.platform);
+	const modKey = platform === "darwin" ? "⌘" : "Ctrl";
 	const isDark = useIsDarkTheme();
 	const textareaRef = useRef<HTMLTextAreaElement>(null);
 	const [prompt, setPrompt] = useState("");
@@ -180,7 +183,7 @@ export function PromptGroup({ projectId, onClose }: PromptGroupProps) {
 				Create Workspace
 				<KbdGroup className="ml-1.5 opacity-70">
 					<Kbd className="bg-primary-foreground/15 text-primary-foreground h-4 min-w-4 text-[10px]">
-						⌘
+						{modKey}
 					</Kbd>
 					<Kbd className="bg-primary-foreground/15 text-primary-foreground h-4 min-w-4 text-[10px]">
 						↵
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/project/$projectId/components/ProjectSettings/ProjectSettings.tsx b/apps/desktop/src/renderer/routes/_authenticated/settings/project/$projectId/components/ProjectSettings/ProjectSettings.tsx
index 7b3b2b0d183..d997e68e271 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/settings/project/$projectId/components/ProjectSettings/ProjectSettings.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/settings/project/$projectId/components/ProjectSettings/ProjectSettings.tsx
@@ -1,4 +1,16 @@
 import type { BranchPrefixMode } from "@superset/local-db";
+import {
+	AlertDialog,
+	AlertDialogAction,
+	AlertDialogCancel,
+	AlertDialogContent,
+	AlertDialogDescription,
+	AlertDialogFooter,
+	AlertDialogHeader,
+	AlertDialogTitle,
+	AlertDialogTrigger,
+} from "@superset/ui/alert-dialog";
+import { Button } from "@superset/ui/button";
 import { Input } from "@superset/ui/input";
 import { Label } from "@superset/ui/label";
 import {
@@ -8,6 +20,7 @@ import {
 	SelectTrigger,
 	SelectValue,
 } from "@superset/ui/select";
+import { toast } from "@superset/ui/sonner";
 import { Switch } from "@superset/ui/switch";
 import { cn } from "@superset/ui/utils";
 import type { ReactNode } from "react";
@@ -19,6 +32,10 @@ import {
 } from "react-icons/hi2";
 import { LuImagePlus, LuTrash2 } from "react-icons/lu";
 import { electronTrpc } from "renderer/lib/electron-trpc";
+import {
+	useImportAllWorktrees,
+	useOpenExternalWorktree,
+} from "renderer/react-query/workspaces";
 import {
 	PROJECT_COLOR_DEFAULT,
 	PROJECT_COLORS,
@@ -85,6 +102,9 @@ export function ProjectSettings({ projectId }: ProjectSettingsProps) {
 	const [customPrefixInput, setCustomPrefixInput] = useState(
 		project?.branchPrefixCustom ?? "",
 	);
+	const [selectedWorktreePath, setSelectedWorktreePath] = useState<
+		string | null
+	>(null);
 
 	useEffect(() => {
 		setCustomPrefixInput(project?.branchPrefixCustom ?? "");
@@ -184,6 +204,43 @@ export function ProjectSettings({ projectId }: ProjectSettingsProps) {
 	const defaultWorktreePath = useDefaultWorktreePath();
 	const globalPath = globalWorktreeBaseDir ?? defaultWorktreePath;
 
+	const { data: externalWorktrees = [], isLoading: isExternalLoading } =
+		electronTrpc.workspaces.getExternalWorktrees.useQuery(
+			{ projectId },
+			{ enabled: !!projectId },
+		);
+	const importAllWorktrees = useImportAllWorktrees();
+	const openExternalWorktree = useOpenExternalWorktree();
+
+	const handleImportAll = async () => {
+		try {
+			const result = await importAllWorktrees.mutateAsync({ projectId });
+			toast.success(
+				`Imported ${result.imported} workspace${result.imported === 1 ? "" : "s"}`,
+			);
+		} catch (err) {
+			toast.error(
+				err instanceof Error ? err.message : "Failed to import worktrees",
+			);
+		}
+	};
+
+	const handleImportWorktree = async (path: string, branch: string) => {
+		toast.promise(
+			openExternalWorktree.mutateAsync({
+				projectId,
+				worktreePath: path,
+				branch,
+			}),
+			{
+				loading: "Importing worktree...",
+				success: `Imported ${branch}`,
+				error: (err) =>
+					err instanceof Error ? err.message : "Failed to import worktree",
+			},
+		);
+	};
+
 	const getPreviewPrefix = (
 		mode: BranchPrefixMode | "default",
 	): string | null => {
@@ -336,8 +393,8 @@ export function ProjectSettings({ projectId }: ProjectSettingsProps) {
 
 				<SettingsSection
 					icon={<HiOutlineFolderOpen className="h-4 w-4" />}
-					title="Worktree Location"
-					description="Override the global worktree directory for this project."
+					title="Worktrees"
+					description="Manage worktree location and import existing worktrees."
 				>
 					<WorktreeLocationPicker
 						currentPath={project.worktreeBaseDir}
@@ -358,6 +415,99 @@ export function ProjectSettings({ projectId }: ProjectSettingsProps) {
 							})
 						}
 					/>
+
+					{!isExternalLoading && externalWorktrees.length > 0 && (
+						<div className="flex items-center justify-between">
+							<div className="space-y-0.5">
+								<Label className="text-sm font-medium">
+									Import Worktrees
+								</Label>
+								<p className="text-xs text-muted-foreground">
+									{externalWorktrees.length} external worktree
+									{externalWorktrees.length === 1 ? "" : "s"} found on disk.
+								</p>
+							</div>
+							<div className="flex items-center gap-2">
+								<Select
+									value={selectedWorktreePath ?? "__all__"}
+									onValueChange={(value) =>
+										setSelectedWorktreePath(
+											value === "__all__" ? null : value,
+										)
+									}
+								>
+									<SelectTrigger className="w-[220px]">
+										<SelectValue />
+									</SelectTrigger>
+									<SelectContent>
+										<SelectItem value="__all__">
+											All worktrees ({externalWorktrees.length})
+										</SelectItem>
+										{externalWorktrees.map((wt) => (
+											<SelectItem key={wt.path} value={wt.path}>
+												{wt.branch}
+											</SelectItem>
+										))}
+									</SelectContent>
+								</Select>
+								{selectedWorktreePath ? (
+									<Button
+										size="sm"
+										className="w-22"
+										disabled={openExternalWorktree.isPending}
+										onClick={() => {
+											const wt = externalWorktrees.find(
+												(w) => w.path === selectedWorktreePath,
+											);
+											if (wt) {
+												handleImportWorktree(wt.path, wt.branch);
+												setSelectedWorktreePath(null);
+											}
+										}}
+									>
+										{openExternalWorktree.isPending
+											? "Importing..."
+											: "Import"}
+									</Button>
+								) : (
+									<AlertDialog>
+										<AlertDialogTrigger asChild>
+											<Button
+												size="sm"
+												className="w-22"
+												disabled={importAllWorktrees.isPending}
+											>
+												{importAllWorktrees.isPending
+													? "Importing..."
+													: "Import all"}
+											</Button>
+										</AlertDialogTrigger>
+										<AlertDialogContent>
+											<AlertDialogHeader>
+												<AlertDialogTitle>
+													Import all worktrees
+												</AlertDialogTitle>
+												<AlertDialogDescription>
+													This will import {externalWorktrees.length} external
+													worktree
+													{externalWorktrees.length === 1 ? "" : "s"} into
+													Superset as workspaces. Each worktree on disk will
+													be tracked and appear in your sidebar. No files will
+													be modified.
+												</AlertDialogDescription>
+											</AlertDialogHeader>
+											<AlertDialogFooter>
+												<AlertDialogCancel>Cancel</AlertDialogCancel>
+												<AlertDialogAction onClick={handleImportAll}>
+													Import all
+												</AlertDialogAction>
+											</AlertDialogFooter>
+										</AlertDialogContent>
+									</AlertDialog>
+								)}
+							</div>
+						</div>
+					)}
 				</SettingsSection>
 
 				<div className="pt-3 border-t">

From 74f7416bb2c4e352cc1708b1b7db4b02e7a6093a Mon Sep 17 00:00:00 2001
From: Satya Patel <satyapatel111@gmail.com>
Date: Fri, 6 Mar 2026 20:19:34 -0800
Subject: [PATCH 7/9] feat(desktop): revamp New Workspace modal and add
 worktree import to project settings

- Wire PullRequestsGroup to match GitHub repos by owner+name instead of cloud project FK
- Wire BranchesGroup to real tRPC data with open/create/duplicate actions
- Add workspace detection across all tabs (Open vs Create CTAs)
- Add platform-aware keyboard shortcuts via useHotkeysStore
- Add worktree import section to project general settings (dropdown + import all)
- Delete old NewWorkspaceModal and orphaned useOpenWorktree hook
---
 .../NewWorkspaceModal.tsx                     | 469 ------------------
 .../ExistingWorktreesList.tsx                 | 342 -------------
 .../components/BranchesSection.tsx            | 108 ----
 .../components/PrUrlSection.tsx               |  52 --
 .../components/WorktreesSection.tsx           | 203 --------
 .../ExistingWorktreesList/components/index.ts |   3 -
 .../components/ExistingWorktreesList/index.ts |   4 -
 .../components/ImportFlow/ImportFlow.tsx      |  60 ---
 .../components/ImportFlow/index.ts            |   1 -
 .../NewWorkspaceAdvancedOptions.tsx           | 203 --------
 .../NewWorkspaceAdvancedOptions/index.ts      |   1 -
 .../NewWorkspaceCreateFlow.tsx                | 138 ------
 .../NewWorkspaceCreateFlow/index.ts           |   4 -
 .../NewWorkspaceHeader/NewWorkspaceHeader.tsx |  53 --
 .../components/NewWorkspaceHeader/index.ts    |   1 -
 .../ProjectSelector/ProjectSelector.tsx       |  74 ---
 .../components/ProjectSelector/index.ts       |   1 -
 .../components/NewWorkspaceModal.old/index.ts |   1 -
 .../NewWorkspaceModal/NewWorkspaceModal.tsx   |  43 +-
 .../BranchesGroup/BranchesGroup.tsx           |   4 +-
 .../components/IssuesGroup/IssuesGroup.tsx    |  18 +-
 .../components/PromptGroup/PromptGroup.tsx    |  13 +-
 .../PullRequestsGroup/PullRequestsGroup.tsx   |  21 +-
 .../renderer/react-query/workspaces/index.ts  |   1 -
 .../react-query/workspaces/useOpenWorktree.ts |  51 --
 .../ProjectSettings/ProjectSettings.tsx       |  18 +-
 26 files changed, 44 insertions(+), 1843 deletions(-)
 delete mode 100644 apps/desktop/src/renderer/components/NewWorkspaceModal.old/NewWorkspaceModal.tsx
 delete mode 100644 apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ExistingWorktreesList/ExistingWorktreesList.tsx
 delete mode 100644 apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ExistingWorktreesList/components/BranchesSection.tsx
 delete mode 100644 apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ExistingWorktreesList/components/PrUrlSection.tsx
 delete mode 100644 apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ExistingWorktreesList/components/WorktreesSection.tsx
 delete mode 100644 apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ExistingWorktreesList/components/index.ts
 delete mode 100644 apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ExistingWorktreesList/index.ts
 delete mode 100644 apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ImportFlow/ImportFlow.tsx
 delete mode 100644 apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ImportFlow/index.ts
 delete mode 100644 apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/NewWorkspaceAdvancedOptions/NewWorkspaceAdvancedOptions.tsx
 delete mode 100644 apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/NewWorkspaceAdvancedOptions/index.ts
 delete mode 100644 apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/NewWorkspaceCreateFlow/NewWorkspaceCreateFlow.tsx
 delete mode 100644 apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/NewWorkspaceCreateFlow/index.ts
 delete mode 100644 apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/NewWorkspaceHeader/NewWorkspaceHeader.tsx
 delete mode 100644 apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/NewWorkspaceHeader/index.ts
 delete mode 100644 apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ProjectSelector/ProjectSelector.tsx
 delete mode 100644 apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ProjectSelector/index.ts
 delete mode 100644 apps/desktop/src/renderer/components/NewWorkspaceModal.old/index.ts
 delete mode 100644 apps/desktop/src/renderer/react-query/workspaces/useOpenWorktree.ts

diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal.old/NewWorkspaceModal.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal.old/NewWorkspaceModal.tsx
deleted file mode 100644
index e6831844e83..00000000000
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal.old/NewWorkspaceModal.tsx
+++ /dev/null
@@ -1,469 +0,0 @@
-import {
-	AGENT_PRESET_COMMANDS,
-	buildAgentPromptCommand,
-} from "@superset/shared/agent-command";
-import {
-	type AgentLaunchRequest,
-	STARTABLE_AGENT_TYPES,
-	type StartableAgentType,
-} from "@superset/shared/agent-launch";
-import { Dialog, DialogContent } from "@superset/ui/dialog";
-import { toast } from "@superset/ui/sonner";
-import { useNavigate } from "@tanstack/react-router";
-import { useEffect, useMemo, useRef, useState } from "react";
-import { launchAgentSession } from "renderer/lib/agent-session-orchestrator";
-import { electronTrpc } from "renderer/lib/electron-trpc";
-import { resolveEffectiveWorkspaceBaseBranch } from "renderer/lib/workspaceBaseBranch";
-import { useOpenProject } from "renderer/react-query/projects";
-import { useCreateWorkspace } from "renderer/react-query/workspaces";
-import {
-	useCloseNewWorkspaceModal,
-	useNewWorkspaceModalOpen,
-	usePreSelectedProjectId,
-} from "renderer/stores/new-workspace-modal";
-import {
-	resolveBranchPrefix,
-	sanitizeBranchNameWithMaxLength,
-} from "shared/utils/branch";
-import type { ImportSourceTab } from "./components/ExistingWorktreesList";
-import { ImportFlow } from "./components/ImportFlow";
-import { NewWorkspaceAdvancedOptions } from "./components/NewWorkspaceAdvancedOptions";
-import {
-	NewWorkspaceCreateFlow,
-	type WorkspaceCreateAgent,
-} from "./components/NewWorkspaceCreateFlow";
-import { NewWorkspaceHeader } from "./components/NewWorkspaceHeader";
-import { ProjectSelector } from "./components/ProjectSelector";
-
-type Mode = "existing" | "new";
-const WORKSPACE_AGENT_STORAGE_KEY = "lastSelectedWorkspaceCreateAgent";
-
-export function NewWorkspaceModal() {
-	const navigate = useNavigate();
-	const isOpen = useNewWorkspaceModalOpen();
-	const closeModal = useCloseNewWorkspaceModal();
-	const preSelectedProjectId = usePreSelectedProjectId();
-	const [selectedProjectId, setSelectedProjectId] = useState<string | null>(
-		null,
-	);
-	const [title, setTitle] = useState("");
-	const [branchName, setBranchName] = useState("");
-	const [branchNameEdited, setBranchNameEdited] = useState(false);
-	const [mode, setMode] = useState<Mode>("new");
-	const [baseBranch, setBaseBranch] = useState<string | null>(null);
-	const [baseBranchOpen, setBaseBranchOpen] = useState(false);
-	const [branchSearch, setBranchSearch] = useState("");
-	const [showAdvanced, setShowAdvanced] = useState(false);
-	const [runSetupScript, setRunSetupScript] = useState(true);
-	const [importTab, setImportTab] = useState<ImportSourceTab>("pull-request");
-	const [selectedAgent, setSelectedAgent] = useState<WorkspaceCreateAgent>(
-		() => {
-			if (typeof window === "undefined") return "none";
-			const stored = window.localStorage.getItem(WORKSPACE_AGENT_STORAGE_KEY);
-			if (stored === "none") return "none";
-			return stored &&
-				(STARTABLE_AGENT_TYPES as readonly string[]).includes(stored)
-				? (stored as WorkspaceCreateAgent)
-				: "none";
-		},
-	);
-	const runSetupScriptRef = useRef(true);
-	runSetupScriptRef.current = runSetupScript;
-	const titleInputRef = useRef<HTMLTextAreaElement>(null);
-
-	const { data: recentProjects = [] } =
-		electronTrpc.projects.getRecents.useQuery();
-	const { data: project } = electronTrpc.projects.get.useQuery(
-		{ id: selectedProjectId ?? "" },
-		{ enabled: !!selectedProjectId },
-	);
-	const {
-		data: branchData,
-		isLoading: isBranchesLoading,
-		isError: isBranchesError,
-	} = electronTrpc.projects.getBranches.useQuery(
-		{ projectId: selectedProjectId ?? "" },
-		{ enabled: !!selectedProjectId },
-	);
-	const { data: gitAuthor } = electronTrpc.projects.getGitAuthor.useQuery(
-		{ id: selectedProjectId ?? "" },
-		{ enabled: !!selectedProjectId },
-	);
-	const { data: globalBranchPrefix } =
-		electronTrpc.settings.getBranchPrefix.useQuery();
-	const { data: gitInfo } = electronTrpc.settings.getGitInfo.useQuery();
-	const terminalCreateOrAttach =
-		electronTrpc.terminal.createOrAttach.useMutation();
-	const terminalWrite = electronTrpc.terminal.write.useMutation();
-	const createWorkspace = useCreateWorkspace({
-		resolveInitialCommands: (commands) =>
-			runSetupScriptRef.current ? commands : null,
-	});
-	const { openNew } = useOpenProject();
-	const selectableAgents =
-		STARTABLE_AGENT_TYPES as readonly StartableAgentType[];
-
-	const resolvedPrefix = useMemo(() => {
-		const projectOverrides = project?.branchPrefixMode != null;
-		return resolveBranchPrefix({
-			mode: projectOverrides
-				? project?.branchPrefixMode
-				: (globalBranchPrefix?.mode ?? "none"),
-			customPrefix: projectOverrides
-				? project?.branchPrefixCustom
-				: globalBranchPrefix?.customPrefix,
-			authorPrefix: gitAuthor?.prefix,
-			githubUsername: gitInfo?.githubUsername,
-		});
-	}, [project, globalBranchPrefix, gitAuthor, gitInfo]);
-
-	const filteredBranches = useMemo(() => {
-		if (!branchData?.branches) return [];
-		if (!branchSearch) return branchData.branches;
-		const searchLower = branchSearch.toLowerCase();
-		return branchData.branches.filter((b) =>
-			b.name.toLowerCase().includes(searchLower),
-		);
-	}, [branchData?.branches, branchSearch]);
-
-	// biome-ignore lint/correctness/useExhaustiveDependencies: reset form each time the modal opens
-	useEffect(() => {
-		if (!isOpen) return;
-		resetForm();
-		if (preSelectedProjectId) {
-			setSelectedProjectId(preSelectedProjectId);
-		}
-	}, [isOpen]);
-
-	useEffect(() => {
-		if (selectedAgent === "none") return;
-		if ((STARTABLE_AGENT_TYPES as readonly string[]).includes(selectedAgent)) {
-			return;
-		}
-		setSelectedAgent("none");
-		window.localStorage.setItem(WORKSPACE_AGENT_STORAGE_KEY, "none");
-	}, [selectedAgent]);
-
-	const effectiveBaseBranch = resolveEffectiveWorkspaceBaseBranch({
-		explicitBaseBranch: baseBranch,
-		workspaceBaseBranch: project?.workspaceBaseBranch,
-		defaultBranch: branchData?.defaultBranch,
-		branches: branchData?.branches,
-	});
-
-	// biome-ignore lint/correctness/useExhaustiveDependencies: intentionally reset when project changes
-	useEffect(() => {
-		setBaseBranch(null);
-	}, [selectedProjectId]);
-
-	const branchSlug = branchNameEdited
-		? sanitizeBranchNameWithMaxLength(branchName, undefined, {
-				preserveFirstSegmentCase: true,
-			})
-		: "";
-
-	const applyPrefix = !branchNameEdited;
-
-	const branchPreview =
-		branchSlug && applyPrefix && resolvedPrefix
-			? sanitizeBranchNameWithMaxLength(`${resolvedPrefix}/${branchSlug}`)
-			: branchSlug;
-
-	const resetForm = () => {
-		setSelectedProjectId(null);
-		setTitle("");
-		setBranchName("");
-		setBranchNameEdited(false);
-		setMode("new");
-		setImportTab("pull-request");
-		setBaseBranch(null);
-		setBranchSearch("");
-		setShowAdvanced(false);
-		setRunSetupScript(true);
-	};
-
-	useEffect(() => {
-		if (isOpen && selectedProjectId && mode === "new") {
-			const timer = setTimeout(() => titleInputRef.current?.focus(), 50);
-			return () => clearTimeout(timer);
-		}
-	}, [isOpen, selectedProjectId, mode]);
-
-	const handleKeyDown = (e: React.KeyboardEvent) => {
-		if (e.defaultPrevented) return;
-
-		const isTextareaTarget = e.target instanceof HTMLTextAreaElement;
-		const isSubmitShortcutInTextarea =
-			isTextareaTarget && (e.metaKey || e.ctrlKey);
-
-		if (isTextareaTarget && !isSubmitShortcutInTextarea) {
-			return;
-		}
-
-		if (
-			e.key === "Enter" &&
-			!e.shiftKey &&
-			mode === "new" &&
-			selectedProjectId &&
-			!createWorkspace.isPending
-		) {
-			e.preventDefault();
-			handleCreateWorkspace();
-		}
-	};
-
-	const handleClose = () => {
-		closeModal();
-		resetForm();
-	};
-
-	const handleBranchNameChange = (value: string) => {
-		setBranchName(value);
-		setBranchNameEdited(true);
-	};
-
-	const handleBranchNameBlur = () => {
-		if (!branchName.trim()) {
-			setBranchName("");
-			setBranchNameEdited(false);
-		}
-	};
-
-	const handleImportRepo = async () => {
-		try {
-			const projects = await openNew();
-
-			if (projects.length > 1) {
-				toast.success(`${projects.length} projects imported`);
-			}
-
-			if (projects.length > 0) {
-				setSelectedProjectId(projects[0].id);
-			}
-		} catch (error) {
-			toast.error("Failed to open project", {
-				description:
-					error instanceof Error ? error.message : "An unknown error occurred",
-			});
-		}
-	};
-
-	const selectedProject = recentProjects.find(
-		(p) => p.id === selectedProjectId,
-	);
-	const projectSelector = (
-		<ProjectSelector
-			selectedProjectId={selectedProjectId}
-			selectedProjectName={selectedProject?.name ?? null}
-			recentProjects={recentProjects.filter((project) => Boolean(project.id))}
-			onSelectProject={setSelectedProjectId}
-			onImportRepo={handleImportRepo}
-		/>
-	);
-	const isCreateDisabled = createWorkspace.isPending || isBranchesError;
-	const buildLaunchRequestForWorkspace = (
-		workspaceId: string,
-		prompt: string,
-	): AgentLaunchRequest | null => {
-		if (selectedAgent === "none") {
-			return null;
-		}
-
-		if (selectedAgent === "superset-chat") {
-			return {
-				kind: "chat",
-				workspaceId,
-				agentType: "superset-chat",
-				source: "new-workspace",
-				chat: {
-					initialPrompt: prompt || undefined,
-					retryCount: 1,
-				},
-			};
-		}
-
-		const command = prompt
-			? buildAgentPromptCommand({
-					prompt,
-					randomId: window.crypto.randomUUID(),
-					agent: selectedAgent,
-				})
-			: (AGENT_PRESET_COMMANDS[selectedAgent][0] ?? null);
-
-		if (!command) {
-			return null;
-		}
-
-		return {
-			kind: "terminal",
-			workspaceId,
-			agentType: selectedAgent,
-			source: "new-workspace",
-			terminal: {
-				command,
-				name: "Agent",
-			},
-		};
-	};
-
-	const handleCreateWorkspace = async () => {
-		if (!selectedProjectId) return;
-		// Keep the agent prompt uncapped; only trim surrounding whitespace.
-		const prompt = title.trim();
-
-		const workspaceName = undefined;
-		const launchRequestTemplate = buildLaunchRequestForWorkspace(
-			"pending-workspace",
-			prompt,
-		);
-
-		closeModal();
-
-		try {
-			const result = await createWorkspace.mutateAsyncWithPendingSetup(
-				{
-					projectId: selectedProjectId,
-					name: workspaceName,
-					prompt: prompt || undefined,
-					branchName: branchSlug || undefined,
-					baseBranch: baseBranch || undefined,
-					applyPrefix,
-				},
-				launchRequestTemplate
-					? { agentLaunchRequest: launchRequestTemplate }
-					: undefined,
-			);
-
-			const launchRequest = launchRequestTemplate
-				? {
-						...launchRequestTemplate,
-						workspaceId: result.workspace.id,
-					}
-				: null;
-
-			if (launchRequest && result.wasExisting) {
-				const launchResult = await launchAgentSession(launchRequest, {
-					source: "new-workspace",
-					createOrAttach: (input) => terminalCreateOrAttach.mutateAsync(input),
-					write: (input) => terminalWrite.mutateAsync(input),
-				});
-				if (launchResult.status === "failed") {
-					toast.error("Failed to start agent", {
-						description: launchResult.error ?? "Failed to start agent session.",
-					});
-				}
-			}
-
-			if (result.wasExisting) {
-				toast.success("Opened existing workspace");
-			} else if (result.isInitializing) {
-				toast.success("Workspace created", {
-					description: "Setting up in the background...",
-				});
-			} else {
-				toast.success("Workspace created");
-			}
-		} catch (err) {
-			toast.error(
-				err instanceof Error ? err.message : "Failed to create workspace",
-			);
-		}
-	};
-
-	const handleAgentChange = (value: WorkspaceCreateAgent) => {
-		setSelectedAgent(value);
-		window.localStorage.setItem(WORKSPACE_AGENT_STORAGE_KEY, value);
-	};
-
-	const handleBaseBranchSelect = (branchName: string) => {
-		setBaseBranch(branchName);
-		setBaseBranchOpen(false);
-		setBranchSearch("");
-	};
-
-	const advancedOptions = (
-		<NewWorkspaceAdvancedOptions
-			showAdvanced={showAdvanced}
-			onShowAdvancedChange={setShowAdvanced}
-			branchInputValue={branchNameEdited ? branchName : branchPreview}
-			onBranchInputChange={handleBranchNameChange}
-			onBranchInputBlur={handleBranchNameBlur}
-			onEditPrefix={() => {
-				handleClose();
-				navigate({ to: "/settings/behavior" });
-			}}
-			isBranchesError={isBranchesError}
-			isBranchesLoading={isBranchesLoading}
-			baseBranchOpen={baseBranchOpen}
-			onBaseBranchOpenChange={setBaseBranchOpen}
-			effectiveBaseBranch={effectiveBaseBranch}
-			defaultBranch={branchData?.defaultBranch}
-			branchSearch={branchSearch}
-			onBranchSearchChange={setBranchSearch}
-			filteredBranches={filteredBranches}
-			onSelectBaseBranch={handleBaseBranchSelect}
-			runSetupScript={runSetupScript}
-			onRunSetupScriptChange={setRunSetupScript}
-		/>
-	);
-
-	return (
-		<Dialog modal open={isOpen} onOpenChange={(open) => !open && handleClose()}>
-			<DialogContent
-				className="sm:max-w-[440px] gap-0 p-0 overflow-hidden"
-				onKeyDown={handleKeyDown}
-				showCloseButton={false}
-			>
-				<NewWorkspaceHeader
-					mode={mode}
-					hasSelectedProject={!!selectedProjectId}
-					onBackToNew={() => setMode("new")}
-					onOpenImport={() => setMode("existing")}
-				/>
-
-				{!selectedProjectId && (
-					<div className="px-4 pb-3">{projectSelector}</div>
-				)}
-
-				{selectedProjectId && (
-					<div className="px-4 pb-4 min-w-0">
-						{mode === "new" && (
-							<NewWorkspaceCreateFlow
-								projectSelector={projectSelector}
-								selectedAgent={selectedAgent}
-								agentOptions={selectableAgents}
-								onSelectedAgentChange={handleAgentChange}
-								title={title}
-								onTitleChange={setTitle}
-								titleInputRef={titleInputRef}
-								showBranchPreview={branchNameEdited}
-								branchPreview={branchPreview}
-								effectiveBaseBranch={effectiveBaseBranch}
-								onCreateWorkspace={handleCreateWorkspace}
-								isCreateDisabled={isCreateDisabled}
-								advancedOptions={advancedOptions}
-							/>
-						)}
-						{mode === "existing" && (
-							<ImportFlow
-								projectId={selectedProjectId}
-								projectSelector={projectSelector}
-								onOpenSuccess={handleClose}
-								activeTab={importTab}
-								onActiveTabChange={setImportTab}
-							/>
-						)}
-					</div>
-				)}
-
-				{!selectedProjectId && (
-					<div className="px-4 pb-4 pt-2">
-						<div className="text-center text-sm text-muted-foreground py-8">
-							Select a project to get started
-						</div>
-					</div>
-				)}
-			</DialogContent>
-		</Dialog>
-	);
-}
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ExistingWorktreesList/ExistingWorktreesList.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ExistingWorktreesList/ExistingWorktreesList.tsx
deleted file mode 100644
index 2904b7ad7ec..00000000000
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ExistingWorktreesList/ExistingWorktreesList.tsx
+++ /dev/null
@@ -1,342 +0,0 @@
-import {
-	AlertDialog,
-	AlertDialogAction,
-	AlertDialogCancel,
-	AlertDialogContent,
-	AlertDialogDescription,
-	AlertDialogFooter,
-	AlertDialogHeader,
-	AlertDialogTitle,
-	AlertDialogTrigger,
-} from "@superset/ui/alert-dialog";
-import { Button } from "@superset/ui/button";
-import { toast } from "@superset/ui/sonner";
-import { Tabs, TabsList, TabsTrigger } from "@superset/ui/tabs";
-import { useMemo, useState } from "react";
-import { electronTrpc } from "renderer/lib/electron-trpc";
-import {
-	useCreateFromPr,
-	useCreateWorkspace,
-	useImportAllWorktrees,
-	useOpenExternalWorktree,
-	useOpenWorktree,
-} from "renderer/react-query/workspaces";
-import { BranchesSection, PrUrlSection, WorktreesSection } from "./components";
-
-interface ExistingWorktreesListProps {
-	projectId: string;
-	onOpenSuccess: () => void;
-	activeTab?: ImportSourceTab;
-	onActiveTabChange?: (tab: ImportSourceTab) => void;
-	showTabs?: boolean;
-}
-
-export type ImportSourceTab = "pull-request" | "branches" | "worktrees";
-
-export function ExistingWorktreesList({
-	projectId,
-	onOpenSuccess,
-	activeTab,
-	onActiveTabChange,
-	showTabs = true,
-}: ExistingWorktreesListProps) {
-	const { data: worktrees = [], isLoading: isWorktreesLoading } =
-		electronTrpc.workspaces.getWorktreesByProject.useQuery({ projectId });
-	const {
-		data: externalWorktrees = [],
-		isLoading: isExternalWorktreesLoading,
-	} = electronTrpc.workspaces.getExternalWorktrees.useQuery({ projectId });
-	const { data: branchData, isLoading: isBranchesLoading } =
-		electronTrpc.projects.getBranches.useQuery({ projectId });
-	const openWorktree = useOpenWorktree();
-	const openExternalWorktree = useOpenExternalWorktree();
-	const createWorkspace = useCreateWorkspace();
-	const createFromPr = useCreateFromPr();
-	const importAllWorktrees = useImportAllWorktrees();
-
-	const [branchOpen, setBranchOpen] = useState(false);
-	const [branchSearch, setBranchSearch] = useState("");
-	const [worktreeOpen, setWorktreeOpen] = useState(false);
-	const [worktreeSearch, setWorktreeSearch] = useState("");
-	const [prUrl, setPrUrl] = useState("");
-	const [internalActiveTab, setInternalActiveTab] =
-		useState<ImportSourceTab>("pull-request");
-	const selectedTab = activeTab ?? internalActiveTab;
-	const setSelectedTab = onActiveTabChange ?? setInternalActiveTab;
-
-	const closedWorktrees = worktrees
-		.filter((wt) => !wt.hasActiveWorkspace && wt.existsOnDisk)
-		.sort((a, b) => b.createdAt - a.createdAt);
-	const openWorktrees = worktrees
-		.filter((wt) => wt.hasActiveWorkspace)
-		.sort((a, b) => b.createdAt - a.createdAt);
-
-	const branchesWithoutWorktrees = useMemo(() => {
-		if (!branchData?.branches) return [];
-		const worktreeBranches = new Set(worktrees.map((wt) => wt.branch));
-		const externalWorktreeBranches = new Set(
-			externalWorktrees.map((wt) => wt.branch),
-		);
-		return branchData.branches.filter(
-			(branch) =>
-				!worktreeBranches.has(branch.name) &&
-				!externalWorktreeBranches.has(branch.name),
-		);
-	}, [branchData?.branches, worktrees, externalWorktrees]);
-
-	const filteredBranches = useMemo(() => {
-		if (!branchSearch) return branchesWithoutWorktrees;
-		const searchLower = branchSearch.toLowerCase();
-		return branchesWithoutWorktrees.filter((b) =>
-			b.name.toLowerCase().includes(searchLower),
-		);
-	}, [branchesWithoutWorktrees, branchSearch]);
-
-	const handleOpenWorktree = async (worktreeId: string, branch: string) => {
-		setWorktreeOpen(false);
-		setWorktreeSearch("");
-		toast.promise(openWorktree.mutateAsync({ worktreeId }), {
-			loading: "Opening workspace...",
-			success: () => {
-				onOpenSuccess();
-				return `Opened ${branch}`;
-			},
-			error: (err) =>
-				err instanceof Error ? err.message : "Failed to open workspace",
-		});
-	};
-
-	const handleCreateFromBranch = async (branchName: string) => {
-		setBranchOpen(false);
-		setBranchSearch("");
-
-		try {
-			const result = await createWorkspace.mutateAsync({
-				projectId,
-				branchName,
-				useExistingBranch: true,
-			});
-
-			onOpenSuccess();
-
-			if (result.isInitializing) {
-				toast.success("Workspace created", {
-					description: "Setting up in the background...",
-				});
-			} else {
-				toast.success("Workspace created");
-			}
-		} catch (err) {
-			toast.error(
-				err instanceof Error ? err.message : "Failed to create workspace",
-			);
-		}
-	};
-
-	const handleCreateFromPr = async () => {
-		if (!prUrl.trim()) return;
-
-		try {
-			const result = await createFromPr.mutateAsync({
-				projectId,
-				prUrl: prUrl.trim(),
-			});
-
-			onOpenSuccess();
-			setPrUrl("");
-
-			if (result.wasExisting) {
-				toast.success(`Reopened PR #${result.prNumber}`, {
-					description: result.prTitle,
-				});
-			} else {
-				toast.success(`Opened PR #${result.prNumber}`, {
-					description: result.prTitle,
-				});
-			}
-		} catch (err) {
-			toast.error(err instanceof Error ? err.message : "Failed to open PR");
-		}
-	};
-
-	const handleOpenExternalWorktree = async (path: string, branch: string) => {
-		setWorktreeOpen(false);
-		setWorktreeSearch("");
-		toast.promise(
-			openExternalWorktree.mutateAsync({
-				projectId,
-				worktreePath: path,
-				branch,
-			}),
-			{
-				loading: "Opening workspace...",
-				success: () => {
-					onOpenSuccess();
-					return `Opened ${branch}`;
-				},
-				error: (err) =>
-					err instanceof Error ? err.message : "Failed to open workspace",
-			},
-		);
-	};
-
-	const handleImportAll = async () => {
-		try {
-			const result = await importAllWorktrees.mutateAsync({ projectId });
-			onOpenSuccess();
-			toast.success(
-				`Imported ${result.imported} workspace${result.imported === 1 ? "" : "s"}`,
-			);
-		} catch (err) {
-			toast.error(
-				err instanceof Error ? err.message : "Failed to import worktrees",
-			);
-		}
-	};
-
-	const isLoading =
-		isWorktreesLoading || isExternalWorktreesLoading || isBranchesLoading;
-	const isPending =
-		openWorktree.isPending ||
-		openExternalWorktree.isPending ||
-		createWorkspace.isPending ||
-		createFromPr.isPending ||
-		importAllWorktrees.isPending;
-
-	const importableCount = closedWorktrees.length + externalWorktrees.length;
-
-	if (isLoading) {
-		return (
-			<div className="py-6 text-center text-xs text-muted-foreground">
-				Loading...
-			</div>
-		);
-	}
-
-	const hasWorktrees =
-		closedWorktrees.length > 0 ||
-		openWorktrees.length > 0 ||
-		externalWorktrees.length > 0;
-	const hasBranches = branchesWithoutWorktrees.length > 0;
-
-	return (
-		<div className="space-y-3 max-h-[350px] overflow-y-auto">
-			{showTabs && (
-				<Tabs
-					value={selectedTab}
-					onValueChange={(value) => setSelectedTab(value as ImportSourceTab)}
-				>
-					<TabsList className="h-8 bg-transparent p-0 gap-1">
-						<TabsTrigger
-							value="pull-request"
-							className="h-8 rounded-md px-3 data-[state=active]:bg-accent data-[state=active]:text-foreground data-[state=inactive]:text-muted-foreground"
-						>
-							Pull request
-						</TabsTrigger>
-						<TabsTrigger
-							value="branches"
-							className="h-8 rounded-md px-3 data-[state=active]:bg-accent data-[state=active]:text-foreground data-[state=inactive]:text-muted-foreground"
-						>
-							Branches
-						</TabsTrigger>
-						<TabsTrigger
-							value="worktrees"
-							className="h-8 rounded-md px-3 data-[state=active]:bg-accent data-[state=active]:text-foreground data-[state=inactive]:text-muted-foreground"
-						>
-							Worktrees
-						</TabsTrigger>
-					</TabsList>
-				</Tabs>
-			)}
-
-			{selectedTab === "pull-request" && (
-				<PrUrlSection
-					prUrl={prUrl}
-					onPrUrlChange={setPrUrl}
-					onSubmit={handleCreateFromPr}
-					isPending={createFromPr.isPending}
-				/>
-			)}
-
-			{selectedTab === "branches" &&
-				(hasBranches ? (
-					<BranchesSection
-						branches={filteredBranches}
-						defaultBranch={branchData?.defaultBranch}
-						searchValue={branchSearch}
-						onSearchChange={setBranchSearch}
-						isOpen={branchOpen}
-						onOpenChange={setBranchOpen}
-						onSelectBranch={handleCreateFromBranch}
-						disabled={isPending}
-					/>
-				) : (
-					<div className="py-4 text-center text-xs text-muted-foreground">
-						No branches available to import.
-					</div>
-				))}
-
-			{selectedTab === "worktrees" &&
-				(hasWorktrees ? (
-					<WorktreesSection
-						closedWorktrees={closedWorktrees}
-						openWorktrees={openWorktrees}
-						externalWorktrees={externalWorktrees}
-						searchValue={worktreeSearch}
-						onSearchChange={setWorktreeSearch}
-						isOpen={worktreeOpen}
-						onOpenChange={setWorktreeOpen}
-						onOpenWorktree={handleOpenWorktree}
-						onOpenExternalWorktree={handleOpenExternalWorktree}
-						disabled={isPending}
-					/>
-				) : (
-					<div className="py-4 text-center text-xs text-muted-foreground">
-						No worktrees available to import.
-					</div>
-				))}
-
-			{selectedTab === "worktrees" && importableCount > 0 && (
-				<AlertDialog>
-					<AlertDialogTrigger asChild>
-						<Button
-							variant="ghost"
-							size="sm"
-							className="w-full h-7 text-xs text-muted-foreground"
-							disabled={isPending}
-						>
-							{importAllWorktrees.isPending
-								? "Importing..."
-								: `Import all external worktrees (${importableCount})`}
-						</Button>
-					</AlertDialogTrigger>
-					<AlertDialogContent>
-						<AlertDialogHeader>
-							<AlertDialogTitle>Import all worktrees</AlertDialogTitle>
-							<AlertDialogDescription>
-								This will import {importableCount} external worktree
-								{importableCount === 1 ? "" : "s"} into Superset as workspaces.
-								Each worktree on disk will be tracked and appear in your
-								sidebar. No files will be modified.
-							</AlertDialogDescription>
-						</AlertDialogHeader>
-						<AlertDialogFooter>
-							<AlertDialogCancel>Cancel</AlertDialogCancel>
-							<AlertDialogAction onClick={handleImportAll}>
-								Import all
-							</AlertDialogAction>
-						</AlertDialogFooter>
-					</AlertDialogContent>
-				</AlertDialog>
-			)}
-
-			{selectedTab === "pull-request" && !hasWorktrees && !hasBranches && (
-				<div className="py-4 text-center text-xs text-muted-foreground">
-					No existing worktrees or branches found.
-					<br />
-					Use Pull request tab to paste a PR URL.
-				</div>
-			)}
-		</div>
-	);
-}
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ExistingWorktreesList/components/BranchesSection.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ExistingWorktreesList/components/BranchesSection.tsx
deleted file mode 100644
index 83b4255246d..00000000000
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ExistingWorktreesList/components/BranchesSection.tsx
+++ /dev/null
@@ -1,108 +0,0 @@
-import { Button } from "@superset/ui/button";
-import {
-	Command,
-	CommandEmpty,
-	CommandInput,
-	CommandItem,
-	CommandList,
-} from "@superset/ui/command";
-import { Popover, PopoverContent, PopoverTrigger } from "@superset/ui/popover";
-import { GoGitBranch } from "react-icons/go";
-import { HiChevronUpDown } from "react-icons/hi2";
-import { formatRelativeTime } from "renderer/lib/formatRelativeTime";
-
-interface Branch {
-	name: string;
-	lastCommitDate: number;
-	isLocal: boolean;
-	isRemote: boolean;
-}
-
-interface BranchesSectionProps {
-	branches: Branch[];
-	defaultBranch: string | undefined;
-	searchValue: string;
-	onSearchChange: (value: string) => void;
-	isOpen: boolean;
-	onOpenChange: (open: boolean) => void;
-	onSelectBranch: (branchName: string) => void;
-	disabled: boolean;
-}
-
-export function BranchesSection({
-	branches,
-	defaultBranch,
-	searchValue,
-	onSearchChange,
-	isOpen,
-	onOpenChange,
-	onSelectBranch,
-	disabled,
-}: BranchesSectionProps) {
-	return (
-		<div className="space-y-1.5">
-			<Popover open={isOpen} onOpenChange={onOpenChange} modal={false}>
-				<PopoverTrigger asChild>
-					<Button
-						variant="outline"
-						size="sm"
-						className="w-full h-8 justify-between font-normal"
-						disabled={disabled}
-					>
-						<span className="flex items-center gap-2 shrink-0 min-w-0">
-							<GoGitBranch className="size-3.5 shrink-0 text-muted-foreground" />
-							<span className="truncate text-sm text-muted-foreground">
-								Select branch...
-							</span>
-						</span>
-						<HiChevronUpDown className="size-4 shrink-0 text-muted-foreground ml-2" />
-					</Button>
-				</PopoverTrigger>
-				<PopoverContent
-					className="w-[--radix-popover-trigger-width] p-0"
-					align="start"
-					onWheel={(e) => e.stopPropagation()}
-				>
-					<Command shouldFilter={false}>
-						<CommandInput
-							placeholder="Search branches..."
-							value={searchValue}
-							onValueChange={onSearchChange}
-						/>
-						<CommandList className="max-h-[200px]">
-							<CommandEmpty>No branches found</CommandEmpty>
-							{branches.map((branch) => (
-								<CommandItem
-									key={branch.name}
-									value={branch.name}
-									onSelect={() => onSelectBranch(branch.name)}
-									className="flex items-center justify-between"
-								>
-									<span className="flex items-center gap-2 truncate min-w-0">
-										<GoGitBranch className="size-3.5 shrink-0 text-muted-foreground" />
-										<span className="truncate">{branch.name}</span>
-										{branch.name === defaultBranch && (
-											<span className="text-[10px] text-muted-foreground bg-muted px-1.5 py-0.5 rounded shrink-0">
-												default
-											</span>
-										)}
-										{!branch.isLocal && branch.isRemote && (
-											<span className="text-[10px] text-muted-foreground/60 bg-muted/50 px-1.5 py-0.5 rounded shrink-0">
-												remote
-											</span>
-										)}
-									</span>
-									{branch.lastCommitDate > 0 && (
-										<span className="text-xs text-muted-foreground shrink-0 ml-2">
-											{formatRelativeTime(branch.lastCommitDate)}
-										</span>
-									)}
-								</CommandItem>
-							))}
-						</CommandList>
-					</Command>
-				</PopoverContent>
-			</Popover>
-		</div>
-	);
-}
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ExistingWorktreesList/components/PrUrlSection.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ExistingWorktreesList/components/PrUrlSection.tsx
deleted file mode 100644
index 3ac4c5f093b..00000000000
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ExistingWorktreesList/components/PrUrlSection.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import { Button } from "@superset/ui/button";
-import { Input } from "@superset/ui/input";
-import { GoGitPullRequest } from "react-icons/go";
-import { LuLoader } from "react-icons/lu";
-
-interface PrUrlSectionProps {
-	prUrl: string;
-	onPrUrlChange: (value: string) => void;
-	onSubmit: () => void;
-	isPending: boolean;
-}
-
-export function PrUrlSection({
-	prUrl,
-	onPrUrlChange,
-	onSubmit,
-	isPending,
-}: PrUrlSectionProps) {
-	const handleKeyDown = (e: React.KeyboardEvent) => {
-		if (e.key === "Enter" && !isPending) {
-			e.preventDefault();
-			onSubmit();
-		}
-	};
-
-	return (
-		<div className="space-y-1.5">
-			<div className="flex min-w-0 gap-2">
-				<div className="relative min-w-0 flex-1">
-					<GoGitPullRequest className="absolute left-2.5 top-1/2 -translate-y-1/2 size-3.5 text-muted-foreground" />
-					<Input
-						className="h-8 w-full min-w-0 max-w-full text-sm pl-8 pr-3"
-						placeholder="Paste PR URL..."
-						value={prUrl}
-						onChange={(e) => onPrUrlChange(e.target.value)}
-						onKeyDown={handleKeyDown}
-						disabled={isPending}
-					/>
-				</div>
-				<Button
-					variant="outline"
-					size="sm"
-					className="h-8 px-3"
-					onClick={onSubmit}
-					disabled={!prUrl.trim() || isPending}
-				>
-					{isPending ? <LuLoader className="size-3.5 animate-spin" /> : "Open"}
-				</Button>
-			</div>
-		</div>
-	);
-}
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ExistingWorktreesList/components/WorktreesSection.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ExistingWorktreesList/components/WorktreesSection.tsx
deleted file mode 100644
index 0b107e6ebd6..00000000000
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ExistingWorktreesList/components/WorktreesSection.tsx
+++ /dev/null
@@ -1,203 +0,0 @@
-import { Button } from "@superset/ui/button";
-import {
-	Command,
-	CommandEmpty,
-	CommandGroup,
-	CommandInput,
-	CommandItem,
-	CommandList,
-} from "@superset/ui/command";
-import { Popover, PopoverContent, PopoverTrigger } from "@superset/ui/popover";
-import { formatDistanceToNow } from "date-fns";
-import { HiChevronUpDown } from "react-icons/hi2";
-import { LuGitBranch } from "react-icons/lu";
-
-interface Worktree {
-	id: string;
-	branch: string;
-	path: string;
-	createdAt: number;
-	hasActiveWorkspace: boolean;
-}
-
-interface ExternalWorktree {
-	path: string;
-	branch: string;
-}
-
-interface WorktreesSectionProps {
-	closedWorktrees: Worktree[];
-	openWorktrees: Worktree[];
-	externalWorktrees: ExternalWorktree[];
-	searchValue: string;
-	onSearchChange: (value: string) => void;
-	isOpen: boolean;
-	onOpenChange: (open: boolean) => void;
-	onOpenWorktree: (worktreeId: string, branch: string) => void;
-	onOpenExternalWorktree: (path: string, branch: string) => void;
-	disabled: boolean;
-}
-
-export function WorktreesSection({
-	closedWorktrees,
-	openWorktrees,
-	externalWorktrees,
-	searchValue,
-	onSearchChange,
-	isOpen,
-	onOpenChange,
-	onOpenWorktree,
-	onOpenExternalWorktree,
-	disabled,
-}: WorktreesSectionProps) {
-	const searchLower = searchValue.toLowerCase();
-
-	const filteredClosed = searchValue
-		? closedWorktrees.filter(
-				(wt) =>
-					wt.branch.toLowerCase().includes(searchLower) ||
-					wt.path.toLowerCase().includes(searchLower),
-			)
-		: closedWorktrees;
-
-	const filteredOpen = searchValue
-		? openWorktrees.filter(
-				(wt) =>
-					wt.branch.toLowerCase().includes(searchLower) ||
-					wt.path.toLowerCase().includes(searchLower),
-			)
-		: openWorktrees;
-
-	const filteredExternal = searchValue
-		? externalWorktrees.filter(
-				(wt) =>
-					wt.branch.toLowerCase().includes(searchLower) ||
-					wt.path.toLowerCase().includes(searchLower),
-			)
-		: externalWorktrees;
-
-	const totalCount =
-		closedWorktrees.length + openWorktrees.length + externalWorktrees.length;
-	const hasResults =
-		filteredClosed.length > 0 ||
-		filteredOpen.length > 0 ||
-		filteredExternal.length > 0;
-
-	return (
-		<div className="space-y-1.5">
-			<Popover open={isOpen} onOpenChange={onOpenChange} modal={false}>
-				<PopoverTrigger asChild>
-					<Button
-						variant="outline"
-						size="sm"
-						className="w-full h-8 justify-between font-normal"
-						disabled={disabled}
-					>
-						<span className="flex items-center gap-2 truncate">
-							<LuGitBranch className="size-3.5 shrink-0 text-muted-foreground" />
-							<span className="truncate text-sm text-muted-foreground">
-								Select worktree...
-							</span>
-						</span>
-						<span className="flex items-center gap-1.5">
-							<span className="text-xs text-muted-foreground/60">
-								{totalCount}
-							</span>
-							<HiChevronUpDown className="size-4 shrink-0 text-muted-foreground" />
-						</span>
-					</Button>
-				</PopoverTrigger>
-				<PopoverContent
-					className="w-[--radix-popover-trigger-width] p-0"
-					align="start"
-					onWheel={(e) => e.stopPropagation()}
-				>
-					<Command shouldFilter={false}>
-						<CommandInput
-							placeholder="Search worktrees..."
-							value={searchValue}
-							onValueChange={onSearchChange}
-						/>
-						<CommandList className="max-h-[200px]">
-							{!hasResults && <CommandEmpty>No worktrees found</CommandEmpty>}
-							{filteredClosed.length > 0 && (
-								<CommandGroup heading="Superset">
-									{filteredClosed.map((wt) => (
-										<CommandItem
-											key={wt.id}
-											value={wt.id}
-											onSelect={() => onOpenWorktree(wt.id, wt.branch)}
-											className="flex flex-col items-start gap-0.5"
-										>
-											<span className="flex items-center gap-2 w-full">
-												<LuGitBranch className="size-3.5 shrink-0 text-muted-foreground" />
-												<span className="flex-1 truncate text-xs font-mono">
-													{wt.branch}
-												</span>
-												<span className="text-[10px] text-muted-foreground shrink-0">
-													{formatDistanceToNow(wt.createdAt, {
-														addSuffix: false,
-													})}
-												</span>
-											</span>
-											<span className="text-[10px] text-muted-foreground/60 truncate w-full pl-5">
-												{wt.path}
-											</span>
-										</CommandItem>
-									))}
-								</CommandGroup>
-							)}
-							{filteredExternal.length > 0 && (
-								<CommandGroup heading="External">
-									{filteredExternal.map((wt) => (
-										<CommandItem
-											key={wt.path}
-											value={wt.path}
-											onSelect={() =>
-												onOpenExternalWorktree(wt.path, wt.branch)
-											}
-											className="flex flex-col items-start gap-0.5"
-										>
-											<span className="flex items-center gap-2 w-full">
-												<LuGitBranch className="size-3.5 shrink-0 text-muted-foreground" />
-												<span className="flex-1 truncate text-xs font-mono">
-													{wt.branch}
-												</span>
-											</span>
-											<span className="text-[10px] text-muted-foreground/60 truncate w-full pl-5">
-												{wt.path}
-											</span>
-										</CommandItem>
-									))}
-								</CommandGroup>
-							)}
-							{filteredOpen.length > 0 && (
-								<CommandGroup heading="Already open">
-									{filteredOpen.map((wt) => (
-										<CommandItem
-											key={wt.id}
-											value={wt.id}
-											disabled
-											className="flex flex-col items-start gap-0.5 opacity-50"
-										>
-											<span className="flex items-center gap-2 w-full">
-												<LuGitBranch className="size-3.5 shrink-0" />
-												<span className="flex-1 truncate text-xs font-mono">
-													{wt.branch}
-												</span>
-												<span className="text-[10px] shrink-0">open</span>
-											</span>
-											<span className="text-[10px] text-muted-foreground/60 truncate w-full pl-5">
-												{wt.path}
-											</span>
-										</CommandItem>
-									))}
-								</CommandGroup>
-							)}
-						</CommandList>
-					</Command>
-				</PopoverContent>
-			</Popover>
-		</div>
-	);
-}
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ExistingWorktreesList/components/index.ts b/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ExistingWorktreesList/components/index.ts
deleted file mode 100644
index 614964b4141..00000000000
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ExistingWorktreesList/components/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { BranchesSection } from "./BranchesSection";
-export { PrUrlSection } from "./PrUrlSection";
-export { WorktreesSection } from "./WorktreesSection";
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ExistingWorktreesList/index.ts b/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ExistingWorktreesList/index.ts
deleted file mode 100644
index 94dfbe747ca..00000000000
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ExistingWorktreesList/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export {
-	ExistingWorktreesList,
-	type ImportSourceTab,
-} from "./ExistingWorktreesList";
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ImportFlow/ImportFlow.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ImportFlow/ImportFlow.tsx
deleted file mode 100644
index 4f67677431e..00000000000
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ImportFlow/ImportFlow.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import { Tabs, TabsList, TabsTrigger } from "@superset/ui/tabs";
-import type { ReactNode } from "react";
-import type { ImportSourceTab } from "../ExistingWorktreesList";
-import { ExistingWorktreesList } from "../ExistingWorktreesList";
-
-interface ImportFlowProps {
-	projectId: string;
-	projectSelector: ReactNode;
-	onOpenSuccess: () => void;
-	activeTab: ImportSourceTab;
-	onActiveTabChange: (tab: ImportSourceTab) => void;
-}
-
-export function ImportFlow({
-	projectId,
-	projectSelector,
-	onOpenSuccess,
-	activeTab,
-	onActiveTabChange,
-}: ImportFlowProps) {
-	return (
-		<div className="space-y-3">
-			<div className="min-w-0 overflow-x-auto">
-				<Tabs
-					value={activeTab}
-					onValueChange={(value) => onActiveTabChange(value as ImportSourceTab)}
-				>
-					<TabsList className="h-8 bg-transparent p-0 gap-1 w-max min-w-full justify-start">
-						<TabsTrigger
-							value="pull-request"
-							className="h-8 rounded-md px-3 data-[state=active]:bg-accent data-[state=active]:text-foreground data-[state=inactive]:text-muted-foreground"
-						>
-							Pull request
-						</TabsTrigger>
-						<TabsTrigger
-							value="branches"
-							className="h-8 rounded-md px-3 data-[state=active]:bg-accent data-[state=active]:text-foreground data-[state=inactive]:text-muted-foreground"
-						>
-							Branches
-						</TabsTrigger>
-						<TabsTrigger
-							value="worktrees"
-							className="h-8 rounded-md px-3 data-[state=active]:bg-accent data-[state=active]:text-foreground data-[state=inactive]:text-muted-foreground"
-						>
-							Worktrees
-						</TabsTrigger>
-					</TabsList>
-				</Tabs>
-			</div>
-			<div>{projectSelector}</div>
-			<ExistingWorktreesList
-				projectId={projectId}
-				onOpenSuccess={onOpenSuccess}
-				activeTab={activeTab}
-				onActiveTabChange={onActiveTabChange}
-				showTabs={false}
-			/>
-		</div>
-	);
-}
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ImportFlow/index.ts b/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ImportFlow/index.ts
deleted file mode 100644
index f7319922aae..00000000000
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ImportFlow/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { ImportFlow } from "./ImportFlow";
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/NewWorkspaceAdvancedOptions/NewWorkspaceAdvancedOptions.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/NewWorkspaceAdvancedOptions/NewWorkspaceAdvancedOptions.tsx
deleted file mode 100644
index c7c5bf4704d..00000000000
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/NewWorkspaceAdvancedOptions/NewWorkspaceAdvancedOptions.tsx
+++ /dev/null
@@ -1,203 +0,0 @@
-import { Button } from "@superset/ui/button";
-import {
-	Collapsible,
-	CollapsibleContent,
-	CollapsibleTrigger,
-} from "@superset/ui/collapsible";
-import {
-	Command,
-	CommandEmpty,
-	CommandInput,
-	CommandItem,
-	CommandList,
-} from "@superset/ui/command";
-import { Input } from "@superset/ui/input";
-import { Label } from "@superset/ui/label";
-import { Popover, PopoverContent, PopoverTrigger } from "@superset/ui/popover";
-import { Switch } from "@superset/ui/switch";
-import { GoGitBranch } from "react-icons/go";
-import {
-	HiCheck,
-	HiChevronDown,
-	HiChevronUpDown,
-	HiOutlinePencil,
-} from "react-icons/hi2";
-import { formatRelativeTime } from "renderer/lib/formatRelativeTime";
-
-interface BranchOption {
-	name: string;
-	lastCommitDate: number;
-}
-
-interface NewWorkspaceAdvancedOptionsProps {
-	showAdvanced: boolean;
-	onShowAdvancedChange: (open: boolean) => void;
-	branchInputValue: string;
-	onBranchInputChange: (value: string) => void;
-	onBranchInputBlur: () => void;
-	onEditPrefix: () => void;
-	isBranchesError: boolean;
-	isBranchesLoading: boolean;
-	baseBranchOpen: boolean;
-	onBaseBranchOpenChange: (open: boolean) => void;
-	effectiveBaseBranch: string | null;
-	defaultBranch?: string;
-	branchSearch: string;
-	onBranchSearchChange: (value: string) => void;
-	filteredBranches: BranchOption[];
-	onSelectBaseBranch: (branchName: string) => void;
-	runSetupScript: boolean;
-	onRunSetupScriptChange: (checked: boolean) => void;
-}
-
-export function NewWorkspaceAdvancedOptions({
-	showAdvanced,
-	onShowAdvancedChange,
-	branchInputValue,
-	onBranchInputChange,
-	onBranchInputBlur,
-	onEditPrefix,
-	isBranchesError,
-	isBranchesLoading,
-	baseBranchOpen,
-	onBaseBranchOpenChange,
-	effectiveBaseBranch,
-	defaultBranch,
-	branchSearch,
-	onBranchSearchChange,
-	filteredBranches,
-	onSelectBaseBranch,
-	runSetupScript,
-	onRunSetupScriptChange,
-}: NewWorkspaceAdvancedOptionsProps) {
-	return (
-		<Collapsible open={showAdvanced} onOpenChange={onShowAdvancedChange}>
-			<CollapsibleTrigger className="flex items-center gap-1 text-xs text-muted-foreground hover:text-foreground transition-colors">
-				<HiChevronDown
-					className={`size-3 transition-transform ${showAdvanced ? "" : "-rotate-90"}`}
-				/>
-				Advanced options
-			</CollapsibleTrigger>
-			<CollapsibleContent className="pt-3 space-y-3">
-				<div className="space-y-1.5">
-					<div className="flex items-center justify-between">
-						<label htmlFor="branch" className="text-xs text-muted-foreground">
-							Branch name
-						</label>
-						<button
-							type="button"
-							onClick={onEditPrefix}
-							className="inline-flex items-center gap-1 text-xs text-muted-foreground hover:text-foreground transition-colors"
-						>
-							<HiOutlinePencil className="size-3" />
-							<span>Edit prefix</span>
-						</button>
-					</div>
-					<Input
-						id="branch"
-						className="h-8 text-sm font-mono"
-						placeholder="auto-generated"
-						value={branchInputValue}
-						onChange={(e) => onBranchInputChange(e.target.value)}
-						onBlur={onBranchInputBlur}
-					/>
-				</div>
-
-				<div className="space-y-1.5">
-					<span className="text-xs text-muted-foreground">Base branch</span>
-					{isBranchesError ? (
-						<div className="flex items-center gap-2 h-8 px-3 rounded-md border border-destructive/50 bg-destructive/10 text-destructive text-xs">
-							Failed to load branches
-						</div>
-					) : (
-						<Popover
-							open={baseBranchOpen}
-							onOpenChange={onBaseBranchOpenChange}
-							modal={false}
-						>
-							<PopoverTrigger asChild>
-								<Button
-									variant="outline"
-									size="sm"
-									className="w-full h-8 justify-between font-normal"
-									disabled={isBranchesLoading}
-								>
-									<span className="flex items-center gap-2 truncate">
-										<GoGitBranch className="size-3.5 shrink-0 text-muted-foreground" />
-										<span className="truncate font-mono text-sm">
-											{effectiveBaseBranch || "Select branch..."}
-										</span>
-										{effectiveBaseBranch === defaultBranch && (
-											<span className="text-[10px] text-muted-foreground bg-muted px-1.5 py-0.5 rounded">
-												default
-											</span>
-										)}
-									</span>
-									<HiChevronUpDown className="size-4 shrink-0 text-muted-foreground" />
-								</Button>
-							</PopoverTrigger>
-							<PopoverContent
-								className="w-[--radix-popover-trigger-width] p-0"
-								align="start"
-								onWheel={(e) => e.stopPropagation()}
-							>
-								<Command shouldFilter={false}>
-									<CommandInput
-										placeholder="Search branches..."
-										value={branchSearch}
-										onValueChange={onBranchSearchChange}
-									/>
-									<CommandList className="max-h-[200px]">
-										<CommandEmpty>No branches found</CommandEmpty>
-										{filteredBranches.map((branch) => (
-											<CommandItem
-												key={branch.name}
-												value={branch.name}
-												onSelect={() => onSelectBaseBranch(branch.name)}
-												className="flex items-center justify-between"
-											>
-												<span className="flex items-center gap-2 truncate">
-													<GoGitBranch className="size-3.5 shrink-0 text-muted-foreground" />
-													<span className="truncate">{branch.name}</span>
-													{branch.name === defaultBranch && (
-														<span className="text-[10px] text-muted-foreground bg-muted px-1.5 py-0.5 rounded">
-															default
-														</span>
-													)}
-												</span>
-												<span className="flex items-center gap-2 shrink-0">
-													{branch.lastCommitDate > 0 && (
-														<span className="text-xs text-muted-foreground">
-															{formatRelativeTime(branch.lastCommitDate)}
-														</span>
-													)}
-													{effectiveBaseBranch === branch.name && (
-														<HiCheck className="size-4 text-primary" />
-													)}
-												</span>
-											</CommandItem>
-										))}
-									</CommandList>
-								</Command>
-							</PopoverContent>
-						</Popover>
-					)}
-				</div>
-
-				<div className="flex items-center justify-between">
-					<Label
-						htmlFor="run-setup-script"
-						className="text-xs text-muted-foreground"
-					>
-						Run setup script
-					</Label>
-					<Switch
-						id="run-setup-script"
-						checked={runSetupScript}
-						onCheckedChange={onRunSetupScriptChange}
-					/>
-				</div>
-			</CollapsibleContent>
-		</Collapsible>
-	);
-}
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/NewWorkspaceAdvancedOptions/index.ts b/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/NewWorkspaceAdvancedOptions/index.ts
deleted file mode 100644
index 3f121204833..00000000000
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/NewWorkspaceAdvancedOptions/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { NewWorkspaceAdvancedOptions } from "./NewWorkspaceAdvancedOptions";
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/NewWorkspaceCreateFlow/NewWorkspaceCreateFlow.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/NewWorkspaceCreateFlow/NewWorkspaceCreateFlow.tsx
deleted file mode 100644
index 3c557613840..00000000000
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/NewWorkspaceCreateFlow/NewWorkspaceCreateFlow.tsx
+++ /dev/null
@@ -1,138 +0,0 @@
-import {
-	STARTABLE_AGENT_LABELS,
-	type StartableAgentType,
-} from "@superset/shared/agent-launch";
-import { Button } from "@superset/ui/button";
-import { Kbd, KbdGroup } from "@superset/ui/kbd";
-import {
-	Select,
-	SelectContent,
-	SelectItem,
-	SelectTrigger,
-	SelectValue,
-} from "@superset/ui/select";
-import { Textarea } from "@superset/ui/textarea";
-import type { ReactNode, RefObject } from "react";
-import { GoGitBranch } from "react-icons/go";
-import {
-	getPresetIcon,
-	useIsDarkTheme,
-} from "renderer/assets/app-icons/preset-icons";
-import { useHotkeysStore } from "renderer/stores/hotkeys";
-
-export type WorkspaceCreateAgent = StartableAgentType | "none";
-
-interface NewWorkspaceCreateFlowProps {
-	projectSelector: ReactNode;
-	selectedAgent: WorkspaceCreateAgent;
-	agentOptions: readonly StartableAgentType[];
-	onSelectedAgentChange: (agent: WorkspaceCreateAgent) => void;
-	title: string;
-	onTitleChange: (value: string) => void;
-	titleInputRef: RefObject<HTMLTextAreaElement | null>;
-	showBranchPreview: boolean;
-	branchPreview: string;
-	effectiveBaseBranch: string | null;
-	onCreateWorkspace: () => void;
-	isCreateDisabled: boolean;
-	advancedOptions: ReactNode;
-}
-
-export function NewWorkspaceCreateFlow({
-	projectSelector,
-	selectedAgent,
-	agentOptions,
-	onSelectedAgentChange,
-	title,
-	onTitleChange,
-	titleInputRef,
-	showBranchPreview,
-	branchPreview,
-	effectiveBaseBranch,
-	onCreateWorkspace,
-	isCreateDisabled,
-	advancedOptions,
-}: NewWorkspaceCreateFlowProps) {
-	const isDark = useIsDarkTheme();
-	const platform = useHotkeysStore((state) => state.platform);
-	const modKey = platform === "darwin" || platform === undefined ? "⌘" : "Ctrl";
-
-	return (
-		<div className="space-y-3 min-w-0">
-			<div className="flex items-end gap-3 min-w-0">
-				<div className="flex-1 min-w-0">{projectSelector}</div>
-				<div className="shrink-0 max-w-[45%]">
-					<Select
-						value={selectedAgent}
-						onValueChange={(value: WorkspaceCreateAgent) =>
-							onSelectedAgentChange(value)
-						}
-					>
-						<SelectTrigger className="h-8 text-xs w-auto max-w-full">
-							<SelectValue placeholder="No agent" className="truncate" />
-						</SelectTrigger>
-						<SelectContent>
-							<SelectItem value="none">No agent</SelectItem>
-							{agentOptions.map((agent) => {
-								const icon = getPresetIcon(agent, isDark);
-								return (
-									<SelectItem key={agent} value={agent}>
-										<span className="flex items-center gap-2">
-											{icon && (
-												<img
-													src={icon}
-													alt=""
-													className="size-3.5 object-contain"
-												/>
-											)}
-											{STARTABLE_AGENT_LABELS[agent]}
-										</span>
-									</SelectItem>
-								);
-							})}
-						</SelectContent>
-					</Select>
-				</div>
-			</div>
-
-			<Textarea
-				ref={titleInputRef}
-				id="title"
-				className="min-h-20 min-w-0 w-full max-w-full field-sizing-fixed text-sm resize-y"
-				placeholder="What do you want to do?"
-				value={title}
-				onChange={(e) => onTitleChange(e.target.value)}
-			/>
-
-			{showBranchPreview && (
-				<p className="text-xs text-muted-foreground grid grid-cols-[auto_minmax(0,1fr)_auto] items-center gap-1.5 min-w-0">
-					<GoGitBranch className="size-3" />
-					<span className="font-mono min-w-0 truncate">
-						{branchPreview || "branch-name"}
-					</span>
-					<span className="text-muted-foreground/60 whitespace-nowrap">
-						from {effectiveBaseBranch ?? "..."}
-					</span>
-				</p>
-			)}
-
-			<Button
-				className="w-full h-8 text-sm"
-				onClick={onCreateWorkspace}
-				disabled={isCreateDisabled}
-			>
-				Create Workspace
-				<KbdGroup className="ml-1.5 opacity-70">
-					<Kbd className="bg-primary-foreground/15 text-primary-foreground h-4 min-w-4 text-[10px]">
-						{modKey}
-					</Kbd>
-					<Kbd className="bg-primary-foreground/15 text-primary-foreground h-4 min-w-4 text-[10px]">
-						↵
-					</Kbd>
-				</KbdGroup>
-			</Button>
-
-			{advancedOptions}
-		</div>
-	);
-}
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/NewWorkspaceCreateFlow/index.ts b/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/NewWorkspaceCreateFlow/index.ts
deleted file mode 100644
index dab133816da..00000000000
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/NewWorkspaceCreateFlow/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export {
-	NewWorkspaceCreateFlow,
-	type WorkspaceCreateAgent,
-} from "./NewWorkspaceCreateFlow";
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/NewWorkspaceHeader/NewWorkspaceHeader.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/NewWorkspaceHeader/NewWorkspaceHeader.tsx
deleted file mode 100644
index b1ff4b84899..00000000000
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/NewWorkspaceHeader/NewWorkspaceHeader.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import { Button } from "@superset/ui/button";
-import { DialogHeader, DialogTitle } from "@superset/ui/dialog";
-import { HiChevronLeft } from "react-icons/hi2";
-import { LuFolderOpen } from "react-icons/lu";
-
-interface NewWorkspaceHeaderProps {
-	mode: "new" | "existing";
-	hasSelectedProject: boolean;
-	onBackToNew: () => void;
-	onOpenImport: () => void;
-}
-
-export function NewWorkspaceHeader({
-	mode,
-	hasSelectedProject,
-	onBackToNew,
-	onOpenImport,
-}: NewWorkspaceHeaderProps) {
-	return (
-		<DialogHeader className="px-4 pt-4 pb-3 flex-row items-center justify-between space-y-0">
-			{hasSelectedProject && mode === "existing" && (
-				<Button
-					type="button"
-					variant="ghost"
-					size="sm"
-					className="h-7 px-2 text-xs"
-					onClick={onBackToNew}
-				>
-					<HiChevronLeft className="size-3.5" />
-					Back
-				</Button>
-			)}
-			<DialogTitle className={mode === "existing" ? "sr-only" : "text-base"}>
-				New Workspace
-			</DialogTitle>
-			{hasSelectedProject && mode === "new" && (
-				<Button
-					type="button"
-					variant="ghost"
-					size="sm"
-					className="h-7 px-2 text-xs"
-					onClick={onOpenImport}
-				>
-					<LuFolderOpen className="size-3.5" />
-					Import
-				</Button>
-			)}
-			{hasSelectedProject && mode === "existing" && (
-				<div className="h-7 w-[56px]" />
-			)}
-		</DialogHeader>
-	);
-}
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/NewWorkspaceHeader/index.ts b/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/NewWorkspaceHeader/index.ts
deleted file mode 100644
index b0f6f49bce1..00000000000
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/NewWorkspaceHeader/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { NewWorkspaceHeader } from "./NewWorkspaceHeader";
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ProjectSelector/ProjectSelector.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ProjectSelector/ProjectSelector.tsx
deleted file mode 100644
index f4629c821bd..00000000000
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ProjectSelector/ProjectSelector.tsx
+++ /dev/null
@@ -1,74 +0,0 @@
-import { Button } from "@superset/ui/button";
-import {
-	DropdownMenu,
-	DropdownMenuContent,
-	DropdownMenuItem,
-	DropdownMenuSeparator,
-	DropdownMenuTrigger,
-} from "@superset/ui/dropdown-menu";
-import { HiCheck, HiChevronDown } from "react-icons/hi2";
-import { LuFolderOpen } from "react-icons/lu";
-
-interface ProjectOption {
-	id: string;
-	name: string;
-}
-
-interface ProjectSelectorProps {
-	selectedProjectId: string | null;
-	selectedProjectName: string | null;
-	recentProjects: ProjectOption[];
-	onSelectProject: (projectId: string) => void;
-	onImportRepo: () => void;
-	className?: string;
-}
-
-export function ProjectSelector({
-	selectedProjectId,
-	selectedProjectName,
-	recentProjects,
-	onSelectProject,
-	onImportRepo,
-	className,
-}: ProjectSelectorProps) {
-	return (
-		<DropdownMenu>
-			<DropdownMenuTrigger asChild>
-				<Button
-					variant="outline"
-					className={`w-full h-8 text-sm justify-between font-normal min-w-0 ${className ?? ""}`}
-				>
-					<span
-						className={`truncate ${
-							selectedProjectName ? "" : "text-muted-foreground"
-						}`}
-					>
-						{selectedProjectName ?? "Select project"}
-					</span>
-					<HiChevronDown className="size-4 text-muted-foreground shrink-0" />
-				</Button>
-			</DropdownMenuTrigger>
-			<DropdownMenuContent
-				align="start"
-				className="w-[--radix-dropdown-menu-trigger-width]"
-			>
-				{recentProjects.map((project) => (
-					<DropdownMenuItem
-						key={project.id}
-						onClick={() => onSelectProject(project.id)}
-					>
-						{project.name}
-						{project.id === selectedProjectId && (
-							<HiCheck className="ml-auto size-4" />
-						)}
-					</DropdownMenuItem>
-				))}
-				<DropdownMenuSeparator />
-				<DropdownMenuItem onClick={onImportRepo}>
-					<LuFolderOpen className="size-4" />
-					Import repo
-				</DropdownMenuItem>
-			</DropdownMenuContent>
-		</DropdownMenu>
-	);
-}
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ProjectSelector/index.ts b/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ProjectSelector/index.ts
deleted file mode 100644
index a524b03c166..00000000000
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal.old/components/ProjectSelector/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { ProjectSelector } from "./ProjectSelector";
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal.old/index.ts b/apps/desktop/src/renderer/components/NewWorkspaceModal.old/index.ts
deleted file mode 100644
index 6267ce7fe48..00000000000
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal.old/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { NewWorkspaceModal } from "./NewWorkspaceModal";
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/NewWorkspaceModal.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal/NewWorkspaceModal.tsx
index 3a86a8aefed..84cef32ccf4 100644
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal/NewWorkspaceModal.tsx
+++ b/apps/desktop/src/renderer/components/NewWorkspaceModal/NewWorkspaceModal.tsx
@@ -1,10 +1,6 @@
-import {
-	CommandDialog,
-	CommandInput,
-	CommandList,
-} from "@superset/ui/command";
-import { Tabs, TabsList, TabsTrigger } from "@superset/ui/tabs";
+import { CommandDialog, CommandInput, CommandList } from "@superset/ui/command";
 import { toast } from "@superset/ui/sonner";
+import { Tabs, TabsList, TabsTrigger } from "@superset/ui/tabs";
 import { useNavigate } from "@tanstack/react-router";
 import { useEffect, useState } from "react";
 import { electronTrpc } from "renderer/lib/electron-trpc";
@@ -114,31 +110,22 @@ export function NewWorkspaceModal() {
 
 			<CommandList className="!max-h-none flex-1 overflow-y-auto">
 				{activeTab === "pull-requests" && (
-						<PullRequestsGroup
-							projectId={selectedProjectId}
-							githubOwner={selectedProject?.githubOwner ?? null}
-							repoName={selectedProject?.name ?? null}
-							onClose={closeModal}
-						/>
-					)}
+					<PullRequestsGroup
+						projectId={selectedProjectId}
+						githubOwner={selectedProject?.githubOwner ?? null}
+						repoName={selectedProject?.name ?? null}
+						onClose={closeModal}
+					/>
+				)}
 				{activeTab === "branches" && (
-						<BranchesGroup
-							projectId={selectedProjectId}
-							onClose={closeModal}
-						/>
-					)}
+					<BranchesGroup projectId={selectedProjectId} onClose={closeModal} />
+				)}
 				{activeTab === "issues" && (
-						<IssuesGroup
-							projectId={selectedProjectId}
-							onClose={closeModal}
-						/>
-					)}
+					<IssuesGroup projectId={selectedProjectId} onClose={closeModal} />
+				)}
 				{activeTab === "prompt" && (
-						<PromptGroup
-							projectId={selectedProjectId}
-							onClose={closeModal}
-						/>
-					)}
+					<PromptGroup projectId={selectedProjectId} onClose={closeModal} />
+				)}
 			</CommandList>
 		</CommandDialog>
 	);
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/BranchesGroup/BranchesGroup.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/BranchesGroup/BranchesGroup.tsx
index 65822b8811e..fc06dc34a61 100644
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/BranchesGroup/BranchesGroup.tsx
+++ b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/BranchesGroup/BranchesGroup.tsx
@@ -62,9 +62,7 @@ export function BranchesGroup({ projectId, onClose }: BranchesGroupProps) {
 					loading: "Creating workspace from branch...",
 					success: "Workspace created",
 					error: (err) =>
-						err instanceof Error
-							? err.message
-							: "Failed to create workspace",
+						err instanceof Error ? err.message : "Failed to create workspace",
 				},
 			);
 		},
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/IssuesGroup/IssuesGroup.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/IssuesGroup/IssuesGroup.tsx
index acfa6217638..d661488dec5 100644
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/IssuesGroup/IssuesGroup.tsx
+++ b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/IssuesGroup/IssuesGroup.tsx
@@ -2,22 +2,22 @@ import { Avatar } from "@superset/ui/atoms/Avatar";
 import { Button } from "@superset/ui/button";
 import { CommandEmpty, CommandGroup, CommandItem } from "@superset/ui/command";
 import { toast } from "@superset/ui/sonner";
+import { eq, isNull } from "@tanstack/db";
+import { useLiveQuery } from "@tanstack/react-db";
 import { useNavigate } from "@tanstack/react-router";
+import { useMemo } from "react";
 import { GoArrowUpRight } from "react-icons/go";
 import { HiOutlineUserCircle } from "react-icons/hi2";
 import { SiLinear } from "react-icons/si";
 import { GATED_FEATURES, usePaywall } from "renderer/components/Paywall";
-import { eq, isNull } from "@tanstack/db";
-import { useLiveQuery } from "@tanstack/react-db";
-import { useMemo } from "react";
 import { electronTrpc } from "renderer/lib/electron-trpc";
 import { getSlugColumnWidth } from "renderer/lib/slug-width";
 import { useCreateWorkspace } from "renderer/react-query/workspaces";
-import { useCollections } from "renderer/routes/_authenticated/providers/CollectionsProvider";
 import {
 	StatusIcon,
 	type StatusType,
 } from "renderer/routes/_authenticated/_dashboard/tasks/components/TasksView/components/shared/StatusIcon";
+import { useCollections } from "renderer/routes/_authenticated/providers/CollectionsProvider";
 
 interface IssuesGroupProps {
 	projectId: string | null;
@@ -49,13 +49,11 @@ export function IssuesGroup({ projectId, onClose }: IssuesGroupProps) {
 		(q) =>
 			q
 				.from({ tasks: collections.tasks })
-				.innerJoin(
-					{ status: collections.taskStatuses },
-					({ tasks, status }) => eq(tasks.statusId, status.id),
+				.innerJoin({ status: collections.taskStatuses }, ({ tasks, status }) =>
+					eq(tasks.statusId, status.id),
 				)
-				.leftJoin(
-					{ assignee: collections.users },
-					({ tasks, assignee }) => eq(tasks.assigneeId, assignee.id),
+				.leftJoin({ assignee: collections.users }, ({ tasks, assignee }) =>
+					eq(tasks.assigneeId, assignee.id),
 				)
 				.select(({ tasks, status, assignee }) => ({
 					...tasks,
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PromptGroup/PromptGroup.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PromptGroup/PromptGroup.tsx
index a9ef427c541..64babf1dbba 100644
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PromptGroup/PromptGroup.tsx
+++ b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PromptGroup/PromptGroup.tsx
@@ -114,9 +114,7 @@ export function PromptGroup({ projectId, onClose }: PromptGroupProps) {
 					projectId,
 					prompt: trimmedPrompt || undefined,
 				},
-				launchRequest
-					? { agentLaunchRequest: launchRequest }
-					: undefined,
+				launchRequest ? { agentLaunchRequest: launchRequest } : undefined,
 			),
 			{
 				loading: "Creating workspace...",
@@ -153,7 +151,9 @@ export function PromptGroup({ projectId, onClose }: PromptGroupProps) {
 												className="size-5 object-contain"
 											/>
 										)}
-										{agent === "superset-chat" ? "Superset" : STARTABLE_AGENT_LABELS[agent]}
+										{agent === "superset-chat"
+											? "Superset"
+											: STARTABLE_AGENT_LABELS[agent]}
 									</span>
 								</SelectItem>
 							);
@@ -176,10 +176,7 @@ export function PromptGroup({ projectId, onClose }: PromptGroupProps) {
 				}}
 			/>
 
-			<Button
-				className="w-full h-8 text-sm"
-				onClick={handleCreate}
-			>
+			<Button className="w-full h-8 text-sm" onClick={handleCreate}>
 				Create Workspace
 				<KbdGroup className="ml-1.5 opacity-70">
 					<Kbd className="bg-primary-foreground/15 text-primary-foreground h-4 min-w-4 text-[10px]">
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PullRequestsGroup/PullRequestsGroup.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PullRequestsGroup/PullRequestsGroup.tsx
index 1a60544edcc..2ab65b733c9 100644
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PullRequestsGroup/PullRequestsGroup.tsx
+++ b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PullRequestsGroup/PullRequestsGroup.tsx
@@ -5,10 +5,14 @@ import { and, eq } from "@tanstack/db";
 import { useLiveQuery } from "@tanstack/react-db";
 import { useNavigate } from "@tanstack/react-router";
 import { useMemo } from "react";
-import { GoArrowUpRight, GoGitPullRequest, GoGitPullRequestDraft } from "react-icons/go";
+import {
+	GoArrowUpRight,
+	GoGitPullRequest,
+	GoGitPullRequestDraft,
+} from "react-icons/go";
 import { SiGithub } from "react-icons/si";
-import { electronTrpc } from "renderer/lib/electron-trpc";
 import { GATED_FEATURES, usePaywall } from "renderer/components/Paywall";
+import { electronTrpc } from "renderer/lib/electron-trpc";
 import { useCreateFromPr } from "renderer/react-query/workspaces/useCreateFromPr";
 import { useCollections } from "renderer/routes/_authenticated/providers/CollectionsProvider";
 
@@ -54,9 +58,7 @@ export function PullRequestsGroup({
 		(q) =>
 			q
 				.from({ prs: collections.githubPullRequests })
-				.where(({ prs }) =>
-					eq(prs.repositoryId, githubRepositoryId ?? ""),
-				)
+				.where(({ prs }) => eq(prs.repositoryId, githubRepositoryId ?? ""))
 				.select(({ prs }) => ({ ...prs })),
 		[collections, githubRepositoryId],
 	);
@@ -75,10 +77,7 @@ export function PullRequestsGroup({
 	);
 
 	const openPrs = useMemo(
-		() =>
-			(pullRequests ?? [])
-				.filter((pr) => pr.state === "open")
-				.slice(0, 30),
+		() => (pullRequests ?? []).filter((pr) => pr.state === "open").slice(0, 30),
 		[pullRequests],
 	);
 
@@ -119,9 +118,7 @@ export function PullRequestsGroup({
 	if (!githubRepositoryId) {
 		return (
 			<CommandGroup>
-				<CommandEmpty>
-					No GitHub repository found.
-				</CommandEmpty>
+				<CommandEmpty>No GitHub repository found.</CommandEmpty>
 			</CommandGroup>
 		);
 	}
diff --git a/apps/desktop/src/renderer/react-query/workspaces/index.ts b/apps/desktop/src/renderer/react-query/workspaces/index.ts
index 2099ba1d4b6..ad53a5895ce 100644
--- a/apps/desktop/src/renderer/react-query/workspaces/index.ts
+++ b/apps/desktop/src/renderer/react-query/workspaces/index.ts
@@ -6,7 +6,6 @@ export { useDeleteWorkspace } from "./useDeleteWorkspace";
 export { useDeleteWorktree } from "./useDeleteWorktree";
 export { useImportAllWorktrees } from "./useImportAllWorktrees";
 export { useOpenExternalWorktree } from "./useOpenExternalWorktree";
-export { useOpenWorktree } from "./useOpenWorktree";
 export { useReorderWorkspaces } from "./useReorderWorkspaces";
 export { useUpdateWorkspace } from "./useUpdateWorkspace";
 export { useWorkspaceDeleteHandler } from "./useWorkspaceDeleteHandler";
diff --git a/apps/desktop/src/renderer/react-query/workspaces/useOpenWorktree.ts b/apps/desktop/src/renderer/react-query/workspaces/useOpenWorktree.ts
deleted file mode 100644
index 04239686dd6..00000000000
--- a/apps/desktop/src/renderer/react-query/workspaces/useOpenWorktree.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { toast } from "@superset/ui/sonner";
-import { useNavigate } from "@tanstack/react-router";
-import { useCreateOrAttachWithTheme } from "renderer/hooks/useCreateOrAttachWithTheme";
-import { electronTrpc } from "renderer/lib/electron-trpc";
-import { navigateToWorkspace } from "renderer/routes/_authenticated/_dashboard/utils/workspace-navigation";
-import { useTabsStore } from "renderer/stores/tabs/store";
-import { bootstrapOpenWorktree } from "./bootstrap-open-worktree";
-
-/**
- * Mutation hook for opening an existing worktree as a new workspace
- * Automatically invalidates all workspace queries on success
- * Creates a terminal tab with setup commands if present
- */
-export function useOpenWorktree(
-	options?: Parameters<
-		typeof electronTrpc.workspaces.openWorktree.useMutation
-	>[0],
-) {
-	const navigate = useNavigate();
-	const utils = electronTrpc.useUtils();
-	const addTab = useTabsStore((state) => state.addTab);
-	const setTabAutoTitle = useTabsStore((state) => state.setTabAutoTitle);
-	const createOrAttach = useCreateOrAttachWithTheme();
-	const writeToTerminal = electronTrpc.terminal.write.useMutation();
-
-	return electronTrpc.workspaces.openWorktree.useMutation({
-		...options,
-		onSuccess: async (data, ...rest) => {
-			await utils.workspaces.invalidate();
-			await utils.projects.getRecents.invalidate();
-
-			const bootstrapError = await bootstrapOpenWorktree({
-				data,
-				addTab,
-				setTabAutoTitle,
-				createOrAttach: (input) => createOrAttach.mutateAsync(input),
-				writeToTerminal: (input) => writeToTerminal.mutateAsync(input),
-			});
-			if (bootstrapError === "create_or_attach_failed") {
-				toast.error("Workspace opened, but terminal failed to start.");
-			}
-			if (bootstrapError === "write_initial_commands_failed") {
-				toast.error("Workspace opened, but setup command failed.");
-			}
-
-			navigateToWorkspace(data.workspace.id, navigate);
-
-			await options?.onSuccess?.(data, ...rest);
-		},
-	});
-}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/project/$projectId/components/ProjectSettings/ProjectSettings.tsx b/apps/desktop/src/renderer/routes/_authenticated/settings/project/$projectId/components/ProjectSettings/ProjectSettings.tsx
index d997e68e271..8f1f2559f78 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/settings/project/$projectId/components/ProjectSettings/ProjectSettings.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/settings/project/$projectId/components/ProjectSettings/ProjectSettings.tsx
@@ -419,9 +419,7 @@ export function ProjectSettings({ projectId }: ProjectSettingsProps) {
 					{!isExternalLoading && externalWorktrees.length > 0 && (
 						<div className="flex items-center justify-between">
 							<div className="space-y-0.5">
-								<Label className="text-sm font-medium">
-									Import Worktrees
-								</Label>
+								<Label className="text-sm font-medium">Import Worktrees</Label>
 								<p className="text-xs text-muted-foreground">
 									{externalWorktrees.length} external worktree
 									{externalWorktrees.length === 1 ? "" : "s"} found on disk.
@@ -431,9 +429,7 @@ export function ProjectSettings({ projectId }: ProjectSettingsProps) {
 								<Select
 									value={selectedWorktreePath ?? "__all__"}
 									onValueChange={(value) =>
-										setSelectedWorktreePath(
-											value === "__all__" ? null : value,
-										)
+										setSelectedWorktreePath(value === "__all__" ? null : value)
 									}
 								>
 									<SelectTrigger className="w-[220px]">
@@ -465,9 +461,7 @@ export function ProjectSettings({ projectId }: ProjectSettingsProps) {
 											}
 										}}
 									>
-										{openExternalWorktree.isPending
-											? "Importing..."
-											: "Import"}
+										{openExternalWorktree.isPending ? "Importing..." : "Import"}
 									</Button>
 								) : (
 									<AlertDialog>
@@ -491,9 +485,9 @@ export function ProjectSettings({ projectId }: ProjectSettingsProps) {
 													This will import {externalWorktrees.length} external
 													worktree
 													{externalWorktrees.length === 1 ? "" : "s"} into
-													Superset as workspaces. Each worktree on disk will
-													be tracked and appear in your sidebar. No files will
-													be modified.
+													Superset as workspaces. Each worktree on disk will be
+													tracked and appear in your sidebar. No files will be
+													modified.
 												</AlertDialogDescription>
 											</AlertDialogHeader>
 											<AlertDialogFooter>

From 483cb63dc3ee2e4381c168bde231b0db31548b2e Mon Sep 17 00:00:00 2001
From: Satya Patel <satyapatel111@gmail.com>
Date: Fri, 6 Mar 2026 20:30:31 -0800
Subject: [PATCH 8/9] chore: fix lint

---
 .../TasksView/hooks/useTasksTable/useTasksTable.tsx  |  2 +-
 .../useOrderedSections/useOrderedSections.test.tsx   | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/tasks/components/TasksView/hooks/useTasksTable/useTasksTable.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/tasks/components/TasksView/hooks/useTasksTable/useTasksTable.tsx
index 11322e050a1..33e5fe33250 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/tasks/components/TasksView/hooks/useTasksTable/useTasksTable.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/tasks/components/TasksView/hooks/useTasksTable/useTasksTable.tsx
@@ -22,8 +22,8 @@ import {
 import { format } from "date-fns";
 import { useEffect, useMemo, useRef, useState } from "react";
 import { HiChevronRight } from "react-icons/hi2";
-import { useCollections } from "renderer/routes/_authenticated/providers/CollectionsProvider";
 import { getSlugColumnWidth } from "renderer/lib/slug-width";
+import { useCollections } from "renderer/routes/_authenticated/providers/CollectionsProvider";
 import { create } from "zustand";
 import {
 	StatusIcon,
diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/RightSidebar/ChangesView/hooks/useOrderedSections/useOrderedSections.test.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/RightSidebar/ChangesView/hooks/useOrderedSections/useOrderedSections.test.tsx
index d3427e7061e..a4698a23af2 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/RightSidebar/ChangesView/hooks/useOrderedSections/useOrderedSections.test.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/RightSidebar/ChangesView/hooks/useOrderedSections/useOrderedSections.test.tsx
@@ -77,7 +77,9 @@ describe("useOrderedSections", () => {
 			],
 		});
 
-		const committedSection = sections.find((section) => section.id === "committed");
+		const committedSection = sections.find(
+			(section) => section.id === "committed",
+		);
 
 		expect(committedSection).toBeDefined();
 		expect(committedSection?.count).toBe(1);
@@ -91,8 +93,12 @@ describe("useOrderedSections", () => {
 			unstagedFiles: [emptyFile(), emptyFile(), emptyFile()],
 		});
 
-		expect(sections.find((section) => section.id === "against-base")?.count).toBe(1);
+		expect(
+			sections.find((section) => section.id === "against-base")?.count,
+		).toBe(1);
 		expect(sections.find((section) => section.id === "staged")?.count).toBe(2);
-		expect(sections.find((section) => section.id === "unstaged")?.count).toBe(3);
+		expect(sections.find((section) => section.id === "unstaged")?.count).toBe(
+			3,
+		);
 	});
 });

From cfe6b2d82769cb042817a4c95e01a7a8afa21a84 Mon Sep 17 00:00:00 2001
From: Satya Patel <satyapatel111@gmail.com>
Date: Fri, 6 Mar 2026 20:45:32 -0800
Subject: [PATCH 9/9] fix(desktop): address PR review P1s

- IssuesGroup/PullRequestsGroup: navigate to existing workspace on "Open" instead of creating duplicate
- PromptGroup: fix Ctrl+Enter shortcut on Windows/Linux (was only checking metaKey)
- GitHub sync: add organizationId to onConflictDoUpdate for PR upserts across initial-sync, sync, and webhooks
---
 .../app/api/github/jobs/initial-sync/route.ts |  1 +
 apps/api/src/app/api/github/sync/route.ts     |  1 +
 .../src/app/api/github/webhook/webhooks.ts    |  1 +
 .../components/IssuesGroup/IssuesGroup.tsx    | 30 ++++++++++++-------
 .../components/PromptGroup/PromptGroup.tsx    |  2 +-
 .../PullRequestsGroup/PullRequestsGroup.tsx   | 29 +++++++++++-------
 6 files changed, 41 insertions(+), 23 deletions(-)

diff --git a/apps/api/src/app/api/github/jobs/initial-sync/route.ts b/apps/api/src/app/api/github/jobs/initial-sync/route.ts
index 4b3b5a843dd..8c91160da5e 100644
--- a/apps/api/src/app/api/github/jobs/initial-sync/route.ts
+++ b/apps/api/src/app/api/github/jobs/initial-sync/route.ts
@@ -216,6 +216,7 @@ export async function POST(request: Request) {
 							githubPullRequests.prNumber,
 						],
 						set: {
+							organizationId: dbRepo.organizationId,
 							headSha: pr.head.sha,
 							title: pr.title,
 							state: pr.state,
diff --git a/apps/api/src/app/api/github/sync/route.ts b/apps/api/src/app/api/github/sync/route.ts
index 644fa3d5857..8d45397040b 100644
--- a/apps/api/src/app/api/github/sync/route.ts
+++ b/apps/api/src/app/api/github/sync/route.ts
@@ -188,6 +188,7 @@ export async function POST(request: Request) {
 							githubPullRequests.prNumber,
 						],
 						set: {
+							organizationId: dbRepo.organizationId,
 							headSha: pr.head.sha,
 							title: pr.title,
 							state: pr.state,
diff --git a/apps/api/src/app/api/github/webhook/webhooks.ts b/apps/api/src/app/api/github/webhook/webhooks.ts
index 88c9ee78a0b..aa3cfea6b9f 100644
--- a/apps/api/src/app/api/github/webhook/webhooks.ts
+++ b/apps/api/src/app/api/github/webhook/webhooks.ts
@@ -181,6 +181,7 @@ webhooks.on(
 			.onConflictDoUpdate({
 				target: [githubPullRequests.repositoryId, githubPullRequests.prNumber],
 				set: {
+					organizationId: repo.organizationId,
 					headBranch: pr.head.ref,
 					headSha: pr.head.sha,
 					baseBranch: pr.base.ref,
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/IssuesGroup/IssuesGroup.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/IssuesGroup/IssuesGroup.tsx
index d661488dec5..677f0a51821 100644
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/IssuesGroup/IssuesGroup.tsx
+++ b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/IssuesGroup/IssuesGroup.tsx
@@ -17,6 +17,7 @@ import {
 	StatusIcon,
 	type StatusType,
 } from "renderer/routes/_authenticated/_dashboard/tasks/components/TasksView/components/shared/StatusIcon";
+import { navigateToWorkspace } from "renderer/routes/_authenticated/_dashboard/utils/workspace-navigation";
 import { useCollections } from "renderer/routes/_authenticated/providers/CollectionsProvider";
 
 interface IssuesGroupProps {
@@ -67,15 +68,15 @@ export function IssuesGroup({ projectId, onClose }: IssuesGroupProps) {
 	const { data: allWorkspaces = [] } =
 		electronTrpc.workspaces.getAll.useQuery();
 
-	const openBranches = useMemo(
-		() =>
-			new Set(
-				allWorkspaces
-					.filter((w) => w.projectId === projectId)
-					.map((w) => w.branch),
-			),
-		[allWorkspaces, projectId],
-	);
+	const workspaceByBranch = useMemo(() => {
+		const map = new Map<string, string>();
+		for (const w of allWorkspaces) {
+			if (w.projectId === projectId) {
+				map.set(w.branch, w.id);
+			}
+		}
+		return map;
+	}, [allWorkspaces, projectId]);
 
 	const tasks = useMemo(() => data ?? [], [data]);
 
@@ -122,6 +123,12 @@ export function IssuesGroup({ projectId, onClose }: IssuesGroupProps) {
 							toast.error("Select a project first");
 							return;
 						}
+						const existingId = workspaceByBranch.get(task.slug.toLowerCase());
+						if (existingId) {
+							onClose();
+							navigateToWorkspace(existingId, navigate);
+							return;
+						}
 						onClose();
 						toast.promise(
 							createWorkspace.mutateAsync({
@@ -141,7 +148,7 @@ export function IssuesGroup({ projectId, onClose }: IssuesGroupProps) {
 					}}
 					className="group h-12"
 				>
-					{openBranches.has(task.slug.toLowerCase()) ? (
+					{workspaceByBranch.has(task.slug.toLowerCase()) ? (
 						<GoArrowUpRight className="size-4 shrink-0 text-muted-foreground" />
 					) : (
 						<StatusIcon
@@ -170,7 +177,8 @@ export function IssuesGroup({ projectId, onClose }: IssuesGroupProps) {
 						)}
 					</span>
 					<span className="text-xs text-muted-foreground shrink-0 hidden group-data-[selected=true]:inline">
-						{openBranches.has(task.slug.toLowerCase()) ? "Open" : "Create"} ↵
+						{workspaceByBranch.has(task.slug.toLowerCase()) ? "Open" : "Create"}{" "}
+						↵
 					</span>
 				</CommandItem>
 			))}
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PromptGroup/PromptGroup.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PromptGroup/PromptGroup.tsx
index 64babf1dbba..821a78f67a8 100644
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PromptGroup/PromptGroup.tsx
+++ b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PromptGroup/PromptGroup.tsx
@@ -169,7 +169,7 @@ export function PromptGroup({ projectId, onClose }: PromptGroupProps) {
 				value={prompt}
 				onChange={(e) => setPrompt(e.target.value)}
 				onKeyDown={(e) => {
-					if (e.key === "Enter" && e.metaKey) {
+					if (e.key === "Enter" && (e.metaKey || e.ctrlKey)) {
 						e.preventDefault();
 						handleCreate();
 					}
diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PullRequestsGroup/PullRequestsGroup.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PullRequestsGroup/PullRequestsGroup.tsx
index 2ab65b733c9..9169d3304b7 100644
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PullRequestsGroup/PullRequestsGroup.tsx
+++ b/apps/desktop/src/renderer/components/NewWorkspaceModal/components/PullRequestsGroup/PullRequestsGroup.tsx
@@ -14,6 +14,7 @@ import { SiGithub } from "react-icons/si";
 import { GATED_FEATURES, usePaywall } from "renderer/components/Paywall";
 import { electronTrpc } from "renderer/lib/electron-trpc";
 import { useCreateFromPr } from "renderer/react-query/workspaces/useCreateFromPr";
+import { navigateToWorkspace } from "renderer/routes/_authenticated/_dashboard/utils/workspace-navigation";
 import { useCollections } from "renderer/routes/_authenticated/providers/CollectionsProvider";
 
 interface PullRequestsGroupProps {
@@ -66,15 +67,15 @@ export function PullRequestsGroup({
 	const { data: allWorkspaces = [] } =
 		electronTrpc.workspaces.getAll.useQuery();
 
-	const openBranches = useMemo(
-		() =>
-			new Set(
-				allWorkspaces
-					.filter((w) => w.projectId === projectId)
-					.map((w) => w.branch),
-			),
-		[allWorkspaces, projectId],
-	);
+	const workspaceByBranch = useMemo(() => {
+		const map = new Map<string, string>();
+		for (const w of allWorkspaces) {
+			if (w.projectId === projectId) {
+				map.set(w.branch, w.id);
+			}
+		}
+		return map;
+	}, [allWorkspaces, projectId]);
 
 	const openPrs = useMemo(
 		() => (pullRequests ?? []).filter((pr) => pr.state === "open").slice(0, 30),
@@ -135,6 +136,12 @@ export function PullRequestsGroup({
 							toast.error("Select a project first");
 							return;
 						}
+						const existingId = workspaceByBranch.get(pr.headBranch);
+						if (existingId) {
+							onClose();
+							navigateToWorkspace(existingId, navigate);
+							return;
+						}
 						onClose();
 						toast.promise(
 							createFromPr.mutateAsync({
@@ -153,7 +160,7 @@ export function PullRequestsGroup({
 					}}
 					className="group h-12"
 				>
-					{openBranches.has(pr.headBranch) ? (
+					{workspaceByBranch.has(pr.headBranch) ? (
 						<GoArrowUpRight className="size-4 shrink-0 text-muted-foreground" />
 					) : pr.isDraft ? (
 						<GoGitPullRequestDraft className="size-4 shrink-0 text-muted-foreground" />
@@ -171,7 +178,7 @@ export function PullRequestsGroup({
 						{pr.authorLogin}
 					</span>
 					<span className="text-xs text-muted-foreground shrink-0 hidden group-data-[selected=true]:inline">
-						{openBranches.has(pr.headBranch) ? "Open" : "Create"} ↵
+						{workspaceByBranch.has(pr.headBranch) ? "Open" : "Create"} ↵
 					</span>
 				</CommandItem>
 			))}