diff --git a/apps/desktop/src/main/lib/tmux-manager.ts b/apps/desktop/src/main/lib/tmux-manager.ts
index d40b2736339..e32e3aab80f 100644
--- a/apps/desktop/src/main/lib/tmux-manager.ts
+++ b/apps/desktop/src/main/lib/tmux-manager.ts
@@ -183,7 +183,7 @@ class TmuxManager {
 			["status", "off"],
 			["set-titles", "off"],
 			["allow-rename", "off"],
-			["mouse", "off"],
+			["mouse", "on"], // Enable mouse mode for scroll handling
 			["focus-events", "on"],
 			["history-limit", "200000"],
 			["remain-on-exit", "off"],
diff --git a/apps/desktop/src/main/lib/window-manager.ts b/apps/desktop/src/main/lib/window-manager.ts
index 736cabd2991..1bdac755dad 100644
--- a/apps/desktop/src/main/lib/window-manager.ts
+++ b/apps/desktop/src/main/lib/window-manager.ts
@@ -7,9 +7,10 @@ class WindowManager {
 	private windowWorkspaces: Map<BrowserWindow, string | null> = new Map();
 	private restoredWindowIds: Set<number> = new Set();
 
-	async createWindow(
-		restoreState?: { workspaceId: string | null; bounds?: Electron.Rectangle },
-	): Promise<BrowserWindow> {
+	async createWindow(restoreState?: {
+		workspaceId: string | null;
+		bounds?: Electron.Rectangle;
+	}): Promise<BrowserWindow> {
 		const window = await MainWindow();
 
 		// Restore window bounds if provided
@@ -55,7 +56,7 @@ class WindowManager {
 			// Save final state before closing (window is still valid here)
 			// Get workspace ID from our map before window might be destroyed
 			const workspaceId = this.windowWorkspaces.get(window) ?? null;
-			
+
 			try {
 				if (!window.isDestroyed()) {
 					const bounds = window.getBounds();
@@ -77,7 +78,10 @@ class WindowManager {
 			} catch (error) {
 				// Silently fail if window is destroyed - we'll clean up in closed handler
 				if (!(error instanceof Error && error.message.includes("destroyed"))) {
-					console.error("[WindowManager] Failed to save window state on close:", error);
+					console.error(
+						"[WindowManager] Failed to save window state on close:",
+						error,
+					);
 				}
 			}
 		});
@@ -109,7 +113,10 @@ class WindowManager {
 		return this.windowWorkspaces.get(window) ?? null;
 	}
 
-	setWorkspaceForWindow(window: BrowserWindow, workspaceId: string | null): void {
+	setWorkspaceForWindow(
+		window: BrowserWindow,
+		workspaceId: string | null,
+	): void {
 		this.windowWorkspaces.set(window, workspaceId);
 		// Persist the workspace association
 		windowStateManager.saveWindowState(window, workspaceId);
diff --git a/apps/desktop/src/main/lib/window-state-manager.ts b/apps/desktop/src/main/lib/window-state-manager.ts
index bea74137411..e254ffacae8 100644
--- a/apps/desktop/src/main/lib/window-state-manager.ts
+++ b/apps/desktop/src/main/lib/window-state-manager.ts
@@ -132,7 +132,10 @@ class WindowStateManager {
 
 			this.write(state);
 		} catch (error) {
-			console.error("[WindowStateManager] Failed to save window state by ID:", error);
+			console.error(
+				"[WindowStateManager] Failed to save window state by ID:",
+				error,
+			);
 		}
 	}
 
@@ -157,4 +160,3 @@ class WindowStateManager {
 }
 
 export default WindowStateManager.getInstance();
-
diff --git a/apps/desktop/src/main/lib/workspace-ipcs.ts b/apps/desktop/src/main/lib/workspace-ipcs.ts
index 4f44ca803f8..87f9edc8aa0 100644
--- a/apps/desktop/src/main/lib/workspace-ipcs.ts
+++ b/apps/desktop/src/main/lib/workspace-ipcs.ts
@@ -10,9 +10,9 @@ import type {
 } from "shared/types";
 
 import configManager from "./config-manager";
+import windowManager from "./window-manager";
 import workspaceManager from "./workspace-manager";
 import worktreeManager from "./worktree-manager";
-import windowManager from "./window-manager";
 
 export function registerWorkspaceIPCs() {
 	// Open repository dialog
@@ -627,7 +627,9 @@ export function registerWorkspaceIPCs() {
 
 				// Detect main branch instead of using workspace.branch
 				// This ensures we compare against main/master, not a feature branch
-				const mainBranch = await worktreeManager.detectMainBranch(workspace.repoPath);
+				const mainBranch = await worktreeManager.detectMainBranch(
+					workspace.repoPath,
+				);
 
 				return await worktreeManager.getGitDiffFile(
 					worktree.path,
diff --git a/apps/desktop/src/main/lib/worktree-manager.ts b/apps/desktop/src/main/lib/worktree-manager.ts
index 1df6166e1a3..9fcdb203cd9 100644
--- a/apps/desktop/src/main/lib/worktree-manager.ts
+++ b/apps/desktop/src/main/lib/worktree-manager.ts
@@ -854,7 +854,10 @@ class WorktreeManager {
 				const oldPath = parts[2]; // For renamed files
 
 				// Check if file should be excluded
-				if (this.shouldExcludeFile(filePath) || (oldPath && this.shouldExcludeFile(oldPath))) {
+				if (
+					this.shouldExcludeFile(filePath) ||
+					(oldPath && this.shouldExcludeFile(oldPath))
+				) {
 					continue;
 				}
 
diff --git a/apps/desktop/src/renderer/contexts/AppProviders.tsx b/apps/desktop/src/renderer/contexts/AppProviders.tsx
index fee2124f14f..e347d689441 100644
--- a/apps/desktop/src/renderer/contexts/AppProviders.tsx
+++ b/apps/desktop/src/renderer/contexts/AppProviders.tsx
@@ -1,11 +1,11 @@
 import type React from "react";
 import { useState } from "react";
 import {
-	WorkspaceProvider,
-	TabProvider,
 	SidebarProvider,
-	WorktreeOperationsProvider,
+	TabProvider,
 	TaskProvider,
+	WorkspaceProvider,
+	WorktreeOperationsProvider,
 } from "./index";
 
 interface AppProvidersProps {
@@ -15,7 +15,9 @@ interface AppProvidersProps {
 export function AppProviders({ children }: AppProvidersProps) {
 	// Tab selection state needs to be lifted to AppProviders level
 	// so WorkspaceProvider can use it
-	const [selectedWorktreeId, setSelectedWorktreeId] = useState<string | null>(null);
+	const [selectedWorktreeId, setSelectedWorktreeId] = useState<string | null>(
+		null,
+	);
 	const [selectedTabId, setSelectedTabId] = useState<string | null>(null);
 
 	return (
@@ -38,4 +40,3 @@ export function AppProviders({ children }: AppProvidersProps) {
 		</WorkspaceProvider>
 	);
 }
-
diff --git a/apps/desktop/src/renderer/contexts/SidebarContext.tsx b/apps/desktop/src/renderer/contexts/SidebarContext.tsx
index 087e9a92873..da81e60268d 100644
--- a/apps/desktop/src/renderer/contexts/SidebarContext.tsx
+++ b/apps/desktop/src/renderer/contexts/SidebarContext.tsx
@@ -38,4 +38,3 @@ export function useSidebarContext() {
 	}
 	return context;
 }
-
diff --git a/apps/desktop/src/renderer/contexts/TabContext.tsx b/apps/desktop/src/renderer/contexts/TabContext.tsx
index 11f25deab64..943f422ebd4 100644
--- a/apps/desktop/src/renderer/contexts/TabContext.tsx
+++ b/apps/desktop/src/renderer/contexts/TabContext.tsx
@@ -1,5 +1,5 @@
-import { createContext, useContext } from "react";
 import type React from "react";
+import { createContext, useContext } from "react";
 import type { Tab, Worktree } from "shared/types";
 import { useTabs } from "../screens/main/hooks";
 import { useWorkspaceContext } from "./WorkspaceContext";
@@ -45,11 +45,7 @@ export function TabProvider({
 		setSelectedTabId,
 	});
 
-	return (
-		<TabContext.Provider value={tabData}>
-			{children}
-		</TabContext.Provider>
-	);
+	return <TabContext.Provider value={tabData}>{children}</TabContext.Provider>;
 }
 
 export function useTabContext() {
@@ -59,4 +55,3 @@ export function useTabContext() {
 	}
 	return context;
 }
-
diff --git a/apps/desktop/src/renderer/contexts/TaskContext.tsx b/apps/desktop/src/renderer/contexts/TaskContext.tsx
index 8b419f20fdd..38c7cb91b00 100644
--- a/apps/desktop/src/renderer/contexts/TaskContext.tsx
+++ b/apps/desktop/src/renderer/contexts/TaskContext.tsx
@@ -1,10 +1,10 @@
 import type React from "react";
 import { createContext, useContext } from "react";
 import type { TaskStatus } from "../screens/main/components/Layout/StatusIndicator";
-import type { PendingWorktree, UITask } from "../screens/main/types";
 import { useTasks } from "../screens/main/hooks";
-import { useWorkspaceContext } from "./WorkspaceContext";
+import type { PendingWorktree, UITask } from "../screens/main/types";
 import { useTabContext } from "./TabContext";
+import { useWorkspaceContext } from "./WorkspaceContext";
 import { useWorktreeOperationsContext } from "./WorktreeOperationsContext";
 
 interface TaskContextValue {
@@ -50,9 +50,7 @@ export function TaskProvider({ children }: TaskProviderProps) {
 	});
 
 	return (
-		<TaskContext.Provider value={taskData}>
-			{children}
-		</TaskContext.Provider>
+		<TaskContext.Provider value={taskData}>{children}</TaskContext.Provider>
 	);
 }
 
@@ -63,4 +61,3 @@ export function useTaskContext() {
 	}
 	return context;
 }
-
diff --git a/apps/desktop/src/renderer/contexts/WorkspaceContext.tsx b/apps/desktop/src/renderer/contexts/WorkspaceContext.tsx
index acc634b050d..e5372d72a75 100644
--- a/apps/desktop/src/renderer/contexts/WorkspaceContext.tsx
+++ b/apps/desktop/src/renderer/contexts/WorkspaceContext.tsx
@@ -4,53 +4,53 @@ import type { Workspace } from "shared/types";
 import { useWorkspace } from "../screens/main/hooks";
 
 interface WorkspaceContextValue {
-    workspaces: Workspace[] | null;
-    currentWorkspace: Workspace | null;
-    setCurrentWorkspace: React.Dispatch<React.SetStateAction<Workspace | null>>;
-    setWorkspaces: React.Dispatch<React.SetStateAction<Workspace[] | null>>;
-    loading: boolean;
-    error: string | null;
-    showWorkspaceSelection: boolean;
-    setShowWorkspaceSelection: React.Dispatch<React.SetStateAction<boolean>>;
-    loadAllWorkspaces: () => Promise<void>;
-    handleWorkspaceSelect: (workspaceId: string) => Promise<void>;
-    handleWorkspaceSelectFromModal: (workspaceId: string) => Promise<void>;
-    handleCreateWorkspaceFromModal: () => Promise<void>;
+	workspaces: Workspace[] | null;
+	currentWorkspace: Workspace | null;
+	setCurrentWorkspace: React.Dispatch<React.SetStateAction<Workspace | null>>;
+	setWorkspaces: React.Dispatch<React.SetStateAction<Workspace[] | null>>;
+	loading: boolean;
+	error: string | null;
+	showWorkspaceSelection: boolean;
+	setShowWorkspaceSelection: React.Dispatch<React.SetStateAction<boolean>>;
+	loadAllWorkspaces: () => Promise<void>;
+	handleWorkspaceSelect: (workspaceId: string) => Promise<void>;
+	handleWorkspaceSelectFromModal: (workspaceId: string) => Promise<void>;
+	handleCreateWorkspaceFromModal: () => Promise<void>;
 }
 
 const WorkspaceContext = createContext<WorkspaceContextValue | undefined>(
-    undefined,
+	undefined,
 );
 
 interface WorkspaceProviderProps {
-    children: React.ReactNode;
-    setSelectedWorktreeId?: (id: string | null) => void;
-    setSelectedTabId?: (id: string | null) => void;
+	children: React.ReactNode;
+	setSelectedWorktreeId?: (id: string | null) => void;
+	setSelectedTabId?: (id: string | null) => void;
 }
 
 export function WorkspaceProvider({
-    children,
-    setSelectedWorktreeId,
-    setSelectedTabId,
+	children,
+	setSelectedWorktreeId,
+	setSelectedTabId,
 }: WorkspaceProviderProps) {
-    const workspaceData = useWorkspace({
-        setSelectedWorktreeId,
-        setSelectedTabId,
-    });
+	const workspaceData = useWorkspace({
+		setSelectedWorktreeId,
+		setSelectedTabId,
+	});
 
-    return (
-        <WorkspaceContext.Provider value={workspaceData}>
-            {children}
-        </WorkspaceContext.Provider>
-    );
+	return (
+		<WorkspaceContext.Provider value={workspaceData}>
+			{children}
+		</WorkspaceContext.Provider>
+	);
 }
 
 export function useWorkspaceContext() {
-    const context = useContext(WorkspaceContext);
-    if (context === undefined) {
-        throw new Error(
-            "useWorkspaceContext must be used within a WorkspaceProvider",
-        );
-    }
-    return context;
+	const context = useContext(WorkspaceContext);
+	if (context === undefined) {
+		throw new Error(
+			"useWorkspaceContext must be used within a WorkspaceProvider",
+		);
+	}
+	return context;
 }
diff --git a/apps/desktop/src/renderer/contexts/WorktreeOperationsContext.tsx b/apps/desktop/src/renderer/contexts/WorktreeOperationsContext.tsx
index 99769fa6d29..778273fd63d 100644
--- a/apps/desktop/src/renderer/contexts/WorktreeOperationsContext.tsx
+++ b/apps/desktop/src/renderer/contexts/WorktreeOperationsContext.tsx
@@ -2,29 +2,40 @@ import type React from "react";
 import { createContext, useContext } from "react";
 import type { Worktree } from "shared/types";
 import { useWorktrees } from "../screens/main/hooks";
-import { useWorkspaceContext } from "./WorkspaceContext";
 import { useTabContext } from "./TabContext";
+import { useWorkspaceContext } from "./WorkspaceContext";
 
 interface WorktreeOperationsContextValue {
 	handleWorktreeCreated: () => Promise<void>;
-	handleWorktreeCreatedWithResult: () => Promise<{ id: string; worktrees?: Worktree[] } | null>;
+	handleWorktreeCreatedWithResult: () => Promise<{
+		id: string;
+		worktrees?: Worktree[];
+	} | null>;
 	handleUpdateWorktree: (worktreeId: string, updatedWorktree: Worktree) => void;
 	handleCreatePR: (selectedWorktreeId: string | null) => Promise<void>;
 	handleMergePR: (selectedWorktreeId: string | null) => Promise<void>;
 	handleDeleteWorktree: (worktreeId: string) => Promise<void>;
 }
 
-const WorktreeOperationsContext = createContext<WorktreeOperationsContextValue | undefined>(
-	undefined,
-);
+const WorktreeOperationsContext = createContext<
+	WorktreeOperationsContextValue | undefined
+>(undefined);
 
 interface WorktreeOperationsProviderProps {
 	children: React.ReactNode;
 }
 
-export function WorktreeOperationsProvider({ children }: WorktreeOperationsProviderProps) {
-	const { currentWorkspace, setCurrentWorkspace, setWorkspaces, loadAllWorkspaces } = useWorkspaceContext();
-	const { selectedWorktreeId, setSelectedWorktreeId, setSelectedTabId } = useTabContext();
+export function WorktreeOperationsProvider({
+	children,
+}: WorktreeOperationsProviderProps) {
+	const {
+		currentWorkspace,
+		setCurrentWorkspace,
+		setWorkspaces,
+		loadAllWorkspaces,
+	} = useWorkspaceContext();
+	const { selectedWorktreeId, setSelectedWorktreeId, setSelectedTabId } =
+		useTabContext();
 
 	const worktreeOperations = useWorktrees({
 		currentWorkspace,
@@ -46,8 +57,9 @@ export function WorktreeOperationsProvider({ children }: WorktreeOperationsProvi
 export function useWorktreeOperationsContext() {
 	const context = useContext(WorktreeOperationsContext);
 	if (context === undefined) {
-		throw new Error("useWorktreeOperationsContext must be used within a WorktreeOperationsProvider");
+		throw new Error(
+			"useWorktreeOperationsContext must be used within a WorktreeOperationsProvider",
+		);
 	}
 	return context;
 }
-
diff --git a/apps/desktop/src/renderer/contexts/index.ts b/apps/desktop/src/renderer/contexts/index.ts
index 42bd7c03468..4ffe34ebbb6 100644
--- a/apps/desktop/src/renderer/contexts/index.ts
+++ b/apps/desktop/src/renderer/contexts/index.ts
@@ -1,8 +1,10 @@
 export { AppProviders } from "./AppProviders";
-export { WorkspaceProvider, useWorkspaceContext } from "./WorkspaceContext";
-export { TabProvider, useTabContext } from "./TabContext";
 export { SidebarProvider, useSidebarContext } from "./SidebarContext";
-export { WorktreeOperationsProvider, useWorktreeOperationsContext } from "./WorktreeOperationsContext";
+export { TabProvider, useTabContext } from "./TabContext";
 export { TaskProvider, useTaskContext } from "./TaskContext";
-export { WorktreeProvider, useWorktree } from "./WorktreeContext";
-
+export { useWorkspaceContext, WorkspaceProvider } from "./WorkspaceContext";
+export { useWorktree, WorktreeProvider } from "./WorktreeContext";
+export {
+	useWorktreeOperationsContext,
+	WorktreeOperationsProvider,
+} from "./WorktreeOperationsContext";
diff --git a/apps/desktop/src/renderer/globals.css b/apps/desktop/src/renderer/globals.css
index 8692abbe85d..7773f13c792 100644
--- a/apps/desktop/src/renderer/globals.css
+++ b/apps/desktop/src/renderer/globals.css
@@ -135,15 +135,24 @@
 		-webkit-font-smoothing: antialiased;
 	}
 
-	/* Ensure xterm terminal fills container height */
+	/* Fix xterm.js scrollbar positioning */
 	.xterm {
-		height: 100% !important;
-		width: 100% !important;
+		position: relative;
+		height: 100%;
+		width: 100%;
 	}
 
-	.xterm-screen {
-		height: 100% !important;
-		width: 100% !important;
+	.xterm .xterm-viewport {
+		overflow-y: auto;
+		position: absolute;
+		right: 0;
+		left: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.xterm .xterm-screen {
+		position: relative;
 	}
 
 	/* Hide scrollbar for workspace carousel and tabs */
diff --git a/apps/desktop/src/renderer/screens/main/MainScreen.tsx b/apps/desktop/src/renderer/screens/main/MainScreen.tsx
index fb15c6b9409..63ec8b16199 100644
--- a/apps/desktop/src/renderer/screens/main/MainScreen.tsx
+++ b/apps/desktop/src/renderer/screens/main/MainScreen.tsx
@@ -1,6 +1,13 @@
 import { useState } from "react";
 import { DndProvider } from "react-dnd";
 import { HTML5Backend } from "react-dnd-html5-backend";
+import {
+	useSidebarContext,
+	useTabContext,
+	useTaskContext,
+	useWorkspaceContext,
+	useWorktreeOperationsContext,
+} from "../../contexts";
 import { AppFrame } from "./components/AppFrame";
 import { Background } from "./components/Background";
 import { AddTaskModal } from "./components/Layout/AddTaskModal";
@@ -8,13 +15,6 @@ import { TaskTabs } from "./components/Layout/TaskTabs";
 import { MainContentArea } from "./components/MainContentArea";
 import { SidebarOverlay } from "./components/SidebarOverlay";
 import { WorkspaceSelectionModal } from "./components/WorkspaceSelectionModal";
-import {
-	useWorkspaceContext,
-	useTabContext,
-	useSidebarContext,
-	useWorktreeOperationsContext,
-	useTaskContext,
-} from "../../contexts";
 import type { AppMode } from "./types";
 import { enrichWorktreesWithTasks } from "./utils";
 
diff --git a/apps/desktop/src/renderer/screens/main/components/AppFrame/AppFrame.tsx b/apps/desktop/src/renderer/screens/main/components/AppFrame/AppFrame.tsx
index b31079f13bb..5bce819bb7c 100644
--- a/apps/desktop/src/renderer/screens/main/components/AppFrame/AppFrame.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/AppFrame/AppFrame.tsx
@@ -3,9 +3,5 @@ interface AppFrameProps {
 }
 
 export function AppFrame({ children }: AppFrameProps) {
-	return (
-		<div className="absolute inset-0 bg-stone-950 flex">
-			{children}
-		</div>
-	);
+	return <div className="absolute inset-0 bg-stone-950 flex">{children}</div>;
 }
diff --git a/apps/desktop/src/renderer/screens/main/components/DiffView/DiffContent.tsx b/apps/desktop/src/renderer/screens/main/components/DiffView/DiffContent.tsx
index 83efbc0a4e9..16e81d0186e 100644
--- a/apps/desktop/src/renderer/screens/main/components/DiffView/DiffContent.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/DiffView/DiffContent.tsx
@@ -155,14 +155,15 @@ export const DiffContent = memo(function DiffContent({
 							</div>
 						)}
 						<span
-							className={`px-1.5 py-0.5 text-[10px] font-medium rounded ${file.status === "added"
-								? "bg-emerald-500/10 text-emerald-400"
-								: file.status === "deleted"
-									? "bg-rose-500/10 text-rose-400"
-									: file.status === "modified"
-										? "bg-amber-500/10 text-amber-400"
-										: "bg-white/5 text-zinc-400"
-								}`}
+							className={`px-1.5 py-0.5 text-[10px] font-medium rounded ${
+								file.status === "added"
+									? "bg-emerald-500/10 text-emerald-400"
+									: file.status === "deleted"
+										? "bg-rose-500/10 text-rose-400"
+										: file.status === "modified"
+											? "bg-amber-500/10 text-amber-400"
+											: "bg-white/5 text-zinc-400"
+							}`}
 						>
 							{file.status}
 						</span>
diff --git a/apps/desktop/src/renderer/screens/main/components/DiffView/DiffContentArea.tsx b/apps/desktop/src/renderer/screens/main/components/DiffView/DiffContentArea.tsx
index 56c41c6749f..678bba98b74 100644
--- a/apps/desktop/src/renderer/screens/main/components/DiffView/DiffContentArea.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/DiffView/DiffContentArea.tsx
@@ -49,21 +49,31 @@ export function DiffContentArea({
 
 	// Load selected file immediately
 	useEffect(() => {
-		if (selectedFile && loadFileContent && !loadedFiles.has(selectedFile) && !loadingFiles.has(selectedFile)) {
+		if (
+			selectedFile &&
+			loadFileContent &&
+			!loadedFiles.has(selectedFile) &&
+			!loadingFiles.has(selectedFile)
+		) {
 			loadFileContent(selectedFile);
 		}
 	}, [selectedFile, loadFileContent, loadedFiles, loadingFiles]);
 
 	// Use intersection observer to load files when they come into view
 	useEffect(() => {
-		if (viewMode !== "files" || !scrollContainerRef.current || !loadFileContent) return;
+		if (viewMode !== "files" || !scrollContainerRef.current || !loadFileContent)
+			return;
 
 		const observer = new IntersectionObserver(
 			(entries) => {
 				for (const entry of entries) {
 					if (entry.isIntersecting) {
 						const fileId = entry.target.id.replace("file-diff-", "");
-						if (fileId && !loadedFilesRef.current.has(fileId) && !loadingFilesRef.current.has(fileId)) {
+						if (
+							fileId &&
+							!loadedFilesRef.current.has(fileId) &&
+							!loadingFilesRef.current.has(fileId)
+						) {
 							loadFileContentRef.current?.(fileId);
 						}
 					}
@@ -361,4 +371,3 @@ export function DiffContentArea({
 		</div>
 	);
 }
-
diff --git a/apps/desktop/src/renderer/screens/main/components/Layout/AddTaskModal.tsx b/apps/desktop/src/renderer/screens/main/components/Layout/AddTaskModal.tsx
index bf3b1a4b5a1..09505c8dc0e 100644
--- a/apps/desktop/src/renderer/screens/main/components/Layout/AddTaskModal.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/Layout/AddTaskModal.tsx
@@ -34,12 +34,12 @@ export const AddTaskModal: React.FC<AddTaskModalProps> = ({
 	const [searchQuery, setSearchQuery] = useState("");
 	const [selectedTaskId, setSelectedTaskId] = useState<string | null>(null);
 
-	const { tasks, isLoadingTasks, tasksError, refetch: refetchTasks } = useTaskData(
-		isOpen,
-		mode,
-		currentWorkspaceId ?? null,
-		worktrees,
-	);
+	const {
+		tasks,
+		isLoadingTasks,
+		tasksError,
+		refetch: refetchTasks,
+	} = useTaskData(isOpen, mode, currentWorkspaceId ?? null, worktrees);
 
 	const formState = useTaskForm(isOpen, mode, branches, worktrees);
 
@@ -231,7 +231,7 @@ export const AddTaskModal: React.FC<AddTaskModalProps> = ({
 				) : (
 					<>
 						{/* Show creating view when creating or when there's a status */}
-						{(isCreating || setupStatus) ? (
+						{isCreating || setupStatus ? (
 							<CreatingView
 								setupStatus={setupStatus}
 								setupOutput={setupOutput}
@@ -253,7 +253,9 @@ export const AddTaskModal: React.FC<AddTaskModalProps> = ({
 								sourceBranch={formState.sourceBranch}
 								onSourceBranchChange={formState.setSourceBranch}
 								cloneTabsFromWorktreeId={formState.cloneTabsFromWorktreeId}
-								onCloneTabsFromWorktreeIdChange={formState.setCloneTabsFromWorktreeId}
+								onCloneTabsFromWorktreeIdChange={
+									formState.setCloneTabsFromWorktreeId
+								}
 								branches={branches}
 								worktrees={worktrees}
 								onSubmit={handleCreateTask}
diff --git a/apps/desktop/src/renderer/screens/main/components/Layout/AddTaskModal/CreatingView.tsx b/apps/desktop/src/renderer/screens/main/components/Layout/AddTaskModal/CreatingView.tsx
index 84d9f5a44a4..4f6e995b77a 100644
--- a/apps/desktop/src/renderer/screens/main/components/Layout/AddTaskModal/CreatingView.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/Layout/AddTaskModal/CreatingView.tsx
@@ -1,7 +1,7 @@
 import { Button } from "@superset/ui/button";
+import { ScrollArea } from "@superset/ui/scroll-area";
 import { Loader2 } from "lucide-react";
 import type React from "react";
-import { ScrollArea } from "@superset/ui/scroll-area";
 import { TerminalOutput } from "../../Sidebar/components/CreateWorktreeModal/TerminalOutput";
 
 interface CreatingViewProps {
@@ -13,7 +13,7 @@ interface CreatingViewProps {
 
 function getStatusType(status?: string): "error" | "success" | "creating" {
 	if (!status) return "creating";
-	
+
 	const lowerStatus = status.toLowerCase();
 	if (lowerStatus.includes("failed") || lowerStatus.includes("error")) {
 		return "error";
@@ -103,4 +103,3 @@ export const CreatingView: React.FC<CreatingViewProps> = ({
 		</div>
 	);
 };
-
diff --git a/apps/desktop/src/renderer/screens/main/components/Layout/AddTaskModal/TaskForm.tsx b/apps/desktop/src/renderer/screens/main/components/Layout/AddTaskModal/TaskForm.tsx
index 07e46b6d640..845f469e5c5 100644
--- a/apps/desktop/src/renderer/screens/main/components/Layout/AddTaskModal/TaskForm.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/Layout/AddTaskModal/TaskForm.tsx
@@ -80,7 +80,9 @@ export const TaskForm: React.FC<TaskFormProps> = ({
 						<div className="space-y-2">
 							<Label htmlFor="task-description">
 								Description{" "}
-								<span className="text-muted-foreground font-normal">(Optional)</span>
+								<span className="text-muted-foreground font-normal">
+									(Optional)
+								</span>
 							</Label>
 							<Textarea
 								id="task-description"
@@ -120,7 +122,9 @@ export const TaskForm: React.FC<TaskFormProps> = ({
 									<select
 										id="clone-tabs"
 										value={cloneTabsFromWorktreeId}
-										onChange={(e) => onCloneTabsFromWorktreeIdChange(e.target.value)}
+										onChange={(e) =>
+											onCloneTabsFromWorktreeIdChange(e.target.value)
+										}
 										className="flex h-9 w-full rounded-md border border-neutral-700 bg-neutral-900/50 px-3 py-1 text-sm text-neutral-200 shadow-sm transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-neutral-600 disabled:cursor-not-allowed disabled:opacity-50"
 									>
 										<option value="">Don't clone tabs</option>
@@ -165,7 +169,10 @@ export const TaskForm: React.FC<TaskFormProps> = ({
 						</Select>
 
 						{/* Assignee */}
-						<Select value={newTaskAssignee} onValueChange={onTaskAssigneeChange}>
+						<Select
+							value={newTaskAssignee}
+							onValueChange={onTaskAssigneeChange}
+						>
 							<SelectTrigger>
 								<SelectValue />
 							</SelectTrigger>
@@ -201,11 +208,14 @@ export const TaskForm: React.FC<TaskFormProps> = ({
 			</ScrollArea>
 			{/* Footer for new task form */}
 			<div className="px-6 py-4 border-t border-neutral-800 flex items-center justify-between gap-2 shrink-0">
-				<Button type="submit" disabled={!newTaskName.trim()} className="ml-auto">
+				<Button
+					type="submit"
+					disabled={!newTaskName.trim()}
+					className="ml-auto"
+				>
 					Create task
 				</Button>
 			</div>
 		</form>
 	);
 };
-
diff --git a/apps/desktop/src/renderer/screens/main/components/Layout/AddTaskModal/TaskList.tsx b/apps/desktop/src/renderer/screens/main/components/Layout/AddTaskModal/TaskList.tsx
index 6b4681392df..28a34f2e1b4 100644
--- a/apps/desktop/src/renderer/screens/main/components/Layout/AddTaskModal/TaskList.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/Layout/AddTaskModal/TaskList.tsx
@@ -8,9 +8,9 @@ import {
 import { ScrollArea } from "@superset/ui/scroll-area";
 import { Loader2, Search, X } from "lucide-react";
 import type React from "react";
-import type { Task } from "./types";
 import { TaskListItem } from "../TaskListItem";
 import { TaskPreview } from "../TaskPreview";
+import type { Task } from "./types";
 
 interface TaskListProps {
 	searchQuery: string;
@@ -88,7 +88,10 @@ export const TaskList: React.FC<TaskListProps> = ({
 								<div className="p-2 space-y-0.5">
 									{isLoadingTasks ? (
 										<div className="flex items-center justify-center py-8">
-											<Loader2 size={20} className="animate-spin text-neutral-500" />
+											<Loader2
+												size={20}
+												className="animate-spin text-neutral-500"
+											/>
 											<span className="ml-2 text-sm text-neutral-500">
 												Loading tasks...
 											</span>
@@ -100,7 +103,9 @@ export const TaskList: React.FC<TaskListProps> = ({
 										</div>
 									) : filteredTasks.length === 0 ? (
 										<div className="text-center text-neutral-500 text-sm py-8">
-											{searchQuery ? "No tasks match your search" : "No tasks found"}
+											{searchQuery
+												? "No tasks match your search"
+												: "No tasks found"}
 										</div>
 									) : (
 										filteredTasks.map((task) => (
@@ -138,7 +143,10 @@ export const TaskList: React.FC<TaskListProps> = ({
 					<Button variant="ghost" onClick={onClose}>
 						Cancel
 					</Button>
-					<Button onClick={onOpenTask} disabled={!selectedTask || isLoadingTasks}>
+					<Button
+						onClick={onOpenTask}
+						disabled={!selectedTask || isLoadingTasks}
+					>
 						{isSelectedTaskOpen ? "Switch to Task" : "Open Task"}
 					</Button>
 				</div>
@@ -146,4 +154,3 @@ export const TaskList: React.FC<TaskListProps> = ({
 		</>
 	);
 };
-
diff --git a/apps/desktop/src/renderer/screens/main/components/Layout/AddTaskModal/index.ts b/apps/desktop/src/renderer/screens/main/components/Layout/AddTaskModal/index.ts
index 3343ffe5bbe..bd3bfbbd38d 100644
--- a/apps/desktop/src/renderer/screens/main/components/Layout/AddTaskModal/index.ts
+++ b/apps/desktop/src/renderer/screens/main/components/Layout/AddTaskModal/index.ts
@@ -1,6 +1,5 @@
 export { AddTaskModal } from "../AddTaskModal";
-export type { AddTaskModalProps, Task, APITask } from "./types";
 export { CreatingView } from "./CreatingView";
 export { TaskForm } from "./TaskForm";
 export { TaskList } from "./TaskList";
-
+export type { AddTaskModalProps, APITask, Task } from "./types";
diff --git a/apps/desktop/src/renderer/screens/main/components/Layout/AddTaskModal/types.ts b/apps/desktop/src/renderer/screens/main/components/Layout/AddTaskModal/types.ts
index 8bfff1f8838..8a4caace32b 100644
--- a/apps/desktop/src/renderer/screens/main/components/Layout/AddTaskModal/types.ts
+++ b/apps/desktop/src/renderer/screens/main/components/Layout/AddTaskModal/types.ts
@@ -1,5 +1,5 @@
-import type { TaskStatus } from "../StatusIndicator";
 import type { Worktree } from "shared/types";
+import type { TaskStatus } from "../StatusIndicator";
 
 export interface Task {
 	id: string;
@@ -57,4 +57,3 @@ export interface AddTaskModalProps {
 	onClearStatus?: () => void;
 	currentWorkspaceId?: string | null;
 }
-
diff --git a/apps/desktop/src/renderer/screens/main/components/Layout/AddTaskModal/useTaskData.ts b/apps/desktop/src/renderer/screens/main/components/Layout/AddTaskModal/useTaskData.ts
index a6e2a0dea08..4301b715a18 100644
--- a/apps/desktop/src/renderer/screens/main/components/Layout/AddTaskModal/useTaskData.ts
+++ b/apps/desktop/src/renderer/screens/main/components/Layout/AddTaskModal/useTaskData.ts
@@ -68,4 +68,3 @@ export function useTaskData(
 
 	return { tasks, isLoadingTasks, tasksError, refetch: fetchTasks };
 }
-
diff --git a/apps/desktop/src/renderer/screens/main/components/Layout/AddTaskModal/useTaskForm.ts b/apps/desktop/src/renderer/screens/main/components/Layout/AddTaskModal/useTaskForm.ts
index 4cfa07083a1..65859aefd40 100644
--- a/apps/desktop/src/renderer/screens/main/components/Layout/AddTaskModal/useTaskForm.ts
+++ b/apps/desktop/src/renderer/screens/main/components/Layout/AddTaskModal/useTaskForm.ts
@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useState } from "react";
-import type { TaskStatus } from "../StatusIndicator";
 import type { Worktree } from "shared/types";
+import type { TaskStatus } from "../StatusIndicator";
 import { generateBranchNameWithCollisionAvoidance } from "./utils";
 
 export function useTaskForm(
@@ -45,7 +45,9 @@ export function useTaskForm(
 	// Auto-select worktree to clone tabs from if it matches the source branch
 	useEffect(() => {
 		if (sourceBranch && worktrees.length > 0) {
-			const matchingWorktree = worktrees.find((wt) => wt.branch === sourceBranch);
+			const matchingWorktree = worktrees.find(
+				(wt) => wt.branch === sourceBranch,
+			);
 			if (matchingWorktree) {
 				setCloneTabsFromWorktreeId(matchingWorktree.id);
 			} else {
@@ -94,4 +96,3 @@ export function useTaskForm(
 		setCloneTabsFromWorktreeId,
 	};
 }
-
diff --git a/apps/desktop/src/renderer/screens/main/components/Layout/AddTaskModal/utils.ts b/apps/desktop/src/renderer/screens/main/components/Layout/AddTaskModal/utils.ts
index 23d5a41077f..7a64ddf6812 100644
--- a/apps/desktop/src/renderer/screens/main/components/Layout/AddTaskModal/utils.ts
+++ b/apps/desktop/src/renderer/screens/main/components/Layout/AddTaskModal/utils.ts
@@ -1,6 +1,6 @@
 import type { Worktree } from "shared/types";
-import type { APITask, Task } from "./types";
 import type { TaskStatus } from "../StatusIndicator";
+import type { APITask, Task } from "./types";
 
 export function formatRelativeTime(date: Date): string {
 	const now = new Date();
@@ -10,8 +10,10 @@ export function formatRelativeTime(date: Date): string {
 	const diffDays = Math.floor(diffMs / 86400000);
 
 	if (diffMins < 1) return "just now";
-	if (diffMins < 60) return `${diffMins} minute${diffMins !== 1 ? "s" : ""} ago`;
-	if (diffHours < 24) return `${diffHours} hour${diffHours !== 1 ? "s" : ""} ago`;
+	if (diffMins < 60)
+		return `${diffMins} minute${diffMins !== 1 ? "s" : ""} ago`;
+	if (diffHours < 24)
+		return `${diffHours} hour${diffHours !== 1 ? "s" : ""} ago`;
 	if (diffDays < 7) return `${diffDays} day${diffDays !== 1 ? "s" : ""} ago`;
 	return date.toLocaleDateString();
 }
@@ -67,7 +69,9 @@ export function transformWorktreeToTask(worktree: Worktree): Task {
 	};
 }
 
-export function generateBranchNameWithCollisionAvoidance(title: string): string {
+export function generateBranchNameWithCollisionAvoidance(
+	title: string,
+): string {
 	// Convert to lowercase and replace spaces/special chars with hyphens
 	let slug = title
 		.toLowerCase()
@@ -109,4 +113,3 @@ export function generateBranchNameWithCollisionAvoidance(title: string): string
 
 	return `${slug}-${randomSuffix}`;
 }
-
diff --git a/apps/desktop/src/renderer/screens/main/components/Layout/NewLayoutMain.tsx b/apps/desktop/src/renderer/screens/main/components/Layout/NewLayoutMain.tsx
index 39fb62cfbed..77f471da2f4 100644
--- a/apps/desktop/src/renderer/screens/main/components/Layout/NewLayoutMain.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/Layout/NewLayoutMain.tsx
@@ -240,12 +240,12 @@ function enrichWorktreesWithTasks(
 			isPending: true, // Mark as pending for UI
 			task: pending.taskData
 				? {
-					id: pending.id,
-					slug: pending.taskData.slug,
-					title: pending.taskData.name,
-					status: pending.taskData.status,
-					description: pending.description || "",
-				}
+						id: pending.id,
+						slug: pending.taskData.slug,
+						title: pending.taskData.name,
+						status: pending.taskData.status,
+						description: pending.description || "",
+					}
 				: undefined,
 		}),
 	);
@@ -289,7 +289,9 @@ export const MainLayout: React.FC = () => {
 	const [isSidebarOpen, setIsSidebarOpen] = useState(true);
 	const [showSidebarOverlay, setShowSidebarOverlay] = useState(false);
 	const [isAddTaskModalOpen, setIsAddTaskModalOpen] = useState(false);
-	const [addTaskModalInitialMode, setAddTaskModalInitialMode] = useState<"list" | "new">("list");
+	const [addTaskModalInitialMode, setAddTaskModalInitialMode] = useState<
+		"list" | "new"
+	>("list");
 	const [branches, setBranches] = useState<string[]>([]);
 	const [isCreatingWorktree, setIsCreatingWorktree] = useState(false);
 	const [setupStatus, setSetupStatus] = useState<string | undefined>(undefined);
@@ -526,7 +528,10 @@ export const MainLayout: React.FC = () => {
 
 					// If we deleted the selected worktree, select the first available one
 					if (selectedWorktreeId === worktreeId) {
-						if (refreshedWorkspace.worktrees && refreshedWorkspace.worktrees.length > 0) {
+						if (
+							refreshedWorkspace.worktrees &&
+							refreshedWorkspace.worktrees.length > 0
+						) {
 							const firstWorktree = refreshedWorkspace.worktrees[0];
 							setSelectedWorktreeId(firstWorktree.id);
 							if (firstWorktree.tabs && firstWorktree.tabs.length > 0) {
@@ -581,7 +586,7 @@ export const MainLayout: React.FC = () => {
 	const handleOpenAddTaskModal = (mode: "list" | "new" = "list") => {
 		setAddTaskModalInitialMode(mode);
 		setIsAddTaskModalOpen(true);
-		
+
 		// Fetch branches when opening in new mode
 		if (mode === "new" && currentWorkspace) {
 			void (async () => {
@@ -715,7 +720,10 @@ export const MainLayout: React.FC = () => {
 				}),
 			});
 
-			window.ipcRenderer.removeListener("worktree-setup-progress", progressHandler);
+			window.ipcRenderer.removeListener(
+				"worktree-setup-progress",
+				progressHandler,
+			);
 
 			if (result.success) {
 				// Display setup result if available
@@ -748,7 +756,10 @@ export const MainLayout: React.FC = () => {
 					}
 				}
 			} else {
-				console.error("[NewLayoutMain] Failed to create worktree:", result.error);
+				console.error(
+					"[NewLayoutMain] Failed to create worktree:",
+					result.error,
+				);
 				setSetupStatus("Failed to create worktree");
 				setSetupOutput(result.error);
 				setIsCreatingWorktree(false);
@@ -759,7 +770,10 @@ export const MainLayout: React.FC = () => {
 			setSetupStatus("Error creating worktree");
 			setSetupOutput(String(error));
 			setIsCreatingWorktree(false);
-			window.ipcRenderer.removeListener("worktree-setup-progress", progressHandler);
+			window.ipcRenderer.removeListener(
+				"worktree-setup-progress",
+				progressHandler,
+			);
 		}
 	};
 
@@ -1035,10 +1049,10 @@ export const MainLayout: React.FC = () => {
 								{/* Main content panel */}
 								<ResizablePanel defaultSize={80} minSize={30}>
 									{loading ||
-										error ||
-										!currentWorkspace ||
-										!selectedTab ||
-										!selectedWorktree ? (
+									error ||
+									!currentWorkspace ||
+									!selectedTab ||
+									!selectedWorktree ? (
 										<PlaceholderState
 											loading={loading}
 											error={error}
diff --git a/apps/desktop/src/renderer/screens/main/components/Layout/TaskTabs/AddTaskButton.tsx b/apps/desktop/src/renderer/screens/main/components/Layout/TaskTabs/AddTaskButton.tsx
index c674713a5e0..ea66b3246b1 100644
--- a/apps/desktop/src/renderer/screens/main/components/Layout/TaskTabs/AddTaskButton.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/Layout/TaskTabs/AddTaskButton.tsx
@@ -15,7 +15,12 @@ export const AddTaskButton: React.FC<AddTaskButtonProps> = ({ onClick }) => {
 	return (
 		<Tooltip>
 			<TooltipTrigger asChild>
-				<Button variant="ghost" size="icon-sm" className="ml-1" onClick={handleClick}>
+				<Button
+					variant="ghost"
+					size="icon-sm"
+					className="ml-1"
+					onClick={handleClick}
+				>
 					<Plus size={18} />
 				</Button>
 			</TooltipTrigger>
diff --git a/apps/desktop/src/renderer/screens/main/components/Layout/TaskTabs/ModeToggle.tsx b/apps/desktop/src/renderer/screens/main/components/Layout/TaskTabs/ModeToggle.tsx
index a49dde75c5d..161eb13933f 100644
--- a/apps/desktop/src/renderer/screens/main/components/Layout/TaskTabs/ModeToggle.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/Layout/TaskTabs/ModeToggle.tsx
@@ -11,20 +11,22 @@ export const ModeToggle: React.FC<ModeToggleProps> = ({ mode, onChange }) => (
 			<button
 				type="button"
 				onClick={() => onChange("plan")}
-				className={`px-2.5 py-1 text-xs font-medium rounded-md transition-colors ${mode === "plan"
+				className={`px-2.5 py-1 text-xs font-medium rounded-md transition-colors ${
+					mode === "plan"
 						? "bg-neutral-700 text-white"
 						: "text-neutral-400 hover:text-neutral-200"
-					}`}
+				}`}
 			>
 				Plan
 			</button>
 			<button
 				type="button"
 				onClick={() => onChange("edit")}
-				className={`px-2.5 py-1 text-xs font-medium rounded-md transition-colors ${mode === "edit"
+				className={`px-2.5 py-1 text-xs font-medium rounded-md transition-colors ${
+					mode === "edit"
 						? "bg-neutral-700 text-white"
 						: "text-neutral-400 hover:text-neutral-200"
-					}`}
+				}`}
 			>
 				Edit
 			</button>
diff --git a/apps/desktop/src/renderer/screens/main/components/Layout/TaskTabs/TaskTabs.tsx b/apps/desktop/src/renderer/screens/main/components/Layout/TaskTabs/TaskTabs.tsx
index 0b888fe44f7..618a5b3a53d 100644
--- a/apps/desktop/src/renderer/screens/main/components/Layout/TaskTabs/TaskTabs.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/Layout/TaskTabs/TaskTabs.tsx
@@ -47,12 +47,16 @@ function useTabWidth(worktrees: Array<{ id: string }>) {
 			// numTabs gaps: (numTabs - 1) between tabs + 1 before button
 			const addButtonWidth = ADD_BUTTON_WIDTH + TAB_GAP;
 			const totalGapWidth = TAB_GAP * numTabs;
-			const availableWidth = containerWidth - totalGapWidth - addButtonWidth - WIDTH_BUFFER;
+			const availableWidth =
+				containerWidth - totalGapWidth - addButtonWidth - WIDTH_BUFFER;
 			const calculatedWidth = availableWidth / numTabs;
 
-			const finalWidth = calculatedWidth < MIN_TAB_WIDTH
-				? MIN_TAB_WIDTH
-				: Math.floor(Math.max(MIN_TAB_WIDTH, Math.min(MAX_TAB_WIDTH, calculatedWidth)));
+			const finalWidth =
+				calculatedWidth < MIN_TAB_WIDTH
+					? MIN_TAB_WIDTH
+					: Math.floor(
+							Math.max(MIN_TAB_WIDTH, Math.min(MAX_TAB_WIDTH, calculatedWidth)),
+						);
 
 			setTabWidth(finalWidth);
 		};
diff --git a/apps/desktop/src/renderer/screens/main/components/Layout/TaskTabs/WorktreeTabButton.tsx b/apps/desktop/src/renderer/screens/main/components/Layout/TaskTabs/WorktreeTabButton.tsx
index 2fe76318c1b..7b73326bca0 100644
--- a/apps/desktop/src/renderer/screens/main/components/Layout/TaskTabs/WorktreeTabButton.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/Layout/TaskTabs/WorktreeTabButton.tsx
@@ -37,9 +37,10 @@ export const WorktreeTabButton: React.FC<WorktreeTabButtonProps> = ({
 				className={`
 					flex items-center gap-2 rounded-t-md transition-all w-full shrink-0
 					${onClose && !isPending ? "pl-3 pr-6" : "px-3"}
-					${isSelected
-						? "text-white border-t border-x border-r h-[33px] bg-stone-950"
-						: "text-neutral-400 hover:text-neutral-200 hover:bg-neutral-800/50 border-transparent h-8"
+					${
+						isSelected
+							? "text-white border-t border-x border-r h-[33px] bg-stone-950"
+							: "text-neutral-400 hover:text-neutral-200 hover:bg-neutral-800/50 border-transparent h-8"
 					}
 					${isPending ? "opacity-70 cursor-wait" : ""}
 				`}
@@ -58,7 +59,9 @@ export const WorktreeTabButton: React.FC<WorktreeTabButtonProps> = ({
 					task && <StatusIndicator status={task.status} showLabel={false} />
 				)}
 				<span className="text-sm whitespace-nowrap truncate flex-1 text-left">
-					{hasTask && task ? `${task.title} (${worktree.branch})` : worktree.branch}
+					{hasTask && task
+						? `${task.title} (${worktree.branch})`
+						: worktree.branch}
 				</span>
 			</button>
 			{onClose && !isPending && (
@@ -74,9 +77,10 @@ export const WorktreeTabButton: React.FC<WorktreeTabButtonProps> = ({
 						w-4 h-4 rounded
 						transition-opacity cursor-pointer
 						hover:bg-neutral-700
-						${isSelected
-							? "opacity-100 text-neutral-300"
-							: "opacity-0 group-hover:opacity-100 text-neutral-400 hover:text-neutral-200"
+						${
+							isSelected
+								? "opacity-100 text-neutral-300"
+								: "opacity-0 group-hover:opacity-100 text-neutral-400 hover:text-neutral-200"
 						}
 					`}
 					aria-label="Close tab"
diff --git a/apps/desktop/src/renderer/screens/main/components/MainContent/TabContent.tsx b/apps/desktop/src/renderer/screens/main/components/MainContent/TabContent.tsx
index 576fb053042..4a3c10c0a7e 100644
--- a/apps/desktop/src/renderer/screens/main/components/MainContent/TabContent.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/MainContent/TabContent.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useRef, useState } from "react";
 import type { Tab } from "shared/types";
-import { useWorkspaceContext, useTabContext } from "../../../../contexts";
+import { useTabContext, useWorkspaceContext } from "../../../../contexts";
 import { PortTab } from "../TabContent/components/PortTab";
 import { PreviewTab } from "../TabContent/components/PreviewTab";
 import TabGroup from "./TabGroup";
@@ -28,16 +28,17 @@ export default function TabContent({
 }: TabContentProps) {
 	const { currentWorkspace } = useWorkspaceContext();
 	const { selectedWorktreeId, selectedTabId, handleTabFocus } = useTabContext();
-	
+
 	const selectedWorktree = currentWorkspace?.worktrees?.find(
 		(wt) => wt.id === selectedWorktreeId,
 	);
-	
-	const workingDirectory = selectedWorktree?.path || currentWorkspace?.repoPath || "";
+
+	const workingDirectory =
+		selectedWorktree?.path || currentWorkspace?.repoPath || "";
 	const workspaceId = currentWorkspace?.id || "";
 	const worktreeId = selectedWorktreeId ?? undefined;
 	const worktree = selectedWorktree;
-	
+
 	const handleFocus = () => {
 		handleTabFocus(tab.id);
 	};
diff --git a/apps/desktop/src/renderer/screens/main/components/MainContent/TabGroup.tsx b/apps/desktop/src/renderer/screens/main/components/MainContent/TabGroup.tsx
index 2f957334628..6e56c4d1c42 100644
--- a/apps/desktop/src/renderer/screens/main/components/MainContent/TabGroup.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/MainContent/TabGroup.tsx
@@ -7,7 +7,7 @@ import {
 } from "react-mosaic-component";
 import "react-mosaic-component/react-mosaic-component.css";
 import type { Tab } from "shared/types";
-import { useWorkspaceContext, useTabContext } from "../../../../contexts";
+import { useTabContext, useWorkspaceContext } from "../../../../contexts";
 import TabContent from "./TabContent";
 
 interface ScreenLayoutProps {
@@ -17,12 +17,13 @@ interface ScreenLayoutProps {
 export default function TabGroup({ groupTab }: ScreenLayoutProps) {
 	const { currentWorkspace } = useWorkspaceContext();
 	const { selectedWorktreeId, selectedTabId, handleTabFocus } = useTabContext();
-	
+
 	const selectedWorktree = currentWorkspace?.worktrees?.find(
 		(wt) => wt.id === selectedWorktreeId,
 	);
-	
-	const workingDirectory = selectedWorktree?.path || currentWorkspace?.repoPath || "";
+
+	const workingDirectory =
+		selectedWorktree?.path || currentWorkspace?.repoPath || "";
 	const workspaceId = currentWorkspace?.id || "";
 	const worktreeId = selectedWorktreeId ?? undefined;
 	// Initialize mosaic tree from groupTab or create a default tree
diff --git a/apps/desktop/src/renderer/screens/main/components/MainContent/Terminal.tsx b/apps/desktop/src/renderer/screens/main/components/MainContent/Terminal.tsx
index a38b851b94b..c4226c69964 100644
--- a/apps/desktop/src/renderer/screens/main/components/MainContent/Terminal.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/MainContent/Terminal.tsx
@@ -222,12 +222,43 @@ export default function TerminalComponent({
 					return; // Skip if container has no dimensions yet
 				}
 
-				// Use proposeDimensions to calculate optimal size without applying it
-				// Then manually resize to ensure PTY gets the correct dimensions
-				const dimensions = fitAddon.proposeDimensions();
-				if (dimensions) {
-					term.resize(dimensions.cols, dimensions.rows);
-				}
+				// Access xterm.js internal dimensions for more accurate calculations
+				// This ensures we use the actual rendered cell dimensions
+				const core = (term as any)._core;
+				const cellWidth =
+					core?._renderService?.dimensions?.css?.cell?.width || 9;
+				const cellHeight =
+					core?._renderService?.dimensions?.css?.cell?.height || 17;
+
+				// Calculate available space (accounting for potential padding)
+				// Note: CSS has [&_.xterm-screen]:!p-0 which removes padding,
+				// but we calculate defensively in case padding is present
+				const xtermScreen = container.querySelector(".xterm-screen");
+				const computedStyle = xtermScreen
+					? window.getComputedStyle(xtermScreen)
+					: null;
+				const paddingLeft = computedStyle
+					? Number.parseFloat(computedStyle.paddingLeft)
+					: 0;
+				const paddingRight = computedStyle
+					? Number.parseFloat(computedStyle.paddingRight)
+					: 0;
+				const paddingTop = computedStyle
+					? Number.parseFloat(computedStyle.paddingTop)
+					: 0;
+				const paddingBottom = computedStyle
+					? Number.parseFloat(computedStyle.paddingBottom)
+					: 0;
+
+				const availableWidth = width - paddingLeft - paddingRight;
+				const availableHeight = height - paddingTop - paddingBottom;
+
+				// Calculate cols and rows based on actual cell dimensions
+				const cols = Math.max(2, Math.floor(availableWidth / cellWidth));
+				const rows = Math.max(1, Math.floor(availableHeight / cellHeight));
+
+				// Resize the terminal
+				term.resize(cols, rows);
 			} catch (e) {
 				console.warn("Custom fit failed:", e);
 			}
@@ -313,7 +344,11 @@ export default function TerminalComponent({
 				.then((history: string | undefined) => {
 					if (history) {
 						// Write history directly - PTY data already has proper formatting
-						term.write(history);
+						// Use callback to ensure scroll happens after write completes
+						term.write(history, () => {
+							// Scroll to bottom to show latest output
+							term.scrollToBottom();
+						});
 
 						// Delay initial fit AFTER writing history to prevent resize events
 						// from triggering the shell to redraw the prompt
@@ -475,7 +510,7 @@ export default function TerminalComponent({
 	return (
 		<div
 			ref={terminalRef}
-			className={`h-full w-full transition-opacity duration-200 text-start [&_.xterm-screen]:!p-0 ${hidden ? "opacity-0" : "opacity-100 delay-300"}`}
+			className={`h-full w-full overflow-hidden transition-opacity duration-200 text-start ${hidden ? "opacity-0" : "opacity-100 delay-300"}`}
 		/>
 	);
 }
diff --git a/apps/desktop/src/renderer/screens/main/components/MainContentArea/MainContentArea.tsx b/apps/desktop/src/renderer/screens/main/components/MainContentArea/MainContentArea.tsx
index 808d0293535..469cf2bb02f 100644
--- a/apps/desktop/src/renderer/screens/main/components/MainContentArea/MainContentArea.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/MainContentArea/MainContentArea.tsx
@@ -1,17 +1,17 @@
 import {
-    ResizableHandle,
-    ResizablePanel,
-    ResizablePanelGroup,
+	ResizableHandle,
+	ResizablePanel,
+	ResizablePanelGroup,
 } from "@superset/ui/resizable";
 import { useState } from "react";
-import { useDiffData } from "../../hooks";
-import type { AppMode } from "../../types";
 import {
-	useWorkspaceContext,
-	useTabContext,
 	useSidebarContext,
+	useTabContext,
+	useWorkspaceContext,
 	useWorktreeOperationsContext,
 } from "../../../../contexts";
+import { useDiffData } from "../../hooks";
+import type { AppMode } from "../../types";
 import { DiffContentArea } from "../DiffView";
 import TabContent from "../MainContent/TabContent";
 import TabGroup from "../MainContent/TabGroup";
@@ -21,7 +21,7 @@ import { Sidebar } from "../Sidebar";
 import type { SidebarMode } from "../Sidebar/components/ModeCarousel";
 
 interface MainContentAreaProps {
-    mode: AppMode;
+	mode: AppMode;
 }
 
 export function MainContentArea({ mode }: MainContentAreaProps) {
@@ -48,111 +48,109 @@ export function MainContentArea({ mode }: MainContentAreaProps) {
 		handleCollapseSidebar,
 		handleExpandSidebar,
 	} = useSidebarContext();
-	const {
-		handleWorktreeCreated,
-		handleUpdateWorktree,
-	} = useWorktreeOperationsContext();
-    const [sidebarMode, setSidebarMode] = useState<SidebarMode>("tabs");
-    const [selectedFile, setSelectedFile] = useState<string | null>(null);
+	const { handleWorktreeCreated, handleUpdateWorktree } =
+		useWorktreeOperationsContext();
+	const [sidebarMode, setSidebarMode] = useState<SidebarMode>("tabs");
+	const [selectedFile, setSelectedFile] = useState<string | null>(null);
 
-    // Fetch diff data when sidebar is in diff mode
-    const {
-        diffData,
-        loading: diffLoading,
-        refreshing: diffRefreshing,
-        refresh: refreshDiff,
-        loadFileContent,
-        loadedFiles,
-        loadingFiles,
-    } = useDiffData({
-        workspaceId: currentWorkspace?.id,
-        worktreeId: selectedWorktreeId ?? undefined,
-        worktreeBranch: selectedWorktree?.branch,
-        workspaceName: currentWorkspace?.name,
-        enabled: sidebarMode === "changes" && !!selectedWorktreeId,
-    });
-    if (mode === "plan") {
-        return <PlanView />;
-    }
+	// Fetch diff data when sidebar is in diff mode
+	const {
+		diffData,
+		loading: diffLoading,
+		refreshing: diffRefreshing,
+		refresh: refreshDiff,
+		loadFileContent,
+		loadedFiles,
+		loadingFiles,
+	} = useDiffData({
+		workspaceId: currentWorkspace?.id,
+		worktreeId: selectedWorktreeId ?? undefined,
+		worktreeBranch: selectedWorktree?.branch,
+		workspaceName: currentWorkspace?.name,
+		enabled: sidebarMode === "changes" && !!selectedWorktreeId,
+	});
+	if (mode === "plan") {
+		return <PlanView />;
+	}
 
-    return (
-        <ResizablePanelGroup direction="horizontal" autoSaveId="new-layout-panels">
-            {/* Sidebar panel with full workspace/worktree management */}
-            <ResizablePanel
-                ref={sidebarPanelRef}
-                defaultSize={20}
-                minSize={15}
-                maxSize={40}
-                collapsible
-                onCollapse={handleCollapseSidebar}
-                onExpand={handleExpandSidebar}
-            >
-                {isSidebarOpen && workspaces && (
-                    <Sidebar
-                        onDiffModeChange={(mode, file) => {
-                            setSidebarMode(mode);
-                            setSelectedFile(file);
-                        }}
-                    />
-                )}
-            </ResizablePanel>
+	return (
+		<ResizablePanelGroup direction="horizontal" autoSaveId="new-layout-panels">
+			{/* Sidebar panel with full workspace/worktree management */}
+			<ResizablePanel
+				ref={sidebarPanelRef}
+				defaultSize={20}
+				minSize={15}
+				maxSize={40}
+				collapsible
+				onCollapse={handleCollapseSidebar}
+				onExpand={handleExpandSidebar}
+			>
+				{isSidebarOpen && workspaces && (
+					<Sidebar
+						onDiffModeChange={(mode, file) => {
+							setSidebarMode(mode);
+							setSelectedFile(file);
+						}}
+					/>
+				)}
+			</ResizablePanel>
 
-            <ResizableHandle withHandle />
+			<ResizableHandle withHandle />
 
-            {/* Main content panel */}
-            <ResizablePanel defaultSize={80} minSize={30}>
-                {sidebarMode === "changes" ? (
-                    diffLoading ? (
-                        <PlaceholderState
-                            loading={true}
-                            error={null}
-                            hasWorkspace={!!currentWorkspace}
-                        />
-                    ) : diffData ? (
-                        // Diff mode - show diff content area
-                        <DiffContentArea
-                            data={diffData}
-                            selectedFile={selectedFile}
-                            onFileSelect={setSelectedFile}
-                            onRefresh={refreshDiff}
-                            isRefreshing={diffRefreshing}
-                            loadFileContent={loadFileContent}
-                            loadedFiles={loadedFiles}
-                            loadingFiles={loadingFiles}
-                        />
-                    ) : (
-                        <PlaceholderState
-                            loading={false}
-                            error={null}
-                            hasWorkspace={!!currentWorkspace}
-                        />
-                    )
-                ) : loading ||
-                    error ||
-                    !currentWorkspace ||
-                    !selectedTab ||
-                    !selectedWorktree ? (
-                    <PlaceholderState
-                        loading={loading}
-                        error={error}
-                        hasWorkspace={!!currentWorkspace}
-                    />
-                ) : parentGroupTab ? (
-                    // Selected tab is a sub-tab of a group → display the parent group's mosaic
-                    <TabGroup groupTab={parentGroupTab} />
-                ) : selectedTab.type === "group" ? (
-                    // Selected tab is a group tab → display its mosaic layout
-                    <TabGroup groupTab={selectedTab} />
-                ) : (
-                    // Base level tab (terminal, preview, etc.) → display full width/height
-                    <div className="w-full h-full p-2 bg-[#1e1e1e] rounded-sm">
-                        <TabContent
-                            tab={selectedTab}
-                            groupTabId="" // No parent group
-                        />
-                    </div>
-                )}
-            </ResizablePanel>
-        </ResizablePanelGroup>
-    );
+			{/* Main content panel */}
+			<ResizablePanel defaultSize={80} minSize={30}>
+				{sidebarMode === "changes" ? (
+					diffLoading ? (
+						<PlaceholderState
+							loading={true}
+							error={null}
+							hasWorkspace={!!currentWorkspace}
+						/>
+					) : diffData ? (
+						// Diff mode - show diff content area
+						<DiffContentArea
+							data={diffData}
+							selectedFile={selectedFile}
+							onFileSelect={setSelectedFile}
+							onRefresh={refreshDiff}
+							isRefreshing={diffRefreshing}
+							loadFileContent={loadFileContent}
+							loadedFiles={loadedFiles}
+							loadingFiles={loadingFiles}
+						/>
+					) : (
+						<PlaceholderState
+							loading={false}
+							error={null}
+							hasWorkspace={!!currentWorkspace}
+						/>
+					)
+				) : loading ||
+					error ||
+					!currentWorkspace ||
+					!selectedTab ||
+					!selectedWorktree ? (
+					<PlaceholderState
+						loading={loading}
+						error={error}
+						hasWorkspace={!!currentWorkspace}
+					/>
+				) : parentGroupTab ? (
+					// Selected tab is a sub-tab of a group → display the parent group's mosaic
+					<TabGroup groupTab={parentGroupTab} />
+				) : selectedTab.type === "group" ? (
+					// Selected tab is a group tab → display its mosaic layout
+					<TabGroup groupTab={selectedTab} />
+				) : (
+					// Base level tab (terminal, preview, etc.) → display full width/height
+					<div className="w-full h-full p-2 bg-[#1e1e1e] rounded-sm">
+						<TabContent
+							tab={selectedTab}
+							groupTabId="" // No parent group
+						/>
+					</div>
+				)}
+			</ResizablePanel>
+		</ResizablePanelGroup>
+	);
 }
diff --git a/apps/desktop/src/renderer/screens/main/components/MainContentArea/index.ts b/apps/desktop/src/renderer/screens/main/components/MainContentArea/index.ts
index b24b43dd9e8..8b6bdcffa19 100644
--- a/apps/desktop/src/renderer/screens/main/components/MainContentArea/index.ts
+++ b/apps/desktop/src/renderer/screens/main/components/MainContentArea/index.ts
@@ -1,2 +1 @@
 export { MainContentArea } from "./MainContentArea";
-
diff --git a/apps/desktop/src/renderer/screens/main/components/PlanView/PlanView.tsx b/apps/desktop/src/renderer/screens/main/components/PlanView/PlanView.tsx
index 73850a8c24f..cf65fedcee6 100644
--- a/apps/desktop/src/renderer/screens/main/components/PlanView/PlanView.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/PlanView/PlanView.tsx
@@ -2,8 +2,8 @@ import type { RouterOutputs } from "@superset/api";
 import { Plus } from "lucide-react";
 import type React from "react";
 import { useMemo, useState } from "react";
-import { useWorkspaceContext, useTabContext } from "../../../../contexts";
 import { mockTasks, mockUsers } from "../../../../../lib/mock-data";
+import { useTabContext, useWorkspaceContext } from "../../../../contexts";
 import { CreateTaskModal } from "./CreateTaskModal";
 import { KanbanColumn } from "./KanbanColumn";
 import { TaskPage } from "./TaskPage";
@@ -11,11 +11,12 @@ import { TaskPage } from "./TaskPage";
 type Task = RouterOutputs["task"]["all"][number];
 type User = RouterOutputs["user"]["all"][number];
 
-interface PlanViewProps {}
+type PlanViewProps = {};
 
 export const PlanView: React.FC<PlanViewProps> = () => {
 	const { currentWorkspace } = useWorkspaceContext();
-	const { selectedWorktreeId, handleTabSelect, handleTabCreated } = useTabContext();
+	const { selectedWorktreeId, handleTabSelect, handleTabCreated } =
+		useTabContext();
 	// Initialize with mock tasks and add some variety to statuses
 	const [tasks, setTasks] = useState<Task[]>(() => {
 		// Modify some tasks to have different statuses for demo purposes
diff --git a/apps/desktop/src/renderer/screens/main/components/Sidebar/Sidebar.tsx b/apps/desktop/src/renderer/screens/main/components/Sidebar/Sidebar.tsx
index dfbbd4d02bd..fba1e1497f0 100644
--- a/apps/desktop/src/renderer/screens/main/components/Sidebar/Sidebar.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/Sidebar/Sidebar.tsx
@@ -2,19 +2,16 @@ import { type MotionValue, useMotionValue } from "framer-motion";
 import { File, FileEdit, FilePlus, FileX } from "lucide-react";
 import { useEffect, useState } from "react";
 import type { Tab } from "shared/types";
-import { useDiffData } from "../../hooks";
 import {
-	useWorkspaceContext,
+	useSidebarContext,
 	useTabContext,
+	useWorkspaceContext,
 	useWorktreeOperationsContext,
-	useSidebarContext,
 } from "../../../../contexts";
+import { useDiffData } from "../../hooks";
 import { FileTree } from "../DiffView";
 import type { FileDiff } from "../DiffView/types";
-import {
-	CreateWorktreeModal,
-	WorktreeList,
-} from "./components";
+import { CreateWorktreeModal, WorktreeList } from "./components";
 import { ModeCarousel, type SidebarMode } from "./components/ModeCarousel";
 
 interface SidebarProps {
@@ -26,9 +23,12 @@ export function Sidebar({
 	isDragging = false,
 	onDiffModeChange,
 }: SidebarProps) {
-	const { workspaces, currentWorkspace, handleWorkspaceSelect } = useWorkspaceContext();
-	const { selectedTabId, selectedWorktreeId, handleTabSelect } = useTabContext();
-	const { handleWorktreeCreated, handleUpdateWorktree } = useWorktreeOperationsContext();
+	const { workspaces, currentWorkspace, handleWorkspaceSelect } =
+		useWorkspaceContext();
+	const { selectedTabId, selectedWorktreeId, handleTabSelect } =
+		useTabContext();
+	const { handleWorktreeCreated, handleUpdateWorktree } =
+		useWorktreeOperationsContext();
 	const { handleCollapseSidebar } = useSidebarContext();
 	const [expandedWorktrees, setExpandedWorktrees] = useState<Set<string>>(
 		new Set(),
diff --git a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/ModeCarousel.tsx b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/ModeCarousel.tsx
index 3178c0be266..352a56cf118 100644
--- a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/ModeCarousel.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/ModeCarousel.tsx
@@ -91,10 +91,7 @@ export function ModeCarousel({
 								width: `${100 / modes.length}%`,
 							}}
 						>
-							<ModeContent
-								mode={mode}
-								isActive={mode === currentMode}
-							>
+							<ModeContent mode={mode} isActive={mode === currentMode}>
 								{children(mode, mode === currentMode)}
 							</ModeContent>
 						</div>
diff --git a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/components/AnimatedBackground/AnimatedBackground.tsx b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/components/AnimatedBackground/AnimatedBackground.tsx
index d159e972e91..141906300ac 100644
--- a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/components/AnimatedBackground/AnimatedBackground.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/components/AnimatedBackground/AnimatedBackground.tsx
@@ -19,7 +19,7 @@ export function AnimatedBackground({
 	const translateX = useTransform(
 		progress,
 		[0, modeCount - 1],
-		[0, (modeCount - 1) * totalButtonWidth]
+		[0, (modeCount - 1) * totalButtonWidth],
 	);
 
 	return (
@@ -37,4 +37,3 @@ export function AnimatedBackground({
 		/>
 	);
 }
-
diff --git a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/components/AnimatedBackground/index.ts b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/components/AnimatedBackground/index.ts
index f57394e4fd0..bd67e3d1dd3 100644
--- a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/components/AnimatedBackground/index.ts
+++ b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/components/AnimatedBackground/index.ts
@@ -1,2 +1 @@
 export { AnimatedBackground } from "./AnimatedBackground";
-
diff --git a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/components/ModeContent/index.ts b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/components/ModeContent/index.ts
index d745b999a59..a417863b8c1 100644
--- a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/components/ModeContent/index.ts
+++ b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/components/ModeContent/index.ts
@@ -1,2 +1 @@
 export { ModeContent } from "./ModeContent";
-
diff --git a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/components/ModeHeader/ModeHeader.tsx b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/components/ModeHeader/ModeHeader.tsx
index 6abbe28631d..30aa3c86599 100644
--- a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/components/ModeHeader/ModeHeader.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/components/ModeHeader/ModeHeader.tsx
@@ -14,4 +14,3 @@ export function ModeHeader({ mode }: ModeHeaderProps) {
 		</div>
 	);
 }
-
diff --git a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/components/ModeHeader/index.ts b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/components/ModeHeader/index.ts
index 80cc09d0ea1..4701a949629 100644
--- a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/components/ModeHeader/index.ts
+++ b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/components/ModeHeader/index.ts
@@ -1,2 +1 @@
 export { ModeHeader } from "./ModeHeader";
-
diff --git a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/components/ModeNavigation/ModeNavigation.tsx b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/components/ModeNavigation/ModeNavigation.tsx
index 9442120bd66..cae5c51c65b 100644
--- a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/components/ModeNavigation/ModeNavigation.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/components/ModeNavigation/ModeNavigation.tsx
@@ -36,10 +36,11 @@ export function ModeNavigation({
 								<button
 									type="button"
 									onClick={() => onModeSelect(mode)}
-									className={`relative z-10 h-8 w-8 rounded-sm flex items-center justify-center transition-colors duration-150 ${isActive
-										? "text-neutral-100"
-										: "text-neutral-600 hover:text-neutral-500"
-										}`}
+									className={`relative z-10 h-8 w-8 rounded-sm flex items-center justify-center transition-colors duration-150 ${
+										isActive
+											? "text-neutral-100"
+											: "text-neutral-600 hover:text-neutral-500"
+									}`}
 								>
 									<Icon className="w-3.5 h-3.5" />
 								</button>
diff --git a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/components/ModeNavigation/index.ts b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/components/ModeNavigation/index.ts
index 2d7c7a6c88e..e9331e40a77 100644
--- a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/components/ModeNavigation/index.ts
+++ b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/components/ModeNavigation/index.ts
@@ -1,2 +1 @@
 export { ModeNavigation } from "./ModeNavigation";
-
diff --git a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/constants.ts b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/constants.ts
index 1e679896654..f047d29afeb 100644
--- a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/constants.ts
+++ b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/constants.ts
@@ -10,4 +10,3 @@ export const modeLabels: Record<SidebarMode, string> = {
 	tabs: "Tabs",
 	changes: "Changes",
 };
-
diff --git a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/hooks/useModeDetection.ts b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/hooks/useModeDetection.ts
index 4c65b268477..3303712c26f 100644
--- a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/hooks/useModeDetection.ts
+++ b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/hooks/useModeDetection.ts
@@ -36,11 +36,7 @@ export function useModeDetection({
 				// Calculate which mode we're closest to and snap to it
 				const finalIndex = Math.round(finalScrollLeft / finalContainerWidth);
 
-				if (
-					finalIndex >= 0 &&
-					finalIndex < modes.length &&
-					modes[finalIndex]
-				) {
+				if (finalIndex >= 0 && finalIndex < modes.length && modes[finalIndex]) {
 					// Snap to the nearest mode
 					const targetScrollX = finalIndex * finalContainerWidth;
 					if (Math.abs(finalScrollLeft - targetScrollX) > 5) {
@@ -68,4 +64,3 @@ export function useModeDetection({
 		};
 	}, [modes, currentMode, onModeSelect, scrollContainer, isDragging]);
 }
-
diff --git a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/hooks/useScrollProgress.ts b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/hooks/useScrollProgress.ts
index 42d211285c2..4009b7fbbb8 100644
--- a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/hooks/useScrollProgress.ts
+++ b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/hooks/useScrollProgress.ts
@@ -56,4 +56,3 @@ export function useScrollProgress({
 
 	return modeProgress;
 }
-
diff --git a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/hooks/useScrollSnap.ts b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/hooks/useScrollSnap.ts
index 9439dc24856..cce5414fcae 100644
--- a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/hooks/useScrollSnap.ts
+++ b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/hooks/useScrollSnap.ts
@@ -30,4 +30,3 @@ export function useScrollSnap({
 		isInitialMount.current = false;
 	}, [currentIndex, scrollContainer, isInitialMount]);
 }
-
diff --git a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/index.ts b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/index.ts
index de0e8d8c3dc..7167b4075d3 100644
--- a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/index.ts
+++ b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/index.ts
@@ -1,2 +1,2 @@
 export { ModeCarousel } from "./ModeCarousel";
-export type { SidebarMode, ModeCarouselProps } from "./types";
+export type { ModeCarouselProps, SidebarMode } from "./types";
diff --git a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/types.ts b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/types.ts
index d6529f2f5a6..8e3d62b39d5 100644
--- a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/types.ts
+++ b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeCarousel/types.ts
@@ -11,4 +11,3 @@ export interface ModeCarouselProps {
 	onScrollProgress: (progress: MotionValue<number>) => void;
 	isDragging?: boolean;
 }
-
diff --git a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeSwitcher/ModeSwitcher.tsx b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeSwitcher/ModeSwitcher.tsx
index 501d10fd93d..dc370c6491e 100644
--- a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeSwitcher/ModeSwitcher.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeSwitcher/ModeSwitcher.tsx
@@ -58,4 +58,3 @@ export function ModeSwitcher({
 		</div>
 	);
 }
-
diff --git a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeSwitcher/index.ts b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeSwitcher/index.ts
index 78e1204bc2f..cdf442a10ca 100644
--- a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeSwitcher/index.ts
+++ b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/ModeSwitcher/index.ts
@@ -1,2 +1 @@
 export { ModeSwitcher } from "./ModeSwitcher";
-
diff --git a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/WorktreeList/WorktreeList.tsx b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/WorktreeList/WorktreeList.tsx
index 357de06c08e..a462c6aa24c 100644
--- a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/WorktreeList/WorktreeList.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/WorktreeList/WorktreeList.tsx
@@ -28,7 +28,6 @@ export function WorktreeList({
 	selectedWorktreeId,
 	showWorkspaceHeader = false,
 }: WorktreeListProps) {
-
 	if (!currentWorkspace) {
 		return (
 			<div className="text-sm text-gray-500 px-3 py-2">No workspace open</div>
diff --git a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/WorktreeList/components/NewTabButton/index.ts b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/WorktreeList/components/NewTabButton/index.ts
index fb7efae0fc0..4dc254e12fd 100644
--- a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/WorktreeList/components/NewTabButton/index.ts
+++ b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/WorktreeList/components/NewTabButton/index.ts
@@ -1,2 +1 @@
 export { NewTabButton } from "./NewTabButton";
-
diff --git a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/WorktreeList/components/WorktreeItem/WorktreeItem.tsx b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/WorktreeList/components/WorktreeItem/WorktreeItem.tsx
index 27f6fe2704f..243dacb83a8 100644
--- a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/WorktreeList/components/WorktreeItem/WorktreeItem.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/WorktreeList/components/WorktreeItem/WorktreeItem.tsx
@@ -88,11 +88,15 @@ function buildMergeWarning(
 
 	if (canMergeResult.targetHasUncommittedChanges) {
 		const targetBranchText = targetBranch ? ` (${targetBranch})` : "";
-		warnings.push(`The target worktree${targetBranchText} has uncommitted changes.`);
+		warnings.push(
+			`The target worktree${targetBranchText} has uncommitted changes.`,
+		);
 	}
 
 	if (canMergeResult.sourceHasUncommittedChanges) {
-		warnings.push(`The source worktree (${sourceBranch}) has uncommitted changes.`);
+		warnings.push(
+			`The source worktree (${sourceBranch}) has uncommitted changes.`,
+		);
 	}
 
 	return warnings.length > 0
@@ -236,7 +240,6 @@ export function WorktreeItem({
 		};
 	};
 
-
 	// Helper: get all non-group tabs at the same level (for shift-click range selection)
 	const getTabsAtSameLevel = (
 		tabs: Tab[],
@@ -498,7 +501,6 @@ export function WorktreeItem({
 		loadWorktrees();
 	}, [workspaceId, worktree.id]);
 
-
 	// Calculate responsive height based on visible items
 	// Must be before early return to satisfy React hooks rules
 	const treeData = useMemo(() => convertTabsToTreeData(tabs), [tabs]);
@@ -521,7 +523,10 @@ export function WorktreeItem({
 
 		const visibleCount = countVisibleNodes(treeData);
 		const calculatedHeight = visibleCount * TREE_ROW_HEIGHT;
-		return Math.max(TREE_MIN_HEIGHT, Math.min(TREE_MAX_HEIGHT, calculatedHeight));
+		return Math.max(
+			TREE_MIN_HEIGHT,
+			Math.min(TREE_MAX_HEIGHT, calculatedHeight),
+		);
 	}, [treeData, expandedGroupTabs]);
 
 	// Only render tabs for the active worktree
@@ -579,7 +584,7 @@ export function WorktreeItem({
 			setErrorTitle("Failed to Remove Worktree");
 			setErrorMessage(
 				result.error ||
-				"An unknown error occurred while removing the worktree.",
+					"An unknown error occurred while removing the worktree.",
 			);
 			setShowErrorDialog(true);
 		}
@@ -689,7 +694,7 @@ export function WorktreeItem({
 			setErrorTitle("Failed to Check Settings");
 			setErrorMessage(
 				checkResult.error ||
-				"An unknown error occurred while checking settings.",
+					"An unknown error occurred while checking settings.",
 			);
 			setShowErrorDialog(true);
 			return;
@@ -993,10 +998,11 @@ export function WorktreeItem({
 									node.toggle();
 									handleTabSelect(worktree.id, tab.id, false);
 								}}
-								className={`group flex items-center gap-1.5 w-full h-7 px-2.5 text-xs rounded-md transition-all ${isSelected
-									? "bg-neutral-800/80 text-neutral-200"
-									: "hover:bg-neutral-800/40 text-neutral-400"
-									}`}
+								className={`group flex items-center gap-1.5 w-full h-7 px-2.5 text-xs rounded-md transition-all ${
+									isSelected
+										? "bg-neutral-800/80 text-neutral-200"
+										: "hover:bg-neutral-800/40 text-neutral-400"
+								}`}
 								style={{ paddingLeft: `${node.level * 12 + 10}px` }}
 							>
 								<ChevronRight
@@ -1095,8 +1101,7 @@ export function WorktreeItem({
 						const draggedTab = args.dragNodes[0]?.data.tab as Tab;
 						const targetParentTab = args.parentNode?.data.tab as Tab;
 						return (
-							draggedTab?.type === "group" &&
-							targetParentTab?.type === "group"
+							draggedTab?.type === "group" && targetParentTab?.type === "group"
 						);
 					}}
 				>
diff --git a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/WorktreeList/components/WorktreeItem/WorktreeItemArborist.tsx b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/WorktreeList/components/WorktreeItem/WorktreeItemArborist.tsx
index 6f359f5d066..9a3085b40de 100644
--- a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/WorktreeList/components/WorktreeItem/WorktreeItemArborist.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/WorktreeList/components/WorktreeItem/WorktreeItemArborist.tsx
@@ -1,6 +1,3 @@
-import { Tree } from "react-arborist";
-import type { NodeApi } from "react-arborist";
-import type { TreeApi } from "react-arborist";
 import { Button } from "@superset/ui/button";
 import {
 	ContextMenu,
@@ -8,16 +5,10 @@ import {
 	ContextMenuItem,
 	ContextMenuTrigger,
 } from "@superset/ui/context-menu";
-import {
-	ChevronRight,
-	Edit2,
-	FolderOpen,
-} from "lucide-react";
+import { ChevronRight, Edit2, FolderOpen } from "lucide-react";
 import { useEffect, useId, useRef, useState } from "react";
-import type { Tab, Worktree } from "shared/types";
-import { WorktreePortsList } from "../WorktreePortsList";
-import { GitStatusDialog } from "./components/GitStatusDialog";
-import { TabItem } from "./components/TabItem";
+import type { NodeApi, TreeApi } from "react-arborist";
+import { Tree } from "react-arborist";
 import {
 	Dialog,
 	DialogContent,
@@ -26,6 +17,10 @@ import {
 	DialogHeader,
 	DialogTitle,
 } from "renderer/components/ui/dialog";
+import type { Tab, Worktree } from "shared/types";
+import { WorktreePortsList } from "../WorktreePortsList";
+import { GitStatusDialog } from "./components/GitStatusDialog";
+import { TabItem } from "./components/TabItem";
 
 interface WorktreeItemProps {
 	worktree: Worktree;
@@ -40,9 +35,21 @@ interface WorktreeItemProps {
 }
 
 // Convert Tab[] to react-arborist format
-function convertTabsToTreeData(tabs: Tab[]): Array<{ id: string; name: string; tab: Tab; children?: Array<{ id: string; name: string; tab: Tab }> }> {
+function convertTabsToTreeData(
+	tabs: Tab[],
+): Array<{
+	id: string;
+	name: string;
+	tab: Tab;
+	children?: Array<{ id: string; name: string; tab: Tab }>;
+}> {
 	return tabs.map((tab) => {
-		const node: { id: string; name: string; tab: Tab; children?: Array<{ id: string; name: string; tab: Tab }> } = {
+		const node: {
+			id: string;
+			name: string;
+			tab: Tab;
+			children?: Array<{ id: string; name: string; tab: Tab }>;
+		} = {
 			id: tab.id,
 			name: tab.name,
 			tab,
@@ -147,9 +154,19 @@ export function WorktreeItem({
 	// Handle drag and drop (move)
 	const handleMove = async (args: {
 		dragIds: string[];
-		dragNodes: NodeApi<{ id: string; name: string; tab: Tab; children?: Array<{ id: string; name: string; tab: Tab }> }>[];
+		dragNodes: NodeApi<{
+			id: string;
+			name: string;
+			tab: Tab;
+			children?: Array<{ id: string; name: string; tab: Tab }>;
+		}>[];
 		parentId: string | null;
-		parentNode: NodeApi<{ id: string; name: string; tab: Tab; children?: Array<{ id: string; name: string; tab: Tab }> }> | null;
+		parentNode: NodeApi<{
+			id: string;
+			name: string;
+			tab: Tab;
+			children?: Array<{ id: string; name: string; tab: Tab }>;
+		}> | null;
 		index: number;
 	}) => {
 		if (args.dragNodes.length === 0) return;
@@ -161,8 +178,10 @@ export function WorktreeItem({
 
 		const draggedTabId = draggedTab.id;
 		const sourceParent = draggedNode.parent;
-		const sourceParentTabId = sourceParent?.data.tab?.type === "group" ? sourceParent.id : null;
-		const targetParentTabId = args.parentNode?.data.tab?.type === "group" ? args.parentNode.id : null;
+		const sourceParentTabId =
+			sourceParent?.data.tab?.type === "group" ? sourceParent.id : null;
+		const targetParentTabId =
+			args.parentNode?.data.tab?.type === "group" ? args.parentNode.id : null;
 
 		// Don't move if already in the same position
 		if (sourceParentTabId === targetParentTabId) {
@@ -326,9 +345,19 @@ export function WorktreeItem({
 
 	// Render node content
 	const renderNode = (props: {
-		node: NodeApi<{ id: string; name: string; tab: Tab; children?: Array<{ id: string; name: string; tab: Tab }> }>;
+		node: NodeApi<{
+			id: string;
+			name: string;
+			tab: Tab;
+			children?: Array<{ id: string; name: string; tab: Tab }>;
+		}>;
 		style: React.CSSProperties;
-		tree: TreeApi<{ id: string; name: string; tab: Tab; children?: Array<{ id: string; name: string; tab: Tab }> }>;
+		tree: TreeApi<{
+			id: string;
+			name: string;
+			tab: Tab;
+			children?: Array<{ id: string; name: string; tab: Tab }>;
+		}>;
 		dragHandle?: (el: HTMLDivElement | null) => void;
 		preview?: boolean;
 	}) => {
@@ -364,7 +393,9 @@ export function WorktreeItem({
 							</button>
 						</ContextMenuTrigger>
 						<ContextMenuContent>
-							<ContextMenuItem onClick={() => handleRenameGroup(tab.id, tab.name)}>
+							<ContextMenuItem
+								onClick={() => handleRenameGroup(tab.id, tab.name)}
+							>
 								<Edit2 size={14} className="mr-2" />
 								Rename
 							</ContextMenuItem>
@@ -385,7 +416,9 @@ export function WorktreeItem({
 					worktreeId={worktree.id}
 					worktree={worktree}
 					workspaceId={workspaceId}
-					parentTabId={node.parent?.data.tab?.type === "group" ? node.parent.id : undefined}
+					parentTabId={
+						node.parent?.data.tab?.type === "group" ? node.parent.id : undefined
+					}
 					selectedTabId={selectedTabId}
 					selectedTabIds={selectedTabIds}
 					onTabSelect={(wtId, tabId, shiftKey) => {
@@ -435,8 +468,11 @@ export function WorktreeItem({
 					openByDefault={false}
 					initialOpenState={Object.fromEntries(
 						treeData
-							.filter((item) => item.tab.type === "group" && expandedGroupTabs.has(item.id))
-							.map((item) => [item.id, true])
+							.filter(
+								(item) =>
+									item.tab.type === "group" && expandedGroupTabs.has(item.id),
+							)
+							.map((item) => [item.id, true]),
 					)}
 				>
 					{renderNode}
@@ -447,4 +483,3 @@ export function WorktreeItem({
 		</div>
 	);
 }
-
diff --git a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/WorktreeList/components/WorktreeItem/components/TabItem/TabItem.tsx b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/WorktreeList/components/WorktreeItem/components/TabItem/TabItem.tsx
index 72ff0e0209f..17ba209cc9d 100644
--- a/apps/desktop/src/renderer/screens/main/components/Sidebar/components/WorktreeList/components/WorktreeItem/components/TabItem/TabItem.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/Sidebar/components/WorktreeList/components/WorktreeItem/components/TabItem/TabItem.tsx
@@ -145,12 +145,13 @@ export function TabItem({
 			<ContextMenuTrigger asChild>
 				<button
 					type="button"
-					className={`group flex items-center gap-1.5 w-full h-7 px-2.5 text-xs rounded-md transition-all ${isSelected
+					className={`group flex items-center gap-1.5 w-full h-7 px-2.5 text-xs rounded-md transition-all ${
+						isSelected
 							? "bg-neutral-800/80 text-neutral-200"
 							: showMultiSelectHighlight
 								? "bg-blue-900/30 text-blue-200"
 								: "hover:bg-neutral-800/40 text-neutral-400 hover:text-neutral-300"
-						}`}
+					}`}
 					onMouseDown={handleMouseDown}
 					onClick={handleClick}
 					onDoubleClick={handleDoubleClick}
diff --git a/apps/desktop/src/renderer/screens/main/components/SidebarOverlay/SidebarOverlay.tsx b/apps/desktop/src/renderer/screens/main/components/SidebarOverlay/SidebarOverlay.tsx
index 7cf033ca3fa..714ac7c43a9 100644
--- a/apps/desktop/src/renderer/screens/main/components/SidebarOverlay/SidebarOverlay.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/SidebarOverlay/SidebarOverlay.tsx
@@ -11,7 +11,7 @@ export function SidebarOverlay({
 	onMouseLeave,
 }: SidebarOverlayProps) {
 	const { workspaces } = useWorkspaceContext();
-	
+
 	if (!isVisible || !workspaces) return null;
 
 	return (
@@ -25,4 +25,3 @@ export function SidebarOverlay({
 		</aside>
 	);
 }
-
diff --git a/apps/desktop/src/renderer/screens/main/components/SidebarOverlay/index.ts b/apps/desktop/src/renderer/screens/main/components/SidebarOverlay/index.ts
index f0fba5e2848..ad70832583e 100644
--- a/apps/desktop/src/renderer/screens/main/components/SidebarOverlay/index.ts
+++ b/apps/desktop/src/renderer/screens/main/components/SidebarOverlay/index.ts
@@ -1,2 +1 @@
 export { SidebarOverlay } from "./SidebarOverlay";
-
diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSelectionModal/WorkspaceSelectionModal.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSelectionModal/WorkspaceSelectionModal.tsx
index 393f20ff20e..883616e690a 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSelectionModal/WorkspaceSelectionModal.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSelectionModal/WorkspaceSelectionModal.tsx
@@ -29,7 +29,7 @@ export function WorkspaceSelectionModal({
 	const recentWorkspaces = workspaces.slice(0, 5);
 
 	return (
-		<Dialog open={isOpen} onOpenChange={() => { }}>
+		<Dialog open={isOpen} onOpenChange={() => {}}>
 			<DialogContent
 				className="max-w-[900px] max-h-[85vh] flex flex-col p-0 bg-[#1e1e1e] border-neutral-800"
 				showCloseButton={false}
@@ -38,7 +38,9 @@ export function WorkspaceSelectionModal({
 					{/* Header */}
 					<div className="flex items-center justify-between px-8 pt-8 pb-6 border-b border-neutral-800">
 						<div className="flex items-center gap-2">
-							<span className="text-lg font-semibold text-white">Select Workspace</span>
+							<span className="text-lg font-semibold text-white">
+								Select Workspace
+							</span>
 						</div>
 						<Button
 							variant="ghost"
diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSelectionModal/index.ts b/apps/desktop/src/renderer/screens/main/components/WorkspaceSelectionModal/index.ts
index b2c313152df..109b45496d4 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSelectionModal/index.ts
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSelectionModal/index.ts
@@ -1,2 +1 @@
 export { WorkspaceSelectionModal } from "./WorkspaceSelectionModal";
-
diff --git a/apps/desktop/src/renderer/screens/main/constants.ts b/apps/desktop/src/renderer/screens/main/constants.ts
index 86723034dd1..40cff3023d2 100644
--- a/apps/desktop/src/renderer/screens/main/constants.ts
+++ b/apps/desktop/src/renderer/screens/main/constants.ts
@@ -2,178 +2,177 @@ import type { UITask } from "./types";
 
 // Mock tasks data - TODO: Replace with actual task data from backend
 export const MOCK_TASKS: UITask[] = [
-    {
-        id: "1",
-        slug: "SSET-1",
-        name: "Homepage Redesign",
-        status: "working",
-        branch: "feature/homepage-redesign",
-        description: "Redesigning the homepage with new branding and improved UX",
-        assignee: "Alice",
-        assigneeAvatarUrl: "https://i.pravatar.cc/150?img=1",
-        lastUpdated: "2 hours ago",
-    },
-    {
-        id: "2",
-        slug: "SSET-2",
-        name: "API Integration",
-        status: "needs-feedback",
-        branch: "feature/api-integration",
-        description: "Integrate new REST API endpoints for user management",
-        assignee: "Bob",
-        assigneeAvatarUrl: "https://i.pravatar.cc/150?img=12",
-        lastUpdated: "1 day ago",
-    },
-    {
-        id: "3",
-        slug: "SSET-3",
-        name: "Bug Fixes",
-        status: "planning",
-        branch: "fix/various-bugs",
-        description: "Collection of bug fixes reported by users",
-        assignee: "Charlie",
-        assigneeAvatarUrl: "https://i.pravatar.cc/150?img=33",
-        lastUpdated: "3 days ago",
-    },
-    {
-        id: "4",
-        slug: "SSET-4",
-        name: "Performance Optimization",
-        status: "ready-to-merge",
-        branch: "perf/optimize-queries",
-        description: "Optimize database queries for faster page loads",
-        assignee: "Diana",
-        assigneeAvatarUrl: "https://i.pravatar.cc/150?img=9",
-        lastUpdated: "5 minutes ago",
-    },
-    {
-        id: "5",
-        slug: "SSET-5",
-        name: "User Authentication System",
-        status: "working",
-        branch: "feature/auth-system",
-        description:
-            "Implement OAuth2 and JWT-based authentication system with refresh tokens",
-        assignee: "Eve",
-        assigneeAvatarUrl: "https://i.pravatar.cc/150?img=5",
-        lastUpdated: "3 hours ago",
-    },
-    {
-        id: "6",
-        slug: "SSET-6",
-        name: "Dark Mode Support",
-        status: "planning",
-        branch: "feature/dark-mode",
-        description: "Add dark mode theme support across the entire application",
-        assignee: "Frank",
-        assigneeAvatarUrl: "https://i.pravatar.cc/150?img=13",
-        lastUpdated: "2 days ago",
-    },
-    {
-        id: "7",
-        slug: "SSET-7",
-        name: "Database Migration Scripts",
-        status: "ready-to-merge",
-        branch: "db/migration-scripts",
-        description:
-            "Create automated migration scripts for production database updates",
-        assignee: "Grace",
-        assigneeAvatarUrl: "https://i.pravatar.cc/150?img=20",
-        lastUpdated: "1 hour ago",
-    },
-    {
-        id: "8",
-        slug: "SSET-8",
-        name: "Email Notification Service",
-        status: "needs-feedback",
-        branch: "feature/email-notifications",
-        description:
-            "Build email notification service using SendGrid for transactional emails",
-        assignee: "Henry",
-        assigneeAvatarUrl: "https://i.pravatar.cc/150?img=8",
-        lastUpdated: "4 hours ago",
-    },
-    {
-        id: "9",
-        slug: "SSET-9",
-        name: "Mobile Responsive Design",
-        status: "working",
-        branch: "feature/mobile-responsive",
-        description:
-            "Make the application fully responsive for mobile and tablet devices",
-        assignee: "Iris",
-        assigneeAvatarUrl: "https://i.pravatar.cc/150?img=16",
-        lastUpdated: "6 hours ago",
-    },
-    {
-        id: "10",
-        slug: "SSET-10",
-        name: "Analytics Dashboard",
-        status: "planning",
-        branch: "feature/analytics-dashboard",
-        description:
-            "Create admin dashboard with charts and metrics for user analytics",
-        assignee: "Jack",
-        assigneeAvatarUrl: "https://i.pravatar.cc/150?img=11",
-        lastUpdated: "1 week ago",
-    },
-    {
-        id: "11",
-        slug: "SSET-11",
-        name: "CI/CD Pipeline",
-        status: "ready-to-merge",
-        branch: "devops/ci-cd-pipeline",
-        description:
-            "Set up automated CI/CD pipeline with GitHub Actions and Docker",
-        assignee: "Kate",
-        assigneeAvatarUrl: "https://i.pravatar.cc/150?img=25",
-        lastUpdated: "30 minutes ago",
-    },
-    {
-        id: "12",
-        slug: "SSET-12",
-        name: "Search Functionality",
-        status: "working",
-        branch: "feature/search",
-        description: "Implement full-text search with Elasticsearch integration",
-        assignee: "Liam",
-        assigneeAvatarUrl: "https://i.pravatar.cc/150?img=14",
-        lastUpdated: "5 hours ago",
-    },
-    {
-        id: "13",
-        slug: "SSET-13",
-        name: "File Upload System",
-        status: "needs-feedback",
-        branch: "feature/file-uploads",
-        description:
-            "Build secure file upload system with S3 storage and virus scanning",
-        assignee: "Mia",
-        assigneeAvatarUrl: "https://i.pravatar.cc/150?img=27",
-        lastUpdated: "2 hours ago",
-    },
-    {
-        id: "14",
-        slug: "SSET-14",
-        name: "API Rate Limiting",
-        status: "planning",
-        branch: "feature/rate-limiting",
-        description: "Implement rate limiting and throttling for API endpoints",
-        assignee: "Noah",
-        assigneeAvatarUrl: "https://i.pravatar.cc/150?img=17",
-        lastUpdated: "4 days ago",
-    },
-    {
-        id: "15",
-        slug: "SSET-15",
-        name: "Internationalization",
-        status: "working",
-        branch: "feature/i18n",
-        description:
-            "Add multi-language support with i18next for English, Spanish, and French",
-        assignee: "Olivia",
-        assigneeAvatarUrl: "https://i.pravatar.cc/150?img=32",
-        lastUpdated: "8 hours ago",
-    },
+	{
+		id: "1",
+		slug: "SSET-1",
+		name: "Homepage Redesign",
+		status: "working",
+		branch: "feature/homepage-redesign",
+		description: "Redesigning the homepage with new branding and improved UX",
+		assignee: "Alice",
+		assigneeAvatarUrl: "https://i.pravatar.cc/150?img=1",
+		lastUpdated: "2 hours ago",
+	},
+	{
+		id: "2",
+		slug: "SSET-2",
+		name: "API Integration",
+		status: "needs-feedback",
+		branch: "feature/api-integration",
+		description: "Integrate new REST API endpoints for user management",
+		assignee: "Bob",
+		assigneeAvatarUrl: "https://i.pravatar.cc/150?img=12",
+		lastUpdated: "1 day ago",
+	},
+	{
+		id: "3",
+		slug: "SSET-3",
+		name: "Bug Fixes",
+		status: "planning",
+		branch: "fix/various-bugs",
+		description: "Collection of bug fixes reported by users",
+		assignee: "Charlie",
+		assigneeAvatarUrl: "https://i.pravatar.cc/150?img=33",
+		lastUpdated: "3 days ago",
+	},
+	{
+		id: "4",
+		slug: "SSET-4",
+		name: "Performance Optimization",
+		status: "ready-to-merge",
+		branch: "perf/optimize-queries",
+		description: "Optimize database queries for faster page loads",
+		assignee: "Diana",
+		assigneeAvatarUrl: "https://i.pravatar.cc/150?img=9",
+		lastUpdated: "5 minutes ago",
+	},
+	{
+		id: "5",
+		slug: "SSET-5",
+		name: "User Authentication System",
+		status: "working",
+		branch: "feature/auth-system",
+		description:
+			"Implement OAuth2 and JWT-based authentication system with refresh tokens",
+		assignee: "Eve",
+		assigneeAvatarUrl: "https://i.pravatar.cc/150?img=5",
+		lastUpdated: "3 hours ago",
+	},
+	{
+		id: "6",
+		slug: "SSET-6",
+		name: "Dark Mode Support",
+		status: "planning",
+		branch: "feature/dark-mode",
+		description: "Add dark mode theme support across the entire application",
+		assignee: "Frank",
+		assigneeAvatarUrl: "https://i.pravatar.cc/150?img=13",
+		lastUpdated: "2 days ago",
+	},
+	{
+		id: "7",
+		slug: "SSET-7",
+		name: "Database Migration Scripts",
+		status: "ready-to-merge",
+		branch: "db/migration-scripts",
+		description:
+			"Create automated migration scripts for production database updates",
+		assignee: "Grace",
+		assigneeAvatarUrl: "https://i.pravatar.cc/150?img=20",
+		lastUpdated: "1 hour ago",
+	},
+	{
+		id: "8",
+		slug: "SSET-8",
+		name: "Email Notification Service",
+		status: "needs-feedback",
+		branch: "feature/email-notifications",
+		description:
+			"Build email notification service using SendGrid for transactional emails",
+		assignee: "Henry",
+		assigneeAvatarUrl: "https://i.pravatar.cc/150?img=8",
+		lastUpdated: "4 hours ago",
+	},
+	{
+		id: "9",
+		slug: "SSET-9",
+		name: "Mobile Responsive Design",
+		status: "working",
+		branch: "feature/mobile-responsive",
+		description:
+			"Make the application fully responsive for mobile and tablet devices",
+		assignee: "Iris",
+		assigneeAvatarUrl: "https://i.pravatar.cc/150?img=16",
+		lastUpdated: "6 hours ago",
+	},
+	{
+		id: "10",
+		slug: "SSET-10",
+		name: "Analytics Dashboard",
+		status: "planning",
+		branch: "feature/analytics-dashboard",
+		description:
+			"Create admin dashboard with charts and metrics for user analytics",
+		assignee: "Jack",
+		assigneeAvatarUrl: "https://i.pravatar.cc/150?img=11",
+		lastUpdated: "1 week ago",
+	},
+	{
+		id: "11",
+		slug: "SSET-11",
+		name: "CI/CD Pipeline",
+		status: "ready-to-merge",
+		branch: "devops/ci-cd-pipeline",
+		description:
+			"Set up automated CI/CD pipeline with GitHub Actions and Docker",
+		assignee: "Kate",
+		assigneeAvatarUrl: "https://i.pravatar.cc/150?img=25",
+		lastUpdated: "30 minutes ago",
+	},
+	{
+		id: "12",
+		slug: "SSET-12",
+		name: "Search Functionality",
+		status: "working",
+		branch: "feature/search",
+		description: "Implement full-text search with Elasticsearch integration",
+		assignee: "Liam",
+		assigneeAvatarUrl: "https://i.pravatar.cc/150?img=14",
+		lastUpdated: "5 hours ago",
+	},
+	{
+		id: "13",
+		slug: "SSET-13",
+		name: "File Upload System",
+		status: "needs-feedback",
+		branch: "feature/file-uploads",
+		description:
+			"Build secure file upload system with S3 storage and virus scanning",
+		assignee: "Mia",
+		assigneeAvatarUrl: "https://i.pravatar.cc/150?img=27",
+		lastUpdated: "2 hours ago",
+	},
+	{
+		id: "14",
+		slug: "SSET-14",
+		name: "API Rate Limiting",
+		status: "planning",
+		branch: "feature/rate-limiting",
+		description: "Implement rate limiting and throttling for API endpoints",
+		assignee: "Noah",
+		assigneeAvatarUrl: "https://i.pravatar.cc/150?img=17",
+		lastUpdated: "4 days ago",
+	},
+	{
+		id: "15",
+		slug: "SSET-15",
+		name: "Internationalization",
+		status: "working",
+		branch: "feature/i18n",
+		description:
+			"Add multi-language support with i18next for English, Spanish, and French",
+		assignee: "Olivia",
+		assigneeAvatarUrl: "https://i.pravatar.cc/150?img=32",
+		lastUpdated: "8 hours ago",
+	},
 ];
-
diff --git a/apps/desktop/src/renderer/screens/main/hooks/useDiffData.ts b/apps/desktop/src/renderer/screens/main/hooks/useDiffData.ts
index b87173c2266..0073e3cfc62 100644
--- a/apps/desktop/src/renderer/screens/main/hooks/useDiffData.ts
+++ b/apps/desktop/src/renderer/screens/main/hooks/useDiffData.ts
@@ -106,7 +106,10 @@ export function useDiffData({
 			if (!diffData || !workspaceId || !worktreeId) return;
 
 			// Check if already loaded or loading using refs
-			if (loadedFilesRef.current.has(fileId) || loadingFilesRef.current.has(fileId)) {
+			if (
+				loadedFilesRef.current.has(fileId) ||
+				loadingFilesRef.current.has(fileId)
+			) {
 				return;
 			}
 
@@ -147,9 +150,7 @@ export function useDiffData({
 						return {
 							...prev,
 							files: prev.files.map((f) =>
-								f.id === fileId
-									? { ...f, changes: result.changes || [] }
-									: f,
+								f.id === fileId ? { ...f, changes: result.changes || [] } : f,
 							),
 						};
 					});
@@ -196,4 +197,3 @@ export function useDiffData({
 		loadingFiles,
 	};
 }
-
diff --git a/apps/desktop/src/renderer/screens/main/hooks/useSidebar.ts b/apps/desktop/src/renderer/screens/main/hooks/useSidebar.ts
index 65c5355d4d0..1a71fc2939a 100644
--- a/apps/desktop/src/renderer/screens/main/hooks/useSidebar.ts
+++ b/apps/desktop/src/renderer/screens/main/hooks/useSidebar.ts
@@ -37,4 +37,3 @@ export function useSidebar() {
 		handleSidebarCollapse,
 	};
 }
-
diff --git a/apps/desktop/src/renderer/screens/main/hooks/useTabs.ts b/apps/desktop/src/renderer/screens/main/hooks/useTabs.ts
index bd689e5a661..da0dec8491f 100644
--- a/apps/desktop/src/renderer/screens/main/hooks/useTabs.ts
+++ b/apps/desktop/src/renderer/screens/main/hooks/useTabs.ts
@@ -19,7 +19,6 @@ export function useTabs({
 	selectedTabId,
 	setSelectedTabId,
 }: UseTabsProps) {
-
 	// Get selected worktree
 	const selectedWorktree = currentWorkspace?.worktrees?.find(
 		(wt) => wt.id === selectedWorktreeId,
@@ -121,4 +120,3 @@ export function useTabs({
 		handleTabFocus,
 	};
 }
-
diff --git a/apps/desktop/src/renderer/screens/main/hooks/useTasks.ts b/apps/desktop/src/renderer/screens/main/hooks/useTasks.ts
index ee746626303..223d9ca34d4 100644
--- a/apps/desktop/src/renderer/screens/main/hooks/useTasks.ts
+++ b/apps/desktop/src/renderer/screens/main/hooks/useTasks.ts
@@ -1,8 +1,8 @@
 import { useEffect, useRef, useState } from "react";
 import type { Worktree } from "shared/types";
-import type { TaskStatus } from "../components/Layout/StatusIndicator";
-import type { UITask, PendingWorktree } from "../types";
 import { transformWorktreeToTask } from "../components/Layout/AddTaskModal/utils";
+import type { TaskStatus } from "../components/Layout/StatusIndicator";
+import type { PendingWorktree, UITask } from "../types";
 
 interface UseTasksProps {
 	currentWorkspace: {
@@ -11,7 +11,10 @@ interface UseTasksProps {
 	} | null;
 	setSelectedWorktreeId: (id: string | null) => void;
 	handleTabSelect: (worktreeId: string, tabId: string) => void;
-	handleWorktreeCreated: () => Promise<{ id: string; worktrees?: Worktree[] } | null>;
+	handleWorktreeCreated: () => Promise<{
+		id: string;
+		worktrees?: Worktree[];
+	} | null>;
 }
 
 export function useTasks({
@@ -21,7 +24,9 @@ export function useTasks({
 	handleWorktreeCreated,
 }: UseTasksProps) {
 	const [isAddTaskModalOpen, setIsAddTaskModalOpen] = useState(false);
-	const [addTaskModalInitialMode, setAddTaskModalInitialMode] = useState<"list" | "new">("list");
+	const [addTaskModalInitialMode, setAddTaskModalInitialMode] = useState<
+		"list" | "new"
+	>("list");
 	const [branches, setBranches] = useState<string[]>([]);
 	const [isCreatingWorktree, setIsCreatingWorktree] = useState(false);
 	const [setupStatus, setSetupStatus] = useState<string | undefined>(undefined);
@@ -29,7 +34,9 @@ export function useTasks({
 	const [pendingWorktrees, setPendingWorktrees] = useState<PendingWorktree[]>(
 		[],
 	);
-	const progressHandlerRef = useRef<((data: { status: string; output: string }) => void) | null>(null);
+	const progressHandlerRef = useRef<
+		((data: { status: string; output: string }) => void) | null
+	>(null);
 	const isHandlingProgressRef = useRef(false);
 	const cleanupTimeoutRef = useRef<NodeJS.Timeout | null>(null);
 
@@ -41,7 +48,10 @@ export function useTasks({
 				cleanupTimeoutRef.current = null;
 			}
 			if (progressHandlerRef.current) {
-				window.ipcRenderer.off("worktree-setup-progress", progressHandlerRef.current);
+				window.ipcRenderer.off(
+					"worktree-setup-progress",
+					progressHandlerRef.current,
+				);
 				progressHandlerRef.current = null;
 			}
 			isHandlingProgressRef.current = false;
@@ -56,7 +66,7 @@ export function useTasks({
 	const handleOpenAddTaskModal = (mode: "list" | "new" = "list") => {
 		setAddTaskModalInitialMode(mode);
 		setIsAddTaskModalOpen(true);
-		
+
 		// Fetch branches when opening in new mode
 		if (mode === "new" && currentWorkspace) {
 			void (async () => {
@@ -121,7 +131,10 @@ export function useTasks({
 
 		// Clean up any existing listener first
 		if (progressHandlerRef.current) {
-			window.ipcRenderer.off("worktree-setup-progress", progressHandlerRef.current);
+			window.ipcRenderer.off(
+				"worktree-setup-progress",
+				progressHandlerRef.current,
+			);
 		}
 
 		isHandlingProgressRef.current = true;
@@ -130,7 +143,7 @@ export function useTasks({
 		const progressHandler = (data: { status: string; output: string }) => {
 			// Ignore events if we're no longer handling progress
 			if (!isHandlingProgressRef.current) return;
-			
+
 			if (data && data.status !== undefined && data.output !== undefined) {
 				setSetupStatus(data.status);
 				setSetupOutput(data.output);
@@ -216,16 +229,19 @@ export function useTasks({
 		} finally {
 			// Stop handling progress events
 			isHandlingProgressRef.current = false;
-			
+
 			// Clear any existing cleanup timeout
 			if (cleanupTimeoutRef.current) {
 				clearTimeout(cleanupTimeoutRef.current);
 			}
-			
+
 			// Wait a bit to ensure any queued events are processed, then remove listener
 			cleanupTimeoutRef.current = setTimeout(() => {
 				if (progressHandlerRef.current) {
-					window.ipcRenderer.off("worktree-setup-progress", progressHandlerRef.current);
+					window.ipcRenderer.off(
+						"worktree-setup-progress",
+						progressHandlerRef.current,
+					);
 					progressHandlerRef.current = null;
 				}
 				cleanupTimeoutRef.current = null;
@@ -249,4 +265,3 @@ export function useTasks({
 		handleClearStatus,
 	};
 }
-
diff --git a/apps/desktop/src/renderer/screens/main/hooks/useWorkspace.ts b/apps/desktop/src/renderer/screens/main/hooks/useWorkspace.ts
index 26baa525db4..6a902a5c795 100644
--- a/apps/desktop/src/renderer/screens/main/hooks/useWorkspace.ts
+++ b/apps/desktop/src/renderer/screens/main/hooks/useWorkspace.ts
@@ -92,9 +92,8 @@ export function useWorkspace({
 				setWorkspaces(allWorkspaces);
 
 				// Check if this window was restored from a previous session
-				const isRestored = await window.ipcRenderer.invoke(
-					"window-is-restored",
-				);
+				const isRestored =
+					await window.ipcRenderer.invoke("window-is-restored");
 
 				// Check for window-specific workspace first
 				const workspaceId = await window.ipcRenderer.invoke(
@@ -198,4 +197,3 @@ export function useWorkspace({
 		handleCreateWorkspaceFromModal,
 	};
 }
-
diff --git a/apps/desktop/src/renderer/screens/main/hooks/useWorktrees.ts b/apps/desktop/src/renderer/screens/main/hooks/useWorktrees.ts
index 4bd39c7d704..f0ff8cc6bf7 100644
--- a/apps/desktop/src/renderer/screens/main/hooks/useWorktrees.ts
+++ b/apps/desktop/src/renderer/screens/main/hooks/useWorktrees.ts
@@ -45,7 +45,9 @@ export function useWorktrees({
 					// Create a new object with new array references to ensure React detects the change
 					return {
 						...refreshedWorkspace,
-						worktrees: refreshedWorkspace.worktrees ? [...refreshedWorkspace.worktrees] : [],
+						worktrees: refreshedWorkspace.worktrees
+							? [...refreshedWorkspace.worktrees]
+							: [],
 					};
 				});
 
@@ -183,7 +185,10 @@ export function useWorktrees({
 
 					// If we deleted the selected worktree, select the first available one
 					if (selectedWorktreeId === worktreeId) {
-						if (refreshedWorkspace.worktrees && refreshedWorkspace.worktrees.length > 0) {
+						if (
+							refreshedWorkspace.worktrees &&
+							refreshedWorkspace.worktrees.length > 0
+						) {
 							const firstWorktree = refreshedWorkspace.worktrees[0];
 							setSelectedWorktreeId(firstWorktree.id);
 							if (firstWorktree.tabs && firstWorktree.tabs.length > 0) {
@@ -221,4 +226,3 @@ export function useWorktrees({
 		handleDeleteWorktree,
 	};
 }
-
diff --git a/apps/desktop/src/renderer/screens/main/types.ts b/apps/desktop/src/renderer/screens/main/types.ts
index 271cce98c38..faf5f303172 100644
--- a/apps/desktop/src/renderer/screens/main/types.ts
+++ b/apps/desktop/src/renderer/screens/main/types.ts
@@ -2,30 +2,29 @@ import type { TaskStatus } from "./components/Layout/StatusIndicator";
 
 // Type alias for task data used in UI
 export type UITask = {
-    id: string;
-    slug: string;
-    name: string;
-    status: TaskStatus;
-    branch: string;
-    description: string;
-    assignee: string;
-    assigneeAvatarUrl: string;
-    lastUpdated: string;
+	id: string;
+	slug: string;
+	name: string;
+	status: TaskStatus;
+	branch: string;
+	description: string;
+	assignee: string;
+	assigneeAvatarUrl: string;
+	lastUpdated: string;
 };
 
 // Type for pending worktrees (optimistic updates)
 export type PendingWorktree = {
-    id: string;
-    isPending: true;
-    title: string;
-    branch: string;
-    description?: string;
-    taskData?: {
-        slug: string;
-        name: string;
-        status: TaskStatus;
-    };
+	id: string;
+	isPending: true;
+	title: string;
+	branch: string;
+	description?: string;
+	taskData?: {
+		slug: string;
+		name: string;
+		status: TaskStatus;
+	};
 };
 
 export type AppMode = "plan" | "edit";
-
diff --git a/apps/desktop/src/renderer/screens/main/utils.ts b/apps/desktop/src/renderer/screens/main/utils.ts
index 908425ff56e..9153d74eacf 100644
--- a/apps/desktop/src/renderer/screens/main/utils.ts
+++ b/apps/desktop/src/renderer/screens/main/utils.ts
@@ -1,30 +1,30 @@
 import type { Tab, Worktree } from "shared/types";
+import { formatRelativeTime } from "./components/Layout/AddTaskModal/utils";
 import type { TaskStatus } from "./components/Layout/StatusIndicator";
 import type { WorktreeWithTask } from "./components/Layout/TaskTabs";
 import type { PendingWorktree } from "./types";
-import { formatRelativeTime } from "./components/Layout/AddTaskModal/utils";
 
 // Helper function to find a tab recursively (for finding sub-tabs inside groups)
 export function findTabRecursive(
-    tabs: Tab[] | undefined,
-    tabId: string,
+	tabs: Tab[] | undefined,
+	tabId: string,
 ): { tab: Tab; parent?: Tab } | null {
-    if (!tabs) return null;
+	if (!tabs) return null;
 
-    for (const tab of tabs) {
-        if (tab.id === tabId) {
-            return { tab };
-        }
-        // Check if this tab is a group tab with children
-        if (tab.type === "group" && tab.tabs) {
-            for (const childTab of tab.tabs) {
-                if (childTab.id === tabId) {
-                    return { tab: childTab, parent: tab };
-                }
-            }
-        }
-    }
-    return null;
+	for (const tab of tabs) {
+		if (tab.id === tabId) {
+			return { tab };
+		}
+		// Check if this tab is a group tab with children
+		if (tab.type === "group" && tab.tabs) {
+			for (const childTab of tab.tabs) {
+				if (childTab.id === tabId) {
+					return { tab: childTab, parent: tab };
+				}
+			}
+		}
+	}
+	return null;
 }
 
 /**
@@ -56,50 +56,50 @@ function generateSlugFromBranch(branch: string): string {
 
 // Helper function to enrich worktrees with task metadata
 export function enrichWorktreesWithTasks(
-    worktrees: Worktree[],
-    pendingWorktrees: PendingWorktree[],
+	worktrees: Worktree[],
+	pendingWorktrees: PendingWorktree[],
 ): WorktreeWithTask[] {
-    // First, convert pending worktrees to WorktreeWithTask format
-    const pendingAsWorktrees: WorktreeWithTask[] = pendingWorktrees.map(
-        (pending) => ({
-            id: pending.id,
-            branch: pending.branch,
-            path: "", // Pending worktrees don't have a path yet
-            tabs: [],
-            createdAt: new Date().toISOString(),
-            isPending: true, // Mark as pending for UI
-            task: pending.taskData
-                ? {
-                    id: pending.id,
-                    slug: pending.taskData.slug,
-                    title: pending.taskData.name,
-                    status: pending.taskData.status,
-                    description: pending.description || "",
-                }
-                : undefined,
-        }),
-    );
+	// First, convert pending worktrees to WorktreeWithTask format
+	const pendingAsWorktrees: WorktreeWithTask[] = pendingWorktrees.map(
+		(pending) => ({
+			id: pending.id,
+			branch: pending.branch,
+			path: "", // Pending worktrees don't have a path yet
+			tabs: [],
+			createdAt: new Date().toISOString(),
+			isPending: true, // Mark as pending for UI
+			task: pending.taskData
+				? {
+						id: pending.id,
+						slug: pending.taskData.slug,
+						title: pending.taskData.name,
+						status: pending.taskData.status,
+						description: pending.description || "",
+					}
+				: undefined,
+		}),
+	);
 
-    // Then, enrich real worktrees with task metadata derived from worktree data
-    const enrichedWorktrees: WorktreeWithTask[] = worktrees.map((worktree) => {
-        // Generate task metadata from worktree data
-        const slug = generateSlugFromBranch(worktree.branch);
-        const status = getTaskStatusFromWorktree(worktree);
-        const title = worktree.description || worktree.branch;
+	// Then, enrich real worktrees with task metadata derived from worktree data
+	const enrichedWorktrees: WorktreeWithTask[] = worktrees.map((worktree) => {
+		// Generate task metadata from worktree data
+		const slug = generateSlugFromBranch(worktree.branch);
+		const status = getTaskStatusFromWorktree(worktree);
+		const title = worktree.description || worktree.branch;
 
-        return {
-            ...worktree,
-            task: {
-                id: worktree.id,
-                slug: slug || worktree.id,
-                title,
-                status,
-                description: worktree.description || "",
-                lastUpdated: formatRelativeTime(new Date(worktree.createdAt)),
-            },
-        };
-    });
+		return {
+			...worktree,
+			task: {
+				id: worktree.id,
+				slug: slug || worktree.id,
+				title,
+				status,
+				description: worktree.description || "",
+				lastUpdated: formatRelativeTime(new Date(worktree.createdAt)),
+			},
+		};
+	});
 
-    // Merge pending and real worktrees
-    return [...pendingAsWorktrees, ...enrichedWorktrees];
+	// Merge pending and real worktrees
+	return [...pendingAsWorktrees, ...enrichedWorktrees];
 }
diff --git a/apps/desktop/src/shared/ipc-channels.ts b/apps/desktop/src/shared/ipc-channels.ts
index ce6ea4661a5..f64a122ccf1 100644
--- a/apps/desktop/src/shared/ipc-channels.ts
+++ b/apps/desktop/src/shared/ipc-channels.ts
@@ -3,4 +3,3 @@
  * This maintains backward compatibility with existing imports
  */
 export * from "./ipc-channels/index";
-
diff --git a/apps/desktop/src/shared/ipc-channels/deep-link.ts b/apps/desktop/src/shared/ipc-channels/deep-link.ts
index 5fae8cb605f..b03e0c23116 100644
--- a/apps/desktop/src/shared/ipc-channels/deep-link.ts
+++ b/apps/desktop/src/shared/ipc-channels/deep-link.ts
@@ -10,4 +10,3 @@ export interface DeepLinkChannels {
 		response: string | null;
 	};
 }
-
diff --git a/apps/desktop/src/shared/ipc-channels/external.ts b/apps/desktop/src/shared/ipc-channels/external.ts
index b49ad5551ff..1118a74e851 100644
--- a/apps/desktop/src/shared/ipc-channels/external.ts
+++ b/apps/desktop/src/shared/ipc-channels/external.ts
@@ -15,4 +15,3 @@ export interface ExternalChannels {
 		response: SuccessResponse;
 	};
 }
-
diff --git a/apps/desktop/src/shared/ipc-channels/index.ts b/apps/desktop/src/shared/ipc-channels/index.ts
index 905df5c1233..29af2dc2c68 100644
--- a/apps/desktop/src/shared/ipc-channels/index.ts
+++ b/apps/desktop/src/shared/ipc-channels/index.ts
@@ -11,8 +11,8 @@ import type { ProxyChannels } from "./proxy";
 import type { TabChannels } from "./tab";
 import type { TerminalChannels } from "./terminal";
 import type { WindowChannels } from "./window";
-import type { WorktreeChannels } from "./worktree";
 import type { WorkspaceChannels } from "./workspace";
+import type { WorktreeChannels } from "./worktree";
 
 // Re-export shared types
 export type {
@@ -68,4 +68,3 @@ export function isValidChannel(channel: string): channel is IpcChannelName {
 export function getAllChannelNames(): IpcChannelName[] {
 	return Object.keys({} as IpcChannels) as IpcChannelName[];
 }
-
diff --git a/apps/desktop/src/shared/ipc-channels/proxy.ts b/apps/desktop/src/shared/ipc-channels/proxy.ts
index 210a14cc51f..cbb5e6356cb 100644
--- a/apps/desktop/src/shared/ipc-channels/proxy.ts
+++ b/apps/desktop/src/shared/ipc-channels/proxy.ts
@@ -15,4 +15,3 @@ export interface ProxyChannels {
 		}>;
 	};
 }
-
diff --git a/apps/desktop/src/shared/ipc-channels/tab.ts b/apps/desktop/src/shared/ipc-channels/tab.ts
index 123198b347e..7b90b4338b2 100644
--- a/apps/desktop/src/shared/ipc-channels/tab.ts
+++ b/apps/desktop/src/shared/ipc-channels/tab.ts
@@ -2,7 +2,12 @@
  * Tab-related IPC channels
  */
 
-import type { CreateTabInput, MosaicNode, Tab, UpdatePreviewTabInput } from "../types";
+import type {
+	CreateTabInput,
+	MosaicNode,
+	Tab,
+	UpdatePreviewTabInput,
+} from "../types";
 import type { IpcResponse } from "./types";
 
 export interface TabChannels {
@@ -67,4 +72,3 @@ export interface TabChannels {
 		response: IpcResponse;
 	};
 }
-
diff --git a/apps/desktop/src/shared/ipc-channels/terminal.ts b/apps/desktop/src/shared/ipc-channels/terminal.ts
index d9de741fc4b..ead25f002c1 100644
--- a/apps/desktop/src/shared/ipc-channels/terminal.ts
+++ b/apps/desktop/src/shared/ipc-channels/terminal.ts
@@ -40,4 +40,3 @@ export interface TerminalChannels {
 		response: NoResponse;
 	};
 }
-
diff --git a/apps/desktop/src/shared/ipc-channels/types.ts b/apps/desktop/src/shared/ipc-channels/types.ts
index fefb420203b..ca799211723 100644
--- a/apps/desktop/src/shared/ipc-channels/types.ts
+++ b/apps/desktop/src/shared/ipc-channels/types.ts
@@ -25,4 +25,3 @@ export type NoResponse = void;
  * Helper type for simple success/error responses
  */
 export type SuccessResponse = { success: boolean; error?: string };
-
diff --git a/apps/desktop/src/shared/ipc-channels/window.ts b/apps/desktop/src/shared/ipc-channels/window.ts
index a386207bffc..d8050b2af63 100644
--- a/apps/desktop/src/shared/ipc-channels/window.ts
+++ b/apps/desktop/src/shared/ipc-channels/window.ts
@@ -15,4 +15,3 @@ export interface WindowChannels {
 		response: boolean;
 	};
 }
-
diff --git a/apps/desktop/src/shared/ipc-channels/workspace.ts b/apps/desktop/src/shared/ipc-channels/workspace.ts
index 4d7f68a1c15..777d0d5d9f3 100644
--- a/apps/desktop/src/shared/ipc-channels/workspace.ts
+++ b/apps/desktop/src/shared/ipc-channels/workspace.ts
@@ -111,4 +111,3 @@ export interface WorkspaceChannels {
 		response: boolean;
 	};
 }
-
diff --git a/apps/desktop/src/shared/ipc-channels/worktree.ts b/apps/desktop/src/shared/ipc-channels/worktree.ts
index 58c09838e1a..bf4f1a991bd 100644
--- a/apps/desktop/src/shared/ipc-channels/worktree.ts
+++ b/apps/desktop/src/shared/ipc-channels/worktree.ts
@@ -182,4 +182,3 @@ export interface WorktreeChannels {
 		response: SuccessResponse;
 	};
 }
-
diff --git a/apps/website/src/app/components/HeroSection/HeroSection.tsx b/apps/website/src/app/components/HeroSection/HeroSection.tsx
index 154aaa61055..1e0ef36f5c0 100644
--- a/apps/website/src/app/components/HeroSection/HeroSection.tsx
+++ b/apps/website/src/app/components/HeroSection/HeroSection.tsx
@@ -1,6 +1,6 @@
 import { FadeUp } from "./components/FadeUp";
-import { HeroParallax } from "./components/HeroParallax";
 import { HeroCanvas } from "./components/HeroCanvas";
+import { HeroParallax } from "./components/HeroParallax";
 
 export function HeroSection() {
 	return (
diff --git a/apps/website/src/app/components/HeroSection/components/HeroCanvas/components/LitBackground/LitBackground.tsx b/apps/website/src/app/components/HeroSection/components/HeroCanvas/components/LitBackground/LitBackground.tsx
index 56ae09a210f..8c64aafc683 100644
--- a/apps/website/src/app/components/HeroSection/components/HeroCanvas/components/LitBackground/LitBackground.tsx
+++ b/apps/website/src/app/components/HeroSection/components/HeroCanvas/components/LitBackground/LitBackground.tsx
@@ -6,15 +6,15 @@ import { useEffect, useMemo, useRef, useState } from "react";
 import type { Mesh, PointLight } from "three";
 import * as THREE from "three";
 import { useHeroVisibility } from "../../../HeroParallax";
-import { waveVertexShader } from "../../shaders/vertex";
-import { waveFragmentShader } from "../../shaders/fragment";
 import {
+	GEOMETRY_CONFIG,
 	LIGHT_CONFIG,
 	MATERIAL_CONFIG,
 	TEXT_CONFIG,
-	GEOMETRY_CONFIG,
 } from "../../config";
 import { calculateGlareProperties } from "../../helpers";
+import { waveFragmentShader } from "../../shaders/fragment";
+import { waveVertexShader } from "../../shaders/vertex";
 
 export function LitBackground() {
 	const meshRef = useRef<Mesh>(null);
diff --git a/apps/website/src/app/page.tsx b/apps/website/src/app/page.tsx
index a113662ae77..5020aa292a3 100644
--- a/apps/website/src/app/page.tsx
+++ b/apps/website/src/app/page.tsx
@@ -1,13 +1,13 @@
 "use client";
 
 import { useState } from "react";
+import { ClientLogosSection } from "./components/ClientLogosSection";
+import { FeaturesSection } from "./components/FeaturesSection";
 import { Footer } from "./components/Footer";
 import { Header } from "./components/Header";
-import { WaitlistModal } from "./components/WaitlistModal";
 import { HeroSection } from "./components/HeroSection";
-import { ClientLogosSection } from "./components/ClientLogosSection";
-import { FeaturesSection } from "./components/FeaturesSection";
 import { TestimonialsSection } from "./components/TestimonialsSection";
+import { WaitlistModal } from "./components/WaitlistModal";
 
 export default function Home() {
 	const [isWaitlistOpen, setIsWaitlistOpen] = useState(false);
diff --git a/packages/ui/src/components/dropdown-menu.tsx b/packages/ui/src/components/dropdown-menu.tsx
index 9a1ea6a2752..b5f22c73e0d 100644
--- a/packages/ui/src/components/dropdown-menu.tsx
+++ b/packages/ui/src/components/dropdown-menu.tsx
@@ -5,256 +5,256 @@ import type * as React from "react";
 import { cn } from "../lib/utils";
 
 function DropdownMenu({
-  modal = false,
-  ...props
+	modal = false,
+	...props
 }: React.ComponentProps<typeof DropdownMenuPrimitive.Root>) {
-  return (
-    <DropdownMenuPrimitive.Root
-      data-slot="dropdown-menu"
-      modal={modal}
-      {...props}
-    />
-  );
+	return (
+		<DropdownMenuPrimitive.Root
+			data-slot="dropdown-menu"
+			modal={modal}
+			{...props}
+		/>
+	);
 }
 
 function DropdownMenuPortal({
-  ...props
+	...props
 }: React.ComponentProps<typeof DropdownMenuPrimitive.Portal>) {
-  return (
-    <DropdownMenuPrimitive.Portal data-slot="dropdown-menu-portal" {...props} />
-  );
+	return (
+		<DropdownMenuPrimitive.Portal data-slot="dropdown-menu-portal" {...props} />
+	);
 }
 
 function DropdownMenuTrigger({
-  ...props
+	...props
 }: React.ComponentProps<typeof DropdownMenuPrimitive.Trigger>) {
-  return (
-    <DropdownMenuPrimitive.Trigger
-      data-slot="dropdown-menu-trigger"
-      {...props}
-    />
-  );
+	return (
+		<DropdownMenuPrimitive.Trigger
+			data-slot="dropdown-menu-trigger"
+			{...props}
+		/>
+	);
 }
 
 function DropdownMenuContent({
-  className,
-  sideOffset = 4,
-  ...props
+	className,
+	sideOffset = 4,
+	...props
 }: React.ComponentProps<typeof DropdownMenuPrimitive.Content>) {
-  return (
-    <DropdownMenuPrimitive.Content
-      data-slot="dropdown-menu-content"
-      sideOffset={sideOffset}
-      className={cn(
-        "bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-[9999] max-h-(--radix-dropdown-menu-content-available-height) min-w-[8rem] origin-(--radix-dropdown-menu-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-md border p-1 shadow-md",
-        className,
-      )}
-      {...props}
-    />
-  );
+	return (
+		<DropdownMenuPrimitive.Content
+			data-slot="dropdown-menu-content"
+			sideOffset={sideOffset}
+			className={cn(
+				"bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-[9999] max-h-(--radix-dropdown-menu-content-available-height) min-w-[8rem] origin-(--radix-dropdown-menu-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-md border p-1 shadow-md",
+				className,
+			)}
+			{...props}
+		/>
+	);
 }
 
 function DropdownMenuGroup({
-  ...props
+	...props
 }: React.ComponentProps<typeof DropdownMenuPrimitive.Group>) {
-  return (
-    <DropdownMenuPrimitive.Group data-slot="dropdown-menu-group" {...props} />
-  );
+	return (
+		<DropdownMenuPrimitive.Group data-slot="dropdown-menu-group" {...props} />
+	);
 }
 
 function DropdownMenuItem({
-  className,
-  inset,
-  variant = "default",
-  ...props
+	className,
+	inset,
+	variant = "default",
+	...props
 }: React.ComponentProps<typeof DropdownMenuPrimitive.Item> & {
-  inset?: boolean;
-  variant?: "default" | "destructive";
+	inset?: boolean;
+	variant?: "default" | "destructive";
 }) {
-  return (
-    <DropdownMenuPrimitive.Item
-      data-slot="dropdown-menu-item"
-      data-inset={inset}
-      data-variant={variant}
-      className={cn(
-        "focus:bg-accent focus:text-accent-foreground data-[variant=destructive]:text-destructive data-[variant=destructive]:focus:bg-destructive/10 dark:data-[variant=destructive]:focus:bg-destructive/20 data-[variant=destructive]:focus:text-destructive data-[variant=destructive]:*:[svg]:!text-destructive [&_svg:not([class*='text-'])]:text-muted-foreground relative flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 data-[inset]:pl-8 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
-        className,
-      )}
-      {...props}
-    />
-  );
+	return (
+		<DropdownMenuPrimitive.Item
+			data-slot="dropdown-menu-item"
+			data-inset={inset}
+			data-variant={variant}
+			className={cn(
+				"focus:bg-accent focus:text-accent-foreground data-[variant=destructive]:text-destructive data-[variant=destructive]:focus:bg-destructive/10 dark:data-[variant=destructive]:focus:bg-destructive/20 data-[variant=destructive]:focus:text-destructive data-[variant=destructive]:*:[svg]:!text-destructive [&_svg:not([class*='text-'])]:text-muted-foreground relative flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 data-[inset]:pl-8 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+				className,
+			)}
+			{...props}
+		/>
+	);
 }
 
 function DropdownMenuCheckboxItem({
-  className,
-  children,
-  checked,
-  ...props
+	className,
+	children,
+	checked,
+	...props
 }: React.ComponentProps<typeof DropdownMenuPrimitive.CheckboxItem>) {
-  return (
-    <DropdownMenuPrimitive.CheckboxItem
-      data-slot="dropdown-menu-checkbox-item"
-      className={cn(
-        "focus:bg-accent focus:text-accent-foreground relative flex cursor-default items-center gap-2 rounded-sm py-1.5 pr-2 pl-8 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
-        className,
-      )}
-      checked={checked}
-      {...props}
-    >
-      <span className="pointer-events-none absolute left-2 flex size-3.5 items-center justify-center">
-        <DropdownMenuPrimitive.ItemIndicator>
-          <CheckIcon className="size-4" />
-        </DropdownMenuPrimitive.ItemIndicator>
-      </span>
-      {children}
-    </DropdownMenuPrimitive.CheckboxItem>
-  );
+	return (
+		<DropdownMenuPrimitive.CheckboxItem
+			data-slot="dropdown-menu-checkbox-item"
+			className={cn(
+				"focus:bg-accent focus:text-accent-foreground relative flex cursor-default items-center gap-2 rounded-sm py-1.5 pr-2 pl-8 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+				className,
+			)}
+			checked={checked}
+			{...props}
+		>
+			<span className="pointer-events-none absolute left-2 flex size-3.5 items-center justify-center">
+				<DropdownMenuPrimitive.ItemIndicator>
+					<CheckIcon className="size-4" />
+				</DropdownMenuPrimitive.ItemIndicator>
+			</span>
+			{children}
+		</DropdownMenuPrimitive.CheckboxItem>
+	);
 }
 
 function DropdownMenuRadioGroup({
-  ...props
+	...props
 }: React.ComponentProps<typeof DropdownMenuPrimitive.RadioGroup>) {
-  return (
-    <DropdownMenuPrimitive.RadioGroup
-      data-slot="dropdown-menu-radio-group"
-      {...props}
-    />
-  );
+	return (
+		<DropdownMenuPrimitive.RadioGroup
+			data-slot="dropdown-menu-radio-group"
+			{...props}
+		/>
+	);
 }
 
 function DropdownMenuRadioItem({
-  className,
-  children,
-  ...props
+	className,
+	children,
+	...props
 }: React.ComponentProps<typeof DropdownMenuPrimitive.RadioItem>) {
-  return (
-    <DropdownMenuPrimitive.RadioItem
-      data-slot="dropdown-menu-radio-item"
-      className={cn(
-        "focus:bg-accent focus:text-accent-foreground relative flex cursor-default items-center gap-2 rounded-sm py-1.5 pr-2 pl-8 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
-        className,
-      )}
-      {...props}
-    >
-      <span className="pointer-events-none absolute left-2 flex size-3.5 items-center justify-center">
-        <DropdownMenuPrimitive.ItemIndicator>
-          <CircleIcon className="size-2 fill-current" />
-        </DropdownMenuPrimitive.ItemIndicator>
-      </span>
-      {children}
-    </DropdownMenuPrimitive.RadioItem>
-  );
+	return (
+		<DropdownMenuPrimitive.RadioItem
+			data-slot="dropdown-menu-radio-item"
+			className={cn(
+				"focus:bg-accent focus:text-accent-foreground relative flex cursor-default items-center gap-2 rounded-sm py-1.5 pr-2 pl-8 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+				className,
+			)}
+			{...props}
+		>
+			<span className="pointer-events-none absolute left-2 flex size-3.5 items-center justify-center">
+				<DropdownMenuPrimitive.ItemIndicator>
+					<CircleIcon className="size-2 fill-current" />
+				</DropdownMenuPrimitive.ItemIndicator>
+			</span>
+			{children}
+		</DropdownMenuPrimitive.RadioItem>
+	);
 }
 
 function DropdownMenuLabel({
-  className,
-  inset,
-  ...props
+	className,
+	inset,
+	...props
 }: React.ComponentProps<typeof DropdownMenuPrimitive.Label> & {
-  inset?: boolean;
+	inset?: boolean;
 }) {
-  return (
-    <DropdownMenuPrimitive.Label
-      data-slot="dropdown-menu-label"
-      data-inset={inset}
-      className={cn(
-        "px-2 py-1.5 text-sm font-medium data-[inset]:pl-8",
-        className,
-      )}
-      {...props}
-    />
-  );
+	return (
+		<DropdownMenuPrimitive.Label
+			data-slot="dropdown-menu-label"
+			data-inset={inset}
+			className={cn(
+				"px-2 py-1.5 text-sm font-medium data-[inset]:pl-8",
+				className,
+			)}
+			{...props}
+		/>
+	);
 }
 
 function DropdownMenuSeparator({
-  className,
-  ...props
+	className,
+	...props
 }: React.ComponentProps<typeof DropdownMenuPrimitive.Separator>) {
-  return (
-    <DropdownMenuPrimitive.Separator
-      data-slot="dropdown-menu-separator"
-      className={cn("bg-border -mx-1 my-1 h-px", className)}
-      {...props}
-    />
-  );
+	return (
+		<DropdownMenuPrimitive.Separator
+			data-slot="dropdown-menu-separator"
+			className={cn("bg-border -mx-1 my-1 h-px", className)}
+			{...props}
+		/>
+	);
 }
 
 function DropdownMenuShortcut({
-  className,
-  ...props
+	className,
+	...props
 }: React.ComponentProps<"span">) {
-  return (
-    <span
-      data-slot="dropdown-menu-shortcut"
-      className={cn(
-        "text-muted-foreground ml-auto text-xs tracking-widest",
-        className,
-      )}
-      {...props}
-    />
-  );
+	return (
+		<span
+			data-slot="dropdown-menu-shortcut"
+			className={cn(
+				"text-muted-foreground ml-auto text-xs tracking-widest",
+				className,
+			)}
+			{...props}
+		/>
+	);
 }
 
 function DropdownMenuSub({
-  ...props
+	...props
 }: React.ComponentProps<typeof DropdownMenuPrimitive.Sub>) {
-  return <DropdownMenuPrimitive.Sub data-slot="dropdown-menu-sub" {...props} />;
+	return <DropdownMenuPrimitive.Sub data-slot="dropdown-menu-sub" {...props} />;
 }
 
 function DropdownMenuSubTrigger({
-  className,
-  inset,
-  children,
-  ...props
+	className,
+	inset,
+	children,
+	...props
 }: React.ComponentProps<typeof DropdownMenuPrimitive.SubTrigger> & {
-  inset?: boolean;
+	inset?: boolean;
 }) {
-  return (
-    <DropdownMenuPrimitive.SubTrigger
-      data-slot="dropdown-menu-sub-trigger"
-      data-inset={inset}
-      className={cn(
-        "focus:bg-accent focus:text-accent-foreground data-[state=open]:bg-accent data-[state=open]:text-accent-foreground [&_svg:not([class*='text-'])]:text-muted-foreground flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-[inset]:pl-8 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
-        className,
-      )}
-      {...props}
-    >
-      {children}
-      <ChevronRightIcon className="ml-auto size-4" />
-    </DropdownMenuPrimitive.SubTrigger>
-  );
+	return (
+		<DropdownMenuPrimitive.SubTrigger
+			data-slot="dropdown-menu-sub-trigger"
+			data-inset={inset}
+			className={cn(
+				"focus:bg-accent focus:text-accent-foreground data-[state=open]:bg-accent data-[state=open]:text-accent-foreground [&_svg:not([class*='text-'])]:text-muted-foreground flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-[inset]:pl-8 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+				className,
+			)}
+			{...props}
+		>
+			{children}
+			<ChevronRightIcon className="ml-auto size-4" />
+		</DropdownMenuPrimitive.SubTrigger>
+	);
 }
 
 function DropdownMenuSubContent({
-  className,
-  ...props
+	className,
+	...props
 }: React.ComponentProps<typeof DropdownMenuPrimitive.SubContent>) {
-  return (
-    <DropdownMenuPrimitive.SubContent
-      data-slot="dropdown-menu-sub-content"
-      className={cn(
-        "bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 min-w-[8rem] origin-(--radix-dropdown-menu-content-transform-origin) overflow-hidden rounded-md border p-1 shadow-lg",
-        className,
-      )}
-      {...props}
-    />
-  );
+	return (
+		<DropdownMenuPrimitive.SubContent
+			data-slot="dropdown-menu-sub-content"
+			className={cn(
+				"bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 min-w-[8rem] origin-(--radix-dropdown-menu-content-transform-origin) overflow-hidden rounded-md border p-1 shadow-lg",
+				className,
+			)}
+			{...props}
+		/>
+	);
 }
 
 export {
-  DropdownMenu,
-  DropdownMenuPortal,
-  DropdownMenuTrigger,
-  DropdownMenuContent,
-  DropdownMenuGroup,
-  DropdownMenuLabel,
-  DropdownMenuItem,
-  DropdownMenuCheckboxItem,
-  DropdownMenuRadioGroup,
-  DropdownMenuRadioItem,
-  DropdownMenuSeparator,
-  DropdownMenuShortcut,
-  DropdownMenuSub,
-  DropdownMenuSubTrigger,
-  DropdownMenuSubContent,
+	DropdownMenu,
+	DropdownMenuPortal,
+	DropdownMenuTrigger,
+	DropdownMenuContent,
+	DropdownMenuGroup,
+	DropdownMenuLabel,
+	DropdownMenuItem,
+	DropdownMenuCheckboxItem,
+	DropdownMenuRadioGroup,
+	DropdownMenuRadioItem,
+	DropdownMenuSeparator,
+	DropdownMenuShortcut,
+	DropdownMenuSub,
+	DropdownMenuSubTrigger,
+	DropdownMenuSubContent,
 };