feat(desktop): add configurable worktree location

apps/desktop/src/lib/trpc/routers/projects/projects.ts

@@ -813,6 +813,7 @@ export const createProjectsRouter = (getWindow: () => BrowserWindow | null) => {
 						branchPrefixMode: z.enum(BRANCH_PREFIX_MODES).nullable().optional(),
 						branchPrefixCustom: z.string().nullable().optional(),
 						workspaceBaseBranch: z.string().nullable().optional(),
+						worktreeBaseDir: z.string().nullable().optional(),
 						hideImage: z.boolean().optional(),
 						defaultApp: z.enum(EXTERNAL_APPS).nullable().optional(),
 					}),
@@ -844,6 +845,9 @@ export const createProjectsRouter = (getWindow: () => BrowserWindow | null) => {
 						...(input.patch.workspaceBaseBranch !== undefined && {
 							workspaceBaseBranch: input.patch.workspaceBaseBranch,
 						}),
+						...(input.patch.worktreeBaseDir !== undefined && {
+							worktreeBaseDir: input.patch.worktreeBaseDir,
+						}),
 						...(input.patch.hideImage !== undefined && {
 							hideImage: input.patch.hideImage,
 						}),

apps/desktop/src/lib/trpc/routers/settings/index.ts

@@ -621,6 +621,26 @@ export const createSettingsRouter = () => {
 				return { success: true };
 			}),
 
+		getWorktreeBaseDir: publicProcedure.query(() => {
+			const row = getSettings();
+			return row.worktreeBaseDir ?? null;
+		}),
+
+		setWorktreeBaseDir: publicProcedure
+			.input(z.object({ path: z.string().nullable() }))
+			.mutation(({ input }) => {
+				localDb
+					.insert(settings)
+					.values({ id: 1, worktreeBaseDir: input.path })
+					.onConflictDoUpdate({
+						target: settings.id,
+						set: { worktreeBaseDir: input.path },
+					})
+					.run();
+
+				return { success: true };
+			}),
+
 		// TODO: remove telemetry procedures once telemetry_enabled column is dropped
 		getTelemetryEnabled: publicProcedure.query(() => {
 			return true;

apps/desktop/src/lib/trpc/routers/window.ts

@@ -3,15 +3,9 @@ import { homedir } from "node:os";
 import path from "node:path";
 import type { BrowserWindow } from "electron";
 import { dialog } from "electron";
+import { z } from "zod";
 import { publicProcedure, router } from "..";
 
-/**
- * Window router for window controls
- * Handles minimize, maximize, close, and platform detection
- *
- * Uses a getter function to always access the current window,
- * allowing window recreation on macOS without stale references.
- */
 export const createWindowRouter = (getWindow: () => BrowserWindow | null) => {
 	return router({
 		minimize: publicProcedure.mutation(() => {
@@ -53,6 +47,34 @@ export const createWindowRouter = (getWindow: () => BrowserWindow | null) => {
 			return homedir();
 		}),
 
+		selectDirectory: publicProcedure
+			.input(
+				z
+					.object({
+						title: z.string().optional(),
+						defaultPath: z.string().optional(),
+					})
+					.optional(),
+			)
+			.mutation(async ({ input }) => {
+				const window = getWindow();
+				if (!window) {
+					return { canceled: true, path: null };
+				}
+
+				const result = await dialog.showOpenDialog(window, {
+					properties: ["openDirectory", "createDirectory"],
+					title: input?.title ?? "Select Directory",
+					defaultPath: input?.defaultPath ?? undefined,
+				});
+
+				if (result.canceled || result.filePaths.length === 0) {
+					return { canceled: true, path: null };
+				}
+
+				return { canceled: false, path: result.filePaths[0] };
+			}),
+
 		selectImageFile: publicProcedure.mutation(async () => {
 			const window = getWindow();
 			if (!window) {

apps/desktop/src/lib/trpc/routers/workspaces/procedures/create.ts

@@ -1,11 +1,8 @@
-import { homedir } from "node:os";
-import { join } from "node:path";
 import { projects, settings, workspaces, worktrees } from "@superset/local-db";
 import { and, eq, isNull, not } from "drizzle-orm";
 import { track } from "main/lib/analytics";
 import { localDb } from "main/lib/local-db";
 import { workspaceInitManager } from "main/lib/workspace-init-manager";
-import { SUPERSET_DIR_NAME, WORKTREES_DIR_NAME } from "shared/constants";
 import { z } from "zod";
 import { publicProcedure, router } from "../../..";
 import { resolveWorkspaceBaseBranch } from "../utils/base-branch";
@@ -39,6 +36,7 @@ import {
 	sanitizeBranchName,
 	worktreeExists,
 } from "../utils/git";
+import { resolveWorktreePath } from "../utils/resolve-worktree-path";
 import { copySupersetConfigToWorktree, loadSetupConfig } from "../utils/setup";
 import { initializeWorkspaceWorktree } from "../utils/workspace-init";
 
@@ -207,13 +205,7 @@ async function handleNewWorktree({
 		prInfo,
 	});
 
-	const worktreePath = join(
-		homedir(),
-		SUPERSET_DIR_NAME,
-		WORKTREES_DIR_NAME,
-		project.name,
-		localBranchName,
-	);
+	const worktreePath = resolveWorktreePath(project, localBranchName);
 
 	await createWorktreeFromPr({
 		mainRepoPath: project.mainRepoPath,
@@ -437,13 +429,7 @@ export const createCreateProcedures = () => {
 					}
 				}
 
-				const worktreePath = join(
-					homedir(),
-					SUPERSET_DIR_NAME,
-					WORKTREES_DIR_NAME,
-					project.name,
-					branch,
-				);
+				const worktreePath = resolveWorktreePath(project, branch);
 
 				const targetBranch = resolveWorkspaceBaseBranch({
 					explicitBaseBranch: input.baseBranch,

apps/desktop/src/lib/trpc/routers/workspaces/utils/resolve-worktree-path.ts

@@ -0,0 +1,22 @@
+import { homedir } from "node:os";
+import { join } from "node:path";
+import { type SelectProject, settings } from "@superset/local-db";
+import { localDb } from "main/lib/local-db";
+import { SUPERSET_DIR_NAME, WORKTREES_DIR_NAME } from "shared/constants";
+
+/** Resolves base dir: project override > global setting > default (~/.superset/worktrees) */
+export function resolveWorktreePath(
+	project: Pick<SelectProject, "name" | "worktreeBaseDir">,
+	branch: string,
+): string {
+	if (project.worktreeBaseDir) {
+		return join(project.worktreeBaseDir, project.name, branch);
+	}
+
+	const row = localDb.select().from(settings).get();
+	const baseDir =
+		row?.worktreeBaseDir ??
+		join(homedir(), SUPERSET_DIR_NAME, WORKTREES_DIR_NAME);
+
+	return join(baseDir, project.name, branch);
+}

apps/desktop/src/renderer/routes/_authenticated/settings/behavior/components/BehaviorSettings/BehaviorSettings.tsx

@@ -12,6 +12,10 @@ import { Switch } from "@superset/ui/switch";
 import { useEffect, useState } from "react";
 import { electronTrpc } from "renderer/lib/electron-trpc";
 import { resolveBranchPrefix, sanitizeSegment } from "shared/utils/branch";
+import {
+	useDefaultWorktreePath,
+	WorktreeLocationPicker,
+} from "../../../components/WorktreeLocationPicker";
 import { BRANCH_PREFIX_MODE_LABELS } from "../../../utils/branch-prefix";
 import {
 	isItemVisible,
@@ -48,6 +52,10 @@ export function BehaviorSettings({ visibleItems }: BehaviorSettingsProps) {
 		SETTING_ITEM_ID.BEHAVIOR_RESOURCE_MONITOR,
 		visibleItems,
 	);
+	const showWorktreeLocation = isItemVisible(
+		SETTING_ITEM_ID.BEHAVIOR_WORKTREE_LOCATION,
+		visibleItems,
+	);
 
 	const utils = electronTrpc.useUtils();
 
@@ -210,6 +218,30 @@ export function BehaviorSettings({ visibleItems }: BehaviorSettingsProps) {
 			},
 		});
 
+	const { data: worktreeBaseDir, isLoading: isWorktreeBaseDirLoading } =
+		electronTrpc.settings.getWorktreeBaseDir.useQuery();
+	const setWorktreeBaseDir =
+		electronTrpc.settings.setWorktreeBaseDir.useMutation({
+			onMutate: async ({ path }) => {
+				await utils.settings.getWorktreeBaseDir.cancel();
+				const previous = utils.settings.getWorktreeBaseDir.getData();
+				utils.settings.getWorktreeBaseDir.setData(undefined, path);
+				return { previous };
+			},
+			onError: (_err, _vars, context) => {
+				if (context?.previous !== undefined) {
+					utils.settings.getWorktreeBaseDir.setData(
+						undefined,
+						context.previous,
+					);
+				}
+			},
+			onSettled: () => {
+				utils.settings.getWorktreeBaseDir.invalidate();
+			},
+		});
+	const defaultWorktreePath = useDefaultWorktreePath();
+
 	const previewPrefix =
 		resolveBranchPrefix({
 			mode: branchPrefix?.mode ?? "none",
@@ -375,6 +407,25 @@ export function BehaviorSettings({ visibleItems }: BehaviorSettingsProps) {
 					</div>
 				)}
 
+				{showWorktreeLocation && (
+					<div className="space-y-0.5">
+						<Label className="text-sm font-medium">Worktree location</Label>
+						<p className="text-xs text-muted-foreground">
+							Base directory for new worktrees
+						</p>
+						<WorktreeLocationPicker
+							currentPath={worktreeBaseDir}
+							defaultPathLabel={`Default (${defaultWorktreePath})`}
+							defaultBrowsePath={worktreeBaseDir}
+							disabled={
+								isWorktreeBaseDirLoading || setWorktreeBaseDir.isPending
+							}
+							onSelect={(path) => setWorktreeBaseDir.mutate({ path })}
+							onReset={() => setWorktreeBaseDir.mutate({ path: null })}
+						/>
+					</div>
+				)}
+
 				{false && showTelemetry && (
 					<div className="flex items-center justify-between">
 						<div className="space-y-0.5">

apps/desktop/src/renderer/routes/_authenticated/settings/components/WorktreeLocationPicker/WorktreeLocationPicker.tsx

@@ -0,0 +1,71 @@
+import { Button } from "@superset/ui/button";
+import { Label } from "@superset/ui/label";
+import { electronTrpc } from "renderer/lib/electron-trpc";
+
+interface WorktreeLocationPickerProps {
+	currentPath: string | null | undefined;
+	defaultPathLabel: string;
+	dialogTitle?: string;
+	defaultBrowsePath?: string | null;
+	disabled?: boolean;
+	onSelect: (path: string) => void;
+	onReset: () => void;
+}
+
+export function useDefaultWorktreePath() {
+	const { data: homeDir } = electronTrpc.window.getHomeDir.useQuery();
+	return homeDir ? `${homeDir}/.superset/worktrees` : "~/.superset/worktrees";
+}
+
+export function WorktreeLocationPicker({
+	currentPath,
+	defaultPathLabel,
+	dialogTitle = "Select worktree location",
+	defaultBrowsePath,
+	disabled,
+	onSelect,
+	onReset,
+}: WorktreeLocationPickerProps) {
+	const selectDirectory = electronTrpc.window.selectDirectory.useMutation();
+
+	const handleBrowse = async () => {
+		const result = await selectDirectory.mutateAsync({
+			title: dialogTitle,
+			defaultPath: defaultBrowsePath ?? undefined,
+		});
+		if (!result.canceled && result.path) {
+			onSelect(result.path);
+		}
+	};
+
+	return (
+		<div className="flex items-center justify-between">
+			<div className="space-y-0.5">
+				<Label className="text-sm font-medium">Directory</Label>
+				<code className="text-xs bg-muted px-1.5 py-0.5 rounded text-foreground block mt-1">
+					{currentPath ?? defaultPathLabel}
+				</code>
+			</div>
+			<div className="flex items-center gap-2">
+				<Button
+					variant="outline"
+					size="sm"
+					onClick={handleBrowse}
+					disabled={disabled || selectDirectory.isPending}
+				>
+					Browse...
+				</Button>
+				{currentPath && (
+					<Button
+						variant="outline"
+						size="sm"
+						onClick={onReset}
+						disabled={disabled}
+					>
+						Reset
+					</Button>
+				)}
+			</div>
+		</div>
+	);
+}

apps/desktop/src/renderer/routes/_authenticated/settings/components/WorktreeLocationPicker/index.ts

@@ -0,0 +1,4 @@
+export {
+	useDefaultWorktreePath,
+	WorktreeLocationPicker,
+} from "./WorktreeLocationPicker";

apps/desktop/src/renderer/routes/_authenticated/settings/project/$projectId/components/ProjectSettings/ProjectSettings.tsx

@@ -12,7 +12,11 @@ import { Switch } from "@superset/ui/switch";
 import { cn } from "@superset/ui/utils";
 import type { ReactNode } from "react";
 import { useCallback, useEffect, useRef, useState } from "react";
-import { HiOutlineCog6Tooth, HiOutlinePaintBrush } from "react-icons/hi2";
+import {
+	HiOutlineCog6Tooth,
+	HiOutlineFolderOpen,
+	HiOutlinePaintBrush,
+} from "react-icons/hi2";
 import { LuImagePlus, LuTrash2 } from "react-icons/lu";
 import { electronTrpc } from "renderer/lib/electron-trpc";
 import {
@@ -21,6 +25,10 @@ import {
 } from "shared/constants/project-colors";
 import { resolveBranchPrefix, sanitizeSegment } from "shared/utils/branch";
 import { ClickablePath } from "../../../../components/ClickablePath";
+import {
+	useDefaultWorktreePath,
+	WorktreeLocationPicker,
+} from "../../../../components/WorktreeLocationPicker";
 import { BRANCH_PREFIX_MODE_LABELS_WITH_DEFAULT } from "../../../../utils/branch-prefix";
 import { ScriptsEditor } from "./components/ScriptsEditor";
 
@@ -171,6 +179,11 @@ export function ProjectSettings({ projectId }: ProjectSettingsProps) {
 		});
 	};
 
+	const { data: globalWorktreeBaseDir } =
+		electronTrpc.settings.getWorktreeBaseDir.useQuery();
+	const defaultWorktreePath = useDefaultWorktreePath();
+	const globalPath = globalWorktreeBaseDir ?? defaultWorktreePath;
+
 	const getPreviewPrefix = (
 		mode: BranchPrefixMode | "default",
 	): string | null => {
@@ -321,6 +334,32 @@ export function ProjectSettings({ projectId }: ProjectSettingsProps) {
 					)}
 				</SettingsSection>
 
+				<SettingsSection
+					icon={<HiOutlineFolderOpen className="h-4 w-4" />}
+					title="Worktree Location"
+					description="Override the global worktree directory for this project."
+				>
+					<WorktreeLocationPicker
+						currentPath={project.worktreeBaseDir}
+						defaultPathLabel={`Using global default: ${globalPath}`}
+						dialogTitle="Select worktree location for this project"
+						defaultBrowsePath={project.worktreeBaseDir ?? globalWorktreeBaseDir}
+						disabled={updateProject.isPending}
+						onSelect={(path) =>
+							updateProject.mutate({
+								id: projectId,
+								patch: { worktreeBaseDir: path },
+							})
+						}
+						onReset={() =>
+							updateProject.mutate({
+								id: projectId,
+								patch: { worktreeBaseDir: null },
+							})
+						}
+					/>
+				</SettingsSection>
+
 				<div className="pt-3 border-t">
 					<ScriptsEditor projectId={project.id} />
 				</div>