feat(desktop): delete local branch on workspace deletion

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

@@ -365,6 +365,26 @@ export const createSettingsRouter = () => {
 			};
 		}),
 
+		getDeleteLocalBranch: publicProcedure.query(() => {
+			const row = getSettings();
+			return row.deleteLocalBranch ?? false;
+		}),
+
+		setDeleteLocalBranch: publicProcedure
+			.input(z.object({ enabled: z.boolean() }))
+			.mutation(({ input }) => {
+				localDb
+					.insert(settings)
+					.values({ id: 1, deleteLocalBranch: input.enabled })
+					.onConflictDoUpdate({
+						target: settings.id,
+						set: { deleteLocalBranch: input.enabled },
+					})
+					.run();
+
+				return { success: true };
+			}),
+
 		getNotificationSoundsMuted: publicProcedure.query(() => {
 			const row = getSettings();
 			return row.notificationSoundsMuted ?? false;

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

@@ -17,6 +17,7 @@ import {
 	updateActiveWorkspaceIfRemoved,
 } from "../utils/db-helpers";
 import {
+	deleteLocalBranch,
 	hasUncommittedChanges,
 	hasUnpushedCommits,
 	worktreeExists,
@@ -148,7 +149,9 @@ export const createDeleteProcedures = () => {
 			}),
 
 		delete: publicProcedure
-			.input(z.object({ id: z.string() }))
+			.input(
+				z.object({ id: z.string(), deleteLocalBranch: z.boolean().optional() }),
+			)
 			.mutation(async ({ input }) => {
 				const workspace = getWorkspace(input.id);
 
@@ -247,6 +250,20 @@ export const createDeleteProcedures = () => {
 					} finally {
 						workspaceInitManager.releaseProjectLock(project.id);
 					}
+
+					if (input.deleteLocalBranch && workspace.branch) {
+						try {
+							await deleteLocalBranch({
+								mainRepoPath: project.mainRepoPath,
+								branch: workspace.branch,
+							});
+						} catch (error) {
+							console.error(
+								`[workspace/delete] Branch cleanup failed (non-blocking):`,
+								error instanceof Error ? error.message : String(error),
+							);
+						}
+					}
 				}
 
 				deleteWorkspace(input.id);

apps/desktop/src/lib/trpc/routers/workspaces/utils/git.ts

@@ -632,6 +632,32 @@ export async function createWorktreeFromExistingBranch({
 	}
 }
 
+export async function deleteLocalBranch({
+	mainRepoPath,
+	branch,
+}: {
+	mainRepoPath: string;
+	branch: string;
+}): Promise<void> {
+	const env = await getGitEnv();
+
+	try {
+		await execFileAsync("git", ["-C", mainRepoPath, "branch", "-D", branch], {
+			env,
+			timeout: 10_000,
+		});
+		console.log(`[workspace/delete] Deleted local branch "${branch}"`);
+	} catch (error) {
+		const errorMessage = error instanceof Error ? error.message : String(error);
+		console.error(
+			`[workspace/delete] Failed to delete local branch "${branch}": ${errorMessage}`,
+		);
+		throw new Error(
+			`Failed to delete local branch "${branch}": ${errorMessage}`,
+		);
+	}
+}
+
 export async function removeWorktree(
 	mainRepoPath: string,
 	worktreePath: string,

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

@@ -28,6 +28,10 @@ export function BehaviorSettings({ visibleItems }: BehaviorSettingsProps) {
 		SETTING_ITEM_ID.BEHAVIOR_CONFIRM_QUIT,
 		visibleItems,
 	);
+	const showDeleteLocalBranch = isItemVisible(
+		SETTING_ITEM_ID.BEHAVIOR_DELETE_LOCAL_BRANCH,
+		visibleItems,
+	);
 	const showBranchPrefix = isItemVisible(
 		SETTING_ITEM_ID.BEHAVIOR_BRANCH_PREFIX,
 		visibleItems,
@@ -62,6 +66,33 @@ export function BehaviorSettings({ visibleItems }: BehaviorSettingsProps) {
 		setConfirmOnQuit.mutate({ enabled });
 	};
 
+	const { data: deleteLocalBranch, isLoading: isDeleteBranchLoading } =
+		electronTrpc.settings.getDeleteLocalBranch.useQuery();
+	const setDeleteLocalBranch =
+		electronTrpc.settings.setDeleteLocalBranch.useMutation({
+			onMutate: async ({ enabled }) => {
+				await utils.settings.getDeleteLocalBranch.cancel();
+				const previous = utils.settings.getDeleteLocalBranch.getData();
+				utils.settings.getDeleteLocalBranch.setData(undefined, enabled);
+				return { previous };
+			},
+			onError: (_err, _vars, context) => {
+				if (context?.previous !== undefined) {
+					utils.settings.getDeleteLocalBranch.setData(
+						undefined,
+						context.previous,
+					);
+				}
+			},
+			onSettled: () => {
+				utils.settings.getDeleteLocalBranch.invalidate();
+			},
+		});
+
+	const handleDeleteBranchToggle = (enabled: boolean) => {
+		setDeleteLocalBranch.mutate({ enabled });
+	};
+
 	// TODO: remove telemetry query/mutation/handler once telemetry procedures are removed
 	const { data: telemetryEnabled, isLoading: isTelemetryLoading } =
 		electronTrpc.settings.getTelemetryEnabled.useQuery();
@@ -171,6 +202,29 @@ export function BehaviorSettings({ visibleItems }: BehaviorSettingsProps) {
 					</div>
 				)}
 
+				{showDeleteLocalBranch && (
+					<div className="flex items-center justify-between">
+						<div className="space-y-0.5">
+							<Label
+								htmlFor="delete-local-branch"
+								className="text-sm font-medium"
+							>
+								Delete local branch on workspace removal
+							</Label>
+							<p className="text-xs text-muted-foreground">
+								Also delete the local git branch when deleting a worktree
+								workspace
+							</p>
+						</div>
+						<Switch
+							id="delete-local-branch"
+							checked={deleteLocalBranch ?? false}
+							onCheckedChange={handleDeleteBranchToggle}
+							disabled={isDeleteBranchLoading || setDeleteLocalBranch.isPending}
+						/>
+					</div>
+				)}
+
 				{showBranchPrefix && (
 					<div className="flex items-center justify-between">
 						<div className="space-y-0.5">

apps/desktop/src/renderer/routes/_authenticated/settings/utils/settings-search/settings-search.ts

@@ -21,6 +21,7 @@ export const SETTING_ITEM_ID = {
 	KEYBOARD_SHORTCUTS: "keyboard-shortcuts",
 
 	BEHAVIOR_CONFIRM_QUIT: "behavior-confirm-quit",
+	BEHAVIOR_DELETE_LOCAL_BRANCH: "behavior-delete-local-branch",
 	BEHAVIOR_BRANCH_PREFIX: "behavior-branch-prefix",
 	BEHAVIOR_TELEMETRY: "behavior-telemetry",
 
@@ -308,6 +309,24 @@ export const SETTINGS_ITEMS: SettingsItem[] = [
 			"unsaved",
 		],
 	},
+	{
+		id: SETTING_ITEM_ID.BEHAVIOR_DELETE_LOCAL_BRANCH,
+		section: "behavior",
+		title: "Delete local branch on workspace removal",
+		description:
+			"Also delete the local git branch when deleting a worktree workspace",
+		keywords: [
+			"features",
+			"delete",
+			"branch",
+			"local",
+			"worktree",
+			"workspace",
+			"remove",
+			"cleanup",
+			"git",
+		],
+	},
 	{
 		id: SETTING_ITEM_ID.BEHAVIOR_BRANCH_PREFIX,
 		section: "behavior",

apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/DeleteWorkspaceDialog/DeleteWorkspaceDialog.tsx

@@ -9,6 +9,7 @@ import {
 import { Button } from "@superset/ui/button";
 import { toast } from "@superset/ui/sonner";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@superset/ui/tooltip";
+import { useState } from "react";
 import { electronTrpc } from "renderer/lib/electron-trpc";
 import {
 	useCloseWorkspace,
@@ -33,6 +34,18 @@ export function DeleteWorkspaceDialog({
 	const isBranch = workspaceType === "branch";
 	const deleteWorkspace = useDeleteWorkspace();
 	const closeWorkspace = useCloseWorkspace();
+	const setDeleteLocalBranchSetting =
+		electronTrpc.settings.setDeleteLocalBranch.useMutation();
+
+	const { data: deleteLocalBranchDefault } =
+		electronTrpc.settings.getDeleteLocalBranch.useQuery(undefined, {
+			enabled: open && !isBranch,
+		});
+	const [deleteLocalBranch, setDeleteLocalBranch] = useState<boolean | null>(
+		null,
+	);
+	const deleteLocalBranchChecked =
+		deleteLocalBranch ?? deleteLocalBranchDefault ?? false;
 
 	const { data: gitStatusData, isLoading: isLoadingGitStatus } =
 		electronTrpc.workspaces.canDelete.useQuery(
@@ -85,13 +98,22 @@ export function DeleteWorkspaceDialog({
 	const handleDelete = () => {
 		onOpenChange(false);
 
+		setDeleteLocalBranchSetting.mutate({
+			enabled: deleteLocalBranchChecked,
+		});
+
 		toast.promise(
-			deleteWorkspace.mutateAsync({ id: workspaceId }).then((result) => {
-				if (!result.success) {
-					throw new Error(result.error ?? "Failed to delete");
-				}
-				return result;
-			}),
+			deleteWorkspace
+				.mutateAsync({
+					id: workspaceId,
+					deleteLocalBranch: deleteLocalBranchChecked,
+				})
+				.then((result) => {
+					if (!result.success) {
+						throw new Error(result.error ?? "Failed to delete");
+					}
+					return result;
+				}),
 			{
 				loading: `Deleting "${workspaceName}"...`,
 				success: (result) => {
@@ -183,7 +205,7 @@ export function DeleteWorkspaceDialog({
 
 				{!isLoading && canDelete && hasWarnings && (
 					<div className="px-4 pb-2">
-						<div className="text-sm text-amber-700 dark:text-amber-300 bg-amber-100 dark:bg-amber-950/50 border border-amber-200 dark:border-amber-800 rounded px-2 py-1.5">
+						<div className="text-xs text-yellow-700 dark:text-yellow-400 bg-yellow-50 dark:bg-yellow-500/10 border border-yellow-200 dark:border-yellow-500/20 rounded-md px-2.5 py-1.5">
 							{hasChanges && hasUnpushedCommits
 								? "Has uncommitted changes and unpushed commits"
 								: hasChanges
@@ -193,6 +215,19 @@ export function DeleteWorkspaceDialog({
 					</div>
 				)}
 
+				{!isLoading && canDelete && (
+					<div className="px-4 pb-2">
+						<label className="flex items-center gap-2 text-xs text-muted-foreground cursor-pointer select-none">
+							<input
+								type="checkbox"
+								checked={deleteLocalBranchChecked}
+								onChange={(e) => setDeleteLocalBranch(e.target.checked)}
+							/>
+							Also delete local branch
+						</label>
+					</div>
+				)}
+
 				<AlertDialogFooter className="px-4 pb-4 pt-2 flex-row justify-end gap-2">
 					<Button
 						variant="ghost"

apps/desktop/src/renderer/screens/main/components/WorkspaceView/RightSidebar/FilesView/FilesView.tsx

@@ -39,8 +39,8 @@ export function FilesView() {
 
 	const [searchTerm, setSearchTerm] = useState("");
 	const projectId = workspace?.project?.id;
-	const showHiddenFiles = useFileExplorerStore(
-		(s) => (projectId ? (s.showHiddenFiles[projectId] ?? false) : false),
+	const showHiddenFiles = useFileExplorerStore((s) =>
+		projectId ? (s.showHiddenFiles[projectId] ?? false) : false,
 	);
 	const toggleHiddenFiles = useFileExplorerStore((s) => s.toggleHiddenFiles);
 

packages/local-db/drizzle/0018_add_delete_local_branch_setting.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `settings` ADD `delete_local_branch` integer;--> statement-breakpoint
+ALTER TABLE `settings` DROP COLUMN `telemetry_enabled`;