diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index e6fbd6cbc5b..72c3b46032c 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -72,7 +72,7 @@
 		"@hookform/resolvers": "^5.2.2",
 		"@lezer/highlight": "^1.2.3",
 		"@parcel/watcher": "^2.5.6",
-		"@pierre/diffs": "1.1.7",
+		"@pierre/diffs": "1.1.3",
 		"@radix-ui/react-dialog": "^1.1.15",
 		"@radix-ui/react-label": "^2.1.8",
 		"@sentry/electron": "^7.7.0",
@@ -84,7 +84,7 @@
 		"@superset/host-service": "workspace:*",
 		"@superset/local-db": "workspace:*",
 		"@superset/macos-process-metrics": "workspace:*",
-		"@superset/pane-layout": "workspace:*",
+		"@superset/panes": "workspace:*",
 		"@superset/shared": "workspace:*",
 		"@superset/trpc": "workspace:*",
 		"@superset/ui": "workspace:*",
diff --git a/apps/desktop/src/main/host-service/index.ts b/apps/desktop/src/main/host-service/index.ts
index 56da823a9d2..484f661fb54 100644
--- a/apps/desktop/src/main/host-service/index.ts
+++ b/apps/desktop/src/main/host-service/index.ts
@@ -21,6 +21,7 @@ const dbPath = process.env.HOST_DB_PATH;
 const deviceClientId = process.env.DEVICE_CLIENT_ID;
 const deviceName = process.env.DEVICE_NAME;
 const hostServiceSecret = process.env.HOST_SERVICE_SECRET;
+const desktopVitePort = process.env.DESKTOP_VITE_PORT ?? "5173";
 
 const auth =
 	authToken && cloudApiUrl ? new JwtApiAuthProvider(authToken) : undefined;
@@ -36,7 +37,10 @@ const { app, injectWebSocket } = createApp({
 	dbPath,
 	deviceClientId,
 	deviceName,
-	allowedOrigins: ["http://127.0.0.1"],
+	allowedOrigins: [
+		`http://localhost:${desktopVitePort}`,
+		`http://127.0.0.1:${desktopVitePort}`,
+	],
 });
 
 const server = serve(
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/AddTabMenu/AddTabMenu.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/AddTabMenu/AddTabMenu.tsx
new file mode 100644
index 00000000000..7ae3dd2e50b
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/AddTabMenu/AddTabMenu.tsx
@@ -0,0 +1,52 @@
+import {
+	DropdownMenuCheckboxItem,
+	DropdownMenuItem,
+	DropdownMenuSeparator,
+} from "@superset/ui/dropdown-menu";
+import { BsTerminalPlus } from "react-icons/bs";
+import { TbMessageCirclePlus, TbWorld } from "react-icons/tb";
+import { HotkeyMenuShortcut } from "renderer/components/HotkeyMenuShortcut";
+
+interface AddTabMenuProps {
+	onAddTerminal: () => void;
+	onAddChat: () => void;
+	onAddBrowser: () => void;
+	showPresetsBar: boolean;
+	onTogglePresetsBar: (enabled: boolean) => void;
+}
+
+export function AddTabMenu({
+	onAddTerminal,
+	onAddChat,
+	onAddBrowser,
+	showPresetsBar,
+	onTogglePresetsBar,
+}: AddTabMenuProps) {
+	return (
+		<>
+			<DropdownMenuItem className="gap-2" onClick={onAddTerminal}>
+				<BsTerminalPlus className="size-4" />
+				<span>Terminal</span>
+				<HotkeyMenuShortcut hotkeyId="NEW_GROUP" />
+			</DropdownMenuItem>
+			<DropdownMenuItem className="gap-2" onClick={onAddChat}>
+				<TbMessageCirclePlus className="size-4" />
+				<span>Chat</span>
+				<HotkeyMenuShortcut hotkeyId="NEW_CHAT" />
+			</DropdownMenuItem>
+			<DropdownMenuItem className="gap-2" onClick={onAddBrowser}>
+				<TbWorld className="size-4" />
+				<span>Browser</span>
+				<HotkeyMenuShortcut hotkeyId="NEW_BROWSER" />
+			</DropdownMenuItem>
+			<DropdownMenuSeparator />
+			<DropdownMenuCheckboxItem
+				checked={showPresetsBar}
+				onCheckedChange={(checked) => onTogglePresetsBar(checked === true)}
+				onSelect={(event) => event.preventDefault()}
+			>
+				Show Preset Bar
+			</DropdownMenuCheckboxItem>
+		</>
+	);
+}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/AddTabMenu/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/AddTabMenu/index.ts
new file mode 100644
index 00000000000..212f4c1e26b
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/AddTabMenu/index.ts
@@ -0,0 +1 @@
+export { AddTabMenu } from "./AddTabMenu";
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/PaneViewer/PaneViewer.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/PaneViewer/PaneViewer.tsx
deleted file mode 100644
index ba1d4d82cca..00000000000
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/PaneViewer/PaneViewer.tsx
+++ /dev/null
@@ -1,329 +0,0 @@
-import {
-	createPaneRoot,
-	type PaneRegistry,
-	PaneWorkspace,
-} from "@superset/pane-layout";
-import {
-	DropdownMenuCheckboxItem,
-	DropdownMenuItem,
-	DropdownMenuSeparator,
-} from "@superset/ui/dropdown-menu";
-import { useNavigate } from "@tanstack/react-router";
-import { FileCode2, Globe, MessageSquare, TerminalSquare } from "lucide-react";
-import { useCallback, useMemo } from "react";
-import { BsTerminalPlus } from "react-icons/bs";
-import { TbMessageCirclePlus, TbWorld } from "react-icons/tb";
-import { HotkeyMenuShortcut } from "renderer/components/HotkeyMenuShortcut";
-import { electronTrpc } from "renderer/lib/electron-trpc";
-import { WorkspaceChat } from "renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat";
-import { WorkspaceFilePreview } from "renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceFiles/components/WorkspaceFilePreview/WorkspaceFilePreview";
-import { WorkspaceTerminal } from "renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceTerminal";
-import {
-	CommandPalette,
-	useCommandPalette,
-} from "renderer/screens/main/components/CommandPalette";
-import { PresetsBar } from "renderer/screens/main/components/WorkspaceView/ContentView/components/PresetsBar";
-import { useAppHotkey } from "renderer/stores/hotkeys";
-import { DEFAULT_SHOW_PRESETS_BAR } from "shared/constants";
-import { PaneViewerEmptyState } from "./components/PaneViewerEmptyState";
-import { useV2WorkspacePaneLayout } from "./hooks/useV2WorkspacePaneLayout";
-import {
-	type BrowserPaneData,
-	type ChatPaneData,
-	createBrowserPane,
-	createChatPane,
-	createFilePane,
-	createTerminalPane,
-	type DevtoolsPaneData,
-	type FilePaneData,
-	type PaneViewerData,
-	type TerminalPaneData,
-} from "./pane-viewer.model";
-
-interface PaneViewerProps {
-	projectId: string;
-	workspaceId: string;
-	workspaceName: string;
-}
-
-function getFileTitle(filePath: string): string {
-	return filePath.split("/").pop() ?? filePath;
-}
-
-export function PaneViewer({
-	projectId,
-	workspaceId,
-	workspaceName,
-}: PaneViewerProps) {
-	const navigate = useNavigate();
-	const { store } = useV2WorkspacePaneLayout({
-		projectId,
-		workspaceId,
-	});
-	const utils = electronTrpc.useUtils();
-	const { data: showPresetsBar } =
-		electronTrpc.settings.getShowPresetsBar.useQuery();
-	const setShowPresetsBar = electronTrpc.settings.setShowPresetsBar.useMutation(
-		{
-			onMutate: async ({ enabled }) => {
-				await utils.settings.getShowPresetsBar.cancel();
-				const previous = utils.settings.getShowPresetsBar.getData();
-				utils.settings.getShowPresetsBar.setData(undefined, enabled);
-				return { previous };
-			},
-			onError: (_error, _variables, context) => {
-				if (context?.previous !== undefined) {
-					utils.settings.getShowPresetsBar.setData(undefined, context.previous);
-				}
-			},
-			onSettled: () => {
-				utils.settings.getShowPresetsBar.invalidate();
-			},
-		},
-	);
-
-	const openFilePane = useCallback(
-		(filePath: string) => {
-			const pane = createFilePane({
-				title: getFileTitle(filePath),
-				filePath,
-				mode: "editor",
-				hasChanges: false,
-			});
-			const activePane = store.getState().getActivePane();
-
-			if (activePane) {
-				store.getState().addPaneToGroup({
-					rootId: activePane.rootId,
-					groupId: activePane.groupId,
-					pane,
-					replaceUnpinned: true,
-					select: true,
-				});
-				return;
-			}
-
-			store.getState().addRoot(
-				createPaneRoot({
-					titleOverride: "Files",
-					panes: [pane],
-				}),
-			);
-		},
-		[store],
-	);
-
-	const addTerminalRoot = useCallback(() => {
-		store.getState().addRoot(
-			createPaneRoot({
-				titleOverride: "Terminal",
-				panes: [
-					createTerminalPane({
-						title: "Terminal",
-						sessionKey: `${workspaceId}:${crypto.randomUUID()}`,
-						cwd: `/workspace/${workspaceName}`,
-						launchMode: "workspace-shell",
-					}),
-				],
-			}),
-		);
-	}, [store, workspaceId, workspaceName]);
-
-	const addChatRoot = useCallback(() => {
-		store.getState().addRoot(
-			createPaneRoot({
-				titleOverride: "Chat",
-				panes: [
-					createChatPane({
-						title: "Chat",
-						sessionId: null,
-					}),
-				],
-			}),
-		);
-	}, [store]);
-
-	const addBrowserRoot = useCallback(() => {
-		store.getState().addRoot(
-			createPaneRoot({
-				titleOverride: "Browser",
-				panes: [
-					createBrowserPane({
-						title: "Browser",
-						url: "http://localhost:3000",
-						mode: "preview",
-					}),
-				],
-			}),
-		);
-	}, [store]);
-
-	const commandPalette = useCommandPalette({
-		workspaceId,
-		navigate,
-		onSelectFile: ({ close, filePath, targetWorkspaceId }) => {
-			close();
-
-			if (targetWorkspaceId !== workspaceId) {
-				void navigate({
-					to: "/v2-workspace/$workspaceId",
-					params: { workspaceId: targetWorkspaceId },
-				});
-				return;
-			}
-
-			openFilePane(filePath);
-		},
-	});
-
-	const handleQuickOpen = useCallback(() => {
-		commandPalette.toggle();
-	}, [commandPalette]);
-	const setPaneData = store.getState().setPaneData;
-
-	const paneRegistry = useMemo<PaneRegistry<PaneViewerData>>(
-		() => ({
-			file: {
-				getIcon: () => <FileCode2 className="size-4" />,
-				renderPane: ({ pane }) => {
-					const data = pane.data as FilePaneData;
-
-					return (
-						<WorkspaceFilePreview
-							selectedFilePath={data.filePath}
-							workspaceId={workspaceId}
-						/>
-					);
-				},
-			},
-			terminal: {
-				getIcon: () => <TerminalSquare className="size-4" />,
-				renderPane: ({ pane }) => {
-					const _data = pane.data as TerminalPaneData;
-					return <WorkspaceTerminal workspaceId={workspaceId} />;
-				},
-			},
-			browser: {
-				getIcon: () => <Globe className="size-4" />,
-				renderPane: ({ pane }) => {
-					const data = pane.data as BrowserPaneData;
-
-					return (
-						<iframe
-							className="h-full w-full border-0 bg-background"
-							src={data.url}
-							title={pane.titleOverride ?? "Browser"}
-						/>
-					);
-				},
-			},
-			chat: {
-				getIcon: () => <MessageSquare className="size-4" />,
-				renderPane: ({ pane }) => {
-					const data = pane.data as ChatPaneData;
-					return (
-						<WorkspaceChat
-							onSessionIdChange={(sessionId) =>
-								setPaneData({
-									paneId: pane.id,
-									data: { sessionId },
-								})
-							}
-							sessionId={data.sessionId}
-							workspaceId={workspaceId}
-						/>
-					);
-				},
-			},
-			devtools: {
-				renderPane: ({ pane }) => {
-					const data = pane.data as DevtoolsPaneData;
-
-					return (
-						<div className="flex h-full items-center justify-center text-sm text-muted-foreground">
-							Inspecting {data.targetTitle}
-						</div>
-					);
-				},
-			},
-		}),
-		[setPaneData, workspaceId],
-	);
-
-	useAppHotkey("NEW_GROUP", addTerminalRoot, undefined, [addTerminalRoot]);
-	useAppHotkey("NEW_CHAT", addChatRoot, undefined, [addChatRoot]);
-	useAppHotkey("NEW_BROWSER", addBrowserRoot, undefined, [addBrowserRoot]);
-	useAppHotkey("QUICK_OPEN", handleQuickOpen, undefined, [handleQuickOpen]);
-
-	return (
-		<>
-			<div
-				className="flex min-h-0 min-w-0 flex-1 flex-col overflow-hidden"
-				data-workspace-id={workspaceId}
-			>
-				{(showPresetsBar ?? DEFAULT_SHOW_PRESETS_BAR) ? <PresetsBar /> : null}
-				<PaneWorkspace
-					className="rounded-none border-0"
-					onAddRoot={addTerminalRoot}
-					registry={paneRegistry}
-					renderAddRootMenu={() => (
-						<>
-							<DropdownMenuItem className="gap-2" onClick={addTerminalRoot}>
-								<BsTerminalPlus className="size-4" />
-								<span>Terminal</span>
-								<HotkeyMenuShortcut hotkeyId="NEW_GROUP" />
-							</DropdownMenuItem>
-							<DropdownMenuItem className="gap-2" onClick={addChatRoot}>
-								<TbMessageCirclePlus className="size-4" />
-								<span>Chat</span>
-								<HotkeyMenuShortcut hotkeyId="NEW_CHAT" />
-							</DropdownMenuItem>
-							<DropdownMenuItem className="gap-2" onClick={addBrowserRoot}>
-								<TbWorld className="size-4" />
-								<span>Browser</span>
-								<HotkeyMenuShortcut hotkeyId="NEW_BROWSER" />
-							</DropdownMenuItem>
-							<DropdownMenuSeparator />
-							<DropdownMenuCheckboxItem
-								checked={showPresetsBar ?? DEFAULT_SHOW_PRESETS_BAR}
-								onCheckedChange={(checked) =>
-									setShowPresetsBar.mutate({ enabled: checked === true })
-								}
-								onSelect={(event) => event.preventDefault()}
-							>
-								Show Preset Bar
-							</DropdownMenuCheckboxItem>
-						</>
-					)}
-					renderEmptyState={() => (
-						<PaneViewerEmptyState
-							onOpenBrowser={addBrowserRoot}
-							onOpenChat={addChatRoot}
-							onOpenQuickOpen={handleQuickOpen}
-							onOpenTerminal={addTerminalRoot}
-						/>
-					)}
-					store={store}
-				/>
-			</div>
-			<CommandPalette
-				excludePattern={commandPalette.excludePattern}
-				filtersOpen={commandPalette.filtersOpen}
-				includePattern={commandPalette.includePattern}
-				isLoading={commandPalette.isFetching}
-				onExcludePatternChange={commandPalette.setExcludePattern}
-				onFiltersOpenChange={commandPalette.setFiltersOpen}
-				onIncludePatternChange={commandPalette.setIncludePattern}
-				onOpenChange={commandPalette.handleOpenChange}
-				onQueryChange={commandPalette.setQuery}
-				onScopeChange={commandPalette.setScope}
-				onSelectFile={commandPalette.selectFile}
-				open={commandPalette.open}
-				query={commandPalette.query}
-				scope={commandPalette.scope}
-				searchResults={commandPalette.searchResults}
-				workspaceName={workspaceName}
-			/>
-		</>
-	);
-}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/PaneViewer/components/PaneViewerEmptyState/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/PaneViewer/components/PaneViewerEmptyState/index.ts
deleted file mode 100644
index c04838161da..00000000000
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/PaneViewer/components/PaneViewerEmptyState/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { PaneViewerEmptyState } from "./PaneViewerEmptyState";
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/PaneViewer/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/PaneViewer/index.ts
deleted file mode 100644
index 0bf32100f61..00000000000
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/PaneViewer/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { PaneViewer } from "./PaneViewer";
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/PaneViewer/pane-viewer.model.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/PaneViewer/pane-viewer.model.ts
deleted file mode 100644
index b5584f900b2..00000000000
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/PaneViewer/pane-viewer.model.ts
+++ /dev/null
@@ -1,155 +0,0 @@
-import { createPane, type PaneState } from "@superset/pane-layout";
-
-export interface FilePaneData {
-	filePath: string;
-	mode: "editor" | "diff" | "preview";
-	hasChanges: boolean;
-	language?: string;
-}
-
-export interface TerminalPaneData {
-	sessionKey: string;
-	cwd: string;
-	launchMode: "workspace-shell" | "command" | "agent";
-	command?: string;
-}
-
-export interface ChatPaneData {
-	sessionId: string | null;
-}
-
-export interface BrowserPaneData {
-	url: string;
-	mode: "docs" | "preview" | "generic";
-}
-
-export interface DevtoolsPaneData {
-	targetPaneId: string;
-	targetTitle: string;
-}
-
-export type PaneViewerData =
-	| FilePaneData
-	| TerminalPaneData
-	| ChatPaneData
-	| BrowserPaneData
-	| DevtoolsPaneData;
-
-export function createFilePane({
-	title,
-	filePath,
-	mode,
-	hasChanges,
-	language,
-	pinned,
-}: {
-	title: string;
-	filePath: string;
-	mode: FilePaneData["mode"];
-	hasChanges: boolean;
-	language?: string;
-	pinned?: boolean;
-}): PaneState<PaneViewerData> {
-	return createPane({
-		kind: "file",
-		titleOverride: title,
-		pinned,
-		data: {
-			filePath,
-			mode,
-			hasChanges,
-			language,
-		},
-	});
-}
-
-export function createTerminalPane({
-	title,
-	sessionKey,
-	cwd,
-	launchMode,
-	command,
-	pinned = true,
-}: {
-	title: string;
-	sessionKey: string;
-	cwd: string;
-	launchMode: TerminalPaneData["launchMode"];
-	command?: string;
-	pinned?: boolean;
-}): PaneState<PaneViewerData> {
-	return createPane({
-		kind: "terminal",
-		titleOverride: title,
-		pinned,
-		data: {
-			sessionKey,
-			cwd,
-			launchMode,
-			command,
-		},
-	});
-}
-
-export function createBrowserPane({
-	title,
-	url,
-	mode,
-	pinned = true,
-}: {
-	title: string;
-	url: string;
-	mode: BrowserPaneData["mode"];
-	pinned?: boolean;
-}): PaneState<PaneViewerData> {
-	return createPane({
-		kind: "browser",
-		titleOverride: title,
-		pinned,
-		data: {
-			url,
-			mode,
-		},
-	});
-}
-
-export function createChatPane({
-	title,
-	sessionId,
-	pinned = true,
-}: {
-	title: string;
-	sessionId: string | null;
-	pinned?: boolean;
-}): PaneState<PaneViewerData> {
-	return createPane({
-		kind: "chat",
-		titleOverride: title,
-		pinned,
-		data: {
-			sessionId,
-		},
-	});
-}
-
-export function createDevtoolsPane({
-	title,
-	targetPaneId,
-	targetTitle,
-	pinned = true,
-}: {
-	title: string;
-	targetPaneId: string;
-	targetTitle: string;
-	pinned?: boolean;
-}): PaneState<PaneViewerData> {
-	return createPane({
-		kind: "devtools",
-		titleOverride: title,
-		pinned,
-		data: {
-			targetPaneId,
-			targetTitle,
-		},
-	});
-}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/index.ts
deleted file mode 100644
index a1993ea0215..00000000000
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { WorkspaceChat } from "./WorkspaceChat";
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/PaneViewer/components/PaneViewerEmptyState/PaneViewerEmptyState.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceEmptyState/WorkspaceEmptyState.tsx
similarity index 92%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/PaneViewer/components/PaneViewerEmptyState/PaneViewerEmptyState.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceEmptyState/WorkspaceEmptyState.tsx
index d3105511b67..e35e10ecf56 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/PaneViewer/components/PaneViewerEmptyState/PaneViewerEmptyState.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceEmptyState/WorkspaceEmptyState.tsx
@@ -8,14 +8,14 @@ import { EmptyTabActionButton } from "renderer/screens/main/components/Workspace
 import { useHotkeyDisplay } from "renderer/stores/hotkeys";
 import { useTheme } from "renderer/stores/theme";
 
-interface PaneViewerEmptyStateProps {
+interface WorkspaceEmptyStateProps {
 	onOpenBrowser: () => void;
 	onOpenChat: () => void;
 	onOpenQuickOpen: () => void;
 	onOpenTerminal: () => void;
 }
 
-interface PaneViewerEmptyStateAction {
+interface WorkspaceEmptyStateAction {
 	display: string[];
 	icon: IconType;
 	id: string;
@@ -23,19 +23,19 @@ interface PaneViewerEmptyStateAction {
 	onClick: () => void;
 }
 
-export function PaneViewerEmptyState({
+export function WorkspaceEmptyState({
 	onOpenBrowser,
 	onOpenChat,
 	onOpenQuickOpen,
 	onOpenTerminal,
-}: PaneViewerEmptyStateProps) {
+}: WorkspaceEmptyStateProps) {
 	const activeTheme = useTheme();
 	const newGroupDisplay = useHotkeyDisplay("NEW_GROUP");
 	const newChatDisplay = useHotkeyDisplay("NEW_CHAT");
 	const newBrowserDisplay = useHotkeyDisplay("NEW_BROWSER");
 	const quickOpenDisplay = useHotkeyDisplay("QUICK_OPEN");
 
-	const actions = useMemo<Array<PaneViewerEmptyStateAction>>(
+	const actions = useMemo<Array<WorkspaceEmptyStateAction>>(
 		() => [
 			{
 				id: "terminal",
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceEmptyState/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceEmptyState/index.ts
new file mode 100644
index 00000000000..d35a8872ac8
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceEmptyState/index.ts
@@ -0,0 +1 @@
+export { WorkspaceEmptyState } from "./WorkspaceEmptyState";
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceFiles/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceFiles/index.ts
deleted file mode 100644
index 86b9c7506b7..00000000000
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceFiles/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { WorkspaceFiles } from "./WorkspaceFiles";
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceTerminal/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceTerminal/index.ts
deleted file mode 100644
index 0c06f554ca5..00000000000
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceTerminal/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { WorkspaceTerminal } from "./WorkspaceTerminal";
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/WorkspaceChat.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/ChatPane.tsx
similarity index 97%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/WorkspaceChat.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/ChatPane.tsx
index fe9e0c2ea33..4c835ad4a32 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/WorkspaceChat.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/ChatPane.tsx
@@ -2,7 +2,7 @@ import { SessionSelector } from "./components/SessionSelector";
 import { ChatPaneInterface as WorkspaceChatInterface } from "./components/WorkspaceChatInterface";
 import { useWorkspaceChatController } from "./hooks/useWorkspaceChatController";
 
-export function WorkspaceChat({
+export function ChatPane({
 	onSessionIdChange,
 	sessionId,
 	workspaceId,
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/SessionSelector/SessionSelector.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/SessionSelector/SessionSelector.tsx
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/SessionSelector/SessionSelector.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/SessionSelector/SessionSelector.tsx
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/SessionSelector/components/SessionSelectorItem/SessionSelectorItem.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/SessionSelector/components/SessionSelectorItem/SessionSelectorItem.tsx
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/SessionSelector/components/SessionSelectorItem/SessionSelectorItem.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/SessionSelector/components/SessionSelectorItem/SessionSelectorItem.tsx
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/SessionSelector/components/SessionSelectorItem/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/SessionSelector/components/SessionSelectorItem/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/SessionSelector/components/SessionSelectorItem/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/SessionSelector/components/SessionSelectorItem/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/SessionSelector/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/SessionSelector/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/SessionSelector/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/SessionSelector/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/ChatPaneInterface.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/ChatPaneInterface.tsx
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/ChatPaneInterface.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/ChatPaneInterface.tsx
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/ChatInputFooter.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/ChatInputFooter.tsx
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/ChatInputFooter.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/ChatInputFooter.tsx
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/components/ChatComposerControls/ChatComposerControls.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/components/ChatComposerControls/ChatComposerControls.tsx
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/components/ChatComposerControls/ChatComposerControls.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/components/ChatComposerControls/ChatComposerControls.tsx
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/components/ChatComposerControls/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/components/ChatComposerControls/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/components/ChatComposerControls/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/components/ChatComposerControls/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/components/ChatInputDropZone/ChatInputDropZone.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/components/ChatInputDropZone/ChatInputDropZone.tsx
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/components/ChatInputDropZone/ChatInputDropZone.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/components/ChatInputDropZone/ChatInputDropZone.tsx
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/components/ChatInputDropZone/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/components/ChatInputDropZone/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/components/ChatInputDropZone/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/components/ChatInputDropZone/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/components/ChatShortcuts/ChatShortcuts.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/components/ChatShortcuts/ChatShortcuts.tsx
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/components/ChatShortcuts/ChatShortcuts.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/components/ChatShortcuts/ChatShortcuts.tsx
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/components/ChatShortcuts/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/components/ChatShortcuts/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/components/ChatShortcuts/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/components/ChatShortcuts/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/components/FileDropOverlay/FileDropOverlay.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/components/FileDropOverlay/FileDropOverlay.tsx
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/components/FileDropOverlay/FileDropOverlay.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/components/FileDropOverlay/FileDropOverlay.tsx
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/components/FileDropOverlay/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/components/FileDropOverlay/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/components/FileDropOverlay/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/components/FileDropOverlay/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/components/LinkedIssuePill/LinkedIssuePill.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/components/LinkedIssuePill/LinkedIssuePill.tsx
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/components/LinkedIssuePill/LinkedIssuePill.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/components/LinkedIssuePill/LinkedIssuePill.tsx
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/components/LinkedIssuePill/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/components/LinkedIssuePill/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/components/LinkedIssuePill/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/components/LinkedIssuePill/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/components/LinkedIssues/LinkedIssues.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/components/LinkedIssues/LinkedIssues.tsx
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/components/LinkedIssues/LinkedIssues.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/components/LinkedIssues/LinkedIssues.tsx
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/components/LinkedIssues/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/components/LinkedIssues/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/components/LinkedIssues/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/components/LinkedIssues/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/components/SlashCommandPreview/SlashCommandPreview.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/components/SlashCommandPreview/SlashCommandPreview.tsx
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/components/SlashCommandPreview/SlashCommandPreview.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/components/SlashCommandPreview/SlashCommandPreview.tsx
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/components/SlashCommandPreview/components/SlashCommandParamField/SlashCommandParamField.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/components/SlashCommandPreview/components/SlashCommandParamField/SlashCommandParamField.tsx
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/components/SlashCommandPreview/components/SlashCommandParamField/SlashCommandParamField.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/components/SlashCommandPreview/components/SlashCommandParamField/SlashCommandParamField.tsx
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/components/SlashCommandPreview/components/SlashCommandParamField/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/components/SlashCommandPreview/components/SlashCommandParamField/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/components/SlashCommandPreview/components/SlashCommandParamField/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/components/SlashCommandPreview/components/SlashCommandParamField/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/components/SlashCommandPreview/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/components/SlashCommandPreview/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/components/SlashCommandPreview/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/components/SlashCommandPreview/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/components/SlashCommandPreview/slash-command-preview.model.test.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/components/SlashCommandPreview/slash-command-preview.model.test.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/components/SlashCommandPreview/slash-command-preview.model.test.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/components/SlashCommandPreview/slash-command-preview.model.test.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/components/SlashCommandPreview/slash-command-preview.model.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/components/SlashCommandPreview/slash-command-preview.model.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/components/SlashCommandPreview/slash-command-preview.model.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/components/SlashCommandPreview/slash-command-preview.model.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/hooks/useDocumentDrag/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/hooks/useDocumentDrag/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/hooks/useDocumentDrag/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/hooks/useDocumentDrag/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/hooks/useDocumentDrag/useDocumentDrag.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/hooks/useDocumentDrag/useDocumentDrag.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/hooks/useDocumentDrag/useDocumentDrag.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/hooks/useDocumentDrag/useDocumentDrag.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/types.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/types.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/types.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/types.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/utils/getErrorMessage.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/utils/getErrorMessage.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatInputFooter/utils/getErrorMessage.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatInputFooter/utils/getErrorMessage.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/ChatMessageList.test.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/ChatMessageList.test.tsx
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/ChatMessageList.test.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/ChatMessageList.test.tsx
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/ChatMessageList.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/ChatMessageList.tsx
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/ChatMessageList.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/ChatMessageList.tsx
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/ChatMessageList.types.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/ChatMessageList.types.ts
similarity index 95%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/ChatMessageList.types.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/ChatMessageList.types.ts
index 795f06ab51c..434e6702d30 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/ChatMessageList.types.ts
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/ChatMessageList.types.ts
@@ -1,4 +1,4 @@
-import type { UseChatDisplayReturn } from "renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/hooks/useWorkspaceChatDisplay";
+import type { UseChatDisplayReturn } from "renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/hooks/useWorkspaceChatDisplay";
 
 export type ChatMessage = NonNullable<UseChatDisplayReturn["messages"]>[number];
 
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/AssistantMessage/AssistantMessage.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/AssistantMessage/AssistantMessage.tsx
similarity index 98%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/AssistantMessage/AssistantMessage.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/AssistantMessage/AssistantMessage.tsx
index 6bf73f5698c..86594cb110a 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/AssistantMessage/AssistantMessage.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/AssistantMessage/AssistantMessage.tsx
@@ -7,7 +7,7 @@ import { ReasoningBlock } from "renderer/components/Chat/ChatInterface/component
 import { ToolCallBlock } from "renderer/components/Chat/ChatInterface/components/ToolCallBlock";
 import type { ToolPart } from "renderer/components/Chat/ChatInterface/utils/tool-helpers";
 import { normalizeToolName } from "renderer/components/Chat/ChatInterface/utils/tool-helpers";
-import type { UseChatDisplayReturn } from "renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/hooks/useWorkspaceChatDisplay";
+import type { UseChatDisplayReturn } from "renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/hooks/useWorkspaceChatDisplay";
 import { useTabsStore } from "renderer/stores/tabs/store";
 import { AttachmentChip } from "../AttachmentChip";
 import { PendingPlanApprovalMessage } from "../PendingPlanApprovalMessage";
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/AssistantMessage/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/AssistantMessage/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/AssistantMessage/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/AssistantMessage/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/AttachmentChip/AttachmentChip.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/AttachmentChip/AttachmentChip.tsx
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/AttachmentChip/AttachmentChip.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/AttachmentChip/AttachmentChip.tsx
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/AttachmentChip/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/AttachmentChip/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/AttachmentChip/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/AttachmentChip/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/ChatSearch/ChatSearch.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/ChatSearch/ChatSearch.tsx
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/ChatSearch/ChatSearch.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/ChatSearch/ChatSearch.tsx
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/ChatSearch/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/ChatSearch/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/ChatSearch/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/ChatSearch/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/InterruptedFooter/InterruptedFooter.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/InterruptedFooter/InterruptedFooter.tsx
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/InterruptedFooter/InterruptedFooter.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/InterruptedFooter/InterruptedFooter.tsx
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/InterruptedFooter/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/InterruptedFooter/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/InterruptedFooter/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/InterruptedFooter/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/MessageScrollbackRail/MessageScrollbackRail.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/MessageScrollbackRail/MessageScrollbackRail.tsx
similarity index 98%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/MessageScrollbackRail/MessageScrollbackRail.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/MessageScrollbackRail/MessageScrollbackRail.tsx
index 9d81ad22795..ccbb06dcf50 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/MessageScrollbackRail/MessageScrollbackRail.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/MessageScrollbackRail/MessageScrollbackRail.tsx
@@ -6,7 +6,7 @@ import {
 } from "@superset/ui/hover-card";
 import { cn } from "@superset/ui/utils";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import type { UseChatDisplayReturn } from "renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/hooks/useWorkspaceChatDisplay";
+import type { UseChatDisplayReturn } from "renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/hooks/useWorkspaceChatDisplay";
 
 type ChatMessage = NonNullable<UseChatDisplayReturn["messages"]>[number];
 type ChatMessagePart = ChatMessage["content"][number];
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/MessageScrollbackRail/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/MessageScrollbackRail/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/MessageScrollbackRail/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/MessageScrollbackRail/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/PendingApprovalMessage/PendingApprovalMessage.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/PendingApprovalMessage/PendingApprovalMessage.tsx
similarity index 97%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/PendingApprovalMessage/PendingApprovalMessage.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/PendingApprovalMessage/PendingApprovalMessage.tsx
index b18e430c9bb..faafb44f059 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/PendingApprovalMessage/PendingApprovalMessage.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/PendingApprovalMessage/PendingApprovalMessage.tsx
@@ -1,7 +1,7 @@
 import { Message, MessageContent } from "@superset/ui/ai-elements/message";
 import { Button } from "@superset/ui/button";
 import { useEffect, useRef, useState } from "react";
-import type { UseChatDisplayReturn } from "renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/hooks/useWorkspaceChatDisplay";
+import type { UseChatDisplayReturn } from "renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/hooks/useWorkspaceChatDisplay";
 
 type ApprovalDecision = "approve" | "decline" | "always_allow_category";
 type PendingApproval = UseChatDisplayReturn["pendingApproval"];
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/PendingApprovalMessage/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/PendingApprovalMessage/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/PendingApprovalMessage/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/PendingApprovalMessage/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/PendingPlanApprovalMessage/PendingPlanApprovalMessage.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/PendingPlanApprovalMessage/PendingPlanApprovalMessage.tsx
similarity index 97%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/PendingPlanApprovalMessage/PendingPlanApprovalMessage.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/PendingPlanApprovalMessage/PendingPlanApprovalMessage.tsx
index a3585d513e3..4a45f78c9d0 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/PendingPlanApprovalMessage/PendingPlanApprovalMessage.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/PendingPlanApprovalMessage/PendingPlanApprovalMessage.tsx
@@ -7,7 +7,7 @@ import { Button } from "@superset/ui/button";
 import { Switch } from "@superset/ui/switch";
 import { Textarea } from "@superset/ui/textarea";
 import { useEffect, useId, useRef, useState } from "react";
-import type { UseChatDisplayReturn } from "renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/hooks/useWorkspaceChatDisplay";
+import type { UseChatDisplayReturn } from "renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/hooks/useWorkspaceChatDisplay";
 
 type PendingPlanApproval = UseChatDisplayReturn["pendingPlanApproval"];
 
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/PendingPlanApprovalMessage/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/PendingPlanApprovalMessage/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/PendingPlanApprovalMessage/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/PendingPlanApprovalMessage/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/PendingQuestionMessage/PendingQuestionMessage.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/PendingQuestionMessage/PendingQuestionMessage.tsx
similarity index 97%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/PendingQuestionMessage/PendingQuestionMessage.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/PendingQuestionMessage/PendingQuestionMessage.tsx
index 8556daf1301..7336d270b5e 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/PendingQuestionMessage/PendingQuestionMessage.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/PendingQuestionMessage/PendingQuestionMessage.tsx
@@ -6,7 +6,7 @@ import {
 import { Button } from "@superset/ui/button";
 import { Input } from "@superset/ui/input";
 import { useEffect, useMemo, useRef, useState } from "react";
-import type { UseChatDisplayReturn } from "renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/hooks/useWorkspaceChatDisplay";
+import type { UseChatDisplayReturn } from "renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/hooks/useWorkspaceChatDisplay";
 
 type PendingQuestion = UseChatDisplayReturn["pendingQuestion"];
 
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/PendingQuestionMessage/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/PendingQuestionMessage/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/PendingQuestionMessage/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/PendingQuestionMessage/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/SubagentExecutionMessage/SubagentExecutionMessage.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/SubagentExecutionMessage/SubagentExecutionMessage.tsx
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/SubagentExecutionMessage/SubagentExecutionMessage.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/SubagentExecutionMessage/SubagentExecutionMessage.tsx
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/SubagentExecutionMessage/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/SubagentExecutionMessage/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/SubagentExecutionMessage/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/SubagentExecutionMessage/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/SubagentExecutionMessage/utils/toSubagentViewModels.test.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/SubagentExecutionMessage/utils/toSubagentViewModels.test.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/SubagentExecutionMessage/utils/toSubagentViewModels.test.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/SubagentExecutionMessage/utils/toSubagentViewModels.test.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/SubagentExecutionMessage/utils/toSubagentViewModels.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/SubagentExecutionMessage/utils/toSubagentViewModels.ts
similarity index 96%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/SubagentExecutionMessage/utils/toSubagentViewModels.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/SubagentExecutionMessage/utils/toSubagentViewModels.ts
index 4006e24a885..892909213b1 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/SubagentExecutionMessage/utils/toSubagentViewModels.ts
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/SubagentExecutionMessage/utils/toSubagentViewModels.ts
@@ -1,4 +1,4 @@
-import type { UseChatDisplayReturn } from "renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/hooks/useWorkspaceChatDisplay";
+import type { UseChatDisplayReturn } from "renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/hooks/useWorkspaceChatDisplay";
 
 type ChatActiveSubagents = NonNullable<UseChatDisplayReturn["activeSubagents"]>;
 type ChatActiveSubagent =
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/ThinkingMessage/ThinkingMessage.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/ThinkingMessage/ThinkingMessage.tsx
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/ThinkingMessage/ThinkingMessage.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/ThinkingMessage/ThinkingMessage.tsx
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/ThinkingMessage/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/ThinkingMessage/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/ThinkingMessage/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/ThinkingMessage/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/ToolPreviewMessage/ToolPreviewMessage.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/ToolPreviewMessage/ToolPreviewMessage.tsx
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/ToolPreviewMessage/ToolPreviewMessage.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/ToolPreviewMessage/ToolPreviewMessage.tsx
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/ToolPreviewMessage/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/ToolPreviewMessage/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/ToolPreviewMessage/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/ToolPreviewMessage/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/UserMessage.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/UserMessage.tsx
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/UserMessage.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/UserMessage.tsx
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/components/UserMessageActions/UserMessageActions.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/components/UserMessageActions/UserMessageActions.tsx
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/components/UserMessageActions/UserMessageActions.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/components/UserMessageActions/UserMessageActions.tsx
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/components/UserMessageActions/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/components/UserMessageActions/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/components/UserMessageActions/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/components/UserMessageActions/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/components/UserMessageAttachments/UserMessageAttachments.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/components/UserMessageAttachments/UserMessageAttachments.tsx
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/components/UserMessageAttachments/UserMessageAttachments.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/components/UserMessageAttachments/UserMessageAttachments.tsx
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/components/UserMessageAttachments/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/components/UserMessageAttachments/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/components/UserMessageAttachments/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/components/UserMessageAttachments/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/components/UserMessageEditor/UserMessageEditor.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/components/UserMessageEditor/UserMessageEditor.tsx
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/components/UserMessageEditor/UserMessageEditor.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/components/UserMessageEditor/UserMessageEditor.tsx
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/components/UserMessageEditor/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/components/UserMessageEditor/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/components/UserMessageEditor/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/components/UserMessageEditor/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/components/UserMessageText/UserMessageText.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/components/UserMessageText/UserMessageText.tsx
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/components/UserMessageText/UserMessageText.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/components/UserMessageText/UserMessageText.tsx
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/components/UserMessageText/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/components/UserMessageText/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/components/UserMessageText/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/components/UserMessageText/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/types.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/types.ts
similarity index 63%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/types.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/types.ts
index f17e0dd93c1..ec4e67f955b 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/types.ts
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/types.ts
@@ -1,4 +1,4 @@
-import type { UseChatDisplayReturn } from "renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/hooks/useWorkspaceChatDisplay";
+import type { UseChatDisplayReturn } from "renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/hooks/useWorkspaceChatDisplay";
 
 export type ChatMessage = NonNullable<UseChatDisplayReturn["messages"]>[number];
 
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/utils/getUserMessageDraft/getUserMessageDraft.test.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/utils/getUserMessageDraft/getUserMessageDraft.test.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/utils/getUserMessageDraft/getUserMessageDraft.test.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/utils/getUserMessageDraft/getUserMessageDraft.test.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/utils/getUserMessageDraft/getUserMessageDraft.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/utils/getUserMessageDraft/getUserMessageDraft.ts
similarity index 93%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/utils/getUserMessageDraft/getUserMessageDraft.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/utils/getUserMessageDraft/getUserMessageDraft.ts
index 9b279e7ff42..e6bb1648ab6 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/utils/getUserMessageDraft/getUserMessageDraft.ts
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/utils/getUserMessageDraft/getUserMessageDraft.ts
@@ -1,5 +1,5 @@
 import type { FileUIPart } from "ai";
-import type { UseChatDisplayReturn } from "renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/hooks/useWorkspaceChatDisplay";
+import type { UseChatDisplayReturn } from "renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/hooks/useWorkspaceChatDisplay";
 
 type ChatMessage = NonNullable<UseChatDisplayReturn["messages"]>[number];
 type ChatMessagePart = ChatMessage["content"][number];
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/utils/getUserMessageDraft/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/utils/getUserMessageDraft/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/utils/getUserMessageDraft/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/components/UserMessage/utils/getUserMessageDraft/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/hooks/useChatMessageSearch/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/hooks/useChatMessageSearch/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/hooks/useChatMessageSearch/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/hooks/useChatMessageSearch/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/hooks/useChatMessageSearch/useChatMessageSearch.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/hooks/useChatMessageSearch/useChatMessageSearch.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/hooks/useChatMessageSearch/useChatMessageSearch.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/hooks/useChatMessageSearch/useChatMessageSearch.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/utils/messageListHelpers.test.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/utils/messageListHelpers.test.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/utils/messageListHelpers.test.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/utils/messageListHelpers.test.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/utils/messageListHelpers.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/utils/messageListHelpers.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ChatMessageList/utils/messageListHelpers.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ChatMessageList/utils/messageListHelpers.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/McpControls/McpControls.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/McpControls/McpControls.tsx
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/McpControls/McpControls.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/McpControls/McpControls.tsx
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/McpControls/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/McpControls/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/McpControls/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/McpControls/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/MentionPopover/MentionPopover.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/MentionPopover/MentionPopover.tsx
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/MentionPopover/MentionPopover.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/MentionPopover/MentionPopover.tsx
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/MentionPopover/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/MentionPopover/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/MentionPopover/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/MentionPopover/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ModelPicker/ModelPicker.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ModelPicker/ModelPicker.tsx
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ModelPicker/ModelPicker.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ModelPicker/ModelPicker.tsx
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ModelPicker/components/ModelProviderGroup/ModelProviderGroup.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ModelPicker/components/ModelProviderGroup/ModelProviderGroup.tsx
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ModelPicker/components/ModelProviderGroup/ModelProviderGroup.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ModelPicker/components/ModelProviderGroup/ModelProviderGroup.tsx
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ModelPicker/components/ModelProviderGroup/components/AnthropicProviderHeading/AnthropicProviderHeading.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ModelPicker/components/ModelProviderGroup/components/AnthropicProviderHeading/AnthropicProviderHeading.tsx
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ModelPicker/components/ModelProviderGroup/components/AnthropicProviderHeading/AnthropicProviderHeading.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ModelPicker/components/ModelProviderGroup/components/AnthropicProviderHeading/AnthropicProviderHeading.tsx
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ModelPicker/components/ModelProviderGroup/components/AnthropicProviderHeading/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ModelPicker/components/ModelProviderGroup/components/AnthropicProviderHeading/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ModelPicker/components/ModelProviderGroup/components/AnthropicProviderHeading/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ModelPicker/components/ModelProviderGroup/components/AnthropicProviderHeading/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ModelPicker/components/ModelProviderGroup/components/OpenAIProviderHeading/OpenAIProviderHeading.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ModelPicker/components/ModelProviderGroup/components/OpenAIProviderHeading/OpenAIProviderHeading.tsx
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ModelPicker/components/ModelProviderGroup/components/OpenAIProviderHeading/OpenAIProviderHeading.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ModelPicker/components/ModelProviderGroup/components/OpenAIProviderHeading/OpenAIProviderHeading.tsx
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ModelPicker/components/ModelProviderGroup/components/OpenAIProviderHeading/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ModelPicker/components/ModelProviderGroup/components/OpenAIProviderHeading/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ModelPicker/components/ModelProviderGroup/components/OpenAIProviderHeading/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ModelPicker/components/ModelProviderGroup/components/OpenAIProviderHeading/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ModelPicker/components/ModelProviderGroup/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ModelPicker/components/ModelProviderGroup/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ModelPicker/components/ModelProviderGroup/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ModelPicker/components/ModelProviderGroup/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ModelPicker/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ModelPicker/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ModelPicker/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ModelPicker/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ModelPicker/utils/groupModelsByProvider/groupModelsByProvider.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ModelPicker/utils/groupModelsByProvider/groupModelsByProvider.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ModelPicker/utils/groupModelsByProvider/groupModelsByProvider.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ModelPicker/utils/groupModelsByProvider/groupModelsByProvider.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ModelPicker/utils/groupModelsByProvider/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ModelPicker/utils/groupModelsByProvider/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ModelPicker/utils/groupModelsByProvider/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ModelPicker/utils/groupModelsByProvider/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ModelPicker/utils/providerToLogo/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ModelPicker/utils/providerToLogo/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ModelPicker/utils/providerToLogo/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ModelPicker/utils/providerToLogo/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ModelPicker/utils/providerToLogo/providerToLogo.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ModelPicker/utils/providerToLogo/providerToLogo.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/components/ModelPicker/utils/providerToLogo/providerToLogo.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/components/ModelPicker/utils/providerToLogo/providerToLogo.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/hooks/useMcpUi/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/hooks/useMcpUi/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/hooks/useMcpUi/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/hooks/useMcpUi/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/hooks/useMcpUi/useMcpUi.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/hooks/useMcpUi/useMcpUi.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/hooks/useMcpUi/useMcpUi.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/hooks/useMcpUi/useMcpUi.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/hooks/useOptimisticUpload/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/hooks/useOptimisticUpload/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/hooks/useOptimisticUpload/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/hooks/useOptimisticUpload/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/hooks/useOptimisticUpload/useOptimisticUpload.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/hooks/useOptimisticUpload/useOptimisticUpload.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/hooks/useOptimisticUpload/useOptimisticUpload.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/hooks/useOptimisticUpload/useOptimisticUpload.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/hooks/useSlashCommandExecutor/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/hooks/useSlashCommandExecutor/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/hooks/useSlashCommandExecutor/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/hooks/useSlashCommandExecutor/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/hooks/useSlashCommandExecutor/model-query.test.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/hooks/useSlashCommandExecutor/model-query.test.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/hooks/useSlashCommandExecutor/model-query.test.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/hooks/useSlashCommandExecutor/model-query.test.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/hooks/useSlashCommandExecutor/model-query.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/hooks/useSlashCommandExecutor/model-query.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/hooks/useSlashCommandExecutor/model-query.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/hooks/useSlashCommandExecutor/model-query.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/hooks/useSlashCommandExecutor/prompt-result.test.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/hooks/useSlashCommandExecutor/prompt-result.test.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/hooks/useSlashCommandExecutor/prompt-result.test.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/hooks/useSlashCommandExecutor/prompt-result.test.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/hooks/useSlashCommandExecutor/prompt-result.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/hooks/useSlashCommandExecutor/prompt-result.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/hooks/useSlashCommandExecutor/prompt-result.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/hooks/useSlashCommandExecutor/prompt-result.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/hooks/useSlashCommandExecutor/useSlashCommandExecutor.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/hooks/useSlashCommandExecutor/useSlashCommandExecutor.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/hooks/useSlashCommandExecutor/useSlashCommandExecutor.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/hooks/useSlashCommandExecutor/useSlashCommandExecutor.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/types.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/types.ts
similarity index 85%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/types.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/types.ts
index cf771fad95f..a0d6558d8f5 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/types.ts
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/types.ts
@@ -1,4 +1,4 @@
-import type { UseChatDisplayReturn } from "renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/hooks/useWorkspaceChatDisplay";
+import type { UseChatDisplayReturn } from "renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/hooks/useWorkspaceChatDisplay";
 import type { ChatLaunchConfig } from "shared/tabs-types";
 
 export interface ChatRawSnapshot {
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/utils/optimisticUserMessage/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/utils/optimisticUserMessage/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/utils/optimisticUserMessage/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/utils/optimisticUserMessage/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/utils/optimisticUserMessage/optimisticUserMessage.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/utils/optimisticUserMessage/optimisticUserMessage.ts
similarity index 93%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/utils/optimisticUserMessage/optimisticUserMessage.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/utils/optimisticUserMessage/optimisticUserMessage.ts
index 567184ee67a..ec9638222ac 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/utils/optimisticUserMessage/optimisticUserMessage.ts
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/utils/optimisticUserMessage/optimisticUserMessage.ts
@@ -1,4 +1,4 @@
-import type { UseChatDisplayReturn } from "renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/hooks/useWorkspaceChatDisplay";
+import type { UseChatDisplayReturn } from "renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/hooks/useWorkspaceChatDisplay";
 import type { ChatSendMessageInput } from "../sendMessage";
 
 export type ChatHistoryMessage = NonNullable<
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/utils/sendMessage/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/utils/sendMessage/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/utils/sendMessage/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/utils/sendMessage/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/utils/sendMessage/sendMessage.test.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/utils/sendMessage/sendMessage.test.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/utils/sendMessage/sendMessage.test.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/utils/sendMessage/sendMessage.test.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/utils/sendMessage/sendMessage.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/utils/sendMessage/sendMessage.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/utils/sendMessage/sendMessage.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/utils/sendMessage/sendMessage.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/utils/toRuntimeImages/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/utils/toRuntimeImages/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/utils/toRuntimeImages/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/utils/toRuntimeImages/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/utils/toRuntimeImages/toRuntimeImages.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/utils/toRuntimeImages/toRuntimeImages.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/utils/toRuntimeImages/toRuntimeImages.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/utils/toRuntimeImages/toRuntimeImages.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/utils/transientUserTurn/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/utils/transientUserTurn/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/utils/transientUserTurn/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/utils/transientUserTurn/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/utils/transientUserTurn/transientUserTurn.test.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/utils/transientUserTurn/transientUserTurn.test.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/utils/transientUserTurn/transientUserTurn.test.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/utils/transientUserTurn/transientUserTurn.test.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/utils/transientUserTurn/transientUserTurn.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/utils/transientUserTurn/transientUserTurn.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/utils/transientUserTurn/transientUserTurn.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/utils/transientUserTurn/transientUserTurn.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/utils/uploadFiles/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/utils/uploadFiles/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/utils/uploadFiles/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/utils/uploadFiles/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/utils/uploadFiles/uploadFiles.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/utils/uploadFiles/uploadFiles.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/components/WorkspaceChatInterface/utils/uploadFiles/uploadFiles.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/components/WorkspaceChatInterface/utils/uploadFiles/uploadFiles.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/hooks/useWorkspaceChatController/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/hooks/useWorkspaceChatController/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/hooks/useWorkspaceChatController/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/hooks/useWorkspaceChatController/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/hooks/useWorkspaceChatController/useWorkspaceChatController.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/hooks/useWorkspaceChatController/useWorkspaceChatController.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/hooks/useWorkspaceChatController/useWorkspaceChatController.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/hooks/useWorkspaceChatController/useWorkspaceChatController.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/hooks/useWorkspaceChatDisplay/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/hooks/useWorkspaceChatDisplay/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/hooks/useWorkspaceChatDisplay/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/hooks/useWorkspaceChatDisplay/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/hooks/useWorkspaceChatDisplay/useWorkspaceChatDisplay.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/hooks/useWorkspaceChatDisplay/useWorkspaceChatDisplay.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceChat/hooks/useWorkspaceChatDisplay/useWorkspaceChatDisplay.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/hooks/useWorkspaceChatDisplay/useWorkspaceChatDisplay.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/index.ts
new file mode 100644
index 00000000000..50356fa07cf
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/ChatPane/index.ts
@@ -0,0 +1 @@
+export { ChatPane } from "./ChatPane";
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceFiles/WorkspaceFiles.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/FilesPane/FilesPane.tsx
similarity index 99%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceFiles/WorkspaceFiles.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/FilesPane/FilesPane.tsx
index fde17821d59..e507048180a 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceFiles/WorkspaceFiles.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/FilesPane/FilesPane.tsx
@@ -21,7 +21,7 @@ interface WorkspaceFilesProps {
 	workspaceId: string;
 }
 
-export function WorkspaceFiles({
+export function FilesPane({
 	onSelectFile,
 	selectedFilePath,
 	workspaceId,
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceFiles/components/WorkspaceFilePreview/WorkspaceFilePreview.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/FilesPane/components/WorkspaceFilePreview/WorkspaceFilePreview.tsx
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceFiles/components/WorkspaceFilePreview/WorkspaceFilePreview.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/FilesPane/components/WorkspaceFilePreview/WorkspaceFilePreview.tsx
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceFiles/components/WorkspaceFilePreview/components/WorkspaceFilePreviewContent/WorkspaceFilePreviewContent.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/FilesPane/components/WorkspaceFilePreview/components/WorkspaceFilePreviewContent/WorkspaceFilePreviewContent.tsx
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceFiles/components/WorkspaceFilePreview/components/WorkspaceFilePreviewContent/WorkspaceFilePreviewContent.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/FilesPane/components/WorkspaceFilePreview/components/WorkspaceFilePreviewContent/WorkspaceFilePreviewContent.tsx
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceFiles/components/WorkspaceFilePreview/components/WorkspaceFilePreviewContent/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/FilesPane/components/WorkspaceFilePreview/components/WorkspaceFilePreviewContent/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceFiles/components/WorkspaceFilePreview/components/WorkspaceFilePreviewContent/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/FilesPane/components/WorkspaceFilePreview/components/WorkspaceFilePreviewContent/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceFiles/components/WorkspaceFilePreview/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/FilesPane/components/WorkspaceFilePreview/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceFiles/components/WorkspaceFilePreview/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/FilesPane/components/WorkspaceFilePreview/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceFiles/components/WorkspaceFilesSearchResultItem/WorkspaceFilesSearchResultItem.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/FilesPane/components/WorkspaceFilesSearchResultItem/WorkspaceFilesSearchResultItem.tsx
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceFiles/components/WorkspaceFilesSearchResultItem/WorkspaceFilesSearchResultItem.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/FilesPane/components/WorkspaceFilesSearchResultItem/WorkspaceFilesSearchResultItem.tsx
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceFiles/components/WorkspaceFilesSearchResultItem/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/FilesPane/components/WorkspaceFilesSearchResultItem/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceFiles/components/WorkspaceFilesSearchResultItem/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/FilesPane/components/WorkspaceFilesSearchResultItem/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceFiles/components/WorkspaceFilesToolbar/WorkspaceFilesToolbar.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/FilesPane/components/WorkspaceFilesToolbar/WorkspaceFilesToolbar.tsx
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceFiles/components/WorkspaceFilesToolbar/WorkspaceFilesToolbar.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/FilesPane/components/WorkspaceFilesToolbar/WorkspaceFilesToolbar.tsx
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceFiles/components/WorkspaceFilesToolbar/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/FilesPane/components/WorkspaceFilesToolbar/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceFiles/components/WorkspaceFilesToolbar/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/FilesPane/components/WorkspaceFilesToolbar/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceFiles/components/WorkspaceFilesTreeItem/WorkspaceFilesTreeItem.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/FilesPane/components/WorkspaceFilesTreeItem/WorkspaceFilesTreeItem.tsx
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceFiles/components/WorkspaceFilesTreeItem/WorkspaceFilesTreeItem.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/FilesPane/components/WorkspaceFilesTreeItem/WorkspaceFilesTreeItem.tsx
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceFiles/components/WorkspaceFilesTreeItem/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/FilesPane/components/WorkspaceFilesTreeItem/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceFiles/components/WorkspaceFilesTreeItem/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/FilesPane/components/WorkspaceFilesTreeItem/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceFiles/hooks/useWorkspaceFileSearch/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/FilesPane/hooks/useWorkspaceFileSearch/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceFiles/hooks/useWorkspaceFileSearch/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/FilesPane/hooks/useWorkspaceFileSearch/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceFiles/hooks/useWorkspaceFileSearch/useWorkspaceFileSearch.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/FilesPane/hooks/useWorkspaceFileSearch/useWorkspaceFileSearch.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceFiles/hooks/useWorkspaceFileSearch/useWorkspaceFileSearch.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/FilesPane/hooks/useWorkspaceFileSearch/useWorkspaceFileSearch.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/FilesPane/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/FilesPane/index.ts
new file mode 100644
index 00000000000..12a28cf46a2
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/FilesPane/index.ts
@@ -0,0 +1 @@
+export { FilesPane } from "./FilesPane";
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceTerminal/WorkspaceTerminal.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/TerminalPane/TerminalPane.tsx
similarity index 95%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceTerminal/WorkspaceTerminal.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/TerminalPane/TerminalPane.tsx
index c605278fc2e..33e06b1d555 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/WorkspaceTerminal/WorkspaceTerminal.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/TerminalPane/TerminalPane.tsx
@@ -3,7 +3,7 @@ import { FitAddon } from "@xterm/addon-fit";
 import { Terminal as XTerm } from "@xterm/xterm";
 import "@xterm/xterm/css/xterm.css";
 import { useEffect, useRef, useState } from "react";
-import { useWorkspaceWsUrl } from "../../../providers/WorkspaceTrpcProvider/WorkspaceTrpcProvider";
+import { useWorkspaceWsUrl } from "../../../../../providers/WorkspaceTrpcProvider/WorkspaceTrpcProvider";
 
 interface WorkspaceTerminalProps {
 	workspaceId: string;
@@ -24,7 +24,7 @@ type TerminalServerMessage =
 			signal: number;
 	  };
 
-export function WorkspaceTerminal({ workspaceId }: WorkspaceTerminalProps) {
+export function TerminalPane({ workspaceId }: WorkspaceTerminalProps) {
 	const containerRef = useRef<HTMLDivElement | null>(null);
 	const [connectionState, setConnectionState] = useState<
 		"connecting" | "open" | "closed"
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/TerminalPane/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/TerminalPane/index.ts
new file mode 100644
index 00000000000..3827916e916
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/components/TerminalPane/index.ts
@@ -0,0 +1 @@
+export { TerminalPane } from "./TerminalPane";
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/index.ts
new file mode 100644
index 00000000000..e141f4c6246
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/index.ts
@@ -0,0 +1 @@
+export { usePaneRegistry } from "./usePaneRegistry";
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/usePaneRegistry.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/usePaneRegistry.tsx
new file mode 100644
index 00000000000..88d8e394878
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/usePaneRegistry/usePaneRegistry.tsx
@@ -0,0 +1,96 @@
+import type { PaneRegistry, RendererContext } from "@superset/panes";
+import { FileCode2, Globe, MessageSquare, TerminalSquare } from "lucide-react";
+import { useMemo } from "react";
+import { ChatPane } from "./components/ChatPane";
+import { WorkspaceFilePreview } from "./components/FilesPane/components/WorkspaceFilePreview/WorkspaceFilePreview";
+import { TerminalPane } from "./components/TerminalPane";
+import type {
+	BrowserPaneData,
+	ChatPaneData,
+	DevtoolsPaneData,
+	FilePaneData,
+	PaneViewerData,
+} from "../../types";
+
+function getFileTitle(filePath: string): string {
+	return filePath.split("/").pop() ?? filePath;
+}
+
+export function usePaneRegistry(
+	workspaceId: string,
+): PaneRegistry<PaneViewerData> {
+	return useMemo<PaneRegistry<PaneViewerData>>(
+		() => ({
+			file: {
+				getIcon: () => <FileCode2 className="size-4" />,
+				getTitle: (ctx: RendererContext<PaneViewerData>) => {
+					const data = ctx.pane.data as FilePaneData;
+					return getFileTitle(data.filePath);
+				},
+				renderPane: (ctx: RendererContext<PaneViewerData>) => {
+					const data = ctx.pane.data as FilePaneData;
+					return (
+						<WorkspaceFilePreview
+							selectedFilePath={data.filePath}
+							workspaceId={workspaceId}
+						/>
+					);
+				},
+			},
+			terminal: {
+				getIcon: () => <TerminalSquare className="size-4" />,
+				getTitle: () => "Terminal",
+				renderPane: () => (
+					<TerminalPane workspaceId={workspaceId} />
+				),
+			},
+			browser: {
+				getIcon: () => <Globe className="size-4" />,
+				getTitle: (ctx: RendererContext<PaneViewerData>) => {
+					const data = ctx.pane.data as BrowserPaneData;
+					return data.url;
+				},
+				renderPane: (ctx: RendererContext<PaneViewerData>) => {
+					const data = ctx.pane.data as BrowserPaneData;
+					return (
+						<iframe
+							className="h-full w-full border-0 bg-background"
+							src={data.url}
+							title={ctx.pane.titleOverride ?? "Browser"}
+						/>
+					);
+				},
+			},
+			chat: {
+				getIcon: () => <MessageSquare className="size-4" />,
+				getTitle: () => "Chat",
+				renderPane: (ctx: RendererContext<PaneViewerData>) => {
+					const data = ctx.pane.data as ChatPaneData;
+					return (
+						<ChatPane
+							onSessionIdChange={(sessionId) =>
+								ctx.actions.updateData({
+									sessionId,
+								} as PaneViewerData)
+							}
+							sessionId={data.sessionId}
+							workspaceId={workspaceId}
+						/>
+					);
+				},
+			},
+			devtools: {
+				getTitle: () => "DevTools",
+				renderPane: (ctx: RendererContext<PaneViewerData>) => {
+					const data = ctx.pane.data as DevtoolsPaneData;
+					return (
+						<div className="flex h-full items-center justify-center text-sm text-muted-foreground">
+							Inspecting {data.targetTitle}
+						</div>
+					);
+				},
+			},
+		}),
+		[workspaceId],
+	);
+}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/PaneViewer/hooks/useV2WorkspacePaneLayout/index.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/useV2WorkspacePaneLayout/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/PaneViewer/hooks/useV2WorkspacePaneLayout/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/useV2WorkspacePaneLayout/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/PaneViewer/hooks/useV2WorkspacePaneLayout/useV2WorkspacePaneLayout.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/useV2WorkspacePaneLayout/useV2WorkspacePaneLayout.ts
similarity index 72%
rename from apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/PaneViewer/hooks/useV2WorkspacePaneLayout/useV2WorkspacePaneLayout.ts
rename to apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/useV2WorkspacePaneLayout/useV2WorkspacePaneLayout.ts
index 65d0cd2b365..6e4debee6bb 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/components/PaneViewer/hooks/useV2WorkspacePaneLayout/useV2WorkspacePaneLayout.ts
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/hooks/useV2WorkspacePaneLayout/useV2WorkspacePaneLayout.ts
@@ -1,22 +1,21 @@
 import {
-	createPaneWorkspaceState,
-	createPaneWorkspaceStore,
-	type PaneWorkspaceState,
-} from "@superset/pane-layout";
+	createWorkspaceStore,
+	type WorkspaceState,
+} from "@superset/panes";
 import { eq } from "@tanstack/db";
 import { useLiveQuery } from "@tanstack/react-db";
 import { useEffect, useMemo, useRef, useState } from "react";
 import { useDashboardSidebarState } from "renderer/routes/_authenticated/hooks/useDashboardSidebarState";
 import { useCollections } from "renderer/routes/_authenticated/providers/CollectionsProvider";
-import type { PaneViewerData } from "../../pane-viewer.model";
+import type { PaneViewerData } from "../../types";
 
-const EMPTY_PANE_LAYOUT = createPaneWorkspaceState<PaneViewerData>({
-	roots: [],
-});
+const EMPTY_STATE: WorkspaceState<PaneViewerData> = {
+	version: 1,
+	tabs: [],
+	activeTabId: null,
+};
 
-function getPaneLayoutSnapshot(
-	state: PaneWorkspaceState<PaneViewerData>,
-): string {
+function getSnapshot(state: WorkspaceState<PaneViewerData>): string {
 	return JSON.stringify(state);
 }
 
@@ -32,13 +31,11 @@ export function useV2WorkspacePaneLayout({
 	const collections = useCollections();
 	const { ensureWorkspaceInSidebar } = useDashboardSidebarState();
 	const [store] = useState(() =>
-		createPaneWorkspaceStore<PaneViewerData>({
-			initialState: EMPTY_PANE_LAYOUT,
+		createWorkspaceStore<PaneViewerData>({
+			initialState: EMPTY_STATE,
 		}),
 	);
-	const lastSyncedSnapshotRef = useRef(
-		getPaneLayoutSnapshot(EMPTY_PANE_LAYOUT),
-	);
+	const lastSyncedSnapshotRef = useRef(getSnapshot(EMPTY_STATE));
 
 	const { data: localWorkspaceRows = [] } = useLiveQuery(
 		(query) =>
@@ -53,8 +50,8 @@ export function useV2WorkspacePaneLayout({
 	const persistedPaneLayout = useMemo(
 		() =>
 			(localWorkspaceState?.paneLayout as
-				| PaneWorkspaceState<PaneViewerData>
-				| undefined) ?? EMPTY_PANE_LAYOUT,
+				| WorkspaceState<PaneViewerData>
+				| undefined) ?? EMPTY_STATE,
 		[localWorkspaceState],
 	);
 
@@ -63,7 +60,7 @@ export function useV2WorkspacePaneLayout({
 	}, [ensureWorkspaceInSidebar, projectId, workspaceId]);
 
 	useEffect(() => {
-		const nextSnapshot = getPaneLayoutSnapshot(persistedPaneLayout);
+		const nextSnapshot = getSnapshot(persistedPaneLayout);
 		if (nextSnapshot === lastSyncedSnapshotRef.current) {
 			return;
 		}
@@ -74,7 +71,11 @@ export function useV2WorkspacePaneLayout({
 
 	useEffect(() => {
 		const unsubscribe = store.subscribe((nextStore) => {
-			const nextSnapshot = getPaneLayoutSnapshot(nextStore.state);
+			const nextSnapshot = getSnapshot({
+				version: nextStore.version,
+				tabs: nextStore.tabs,
+				activeTabId: nextStore.activeTabId,
+			});
 			if (nextSnapshot === lastSyncedSnapshotRef.current) {
 				return;
 			}
@@ -85,7 +86,11 @@ export function useV2WorkspacePaneLayout({
 			}
 
 			collections.v2WorkspaceLocalState.update(workspaceId, (draft) => {
-				draft.paneLayout = nextStore.state;
+				draft.paneLayout = {
+					version: nextStore.version,
+					tabs: nextStore.tabs,
+					activeTabId: nextStore.activeTabId,
+				};
 			});
 			lastSyncedSnapshotRef.current = nextSnapshot;
 		});
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/page.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/page.tsx
index b937d6689e6..bc7dddc3bb4 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/page.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/page.tsx
@@ -1,9 +1,31 @@
+import { Workspace, type PaneActionConfig } from "@superset/panes";
 import { eq } from "@tanstack/db";
 import { useLiveQuery } from "@tanstack/react-db";
-import { createFileRoute } from "@tanstack/react-router";
+import { createFileRoute, useNavigate } from "@tanstack/react-router";
+import { useCallback, useMemo } from "react";
+import { HiMiniXMark } from "react-icons/hi2";
+import { TbLayoutColumns, TbLayoutRows } from "react-icons/tb";
+import { electronTrpc } from "renderer/lib/electron-trpc";
 import { useCollections } from "renderer/routes/_authenticated/providers/CollectionsProvider";
-import { PaneViewer } from "./components/PaneViewer";
+import {
+	CommandPalette,
+	useCommandPalette,
+} from "renderer/screens/main/components/CommandPalette";
+import { PresetsBar } from "renderer/screens/main/components/WorkspaceView/ContentView/components/PresetsBar";
+import { HotkeyTooltipContent } from "renderer/components/HotkeyTooltipContent";
+import { useAppHotkey } from "renderer/stores/hotkeys";
+import { AddTabMenu } from "./components/AddTabMenu";
+import { WorkspaceEmptyState } from "./components/WorkspaceEmptyState";
 import { WorkspaceNotFoundState } from "./components/WorkspaceNotFoundState";
+import { usePaneRegistry } from "./hooks/usePaneRegistry";
+import { useV2WorkspacePaneLayout } from "./hooks/useV2WorkspacePaneLayout";
+import type {
+	BrowserPaneData,
+	ChatPaneData,
+	FilePaneData,
+	PaneViewerData,
+	TerminalPaneData,
+} from "./types";
 
 export const Route = createFileRoute(
 	"/_authenticated/_dashboard/v2-workspace/$workspaceId/",
@@ -33,8 +55,7 @@ function V2WorkspacePage() {
 	}
 
 	return (
-		<V2WorkspacePageContent
-			key={workspace.id}
+		<WorkspaceContent
 			projectId={workspace.projectId}
 			workspaceId={workspace.id}
 			workspaceName={workspace.name}
@@ -42,7 +63,7 @@ function V2WorkspacePage() {
 	);
 }
 
-function V2WorkspacePageContent({
+function WorkspaceContent({
 	projectId,
 	workspaceId,
 	workspaceName,
@@ -51,12 +72,206 @@ function V2WorkspacePageContent({
 	workspaceId: string;
 	workspaceName: string;
 }) {
+	const navigate = useNavigate();
+	const { store } = useV2WorkspacePaneLayout({ projectId, workspaceId });
+	const paneRegistry = usePaneRegistry(workspaceId);
+
+	const utils = electronTrpc.useUtils();
+	const { data: showPresetsBar, isLoading: isLoadingPresetsBar } =
+		electronTrpc.settings.getShowPresetsBar.useQuery();
+	const setShowPresetsBar = electronTrpc.settings.setShowPresetsBar.useMutation({
+		onMutate: async ({ enabled }) => {
+			await utils.settings.getShowPresetsBar.cancel();
+			const previous = utils.settings.getShowPresetsBar.getData();
+			utils.settings.getShowPresetsBar.setData(undefined, enabled);
+			return { previous };
+		},
+		onError: (_error, _variables, context) => {
+			if (context?.previous !== undefined) {
+				utils.settings.getShowPresetsBar.setData(undefined, context.previous);
+			}
+		},
+		onSettled: () => {
+			utils.settings.getShowPresetsBar.invalidate();
+		},
+	});
+
+	const openFilePane = useCallback(
+		(filePath: string) => {
+			store.getState().openPane({
+				pane: {
+					kind: "file",
+					data: {
+						filePath,
+						mode: "editor",
+						hasChanges: false,
+					} as FilePaneData,
+				},
+				tabTitle: "Files",
+			});
+		},
+		[store],
+	);
+
+	const addTerminalTab = useCallback(() => {
+		store.getState().addTab({
+			titleOverride: "Terminal",
+			panes: [
+				{
+					kind: "terminal",
+					data: {
+						sessionKey: `${workspaceId}:${crypto.randomUUID()}`,
+						cwd: `/workspace/${workspaceName}`,
+						launchMode: "workspace-shell",
+					} as TerminalPaneData,
+				},
+			],
+		});
+	}, [store, workspaceId, workspaceName]);
+
+	const addChatTab = useCallback(() => {
+		store.getState().addTab({
+			titleOverride: "Chat",
+			panes: [
+				{
+					kind: "chat",
+					data: { sessionId: null } as ChatPaneData,
+				},
+			],
+		});
+	}, [store]);
+
+	const addBrowserTab = useCallback(() => {
+		store.getState().addTab({
+			titleOverride: "Browser",
+			panes: [
+				{
+					kind: "browser",
+					data: {
+						url: "http://localhost:3000",
+						mode: "preview",
+					} as BrowserPaneData,
+				},
+			],
+		});
+	}, [store]);
+
+	const commandPalette = useCommandPalette({
+		workspaceId,
+		navigate,
+		onSelectFile: ({ close, filePath, targetWorkspaceId }) => {
+			close();
+			if (targetWorkspaceId !== workspaceId) {
+				void navigate({
+					to: "/v2-workspace/$workspaceId",
+					params: { workspaceId: targetWorkspaceId },
+				});
+				return;
+			}
+			openFilePane(filePath);
+		},
+	});
+
+	const handleQuickOpen = useCallback(() => {
+		commandPalette.toggle();
+	}, [commandPalette]);
+
+	const defaultPaneActions = useMemo<PaneActionConfig<PaneViewerData>[]>(
+		() => [
+			{
+				key: "split",
+				icon: (ctx) =>
+					ctx.pane.parentDirection === "horizontal" ? (
+						<TbLayoutRows className="size-3.5" />
+					) : (
+						<TbLayoutColumns className="size-3.5" />
+					),
+				tooltip: (
+					<HotkeyTooltipContent label="Split pane" hotkeyId="SPLIT_AUTO" />
+				),
+				onClick: (ctx) => {
+					const position =
+						ctx.pane.parentDirection === "horizontal" ? "down" : "right";
+					ctx.actions.split(position, {
+						kind: "terminal",
+						data: {
+							sessionKey: `${workspaceId}:${crypto.randomUUID()}`,
+							cwd: `/workspace/${workspaceName}`,
+							launchMode: "workspace-shell",
+						} as TerminalPaneData,
+					});
+				},
+			},
+			{
+				key: "close",
+				icon: <HiMiniXMark className="size-3.5" />,
+				tooltip: (
+					<HotkeyTooltipContent
+						label="Close pane"
+						hotkeyId="CLOSE_TERMINAL"
+					/>
+				),
+				onClick: (ctx) => ctx.actions.close(),
+			},
+		],
+		[workspaceId, workspaceName],
+	);
+
+	useAppHotkey("NEW_GROUP", addTerminalTab, undefined, [addTerminalTab]);
+	useAppHotkey("NEW_CHAT", addChatTab, undefined, [addChatTab]);
+	useAppHotkey("NEW_BROWSER", addBrowserTab, undefined, [addBrowserTab]);
+	useAppHotkey("QUICK_OPEN", handleQuickOpen, undefined, [handleQuickOpen]);
+
 	return (
-		<PaneViewer
-			key={workspaceId}
-			projectId={projectId}
-			workspaceId={workspaceId}
-			workspaceName={workspaceName}
-		/>
+		<>
+			<div
+				className="flex min-h-0 min-w-0 flex-1 flex-col overflow-hidden"
+				data-workspace-id={workspaceId}
+			>
+				{!isLoadingPresetsBar && showPresetsBar ? <PresetsBar /> : null}
+				<Workspace<PaneViewerData>
+					registry={paneRegistry}
+					paneActions={defaultPaneActions}
+					renderAddTabMenu={() => (
+						<AddTabMenu
+							onAddTerminal={addTerminalTab}
+							onAddChat={addChatTab}
+							onAddBrowser={addBrowserTab}
+							showPresetsBar={showPresetsBar ?? false}
+							onTogglePresetsBar={(enabled) =>
+								setShowPresetsBar.mutate({ enabled })
+							}
+						/>
+					)}
+					renderEmptyState={() => (
+						<WorkspaceEmptyState
+							onOpenBrowser={addBrowserTab}
+							onOpenChat={addChatTab}
+							onOpenQuickOpen={handleQuickOpen}
+							onOpenTerminal={addTerminalTab}
+						/>
+					)}
+					store={store}
+				/>
+			</div>
+			<CommandPalette
+				excludePattern={commandPalette.excludePattern}
+				filtersOpen={commandPalette.filtersOpen}
+				includePattern={commandPalette.includePattern}
+				isLoading={commandPalette.isFetching}
+				onExcludePatternChange={commandPalette.setExcludePattern}
+				onFiltersOpenChange={commandPalette.setFiltersOpen}
+				onIncludePatternChange={commandPalette.setIncludePattern}
+				onOpenChange={commandPalette.handleOpenChange}
+				onQueryChange={commandPalette.setQuery}
+				onScopeChange={commandPalette.setScope}
+				onSelectFile={commandPalette.selectFile}
+				open={commandPalette.open}
+				query={commandPalette.query}
+				scope={commandPalette.scope}
+				searchResults={commandPalette.searchResults}
+				workspaceName={workspaceName}
+			/>
+		</>
 	);
 }
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/types.ts b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/types.ts
new file mode 100644
index 00000000000..a0f17ea894b
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/v2-workspace/$workspaceId/types.ts
@@ -0,0 +1,34 @@
+export interface FilePaneData {
+	filePath: string;
+	mode: "editor" | "diff" | "preview";
+	hasChanges: boolean;
+	language?: string;
+}
+
+export interface TerminalPaneData {
+	sessionKey: string;
+	cwd: string;
+	launchMode: "workspace-shell" | "command" | "agent";
+	command?: string;
+}
+
+export interface ChatPaneData {
+	sessionId: string | null;
+}
+
+export interface BrowserPaneData {
+	url: string;
+	mode: "docs" | "preview" | "generic";
+}
+
+export interface DevtoolsPaneData {
+	targetPaneId: string;
+	targetTitle: string;
+}
+
+export type PaneViewerData =
+	| FilePaneData
+	| TerminalPaneData
+	| ChatPaneData
+	| BrowserPaneData
+	| DevtoolsPaneData;
diff --git a/apps/desktop/src/renderer/routes/_authenticated/hooks/useDashboardSidebarState/useDashboardSidebarState.ts b/apps/desktop/src/renderer/routes/_authenticated/hooks/useDashboardSidebarState/useDashboardSidebarState.ts
index 45dce8cf6ea..cf55cd37fe7 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/hooks/useDashboardSidebarState/useDashboardSidebarState.ts
+++ b/apps/desktop/src/renderer/routes/_authenticated/hooks/useDashboardSidebarState/useDashboardSidebarState.ts
@@ -1,4 +1,4 @@
-import { createPaneWorkspaceState } from "@superset/pane-layout";
+import type { WorkspaceState } from "@superset/panes";
 import { useCallback } from "react";
 import { useCollections } from "renderer/routes/_authenticated/providers/CollectionsProvider";
 import type { AppCollections } from "renderer/routes/_authenticated/providers/CollectionsProvider/collections";
@@ -62,7 +62,7 @@ function ensureSidebarWorkspaceRecord(
 			tabOrder: getNextTabOrder(topLevelOrders),
 			sectionId: null,
 		},
-		paneLayout: createPaneWorkspaceState({ roots: [] }),
+		paneLayout: { version: 1, tabs: [], activeTabId: null } satisfies WorkspaceState<unknown>,
 	});
 }
 
diff --git a/apps/desktop/src/renderer/routes/_authenticated/providers/CollectionsProvider/dashboardSidebarLocal/schema.ts b/apps/desktop/src/renderer/routes/_authenticated/providers/CollectionsProvider/dashboardSidebarLocal/schema.ts
index 8ec7532de9b..87808e4c3be 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/providers/CollectionsProvider/dashboardSidebarLocal/schema.ts
+++ b/apps/desktop/src/renderer/routes/_authenticated/providers/CollectionsProvider/dashboardSidebarLocal/schema.ts
@@ -1,4 +1,4 @@
-import type { PaneWorkspaceState } from "@superset/pane-layout";
+import type { WorkspaceState } from "@superset/panes";
 import { z } from "zod";
 
 const persistedDateSchema = z
@@ -12,7 +12,7 @@ export const dashboardSidebarProjectSchema = z.object({
 	tabOrder: z.number().int().default(0),
 });
 
-const paneWorkspaceStateSchema = z.custom<PaneWorkspaceState<unknown>>();
+const paneWorkspaceStateSchema = z.custom<WorkspaceState<unknown>>();
 
 export const workspaceLocalStateSchema = z.object({
 	workspaceId: z.string().uuid(),
diff --git a/bun.lock b/bun.lock
index 858416ac0ad..f129a709e4c 100644
--- a/bun.lock
+++ b/bun.lock
@@ -149,7 +149,7 @@
         "@hookform/resolvers": "^5.2.2",
         "@lezer/highlight": "^1.2.3",
         "@parcel/watcher": "^2.5.6",
-        "@pierre/diffs": "1.1.7",
+        "@pierre/diffs": "1.1.3",
         "@radix-ui/react-dialog": "^1.1.15",
         "@radix-ui/react-label": "^2.1.8",
         "@sentry/electron": "^7.7.0",
@@ -161,7 +161,7 @@
         "@superset/host-service": "workspace:*",
         "@superset/local-db": "workspace:*",
         "@superset/macos-process-metrics": "workspace:*",
-        "@superset/pane-layout": "workspace:*",
+        "@superset/panes": "workspace:*",
         "@superset/shared": "workspace:*",
         "@superset/trpc": "workspace:*",
         "@superset/ui": "workspace:*",
@@ -606,7 +606,7 @@
       "dependencies": {
         "@ai-sdk/anthropic": "^3.0.43",
         "@ai-sdk/openai": "3.0.36",
-        "@mastra/core": "1.17.0",
+        "@mastra/core": "1.16.0",
         "@mastra/mcp": "1.3.1",
         "@superset/trpc": "workspace:*",
         "@superset/workspace-fs": "workspace:*",
@@ -760,8 +760,8 @@
         "typescript": "^5.9.3",
       },
     },
-    "packages/pane-layout": {
-      "name": "@superset/pane-layout",
+    "packages/panes": {
+      "name": "@superset/panes",
       "version": "0.1.0",
       "dependencies": {
         "@superset/ui": "workspace:*",
@@ -1654,7 +1654,7 @@
 
     "@mariozechner/pi-tui": ["@mariozechner/pi-tui@0.60.0", "", { "dependencies": { "@types/mime-types": "^2.1.4", "chalk": "^5.5.0", "get-east-asian-width": "^1.3.0", "marked": "^15.0.12", "mime-types": "^3.0.1" }, "optionalDependencies": { "koffi": "^2.9.0" } }, "sha512-ZAK5gxYhGmfJqMjfWcRBjB8glITltDbTrYJXvcDtfengbKTZN0p39p5uO5pvUB8/PiAWKTRS06yaNMhf/LG26g=="],
 
-    "@mastra/core": ["@mastra/core@1.17.0", "", { "dependencies": { "@a2a-js/sdk": "~0.2.5", "@ai-sdk/provider-utils-v5": "npm:@ai-sdk/provider-utils@3.0.20", "@ai-sdk/provider-utils-v6": "npm:@ai-sdk/provider-utils@4.0.0", "@ai-sdk/provider-v5": "npm:@ai-sdk/provider@2.0.1", "@ai-sdk/provider-v6": "npm:@ai-sdk/provider@3.0.5", "@ai-sdk/ui-utils-v5": "npm:@ai-sdk/ui-utils@1.2.11", "@isaacs/ttlcache": "^2.1.4", "@lukeed/uuid": "^2.0.1", "@mastra/schema-compat": "1.2.7", "@modelcontextprotocol/sdk": "^1.27.1", "@sindresorhus/slugify": "^2.2.1", "@standard-schema/spec": "^1.1.0", "ajv": "^8.18.0", "dotenv": "^17.3.1", "execa": "^9.6.1", "gray-matter": "^4.0.3", "hono": "^4.12.8", "hono-openapi": "^1.3.0", "ignore": "^7.0.5", "js-tiktoken": "^1.0.21", "json-schema": "^0.4.0", "lru-cache": "^11.2.7", "p-map": "^7.0.4", "p-retry": "^7.1.1", "picomatch": "^4.0.3", "radash": "^12.1.1", "ws": "^8.19.0", "xxhash-wasm": "^1.1.0" }, "peerDependencies": { "zod": "^3.25.0 || ^4.0.0" } }, "sha512-szJgYEXGj9ux5cM1wpi2HdouvKBugbnt3TEHEPvW9fI6fLvZTiYG0Nt0y8DPQgDK4nH0BPdL9HFxOf3PnevZ8Q=="],
+    "@mastra/core": ["@mastra/core@1.16.0", "", { "dependencies": { "@a2a-js/sdk": "~0.2.5", "@ai-sdk/provider-utils-v5": "npm:@ai-sdk/provider-utils@3.0.20", "@ai-sdk/provider-utils-v6": "npm:@ai-sdk/provider-utils@4.0.0", "@ai-sdk/provider-v5": "npm:@ai-sdk/provider@2.0.1", "@ai-sdk/provider-v6": "npm:@ai-sdk/provider@3.0.5", "@ai-sdk/ui-utils-v5": "npm:@ai-sdk/ui-utils@1.2.11", "@isaacs/ttlcache": "^2.1.4", "@lukeed/uuid": "^2.0.1", "@mastra/schema-compat": "1.2.7", "@modelcontextprotocol/sdk": "^1.27.1", "@sindresorhus/slugify": "^2.2.1", "@standard-schema/spec": "^1.1.0", "ajv": "^8.18.0", "dotenv": "^17.3.1", "execa": "^9.6.1", "gray-matter": "^4.0.3", "hono": "^4.12.8", "hono-openapi": "^1.3.0", "ignore": "^7.0.5", "js-tiktoken": "^1.0.21", "json-schema": "^0.4.0", "lru-cache": "^11.2.7", "p-map": "^7.0.4", "p-retry": "^7.1.1", "picomatch": "^4.0.3", "radash": "^12.1.1", "ws": "^8.19.0", "xxhash-wasm": "^1.1.0" }, "peerDependencies": { "zod": "^3.25.0 || ^4.0.0" } }, "sha512-8CuVN1/oIByJMydOkQwBSEa8jGHEUNg5EMB4ydovGbqDg1tSfIbVIO1EDOMXK6sS6RllkFbC+jsNuw6AP5o0Eg=="],
 
     "@mastra/libsql": ["@mastra/libsql@1.7.2", "", { "dependencies": { "@libsql/client": "^0.15.15" }, "peerDependencies": { "@mastra/core": ">=1.0.0-0 <2.0.0-0" } }, "sha512-BW4wYChvg2Yxci7RfRerCis36ox2EnXXkvlYY1wtnww+5dQSNS5Y+TDrqBxYMi0V2TFWKm5Gs8W0V7HFRhLUPw=="],
 
@@ -1858,7 +1858,7 @@
 
     "@parcel/watcher-win32-x64": ["@parcel/watcher-win32-x64@2.5.6", "", { "os": "win32", "cpu": "x64" }, "sha512-hbQlYcCq5dlAX9Qx+kFb0FHue6vbjlf0FrNzSKdYK2APUf7tGfGxQCk2ihEREmbR6ZMc0MVAD5RIX/41gpUzTw=="],
 
-    "@pierre/diffs": ["@pierre/diffs@1.1.7", "", { "dependencies": { "@pierre/theme": "0.0.22", "@shikijs/transformers": "^3.0.0", "diff": "8.0.3", "hast-util-to-html": "9.0.5", "lru_map": "0.4.1", "shiki": "^3.0.0" }, "peerDependencies": { "react": "^18.3.1 || ^19.0.0", "react-dom": "^18.3.1 || ^19.0.0" } }, "sha512-FWs2hHrjZPXmJl6ewnfFzOjNEM3aeSH1CB8ynZg4SOg95Wc5AxomeyJJhXf44PK9Cc+PNm1CgsJ1IvOdfgHyHA=="],
+    "@pierre/diffs": ["@pierre/diffs@1.1.3", "", { "dependencies": { "@pierre/theme": "0.0.22", "@shikijs/transformers": "^3.0.0", "diff": "8.0.3", "hast-util-to-html": "9.0.5", "lru_map": "0.4.1", "shiki": "^3.0.0" }, "peerDependencies": { "react": "^18.3.1 || ^19.0.0", "react-dom": "^18.3.1 || ^19.0.0" } }, "sha512-sV6G1FL0L4UtequXi+50Uge4QVsouo5vgJx7pCawQ4+ctFglh03zIsB81W8PNheh3coIlVzLzFgB9kI7X4eyjw=="],
 
     "@pierre/theme": ["@pierre/theme@0.0.22", "", {}, "sha512-ePUIdQRNGjrveELTU7fY89Xa7YGHHEy5Po5jQy/18lm32eRn96+tnYJEtFooGdffrx55KBUtOXfvVy/7LDFFhA=="],
 
@@ -2328,7 +2328,7 @@
 
     "@superset/mobile": ["@superset/mobile@workspace:apps/mobile"],
 
-    "@superset/pane-layout": ["@superset/pane-layout@workspace:packages/pane-layout"],
+    "@superset/panes": ["@superset/panes@workspace:packages/panes"],
 
     "@superset/shared": ["@superset/shared@workspace:packages/shared"],
 
@@ -6112,8 +6112,6 @@
 
     "mastracode/@ast-grep/napi": ["@ast-grep/napi@0.42.0", "", { "optionalDependencies": { "@ast-grep/napi-darwin-arm64": "0.42.0", "@ast-grep/napi-darwin-x64": "0.42.0", "@ast-grep/napi-linux-arm64-gnu": "0.42.0", "@ast-grep/napi-linux-arm64-musl": "0.42.0", "@ast-grep/napi-linux-x64-gnu": "0.42.0", "@ast-grep/napi-linux-x64-musl": "0.42.0", "@ast-grep/napi-win32-arm64-msvc": "0.42.0", "@ast-grep/napi-win32-ia32-msvc": "0.42.0", "@ast-grep/napi-win32-x64-msvc": "0.42.0" } }, "sha512-f3DAjeC657EqbWN2In+girgbpvnKMV77bONyhuezXK4XQtvbGCB55u3CnNvQv6EP0caIBTtDHqO5CVyO6qY4LQ=="],
 
-    "mastracode/@mastra/core": ["@mastra/core@1.16.0", "", { "dependencies": { "@a2a-js/sdk": "~0.2.5", "@ai-sdk/provider-utils-v5": "npm:@ai-sdk/provider-utils@3.0.20", "@ai-sdk/provider-utils-v6": "npm:@ai-sdk/provider-utils@4.0.0", "@ai-sdk/provider-v5": "npm:@ai-sdk/provider@2.0.1", "@ai-sdk/provider-v6": "npm:@ai-sdk/provider@3.0.5", "@ai-sdk/ui-utils-v5": "npm:@ai-sdk/ui-utils@1.2.11", "@isaacs/ttlcache": "^2.1.4", "@lukeed/uuid": "^2.0.1", "@mastra/schema-compat": "1.2.7", "@modelcontextprotocol/sdk": "^1.27.1", "@sindresorhus/slugify": "^2.2.1", "@standard-schema/spec": "^1.1.0", "ajv": "^8.18.0", "dotenv": "^17.3.1", "execa": "^9.6.1", "gray-matter": "^4.0.3", "hono": "^4.12.8", "hono-openapi": "^1.3.0", "ignore": "^7.0.5", "js-tiktoken": "^1.0.21", "json-schema": "^0.4.0", "lru-cache": "^11.2.7", "p-map": "^7.0.4", "p-retry": "^7.1.1", "picomatch": "^4.0.3", "radash": "^12.1.1", "ws": "^8.19.0", "xxhash-wasm": "^1.1.0" }, "peerDependencies": { "zod": "^3.25.0 || ^4.0.0" } }, "sha512-8CuVN1/oIByJMydOkQwBSEa8jGHEUNg5EMB4ydovGbqDg1tSfIbVIO1EDOMXK6sS6RllkFbC+jsNuw6AP5o0Eg=="],
-
     "matcher/escape-string-regexp": ["escape-string-regexp@5.0.0", "", {}, "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw=="],
 
     "mdast-util-find-and-replace/escape-string-regexp": ["escape-string-regexp@5.0.0", "", {}, "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw=="],
@@ -6886,8 +6884,6 @@
 
     "mastracode/@ast-grep/napi/@ast-grep/napi-win32-x64-msvc": ["@ast-grep/napi-win32-x64-msvc@0.42.0", "", { "os": "win32", "cpu": "x64" }, "sha512-/5PTpk7EFuqwdJyKleX2gPztL5j73Nq/cdkEJQq1Fbx+ze+UM75JniW3D7J7WZygN58+EN9DAxpc2QOlK32urQ=="],
 
-    "mastracode/@mastra/core/p-retry": ["p-retry@7.1.1", "", { "dependencies": { "is-network-error": "^1.1.0" } }, "sha512-J5ApzjyRkkf601HpEeykoiCvzHQjWxPAHhyjFcEUP2SWq0+35NKh8TLhpLw+Dkq5TZBFvUM6UigdE9hIVYTl5w=="],
-
     "metro-file-map/jest-worker/supports-color": ["supports-color@8.1.1", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q=="],
 
     "metro-symbolicate/metro-source-map/ob1": ["ob1@0.83.3", "", { "dependencies": { "flow-enums-runtime": "^0.0.6" } }, "sha512-egUxXCDwoWG06NGCS5s5AdcpnumHKJlfd3HH06P3m9TEMwwScfcY35wpQxbm9oHof+dM/lVH9Rfyu1elTVelSA=="],
diff --git a/packages/chat/package.json b/packages/chat/package.json
index be0982d1f1a..91806e673ef 100644
--- a/packages/chat/package.json
+++ b/packages/chat/package.json
@@ -32,7 +32,7 @@
 	"dependencies": {
 		"@ai-sdk/anthropic": "^3.0.43",
 		"@ai-sdk/openai": "3.0.36",
-		"@mastra/core": "1.17.0",
+		"@mastra/core": "1.16.0",
 		"@mastra/mcp": "1.3.1",
 		"@superset/trpc": "workspace:*",
 		"@superset/workspace-fs": "workspace:*",
diff --git a/packages/host-service/src/runtime/pull-requests/pull-requests.ts b/packages/host-service/src/runtime/pull-requests/pull-requests.ts
index e5824a7e037..55e4a537ba5 100644
--- a/packages/host-service/src/runtime/pull-requests/pull-requests.ts
+++ b/packages/host-service/src/runtime/pull-requests/pull-requests.ts
@@ -21,8 +21,8 @@ import {
 	type ReviewDecision,
 } from "./utils/pull-request-mappers";
 
-const BRANCH_SYNC_INTERVAL_MS = 10_000;
-const PROJECT_REFRESH_INTERVAL_MS = 15_000;
+const BRANCH_SYNC_INTERVAL_MS = 30_000;
+const PROJECT_REFRESH_INTERVAL_MS = 30_000;
 const UNBORN_HEAD_ERROR_PATTERNS = [
 	"ambiguous argument 'head'",
 	"unknown revision or path not in the working tree",
diff --git a/packages/pane-layout/src/core/store/index.ts b/packages/pane-layout/src/core/store/index.ts
deleted file mode 100644
index cb91242ca9b..00000000000
--- a/packages/pane-layout/src/core/store/index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-export type {
-	CreatePaneWorkspaceStoreOptions,
-	PaneWorkspaceStore,
-	PaneWorkspaceStoreState,
-} from "./store";
-export {
-	createPane,
-	createPaneRoot,
-	createPaneWorkspaceState,
-	createPaneWorkspaceStore,
-} from "./store";
diff --git a/packages/pane-layout/src/core/store/store.test.ts b/packages/pane-layout/src/core/store/store.test.ts
deleted file mode 100644
index edff558b852..00000000000
--- a/packages/pane-layout/src/core/store/store.test.ts
+++ /dev/null
@@ -1,759 +0,0 @@
-import { describe, expect, it } from "bun:test";
-import type { PaneState, PaneWorkspaceState } from "../../types";
-import {
-	createPaneRoot,
-	createPaneWorkspaceState,
-	createPaneWorkspaceStore,
-} from "./store";
-
-interface TestPaneData {
-	label: string;
-}
-
-function createTestPane(id: string, label = id): PaneState<TestPaneData> {
-	return {
-		id,
-		kind: "test",
-		data: { label },
-	};
-}
-
-function getFirstRoot(state: PaneWorkspaceState<TestPaneData>) {
-	const root = state.roots[0];
-	if (!root) {
-		throw new Error("Expected first root");
-	}
-	return root;
-}
-
-describe("pane workspace state operations", () => {
-	it("builds default active ids from the first available root and pane", () => {
-		const root = createPaneRoot({
-			id: "root-main",
-			groupId: "group-root",
-			panes: [createTestPane("pane-a"), createTestPane("pane-b")],
-		});
-
-		const state = createPaneWorkspaceState({
-			roots: [root],
-		});
-
-		expect(root.activeGroupId).toBe("group-root");
-		expect(root.root.type).toBe("group");
-		if (root.root.type !== "group") {
-			throw new Error("Expected group root");
-		}
-		expect(root.root.activePaneId).toBe("pane-a");
-		expect(state.activeRootId).toBe("root-main");
-	});
-
-	it("adds roots, removes the active root, and falls back to the next root", () => {
-		const store = createPaneWorkspaceStore<TestPaneData>({
-			initialState: createPaneWorkspaceState({
-				roots: [
-					createPaneRoot({
-						id: "root-a",
-						groupId: "group-a",
-						panes: [createTestPane("pane-a")],
-					}),
-				],
-			}),
-		});
-
-		store.getState().addRoot(
-			createPaneRoot({
-				id: "root-b",
-				groupId: "group-b",
-				panes: [createTestPane("pane-b")],
-			}),
-		);
-		store.getState().removeRoot("root-a");
-
-		expect(store.getState().state.roots.map((root) => root.id)).toEqual([
-			"root-b",
-		]);
-		expect(store.getState().state.activeRootId).toBe("root-b");
-	});
-
-	it("sets the active group without disturbing the active root", () => {
-		const store = createPaneWorkspaceStore<TestPaneData>({
-			initialState: createPaneWorkspaceState({
-				roots: [
-					{
-						id: "root-main",
-						activeGroupId: "group-left",
-						root: {
-							type: "split",
-							id: "split-root",
-							direction: "horizontal",
-							sizes: [50, 50],
-							children: [
-								{
-									type: "group",
-									id: "group-left",
-									activePaneId: "pane-a",
-									panes: [createTestPane("pane-a")],
-								},
-								{
-									type: "group",
-									id: "group-right",
-									activePaneId: "pane-b",
-									panes: [createTestPane("pane-b")],
-								},
-							],
-						},
-					},
-				],
-			}),
-		});
-
-		store.getState().setActiveGroup({
-			rootId: "root-main",
-			groupId: "group-right",
-		});
-
-		expect(store.getState().state.activeRootId).toBe("root-main");
-		expect(store.getState().state.roots[0]?.activeGroupId).toBe("group-right");
-	});
-
-	it("updates a root title override without affecting the active root", () => {
-		const store = createPaneWorkspaceStore<TestPaneData>({
-			initialState: createPaneWorkspaceState({
-				roots: [
-					createPaneRoot({
-						id: "root-main",
-						titleOverride: "Main",
-						groupId: "group-root",
-						panes: [createTestPane("pane-a")],
-					}),
-				],
-			}),
-		});
-
-		store.getState().setRootTitleOverride({
-			rootId: "root-main",
-			titleOverride: "Renamed",
-		});
-
-		expect(store.getState().state.activeRootId).toBe("root-main");
-		expect(store.getState().state.roots[0]?.titleOverride).toBe("Renamed");
-	});
-
-	it("updates pane data in place by pane id", () => {
-		const store = createPaneWorkspaceStore<TestPaneData>({
-			initialState: createPaneWorkspaceState({
-				roots: [
-					createPaneRoot({
-						id: "root-main",
-						groupId: "group-root",
-						panes: [createTestPane("pane-a", "A")],
-					}),
-				],
-			}),
-		});
-
-		store.getState().setPaneData({
-			paneId: "pane-a",
-			data: { label: "Updated" },
-		});
-
-		expect(store.getState().getPane("pane-a")?.pane.data).toEqual({
-			label: "Updated",
-		});
-	});
-
-	it("splits a group and adds a sibling group", () => {
-		const store = createPaneWorkspaceStore<TestPaneData>({
-			initialState: createPaneWorkspaceState({
-				roots: [
-					createPaneRoot({
-						id: "root-main",
-						groupId: "group-root",
-						panes: [createTestPane("pane-a", "A")],
-					}),
-				],
-			}),
-		});
-
-		store.getState().splitGroup({
-			rootId: "root-main",
-			groupId: "group-root",
-			position: "right",
-			newPane: createTestPane("pane-b", "B"),
-		});
-
-		const nextState = store.getState().state;
-
-		const root = getFirstRoot(nextState);
-		expect(root.root.type).toBe("split");
-		expect(root.activeGroupId).toMatch(/^group-/);
-
-		const splitNode = root.root.type === "split" ? root.root : null;
-		expect(splitNode?.children[1]).toMatchObject({
-			type: "group",
-			activePaneId: "pane-b",
-		});
-		expect(splitNode?.children[1]?.id).toMatch(/^group-/);
-	});
-
-	it("splits with custom metadata and preserves the current group when requested", () => {
-		const store = createPaneWorkspaceStore<TestPaneData>({
-			initialState: createPaneWorkspaceState({
-				roots: [
-					createPaneRoot({
-						id: "root-main",
-						groupId: "group-root",
-						panes: [createTestPane("pane-a")],
-					}),
-				],
-			}),
-		});
-
-		store.getState().splitGroup({
-			rootId: "root-main",
-			groupId: "group-root",
-			position: "top",
-			newPane: createTestPane("pane-b"),
-			selectNewPane: false,
-			sizes: [30, 70],
-		});
-
-		const root = getFirstRoot(store.getState().state);
-		expect(root.activeGroupId).toBe("group-root");
-		expect(root.root).toMatchObject({
-			type: "split",
-			direction: "vertical",
-			sizes: [30, 70],
-		});
-
-		if (root.root.type !== "split") {
-			throw new Error("Expected split root");
-		}
-
-		expect(root.root.children[0]).toMatchObject({
-			type: "group",
-		});
-		expect(root.root.id).toMatch(/^split-/);
-		expect(root.root.children[0]?.id).toMatch(/^group-/);
-		expect(root.root.children[1]).toMatchObject({
-			type: "group",
-			id: "group-root",
-		});
-	});
-
-	it("moves a pane across roots", () => {
-		const store = createPaneWorkspaceStore<TestPaneData>({
-			initialState: createPaneWorkspaceState({
-				roots: [
-					createPaneRoot({
-						id: "root-source",
-						groupId: "group-source",
-						panes: [createTestPane("pane-a", "A")],
-					}),
-					createPaneRoot({
-						id: "root-target",
-						groupId: "group-target",
-						panes: [createTestPane("pane-b", "B")],
-					}),
-				],
-				activeRootId: "root-source",
-			}),
-		});
-
-		store.getState().movePane({
-			paneId: "pane-a",
-			targetRootId: "root-target",
-			targetGroupId: "group-target",
-			select: true,
-		});
-
-		const nextState = store.getState().state;
-
-		const sourceGroup =
-			nextState.roots[0]?.root.type === "group"
-				? nextState.roots[0]?.root
-				: null;
-		const targetGroup =
-			nextState.roots[1]?.root.type === "group"
-				? nextState.roots[1]?.root
-				: null;
-
-		expect(sourceGroup?.panes).toEqual([]);
-		expect(targetGroup?.panes.map((pane) => pane.id)).toEqual([
-			"pane-b",
-			"pane-a",
-		]);
-		expect(targetGroup?.activePaneId).toBe("pane-a");
-		expect(nextState.activeRootId).toBe("root-target");
-	});
-
-	it("reorders a pane inside the same group with index adjustment", () => {
-		const store = createPaneWorkspaceStore<TestPaneData>({
-			initialState: createPaneWorkspaceState({
-				roots: [
-					createPaneRoot({
-						id: "root-main",
-						groupId: "group-root",
-						panes: [
-							createTestPane("pane-a"),
-							createTestPane("pane-b"),
-							createTestPane("pane-c"),
-						],
-					}),
-				],
-			}),
-		});
-
-		store.getState().movePane({
-			paneId: "pane-a",
-			targetRootId: "root-main",
-			targetGroupId: "group-root",
-			index: 2,
-			select: true,
-		});
-
-		const root = getFirstRoot(store.getState().state);
-		if (root.root.type !== "group") {
-			throw new Error("Expected group root");
-		}
-
-		expect(root.root.panes.map((pane) => pane.id)).toEqual([
-			"pane-b",
-			"pane-a",
-			"pane-c",
-		]);
-		expect(root.root.activePaneId).toBe("pane-a");
-	});
-
-	it("adds a pane to a group at a specific index", () => {
-		const store = createPaneWorkspaceStore<TestPaneData>({
-			initialState: createPaneWorkspaceState({
-				roots: [
-					createPaneRoot({
-						id: "root-main",
-						groupId: "group-root",
-						panes: [createTestPane("pane-a"), createTestPane("pane-c")],
-					}),
-				],
-			}),
-		});
-
-		store.getState().addPaneToGroup({
-			rootId: "root-main",
-			groupId: "group-root",
-			pane: createTestPane("pane-b"),
-			index: 1,
-		});
-
-		const nextState = store.getState().state;
-
-		const group =
-			nextState.roots[0]?.root.type === "group"
-				? nextState.roots[0]?.root
-				: null;
-		expect(group?.panes.map((pane) => pane.id)).toEqual([
-			"pane-a",
-			"pane-b",
-			"pane-c",
-		]);
-	});
-
-	it("clamps add-pane indexes and can select the inserted pane", () => {
-		const store = createPaneWorkspaceStore<TestPaneData>({
-			initialState: createPaneWorkspaceState({
-				roots: [
-					createPaneRoot({
-						id: "root-main",
-						groupId: "group-root",
-						panes: [createTestPane("pane-b"), createTestPane("pane-c")],
-					}),
-				],
-			}),
-		});
-
-		store.getState().addPaneToGroup({
-			rootId: "root-main",
-			groupId: "group-root",
-			pane: createTestPane("pane-a"),
-			index: -10,
-			select: true,
-		});
-
-		const root = getFirstRoot(store.getState().state);
-		if (root.root.type !== "group") {
-			throw new Error("Expected group root");
-		}
-
-		expect(root.root.panes.map((pane) => pane.id)).toEqual([
-			"pane-a",
-			"pane-b",
-			"pane-c",
-		]);
-		expect(root.root.activePaneId).toBe("pane-a");
-		expect(root.activeGroupId).toBe("group-root");
-	});
-
-	it("replaces the existing unpinned pane when opening in preview mode", () => {
-		const store = createPaneWorkspaceStore<TestPaneData>({
-			initialState: createPaneWorkspaceState({
-				roots: [
-					createPaneRoot({
-						id: "root-main",
-						groupId: "group-root",
-						panes: [
-							{ ...createTestPane("pane-pinned"), pinned: true },
-							{ ...createTestPane("pane-preview"), pinned: false },
-						],
-						activePaneId: "pane-preview",
-					}),
-				],
-			}),
-		});
-
-		store.getState().addPaneToGroup({
-			rootId: "root-main",
-			groupId: "group-root",
-			pane: { ...createTestPane("pane-next-preview"), pinned: false },
-			replaceUnpinned: true,
-		});
-
-		const root = getFirstRoot(store.getState().state);
-		if (root.root.type !== "group") {
-			throw new Error("Expected group root");
-		}
-
-		expect(root.root.panes.map((pane) => pane.id)).toEqual([
-			"pane-pinned",
-			"pane-next-preview",
-		]);
-		expect(root.root.activePaneId).toBe("pane-next-preview");
-	});
-
-	it("pins a pane so later preview opens append instead of replacing it", () => {
-		const store = createPaneWorkspaceStore<TestPaneData>({
-			initialState: createPaneWorkspaceState({
-				roots: [
-					createPaneRoot({
-						id: "root-main",
-						groupId: "group-root",
-						panes: [{ ...createTestPane("pane-preview"), pinned: false }],
-					}),
-				],
-			}),
-		});
-
-		store.getState().setPanePinned({
-			rootId: "root-main",
-			groupId: "group-root",
-			paneId: "pane-preview",
-			pinned: true,
-		});
-		store.getState().addPaneToGroup({
-			rootId: "root-main",
-			groupId: "group-root",
-			pane: { ...createTestPane("pane-second-preview"), pinned: false },
-			replaceUnpinned: true,
-		});
-
-		const root = getFirstRoot(store.getState().state);
-		if (root.root.type !== "group") {
-			throw new Error("Expected group root");
-		}
-
-		expect(root.root.panes.map((pane) => pane.id)).toEqual([
-			"pane-preview",
-			"pane-second-preview",
-		]);
-		expect(root.root.panes[0]?.pinned).toBe(true);
-	});
-
-	it("closes the active pane and selects the next available pane", () => {
-		const store = createPaneWorkspaceStore<TestPaneData>({
-			initialState: createPaneWorkspaceState({
-				roots: [
-					createPaneRoot({
-						id: "root-main",
-						groupId: "group-root",
-						panes: [createTestPane("pane-a"), createTestPane("pane-b")],
-						activePaneId: "pane-a",
-					}),
-				],
-			}),
-		});
-
-		store.getState().closePane({
-			rootId: "root-main",
-			groupId: "group-root",
-			paneId: "pane-a",
-		});
-
-		const nextState = store.getState().state;
-
-		const group =
-			nextState.roots[0]?.root.type === "group"
-				? nextState.roots[0]?.root
-				: null;
-		expect(group?.panes.map((pane) => pane.id)).toEqual(["pane-b"]);
-		expect(group?.activePaneId).toBe("pane-b");
-	});
-
-	it("resizes an existing split node", () => {
-		const store = createPaneWorkspaceStore<TestPaneData>({
-			initialState: createPaneWorkspaceState({
-				roots: [
-					{
-						id: "root-main",
-						activeGroupId: "group-left",
-						root: {
-							type: "split",
-							id: "split-root",
-							direction: "horizontal",
-							sizes: [50, 50],
-							children: [
-								{
-									type: "group",
-									id: "group-left",
-									activePaneId: "pane-a",
-									panes: [createTestPane("pane-a")],
-								},
-								{
-									type: "group",
-									id: "group-right",
-									activePaneId: "pane-b",
-									panes: [createTestPane("pane-b")],
-								},
-							],
-						},
-					},
-				],
-			}),
-		});
-
-		store.getState().resizeSplit({
-			rootId: "root-main",
-			splitId: "split-root",
-			sizes: [35, 65],
-		});
-
-		const root = getFirstRoot(store.getState().state);
-		expect(root.root).toMatchObject({
-			type: "split",
-			id: "split-root",
-			sizes: [35, 65],
-		});
-	});
-
-	it("equalizes split sizes across all children", () => {
-		const store = createPaneWorkspaceStore<TestPaneData>({
-			initialState: createPaneWorkspaceState({
-				roots: [
-					{
-						id: "root-main",
-						activeGroupId: "group-a",
-						root: {
-							type: "split",
-							id: "split-root",
-							direction: "horizontal",
-							sizes: [10, 30, 60],
-							children: [
-								{
-									type: "group",
-									id: "group-a",
-									activePaneId: "pane-a",
-									panes: [createTestPane("pane-a")],
-								},
-								{
-									type: "group",
-									id: "group-b",
-									activePaneId: "pane-b",
-									panes: [createTestPane("pane-b")],
-								},
-								{
-									type: "group",
-									id: "group-c",
-									activePaneId: "pane-c",
-									panes: [createTestPane("pane-c")],
-								},
-							],
-						},
-					},
-				],
-			}),
-		});
-
-		store.getState().equalizeSplit({
-			rootId: "root-main",
-			splitId: "split-root",
-		});
-
-		const root = getFirstRoot(store.getState().state);
-		expect(root.root).toMatchObject({
-			type: "split",
-			id: "split-root",
-			sizes: [100 / 3, 100 / 3, 100 / 3],
-		});
-	});
-
-	it("treats invalid ids as no-ops", () => {
-		const store = createPaneWorkspaceStore<TestPaneData>({
-			initialState: createPaneWorkspaceState({
-				roots: [
-					createPaneRoot({
-						id: "root-main",
-						groupId: "group-root",
-						panes: [createTestPane("pane-a"), createTestPane("pane-b")],
-					}),
-				],
-			}),
-		});
-
-		const before = structuredClone(store.getState().state);
-
-		store.getState().setActiveRoot("missing-root");
-		store.getState().setActiveGroup({
-			rootId: "root-main",
-			groupId: "missing-group",
-		});
-		store.getState().setActivePane({
-			rootId: "root-main",
-			groupId: "group-root",
-			paneId: "missing-pane",
-		});
-		store.getState().movePane({
-			paneId: "missing-pane",
-			targetRootId: "root-main",
-			targetGroupId: "group-root",
-		});
-		store.getState().resizeSplit({
-			rootId: "root-main",
-			splitId: "missing-split",
-			sizes: [10, 90],
-		});
-
-		expect(store.getState().state).toEqual(before);
-	});
-
-	it("updates active pane without going through a reducer action union", () => {
-		const store = createPaneWorkspaceStore<TestPaneData>({
-			initialState: createPaneWorkspaceState({
-				roots: [
-					createPaneRoot({
-						id: "root-main",
-						groupId: "group-root",
-						panes: [createTestPane("pane-a"), createTestPane("pane-b")],
-					}),
-				],
-			}),
-		});
-
-		store.getState().setActivePane({
-			rootId: "root-main",
-			groupId: "group-root",
-			paneId: "pane-b",
-		});
-
-		const nextState = store.getState().state;
-
-		const group =
-			nextState.roots[0]?.root.type === "group"
-				? nextState.roots[0]?.root
-				: null;
-		expect(group?.activePaneId).toBe("pane-b");
-	});
-});
-
-describe("createPaneWorkspaceStore", () => {
-	it("wraps the pure operations in ergonomic Zustand methods", () => {
-		const store = createPaneWorkspaceStore<TestPaneData>({
-			initialState: createPaneWorkspaceState({
-				roots: [
-					createPaneRoot({
-						id: "root-main",
-						groupId: "group-root",
-						panes: [createTestPane("pane-a"), createTestPane("pane-b")],
-					}),
-				],
-			}),
-		});
-
-		store.getState().setActivePane({
-			rootId: "root-main",
-			groupId: "group-root",
-			paneId: "pane-b",
-		});
-
-		const root = getFirstRoot(store.getState().state);
-		const group = root.root.type === "group" ? root.root : null;
-		expect(store.getState().state.activeRootId).toBe("root-main");
-		expect(root.activeGroupId).toBe("group-root");
-		expect(group?.activePaneId).toBe("pane-b");
-	});
-
-	it("exposes active-root, group, and pane selectors for renderer code", () => {
-		const store = createPaneWorkspaceStore<TestPaneData>({
-			initialState: createPaneWorkspaceState({
-				roots: [
-					{
-						id: "root-main",
-						activeGroupId: "group-right",
-						root: {
-							type: "split",
-							id: "split-root",
-							direction: "horizontal",
-							sizes: [50, 50],
-							children: [
-								{
-									type: "group",
-									id: "group-left",
-									activePaneId: "pane-a",
-									panes: [createTestPane("pane-a")],
-								},
-								{
-									type: "group",
-									id: "group-right",
-									activePaneId: "pane-b",
-									panes: [createTestPane("pane-b", "File B")],
-								},
-							],
-						},
-					},
-				],
-			}),
-		});
-
-		expect(store.getState().getActiveRoot()?.id).toBe("root-main");
-		expect(store.getState().getActiveGroup()?.id).toBe("group-right");
-		expect(store.getState().getPane("pane-b")).toMatchObject({
-			rootId: "root-main",
-			groupId: "group-right",
-			paneIndex: 0,
-			pane: {
-				id: "pane-b",
-				data: { label: "File B" },
-			},
-		});
-		expect(store.getState().getActivePane()).toMatchObject({
-			rootId: "root-main",
-			groupId: "group-right",
-			paneIndex: 0,
-			pane: {
-				id: "pane-b",
-			},
-		});
-	});
-
-	it("supports direct state replacement", () => {
-		const store = createPaneWorkspaceStore<TestPaneData>({
-			initialState: createPaneWorkspaceState({
-				roots: [],
-			}),
-		});
-
-		store.getState().replaceState((prev: PaneWorkspaceState<TestPaneData>) => ({
-			...prev,
-			activeRootId: "root-created",
-		}));
-
-		expect(store.getState().state.activeRootId).toBe("root-created");
-	});
-});
diff --git a/packages/pane-layout/src/core/store/store.ts b/packages/pane-layout/src/core/store/store.ts
deleted file mode 100644
index 0a58971d515..00000000000
--- a/packages/pane-layout/src/core/store/store.ts
+++ /dev/null
@@ -1,888 +0,0 @@
-import { createStore, type StoreApi } from "zustand/vanilla";
-import type {
-	PaneGroupNode,
-	PaneRootState,
-	PaneSplitPosition,
-	PaneState,
-	PaneWorkspaceState,
-} from "../../types";
-import {
-	findNodePathByGroupId,
-	findNodePathBySplitId,
-	findPaneLocation,
-	getGroupNode,
-	getNodeAtPath,
-	replaceNodeAtPath,
-	updateGroupNode,
-	updateNodeAtPath,
-} from "./utils";
-
-export interface PaneWorkspaceStoreState<TPaneData> {
-	state: PaneWorkspaceState<TPaneData>;
-}
-
-export interface CreatePaneWorkspaceStoreOptions<TPaneData> {
-	initialState: PaneWorkspaceState<TPaneData>;
-}
-
-function generatePaneLayoutId(prefix: string): string {
-	return `${prefix}-${crypto.randomUUID()}`;
-}
-
-function getFirstGroupId<TPaneData>(
-	node: PaneRootState<TPaneData>["root"],
-): string | null {
-	if (node.type === "group") {
-		return node.id;
-	}
-
-	for (const child of node.children) {
-		const groupId = getFirstGroupId(child);
-		if (groupId) {
-			return groupId;
-		}
-	}
-
-	return null;
-}
-
-function collapseEmptyNodes<TPaneData>(
-	node: PaneRootState<TPaneData>["root"],
-): PaneRootState<TPaneData>["root"] | null {
-	if (node.type === "group") {
-		return node.panes.length > 0 ? node : null;
-	}
-
-	const nextChildren = node.children
-		.map((child) => collapseEmptyNodes(child))
-		.filter((child): child is NonNullable<typeof child> => child !== null);
-
-	if (nextChildren.length === 0) {
-		return null;
-	}
-
-	if (nextChildren.length === 1) {
-		const [onlyChild] = nextChildren;
-		return onlyChild ?? null;
-	}
-
-	return {
-		...node,
-		children: nextChildren,
-		sizes: Array.from(
-			{ length: nextChildren.length },
-			() => 100 / nextChildren.length,
-		),
-	};
-}
-
-function normalizeRootState<TPaneData>(
-	root: PaneRootState<TPaneData>,
-): PaneRootState<TPaneData> | null {
-	const nextRootNode = collapseEmptyNodes(root.root);
-	if (!nextRootNode) {
-		return null;
-	}
-
-	const nextRoot = {
-		...root,
-		root: nextRootNode,
-	};
-	const nextActiveGroupId =
-		root.activeGroupId && getGroupNode(nextRoot, root.activeGroupId)
-			? root.activeGroupId
-			: getFirstGroupId(nextRootNode);
-
-	return {
-		...nextRoot,
-		activeGroupId: nextActiveGroupId,
-	};
-}
-
-function getRootAtIndex<TPaneData>(
-	roots: PaneRootState<TPaneData>[],
-	index: number,
-): PaneRootState<TPaneData> | null {
-	return roots[index] ?? null;
-}
-
-export interface PaneWorkspaceStore<TPaneData>
-	extends PaneWorkspaceStoreState<TPaneData> {
-	getRoot: (rootId: string) => PaneRootState<TPaneData> | null;
-	getActiveRoot: () => PaneRootState<TPaneData> | null;
-	getGroup: (args: {
-		rootId: string;
-		groupId: string;
-	}) => PaneGroupNode<TPaneData> | null;
-	getActiveGroup: (rootId?: string) => PaneGroupNode<TPaneData> | null;
-	getPane: (paneId: string) => {
-		rootId: string;
-		groupId: string;
-		paneIndex: number;
-		pane: PaneState<TPaneData>;
-	} | null;
-	getActivePane: (rootId?: string) => {
-		rootId: string;
-		groupId: string;
-		paneIndex: number;
-		pane: PaneState<TPaneData>;
-	} | null;
-	replaceState: (
-		next:
-			| PaneWorkspaceState<TPaneData>
-			| ((
-					prev: PaneWorkspaceState<TPaneData>,
-			  ) => PaneWorkspaceState<TPaneData>),
-	) => void;
-	addRoot: (root: PaneRootState<TPaneData>) => void;
-	removeRoot: (rootId: string) => void;
-	setActiveRoot: (rootId: string) => void;
-	setRootTitleOverride: (args: {
-		rootId: string;
-		titleOverride?: string;
-	}) => void;
-	setActiveGroup: (args: { rootId: string; groupId: string }) => void;
-	setActivePane: (args: {
-		rootId: string;
-		groupId: string;
-		paneId: string;
-	}) => void;
-	setPaneTitleOverride: (args: {
-		rootId: string;
-		groupId: string;
-		paneId: string;
-		titleOverride?: string;
-	}) => void;
-	setPanePinned: (args: {
-		rootId: string;
-		groupId: string;
-		paneId: string;
-		pinned: boolean;
-	}) => void;
-	setPaneData: (args: { paneId: string; data: TPaneData }) => void;
-	addPaneToGroup: (args: {
-		rootId: string;
-		groupId: string;
-		pane: PaneState<TPaneData>;
-		index?: number;
-		replaceUnpinned?: boolean;
-		select?: boolean;
-	}) => void;
-	closePane: (args: {
-		rootId: string;
-		groupId: string;
-		paneId: string;
-	}) => void;
-	movePane: (args: {
-		paneId: string;
-		targetRootId: string;
-		targetGroupId: string;
-		index?: number;
-		select?: boolean;
-	}) => void;
-	splitGroup: (args: {
-		rootId: string;
-		groupId: string;
-		position: PaneSplitPosition;
-		newPane: PaneState<TPaneData>;
-		selectNewPane?: boolean;
-		sizes?: number[];
-	}) => void;
-	resizeSplit: (args: {
-		rootId: string;
-		splitId: string;
-		sizes: number[];
-	}) => void;
-	equalizeSplit: (args: { rootId: string; splitId: string }) => void;
-}
-
-export function createPane<TPaneData>({
-	id,
-	kind,
-	titleOverride,
-	pinned,
-	data,
-}: {
-	id?: string;
-	kind: string;
-	titleOverride?: string;
-	pinned?: boolean;
-	data: TPaneData;
-}): PaneState<TPaneData> {
-	return {
-		id: id ?? generatePaneLayoutId("pane"),
-		kind,
-		titleOverride,
-		pinned,
-		data,
-	};
-}
-
-export function createPaneRoot<TPaneData>({
-	id,
-	titleOverride,
-	groupId,
-	panes,
-	activePaneId,
-}: {
-	id?: string;
-	titleOverride?: string;
-	groupId?: string;
-	panes: Array<PaneState<TPaneData>>;
-	activePaneId?: string | null;
-}): PaneRootState<TPaneData> {
-	const resolvedRootId = id ?? generatePaneLayoutId("root");
-	const resolvedGroupId = groupId ?? generatePaneLayoutId("group");
-
-	return {
-		id: resolvedRootId,
-		titleOverride,
-		root: {
-			type: "group",
-			id: resolvedGroupId,
-			activePaneId: activePaneId ?? panes[0]?.id ?? null,
-			panes,
-		},
-		activeGroupId: resolvedGroupId,
-	};
-}
-
-export function createPaneWorkspaceState<TPaneData>({
-	roots,
-	activeRootId,
-}: {
-	roots?: Array<PaneRootState<TPaneData>>;
-	activeRootId?: string | null;
-}): PaneWorkspaceState<TPaneData> {
-	const resolvedRoots = roots ?? [];
-
-	return {
-		version: 1,
-		roots: resolvedRoots,
-		activeRootId: activeRootId ?? resolvedRoots[0]?.id ?? null,
-	};
-}
-
-export function createPaneWorkspaceStore<TPaneData>(
-	options: CreatePaneWorkspaceStoreOptions<TPaneData>,
-): StoreApi<PaneWorkspaceStore<TPaneData>> {
-	return createStore<PaneWorkspaceStore<TPaneData>>((set, get) => ({
-		state: options.initialState,
-		getRoot: (rootId) =>
-			get().state.roots.find((root) => root.id === rootId) ?? null,
-		getActiveRoot: () => {
-			const state = get().state;
-			return state.roots.find((root) => root.id === state.activeRootId) ?? null;
-		},
-		getGroup: (args) => {
-			const root = get().state.roots.find((entry) => entry.id === args.rootId);
-			return root ? getGroupNode(root, args.groupId) : null;
-		},
-		getActiveGroup: (rootId) => {
-			const state = get().state;
-			const root =
-				(rootId == null
-					? state.roots.find((entry) => entry.id === state.activeRootId)
-					: state.roots.find((entry) => entry.id === rootId)) ?? null;
-			return root?.activeGroupId
-				? getGroupNode(root, root.activeGroupId)
-				: null;
-		},
-		getPane: (paneId) => {
-			const location = findPaneLocation(get().state, paneId);
-			if (!location) return null;
-
-			const root = get().state.roots.find(
-				(entry) => entry.id === location.rootId,
-			);
-			const group = root ? getGroupNode(root, location.groupId) : null;
-			const pane = group?.panes[location.paneIndex] ?? null;
-
-			return pane
-				? {
-						...location,
-						pane,
-					}
-				: null;
-		},
-		getActivePane: (rootId) => {
-			const root =
-				rootId == null ? get().getActiveRoot() : get().getRoot(rootId);
-			if (!root || !root.activeGroupId) return null;
-
-			const group = getGroupNode(root, root.activeGroupId);
-			if (!group || !group.activePaneId) return null;
-
-			const paneIndex = group.panes.findIndex(
-				(pane) => pane.id === group.activePaneId,
-			);
-			if (paneIndex === -1) return null;
-			const pane = group.panes[paneIndex];
-			if (!pane) return null;
-
-			return {
-				rootId: root.id,
-				groupId: group.id,
-				paneIndex,
-				pane,
-			};
-		},
-		replaceState: (next) => {
-			set((state) => ({
-				state: typeof next === "function" ? next(state.state) : next,
-			}));
-		},
-		addRoot: (root) => {
-			set((state) => ({
-				state: {
-					...state.state,
-					roots: [...state.state.roots, root],
-					activeRootId: state.state.activeRootId ?? root.id,
-				},
-			}));
-		},
-		removeRoot: (rootId) => {
-			set((state) => ({
-				state: {
-					...state.state,
-					roots: state.state.roots.filter((root) => root.id !== rootId),
-					activeRootId:
-						state.state.activeRootId === rootId
-							? (state.state.roots.filter((root) => root.id !== rootId)[0]
-									?.id ?? null)
-							: state.state.activeRootId,
-				},
-			}));
-		},
-		setActiveRoot: (rootId) => {
-			set((state) => ({
-				state: state.state.roots.some((root) => root.id === rootId)
-					? { ...state.state, activeRootId: rootId }
-					: state.state,
-			}));
-		},
-		setRootTitleOverride: (args) => {
-			set((state) => ({
-				state: {
-					...state.state,
-					roots: state.state.roots.map((root) =>
-						root.id === args.rootId
-							? {
-									...root,
-									titleOverride: args.titleOverride,
-								}
-							: root,
-					),
-				},
-			}));
-		},
-		setActiveGroup: (args) => {
-			set((state) => {
-				const rootIndex = state.state.roots.findIndex(
-					(root) => root.id === args.rootId,
-				);
-				if (rootIndex === -1) return state;
-				const root = getRootAtIndex(state.state.roots, rootIndex);
-				if (!root || !getGroupNode(root, args.groupId)) {
-					return state;
-				}
-
-				return {
-					state: {
-						...state.state,
-						roots: state.state.roots.map((root, index) =>
-							index === rootIndex
-								? {
-										...root,
-										activeGroupId: args.groupId,
-									}
-								: root,
-						),
-					},
-				};
-			});
-		},
-		setActivePane: (args) => {
-			set((state) => {
-				const rootIndex = state.state.roots.findIndex(
-					(root) => root.id === args.rootId,
-				);
-				if (rootIndex === -1) return state;
-				const root = getRootAtIndex(state.state.roots, rootIndex);
-				if (!root) return state;
-
-				const group = getGroupNode(root, args.groupId);
-				if (!group || !group.panes.some((pane) => pane.id === args.paneId)) {
-					return state;
-				}
-
-				return {
-					state: {
-						...state.state,
-						roots: state.state.roots.map((root, index) =>
-							index === rootIndex
-								? {
-										...updateGroupNode(root, args.groupId, (currentGroup) => ({
-											...currentGroup,
-											activePaneId: args.paneId,
-										})),
-										activeGroupId: args.groupId,
-									}
-								: root,
-						),
-						activeRootId: args.rootId,
-					},
-				};
-			});
-		},
-		setPaneTitleOverride: (args) => {
-			set((state) => {
-				const rootIndex = state.state.roots.findIndex(
-					(root) => root.id === args.rootId,
-				);
-				if (rootIndex === -1) return state;
-				const root = getRootAtIndex(state.state.roots, rootIndex);
-				if (!root) return state;
-
-				const group = getGroupNode(root, args.groupId);
-				if (!group || !group.panes.some((pane) => pane.id === args.paneId)) {
-					return state;
-				}
-
-				return {
-					state: {
-						...state.state,
-						roots: state.state.roots.map((root, index) =>
-							index === rootIndex
-								? updateGroupNode(root, args.groupId, (currentGroup) => ({
-										...currentGroup,
-										panes: currentGroup.panes.map((pane) =>
-											pane.id === args.paneId
-												? {
-														...pane,
-														titleOverride: args.titleOverride,
-													}
-												: pane,
-										),
-									}))
-								: root,
-						),
-					},
-				};
-			});
-		},
-		setPanePinned: (args) => {
-			set((state) => {
-				const rootIndex = state.state.roots.findIndex(
-					(root) => root.id === args.rootId,
-				);
-				if (rootIndex === -1) return state;
-				const root = getRootAtIndex(state.state.roots, rootIndex);
-				if (!root) return state;
-
-				const group = getGroupNode(root, args.groupId);
-				if (!group || !group.panes.some((pane) => pane.id === args.paneId)) {
-					return state;
-				}
-
-				return {
-					state: {
-						...state.state,
-						roots: state.state.roots.map((root, index) =>
-							index === rootIndex
-								? updateGroupNode(root, args.groupId, (currentGroup) => ({
-										...currentGroup,
-										panes: currentGroup.panes.map((pane) =>
-											pane.id === args.paneId
-												? { ...pane, pinned: args.pinned }
-												: pane,
-										),
-									}))
-								: root,
-						),
-					},
-				};
-			});
-		},
-		setPaneData: (args) => {
-			set((state) => {
-				const paneLocation = findPaneLocation(state.state, args.paneId);
-				if (!paneLocation) return state;
-
-				return {
-					state: {
-						...state.state,
-						roots: state.state.roots.map((root) =>
-							root.id === paneLocation.rootId
-								? updateGroupNode(
-										root,
-										paneLocation.groupId,
-										(currentGroup) => ({
-											...currentGroup,
-											panes: currentGroup.panes.map((pane) =>
-												pane.id === args.paneId
-													? { ...pane, data: args.data }
-													: pane,
-											),
-										}),
-									)
-								: root,
-						),
-					},
-				};
-			});
-		},
-		addPaneToGroup: (args) => {
-			set((state) => {
-				const rootIndex = state.state.roots.findIndex(
-					(root) => root.id === args.rootId,
-				);
-				if (rootIndex === -1) return state;
-				const root = getRootAtIndex(state.state.roots, rootIndex);
-				if (!root) return state;
-
-				const group = getGroupNode(root, args.groupId);
-				if (!group || group.panes.some((pane) => pane.id === args.pane.id)) {
-					return state;
-				}
-
-				return {
-					state: {
-						...state.state,
-						roots: state.state.roots.map((root, index) =>
-							index === rootIndex
-								? {
-										...updateGroupNode(root, args.groupId, (currentGroup) => {
-											const previewIndex = args.replaceUnpinned
-												? currentGroup.panes.findIndex(
-														(pane) => pane.pinned !== true,
-													)
-												: -1;
-											const nextPanes = [...currentGroup.panes];
-
-											if (previewIndex !== -1) {
-												nextPanes.splice(previewIndex, 1, args.pane);
-											} else {
-												const insertAt =
-													args.index == null
-														? currentGroup.panes.length
-														: Math.max(
-																0,
-																Math.min(args.index, currentGroup.panes.length),
-															);
-												nextPanes.splice(insertAt, 0, args.pane);
-											}
-
-											return {
-												...currentGroup,
-												panes: nextPanes,
-												activePaneId:
-													args.select === true ||
-													currentGroup.activePaneId ===
-														currentGroup.panes[previewIndex]?.id ||
-													currentGroup.activePaneId == null
-														? args.pane.id
-														: currentGroup.activePaneId,
-											};
-										}),
-										activeGroupId:
-											args.select === true ? args.groupId : root.activeGroupId,
-									}
-								: root,
-						),
-						activeRootId: args.rootId,
-					},
-				};
-			});
-		},
-		closePane: (args) => {
-			set((state) => {
-				const rootIndex = state.state.roots.findIndex(
-					(root) => root.id === args.rootId,
-				);
-				if (rootIndex === -1) return state;
-				const root = getRootAtIndex(state.state.roots, rootIndex);
-				if (!root) return state;
-
-				const group = getGroupNode(root, args.groupId);
-				if (!group || !group.panes.some((pane) => pane.id === args.paneId)) {
-					return state;
-				}
-
-				const nextRoots = state.state.roots
-					.map((root, index) =>
-						index === rootIndex
-							? normalizeRootState(
-									updateGroupNode(root, args.groupId, (currentGroup) => {
-										const nextPanes = currentGroup.panes.filter(
-											(pane) => pane.id !== args.paneId,
-										);
-										return {
-											...currentGroup,
-											panes: nextPanes,
-											activePaneId:
-												currentGroup.activePaneId === args.paneId
-													? (nextPanes[0]?.id ?? null)
-													: currentGroup.activePaneId,
-										};
-									}),
-								)
-							: root,
-					)
-					.filter((root): root is PaneRootState<TPaneData> => root !== null);
-
-				return {
-					state: {
-						...state.state,
-						roots: nextRoots,
-						activeRootId: nextRoots.some(
-							(root) => root.id === state.state.activeRootId,
-						)
-							? state.state.activeRootId
-							: (nextRoots[0]?.id ?? null),
-					},
-				};
-			});
-		},
-		movePane: (args) => {
-			set((state) => {
-				const source = findPaneLocation(state.state, args.paneId);
-				if (!source) return state;
-
-				const sourceRootIndex = state.state.roots.findIndex(
-					(root) => root.id === source.rootId,
-				);
-				const targetRootIndex = state.state.roots.findIndex(
-					(root) => root.id === args.targetRootId,
-				);
-				if (sourceRootIndex === -1 || targetRootIndex === -1) return state;
-				const sourceRoot = getRootAtIndex(state.state.roots, sourceRootIndex);
-				const targetRoot = getRootAtIndex(state.state.roots, targetRootIndex);
-				if (!sourceRoot || !targetRoot) return state;
-
-				const sourceGroup = getGroupNode(sourceRoot, source.groupId);
-				const targetGroup = getGroupNode(targetRoot, args.targetGroupId);
-				if (!sourceGroup || !targetGroup) return state;
-
-				const sourcePaneIndex = sourceGroup.panes.findIndex(
-					(pane) => pane.id === args.paneId,
-				);
-				if (sourcePaneIndex === -1) return state;
-				const pane = sourceGroup.panes[sourcePaneIndex];
-				if (!pane) return state;
-				const nextSourceGroup = {
-					...sourceGroup,
-					panes: sourceGroup.panes.filter(
-						(existingPane) => existingPane.id !== args.paneId,
-					),
-					activePaneId:
-						sourceGroup.activePaneId === args.paneId
-							? (sourceGroup.panes.find(
-									(existingPane) => existingPane.id !== args.paneId,
-								)?.id ?? null)
-							: sourceGroup.activePaneId,
-				};
-
-				let nextState: PaneWorkspaceState<TPaneData> = {
-					...state.state,
-					roots: state.state.roots.map((root, index) =>
-						index === sourceRootIndex
-							? updateGroupNode(root, source.groupId, () => nextSourceGroup)
-							: root,
-					),
-				};
-
-				const adjustedTargetIndex =
-					source.rootId === args.targetRootId &&
-					source.groupId === args.targetGroupId &&
-					args.index != null &&
-					args.index > sourcePaneIndex
-						? args.index - 1
-						: args.index;
-
-				nextState = {
-					...nextState,
-					roots: nextState.roots.map((root, index) => {
-						if (index !== targetRootIndex) return root;
-
-						const nextRoot = updateGroupNode(
-							root,
-							args.targetGroupId,
-							(currentGroup) => {
-								if (
-									currentGroup.panes.some(
-										(existingPane) => existingPane.id === pane.id,
-									)
-								) {
-									return currentGroup;
-								}
-
-								const insertAt =
-									adjustedTargetIndex == null
-										? currentGroup.panes.length
-										: Math.max(
-												0,
-												Math.min(
-													adjustedTargetIndex,
-													currentGroup.panes.length,
-												),
-											);
-								const nextPanes = [...currentGroup.panes];
-								nextPanes.splice(insertAt, 0, pane);
-
-								return {
-									...currentGroup,
-									panes: nextPanes,
-									activePaneId:
-										args.select === true ? pane.id : currentGroup.activePaneId,
-								};
-							},
-						);
-
-						return {
-							...nextRoot,
-							activeGroupId:
-								args.select === true
-									? args.targetGroupId
-									: nextRoot.activeGroupId,
-						};
-					}),
-				};
-
-				return {
-					state: {
-						...nextState,
-						activeRootId: args.targetRootId,
-					},
-				};
-			});
-		},
-		splitGroup: (args) => {
-			set((state) => {
-				const rootIndex = state.state.roots.findIndex(
-					(root) => root.id === args.rootId,
-				);
-				if (rootIndex === -1) return state;
-				const root = getRootAtIndex(state.state.roots, rootIndex);
-				if (!root) return state;
-				const path = findNodePathByGroupId(root.root, args.groupId);
-				if (!path) return state;
-
-				const node = getNodeAtPath(root.root, path);
-				if (node.type !== "group") return state;
-
-				const newGroup: PaneGroupNode<TPaneData> = {
-					type: "group",
-					id: generatePaneLayoutId("group"),
-					activePaneId: args.newPane.id,
-					panes: [args.newPane],
-				};
-
-				const children =
-					args.position === "left" || args.position === "top"
-						? [newGroup, node]
-						: [node, newGroup];
-
-				return {
-					state: {
-						...state.state,
-						roots: state.state.roots.map((currentRoot, index) =>
-							index === rootIndex
-								? {
-										...currentRoot,
-										root: replaceNodeAtPath(currentRoot.root, path, {
-											type: "split",
-											id: generatePaneLayoutId("split"),
-											direction:
-												args.position === "left" || args.position === "right"
-													? "horizontal"
-													: "vertical",
-											sizes: args.sizes ?? [50, 50],
-											children,
-										}),
-										activeGroupId:
-											args.selectNewPane === false
-												? currentRoot.activeGroupId
-												: newGroup.id,
-									}
-								: currentRoot,
-						),
-						activeRootId: args.rootId,
-					},
-				};
-			});
-		},
-		resizeSplit: (args) => {
-			set((state) => {
-				const rootIndex = state.state.roots.findIndex(
-					(root) => root.id === args.rootId,
-				);
-				if (rootIndex === -1) return state;
-				const root = getRootAtIndex(state.state.roots, rootIndex);
-				if (!root) return state;
-				const path = findNodePathBySplitId(root.root, args.splitId);
-				if (!path) return state;
-
-				return {
-					state: {
-						...state.state,
-						roots: state.state.roots.map((currentRoot, index) =>
-							index === rootIndex
-								? {
-										...currentRoot,
-										root: updateNodeAtPath(currentRoot.root, path, (node) => {
-											if (node.type !== "split") {
-												throw new Error("Expected split node");
-											}
-											return {
-												...node,
-												sizes: args.sizes,
-											};
-										}),
-									}
-								: currentRoot,
-						),
-					},
-				};
-			});
-		},
-		equalizeSplit: (args) => {
-			set((state) => {
-				const rootIndex = state.state.roots.findIndex(
-					(root) => root.id === args.rootId,
-				);
-				if (rootIndex === -1) return state;
-				const root = getRootAtIndex(state.state.roots, rootIndex);
-				if (!root) return state;
-				const path = findNodePathBySplitId(root.root, args.splitId);
-				if (!path) return state;
-
-				return {
-					state: {
-						...state.state,
-						roots: state.state.roots.map((currentRoot, index) =>
-							index === rootIndex
-								? {
-										...currentRoot,
-										root: updateNodeAtPath(currentRoot.root, path, (node) => {
-											if (node.type !== "split") {
-												throw new Error("Expected split node");
-											}
-
-											return {
-												...node,
-												sizes: Array.from(
-													{ length: node.children.length },
-													() => 100 / node.children.length,
-												),
-											};
-										}),
-									}
-								: currentRoot,
-						),
-					},
-				};
-			});
-		},
-	}));
-}
diff --git a/packages/pane-layout/src/core/store/utils/index.ts b/packages/pane-layout/src/core/store/utils/index.ts
deleted file mode 100644
index 9cb56a9b9c6..00000000000
--- a/packages/pane-layout/src/core/store/utils/index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-export type { PaneLocation } from "./utils";
-export {
-	findNodePathByGroupId,
-	findNodePathBySplitId,
-	findPaneLocation,
-	getGroupNode,
-	getNodeAtPath,
-	replaceNodeAtPath,
-	updateGroupNode,
-	updateNodeAtPath,
-} from "./utils";
diff --git a/packages/pane-layout/src/core/store/utils/utils.ts b/packages/pane-layout/src/core/store/utils/utils.ts
deleted file mode 100644
index f181fbb9757..00000000000
--- a/packages/pane-layout/src/core/store/utils/utils.ts
+++ /dev/null
@@ -1,159 +0,0 @@
-import type {
-	PaneGroupNode,
-	PaneLayoutNode,
-	PaneRootState,
-	PaneWorkspaceState,
-} from "../../../types";
-
-export interface PaneLocation {
-	rootId: string;
-	groupId: string;
-	paneIndex: number;
-}
-
-export function findNodePathByGroupId<TPaneData>(
-	node: PaneLayoutNode<TPaneData>,
-	groupId: string,
-	path: number[] = [],
-): number[] | null {
-	if (node.type === "group") {
-		return node.id === groupId ? path : null;
-	}
-
-	for (const [index, child] of node.children.entries()) {
-		const childPath = findNodePathByGroupId(child, groupId, [...path, index]);
-		if (childPath) return childPath;
-	}
-
-	return null;
-}
-
-export function findNodePathBySplitId<TPaneData>(
-	node: PaneLayoutNode<TPaneData>,
-	splitId: string,
-	path: number[] = [],
-): number[] | null {
-	if (node.type === "group") return null;
-	if (node.id === splitId) return path;
-
-	for (const [index, child] of node.children.entries()) {
-		const childPath = findNodePathBySplitId(child, splitId, [...path, index]);
-		if (childPath) return childPath;
-	}
-
-	return null;
-}
-
-export function getNodeAtPath<TPaneData>(
-	node: PaneLayoutNode<TPaneData>,
-	path: number[],
-): PaneLayoutNode<TPaneData> {
-	let current = node;
-	for (const index of path) {
-		if (current.type !== "split") {
-			throw new Error("Invalid path into non-split node");
-		}
-		const child = current.children[index];
-		if (!child) {
-			throw new Error("Invalid path index");
-		}
-		current = child;
-	}
-	return current;
-}
-
-export function replaceNodeAtPath<TPaneData>(
-	node: PaneLayoutNode<TPaneData>,
-	path: number[],
-	replacement: PaneLayoutNode<TPaneData>,
-): PaneLayoutNode<TPaneData> {
-	if (path.length === 0) return replacement;
-	if (node.type !== "split") {
-		throw new Error("Cannot replace child of non-split node");
-	}
-
-	const [index, ...rest] = path;
-	return {
-		...node,
-		children: node.children.map((child, childIndex) =>
-			childIndex === index
-				? replaceNodeAtPath(child, rest, replacement)
-				: child,
-		),
-	};
-}
-
-export function updateNodeAtPath<TPaneData>(
-	node: PaneLayoutNode<TPaneData>,
-	path: number[],
-	updater: (current: PaneLayoutNode<TPaneData>) => PaneLayoutNode<TPaneData>,
-): PaneLayoutNode<TPaneData> {
-	return replaceNodeAtPath(node, path, updater(getNodeAtPath(node, path)));
-}
-
-export function getGroupNode<TPaneData>(
-	root: PaneRootState<TPaneData>,
-	groupId: string,
-): PaneGroupNode<TPaneData> | null {
-	const path = findNodePathByGroupId(root.root, groupId);
-	if (!path) return null;
-
-	const node = getNodeAtPath(root.root, path);
-	return node.type === "group" ? node : null;
-}
-
-export function updateGroupNode<TPaneData>(
-	root: PaneRootState<TPaneData>,
-	groupId: string,
-	updater: (group: PaneGroupNode<TPaneData>) => PaneGroupNode<TPaneData>,
-): PaneRootState<TPaneData> {
-	const path = findNodePathByGroupId(root.root, groupId);
-	if (!path) return root;
-
-	return {
-		...root,
-		root: updateNodeAtPath(root.root, path, (node) => {
-			if (node.type !== "group") {
-				throw new Error("Expected group node");
-			}
-			return updater(node);
-		}),
-	};
-}
-
-export function findPaneLocation<TPaneData>(
-	state: PaneWorkspaceState<TPaneData>,
-	paneId: string,
-): PaneLocation | null {
-	const visit = (
-		rootId: string,
-		node: PaneLayoutNode<TPaneData>,
-	): PaneLocation | null => {
-		if (node.type === "group") {
-			for (const [paneIndex, pane] of node.panes.entries()) {
-				if (pane.id === paneId) {
-					return {
-						rootId,
-						groupId: node.id,
-						paneIndex,
-					};
-				}
-			}
-			return null;
-		}
-
-		for (const child of node.children) {
-			const location = visit(rootId, child);
-			if (location) return location;
-		}
-
-		return null;
-	};
-
-	for (const root of state.roots) {
-		const location = visit(root.id, root.root);
-		if (location) return location;
-	}
-
-	return null;
-}
diff --git a/packages/pane-layout/src/index.ts b/packages/pane-layout/src/index.ts
deleted file mode 100644
index 21c3fa4ebb1..00000000000
--- a/packages/pane-layout/src/index.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-export type {
-	CreatePaneWorkspaceStoreOptions,
-	PaneWorkspaceStore,
-	PaneWorkspaceStoreState,
-} from "./core/store";
-export {
-	createPane,
-	createPaneRoot,
-	createPaneWorkspaceState,
-	createPaneWorkspaceStore,
-} from "./core/store";
-export type {
-	PaneDefinition,
-	PaneRegistry,
-	PaneRendererContext,
-	PaneWorkspaceProps,
-} from "./react";
-export { PaneWorkspace, usePaneWorkspaceStore } from "./react";
-export type {
-	DropTarget,
-	PaneGroupNode,
-	PaneLayoutNode,
-	PaneRootState,
-	PaneSplitDirection,
-	PaneSplitNode,
-	PaneSplitPosition,
-	PaneState,
-	PaneWorkspaceState,
-} from "./types";
diff --git a/packages/pane-layout/src/react/components/PaneWorkspace/PaneWorkspace.tsx b/packages/pane-layout/src/react/components/PaneWorkspace/PaneWorkspace.tsx
deleted file mode 100644
index 251b85ea4c5..00000000000
--- a/packages/pane-layout/src/react/components/PaneWorkspace/PaneWorkspace.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import { cn } from "@superset/ui/lib/utils";
-import { usePaneWorkspaceStore } from "../../hooks";
-import type { PaneWorkspaceProps } from "../../types";
-import { PaneRootTabs } from "./components/PaneRootTabs";
-import { PaneRootView } from "./components/PaneRootView";
-
-export function PaneWorkspace<TPaneData>({
-	store,
-	registry,
-	className,
-	getRootTitle,
-	onAddRoot,
-	renderAddRootMenu,
-	onAddPane,
-	renderEmptyState,
-	renderUnknownPane,
-}: PaneWorkspaceProps<TPaneData>) {
-	const roots = usePaneWorkspaceStore(store, (state) => state.state.roots);
-	const activeRootId = usePaneWorkspaceStore(
-		store,
-		(state) => state.state.activeRootId,
-	);
-	const activeRoot =
-		roots.find((root) => root.id === activeRootId) ?? roots[0] ?? null;
-
-	return (
-		<div
-			className={cn(
-				"flex min-h-0 min-w-0 flex-1 flex-col overflow-hidden rounded-md border border-border bg-background text-foreground shadow-xs",
-				className,
-			)}
-		>
-			<PaneRootTabs
-				activeRootId={activeRootId}
-				getRootTitle={getRootTitle}
-				onAddRoot={onAddRoot}
-				renderAddRootMenu={renderAddRootMenu}
-				onSelectRoot={(rootId) => store.getState().setActiveRoot(rootId)}
-				roots={roots}
-				store={store}
-			/>
-			<PaneRootView
-				registry={registry}
-				onAddPane={onAddPane}
-				renderEmptyState={renderEmptyState}
-				renderUnknownPane={renderUnknownPane}
-				root={activeRoot}
-				store={store}
-			/>
-		</div>
-	);
-}
diff --git a/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneContent/PaneContent.tsx b/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneContent/PaneContent.tsx
deleted file mode 100644
index c20c2f61879..00000000000
--- a/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneContent/PaneContent.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import type { StoreApi } from "zustand/vanilla";
-import type { PaneWorkspaceStore } from "../../../../../core/store";
-import type {
-	PaneGroupNode,
-	PaneRootState,
-	PaneState,
-} from "../../../../../types";
-import type { PaneRegistry, PaneRendererContext } from "../../../../types";
-
-interface PaneContentProps<TPaneData> {
-	store: StoreApi<PaneWorkspaceStore<TPaneData>>;
-	root: PaneRootState<TPaneData>;
-	group: PaneGroupNode<TPaneData>;
-	pane: PaneState<TPaneData>;
-	registry: PaneRegistry<TPaneData>;
-	renderUnknownPane?: (
-		context: PaneRendererContext<TPaneData>,
-	) => React.ReactNode;
-}
-
-export function PaneContent<TPaneData>({
-	store,
-	root,
-	group,
-	pane,
-	registry,
-	renderUnknownPane,
-}: PaneContentProps<TPaneData>) {
-	const definition = registry[pane.kind];
-	const context: PaneRendererContext<TPaneData> = {
-		store,
-		root,
-		group,
-		pane,
-		isActive: group.activePaneId === pane.id,
-	};
-
-	return (
-		<div className="flex min-h-0 min-w-0 flex-1 overflow-auto">
-			{definition
-				? definition.renderPane(context)
-				: (renderUnknownPane?.(context) ?? (
-						<div className="flex min-h-0 min-w-0 flex-1 items-center justify-center p-6 text-sm text-muted-foreground">
-							Unknown pane kind: {pane.kind}
-						</div>
-					))}
-		</div>
-	);
-}
diff --git a/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneGroup/PaneGroup.tsx b/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneGroup/PaneGroup.tsx
deleted file mode 100644
index 08018225b93..00000000000
--- a/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneGroup/PaneGroup.tsx
+++ /dev/null
@@ -1,276 +0,0 @@
-import { Button } from "@superset/ui/button";
-import {
-	ContextMenu,
-	ContextMenuContent,
-	ContextMenuItem,
-	ContextMenuSeparator,
-	ContextMenuTrigger,
-} from "@superset/ui/context-menu";
-import { Input } from "@superset/ui/input";
-import { cn } from "@superset/ui/lib/utils";
-import { Tooltip, TooltipContent, TooltipTrigger } from "@superset/ui/tooltip";
-import { PlusIcon, XIcon } from "lucide-react";
-import { useState } from "react";
-import type { StoreApi } from "zustand/vanilla";
-import type { PaneWorkspaceStore } from "../../../../../core/store";
-import type {
-	PaneGroupNode,
-	PaneRootState,
-	PaneState,
-} from "../../../../../types";
-import type { PaneRegistry, PaneRendererContext } from "../../../../types";
-import { PaneContent } from "../PaneContent";
-
-interface PaneGroupProps<TPaneData> {
-	store: StoreApi<PaneWorkspaceStore<TPaneData>>;
-	root: PaneRootState<TPaneData>;
-	group: PaneGroupNode<TPaneData>;
-	registry: PaneRegistry<TPaneData>;
-	onAddPane?: (args: {
-		store: StoreApi<PaneWorkspaceStore<TPaneData>>;
-		root: PaneRootState<TPaneData>;
-		group: PaneGroupNode<TPaneData>;
-	}) => void;
-	renderUnknownPane?: (
-		context: PaneRendererContext<TPaneData>,
-	) => React.ReactNode;
-}
-
-interface PaneGroupItemProps<TPaneData> {
-	store: StoreApi<PaneWorkspaceStore<TPaneData>>;
-	root: PaneRootState<TPaneData>;
-	group: PaneGroupNode<TPaneData>;
-	pane: PaneState<TPaneData>;
-	registry: PaneRegistry<TPaneData>;
-	isActive: boolean;
-}
-
-function PaneGroupItem<TPaneData>({
-	store,
-	root,
-	group,
-	pane,
-	registry,
-	isActive,
-}: PaneGroupItemProps<TPaneData>) {
-	const [isEditing, setIsEditing] = useState(false);
-	const [editValue, setEditValue] = useState("");
-
-	const context: PaneRendererContext<TPaneData> = {
-		store,
-		root,
-		group,
-		pane,
-		isActive,
-	};
-	const definition = registry[pane.kind];
-	const title =
-		pane.titleOverride ?? definition?.getTitle?.(context) ?? pane.id;
-
-	const startEditing = () => {
-		setEditValue(typeof title === "string" ? title : pane.id);
-		setIsEditing(true);
-	};
-
-	const saveEdit = () => {
-		const nextTitle = editValue.trim();
-		store.getState().setPaneTitleOverride({
-			rootId: root.id,
-			groupId: group.id,
-			paneId: pane.id,
-			titleOverride: nextTitle.length > 0 ? nextTitle : undefined,
-		});
-		setIsEditing(false);
-	};
-
-	return (
-		<ContextMenu>
-			<ContextMenuTrigger asChild>
-				<div className="group relative flex h-full shrink-0 border-r border-border">
-					{isEditing ? (
-						<div className="flex h-full w-[160px] items-center px-2">
-							<Input
-								autoFocus
-								className="h-7"
-								onBlur={saveEdit}
-								onChange={(event) => setEditValue(event.target.value)}
-								onKeyDown={(event) => {
-									if (event.key === "Enter") {
-										event.preventDefault();
-										saveEdit();
-									}
-									if (event.key === "Escape") {
-										event.preventDefault();
-										setIsEditing(false);
-									}
-								}}
-								value={editValue}
-							/>
-						</div>
-					) : (
-						<>
-							<button
-								className={cn(
-									"flex h-full w-[160px] shrink-0 items-center gap-2 pl-3 pr-8 text-sm transition-all",
-									isActive
-										? "bg-border/30 text-foreground"
-										: "text-muted-foreground/70 hover:bg-tertiary/20 hover:text-muted-foreground",
-								)}
-								onClick={() =>
-									store.getState().setActivePane({
-										rootId: root.id,
-										groupId: group.id,
-										paneId: pane.id,
-									})
-								}
-								onDoubleClick={startEditing}
-								type="button"
-							>
-								<span className="shrink-0">
-									{definition?.getIcon?.(context) ?? null}
-								</span>
-								<span className="flex-1 truncate text-left">{title}</span>
-								{pane.pinned ? (
-									<span className="shrink-0 text-[10px] uppercase tracking-wide text-muted-foreground/80">
-										PIN
-									</span>
-								) : null}
-								<span className="shrink-0">
-									{definition?.renderTabAccessory?.(context) ?? null}
-								</span>
-							</button>
-							<div className="absolute right-1 top-1/2 hidden -translate-y-1/2 items-center gap-0.5 group-hover:flex">
-								<Tooltip delayDuration={500}>
-									<TooltipTrigger asChild>
-										<Button
-											className="size-6 cursor-pointer hover:bg-muted"
-											onClick={(event) => {
-												event.stopPropagation();
-												store.getState().closePane({
-													rootId: root.id,
-													groupId: group.id,
-													paneId: pane.id,
-												});
-											}}
-											size="icon-xs"
-											type="button"
-											variant="ghost"
-										>
-											<XIcon className="size-3.5" />
-										</Button>
-									</TooltipTrigger>
-									<TooltipContent side="top" showArrow={false}>
-										Close
-									</TooltipContent>
-								</Tooltip>
-							</div>
-						</>
-					)}
-				</div>
-			</ContextMenuTrigger>
-			<ContextMenuContent>
-				<ContextMenuItem onSelect={startEditing}>Rename</ContextMenuItem>
-				<ContextMenuSeparator />
-				<ContextMenuItem
-					onSelect={() =>
-						store.getState().setPanePinned({
-							rootId: root.id,
-							groupId: group.id,
-							paneId: pane.id,
-							pinned: !pane.pinned,
-						})
-					}
-				>
-					{pane.pinned ? "Unpin" : "Pin"}
-				</ContextMenuItem>
-				<ContextMenuSeparator />
-				<ContextMenuItem
-					onSelect={() =>
-						store.getState().closePane({
-							rootId: root.id,
-							groupId: group.id,
-							paneId: pane.id,
-						})
-					}
-				>
-					Close
-				</ContextMenuItem>
-			</ContextMenuContent>
-		</ContextMenu>
-	);
-}
-
-export function PaneGroup<TPaneData>({
-	store,
-	root,
-	group,
-	registry,
-	onAddPane,
-	renderUnknownPane,
-}: PaneGroupProps<TPaneData>) {
-	const activePane =
-		group.panes.find((pane) => pane.id === group.activePaneId) ??
-		group.panes[0] ??
-		null;
-
-	return (
-		<div className="flex min-h-0 min-w-0 flex-1 flex-col overflow-hidden bg-background">
-			<div className="flex h-10 min-w-0 shrink-0 items-stretch border-b border-border bg-background">
-				<div
-					className="flex min-w-0 flex-1 items-stretch overflow-x-auto overflow-y-hidden"
-					style={{ scrollbarWidth: "none" }}
-				>
-					<div className="flex h-full items-stretch">
-						{group.panes.map((pane) => (
-							<PaneGroupItem
-								group={group}
-								isActive={pane.id === activePane?.id}
-								key={pane.id}
-								pane={pane}
-								registry={registry}
-								root={root}
-								store={store}
-							/>
-						))}
-					</div>
-				</div>
-				{onAddPane ? (
-					<div className="shrink-0 border-l border-border">
-						<Tooltip delayDuration={500}>
-							<TooltipTrigger asChild>
-								<Button
-									className="h-full rounded-none border-0 px-3 shadow-none"
-									onClick={() => onAddPane({ store, root, group })}
-									size="sm"
-									type="button"
-									variant="ghost"
-								>
-									<PlusIcon className="size-4" />
-								</Button>
-							</TooltipTrigger>
-							<TooltipContent side="top" showArrow={false}>
-								Add pane
-							</TooltipContent>
-						</Tooltip>
-					</div>
-				) : null}
-			</div>
-			<div className="flex min-h-0 min-w-0 flex-1 overflow-hidden bg-background">
-				{activePane ? (
-					<PaneContent
-						group={group}
-						pane={activePane}
-						registry={registry}
-						renderUnknownPane={renderUnknownPane}
-						root={root}
-						store={store}
-					/>
-				) : (
-					<div className="flex min-h-0 min-w-0 flex-1 items-center justify-center text-sm text-muted-foreground">
-						No panes in this group
-					</div>
-				)}
-			</div>
-		</div>
-	);
-}
diff --git a/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneGroup/index.ts b/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneGroup/index.ts
deleted file mode 100644
index 45be6166523..00000000000
--- a/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneGroup/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { PaneGroup } from "./PaneGroup";
diff --git a/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneNodeView/PaneNodeView.tsx b/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneNodeView/PaneNodeView.tsx
deleted file mode 100644
index c4843fb21a8..00000000000
--- a/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneNodeView/PaneNodeView.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-import type { StoreApi } from "zustand/vanilla";
-import type { PaneWorkspaceStore } from "../../../../../core/store";
-import type { PaneLayoutNode, PaneRootState } from "../../../../../types";
-import type { PaneRegistry, PaneRendererContext } from "../../../../types";
-import { PaneGroup } from "../PaneGroup";
-import { PaneSplitHandle } from "../PaneSplitHandle";
-
-interface PaneNodeViewProps<TPaneData> {
-	store: StoreApi<PaneWorkspaceStore<TPaneData>>;
-	root: PaneRootState<TPaneData>;
-	node: PaneLayoutNode<TPaneData>;
-	registry: PaneRegistry<TPaneData>;
-	onAddPane?: (args: {
-		store: StoreApi<PaneWorkspaceStore<TPaneData>>;
-		root: PaneRootState<TPaneData>;
-		group: import("../../../../../types").PaneGroupNode<TPaneData>;
-	}) => void;
-	renderUnknownPane?: (
-		context: PaneRendererContext<TPaneData>,
-	) => React.ReactNode;
-}
-
-export function PaneNodeView<TPaneData>({
-	store,
-	root,
-	node,
-	registry,
-	onAddPane,
-	renderUnknownPane,
-}: PaneNodeViewProps<TPaneData>) {
-	if (node.type === "group") {
-		return (
-			<PaneGroup
-				group={node}
-				registry={registry}
-				onAddPane={onAddPane}
-				renderUnknownPane={renderUnknownPane}
-				root={root}
-				store={store}
-			/>
-		);
-	}
-
-	const isHorizontal = node.direction === "horizontal";
-
-	return (
-		<div
-			className={[
-				"flex min-h-0 min-w-0 flex-1 overflow-hidden",
-				isHorizontal ? "flex-row" : "flex-col",
-			].join(" ")}
-		>
-			{node.children.flatMap((child, index) => {
-				const items = [
-					<div
-						className="flex min-h-0 min-w-0 overflow-hidden"
-						key={child.id}
-						style={{
-							flexBasis: 0,
-							flexGrow: node.sizes[index] ?? 1,
-							flexShrink: 1,
-						}}
-					>
-						<PaneNodeView
-							node={child}
-							registry={registry}
-							onAddPane={onAddPane}
-							renderUnknownPane={renderUnknownPane}
-							root={root}
-							store={store}
-						/>
-					</div>,
-				];
-
-				if (index < node.children.length - 1) {
-					items.push(
-						<PaneSplitHandle
-							key={`${node.id}:separator:${index}`}
-							onDoubleClick={() =>
-								store.getState().equalizeSplit({
-									rootId: root.id,
-									splitId: node.id,
-								})
-							}
-							orientation={node.direction}
-						/>,
-					);
-				}
-
-				return items;
-			})}
-		</div>
-	);
-}
diff --git a/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneNodeView/index.ts b/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneNodeView/index.ts
deleted file mode 100644
index 3eed51dcfa7..00000000000
--- a/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneNodeView/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { PaneNodeView } from "./PaneNodeView";
diff --git a/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneRootTabs/components/PaneRootTabItem/components/RootRenameInput/index.ts b/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneRootTabs/components/PaneRootTabItem/components/RootRenameInput/index.ts
deleted file mode 100644
index 34c4f38a0b8..00000000000
--- a/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneRootTabs/components/PaneRootTabItem/components/RootRenameInput/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { RootRenameInput } from "./RootRenameInput";
diff --git a/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneRootTabs/components/PaneRootTabItem/index.ts b/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneRootTabs/components/PaneRootTabItem/index.ts
deleted file mode 100644
index bc91d9a299e..00000000000
--- a/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneRootTabs/components/PaneRootTabItem/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { PaneRootTabItem } from "./PaneRootTabItem";
diff --git a/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneRootTabs/index.ts b/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneRootTabs/index.ts
deleted file mode 100644
index ef90a6f990f..00000000000
--- a/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneRootTabs/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { PaneRootTabs } from "./PaneRootTabs";
diff --git a/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneRootView/PaneRootView.tsx b/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneRootView/PaneRootView.tsx
deleted file mode 100644
index 5e8fbddef2a..00000000000
--- a/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneRootView/PaneRootView.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import type { StoreApi } from "zustand/vanilla";
-import type { PaneWorkspaceStore } from "../../../../../core/store";
-import type { PaneRootState } from "../../../../../types";
-import type { PaneRegistry, PaneRendererContext } from "../../../../types";
-import { PaneNodeView } from "../PaneNodeView";
-
-interface PaneRootViewProps<TPaneData> {
-	store: StoreApi<PaneWorkspaceStore<TPaneData>>;
-	root: PaneRootState<TPaneData> | null;
-	registry: PaneRegistry<TPaneData>;
-	onAddPane?: (args: {
-		store: StoreApi<PaneWorkspaceStore<TPaneData>>;
-		root: PaneRootState<TPaneData>;
-		group: import("../../../../../types").PaneGroupNode<TPaneData>;
-	}) => void;
-	renderEmptyState?: () => React.ReactNode;
-	renderUnknownPane?: (
-		context: PaneRendererContext<TPaneData>,
-	) => React.ReactNode;
-}
-
-export function PaneRootView<TPaneData>({
-	store,
-	root,
-	registry,
-	onAddPane,
-	renderEmptyState,
-	renderUnknownPane,
-}: PaneRootViewProps<TPaneData>) {
-	if (!root) {
-		return (
-			<div className="flex min-h-0 min-w-0 flex-1 items-center justify-center text-sm text-muted-foreground">
-				{renderEmptyState?.() ?? "No panes open"}
-			</div>
-		);
-	}
-
-	return (
-		<div className="flex min-h-0 min-w-0 flex-1 overflow-hidden">
-			<PaneNodeView
-				node={root.root}
-				registry={registry}
-				onAddPane={onAddPane}
-				renderUnknownPane={renderUnknownPane}
-				root={root}
-				store={store}
-			/>
-		</div>
-	);
-}
diff --git a/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneRootView/index.ts b/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneRootView/index.ts
deleted file mode 100644
index 9ebe1e4365f..00000000000
--- a/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneRootView/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { PaneRootView } from "./PaneRootView";
diff --git a/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneSplitHandle/PaneSplitHandle.tsx b/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneSplitHandle/PaneSplitHandle.tsx
deleted file mode 100644
index c413ed0687c..00000000000
--- a/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneSplitHandle/PaneSplitHandle.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import { cn } from "@superset/ui/lib/utils";
-
-interface PaneSplitHandleProps {
-	orientation: "horizontal" | "vertical";
-	onDoubleClick: () => void;
-}
-
-export function PaneSplitHandle({
-	orientation,
-	onDoubleClick,
-}: PaneSplitHandleProps) {
-	const isHorizontal = orientation === "horizontal";
-
-	return (
-		<button
-			aria-label="Equalize split"
-			className={cn(
-				"group bg-border focus-visible:ring-ring relative flex shrink-0 items-center justify-center transition-colors hover:bg-border/90 focus-visible:ring-1 focus-visible:ring-offset-1 focus-visible:outline-hidden",
-				isHorizontal
-					? "h-full w-px cursor-col-resize after:absolute after:inset-y-0 after:left-1/2 after:w-1 after:-translate-x-1/2"
-					: "h-px w-full cursor-row-resize after:absolute after:inset-x-0 after:top-1/2 after:h-1 after:-translate-y-1/2",
-			)}
-			onDoubleClick={onDoubleClick}
-			type="button"
-		>
-			<span
-				className={cn(
-					"bg-border/80 rounded-full opacity-0 transition-opacity group-hover:opacity-100",
-					isHorizontal ? "h-10 w-[3px]" : "h-[3px] w-10",
-				)}
-			/>
-		</button>
-	);
-}
diff --git a/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneSplitHandle/index.ts b/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneSplitHandle/index.ts
deleted file mode 100644
index 79c76698e5a..00000000000
--- a/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneSplitHandle/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { PaneSplitHandle } from "./PaneSplitHandle";
diff --git a/packages/pane-layout/src/react/components/PaneWorkspace/index.ts b/packages/pane-layout/src/react/components/PaneWorkspace/index.ts
deleted file mode 100644
index 4d331628f27..00000000000
--- a/packages/pane-layout/src/react/components/PaneWorkspace/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { PaneWorkspace } from "./PaneWorkspace";
diff --git a/packages/pane-layout/src/react/components/index.ts b/packages/pane-layout/src/react/components/index.ts
deleted file mode 100644
index 4d331628f27..00000000000
--- a/packages/pane-layout/src/react/components/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { PaneWorkspace } from "./PaneWorkspace";
diff --git a/packages/pane-layout/src/react/hooks/index.ts b/packages/pane-layout/src/react/hooks/index.ts
deleted file mode 100644
index 18ea78b5973..00000000000
--- a/packages/pane-layout/src/react/hooks/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { usePaneWorkspaceStore } from "./usePaneWorkspaceStore";
diff --git a/packages/pane-layout/src/react/hooks/usePaneWorkspaceStore/index.ts b/packages/pane-layout/src/react/hooks/usePaneWorkspaceStore/index.ts
deleted file mode 100644
index 18ea78b5973..00000000000
--- a/packages/pane-layout/src/react/hooks/usePaneWorkspaceStore/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { usePaneWorkspaceStore } from "./usePaneWorkspaceStore";
diff --git a/packages/pane-layout/src/react/hooks/usePaneWorkspaceStore/usePaneWorkspaceStore.ts b/packages/pane-layout/src/react/hooks/usePaneWorkspaceStore/usePaneWorkspaceStore.ts
deleted file mode 100644
index c7e7bbd7687..00000000000
--- a/packages/pane-layout/src/react/hooks/usePaneWorkspaceStore/usePaneWorkspaceStore.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { useStore } from "zustand";
-import type { StoreApi } from "zustand/vanilla";
-import type { PaneWorkspaceStore } from "../../../core/store";
-
-export function usePaneWorkspaceStore<TPaneData, TSelected>(
-	store: StoreApi<PaneWorkspaceStore<TPaneData>>,
-	selector: (state: PaneWorkspaceStore<TPaneData>) => TSelected,
-): TSelected {
-	return useStore(store, selector);
-}
diff --git a/packages/pane-layout/src/react/index.ts b/packages/pane-layout/src/react/index.ts
deleted file mode 100644
index 9505312520d..00000000000
--- a/packages/pane-layout/src/react/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export { PaneWorkspace } from "./components";
-export { usePaneWorkspaceStore } from "./hooks";
-export type {
-	PaneDefinition,
-	PaneRegistry,
-	PaneRendererContext,
-	PaneWorkspaceProps,
-} from "./types";
diff --git a/packages/pane-layout/src/react/types.ts b/packages/pane-layout/src/react/types.ts
deleted file mode 100644
index 60bb2605763..00000000000
--- a/packages/pane-layout/src/react/types.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import type { ReactNode } from "react";
-import type { StoreApi } from "zustand/vanilla";
-import type { PaneWorkspaceStore } from "../core/store";
-import type { PaneGroupNode, PaneRootState, PaneState } from "../types";
-
-export interface PaneRendererContext<TPaneData> {
-	store: StoreApi<PaneWorkspaceStore<TPaneData>>;
-	root: PaneRootState<TPaneData>;
-	group: PaneGroupNode<TPaneData>;
-	pane: PaneState<TPaneData>;
-	isActive: boolean;
-}
-
-export interface PaneDefinition<TPaneData> {
-	renderPane: (context: PaneRendererContext<TPaneData>) => ReactNode;
-	getTitle?: (context: PaneRendererContext<TPaneData>) => ReactNode;
-	getIcon?: (context: PaneRendererContext<TPaneData>) => ReactNode;
-	renderTabAccessory?: (context: PaneRendererContext<TPaneData>) => ReactNode;
-}
-
-export type PaneRegistry<TPaneData> = Record<string, PaneDefinition<TPaneData>>;
-
-export interface PaneWorkspaceProps<TPaneData> {
-	store: StoreApi<PaneWorkspaceStore<TPaneData>>;
-	registry: PaneRegistry<TPaneData>;
-	className?: string;
-	getRootTitle?: (root: PaneRootState<TPaneData>) => ReactNode;
-	onAddRoot?: (args: {
-		store: StoreApi<PaneWorkspaceStore<TPaneData>>;
-	}) => void;
-	renderAddRootMenu?: (args: {
-		store: StoreApi<PaneWorkspaceStore<TPaneData>>;
-	}) => ReactNode;
-	onAddPane?: (args: {
-		store: StoreApi<PaneWorkspaceStore<TPaneData>>;
-		root: PaneRootState<TPaneData>;
-		group: PaneGroupNode<TPaneData>;
-	}) => void;
-	renderEmptyState?: () => ReactNode;
-	renderUnknownPane?: (context: PaneRendererContext<TPaneData>) => ReactNode;
-}
diff --git a/packages/pane-layout/src/types.ts b/packages/pane-layout/src/types.ts
deleted file mode 100644
index 58f3a2fd8d0..00000000000
--- a/packages/pane-layout/src/types.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-export type PaneSplitDirection = "horizontal" | "vertical";
-export type PaneSplitPosition = "top" | "right" | "bottom" | "left";
-
-export interface PaneState<TPaneData> {
-	id: string;
-	kind: string;
-	titleOverride?: string;
-	pinned?: boolean;
-	data: TPaneData;
-}
-
-export interface PaneGroupNode<TPaneData> {
-	type: "group";
-	id: string;
-	activePaneId: string | null;
-	panes: Array<PaneState<TPaneData>>;
-}
-
-export interface PaneSplitNode<TPaneData> {
-	type: "split";
-	id: string;
-	direction: PaneSplitDirection;
-	sizes: number[];
-	children: Array<PaneLayoutNode<TPaneData>>;
-}
-
-export type PaneLayoutNode<TPaneData> =
-	| PaneGroupNode<TPaneData>
-	| PaneSplitNode<TPaneData>;
-
-export interface PaneRootState<TPaneData> {
-	id: string;
-	titleOverride?: string;
-	root: PaneLayoutNode<TPaneData>;
-	activeGroupId: string | null;
-}
-
-export interface PaneWorkspaceState<TPaneData> {
-	version: 1;
-	roots: Array<PaneRootState<TPaneData>>;
-	activeRootId: string | null;
-}
-
-export type DropTarget =
-	| {
-			type: "group-center";
-			rootId: string;
-			groupId: string;
-	  }
-	| {
-			type: "split";
-			rootId: string;
-			groupId: string;
-			position: PaneSplitPosition;
-	  };
diff --git a/packages/panes/README.md b/packages/panes/README.md
new file mode 100644
index 00000000000..dce39c6aba6
--- /dev/null
+++ b/packages/panes/README.md
@@ -0,0 +1,343 @@
+# @superset/panes
+
+A generic, headless workspace layout engine. Tabs hold panes arranged in split layouts. The package provides the data model, store, and React components — you provide the pane content.
+
+## Concepts
+
+```
+Workspace
+├── Tab (chat, terminal, etc.)
+│   ├── Pane A ──┐
+│   ├── Pane B   ├── split layout (horizontal/vertical, n-ary, weighted)
+│   └── Pane C ──┘
+├── Tab
+│   └── Pane D (single pane, no splits)
+└── ...
+```
+
+- **Workspace** — top-level container. Holds tabs, tracks the active tab.
+- **Tab** — a named workspace context. Each tab has a split layout of panes and a flat pane data map.
+- **Pane** — a leaf in the layout tree. Typed with your own data (`TData`). Rendered by a registry of pane definitions.
+- **Layout tree** — purely structural. Describes how panes are arranged (splits + weights) but holds no pane data — just `paneId` references into the tab's flat `panes` map.
+
+## Quick Start
+
+### 1. Define your pane data type
+
+```tsx
+type MyPaneData =
+  | { kind: "editor"; filePath: string }
+  | { kind: "terminal"; sessionId: string }
+  | { kind: "browser"; url: string };
+```
+
+### 2. Create a pane registry
+
+The registry tells the layout engine how to render each pane kind:
+
+```tsx
+import type { PaneRegistry } from "@superset/panes";
+
+const registry: PaneRegistry<MyPaneData> = {
+  // Simple pane — just title + icon, default header
+  terminal: {
+    renderPane: (ctx) => <Terminal sessionId={ctx.pane.data.sessionId} />,
+    getTitle: () => "Terminal",
+    getIcon: () => <TerminalIcon />,
+  },
+
+  // Full toolbar eject (browser needs nav buttons + URL bar)
+  browser: {
+    renderPane: (ctx) => <Webview url={ctx.pane.data.url} />,
+    renderToolbar: (ctx) => <BrowserToolbar context={ctx} />,
+    getTitle: (ctx) => ctx.pane.data.url,
+    getIcon: () => <GlobeIcon />,
+  },
+};
+```
+
+### 3. Create the store
+
+```tsx
+import { createWorkspaceStore, createTab, createPane } from "@superset/panes";
+
+const store = createWorkspaceStore<MyPaneData>({
+  initialState: {
+    version: 1,
+    tabs: [
+      createTab({
+        titleOverride: "My Tab",
+        panes: [
+          createPane({ kind: "terminal", data: { kind: "terminal", sessionId: "abc" } }),
+        ],
+      }),
+    ],
+    activeTabId: null, // auto-set to first tab
+  },
+});
+```
+
+### 4. Render the workspace
+
+```tsx
+import { Workspace } from "@superset/panes";
+
+function App() {
+  return (
+    <Workspace
+      store={store}
+      registry={registry}
+      renderAddTabMenu={() => (
+        <DropdownMenu>
+          <DropdownMenuItem onSelect={() => addTerminalTab()}>
+            <TerminalIcon /> Terminal
+          </DropdownMenuItem>
+          <DropdownMenuItem onSelect={() => addChatTab()}>
+            <ChatIcon /> Chat
+          </DropdownMenuItem>
+          <DropdownMenuItem onSelect={() => addBrowserTab()}>
+            <GlobeIcon /> Browser
+          </DropdownMenuItem>
+        </DropdownMenu>
+      )}
+      renderTabAccessory={(tab) => <StatusDot tab={tab} />}
+    />
+  );
+}
+```
+
+That's it. You get a tab bar, split panes with resizable handles, pane headers with close buttons, and context menus — all wired up.
+
+## Data Model
+
+### Layout Tree
+
+The layout is a tree of split nodes and pane leaves:
+
+```ts
+type LayoutNode =
+  | { type: "pane"; paneId: string }
+  | { type: "split"; id: string; direction: "horizontal" | "vertical"; children: LayoutNode[]; weights: number[] };
+```
+
+Splits are **n-ary** (not binary) — a 3-way split is `children: [A, B, C], weights: [1, 1, 1]`, not nested binary nodes.
+
+**Weights** are relative, not percentages. `[1, 1, 1]` = equal thirds. `[3, 2]` = 60/40. They don't need to sum to any specific value — CSS `flex-grow` handles the proportional rendering.
+
+### Pane
+
+```ts
+interface Pane<TData> {
+  id: string;
+  kind: string;           // maps to a key in your PaneRegistry
+  titleOverride?: string; // overrides getTitle() from registry
+  pinned?: boolean;       // unpinned panes can be replaced in-place (preview mode)
+  data: TData;            // your pane-specific state
+}
+```
+
+### Tab
+
+```ts
+interface Tab<TData> {
+  id: string;
+  titleOverride?: string;
+  createdAt: number;
+  activePaneId: string | null;
+  layout: LayoutNode | null;
+  panes: Record<string, Pane<TData>>;  // flat map — layout tree references these by paneId
+}
+```
+
+The **flat `panes` map** is separate from the layout tree. The tree is purely structural (`paneId` references), pane data lives in the map. This gives you O(1) pane lookup and clean separation of layout vs data.
+
+## Store
+
+The store is a vanilla zustand `StoreApi` (not a React hook store). This is intentional:
+- Stable reference — created once, passed as a prop
+- Subscribable from both React (`useStore`) and non-React code (`store.subscribe`)
+- Works with any persistence layer (localStorage, IndexedDB, TanStack DB, etc.) via `replaceState` for hydration and `store.subscribe` for writes
+
+Create it with `createWorkspaceStore()` and pass it to `<Workspace>`.
+
+### Tab actions
+
+```ts
+store.getState().addTab(tab)
+store.getState().removeTab(tabId)
+store.getState().setActiveTab(tabId)
+store.getState().setTabTitleOverride(tabId, title)
+store.getState().getTab(tabId)
+store.getState().getActiveTab()
+```
+
+### Pane actions
+
+```ts
+store.getState().setActivePane(tabId, paneId)
+store.getState().getPane(paneId)          // searches across all tabs
+store.getState().getActivePane(tabId?)
+store.getState().closePane(tabId, paneId) // removes from layout + panes, collapses empty splits
+store.getState().setPaneData(paneId, data)
+store.getState().setPaneTitleOverride(tabId, paneId, title)
+store.getState().setPanePinned(tabId, paneId, pinned)
+store.getState().replacePane(tabId, paneId, newPane) // swap unpinned pane in-place, no-op if pinned
+```
+
+### Split actions
+
+```ts
+store.getState().splitPane(tabId, paneId, position, newPane, weights?)
+// position: "top" | "right" | "bottom" | "left"
+// splits the target pane, steals space from it (other panes untouched)
+
+store.getState().addPane(tabId, pane, position?, relativeToPaneId?)
+// ergonomic wrapper — splits relative to a target, or appends to edge
+
+store.getState().resizeSplit(tabId, splitId, weights)
+store.getState().equalizeSplit(tabId, splitId) // sets all weights to 1
+```
+
+### Bulk
+
+```ts
+store.getState().replaceState(newState)
+store.getState().replaceState((prev) => ({ ...prev, ... }))
+```
+
+## Pane Registry
+
+Each pane kind registers how it renders:
+
+```ts
+interface PaneDefinition<TData> {
+  renderPane(context: RendererContext<TData>): ReactNode;     // required — the pane content
+  getTitle?(context: RendererContext<TData>): ReactNode;       // derived title (titleOverride wins)
+  getIcon?(context: RendererContext<TData>): ReactNode;        // icon in the pane header
+  renderToolbar?(context: RendererContext<TData>): ReactNode;  // full eject — replaces entire header content
+}
+```
+
+## RendererContext
+
+Every registry method receives a `RendererContext` with the pane's data and pre-wired actions:
+
+```ts
+interface RendererContext<TData> {
+  pane: Pane<TData>;
+  tab: Tab<TData>;
+  isActive: boolean;
+  store: StoreApi<WorkspaceStore<TData>>;  // escape hatch
+
+  actions: {
+    close: () => void;
+    focus: () => void;
+    setTitle: (title: string) => void;
+    pin: () => void;
+    updateData: (data: TData) => void;
+    splitRight: (newPane: Pane<TData>) => void;
+    splitDown: (newPane: Pane<TData>) => void;
+  };
+}
+```
+
+Use `context.actions.*` for normal operations. The `store` is an escape hatch for advanced cases (e.g. setting a tab title from within a pane).
+
+## Hooks
+
+Use these inside your pane components to register behavior with the layout engine:
+
+### useOnBeforeClose
+
+Register a close guard. Return `false` to cancel the close (e.g. show a "Save changes?" dialog):
+
+```tsx
+function EditorPane({ context }: { context: RendererContext<MyPaneData> }) {
+  const isDirty = useDirtyState();
+
+  useOnBeforeClose(context, async () => {
+    if (!isDirty) return true;
+    return await showSaveConfirmation(); // returns true/false
+  }, [isDirty]);
+
+  return <CodeEditor />;
+}
+```
+
+### useContextMenuActions
+
+Register pane-specific context menu items. These appear after the default items (Close, Split Right, Split Down):
+
+```tsx
+function BrowserPane({ context }: { context: RendererContext<MyPaneData> }) {
+  const webviewRef = useRef<WebviewTag>(null);
+
+  useContextMenuActions(context, [
+    { label: "Refresh", icon: <RefreshIcon />, shortcut: "⌘R", onSelect: () => webviewRef.current?.reload() },
+    { type: "separator" },
+    { label: "Open in External Browser", icon: <ExternalIcon />, onSelect: () => shell.openExternal(context.pane.data.url) },
+  ], [context.pane.data.url]);
+
+  return <webview ref={webviewRef} src={context.pane.data.url} />;
+}
+```
+
+Context menu items support:
+- `variant: "destructive"` — red text styling
+- `shortcut` — display-only keyboard hint (e.g. `"⌘K"`)
+- `disabled` — grayed out
+- `type: "separator"` — visual divider
+- `type: "submenu"` — nested menu with `items`
+
+## Splitting
+
+When you split a pane, the new pane steals space from the target. Other panes are untouched.
+
+```ts
+// Single pane → 50/50 split
+store.getState().splitPane(tabId, "pane-a", "right", newPane);
+// Result: horizontal split, weights [1, 1]
+
+// Already in a same-direction split → target's weight is halved
+// Before: horizontal [3, 2, 1], split pane[1] right
+// After:  horizontal [3, 1, 1, 1]
+```
+
+Position determines direction and order:
+- `"left"` / `"right"` → horizontal split
+- `"top"` / `"bottom"` → vertical split
+- `"left"` / `"top"` → new pane goes first
+- `"right"` / `"bottom"` → new pane goes second
+
+## Preview Panes (Pin/Unpin)
+
+Unpinned panes can be replaced in-place without creating a new split — useful for file preview (click a file → replaces the preview pane, double-click or edit → pins it):
+
+```ts
+// Find any unpinned file pane in the tab
+const preview = Object.values(tab.panes).find(p => p.kind === "file" && !p.pinned);
+
+if (preview) {
+  store.getState().replacePane(tabId, preview.id, newFilePane);
+} else {
+  store.getState().splitPane(tabId, activePaneId, "right", newFilePane);
+}
+```
+
+Pin from inside a pane component (e.g. on first edit):
+
+```tsx
+context.actions.pin();
+```
+
+## Workspace Props
+
+```ts
+<Workspace
+  store={store}
+  registry={registry}
+  renderTabAccessory={(tab) => ReactNode}   // custom UI in each tab (status dot, badge, etc.)
+  renderEmptyState={() => ReactNode}        // shown when no tabs exist
+  renderAddTabMenu={() => ReactNode}        // dropdown content for "+" button in tab bar
+/>
+```
diff --git a/packages/pane-layout/package.json b/packages/panes/package.json
similarity index 94%
rename from packages/pane-layout/package.json
rename to packages/panes/package.json
index de598c9aaf5..7af0a4daf99 100644
--- a/packages/pane-layout/package.json
+++ b/packages/panes/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "@superset/pane-layout",
+	"name": "@superset/panes",
 	"version": "0.1.0",
 	"private": true,
 	"type": "module",
diff --git a/packages/panes/src/core/store/index.ts b/packages/panes/src/core/store/index.ts
new file mode 100644
index 00000000000..73deab21a67
--- /dev/null
+++ b/packages/panes/src/core/store/index.ts
@@ -0,0 +1,7 @@
+export type {
+	CreatePaneInput,
+	CreateTabInput,
+	CreateWorkspaceStoreOptions,
+	WorkspaceStore,
+} from "./store";
+export { createWorkspaceStore } from "./store";
diff --git a/packages/panes/src/core/store/store.test.ts b/packages/panes/src/core/store/store.test.ts
new file mode 100644
index 00000000000..66258b8b39f
--- /dev/null
+++ b/packages/panes/src/core/store/store.test.ts
@@ -0,0 +1,617 @@
+import { describe, expect, it } from "bun:test";
+import type { WorkspaceState } from "../../types";
+import type { CreatePaneInput } from "./store";
+import { createWorkspaceStore } from "./store";
+
+interface TestData {
+	label: string;
+}
+
+function tp(id: string, label = id): CreatePaneInput<TestData> {
+	return { id, kind: "test", data: { label } };
+}
+
+function makeStore(initialState?: WorkspaceState<TestData>) {
+	return createWorkspaceStore<TestData>(
+		initialState ? { initialState } : undefined,
+	);
+}
+
+describe("tab operations", () => {
+	it("adds a tab and auto-sets activeTabId", () => {
+		const store = makeStore();
+
+		store.getState().addTab({ id: "t1", panes: [tp("p1")] });
+
+		expect(store.getState().tabs).toHaveLength(1);
+		expect(store.getState().activeTabId).toBe("t1");
+	});
+
+	it("removes the active tab and falls back to neighbor", () => {
+		const store = makeStore();
+		store.getState().addTab({ id: "t1", panes: [tp("p1")] });
+		store.getState().addTab({ id: "t2", panes: [tp("p2")] });
+		store.getState().setActiveTab("t1");
+
+		store.getState().removeTab("t1");
+
+		expect(store.getState().tabs).toHaveLength(1);
+		expect(store.getState().activeTabId).toBe("t2");
+	});
+
+	it("removes the only tab and sets activeTabId to null", () => {
+		const store = makeStore();
+		store.getState().addTab({ id: "t1", panes: [tp("p1")] });
+
+		store.getState().removeTab("t1");
+
+		expect(store.getState().tabs).toHaveLength(0);
+		expect(store.getState().activeTabId).toBeNull();
+	});
+
+	it("sets active tab", () => {
+		const store = makeStore();
+		store.getState().addTab({ id: "t1", panes: [tp("p1")] });
+		store.getState().addTab({ id: "t2", panes: [tp("p2")] });
+
+		store.getState().setActiveTab("t2");
+		expect(store.getState().activeTabId).toBe("t2");
+	});
+
+	it("sets tab title override", () => {
+		const store = makeStore();
+		store.getState().addTab({ id: "t1", panes: [tp("p1")] });
+
+		store.getState().setTabTitleOverride({
+			tabId: "t1",
+			titleOverride: "Renamed",
+		});
+
+		expect(store.getState().tabs[0]?.titleOverride).toBe("Renamed");
+	});
+});
+
+describe("pane operations", () => {
+	it("sets active pane within a tab", () => {
+		const store = makeStore();
+		store.getState().addTab({
+			id: "t1",
+			panes: [tp("p1"), tp("p2")],
+			activePaneId: "p1",
+		});
+
+		store.getState().setActivePane({ tabId: "t1", paneId: "p2" });
+		expect(store.getState().tabs[0]?.activePaneId).toBe("p2");
+	});
+
+	it("gets pane by ID across tabs", () => {
+		const store = makeStore();
+		store.getState().addTab({ id: "t1", panes: [tp("p1")] });
+		store.getState().addTab({ id: "t2", panes: [tp("p2", "second")] });
+
+		const result = store.getState().getPane("p2");
+		expect(result?.tabId).toBe("t2");
+		expect(result?.pane.data.label).toBe("second");
+	});
+
+	it("gets active pane with and without explicit tabId", () => {
+		const store = makeStore();
+		store.getState().addTab({
+			id: "t1",
+			panes: [tp("p1", "A")],
+			activePaneId: "p1",
+		});
+		store.getState().addTab({
+			id: "t2",
+			panes: [tp("p2", "B")],
+			activePaneId: "p2",
+		});
+		store.getState().setActiveTab("t2");
+
+		expect(store.getState().getActivePane()?.pane.data.label).toBe("B");
+		expect(store.getState().getActivePane("t1")?.pane.data.label).toBe("A");
+	});
+
+	it("sets pane data in-place", () => {
+		const store = makeStore();
+		store.getState().addTab({ id: "t1", panes: [tp("p1", "old")] });
+
+		store.getState().setPaneData({ paneId: "p1", data: { label: "new" } });
+		expect(store.getState().getPane("p1")?.pane.data.label).toBe("new");
+	});
+
+	it("sets pane title override", () => {
+		const store = makeStore();
+		store.getState().addTab({ id: "t1", panes: [tp("p1")] });
+
+		store.getState().setPaneTitleOverride({
+			tabId: "t1",
+			paneId: "p1",
+			titleOverride: "Custom",
+		});
+
+		expect(store.getState().getPane("p1")?.pane.titleOverride).toBe("Custom");
+	});
+
+	it("pins a pane", () => {
+		const store = makeStore();
+		store.getState().addTab({ id: "t1", panes: [tp("p1")] });
+
+		store.getState().setPanePinned({
+			tabId: "t1",
+			paneId: "p1",
+			pinned: true,
+		});
+
+		expect(store.getState().getPane("p1")?.pane.pinned).toBe(true);
+	});
+
+	it("replaces an unpinned pane with a new pane", () => {
+		const store = makeStore();
+		store.getState().addTab({
+			id: "t1",
+			panes: [{ ...tp("p1", "old"), pinned: false }],
+			activePaneId: "p1",
+		});
+
+		store.getState().replacePane({
+			tabId: "t1",
+			paneId: "p1",
+			newPane: tp("p2", "new"),
+		});
+
+		const tab = store.getState().tabs[0];
+		expect(tab).toBeDefined();
+		expect(tab?.panes.p1).toBeUndefined();
+		expect(tab?.panes.p2?.data.label).toBe("new");
+		expect(tab?.activePaneId).toBe("p2");
+		expect(tab?.layout?.type === "pane" ? tab.layout.paneId : null).toBe("p2");
+	});
+
+	it("replacePane is no-op if target pane is pinned", () => {
+		const store = makeStore();
+		store.getState().addTab({
+			id: "t1",
+			panes: [{ ...tp("p1"), pinned: true }],
+		});
+
+		const before = structuredClone({
+			version: store.getState().version,
+			tabs: store.getState().tabs,
+			activeTabId: store.getState().activeTabId,
+		});
+		store.getState().replacePane({
+			tabId: "t1",
+			paneId: "p1",
+			newPane: tp("p2"),
+		});
+
+		expect({
+			version: store.getState().version,
+			tabs: store.getState().tabs,
+			activeTabId: store.getState().activeTabId,
+		}).toEqual(before);
+	});
+});
+
+describe("split operations", () => {
+	it("splits a single pane into a split with weights [1, 1]", () => {
+		const store = makeStore();
+		store.getState().addTab({ id: "t1", panes: [tp("p1")] });
+
+		store.getState().splitPane({
+			tabId: "t1",
+			paneId: "p1",
+			position: "right",
+			newPane: tp("p2"),
+		});
+
+		const layout = store.getState().tabs[0]?.layout;
+		expect(layout?.type).toBe("split");
+		if (layout?.type === "split") {
+			expect(layout.direction).toBe("horizontal");
+			expect(layout.weights).toEqual([1, 1]);
+			expect(layout.children).toHaveLength(2);
+			expect(layout.children[0]).toEqual({ type: "pane", paneId: "p1" });
+			expect(layout.children[1]).toEqual({ type: "pane", paneId: "p2" });
+		}
+	});
+
+	it("split left puts new pane first", () => {
+		const store = makeStore();
+		store.getState().addTab({ id: "t1", panes: [tp("p1")] });
+
+		store.getState().splitPane({
+			tabId: "t1",
+			paneId: "p1",
+			position: "left",
+			newPane: tp("p2"),
+		});
+
+		const layout = store.getState().tabs[0]?.layout;
+		if (layout?.type === "split") {
+			expect(layout.direction).toBe("horizontal");
+			expect(layout.children[0]).toEqual({ type: "pane", paneId: "p2" });
+			expect(layout.children[1]).toEqual({ type: "pane", paneId: "p1" });
+		}
+	});
+
+	it("split top/bottom uses vertical direction", () => {
+		const store = makeStore();
+		store.getState().addTab({ id: "t1", panes: [tp("p1")] });
+
+		store.getState().splitPane({
+			tabId: "t1",
+			paneId: "p1",
+			position: "bottom",
+			newPane: tp("p2"),
+		});
+
+		const layout = store.getState().tabs[0]?.layout;
+		if (layout?.type === "split") {
+			expect(layout.direction).toBe("vertical");
+			expect(layout.children[0]).toEqual({ type: "pane", paneId: "p1" });
+			expect(layout.children[1]).toEqual({ type: "pane", paneId: "p2" });
+		}
+	});
+
+	it("split within same-direction split halves target weight and inserts adjacent", () => {
+		const store = makeStore({
+			version: 1,
+			tabs: [
+				{
+					id: "t1",
+					createdAt: Date.now(),
+					activePaneId: "p1",
+					layout: {
+						type: "split",
+						id: "s1",
+						direction: "horizontal",
+						children: [
+							{ type: "pane", paneId: "p1" },
+							{ type: "pane", paneId: "p2" },
+							{ type: "pane", paneId: "p3" },
+						],
+						weights: [3, 2, 1],
+					},
+					panes: {
+						p1: { id: "p1", kind: "test", data: { label: "p1" } },
+						p2: { id: "p2", kind: "test", data: { label: "p2" } },
+						p3: { id: "p3", kind: "test", data: { label: "p3" } },
+					},
+				},
+			],
+			activeTabId: "t1",
+		});
+
+		store.getState().splitPane({
+			tabId: "t1",
+			paneId: "p2",
+			position: "right",
+			newPane: tp("p4"),
+		});
+
+		const layout = store.getState().tabs[0]?.layout;
+		if (layout?.type === "split") {
+			expect(layout.weights).toEqual([3, 1, 1, 1]);
+			expect(layout.children).toHaveLength(4);
+			expect(layout.children[2]).toEqual({ type: "pane", paneId: "p4" });
+		}
+	});
+
+	it("split with custom weights", () => {
+		const store = makeStore();
+		store.getState().addTab({ id: "t1", panes: [tp("p1")] });
+
+		store.getState().splitPane({
+			tabId: "t1",
+			paneId: "p1",
+			position: "right",
+			newPane: tp("p2"),
+			weights: [3, 1],
+		});
+
+		const layout = store.getState().tabs[0]?.layout;
+		if (layout?.type === "split") {
+			expect(layout.weights).toEqual([3, 1]);
+		}
+	});
+
+	it("split with selectNewPane: false preserves focus", () => {
+		const store = makeStore();
+		store.getState().addTab({
+			id: "t1",
+			panes: [tp("p1")],
+			activePaneId: "p1",
+		});
+
+		store.getState().splitPane({
+			tabId: "t1",
+			paneId: "p1",
+			position: "right",
+			newPane: tp("p2"),
+			selectNewPane: false,
+		});
+
+		expect(store.getState().tabs[0]?.activePaneId).toBe("p1");
+	});
+
+	it("resizes a split", () => {
+		const store = makeStore({
+			version: 1,
+			tabs: [
+				{
+					id: "t1",
+					createdAt: Date.now(),
+					activePaneId: "p1",
+					layout: {
+						type: "split",
+						id: "s1",
+						direction: "horizontal",
+						children: [
+							{ type: "pane", paneId: "p1" },
+							{ type: "pane", paneId: "p2" },
+						],
+						weights: [1, 1],
+					},
+					panes: {
+						p1: { id: "p1", kind: "test", data: { label: "p1" } },
+						p2: { id: "p2", kind: "test", data: { label: "p2" } },
+					},
+				},
+			],
+			activeTabId: "t1",
+		});
+
+		store.getState().resizeSplit({
+			tabId: "t1",
+			splitId: "s1",
+			weights: [3, 7],
+		});
+
+		const layout = store.getState().tabs[0]?.layout;
+		if (layout?.type === "split") {
+			expect(layout.weights).toEqual([3, 7]);
+		}
+	});
+
+	it("equalizes a split — all weights become 1", () => {
+		const store = makeStore({
+			version: 1,
+			tabs: [
+				{
+					id: "t1",
+					createdAt: Date.now(),
+					activePaneId: "p1",
+					layout: {
+						type: "split",
+						id: "s1",
+						direction: "horizontal",
+						children: [
+							{ type: "pane", paneId: "p1" },
+							{ type: "pane", paneId: "p2" },
+							{ type: "pane", paneId: "p3" },
+						],
+						weights: [10, 30, 60],
+					},
+					panes: {
+						p1: { id: "p1", kind: "test", data: { label: "p1" } },
+						p2: { id: "p2", kind: "test", data: { label: "p2" } },
+						p3: { id: "p3", kind: "test", data: { label: "p3" } },
+					},
+				},
+			],
+			activeTabId: "t1",
+		});
+
+		store.getState().equalizeSplit({ tabId: "t1", splitId: "s1" });
+
+		const layout = store.getState().tabs[0]?.layout;
+		if (layout?.type === "split") {
+			expect(layout.weights).toEqual([1, 1, 1]);
+		}
+	});
+});
+
+describe("collapsing", () => {
+	it("close pane in 2-pane split collapses to remaining leaf", () => {
+		const store = makeStore({
+			version: 1,
+			tabs: [
+				{
+					id: "t1",
+					createdAt: Date.now(),
+					activePaneId: "p1",
+					layout: {
+						type: "split",
+						id: "s1",
+						direction: "horizontal",
+						children: [
+							{ type: "pane", paneId: "p1" },
+							{ type: "pane", paneId: "p2" },
+						],
+						weights: [1, 1],
+					},
+					panes: {
+						p1: { id: "p1", kind: "test", data: { label: "p1" } },
+						p2: { id: "p2", kind: "test", data: { label: "p2" } },
+					},
+				},
+			],
+			activeTabId: "t1",
+		});
+
+		store.getState().closePane({ tabId: "t1", paneId: "p1" });
+
+		const tab = store.getState().tabs[0];
+		expect(tab).toBeDefined();
+		expect(tab?.layout).toEqual({ type: "pane", paneId: "p2" });
+		expect(tab?.activePaneId).toBe("p2");
+		expect(tab?.panes.p1).toBeUndefined();
+	});
+
+	it("close pane in 3-pane split removes child + weight", () => {
+		const store = makeStore({
+			version: 1,
+			tabs: [
+				{
+					id: "t1",
+					createdAt: Date.now(),
+					activePaneId: "p2",
+					layout: {
+						type: "split",
+						id: "s1",
+						direction: "horizontal",
+						children: [
+							{ type: "pane", paneId: "p1" },
+							{ type: "pane", paneId: "p2" },
+							{ type: "pane", paneId: "p3" },
+						],
+						weights: [3, 2, 1],
+					},
+					panes: {
+						p1: { id: "p1", kind: "test", data: { label: "p1" } },
+						p2: { id: "p2", kind: "test", data: { label: "p2" } },
+						p3: { id: "p3", kind: "test", data: { label: "p3" } },
+					},
+				},
+			],
+			activeTabId: "t1",
+		});
+
+		store.getState().closePane({ tabId: "t1", paneId: "p2" });
+
+		const layout = store.getState().tabs[0]?.layout;
+		if (layout?.type === "split") {
+			expect(layout.children).toHaveLength(2);
+			expect(layout.weights).toEqual([3, 1]);
+		}
+	});
+
+	it("close last pane in tab removes the tab entirely", () => {
+		const store = makeStore();
+		store.getState().addTab({ id: "t1", panes: [tp("p1")] });
+
+		store.getState().closePane({ tabId: "t1", paneId: "p1" });
+
+		expect(store.getState().tabs).toHaveLength(0);
+		expect(store.getState().activeTabId).toBeNull();
+	});
+
+	it("activePaneId falls back to sibling after close", () => {
+		const store = makeStore({
+			version: 1,
+			tabs: [
+				{
+					id: "t1",
+					createdAt: Date.now(),
+					activePaneId: "p1",
+					layout: {
+						type: "split",
+						id: "s1",
+						direction: "horizontal",
+						children: [
+							{ type: "pane", paneId: "p1" },
+							{ type: "pane", paneId: "p2" },
+						],
+						weights: [1, 1],
+					},
+					panes: {
+						p1: { id: "p1", kind: "test", data: { label: "p1" } },
+						p2: { id: "p2", kind: "test", data: { label: "p2" } },
+					},
+				},
+			],
+			activeTabId: "t1",
+		});
+
+		store.getState().closePane({ tabId: "t1", paneId: "p1" });
+		expect(store.getState().tabs[0]?.activePaneId).toBe("p2");
+	});
+});
+
+describe("openPane", () => {
+	it("creates a new tab when no tabs exist", () => {
+		const store = makeStore();
+
+		store.getState().openPane({
+			pane: tp("p1", "opened"),
+			tabTitle: "My Tab",
+		});
+
+		expect(store.getState().tabs).toHaveLength(1);
+		expect(store.getState().tabs[0]?.titleOverride).toBe("My Tab");
+		expect(store.getState().getActivePane()?.pane.data.label).toBe("opened");
+	});
+
+	it("replaces an unpinned pane of the same kind", () => {
+		const store = makeStore();
+		store.getState().addTab({
+			id: "t1",
+			panes: [{ ...tp("p1", "old"), pinned: false }],
+		});
+
+		store.getState().openPane({ pane: tp("p2", "new") });
+
+		const tab = store.getState().tabs[0];
+		expect(tab?.panes.p1).toBeUndefined();
+		expect(
+			Object.values(tab?.panes ?? {}).some((p) => p.data.label === "new"),
+		).toBe(true);
+	});
+
+	it("splits the active pane right when no unpinned match", () => {
+		const store = makeStore();
+		store.getState().addTab({
+			id: "t1",
+			panes: [{ ...tp("p1", "pinned"), pinned: true }],
+		});
+
+		store.getState().openPane({ pane: tp("p2", "split") });
+
+		const layout = store.getState().tabs[0]?.layout;
+		expect(layout?.type).toBe("split");
+		if (layout?.type === "split") {
+			expect(layout.children).toHaveLength(2);
+		}
+	});
+});
+
+describe("edge cases", () => {
+	it("invalid IDs are no-ops", () => {
+		const store = makeStore();
+		store.getState().addTab({ id: "t1", panes: [tp("p1")] });
+
+		const before = structuredClone({
+			version: store.getState().version,
+			tabs: store.getState().tabs,
+			activeTabId: store.getState().activeTabId,
+		});
+
+		store.getState().setActiveTab("missing");
+		store.getState().setActivePane({ tabId: "t1", paneId: "missing" });
+		store.getState().closePane({ tabId: "t1", paneId: "missing" });
+		store.getState().resizeSplit({
+			tabId: "t1",
+			splitId: "missing",
+			weights: [1],
+		});
+
+		expect({
+			version: store.getState().version,
+			tabs: store.getState().tabs,
+			activeTabId: store.getState().activeTabId,
+		}).toEqual(before);
+	});
+
+	it("replaces state wholesale", () => {
+		const store = makeStore();
+
+		store.getState().replaceState((prev: WorkspaceState<TestData>) => ({
+			...prev,
+			activeTabId: "injected",
+		}));
+
+		expect(store.getState().activeTabId).toBe("injected");
+	});
+});
diff --git a/packages/panes/src/core/store/store.ts b/packages/panes/src/core/store/store.ts
new file mode 100644
index 00000000000..f128afdf115
--- /dev/null
+++ b/packages/panes/src/core/store/store.ts
@@ -0,0 +1,639 @@
+import { createStore, type StoreApi } from "zustand/vanilla";
+import type {
+	LayoutNode,
+	Pane,
+	SplitPosition,
+	Tab,
+	WorkspaceState,
+} from "../../types";
+import {
+	findFirstPaneId,
+	findPaneInLayout,
+	generateId,
+	removePaneFromLayout,
+	replacePaneIdInLayout,
+	splitPaneInLayout,
+	updateSplitInLayout,
+} from "./utils";
+
+function buildPane<TData>(args: CreatePaneInput<TData>): Pane<TData> {
+	return {
+		id: args.id ?? generateId("pane"),
+		kind: args.kind,
+		titleOverride: args.titleOverride,
+		pinned: args.pinned,
+		data: args.data,
+	};
+}
+
+function buildTab<TData>(args: {
+	id?: string;
+	titleOverride?: string;
+	panes: [Pane<TData>, ...Pane<TData>[]];
+	activePaneId?: string;
+}): Tab<TData> {
+	const panesMap: Record<string, Pane<TData>> = {};
+	let layout: LayoutNode;
+
+	if (args.panes.length === 1) {
+		panesMap[args.panes[0].id] = args.panes[0];
+		layout = { type: "pane", paneId: args.panes[0].id };
+	} else {
+		const children: LayoutNode[] = [];
+		const weights: number[] = [];
+		for (const pane of args.panes) {
+			panesMap[pane.id] = pane;
+			children.push({ type: "pane", paneId: pane.id });
+			weights.push(1);
+		}
+		layout = {
+			type: "split",
+			id: generateId("split"),
+			direction: "horizontal",
+			children,
+			weights,
+		};
+	}
+
+	return {
+		id: args.id ?? generateId("tab"),
+		titleOverride: args.titleOverride,
+		createdAt: Date.now(),
+		activePaneId: args.activePaneId ?? args.panes[0].id,
+		layout,
+		panes: panesMap,
+	};
+}
+
+// --- Public types ---
+
+export type CreatePaneInput<TData> = {
+	id?: string;
+	kind: string;
+	titleOverride?: string;
+	pinned?: boolean;
+	data: TData;
+};
+
+export type CreateTabInput<TData> = {
+	id?: string;
+	titleOverride?: string;
+	panes: [CreatePaneInput<TData>, ...CreatePaneInput<TData>[]];
+	activePaneId?: string;
+};
+
+export interface WorkspaceStore<TData> extends WorkspaceState<TData> {
+	addTab: (args: CreateTabInput<TData>) => void;
+	removeTab: (tabId: string) => void;
+	setActiveTab: (tabId: string) => void;
+	setTabTitleOverride: (args: {
+		tabId: string;
+		titleOverride?: string;
+	}) => void;
+	getTab: (tabId: string) => Tab<TData> | null;
+	getActiveTab: () => Tab<TData> | null;
+
+	setActivePane: (args: { tabId: string; paneId: string }) => void;
+	getPane: (paneId: string) => { tabId: string; pane: Pane<TData> } | null;
+	getActivePane: (
+		tabId?: string,
+	) => { tabId: string; pane: Pane<TData> } | null;
+	closePane: (args: { tabId: string; paneId: string }) => void;
+	setPaneData: (args: { paneId: string; data: TData }) => void;
+	setPaneTitleOverride: (args: {
+		tabId: string;
+		paneId: string;
+		titleOverride?: string;
+	}) => void;
+	setPanePinned: (args: {
+		tabId: string;
+		paneId: string;
+		pinned: boolean;
+	}) => void;
+	replacePane: (args: {
+		tabId: string;
+		paneId: string;
+		newPane: CreatePaneInput<TData>;
+	}) => void;
+
+	openPane: (args: { pane: CreatePaneInput<TData>; tabTitle?: string }) => void;
+
+	splitPane: (args: {
+		tabId: string;
+		paneId: string;
+		position: SplitPosition;
+		newPane: CreatePaneInput<TData>;
+		weights?: number[];
+		selectNewPane?: boolean;
+	}) => void;
+	addPane: (args: {
+		tabId: string;
+		pane: CreatePaneInput<TData>;
+		position?: SplitPosition;
+		relativeToPaneId?: string;
+	}) => void;
+	resizeSplit: (args: {
+		tabId: string;
+		splitId: string;
+		weights: number[];
+	}) => void;
+	equalizeSplit: (args: { tabId: string; splitId: string }) => void;
+
+	replaceState: (
+		next:
+			| WorkspaceState<TData>
+			| ((prev: WorkspaceState<TData>) => WorkspaceState<TData>),
+	) => void;
+}
+
+export interface CreateWorkspaceStoreOptions<TData> {
+	initialState?: WorkspaceState<TData>;
+}
+
+export function createWorkspaceStore<TData>(
+	options?: CreateWorkspaceStoreOptions<TData>,
+): StoreApi<WorkspaceStore<TData>> {
+	return createStore<WorkspaceStore<TData>>((set, get) => ({
+		version: 1,
+		tabs: options?.initialState?.tabs ?? [],
+		activeTabId: options?.initialState?.activeTabId ?? null,
+
+		addTab: (args) => {
+			const builtPanes = args.panes.map(buildPane) as [
+				Pane<TData>,
+				...Pane<TData>[],
+			];
+			const tab = buildTab({ ...args, panes: builtPanes });
+			set((s) => ({
+				tabs: [...s.tabs, tab],
+				activeTabId: s.activeTabId ?? tab.id,
+			}));
+		},
+
+		removeTab: (tabId) => {
+			set((s) => {
+				const nextTabs = s.tabs.filter((t) => t.id !== tabId);
+				return {
+					tabs: nextTabs,
+					activeTabId:
+						s.activeTabId === tabId ? (nextTabs[0]?.id ?? null) : s.activeTabId,
+				};
+			});
+		},
+
+		setActiveTab: (tabId) => {
+			set((s) => {
+				if (!s.tabs.some((t) => t.id === tabId)) return s;
+				return { activeTabId: tabId };
+			});
+		},
+
+		setTabTitleOverride: (args) => {
+			set((s) => ({
+				tabs: s.tabs.map((t) =>
+					t.id === args.tabId ? { ...t, titleOverride: args.titleOverride } : t,
+				),
+			}));
+		},
+
+		getTab: (tabId) => get().tabs.find((t) => t.id === tabId) ?? null,
+
+		getActiveTab: () => {
+			const s = get();
+			return s.tabs.find((t) => t.id === s.activeTabId) ?? null;
+		},
+
+		setActivePane: (args) => {
+			set((s) => {
+				const tab = s.tabs.find((t) => t.id === args.tabId);
+				if (!tab || !tab.panes[args.paneId]) return s;
+
+				return {
+					activeTabId: args.tabId,
+					tabs: s.tabs.map((t) =>
+						t.id === args.tabId ? { ...t, activePaneId: args.paneId } : t,
+					),
+				};
+			});
+		},
+
+		getPane: (paneId) => {
+			for (const tab of get().tabs) {
+				const pane = tab.panes[paneId];
+				if (pane) return { tabId: tab.id, pane };
+			}
+			return null;
+		},
+
+		getActivePane: (tabId) => {
+			const s = get();
+			const tab = tabId
+				? s.tabs.find((t) => t.id === tabId)
+				: s.tabs.find((t) => t.id === s.activeTabId);
+			if (!tab || !tab.activePaneId) return null;
+
+			const pane = tab.panes[tab.activePaneId];
+			if (!pane) return null;
+
+			return { tabId: tab.id, pane };
+		},
+
+		closePane: (args) => {
+			set((s) => {
+				const tab = s.tabs.find((t) => t.id === args.tabId);
+				if (!tab || !tab.panes[args.paneId] || !tab.layout) return s;
+
+				const nextLayout = removePaneFromLayout(tab.layout, args.paneId);
+				const { [args.paneId]: _, ...nextPanes } = tab.panes;
+
+				if (!nextLayout) {
+					const nextTabs = s.tabs.filter((t) => t.id !== args.tabId);
+					return {
+						tabs: nextTabs,
+						activeTabId:
+							s.activeTabId === args.tabId
+								? (nextTabs[0]?.id ?? null)
+								: s.activeTabId,
+					};
+				}
+
+				return {
+					tabs: s.tabs.map((t) =>
+						t.id === args.tabId
+							? {
+									...tab,
+									layout: nextLayout,
+									panes: nextPanes,
+									activePaneId:
+										tab.activePaneId === args.paneId
+											? findFirstPaneId(nextLayout)
+											: tab.activePaneId,
+								}
+							: t,
+					),
+				};
+			});
+		},
+
+		setPaneData: (args) => {
+			set((s) => {
+				const location = get().getPane(args.paneId);
+				if (!location) return s;
+
+				return {
+					tabs: s.tabs.map((t) =>
+						t.id === location.tabId
+							? {
+									...t,
+									panes: {
+										...t.panes,
+										[args.paneId]: {
+											...location.pane,
+											data: args.data,
+										},
+									},
+								}
+							: t,
+					),
+				};
+			});
+		},
+
+		setPaneTitleOverride: (args) => {
+			set((s) => {
+				const tab = s.tabs.find((t) => t.id === args.tabId);
+				const pane = tab?.panes[args.paneId];
+				if (!tab || !pane) return s;
+
+				return {
+					tabs: s.tabs.map((t) =>
+						t.id === args.tabId
+							? {
+									...t,
+									panes: {
+										...t.panes,
+										[args.paneId]: {
+											...pane,
+											titleOverride: args.titleOverride,
+										},
+									},
+								}
+							: t,
+					),
+				};
+			});
+		},
+
+		setPanePinned: (args) => {
+			set((s) => {
+				const tab = s.tabs.find((t) => t.id === args.tabId);
+				const pane = tab?.panes[args.paneId];
+				if (!tab || !pane) return s;
+
+				return {
+					tabs: s.tabs.map((t) =>
+						t.id === args.tabId
+							? {
+									...t,
+									panes: {
+										...t.panes,
+										[args.paneId]: {
+											...pane,
+											pinned: args.pinned,
+										},
+									},
+								}
+							: t,
+					),
+				};
+			});
+		},
+
+		replacePane: (args) => {
+			set((s) => {
+				const tab = s.tabs.find((t) => t.id === args.tabId);
+				const pane = tab?.panes[args.paneId];
+				if (!tab || !pane || !tab.layout) return s;
+				if (pane.pinned) return s;
+
+				const { layout } = tab;
+				const newPane = buildPane(args.newPane);
+				const { [args.paneId]: _, ...restPanes } = tab.panes;
+
+				return {
+					tabs: s.tabs.map((t) =>
+						t.id === args.tabId
+							? {
+									...tab,
+									layout: replacePaneIdInLayout(
+										layout,
+										args.paneId,
+										newPane.id,
+									),
+									panes: { ...restPanes, [newPane.id]: newPane },
+									activePaneId:
+										tab.activePaneId === args.paneId
+											? newPane.id
+											: tab.activePaneId,
+								}
+							: t,
+					),
+				};
+			});
+		},
+
+		openPane: (args) => {
+			const s = get();
+			const activeTabId = s.activeTabId;
+			const tab = activeTabId ? s.tabs.find((t) => t.id === activeTabId) : null;
+
+			// No tab → create one
+			if (!tab || !activeTabId) {
+				get().addTab({
+					titleOverride: args.tabTitle,
+					panes: [args.pane],
+				});
+				return;
+			}
+
+			// Find unpinned pane of same kind → replace
+			const unpinned = Object.values(tab.panes).find(
+				(p) => p.kind === args.pane.kind && !p.pinned,
+			);
+			if (unpinned) {
+				get().replacePane({
+					tabId: activeTabId,
+					paneId: unpinned.id,
+					newPane: args.pane,
+				});
+				return;
+			}
+
+			// Split the active pane right
+			const activePane = tab.activePaneId;
+			if (
+				activePane &&
+				tab.layout &&
+				findPaneInLayout(tab.layout, activePane)
+			) {
+				get().splitPane({
+					tabId: activeTabId,
+					paneId: activePane,
+					position: "right",
+					newPane: args.pane,
+				});
+				return;
+			}
+
+			// Fallback: add to tab
+			get().addPane({
+				tabId: activeTabId,
+				pane: args.pane,
+			});
+		},
+
+		splitPane: (args) => {
+			set((s) => {
+				const tab = s.tabs.find((t) => t.id === args.tabId);
+				if (!tab || !tab.layout) return s;
+				if (
+					!tab.panes[args.paneId] ||
+					!findPaneInLayout(tab.layout, args.paneId)
+				)
+					return s;
+
+				const { layout } = tab;
+				const newPane = buildPane(args.newPane);
+
+				return {
+					tabs: s.tabs.map((t) =>
+						t.id === args.tabId
+							? {
+									...tab,
+									layout: splitPaneInLayout(
+										layout,
+										args.paneId,
+										newPane.id,
+										args.position,
+										args.weights,
+									),
+									panes: {
+										...tab.panes,
+										[newPane.id]: newPane,
+									},
+									activePaneId:
+										args.selectNewPane === false
+											? tab.activePaneId
+											: newPane.id,
+								}
+							: t,
+					),
+				};
+			});
+		},
+
+		addPane: (args) => {
+			set((s) => {
+				const tab = s.tabs.find((t) => t.id === args.tabId);
+				if (!tab) return s;
+
+				const newPane = buildPane(args.pane);
+
+				if (!tab.layout) {
+					return {
+						tabs: s.tabs.map((t) =>
+							t.id === args.tabId
+								? {
+										...tab,
+										layout: {
+											type: "pane",
+											paneId: newPane.id,
+										} satisfies LayoutNode,
+										panes: {
+											...tab.panes,
+											[newPane.id]: newPane,
+										},
+										activePaneId: newPane.id,
+									}
+								: t,
+						),
+					};
+				}
+
+				const position = args.position ?? "right";
+				const targetPaneId = args.relativeToPaneId ?? tab.activePaneId;
+
+				const { layout } = tab;
+
+				if (targetPaneId && findPaneInLayout(layout, targetPaneId)) {
+					return {
+						tabs: s.tabs.map((t) =>
+							t.id === args.tabId
+								? {
+										...tab,
+										layout: splitPaneInLayout(
+											layout,
+											targetPaneId,
+											newPane.id,
+											position,
+										),
+										panes: {
+											...tab.panes,
+											[newPane.id]: newPane,
+										},
+										activePaneId: newPane.id,
+									}
+								: t,
+						),
+					};
+				}
+
+				const newPaneLeaf: LayoutNode = {
+					type: "pane",
+					paneId: newPane.id,
+				};
+				const edgeLayout: LayoutNode = {
+					type: "split",
+					id: generateId("split"),
+					direction:
+						position === "left" || position === "right"
+							? "horizontal"
+							: "vertical",
+					children:
+						position === "left" || position === "top"
+							? [newPaneLeaf, layout]
+							: [layout, newPaneLeaf],
+					weights: [1, 1],
+				};
+
+				return {
+					tabs: s.tabs.map((t) =>
+						t.id === args.tabId
+							? {
+									...tab,
+									layout: edgeLayout,
+									panes: {
+										...tab.panes,
+										[newPane.id]: newPane,
+									},
+									activePaneId: newPane.id,
+								}
+							: t,
+					),
+				};
+			});
+		},
+
+		resizeSplit: (args) => {
+			set((s) => {
+				const tab = s.tabs.find((t) => t.id === args.tabId);
+				if (!tab || !tab.layout) return s;
+
+				const { layout } = tab;
+
+				return {
+					tabs: s.tabs.map((t) =>
+						t.id === args.tabId
+							? {
+									...t,
+									layout: updateSplitInLayout(
+										layout,
+										args.splitId,
+										(split) => ({
+											...split,
+											weights: args.weights,
+										}),
+									),
+								}
+							: t,
+					),
+				};
+			});
+		},
+
+		equalizeSplit: (args) => {
+			set((s) => {
+				const tab = s.tabs.find((t) => t.id === args.tabId);
+				if (!tab || !tab.layout) return s;
+
+				const { layout } = tab;
+
+				return {
+					tabs: s.tabs.map((t) =>
+						t.id === args.tabId
+							? {
+									...t,
+									layout: updateSplitInLayout(
+										layout,
+										args.splitId,
+										(split) => ({
+											...split,
+											weights: split.children.map(() => 1),
+										}),
+									),
+								}
+							: t,
+					),
+				};
+			});
+		},
+
+		replaceState: (next) => {
+			set((s) => {
+				const resolved =
+					typeof next === "function"
+						? next({
+								version: s.version,
+								tabs: s.tabs,
+								activeTabId: s.activeTabId,
+							})
+						: next;
+				return {
+					version: resolved.version,
+					tabs: resolved.tabs,
+					activeTabId: resolved.activeTabId,
+				};
+			});
+		},
+	}));
+}
diff --git a/packages/panes/src/core/store/utils/index.ts b/packages/panes/src/core/store/utils/index.ts
new file mode 100644
index 00000000000..e4f85fd557f
--- /dev/null
+++ b/packages/panes/src/core/store/utils/index.ts
@@ -0,0 +1,9 @@
+export {
+	findFirstPaneId,
+	findPaneInLayout,
+	generateId,
+	removePaneFromLayout,
+	replacePaneIdInLayout,
+	splitPaneInLayout,
+	updateSplitInLayout,
+} from "./utils";
diff --git a/packages/panes/src/core/store/utils/utils.test.ts b/packages/panes/src/core/store/utils/utils.test.ts
new file mode 100644
index 00000000000..7803559dde2
--- /dev/null
+++ b/packages/panes/src/core/store/utils/utils.test.ts
@@ -0,0 +1,268 @@
+import { describe, expect, it } from "bun:test";
+import type { LayoutNode } from "../../../types";
+import {
+	findFirstPaneId,
+	findPaneInLayout,
+	positionToDirection,
+	removePaneFromLayout,
+	replacePaneIdInLayout,
+	splitPaneInLayout,
+	updateSplitInLayout,
+} from "./utils";
+
+const SINGLE: LayoutNode = { type: "pane", paneId: "a" };
+
+const TWO_SPLIT: LayoutNode = {
+	type: "split",
+	id: "s1",
+	direction: "horizontal",
+	children: [
+		{ type: "pane", paneId: "a" },
+		{ type: "pane", paneId: "b" },
+	],
+	weights: [1, 1],
+};
+
+const THREE_SPLIT: LayoutNode = {
+	type: "split",
+	id: "s1",
+	direction: "horizontal",
+	children: [
+		{ type: "pane", paneId: "a" },
+		{ type: "pane", paneId: "b" },
+		{ type: "pane", paneId: "c" },
+	],
+	weights: [3, 2, 1],
+};
+
+const NESTED: LayoutNode = {
+	type: "split",
+	id: "s1",
+	direction: "horizontal",
+	children: [
+		{ type: "pane", paneId: "a" },
+		{
+			type: "split",
+			id: "s2",
+			direction: "vertical",
+			children: [
+				{ type: "pane", paneId: "b" },
+				{ type: "pane", paneId: "c" },
+			],
+			weights: [1, 1],
+		},
+	],
+	weights: [1, 1],
+};
+
+describe("findPaneInLayout", () => {
+	it("finds a pane in a single leaf", () => {
+		expect(findPaneInLayout(SINGLE, "a")).toBe(true);
+		expect(findPaneInLayout(SINGLE, "z")).toBe(false);
+	});
+
+	it("finds panes in a split", () => {
+		expect(findPaneInLayout(TWO_SPLIT, "a")).toBe(true);
+		expect(findPaneInLayout(TWO_SPLIT, "b")).toBe(true);
+		expect(findPaneInLayout(TWO_SPLIT, "z")).toBe(false);
+	});
+
+	it("finds panes in nested splits", () => {
+		expect(findPaneInLayout(NESTED, "c")).toBe(true);
+		expect(findPaneInLayout(NESTED, "z")).toBe(false);
+	});
+});
+
+describe("findFirstPaneId", () => {
+	it("returns the pane id for a leaf", () => {
+		expect(findFirstPaneId(SINGLE)).toBe("a");
+	});
+
+	it("returns the first (depth-first) pane in a split", () => {
+		expect(findFirstPaneId(TWO_SPLIT)).toBe("a");
+	});
+
+	it("returns the first pane in nested splits", () => {
+		expect(findFirstPaneId(NESTED)).toBe("a");
+	});
+});
+
+describe("removePaneFromLayout", () => {
+	it("returns null when removing the only pane", () => {
+		expect(removePaneFromLayout(SINGLE, "a")).toBeNull();
+	});
+
+	it("returns the remaining pane when removing from a 2-pane split", () => {
+		const result = removePaneFromLayout(TWO_SPLIT, "a");
+		expect(result).toEqual({ type: "pane", paneId: "b" });
+	});
+
+	it("preserves weights when removing from a 3-pane split", () => {
+		const result = removePaneFromLayout(THREE_SPLIT, "b");
+		expect(result).toMatchObject({
+			type: "split",
+			weights: [3, 1],
+			children: [
+				{ type: "pane", paneId: "a" },
+				{ type: "pane", paneId: "c" },
+			],
+		});
+	});
+
+	it("collapses nested split when child is removed", () => {
+		const result = removePaneFromLayout(NESTED, "b");
+		// s2 had [b, c], removing b leaves just c — s2 collapses
+		// s1 now has [a, c]
+		expect(result).toMatchObject({
+			type: "split",
+			id: "s1",
+			children: [
+				{ type: "pane", paneId: "a" },
+				{ type: "pane", paneId: "c" },
+			],
+		});
+	});
+
+	it("returns unchanged layout when pane not found", () => {
+		expect(removePaneFromLayout(TWO_SPLIT, "z")).toEqual(TWO_SPLIT);
+	});
+});
+
+describe("replacePaneIdInLayout", () => {
+	it("replaces a pane id in a leaf", () => {
+		expect(replacePaneIdInLayout(SINGLE, "a", "x")).toEqual({
+			type: "pane",
+			paneId: "x",
+		});
+	});
+
+	it("replaces a pane id inside a split", () => {
+		const result = replacePaneIdInLayout(TWO_SPLIT, "b", "x");
+		if (result.type === "split") {
+			expect(result.children[1]).toEqual({ type: "pane", paneId: "x" });
+		}
+	});
+
+	it("replaces in nested splits", () => {
+		const result = replacePaneIdInLayout(NESTED, "c", "x");
+		if (result.type === "split" && result.children[1]?.type === "split") {
+			expect(result.children[1].children[1]).toEqual({
+				type: "pane",
+				paneId: "x",
+			});
+		}
+	});
+
+	it("returns unchanged layout when pane not found", () => {
+		expect(replacePaneIdInLayout(SINGLE, "z", "x")).toEqual(SINGLE);
+	});
+});
+
+describe("splitPaneInLayout", () => {
+	it("wraps a leaf in a new split", () => {
+		const result = splitPaneInLayout(SINGLE, "a", "b", "right");
+		expect(result.type).toBe("split");
+		if (result.type === "split") {
+			expect(result.direction).toBe("horizontal");
+			expect(result.weights).toEqual([1, 1]);
+			expect(result.children[0]).toEqual({ type: "pane", paneId: "a" });
+			expect(result.children[1]).toEqual({ type: "pane", paneId: "b" });
+		}
+	});
+
+	it("left/top puts new pane first", () => {
+		const result = splitPaneInLayout(SINGLE, "a", "b", "left");
+		if (result.type === "split") {
+			expect(result.children[0]).toEqual({ type: "pane", paneId: "b" });
+			expect(result.children[1]).toEqual({ type: "pane", paneId: "a" });
+		}
+	});
+
+	it("top/bottom uses vertical direction", () => {
+		const result = splitPaneInLayout(SINGLE, "a", "b", "top");
+		if (result.type === "split") {
+			expect(result.direction).toBe("vertical");
+		}
+	});
+
+	it("inserts into existing same-direction split and halves weight", () => {
+		const result = splitPaneInLayout(THREE_SPLIT, "b", "d", "right");
+		if (result.type === "split") {
+			expect(result.children).toHaveLength(4);
+			expect(result.weights).toEqual([3, 1, 1, 1]);
+			expect(result.children[1]).toEqual({ type: "pane", paneId: "b" });
+			expect(result.children[2]).toEqual({ type: "pane", paneId: "d" });
+		}
+	});
+
+	it("inserts left into existing same-direction split", () => {
+		const result = splitPaneInLayout(THREE_SPLIT, "b", "d", "left");
+		if (result.type === "split") {
+			expect(result.children).toHaveLength(4);
+			expect(result.children[1]).toEqual({ type: "pane", paneId: "d" });
+			expect(result.children[2]).toEqual({ type: "pane", paneId: "b" });
+		}
+	});
+
+	it("creates nested split for cross-direction split", () => {
+		const result = splitPaneInLayout(TWO_SPLIT, "b", "c", "bottom");
+		if (result.type === "split") {
+			expect(result.children).toHaveLength(2);
+			expect(result.children[0]).toEqual({ type: "pane", paneId: "a" });
+			const nested = result.children[1];
+			expect(nested?.type).toBe("split");
+			if (nested?.type === "split") {
+				expect(nested.direction).toBe("vertical");
+				expect(nested.children[0]).toEqual({ type: "pane", paneId: "b" });
+				expect(nested.children[1]).toEqual({ type: "pane", paneId: "c" });
+			}
+		}
+	});
+
+	it("uses custom weights", () => {
+		const result = splitPaneInLayout(SINGLE, "a", "b", "right", [3, 1]);
+		if (result.type === "split") {
+			expect(result.weights).toEqual([3, 1]);
+		}
+	});
+});
+
+describe("updateSplitInLayout", () => {
+	it("updates a split by id", () => {
+		const result = updateSplitInLayout(TWO_SPLIT, "s1", (split) => ({
+			...split,
+			weights: [3, 7],
+		}));
+		if (result.type === "split") {
+			expect(result.weights).toEqual([3, 7]);
+		}
+	});
+
+	it("updates a nested split", () => {
+		const result = updateSplitInLayout(NESTED, "s2", (split) => ({
+			...split,
+			weights: [3, 1],
+		}));
+		if (result.type === "split" && result.children[1]?.type === "split") {
+			expect(result.children[1].weights).toEqual([3, 1]);
+		}
+	});
+
+	it("returns unchanged layout for missing id", () => {
+		expect(updateSplitInLayout(TWO_SPLIT, "missing", (s) => s)).toEqual(
+			TWO_SPLIT,
+		);
+	});
+});
+
+describe("positionToDirection", () => {
+	it("maps left/right to horizontal", () => {
+		expect(positionToDirection("left")).toBe("horizontal");
+		expect(positionToDirection("right")).toBe("horizontal");
+	});
+
+	it("maps top/bottom to vertical", () => {
+		expect(positionToDirection("top")).toBe("vertical");
+		expect(positionToDirection("bottom")).toBe("vertical");
+	});
+});
diff --git a/packages/panes/src/core/store/utils/utils.ts b/packages/panes/src/core/store/utils/utils.ts
new file mode 100644
index 00000000000..ce39f3620e9
--- /dev/null
+++ b/packages/panes/src/core/store/utils/utils.ts
@@ -0,0 +1,174 @@
+import type { LayoutNode, SplitDirection, SplitPosition } from "../../../types";
+
+export function findPaneInLayout(node: LayoutNode, paneId: string): boolean {
+	if (node.type === "pane") {
+		return node.paneId === paneId;
+	}
+	return node.children.some((child) => findPaneInLayout(child, paneId));
+}
+
+export function findFirstPaneId(node: LayoutNode): string | null {
+	if (node.type === "pane") {
+		return node.paneId;
+	}
+	for (const child of node.children) {
+		const id = findFirstPaneId(child);
+		if (id) return id;
+	}
+	return null;
+}
+
+export function removePaneFromLayout(
+	node: LayoutNode,
+	paneId: string,
+): LayoutNode | null {
+	if (node.type === "pane") {
+		return node.paneId === paneId ? null : node;
+	}
+
+	const nextChildren: LayoutNode[] = [];
+	const nextWeights: number[] = [];
+
+	for (let i = 0; i < node.children.length; i++) {
+		const child = node.children[i];
+		if (!child) continue;
+
+		const result = removePaneFromLayout(child, paneId);
+		if (result) {
+			nextChildren.push(result);
+			nextWeights.push(node.weights[i] ?? 1);
+		}
+	}
+
+	if (nextChildren.length === 0) {
+		return null;
+	}
+
+	if (nextChildren.length === 1) {
+		return nextChildren[0] ?? null;
+	}
+
+	return {
+		...node,
+		children: nextChildren,
+		weights: nextWeights,
+	};
+}
+
+export function replacePaneIdInLayout(
+	node: LayoutNode,
+	oldPaneId: string,
+	newPaneId: string,
+): LayoutNode {
+	if (node.type === "pane") {
+		return node.paneId === oldPaneId
+			? { type: "pane", paneId: newPaneId }
+			: node;
+	}
+
+	return {
+		...node,
+		children: node.children.map((child) =>
+			replacePaneIdInLayout(child, oldPaneId, newPaneId),
+		),
+	};
+}
+
+export function splitPaneInLayout(
+	node: LayoutNode,
+	targetPaneId: string,
+	newPaneId: string,
+	position: SplitPosition,
+	weights?: number[],
+): LayoutNode {
+	if (node.type === "pane") {
+		if (node.paneId !== targetPaneId) return node;
+
+		const direction = positionToDirection(position);
+		const newPaneNode: LayoutNode = { type: "pane", paneId: newPaneId };
+		const isFirst = position === "left" || position === "top";
+
+		return {
+			type: "split",
+			id: generateId("split"),
+			direction,
+			children: isFirst ? [newPaneNode, node] : [node, newPaneNode],
+			weights: weights ?? [1, 1],
+		};
+	}
+
+	const parentInfo = findDirectChild(node, targetPaneId);
+
+	if (parentInfo && node.direction === positionToDirection(position)) {
+		const { childIndex } = parentInfo;
+		const currentWeight = node.weights[childIndex] ?? 1;
+		const halfWeight = currentWeight / 2;
+		const newPaneNode: LayoutNode = { type: "pane", paneId: newPaneId };
+		const isFirst = position === "left" || position === "top";
+
+		const nextChildren = [...node.children];
+		const nextWeights = [...node.weights];
+
+		nextWeights[childIndex] = halfWeight;
+
+		if (isFirst) {
+			nextChildren.splice(childIndex, 0, newPaneNode);
+			nextWeights.splice(childIndex, 0, halfWeight);
+		} else {
+			nextChildren.splice(childIndex + 1, 0, newPaneNode);
+			nextWeights.splice(childIndex + 1, 0, halfWeight);
+		}
+
+		return {
+			...node,
+			children: nextChildren,
+			weights: nextWeights,
+		};
+	}
+
+	return {
+		...node,
+		children: node.children.map((child) =>
+			splitPaneInLayout(child, targetPaneId, newPaneId, position, weights),
+		),
+	};
+}
+
+function findDirectChild(
+	split: LayoutNode & { type: "split" },
+	paneId: string,
+): { childIndex: number } | null {
+	for (let i = 0; i < split.children.length; i++) {
+		const child = split.children[i];
+		if (child?.type === "pane" && child.paneId === paneId) {
+			return { childIndex: i };
+		}
+	}
+	return null;
+}
+
+export function updateSplitInLayout(
+	node: LayoutNode,
+	splitId: string,
+	updater: (split: LayoutNode & { type: "split" }) => LayoutNode,
+): LayoutNode {
+	if (node.type === "pane") return node;
+	if (node.id === splitId) return updater(node);
+
+	return {
+		...node,
+		children: node.children.map((child) =>
+			updateSplitInLayout(child, splitId, updater),
+		),
+	};
+}
+
+export function positionToDirection(position: SplitPosition): SplitDirection {
+	return position === "left" || position === "right"
+		? "horizontal"
+		: "vertical";
+}
+
+export function generateId(prefix: string): string {
+	return `${prefix}-${crypto.randomUUID()}`;
+}
diff --git a/packages/panes/src/index.ts b/packages/panes/src/index.ts
new file mode 100644
index 00000000000..f582526cc03
--- /dev/null
+++ b/packages/panes/src/index.ts
@@ -0,0 +1,25 @@
+export type {
+	CreatePaneInput,
+	CreateTabInput,
+	CreateWorkspaceStoreOptions,
+	WorkspaceStore,
+} from "./core/store";
+export { createWorkspaceStore } from "./core/store";
+export type {
+	PaneActionConfig,
+	PaneContext,
+	PaneDefinition,
+	PaneRegistry,
+	RendererContext,
+	TabContext,
+	WorkspaceProps,
+} from "./react";
+export { Workspace } from "./react";
+export type {
+	LayoutNode,
+	Pane,
+	SplitDirection,
+	SplitPosition,
+	Tab,
+	WorkspaceState,
+} from "./types";
diff --git a/packages/panes/src/react/components/PaneHeaderActions/PaneHeaderActions.tsx b/packages/panes/src/react/components/PaneHeaderActions/PaneHeaderActions.tsx
new file mode 100644
index 00000000000..70368b89930
--- /dev/null
+++ b/packages/panes/src/react/components/PaneHeaderActions/PaneHeaderActions.tsx
@@ -0,0 +1,46 @@
+import { Tooltip, TooltipContent, TooltipTrigger } from "@superset/ui/tooltip";
+import type { PaneActionConfig, RendererContext } from "../../types";
+
+export function PaneHeaderActions<TData>({
+	actions,
+	context,
+}: {
+	actions: PaneActionConfig<TData>[];
+	context: RendererContext<TData>;
+}) {
+	return (
+		// biome-ignore lint/a11y/noStaticElementInteractions: stop mousedown from triggering pane focus re-render before click fires
+		<div
+			className="flex shrink-0 items-center gap-0.5"
+			onMouseDown={(e) => e.stopPropagation()}
+		>
+			{actions.map((action, _index) => {
+				const icon =
+					typeof action.icon === "function"
+						? action.icon(context)
+						: action.icon;
+				const tooltip =
+					typeof action.tooltip === "function"
+						? action.tooltip(context)
+						: action.tooltip;
+
+				return (
+					<Tooltip key={action.key}>
+						<TooltipTrigger asChild>
+							<button
+								type="button"
+								onClick={() => action.onClick(context)}
+								className="rounded p-0.5 text-muted-foreground/60 transition-colors hover:text-muted-foreground"
+							>
+								{icon}
+							</button>
+						</TooltipTrigger>
+						<TooltipContent side="bottom" showArrow={false}>
+							{tooltip}
+						</TooltipContent>
+					</Tooltip>
+				);
+			})}
+		</div>
+	);
+}
diff --git a/packages/panes/src/react/components/PaneHeaderActions/index.ts b/packages/panes/src/react/components/PaneHeaderActions/index.ts
new file mode 100644
index 00000000000..1060863776e
--- /dev/null
+++ b/packages/panes/src/react/components/PaneHeaderActions/index.ts
@@ -0,0 +1 @@
+export { PaneHeaderActions } from "./PaneHeaderActions";
diff --git a/packages/panes/src/react/components/Workspace/Workspace.tsx b/packages/panes/src/react/components/Workspace/Workspace.tsx
new file mode 100644
index 00000000000..15a56a38be3
--- /dev/null
+++ b/packages/panes/src/react/components/Workspace/Workspace.tsx
@@ -0,0 +1,74 @@
+import { cn } from "@superset/ui/utils";
+import { useStore } from "zustand";
+import type { WorkspaceProps } from "../../types";
+import { Tab } from "./components/Tab";
+import { TabBar } from "./components/TabBar";
+
+export function Workspace<TData>({
+	store,
+	registry,
+	className,
+	renderTabAccessory,
+	renderEmptyState,
+	renderAddTabMenu,
+	onBeforeCloseTab,
+	paneActions,
+}: WorkspaceProps<TData>) {
+	const tabs = useStore(store, (s) => s.tabs);
+	const activeTabId = useStore(store, (s) => s.activeTabId);
+	const activeTab = tabs.find((t) => t.id === activeTabId) ?? null;
+
+	const closeTab = async (tabId: string) => {
+		if (onBeforeCloseTab) {
+			const tab = store.getState().getTab(tabId);
+			if (!tab) return;
+			const allowed = await onBeforeCloseTab(tab);
+			if (!allowed) return;
+		}
+		store.getState().removeTab(tabId);
+	};
+
+	return (
+		<div
+			className={cn(
+				"flex h-full w-full min-h-0 min-w-0 flex-col overflow-hidden bg-background text-foreground",
+				className,
+			)}
+		>
+			<TabBar
+				tabs={tabs}
+				activeTabId={activeTabId}
+				onSelectTab={(tabId) => store.getState().setActiveTab(tabId)}
+				onCloseTab={closeTab}
+				onCloseOtherTabs={(tabId) => {
+					for (const tab of tabs) {
+						if (tab.id !== tabId) closeTab(tab.id);
+					}
+				}}
+				onCloseAllTabs={() => {
+					for (const tab of tabs) {
+						closeTab(tab.id);
+					}
+				}}
+				onRenameTab={(tabId, title) =>
+					store.getState().setTabTitleOverride({ tabId, titleOverride: title })
+				}
+				getTabTitle={(tab) => tab.titleOverride ?? tab.id}
+				renderAddTabMenu={renderAddTabMenu}
+				renderTabAccessory={renderTabAccessory}
+			/>
+			{activeTab ? (
+				<Tab
+					store={store}
+					tab={activeTab}
+					registry={registry}
+					paneActions={paneActions}
+				/>
+			) : (
+				<div className="flex min-h-0 min-w-0 flex-1 items-center justify-center text-sm text-muted-foreground">
+					{renderEmptyState?.() ?? "No tabs open"}
+				</div>
+			)}
+		</div>
+	);
+}
diff --git a/packages/panes/src/react/components/Workspace/components/Tab/Tab.tsx b/packages/panes/src/react/components/Workspace/components/Tab/Tab.tsx
new file mode 100644
index 00000000000..cabede6ea44
--- /dev/null
+++ b/packages/panes/src/react/components/Workspace/components/Tab/Tab.tsx
@@ -0,0 +1,123 @@
+import {
+	ResizableHandle,
+	ResizablePanel,
+	ResizablePanelGroup,
+} from "@superset/ui/resizable";
+import type { StoreApi } from "zustand/vanilla";
+import type { WorkspaceStore } from "../../../../../core/store";
+import type { LayoutNode, Tab as TabType } from "../../../../../types";
+import type {
+	PaneActionConfig,
+	PaneRegistry,
+	RendererContext,
+} from "../../../../types";
+import { Pane } from "./components/Pane";
+
+interface TabProps<TData> {
+	store: StoreApi<WorkspaceStore<TData>>;
+	tab: TabType<TData>;
+	registry: PaneRegistry<TData>;
+	paneActions?:
+		| PaneActionConfig<TData>[]
+		| ((context: RendererContext<TData>) => PaneActionConfig<TData>[]);
+}
+
+function weightsToPercentages(weights: number[]): number[] {
+	const total = weights.reduce((sum, w) => sum + w, 0);
+	if (total === 0) return weights.map(() => 100 / weights.length);
+	return weights.map((w) => (w / total) * 100);
+}
+
+function LayoutNodeView<TData>({
+	store,
+	tab,
+	node,
+	registry,
+	paneActions,
+	parentDirection = null,
+}: {
+	store: StoreApi<WorkspaceStore<TData>>;
+	tab: TabType<TData>;
+	node: LayoutNode;
+	registry: PaneRegistry<TData>;
+	paneActions?: TabProps<TData>["paneActions"];
+	parentDirection?: "horizontal" | "vertical" | null;
+}) {
+	if (node.type === "pane") {
+		const pane = tab.panes[node.paneId];
+		if (!pane) return null;
+
+		return (
+			<Pane
+				store={store}
+				tab={tab}
+				pane={pane}
+				isActive={tab.activePaneId === pane.id}
+				registry={registry}
+				paneActions={paneActions}
+				parentDirection={parentDirection}
+			/>
+		);
+	}
+
+	const percentages = weightsToPercentages(node.weights);
+
+	return (
+		<ResizablePanelGroup
+			direction={node.direction}
+			onLayout={(sizes) => {
+				store.getState().resizeSplit({
+					tabId: tab.id,
+					splitId: node.id,
+					weights: sizes,
+				});
+			}}
+		>
+			{node.children.map((child, index) => {
+				const key = child.type === "pane" ? child.paneId : child.id;
+				return (
+					<>
+						{index > 0 && <ResizableHandle key={`handle-${key}`} />}
+						<ResizablePanel key={key} defaultSize={percentages[index]}>
+							<LayoutNodeView
+								store={store}
+								tab={tab}
+								node={child}
+								registry={registry}
+								paneActions={paneActions}
+								parentDirection={node.direction}
+							/>
+						</ResizablePanel>
+					</>
+				);
+			})}
+		</ResizablePanelGroup>
+	);
+}
+
+export function Tab<TData>({
+	store,
+	tab,
+	registry,
+	paneActions,
+}: TabProps<TData>) {
+	if (!tab.layout) {
+		return (
+			<div className="flex min-h-0 min-w-0 flex-1 items-center justify-center text-sm text-muted-foreground">
+				No panes open
+			</div>
+		);
+	}
+
+	return (
+		<div className="flex h-full w-full min-h-0 min-w-0 overflow-hidden">
+			<LayoutNodeView
+				store={store}
+				tab={tab}
+				node={tab.layout}
+				registry={registry}
+				paneActions={paneActions}
+			/>
+		</div>
+	);
+}
diff --git a/packages/panes/src/react/components/Workspace/components/Tab/components/Pane/Pane.tsx b/packages/panes/src/react/components/Workspace/components/Tab/components/Pane/Pane.tsx
new file mode 100644
index 00000000000..797d7d6c37f
--- /dev/null
+++ b/packages/panes/src/react/components/Workspace/components/Tab/components/Pane/Pane.tsx
@@ -0,0 +1,155 @@
+import { useMemo } from "react";
+import type { StoreApi } from "zustand/vanilla";
+import type { WorkspaceStore } from "../../../../../../../core/store";
+import type { Pane as PaneType, Tab } from "../../../../../../../types";
+import type {
+	PaneActionConfig,
+	PaneRegistry,
+	RendererContext,
+} from "../../../../../../types";
+import { PaneHeaderActions } from "../../../../../PaneHeaderActions";
+import { PaneContent } from "./components/PaneContent";
+import { PaneHeader } from "./components/PaneHeader";
+
+interface PaneComponentProps<TData> {
+	store: StoreApi<WorkspaceStore<TData>>;
+	tab: Tab<TData>;
+	pane: PaneType<TData>;
+	isActive: boolean;
+	registry: PaneRegistry<TData>;
+	parentDirection?: "horizontal" | "vertical" | null;
+	paneActions?:
+		| PaneActionConfig<TData>[]
+		| ((context: RendererContext<TData>) => PaneActionConfig<TData>[]);
+}
+
+function resolveActions<TData>(
+	config:
+		| PaneActionConfig<TData>[]
+		| ((
+				context: RendererContext<TData>,
+				defaults: PaneActionConfig<TData>[],
+		  ) => PaneActionConfig<TData>[])
+		| undefined,
+	context: RendererContext<TData>,
+	defaults: PaneActionConfig<TData>[],
+): PaneActionConfig<TData>[] {
+	if (!config) return defaults;
+	if (typeof config === "function") return config(context, defaults);
+	return config;
+}
+
+export function Pane<TData>({
+	store,
+	tab,
+	pane,
+	isActive,
+	registry,
+	parentDirection = null,
+	paneActions,
+}: PaneComponentProps<TData>) {
+	const definition = registry[pane.kind];
+
+	const tabs = store.getState().tabs;
+	const tabPosition = tabs.findIndex((t) => t.id === tab.id);
+
+	const context: RendererContext<TData> = useMemo(() => {
+		const ctx: RendererContext<TData> = {
+			pane: { ...pane, parentDirection },
+			tab: { ...tab, position: tabPosition },
+			isActive,
+			store,
+			actions: {
+				close: () =>
+					store.getState().closePane({ tabId: tab.id, paneId: pane.id }),
+				focus: () =>
+					store.getState().setActivePane({ tabId: tab.id, paneId: pane.id }),
+				setTitle: (title: string) =>
+					store.getState().setPaneTitleOverride({
+						tabId: tab.id,
+						paneId: pane.id,
+						titleOverride: title,
+					}),
+				pin: () =>
+					store.getState().setPanePinned({
+						tabId: tab.id,
+						paneId: pane.id,
+						pinned: true,
+					}),
+				updateData: (data: TData) =>
+					store.getState().setPaneData({ paneId: pane.id, data }),
+				split: (position, newPane) =>
+					store.getState().splitPane({
+						tabId: tab.id,
+						paneId: pane.id,
+						position: position === "down" ? "bottom" : "right",
+						newPane,
+					}),
+			},
+			components: { PaneHeaderActions: () => null },
+		};
+
+		// Resolve workspace-level actions (or empty if not provided)
+		const workspaceResolved =
+			typeof paneActions === "function"
+				? paneActions(ctx)
+				: (paneActions ?? []);
+
+		// Definition can override or modify workspace actions
+		const finalActions = resolveActions(
+			definition?.paneActions,
+			ctx,
+			workspaceResolved,
+		);
+
+		ctx.components.PaneHeaderActions = () => (
+			<PaneHeaderActions actions={finalActions} context={ctx} />
+		);
+
+		return ctx;
+	}, [
+		pane,
+		tab,
+		isActive,
+		store,
+		definition,
+		paneActions,
+		parentDirection,
+		tabPosition,
+	]);
+
+	const title = definition
+		? (pane.titleOverride ?? definition.getTitle?.(context) ?? pane.id)
+		: `Unknown: ${pane.kind}`;
+	const icon = definition?.getIcon?.(context);
+	const titleContent = definition?.renderTitle?.(context);
+	const headerExtras = definition?.renderHeaderExtras?.(context);
+	const toolbar = definition?.renderToolbar?.(context);
+
+	return (
+		// biome-ignore lint/a11y/noStaticElementInteractions: clicking anywhere in a pane focuses it (standard IDE behavior)
+		<div
+			className="flex h-full w-full flex-col overflow-hidden border-[0.5px] border-border"
+			onMouseDown={context.actions.focus}
+		>
+			<PaneHeader
+				title={title}
+				icon={icon}
+				isActive={isActive}
+				titleContent={titleContent}
+				headerExtras={headerExtras}
+				toolbar={toolbar}
+				actionsContent={<context.components.PaneHeaderActions />}
+			/>
+			<PaneContent>
+				{definition ? (
+					definition.renderPane(context)
+				) : (
+					<div className="flex flex-1 items-center justify-center text-xs text-muted-foreground">
+						Unknown pane kind: {pane.kind}
+					</div>
+				)}
+			</PaneContent>
+		</div>
+	);
+}
diff --git a/packages/panes/src/react/components/Workspace/components/Tab/components/Pane/components/PaneContent/PaneContent.tsx b/packages/panes/src/react/components/Workspace/components/Tab/components/Pane/components/PaneContent/PaneContent.tsx
new file mode 100644
index 00000000000..d96d52c8141
--- /dev/null
+++ b/packages/panes/src/react/components/Workspace/components/Tab/components/Pane/components/PaneContent/PaneContent.tsx
@@ -0,0 +1,13 @@
+import type { ReactNode } from "react";
+
+interface PaneContentProps {
+	children: ReactNode;
+}
+
+export function PaneContent({ children }: PaneContentProps) {
+	return (
+		<div className="flex min-h-0 min-w-0 flex-1 overflow-hidden">
+			{children}
+		</div>
+	);
+}
diff --git a/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneContent/index.ts b/packages/panes/src/react/components/Workspace/components/Tab/components/Pane/components/PaneContent/index.ts
similarity index 100%
rename from packages/pane-layout/src/react/components/PaneWorkspace/components/PaneContent/index.ts
rename to packages/panes/src/react/components/Workspace/components/Tab/components/Pane/components/PaneContent/index.ts
diff --git a/packages/panes/src/react/components/Workspace/components/Tab/components/Pane/components/PaneHeader/PaneHeader.tsx b/packages/panes/src/react/components/Workspace/components/Tab/components/Pane/components/PaneHeader/PaneHeader.tsx
new file mode 100644
index 00000000000..12807bf21ce
--- /dev/null
+++ b/packages/panes/src/react/components/Workspace/components/Tab/components/Pane/components/PaneHeader/PaneHeader.tsx
@@ -0,0 +1,59 @@
+import { cn } from "@superset/ui/utils";
+import type { ReactNode } from "react";
+
+interface PaneHeaderProps {
+	title: ReactNode;
+	icon?: ReactNode;
+	isActive: boolean;
+	titleContent?: ReactNode;
+	headerExtras?: ReactNode;
+	actionsContent: ReactNode;
+	toolbar?: ReactNode;
+}
+
+export function PaneHeader({
+	title,
+	icon,
+	isActive,
+	titleContent,
+	headerExtras,
+	actionsContent,
+	toolbar,
+}: PaneHeaderProps) {
+	const chrome = cn(
+		"flex h-7 shrink-0 items-center transition-[background-color] duration-150",
+		isActive ? "bg-secondary" : "bg-tertiary",
+	);
+
+	// Full eject — pane owns the entire toolbar content
+	if (toolbar) {
+		return <div className={chrome}>{toolbar}</div>;
+	}
+
+	// Default layout — matches v1 BasePaneWindow toolbar pattern
+	return (
+		<div className={chrome}>
+			<div className="flex h-full w-full items-center justify-between px-3">
+				<div className="flex min-w-0 items-center gap-2">
+					{titleContent ?? (
+						<>
+							{icon && <span className="shrink-0">{icon}</span>}
+							<span
+								className={cn(
+									"truncate text-sm transition-colors duration-150",
+									isActive ? "text-foreground" : "text-muted-foreground",
+								)}
+							>
+								{title}
+							</span>
+						</>
+					)}
+				</div>
+				<div className="flex shrink-0 items-center gap-0.5">
+					{headerExtras}
+					{actionsContent}
+				</div>
+			</div>
+		</div>
+	);
+}
diff --git a/packages/panes/src/react/components/Workspace/components/Tab/components/Pane/components/PaneHeader/index.ts b/packages/panes/src/react/components/Workspace/components/Tab/components/Pane/components/PaneHeader/index.ts
new file mode 100644
index 00000000000..6aee6da8df3
--- /dev/null
+++ b/packages/panes/src/react/components/Workspace/components/Tab/components/Pane/components/PaneHeader/index.ts
@@ -0,0 +1 @@
+export { PaneHeader } from "./PaneHeader";
diff --git a/packages/panes/src/react/components/Workspace/components/Tab/components/Pane/index.ts b/packages/panes/src/react/components/Workspace/components/Tab/components/Pane/index.ts
new file mode 100644
index 00000000000..2537147c94a
--- /dev/null
+++ b/packages/panes/src/react/components/Workspace/components/Tab/components/Pane/index.ts
@@ -0,0 +1 @@
+export { Pane } from "./Pane";
diff --git a/packages/panes/src/react/components/Workspace/components/Tab/index.ts b/packages/panes/src/react/components/Workspace/components/Tab/index.ts
new file mode 100644
index 00000000000..70c0b817d8e
--- /dev/null
+++ b/packages/panes/src/react/components/Workspace/components/Tab/index.ts
@@ -0,0 +1 @@
+export { Tab } from "./Tab";
diff --git a/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneRootTabs/PaneRootTabs.tsx b/packages/panes/src/react/components/Workspace/components/TabBar/TabBar.tsx
similarity index 50%
rename from packages/pane-layout/src/react/components/PaneWorkspace/components/PaneRootTabs/PaneRootTabs.tsx
rename to packages/panes/src/react/components/Workspace/components/TabBar/TabBar.tsx
index d0c5eb92a88..f55d7eb0be9 100644
--- a/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneRootTabs/PaneRootTabs.tsx
+++ b/packages/panes/src/react/components/Workspace/components/TabBar/TabBar.tsx
@@ -4,8 +4,7 @@ import {
 	DropdownMenuContent,
 	DropdownMenuTrigger,
 } from "@superset/ui/dropdown-menu";
-import { cn } from "@superset/ui/lib/utils";
-import { Tooltip, TooltipContent, TooltipTrigger } from "@superset/ui/tooltip";
+import { cn } from "@superset/ui/utils";
 import { PlusIcon } from "lucide-react";
 import {
 	type ReactNode,
@@ -15,42 +14,30 @@ import {
 	useRef,
 	useState,
 } from "react";
-import type { StoreApi } from "zustand/vanilla";
-import type { PaneWorkspaceStore } from "../../../../../core/store";
-import type { PaneRootState } from "../../../../../types";
-import { PaneRootTabItem } from "./components/PaneRootTabItem";
+import type { Tab } from "../../../../../types";
+import { TabItem } from "./components/TabItem";
 
-interface PaneRootTabsProps<TPaneData> {
-	store: StoreApi<PaneWorkspaceStore<TPaneData>>;
-	roots: Array<PaneRootState<TPaneData>>;
-	activeRootId: string | null;
-	onSelectRoot: (rootId: string) => void;
-	onAddRoot?: (args: {
-		store: StoreApi<PaneWorkspaceStore<TPaneData>>;
-	}) => void;
-	renderAddRootMenu?: (args: {
-		store: StoreApi<PaneWorkspaceStore<TPaneData>>;
-	}) => ReactNode;
-	getRootTitle?: (root: PaneRootState<TPaneData>) => ReactNode;
+interface TabBarProps<TData> {
+	tabs: Tab<TData>[];
+	activeTabId: string | null;
+	onSelectTab: (tabId: string) => void;
+	onCloseTab: (tabId: string) => void;
+	onCloseOtherTabs: (tabId: string) => void;
+	onCloseAllTabs: () => void;
+	onRenameTab: (tabId: string, title: string) => void;
+	getTabTitle: (tab: Tab<TData>) => string;
+	renderAddTabMenu?: () => ReactNode;
+	renderTabAccessory?: (tab: Tab<TData>) => ReactNode;
 }
 
-function AddRootButtonCell<TPaneData>({
-	store,
-	onAddRoot,
-	renderAddRootMenu,
+function AddTabButton<_TData>({
+	renderAddTabMenu,
 }: {
-	store: StoreApi<PaneWorkspaceStore<TPaneData>>;
-	onAddRoot?: (args: {
-		store: StoreApi<PaneWorkspaceStore<TPaneData>>;
-	}) => void;
-	renderAddRootMenu?: (args: {
-		store: StoreApi<PaneWorkspaceStore<TPaneData>>;
-	}) => ReactNode;
+	renderAddTabMenu?: () => ReactNode;
 }) {
 	const button = (
 		<Button
 			className="h-full w-full rounded-none border-0 bg-transparent px-0 text-muted-foreground shadow-none hover:bg-tertiary/20 hover:text-foreground"
-			onClick={renderAddRootMenu ? undefined : () => onAddRoot?.({ store })}
 			size="sm"
 			type="button"
 			variant="ghost"
@@ -59,50 +46,46 @@ function AddRootButtonCell<TPaneData>({
 		</Button>
 	);
 
-	if (renderAddRootMenu) {
+	if (renderAddTabMenu) {
 		return (
 			<DropdownMenu>
 				<DropdownMenuTrigger asChild>{button}</DropdownMenuTrigger>
 				<DropdownMenuContent align="end" className="w-56">
-					{renderAddRootMenu({ store })}
+					{renderAddTabMenu()}
 				</DropdownMenuContent>
 			</DropdownMenu>
 		);
 	}
 
-	return (
-		<Tooltip delayDuration={500}>
-			<TooltipTrigger asChild>{button}</TooltipTrigger>
-			<TooltipContent side="top" showArrow={false}>
-				Add root
-			</TooltipContent>
-		</Tooltip>
-	);
+	return button;
 }
 
-export function PaneRootTabs<TPaneData>({
-	store,
-	roots,
-	activeRootId,
-	onSelectRoot,
-	onAddRoot,
-	renderAddRootMenu,
-	getRootTitle,
-}: PaneRootTabsProps<TPaneData>) {
+export function TabBar<TData>({
+	tabs,
+	activeTabId,
+	onSelectTab,
+	onCloseTab,
+	onCloseOtherTabs,
+	onCloseAllTabs,
+	onRenameTab,
+	getTabTitle,
+	renderAddTabMenu,
+	renderTabAccessory,
+}: TabBarProps<TData>) {
 	const scrollContainerRef = useRef<HTMLDivElement>(null);
-	const rootsTrackRef = useRef<HTMLDivElement>(null);
+	const tabsTrackRef = useRef<HTMLDivElement>(null);
 	const [hasHorizontalOverflow, setHasHorizontalOverflow] = useState(false);
 
 	const updateOverflow = useCallback(() => {
 		const container = scrollContainerRef.current;
-		const track = rootsTrackRef.current;
+		const track = tabsTrackRef.current;
 		if (!container || !track) return;
 		setHasHorizontalOverflow(track.scrollWidth > container.clientWidth + 1);
 	}, []);
 
 	useLayoutEffect(() => {
 		const container = scrollContainerRef.current;
-		const track = rootsTrackRef.current;
+		const track = tabsTrackRef.current;
 		if (!container || !track) return;
 
 		updateOverflow();
@@ -121,18 +104,12 @@ export function PaneRootTabs<TPaneData>({
 		requestAnimationFrame(updateOverflow);
 	}, [updateOverflow]);
 
-	if (roots.length === 0) {
+	if (tabs.length === 0) {
 		return (
 			<div className="group/root-tabs flex h-10 min-w-0 shrink-0 items-stretch border-b border-border bg-background">
-				{(onAddRoot || renderAddRootMenu) && (
-					<div className="flex h-full w-10 shrink-0 items-stretch bg-background">
-						<AddRootButtonCell
-							onAddRoot={onAddRoot}
-							renderAddRootMenu={renderAddRootMenu}
-							store={store}
-						/>
-					</div>
-				)}
+				<div className="flex h-full w-10 shrink-0 items-stretch bg-background">
+					<AddTabButton renderAddTabMenu={renderAddTabMenu} />
+				</div>
 				<div className="flex min-w-0 flex-1 items-stretch" />
 			</div>
 		);
@@ -155,42 +132,38 @@ export function PaneRootTabs<TPaneData>({
 						: "hide-scrollbar",
 				)}
 			>
-				<div ref={rootsTrackRef} className="flex h-full items-stretch">
-					{roots.map((root) => (
+				<div ref={tabsTrackRef} className="flex h-full items-stretch">
+					{tabs.map((tab) => (
 						<div
 							className="h-full shrink-0"
-							key={root.id}
+							key={tab.id}
 							style={{ width: "160px" }}
 						>
-							<PaneRootTabItem
-								getRootTitle={getRootTitle}
-								isActive={root.id === activeRootId}
-								onSelect={() => onSelectRoot(root.id)}
-								root={root}
-								store={store}
+							<TabItem
+								tab={tab}
+								isActive={tab.id === activeTabId}
+								onSelect={() => onSelectTab(tab.id)}
+								onClose={() => onCloseTab(tab.id)}
+								onCloseOthers={() => onCloseOtherTabs(tab.id)}
+								onCloseAll={onCloseAllTabs}
+								onRename={(title) => onRenameTab(tab.id, title)}
+								getTitle={getTabTitle}
+								accessory={renderTabAccessory?.(tab)}
 							/>
 						</div>
 					))}
-					{(onAddRoot || renderAddRootMenu) && !hasHorizontalOverflow ? (
+					{!hasHorizontalOverflow && (
 						<div className="flex h-full w-10 shrink-0 items-stretch">
-							<AddRootButtonCell
-								onAddRoot={onAddRoot}
-								renderAddRootMenu={renderAddRootMenu}
-								store={store}
-							/>
+							<AddTabButton renderAddTabMenu={renderAddTabMenu} />
 						</div>
-					) : null}
+					)}
 				</div>
 			</div>
-			{(onAddRoot || renderAddRootMenu) && hasHorizontalOverflow ? (
+			{hasHorizontalOverflow && (
 				<div className="flex h-full w-10 shrink-0 items-stretch bg-background">
-					<AddRootButtonCell
-						onAddRoot={onAddRoot}
-						renderAddRootMenu={renderAddRootMenu}
-						store={store}
-					/>
+					<AddTabButton renderAddTabMenu={renderAddTabMenu} />
 				</div>
-			) : null}
+			)}
 		</div>
 	);
 }
diff --git a/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneRootTabs/components/PaneRootTabItem/PaneRootTabItem.tsx b/packages/panes/src/react/components/Workspace/components/TabBar/components/TabItem/TabItem.tsx
similarity index 71%
rename from packages/pane-layout/src/react/components/PaneWorkspace/components/PaneRootTabs/components/PaneRootTabItem/PaneRootTabItem.tsx
rename to packages/panes/src/react/components/Workspace/components/TabBar/components/TabItem/TabItem.tsx
index 53a537da397..4cbec17bece 100644
--- a/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneRootTabs/components/PaneRootTabItem/PaneRootTabItem.tsx
+++ b/packages/panes/src/react/components/Workspace/components/TabBar/components/TabItem/TabItem.tsx
@@ -6,36 +6,42 @@ import {
 	ContextMenuSeparator,
 	ContextMenuTrigger,
 } from "@superset/ui/context-menu";
-import { cn } from "@superset/ui/lib/utils";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@superset/ui/tooltip";
+import { cn } from "@superset/ui/utils";
 import { PencilIcon, XIcon } from "lucide-react";
 import { type ReactNode, useState } from "react";
-import type { StoreApi } from "zustand/vanilla";
-import type { PaneWorkspaceStore } from "../../../../../../../core/store";
-import type { PaneRootState } from "../../../../../../../types";
-import { RootRenameInput } from "./components/RootRenameInput";
+import type { Tab } from "../../../../../../../types";
+import { TabRenameInput } from "./components/TabRenameInput";
 
-interface PaneRootTabItemProps<TPaneData> {
-	store: StoreApi<PaneWorkspaceStore<TPaneData>>;
-	root: PaneRootState<TPaneData>;
+interface TabItemProps<TData> {
+	tab: Tab<TData>;
 	isActive: boolean;
 	onSelect: () => void;
-	getRootTitle?: (root: PaneRootState<TPaneData>) => ReactNode;
+	onClose: () => void;
+	onCloseOthers: () => void;
+	onCloseAll: () => void;
+	onRename: (title: string) => void;
+	getTitle: (tab: Tab<TData>) => string;
+	accessory?: ReactNode;
 }
 
-export function PaneRootTabItem<TPaneData>({
-	store,
-	root,
+export function TabItem<TData>({
+	tab,
 	isActive,
 	onSelect,
-	getRootTitle,
-}: PaneRootTabItemProps<TPaneData>) {
+	onClose,
+	onCloseOthers,
+	onCloseAll,
+	onRename,
+	getTitle,
+	accessory,
+}: TabItemProps<TData>) {
 	const [isEditing, setIsEditing] = useState(false);
 	const [editValue, setEditValue] = useState("");
-	const resolvedTitle = root.titleOverride ?? getRootTitle?.(root) ?? root.id;
+	const title = getTitle(tab);
 
 	const startEditing = () => {
-		setEditValue(typeof resolvedTitle === "string" ? resolvedTitle : root.id);
+		setEditValue(title);
 		setIsEditing(true);
 	};
 
@@ -45,24 +51,19 @@ export function PaneRootTabItem<TPaneData>({
 
 	const saveEdit = () => {
 		const nextTitle = editValue.trim();
-		store.getState().setRootTitleOverride({
-			rootId: root.id,
-			titleOverride: nextTitle.length > 0 ? nextTitle : undefined,
-		});
+		if (nextTitle.length > 0 && nextTitle !== title) {
+			onRename(nextTitle);
+		}
 		stopEditing();
 	};
 
-	const handleClose = () => {
-		store.getState().removeRoot(root.id);
-	};
-
 	return (
 		<ContextMenu>
 			<ContextMenuTrigger asChild>
 				<div className="group relative flex h-full w-full items-center border-r border-border">
 					{isEditing ? (
 						<div className="flex h-full w-full shrink-0 items-center px-2">
-							<RootRenameInput
+							<TabRenameInput
 								className="text-sm w-full min-w-0 rounded border border-border bg-background px-1 py-0.5 text-foreground outline-none focus:ring-1 focus:ring-ring"
 								maxLength={64}
 								onCancel={stopEditing}
@@ -85,18 +86,19 @@ export function PaneRootTabItem<TPaneData>({
 										onAuxClick={(event) => {
 											if (event.button === 1) {
 												event.preventDefault();
-												handleClose();
+												onClose();
 											}
 										}}
 										onClick={onSelect}
 										onDoubleClick={startEditing}
 										type="button"
 									>
-										<span className="flex-1 truncate">{resolvedTitle}</span>
+										<span className="flex-1 truncate">{title}</span>
+										{accessory}
 									</button>
 								</TooltipTrigger>
 								<TooltipContent side="bottom" showArrow={false}>
-									{resolvedTitle}
+									{title}
 								</TooltipContent>
 							</Tooltip>
 							<div className="absolute right-1 top-1/2 hidden -translate-y-1/2 items-center gap-0.5 group-hover:flex">
@@ -106,9 +108,9 @@ export function PaneRootTabItem<TPaneData>({
 											className="size-6 cursor-pointer hover:bg-muted"
 											onClick={(event) => {
 												event.stopPropagation();
-												handleClose();
+												onClose();
 											}}
-											size="icon-xs"
+											size="icon"
 											type="button"
 											variant="ghost"
 										>
@@ -130,10 +132,12 @@ export function PaneRootTabItem<TPaneData>({
 					Rename
 				</ContextMenuItem>
 				<ContextMenuSeparator />
-				<ContextMenuItem onSelect={handleClose}>
+				<ContextMenuItem onSelect={onClose}>
 					<XIcon className="mr-2 size-4" />
 					Close
 				</ContextMenuItem>
+				<ContextMenuItem onSelect={onCloseOthers}>Close Others</ContextMenuItem>
+				<ContextMenuItem onSelect={onCloseAll}>Close All</ContextMenuItem>
 			</ContextMenuContent>
 		</ContextMenu>
 	);
diff --git a/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneRootTabs/components/PaneRootTabItem/components/RootRenameInput/RootRenameInput.tsx b/packages/panes/src/react/components/Workspace/components/TabBar/components/TabItem/components/TabRenameInput/TabRenameInput.tsx
similarity index 91%
rename from packages/pane-layout/src/react/components/PaneWorkspace/components/PaneRootTabs/components/PaneRootTabItem/components/RootRenameInput/RootRenameInput.tsx
rename to packages/panes/src/react/components/Workspace/components/TabBar/components/TabItem/components/TabRenameInput/TabRenameInput.tsx
index 6d388636e76..b5255d33bed 100644
--- a/packages/pane-layout/src/react/components/PaneWorkspace/components/PaneRootTabs/components/PaneRootTabItem/components/RootRenameInput/RootRenameInput.tsx
+++ b/packages/panes/src/react/components/Workspace/components/TabBar/components/TabItem/components/TabRenameInput/TabRenameInput.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useRef } from "react";
 
-interface RootRenameInputProps {
+interface TabRenameInputProps {
 	value: string;
 	onChange: (value: string) => void;
 	onSubmit: () => void;
@@ -9,14 +9,14 @@ interface RootRenameInputProps {
 	maxLength?: number;
 }
 
-export function RootRenameInput({
+export function TabRenameInput({
 	value,
 	onChange,
 	onSubmit,
 	onCancel,
 	className,
 	maxLength,
-}: RootRenameInputProps) {
+}: TabRenameInputProps) {
 	const inputRef = useRef<HTMLInputElement>(null);
 
 	useEffect(() => {
diff --git a/packages/panes/src/react/components/Workspace/components/TabBar/components/TabItem/components/TabRenameInput/index.ts b/packages/panes/src/react/components/Workspace/components/TabBar/components/TabItem/components/TabRenameInput/index.ts
new file mode 100644
index 00000000000..8c2c5be1a5b
--- /dev/null
+++ b/packages/panes/src/react/components/Workspace/components/TabBar/components/TabItem/components/TabRenameInput/index.ts
@@ -0,0 +1 @@
+export { TabRenameInput } from "./TabRenameInput";
diff --git a/packages/panes/src/react/components/Workspace/components/TabBar/components/TabItem/index.ts b/packages/panes/src/react/components/Workspace/components/TabBar/components/TabItem/index.ts
new file mode 100644
index 00000000000..a14a2566dbf
--- /dev/null
+++ b/packages/panes/src/react/components/Workspace/components/TabBar/components/TabItem/index.ts
@@ -0,0 +1 @@
+export { TabItem } from "./TabItem";
diff --git a/packages/panes/src/react/components/Workspace/components/TabBar/index.ts b/packages/panes/src/react/components/Workspace/components/TabBar/index.ts
new file mode 100644
index 00000000000..a4038ca4508
--- /dev/null
+++ b/packages/panes/src/react/components/Workspace/components/TabBar/index.ts
@@ -0,0 +1 @@
+export { TabBar } from "./TabBar";
diff --git a/packages/panes/src/react/components/Workspace/index.ts b/packages/panes/src/react/components/Workspace/index.ts
new file mode 100644
index 00000000000..e904b737efa
--- /dev/null
+++ b/packages/panes/src/react/components/Workspace/index.ts
@@ -0,0 +1 @@
+export { Workspace } from "./Workspace";
diff --git a/packages/panes/src/react/index.ts b/packages/panes/src/react/index.ts
new file mode 100644
index 00000000000..3ac9a4a111f
--- /dev/null
+++ b/packages/panes/src/react/index.ts
@@ -0,0 +1,10 @@
+export { Workspace } from "./components/Workspace";
+export type {
+	PaneActionConfig,
+	PaneContext,
+	PaneDefinition,
+	PaneRegistry,
+	RendererContext,
+	TabContext,
+	WorkspaceProps,
+} from "./types";
diff --git a/packages/panes/src/react/types.ts b/packages/panes/src/react/types.ts
new file mode 100644
index 00000000000..13bcf03777f
--- /dev/null
+++ b/packages/panes/src/react/types.ts
@@ -0,0 +1,76 @@
+import type { ComponentType, ReactNode } from "react";
+import type { StoreApi } from "zustand/vanilla";
+import type { CreatePaneInput, WorkspaceStore } from "../core/store";
+import type { Pane, Tab } from "../types";
+
+export interface PaneActionConfig<TData> {
+	key: string;
+	icon: ReactNode | ((context: RendererContext<TData>) => ReactNode);
+	tooltip: ReactNode | ((context: RendererContext<TData>) => ReactNode);
+	onClick: (context: RendererContext<TData>) => void;
+}
+
+export interface PaneContext<TData> extends Pane<TData> {
+	parentDirection: "horizontal" | "vertical" | null;
+}
+
+export interface TabContext<TData> extends Tab<TData> {
+	position: number;
+}
+
+export interface RendererContext<TData> {
+	pane: PaneContext<TData>;
+	tab: TabContext<TData>;
+	isActive: boolean;
+	store: StoreApi<WorkspaceStore<TData>>;
+
+	actions: {
+		close: () => void;
+		focus: () => void;
+		setTitle: (title: string) => void;
+		pin: () => void;
+		updateData: (data: TData) => void;
+		split: (
+			position: "right" | "down",
+			newPane: CreatePaneInput<TData>,
+		) => void;
+	};
+
+	components: {
+		PaneHeaderActions: ComponentType;
+	};
+}
+
+export interface PaneDefinition<TData> {
+	renderPane(context: RendererContext<TData>): ReactNode;
+	getTitle?(context: RendererContext<TData>): ReactNode;
+	getIcon?(context: RendererContext<TData>): ReactNode;
+	renderTitle?(context: RendererContext<TData>): ReactNode;
+	renderHeaderExtras?(context: RendererContext<TData>): ReactNode;
+	renderToolbar?(context: RendererContext<TData>): ReactNode;
+	paneActions?:
+		| PaneActionConfig<TData>[]
+		| ((
+				context: RendererContext<TData>,
+				defaults: PaneActionConfig<TData>[],
+		  ) => PaneActionConfig<TData>[]);
+}
+
+export type PaneRegistry<TData> = Record<string, PaneDefinition<TData>>;
+
+export interface WorkspaceProps<TData> {
+	store: StoreApi<WorkspaceStore<TData>>;
+	registry: PaneRegistry<TData>;
+	className?: string;
+	renderTabAccessory?: (tab: Tab<TData>) => ReactNode;
+	renderEmptyState?: () => ReactNode;
+	renderAddTabMenu?: () => ReactNode;
+	onBeforeClosePane?: (
+		pane: Pane<TData>,
+		tab: Tab<TData>,
+	) => boolean | Promise<boolean>;
+	onBeforeCloseTab?: (tab: Tab<TData>) => boolean | Promise<boolean>;
+	paneActions?:
+		| PaneActionConfig<TData>[]
+		| ((context: RendererContext<TData>) => PaneActionConfig<TData>[]);
+}
diff --git a/packages/panes/src/types.ts b/packages/panes/src/types.ts
new file mode 100644
index 00000000000..423429bbb92
--- /dev/null
+++ b/packages/panes/src/types.ts
@@ -0,0 +1,36 @@
+export type SplitDirection = "horizontal" | "vertical";
+
+export type SplitPosition = "top" | "right" | "bottom" | "left";
+
+export type LayoutNode =
+	| { type: "pane"; paneId: string }
+	| {
+			type: "split";
+			id: string;
+			direction: SplitDirection;
+			children: LayoutNode[];
+			weights: number[];
+	  };
+
+export interface Pane<TData> {
+	id: string;
+	kind: string;
+	titleOverride?: string;
+	pinned?: boolean;
+	data: TData;
+}
+
+export interface Tab<TData> {
+	id: string;
+	titleOverride?: string;
+	createdAt: number;
+	activePaneId: string | null;
+	layout: LayoutNode;
+	panes: Record<string, Pane<TData>>;
+}
+
+export interface WorkspaceState<TData> {
+	version: 1;
+	tabs: Tab<TData>[];
+	activeTabId: string | null;
+}
diff --git a/packages/pane-layout/tsconfig.json b/packages/panes/tsconfig.json
similarity index 100%
rename from packages/pane-layout/tsconfig.json
rename to packages/panes/tsconfig.json
diff --git a/plans/panes-v2-data-model-redesign.md b/plans/panes-v2-data-model-redesign.md
new file mode 100644
index 00000000000..e9f92e1034f
--- /dev/null
+++ b/plans/panes-v2-data-model-redesign.md
@@ -0,0 +1,961 @@
+# Pane Layout: New Tab + Split + Pane Model
+
+## Context
+
+The current v2 pane model has a 3-tier layout tree: **Root → Split/Group → Pane**. `PaneGroupNode` is a leaf in the split tree that contains a *tab strip* of multiple panes — essentially tabs-within-tabs. The goal is to flatten this to **Tab → Split → Pane**. Each leaf in the layout tree becomes a single pane, no inner tab strip.
+
+No backwards compatibility or migration needed — this isn't live yet.
+
+---
+
+## Schema
+
+### Layout Tree (purely structural — no pane data)
+
+```ts
+type SplitDirection = "horizontal" | "vertical";
+
+type LayoutNode =
+  | { type: "pane"; paneId: string }
+  | {
+      type: "split";
+      id: string;
+      direction: SplitDirection;
+      children: LayoutNode[];  // n-ary (not binary)
+      weights: number[];           // relative weights, one per child (e.g. [1, 2, 1])
+    };
+```
+
+**N-ary splits** — matches FlexLayout and VS Code's approach.
+
+**Relative weights** instead of percentages (FlexLayout's approach). Weights don't need to sum to any specific value — they're proportional. `[1, 1, 1]` = equal thirds, `[3, 2]` = 60/40. Sidesteps the "33.33 + 33.33 + 33.34" rounding problem entirely.
+
+- **Rendering**: CSS `flex-grow` takes weights directly — `flexGrow: weight` on each child.
+- **Resize drag**: UI snapshots pixel sizes from the DOM on mousedown, does pixel math during drag, then converts back to weights via `newPixelSize / totalPixels * sumOfWeights`. Only the two panes adjacent to the dragged splitter are affected.
+- **Equalize**: just set all weights to `1`. Done.
+
+The layout tree only holds `paneId` strings — pane data lives separately in a flat map.
+
+### Pane Data (generic)
+
+```ts
+interface Pane<TData> {
+  id: string;
+  kind: string;
+  titleOverride?: string;  // optional override; titles derived via registry's getTitle()
+  pinned?: boolean;         // unpinned panes can be replaced in-place (e.g. file preview)
+  data: TData;              // pane-specific state lives here (including status indicators, URLs, etc.)
+}
+```
+
+- **`@superset/panes` stays generic** — `TData` parameterized by consumers
+- **Titles are derived** by the registry's `getTitle(context)`, with optional `titleOverride` for user renames
+- **`pinned`** — controls preview/replace behavior. Unpinned panes (e.g. file preview on single-click) can be replaced in-place without splitting. Double-click or edit pins the pane so it persists.
+
+### Open-a-pane behavior (e.g. quick-open, open file from sidebar)
+
+This is the most common user flow — currently `addPaneToGroup({ replaceUnpinned: true })`. In the new model:
+
+```
+1. Check if the file is already open in the tab → focus it (setActivePane)
+2. Find ANY unpinned file pane in the tab (scan tab.panes for kind === "file" && !pinned):
+   → replacePane(tabId, paneId, newPane)  — swap entire Pane, update layout tree paneId ref
+   (VS Code behavior: preview pane is a tab-wide singleton, not tied to focus)
+3. No unpinned file pane, but active pane exists:
+   → splitPane(tabId, activePaneId, "right", newPane)  — split the active pane to the right
+4. No active pane / no tab:
+   → addTab with the new pane
+```
+
+Default split direction is **right** (horizontal). This matches VS Code's behavior and the v1 `splitPaneAuto` which picked vertical/horizontal based on dimensions — we can refine later, but right is the sane default.
+
+The consumer (apps/desktop `PaneViewer.tsx`) owns this logic, not the pane-layout package. The package provides the primitives (`replacePane`, `splitPane`, `addTab`), the app composes them.
+
+### Tab
+
+```ts
+interface Tab<TData> {
+  id: string;
+  titleOverride?: string;
+  createdAt: number;
+  activePaneId: string | null;
+  layout: LayoutNode | null;          // null = empty tab
+  panes: Record<string, Pane<TData>>;  // flat map, O(1) lookup
+}
+```
+
+- **`panes` as flat map** — layout tree is purely structural (`paneId` refs), pane data lives here. Clean separation.
+- **`activePaneId`** — single level of focus tracking (replaces the old two-hop `activeGroupId` → group's `activePaneId` chain)
+- **`layout: null`** — not a normal state. Tabs always have at least one pane: creation makes one, closing the last pane closes the tab. Null is only for transient/initial states.
+
+### Workspace (top-level)
+
+```ts
+interface WorkspaceState<TData> {
+  version: 1;
+  tabs: Tab<TData>[];
+  activeTabId: string | null;
+}
+```
+
+### Drop Targets
+
+```ts
+type SplitPosition = "top" | "right" | "bottom" | "left";
+
+type DropTarget = {
+  type: "split";
+  tabId: string;
+  paneId: string;
+  position: SplitPosition;
+};
+```
+
+Dragging always creates a split. No "add as tab within group" drop zone (groups don't exist).
+
+---
+
+## Concrete Example
+
+```json
+{
+  "version": 1,
+  "tabs": [
+    {
+      "id": "tab_1",
+      "titleOverride": "Chat",
+      "createdAt": 1743300000000,
+      "activePaneId": "pane_chat",
+      "layout": {
+        "type": "split",
+        "id": "split_1",
+        "direction": "horizontal",
+        "children": [
+          { "type": "pane", "paneId": "pane_chat" },
+          { "type": "pane", "paneId": "pane_term" }
+        ],
+        "weights": [3, 2]
+      },
+      "panes": {
+        "pane_chat": {
+          "id": "pane_chat",
+          "kind": "chat",
+          "data": { "sessionId": null }
+        },
+        "pane_term": {
+          "id": "pane_term",
+          "kind": "terminal",
+          "data": {
+            "sessionKey": "workspace-123:abc",
+            "cwd": "/workspace/my-repo",
+            "launchMode": "workspace-shell"
+          }
+        }
+      }
+    }
+  ],
+  "activeTabId": "tab_1"
+}
+```
+
+---
+
+## Store Interface
+
+### Tab actions
+
+| Action | Signature | Notes |
+|---|---|---|
+| `addTab` | `(tab: Tab)` | Adds a new tab |
+| `removeTab` | `(tabId: string)` | Removes tab, activates neighbor |
+| `setActiveTab` | `(tabId: string)` | Switches active tab |
+| `setTabTitleOverride` | `(tabId, titleOverride?)` | |
+| `getTab` | `(tabId) → Tab \| null` | |
+| `getActiveTab` | `() → Tab \| null` | |
+
+### Pane actions
+
+| Action | Signature | Notes |
+|---|---|---|
+| `setActivePane` | `(tabId, paneId)` | Sets focused pane in tab |
+| `getPane` | `(paneId) → { tabId, pane } \| null` | Searches across all tabs |
+| `getActivePane` | `(tabId?) → { tabId, pane } \| null` | |
+| `closePane` | `(tabId, paneId)` | Removes from layout + panes map, collapses empty splits |
+| `setPaneData` | `(paneId, data)` | Updates pane data in flat map |
+| `setPaneTitleOverride` | `(tabId, paneId, titleOverride?)` | |
+
+### Split actions
+
+| Action | Signature | Notes |
+|---|---|---|
+| `splitPane` | `(tabId, paneId, position, newPane, weights?)` | Wraps target pane in a split with the new pane |
+| `addPane` | `(tabId, pane, position?, relativeToPaneId?)` | Adds pane by splitting; appends to edge if no target |
+| `resizeSplit` | `(tabId, splitId, weights)` | Updates weights array (UI converts pixels → weights) |
+| `equalizeSplit` | `(tabId, splitId)` | Sets all weights to `1` |
+
+### Pane pin actions
+
+| Action | Signature | Notes |
+|---|---|---|
+| `setPanePinned` | `(tabId, paneId, pinned)` | Pin/unpin a pane |
+| `replacePane` | `(tabId, paneId, newPane: Pane)` | Replace an unpinned pane with a full new Pane. Removes old entry from `panes` map, adds new entry, updates the layout tree leaf's `paneId` to `newPane.id`. No structural layout change (no splits created/removed). No-op if target pane is pinned. |
+
+### Bulk
+
+| Action | Signature |
+|---|---|
+| `replaceState` | `(next \| (prev) => next)` |
+
+---
+
+## Splitting Behavior
+
+When splitting a pane, the new pane steals space from the target — everything else stays put.
+
+**Split into a new direction** (target pane is a leaf or in a split with a different direction):
+```
+Before: { type: "pane", paneId: "A" }
+Split A right with new pane B:
+After:  { type: "split", direction: "horizontal", children: [A, B], weights: [1, 1] }
+```
+
+**Split within an existing same-direction split** (e.g., drop right on a pane already in a horizontal split):
+```
+Before: weights [3, 2, 1], split pane[1] (weight 2)
+After:  weights [3, 1, 1, 1]  — pane[1]'s weight halved, new pane inserted adjacent
+```
+
+The rule: `targetWeight / 2` for each of the two panes. Other siblings are untouched.
+
+**Position → Direction mapping:** left/right → `"horizontal"`, top/bottom → `"vertical"`. Position also determines child order: left/top → new pane first, right/bottom → new pane second.
+
+---
+
+## Collapsing / Normalization
+
+When a pane is closed:
+1. `context.actions.close()` calls the registered `onBeforeClose` handler (if any) — if it returns false, stop (e.g. "Save changes?" modal)
+2. Remove the `{ type: "pane", paneId }` leaf from the parent split's `children` and `weights` arrays
+3. Remove corresponding entry from `tab.panes`
+4. If the parent split has 1 child left → replace the split with that child (collapse). Recurse up.
+5. If `activePaneId` was the closed pane → fall back to first pane in tree (depth-first)
+6. If that was the last pane in the tab → remove the tab entirely (tabs always have at least one pane)
+
+---
+
+## React Components
+
+### Component Tree
+
+```
+Workspace                          manages tabs, renders TabBar + active Tab
+├── TabBar                         horizontal tab strip with overflow
+│   └── TabItem × N               single tab: click, middle-click close, drag reorder
+│       ├── TabRenameInput         inline input on double-click
+│       └── TabContextMenu         Rename / Close / Close Others / Close All
+└── Tab                            resolves tab's layout, provides tab context, owns recursive renderer
+    └── (recursive layout renderer, inline in Tab.tsx)
+        ├── [if pane]  Pane        data boundary: resolves pane, wires handlers
+        │   ├── PaneHeader         toolbar content + close + active state + context menu
+        │   │   ├── PaneRenameInput    inline input on double-click title
+        │   │   └── PaneContextMenu    Close / Split Right / Split Down + registered items
+        │   └── PaneContent        calls registry renderPane
+        └── [if split] flex container + SplitHandle → recurse
+```
+
+**Responsibility boundaries:**
+- `Workspace` — tab-level state (active tab, add/remove tabs). Renders empty state when no tabs exist. Doesn't know about panes.
+- `Tab` — resolves one tab's layout tree, provides tab context to children. Owns the recursive layout renderer. Tabs always have at least one pane (closing last pane closes the tab).
+- `Pane` — data/handler boundary. Resolves pane from flat map, builds `RendererContext`, wires handlers (close, focus, rename, pin, split). Children are presentational.
+- `PaneHeader` / `PaneContent` — presentational. Receive resolved data + callbacks as props, don't touch the store.
+
+### File Structure (co-located per AGENTS.md)
+
+```
+packages/pane-layout/src/react/components/
+└── Workspace/
+    ├── Workspace.tsx
+    ├── index.ts
+    └── components/
+        ├── TabBar/
+        │   ├── TabBar.tsx
+        │   ├── index.ts
+        │   └── components/
+        │       └── TabItem/
+        │           ├── TabItem.tsx
+        │           ├── index.ts
+        │           └── components/
+        │               ├── TabRenameInput/
+        │               │   ├── TabRenameInput.tsx
+        │               │   └── index.ts
+        │               └── TabContextMenu/
+        │                   ├── TabContextMenu.tsx
+        │                   └── index.ts
+        ├── Tab/
+        │   ├── Tab.tsx            (resolves layout, recursive renderer)
+        │   ├── index.ts
+        │   └── components/
+        │       ├── Pane/
+        │       │   ├── Pane.tsx           (data boundary: resolves pane, wires handlers)
+        │       │   ├── index.ts
+        │       │   └── components/
+        │       │       ├── PaneHeader/
+        │       │       │   ├── PaneHeader.tsx
+        │       │       │   ├── index.ts
+        │       │       │   └── components/
+        │       │       │       ├── PaneRenameInput/
+        │       │       │       │   ├── PaneRenameInput.tsx
+        │       │       │       │   └── index.ts
+        │       │       │       └── PaneContextMenu/
+        │       │       │           ├── PaneContextMenu.tsx
+        │       │       │           └── index.ts
+        │       │       └── PaneContent/
+        │       │           ├── PaneContent.tsx
+        │       │           └── index.ts
+        │       └── SplitHandle/
+        │           ├── SplitHandle.tsx
+        │           └── index.ts
+```
+
+### Types
+
+```ts
+type ContextMenuItem =
+  | {
+      type?: "item";
+      label: string;
+      icon?: ReactNode;
+      variant?: "default" | "destructive";
+      onSelect: () => void;
+      shortcut?: string;          // display-only hint (e.g. "⌘K") — actual keybinding is owned by the pane
+      disabled?: boolean;
+    }
+  | { type: "separator" }
+  | {
+      type: "submenu";
+      label: string;
+      icon?: ReactNode;
+      items: ContextMenuItem[];   // nested items (e.g. "Move to Tab ›")
+    };
+
+interface RendererContext<TData> {
+  pane: Pane<TData>;
+  tab: Tab<TData>;
+  isActive: boolean;
+  store: StoreApi<WorkspaceStore<TData>>;  // escape hatch for advanced cases
+
+  actions: {
+    close: () => void;          // checks onBeforeClose guard first, then calls store.closePane
+    focus: () => void;
+    setTitle: (title: string) => void;
+    pin: () => void;
+    updateData: (data: TData) => void;
+    splitRight: (newPane: Pane<TData>) => void;
+    splitDown: (newPane: Pane<TData>) => void;
+  };
+}
+
+interface PaneDefinition<TData> {
+  renderPane(context: RendererContext<TData>): ReactNode;
+  renderToolbar?(context: RendererContext<TData>): ReactNode;
+  getTitle?(context: RendererContext<TData>): ReactNode;
+  getIcon?(context: RendererContext<TData>): ReactNode;
+}
+
+type PaneRegistry<TData> = Record<string, PaneDefinition<TData>>;
+
+// Workspace-level props (passed to <Workspace>)
+interface WorkspaceProps<TData> {
+  store: StoreApi<WorkspaceStore<TData>>;
+  registry: PaneRegistry<TData>;
+  renderTabAccessory?: (tab: Tab<TData>) => ReactNode;  // custom tab UI (status dot, badge, etc.)
+  renderEmptyState?: () => ReactNode;                    // shown when no tabs exist
+  renderAddTabMenu?: () => ReactNode;                     // dropdown content for "+" button in tab bar
+  // ...other callbacks as needed
+}
+```
+
+**Notes:**
+- `renderToolbar` — full eject. If provided, replaces the entire PaneHeader content (icon, title, actions — everything). For panes that need a completely custom header (e.g. browser with nav buttons + URL bar). Most panes don't need this — the default header uses `getIcon()` + `getTitle()` + split/close buttons.
+- `context.actions` — pre-wired imperative actions. `close()` checks the close guard (if registered via `useOnBeforeClose`) first, then calls the store's raw `closePane`.
+- `store` on context is an escape hatch — pane implementations should use `context.actions.*` for normal operations.
+- The `Pane` component (data boundary) builds the full `RendererContext` so pane implementations never need to know about `tabId` or call store methods directly.
+
+**Pane hooks** (react-dnd style — spec + deps, framework handles registration/cleanup):
+
+```ts
+// Close guard — return false to cancel close (e.g. show "Save changes?" modal)
+useOnBeforeClose(context, async () => {
+  if (!isDirty) return true;
+  return await showSaveDialog();
+}, [isDirty]);
+
+// Context menu items — registered from inside the render tree (access to refs)
+useContextMenuActions(context, [
+  { label: "Refresh", onSelect: () => webviewRef.current?.reload() },
+], []);
+```
+
+Both hooks store the handler/items via a ref on the `Pane` component (through context). Cleanup on unmount is automatic. `PaneContextMenu` renders default items (Close, Split Right, Split Down) + items from `useContextMenuActions`, after a separator.
+
+### Visual Reference (v1 components to match)
+
+These v1 files are the styling targets — the new components should match their look 1:1:
+
+| New Component | Reference File | What to match |
+|---|---|---|
+| `PaneHeader` | `apps/desktop/.../TabView/mosaic-theme.css` | `.mosaic-window-toolbar` (28px height, `var(--color-tertiary)` bg, focused = `var(--color-secondary)`) |
+| `PaneHeader` (layout) | `apps/desktop/.../TabView/components/BasePaneWindow/BasePaneWindow.tsx` | Toolbar wrapper pattern, focus/split/close handler wiring |
+| `PaneHeader` (title) | `apps/desktop/.../TabView/components/PaneTitle/PaneTitle.tsx` | Editable title, `text-sm text-muted-foreground`, double-click to rename |
+| `PaneHeader` (actions) | `apps/desktop/.../TabView/components/PaneToolbarActions/PaneToolbarActions.tsx` | Split + close buttons, `rounded p-0.5 text-muted-foreground/60` |
+| `PaneRenameInput` | `apps/desktop/.../WorkspaceSidebar/RenameInput/RenameInput.tsx` | Shared inline rename input (Enter/Escape/blur, auto-focus + select) |
+| `TabBar` | `apps/desktop/.../TabsContent/GroupStrip/GroupStrip.tsx` | `h-10` tab strip, scroll overflow, fixed `160px` tab width |
+| `TabItem` | `apps/desktop/.../TabsContent/GroupStrip/GroupItem.tsx` | Tab item styles, context menu (inline), middle-click close |
+| `SplitHandle` | `apps/desktop/.../TabView/components/MosaicSplitOverlay/MosaicSplitOverlay.tsx` | 20px hit area, 1px `after:bg-border` line on hover, double-click equalize |
+| `PaneContextMenu` | `apps/desktop/.../TabsContent/TabContentContextMenu.tsx` | Pane right-click menu structure |
+
+### PaneHeader behavior
+
+- **Default**: `getIcon()` + `getTitle()` on left, split + close buttons on right
+- **Full eject**: if `renderToolbar()` is provided, replaces entire header content
+- Focus state driven by `pane.id === tab.activePaneId`
+- Click anywhere: `context.actions.focus()`
+- Right-click: `PaneContextMenu`
+- Future DnD: entire header becomes drag handle
+
+---
+
+## Implementation Plan
+
+### Phase 1: Rename + gut the package
+
+1. Rename `packages/pane-layout/` → `packages/panes/` and `@superset/panes` → `@superset/panes` in `package.json`
+2. Delete all existing source files in `src/` (types, store, react components, tests)
+3. Update the import in `apps/desktop/package.json` from `@superset/panes` to `@superset/panes`
+4. Stub `src/index.ts` so the build doesn't break
+
+### Phase 2: Types + Store (no React)
+
+1. `src/types.ts` — `Pane`, `Tab`, `WorkspaceState`, `LayoutNode`, `SplitDirection`, `SplitPosition`, `ContextMenuItem`
+2. `src/core/store/utils.ts` — tree traversal helpers: find pane in layout tree, find parent split, collapse empty splits, find first pane (depth-first)
+3. `src/core/store/store.ts` — `createWorkspaceStore()` with all actions (tab CRUD, pane CRUD, split/resize/equalize, replacePane, replaceState)
+4. `src/core/store/store.test.ts` — full test suite (see Tests section)
+5. `src/index.ts` — export types + store
+
+Run `bun test` — all store tests pass before touching React.
+
+### Phase 3: React components
+
+1. `src/react/types.ts` — `RendererContext`, `PaneDefinition`, `PaneRegistry`, `WorkspaceProps`
+2. `src/react/hooks/` — `useOnBeforeClose`, `useContextMenuActions`, zustand `useStore` wrapper
+3. Build component tree top-down:
+   - `Workspace/Workspace.tsx` — reads store, renders `TabBar` + `Tab`
+   - `Workspace/components/TabBar/` — tab strip with overflow, `TabItem`, `TabRenameInput`, `TabContextMenu`
+   - `Workspace/components/Tab/` — resolves layout, recursive renderer
+   - `Workspace/components/Tab/components/Pane/` — data boundary, builds `RendererContext`
+   - `Workspace/components/Tab/components/Pane/components/PaneHeader/` — default header with icon/title/actions, full eject via `renderToolbar`
+   - `Workspace/components/Tab/components/Pane/components/PaneContent/` — calls `definition.renderPane()`
+   - `Workspace/components/Tab/components/SplitHandle/` — resize divider
+4. `src/index.ts` — export React components + hooks
+
+Run `bun run typecheck` — package compiles.
+
+### Phase 4: Hook up desktop app
+
+1. Update `apps/desktop/package.json` import
+2. Update collection schema (`dashboardSidebarLocal/schema.ts`) — change `PaneWorkspaceState` → `WorkspaceState` import
+3. Update `pane-viewer.model.ts` — pane factory functions (`createFilePane`, `createTerminalPane`, etc.) to return new `Pane<TData>` shape
+4. Update `PaneViewer.tsx` — new pane registry with `renderPane`, `getTitle`, `getIcon`, `renderToolbar` (for browser)
+5. Update `useV2WorkspacePaneLayout.ts` — swap `createPaneWorkspaceStore` → `createWorkspaceStore`, update type references. Persistence sync pattern stays the same.
+6. Update all callsites using old store actions — search for `addPaneToGroup`, `splitGroup`, `groupId`, `addRoot`, `removeRoot`, `setActiveRoot`
+7. Write the README.md into `packages/panes/README.md`
+
+Run `bun run typecheck` from root, `bun run lint:fix`, manual test in desktop app.
+
+### What stays untouched
+- `apps/desktop/.../CollectionsProvider/` collection structure (workspaceId, sidebarState) — just update the type import
+- The bidirectional persistence sync pattern in `useV2WorkspacePaneLayout` — same `replaceState` + `store.subscribe` approach
+- All pane content components (terminal, chat, browser, file viewer) — they just get the new `RendererContext` interface
+
+---
+
+## Drag-and-Drop (future — not part of first push)
+
+DnD is out of scope for the initial implementation but the model is designed to support it. Here's the plan for when we add it.
+
+### Store action
+
+```ts
+movePaneBySplit: (args: {
+  sourcePaneId: string;
+  targetTabId: string;
+  targetPaneId: string;
+  position: SplitPosition;
+}) => void;
+```
+
+Atomically: remove source pane from its current location (layout + panes map, collapse empty splits), then split the target pane and insert the moved pane at the given position. Works cross-tab (move entry between tabs' `panes` maps).
+
+No path adjustment needed (unlike react-mosaic) because we use IDs, not paths.
+
+### UI behavior
+
+- **Dragging over the tab bar** → `setActiveTab(hoveredTabId)` to switch tabs during drag (with small delay to avoid flicker), so you can see the target tab's panes before dropping
+- **Dragging over a pane's content area** → show split preview overlay (4 edge zones: top/right/bottom/left highlighted based on mouse position within the pane rect). This is local React state on the drop target, not store state.
+- **Drop** → calls `movePaneBySplit` with the resolved target
+- **Cancel / invalid drop** → no-op, source pane stays where it was
+
+### Component changes for DnD
+
+**`PaneHeader`**
+- The entire header bar is the drag handle (same pattern as v1's MosaicWindow toolbar)
+- On drag start: store `{ tabId, paneId }` in drag item
+
+**`Pane`**
+- Wraps each pane in a drop target
+- On drag hover: tracks mouse position within the pane rect, determines which edge zone (top/right/bottom/left) is closest, shows a split preview overlay highlighting that zone
+- On drop: calls `movePaneBySplit({ sourcePaneId, targetTabId, targetPaneId, position })`
+
+**`TabBar` / `TabItem`**
+- Each tab item is a drop target
+- On drag hover (with ~300ms delay): calls `setActiveTab(hoveredTabId)` to switch the visible tab
+- Visual indicator that the tab will activate (e.g. subtle highlight)
+
+**`Workspace`**
+- Wraps the whole workspace in the DnD provider (e.g. `DndProvider` from react-dnd or equivalent)
+
+### Library choice (TBD)
+
+- `react-dnd` — used by react-mosaic, proven for panel layouts
+- `@dnd-kit` — modern, better touch/keyboard support
+- Native HTML drag — simplest, fewer features
+
+---
+
+## Tests
+
+### Tab operations
+- Add tab, verify it appears in state
+- Remove active tab → falls back to neighbor
+- Remove only tab → `activeTabId` becomes null
+- Set active tab
+- Set tab title override
+
+### Pane operations
+- Set active pane within a tab
+- Get pane by ID (searches across all tabs)
+- Get active pane (with and without explicit tabId)
+- Set pane data in-place (flat map update, no layout change)
+- Set pane title override
+- Pin a pane via `setPanePinned`
+- Replace unpinned pane data via `replacePane` (preview behavior)
+- Replace is no-op if target pane is pinned
+
+### Split operations
+- Split a single pane → creates split node with `weights: [1, 1]`
+- Split right/left → horizontal direction, correct child order
+- Split top/bottom → vertical direction, correct child order
+- Split within existing same-direction split → halves target weight, inserts adjacent
+- Split with custom weights
+- Split with `selectNewPane: false` → focus stays on original
+- Resize split (update weights array)
+- Equalize split → all weights become `1`
+
+### Collapsing
+- Close pane in 2-pane split → split collapses to remaining leaf
+- Close pane in 3-pane split → child + weight removed, split stays
+- Close last pane in tab → tab is removed entirely
+- `activePaneId` falls back to sibling after close
+
+### Edge cases
+- Invalid IDs (tab, pane, split) are all no-ops
+- Replace state wholesale via `replaceState`
+- Operations on empty tab (null layout)
+- Duplicate pane ID insertion is no-op
+
+---
+
+## Verification
+
+1. `bun test` in `packages/pane-layout` — all tests pass
+2. `bun run typecheck` — all packages type-check
+3. `bun run lint:fix` — clean lint
+4. Manual: open desktop app → tabs render → panes render without group tab strips → splitting works → closing panes collapses splits → persistence round-trips
+
+---
+
+
+## Pane Lifecycle Notes
+
+**Cleanup on close (terminal kill, editor cleanup):**
+Pane components handle their own cleanup via React unmount (`useEffect` return). When `closePane` removes a pane from state, React unmounts the component, which triggers cleanup (e.g. terminal calls `kill` on unmount, editor cleans up document state). The store doesn't need type-specific cleanup logic.
+
+**Devtools auto-close when browser closes:**
+The devtools pane component reactively watches `store.getPane(targetPaneId)`. When it returns null (browser pane was closed), the devtools pane calls `context.actions.close()` to self-close. No coupling in the store — devtools owns this behavior.
+
+---
+
+## README.md (for `packages/panes/`)
+
+````md
+# @superset/panes
+
+A generic, headless workspace layout engine. Tabs hold panes arranged in split layouts. The package provides the data model, store, and React components — you provide the pane content.
+
+## Concepts
+
+```
+Workspace
+├── Tab (chat, terminal, etc.)
+│   ├── Pane A ──┐
+│   ├── Pane B   ├── split layout (horizontal/vertical, n-ary, weighted)
+│   └── Pane C ──┘
+├── Tab
+│   └── Pane D (single pane, no splits)
+└── ...
+```
+
+- **Workspace** — top-level container. Holds tabs, tracks the active tab.
+- **Tab** — a named workspace context. Each tab has a split layout of panes and a flat pane data map.
+- **Pane** — a leaf in the layout tree. Typed with your own data (`TData`). Rendered by a registry of pane definitions.
+- **Layout tree** — purely structural. Describes how panes are arranged (splits + weights) but holds no pane data — just `paneId` references into the tab's flat `panes` map.
+
+## Quick Start
+
+### 1. Define your pane data type
+
+```tsx
+type MyPaneData =
+  | { kind: "editor"; filePath: string }
+  | { kind: "terminal"; sessionId: string }
+  | { kind: "browser"; url: string };
+```
+
+### 2. Create a pane registry
+
+The registry tells the layout engine how to render each pane kind:
+
+```tsx
+import type { PaneRegistry } from "@superset/panes";
+
+const registry: PaneRegistry<MyPaneData> = {
+  // Simple pane — just title + icon, default header
+  terminal: {
+    renderPane: (ctx) => <Terminal sessionId={ctx.pane.data.sessionId} />,
+    getTitle: () => "Terminal",
+    getIcon: () => <TerminalIcon />,
+  },
+
+  // Extra toolbar actions (pin button before split/close)
+  editor: {
+    renderPane: (ctx) => <CodeEditor file={ctx.pane.data.filePath} />,
+    getTitle: (ctx) => ctx.pane.data.filePath.split("/").pop(),
+    getIcon: (ctx) => <FileIcon />,
+    renderToolbarActions: (ctx) => (
+      !ctx.pane.pinned && <PinButton onClick={() => ctx.actions.pin()} />
+    ),
+  },
+
+  // Full toolbar eject (browser needs nav buttons + URL bar)
+  browser: {
+    renderPane: (ctx) => <Webview url={ctx.pane.data.url} />,
+    renderToolbar: (ctx) => <BrowserToolbar context={ctx} />,
+    getTitle: (ctx) => ctx.pane.data.url,
+    getIcon: () => <GlobeIcon />,
+  },
+};
+```
+
+### 3. Create the store
+
+```tsx
+import { createWorkspaceStore, createTab, createPane } from "@superset/panes";
+
+const store = createWorkspaceStore<MyPaneData>({
+  initialState: {
+    version: 1,
+    tabs: [
+      createTab({
+        titleOverride: "My Tab",
+        panes: [
+          createPane({ kind: "terminal", data: { kind: "terminal", sessionId: "abc" } }),
+        ],
+      }),
+    ],
+    activeTabId: null, // auto-set to first tab
+  },
+});
+```
+
+### 4. Render the workspace
+
+```tsx
+import { Workspace } from "@superset/panes";
+
+function App() {
+  return (
+    <Workspace
+      store={store}
+      registry={registry}
+      renderAddTabMenu={() => (
+        <DropdownMenu>
+          <DropdownMenuItem onSelect={() => addTerminalTab()}>
+            <TerminalIcon /> Terminal
+          </DropdownMenuItem>
+          <DropdownMenuItem onSelect={() => addChatTab()}>
+            <ChatIcon /> Chat
+          </DropdownMenuItem>
+          <DropdownMenuItem onSelect={() => addBrowserTab()}>
+            <GlobeIcon /> Browser
+          </DropdownMenuItem>
+        </DropdownMenu>
+      )}
+      renderTabAccessory={(tab) => <StatusDot tab={tab} />}
+    />
+  );
+}
+```
+
+That's it. You get a tab bar, split panes with resizable handles, pane headers with close buttons, and context menus — all wired up.
+
+## Data Model
+
+### Layout Tree
+
+The layout is a tree of split nodes and pane leaves:
+
+```ts
+type LayoutNode =
+  | { type: "pane"; paneId: string }
+  | { type: "split"; id: string; direction: "horizontal" | "vertical"; children: LayoutNode[]; weights: number[] };
+```
+
+Splits are **n-ary** (not binary) — a 3-way split is `children: [A, B, C], weights: [1, 1, 1]`, not nested binary nodes.
+
+**Weights** are relative, not percentages. `[1, 1, 1]` = equal thirds. `[3, 2]` = 60/40. They don't need to sum to any specific value — CSS `flex-grow` handles the proportional rendering.
+
+### Pane
+
+```ts
+interface Pane<TData> {
+  id: string;
+  kind: string;           // maps to a key in your PaneRegistry
+  titleOverride?: string; // overrides getTitle() from registry
+  pinned?: boolean;       // unpinned panes can be replaced in-place (preview mode)
+  data: TData;            // your pane-specific state
+}
+```
+
+### Tab
+
+```ts
+interface Tab<TData> {
+  id: string;
+  titleOverride?: string;
+  createdAt: number;
+  activePaneId: string | null;
+  layout: LayoutNode | null;
+  panes: Record<string, Pane<TData>>;  // flat map — layout tree references these by paneId
+}
+```
+
+The **flat `panes` map** is separate from the layout tree. The tree is purely structural (`paneId` references), pane data lives in the map. This gives you O(1) pane lookup and clean separation of layout vs data.
+
+## Store
+
+The store is a vanilla zustand `StoreApi` (not a React hook store). This is intentional:
+- Stable reference — created once, passed as a prop
+- Subscribable from both React (`useStore`) and non-React code (`store.subscribe`)
+- Works with any persistence layer (localStorage, IndexedDB, TanStack DB, etc.) via `replaceState` for hydration and `store.subscribe` for writes
+
+Create it with `createWorkspaceStore()` and pass it to `<Workspace>`.
+
+### Tab actions
+
+```ts
+store.getState().addTab(tab)
+store.getState().removeTab(tabId)
+store.getState().setActiveTab(tabId)
+store.getState().setTabTitleOverride(tabId, title)
+store.getState().getTab(tabId)
+store.getState().getActiveTab()
+```
+
+### Pane actions
+
+```ts
+store.getState().setActivePane(tabId, paneId)
+store.getState().getPane(paneId)          // searches across all tabs
+store.getState().getActivePane(tabId?)
+store.getState().closePane(tabId, paneId) // removes from layout + panes, collapses empty splits
+store.getState().setPaneData(paneId, data)
+store.getState().setPaneTitleOverride(tabId, paneId, title)
+store.getState().setPanePinned(tabId, paneId, pinned)
+store.getState().replacePane(tabId, paneId, newPane) // swap unpinned pane in-place, no-op if pinned
+```
+
+### Split actions
+
+```ts
+store.getState().splitPane(tabId, paneId, position, newPane, weights?)
+// position: "top" | "right" | "bottom" | "left"
+// splits the target pane, steals space from it (other panes untouched)
+
+store.getState().addPane(tabId, pane, position?, relativeToPaneId?)
+// ergonomic wrapper — splits relative to a target, or appends to edge
+
+store.getState().resizeSplit(tabId, splitId, weights)
+store.getState().equalizeSplit(tabId, splitId) // sets all weights to 1
+```
+
+### Bulk
+
+```ts
+store.getState().replaceState(newState)
+store.getState().replaceState((prev) => ({ ...prev, ... }))
+```
+
+## Pane Registry
+
+Each pane kind registers how it renders:
+
+```ts
+interface PaneDefinition<TData> {
+  renderPane(context: RendererContext<TData>): ReactNode;     // required — the pane content
+  getTitle?(context: RendererContext<TData>): ReactNode;       // derived title (titleOverride wins)
+  getIcon?(context: RendererContext<TData>): ReactNode;        // icon in the pane header
+  renderToolbar?(context: RendererContext<TData>): ReactNode;  // full eject — replaces entire header content
+}
+```
+
+## RendererContext
+
+Every registry method receives a `RendererContext` with the pane's data and pre-wired actions:
+
+```ts
+interface RendererContext<TData> {
+  pane: Pane<TData>;
+  tab: Tab<TData>;
+  isActive: boolean;
+  store: StoreApi<WorkspaceStore<TData>>;  // escape hatch
+
+  actions: {
+    close: () => void;
+    focus: () => void;
+    setTitle: (title: string) => void;
+    pin: () => void;
+    updateData: (data: TData) => void;
+    splitRight: (newPane: Pane<TData>) => void;
+    splitDown: (newPane: Pane<TData>) => void;
+  };
+}
+```
+
+Use `context.actions.*` for normal operations. The `store` is an escape hatch for advanced cases (e.g. setting a tab title from within a pane).
+
+## Hooks
+
+Use these inside your pane components to register behavior with the layout engine:
+
+### useOnBeforeClose
+
+Register a close guard. Return `false` to cancel the close (e.g. show a "Save changes?" dialog):
+
+```tsx
+function EditorPane({ context }: { context: RendererContext<MyPaneData> }) {
+  const isDirty = useDirtyState();
+
+  useOnBeforeClose(context, async () => {
+    if (!isDirty) return true;
+    return await showSaveConfirmation(); // returns true/false
+  }, [isDirty]);
+
+  return <CodeEditor />;
+}
+```
+
+### useContextMenuActions
+
+Register pane-specific context menu items. These appear after the default items (Close, Split Right, Split Down):
+
+```tsx
+function BrowserPane({ context }: { context: RendererContext<MyPaneData> }) {
+  const webviewRef = useRef<WebviewTag>(null);
+
+  useContextMenuActions(context, [
+    { label: "Refresh", icon: <RefreshIcon />, shortcut: "⌘R", onSelect: () => webviewRef.current?.reload() },
+    { type: "separator" },
+    { label: "Open in External Browser", icon: <ExternalIcon />, onSelect: () => shell.openExternal(context.pane.data.url) },
+  ], [context.pane.data.url]);
+
+  return <webview ref={webviewRef} src={context.pane.data.url} />;
+}
+```
+
+Context menu items support:
+- `variant: "destructive"` — red text styling
+- `shortcut` — display-only keyboard hint (e.g. `"⌘K"`)
+- `disabled` — grayed out
+- `type: "separator"` — visual divider
+- `type: "submenu"` — nested menu with `items`
+
+## Splitting
+
+When you split a pane, the new pane steals space from the target. Other panes are untouched.
+
+```ts
+// Single pane → 50/50 split
+store.getState().splitPane(tabId, "pane-a", "right", newPane);
+// Result: horizontal split, weights [1, 1]
+
+// Already in a same-direction split → target's weight is halved
+// Before: horizontal [3, 2, 1], split pane[1] right
+// After:  horizontal [3, 1, 1, 1]
+```
+
+Position determines direction and order:
+- `"left"` / `"right"` → horizontal split
+- `"top"` / `"bottom"` → vertical split
+- `"left"` / `"top"` → new pane goes first
+- `"right"` / `"bottom"` → new pane goes second
+
+## Preview Panes (Pin/Unpin)
+
+Unpinned panes can be replaced in-place without creating a new split — useful for file preview (click a file → replaces the preview pane, double-click or edit → pins it):
+
+```ts
+// Find any unpinned file pane in the tab
+const preview = Object.values(tab.panes).find(p => p.kind === "file" && !p.pinned);
+
+if (preview) {
+  store.getState().replacePane(tabId, preview.id, newFilePane);
+} else {
+  store.getState().splitPane(tabId, activePaneId, "right", newFilePane);
+}
+```
+
+Pin from inside a pane component (e.g. on first edit):
+
+```tsx
+context.actions.pin();
+```
+
+## Workspace Props
+
+```ts
+<Workspace
+  store={store}
+  registry={registry}
+  renderTabAccessory={(tab) => ReactNode}   // custom UI in each tab (status dot, badge, etc.)
+  renderEmptyState={() => ReactNode}        // shown when no tabs exist
+  renderAddTabMenu={() => ReactNode}          // dropdown content for "+" button in tab bar
+/>
+```
+````
+
+---
+
+## Follow-up Tasks (not part of first push)
+
+1. **Drag-and-drop** — see DnD section above
+2. **Reopen closed tab** — add `closedTabsStack: ClosedTab[]` to `WorkspaceState` and `reopenClosedTab()` action. Snapshot tab + panes on close, restore with fresh IDs. Persist stack so it survives app restarts.