feat: add per-project worktree mode setting

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

@@ -7,6 +7,7 @@ import {
 	projects,
 	type SelectProject,
 	settings,
+	WORKTREE_MODES,
 	workspaceSections,
 	workspaces,
 	worktrees,
@@ -1230,6 +1231,7 @@ export const createProjectsRouter = (getWindow: () => BrowserWindow | null) => {
 						worktreeBaseDir: z.string().nullable().optional(),
 						hideImage: z.boolean().optional(),
 						defaultApp: z.enum(EXTERNAL_APPS).nullable().optional(),
+						worktreeMode: z.enum(WORKTREE_MODES).nullable().optional(),
 					}),
 				}),
 			)
@@ -1268,6 +1270,9 @@ export const createProjectsRouter = (getWindow: () => BrowserWindow | null) => {
 						...(input.patch.defaultApp !== undefined && {
 							defaultApp: input.patch.defaultApp,
 						}),
+						...(input.patch.worktreeMode !== undefined && {
+							worktreeMode: input.patch.worktreeMode,
+						}),
 						lastOpenedAt: Date.now(),
 					})
 					.where(eq(projects.id, input.id))
@@ -1366,7 +1371,12 @@ export const createProjectsRouter = (getWindow: () => BrowserWindow | null) => {
 			}),
 
 		close: publicProcedure
-			.input(z.object({ id: z.string() }))
+			.input(
+				z.object({
+					id: z.string(),
+					deleteWorktrees: z.boolean().optional().default(false),
+				}),
+			)
 			.mutation(async ({ input }) => {
 				const project = localDb
 					.select()
@@ -1394,6 +1404,56 @@ export const createProjectsRouter = (getWindow: () => BrowserWindow | null) => {
 
 				const closedWorkspaceIds = projectWorkspaces.map((w) => w.id);
 
+				// Optionally move worktree directories to Trash
+				if (input.deleteWorktrees) {
+					const { existsSync } = await import("node:fs");
+					const { shell } = await import("electron");
+
+					// Collect worktree paths from both the worktrees table and workspace records
+					const projectWorktrees = localDb
+						.select()
+						.from(worktrees)
+						.where(eq(worktrees.projectId, input.id))
+						.all();
+
+					const worktreePaths = new Set<string>(
+						projectWorktrees.map((wt) => wt.path),
+					);
+
+					for (const ws of projectWorkspaces) {
+						if (ws.type === "worktree" && ws.worktreeId) {
+							const wt = localDb
+								.select()
+								.from(worktrees)
+								.where(eq(worktrees.id, ws.worktreeId))
+								.get();
+							if (wt?.path) {
+								worktreePaths.add(wt.path);
+							}
+						}
+					}
+
+					for (const wtPath of worktreePaths) {
+						if (!existsSync(wtPath)) continue;
+						try {
+							await shell.trashItem(wtPath);
+						} catch (error) {
+							console.error(
+								`[projects/close] Failed to trash worktree ${wtPath}:`,
+								error,
+							);
+						}
+					}
+
+					// Clean up stale git worktree references
+					try {
+						const git = await getSimpleGitWithShellPath(project.mainRepoPath);
+						await git.raw(["worktree", "prune"]);
+					} catch (error) {
+						console.error("[projects/close] Failed to prune worktrees:", error);
+					}
+				}
+
 				if (closedWorkspaceIds.length > 0) {
 					localDb
 						.delete(workspaces)

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

@@ -9,6 +9,7 @@ import {
 	settings,
 	TERMINAL_LINK_BEHAVIORS,
 	type TerminalPreset,
+	WORKTREE_MODES,
 } from "@superset/local-db";
 import {
 	AGENT_PRESET_COMMANDS,
@@ -749,6 +750,26 @@ export const createSettingsRouter = () => {
 				return { success: true };
 			}),
 
+		getWorktreeMode: publicProcedure.query(() => {
+			const row = getSettings();
+			return row.worktreeMode ?? "always";
+		}),
+
+		setWorktreeMode: publicProcedure
+			.input(z.object({ mode: z.enum(WORKTREE_MODES) }))
+			.mutation(({ input }) => {
+				localDb
+					.insert(settings)
+					.values({ id: 1, worktreeMode: input.mode })
+					.onConflictDoUpdate({
+						target: settings.id,
+						set: { worktreeMode: input.mode },
+					})
+					.run();
+
+				return { success: true };
+			}),
+
 		getOpenLinksInApp: publicProcedure.query(() => {
 			const row = getSettings();
 			return row.openLinksInApp ?? DEFAULT_OPEN_LINKS_IN_APP;

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

@@ -295,6 +295,7 @@ export const createCreateProcedures = () => {
 					baseBranch: z.string().optional(),
 					useExistingBranch: z.boolean().optional(),
 					applyPrefix: z.boolean().optional().default(true),
+					useWorktree: z.boolean().optional(),
 				}),
 			)
 			.mutation(async ({ input }) => {
@@ -307,6 +308,87 @@ export const createCreateProcedures = () => {
 					throw new Error(`Project ${input.projectId} not found`);
 				}
 
+				// Resolve effective worktree mode
+				const globalSettings = localDb.select().from(settings).get();
+				const effectiveWorktreeMode =
+					project.worktreeMode ?? globalSettings?.worktreeMode ?? "always";
+
+				// If worktrees are disabled (or user explicitly chose no worktree),
+				// open directly in the main repo
+				if (
+					effectiveWorktreeMode === "disabled" ||
+					input.useWorktree === false
+				) {
+					const branch =
+						input.branchName?.trim() ||
+						(await getCurrentBranch(project.mainRepoPath));
+					if (!branch) {
+						throw new Error("Could not determine current branch");
+					}
+
+					const existing = getBranchWorkspace(input.projectId);
+
+					if (existing) {
+						if (existing.branch !== branch) {
+							localDb
+								.update(workspaces)
+								.set({ branch })
+								.where(eq(workspaces.id, existing.id))
+								.run();
+						}
+						touchWorkspace(existing.id);
+						setLastActiveWorkspace(existing.id);
+						return {
+							workspace: {
+								...existing,
+								branch,
+								lastOpenedAt: Date.now(),
+							},
+							worktreePath: project.mainRepoPath,
+							projectId: project.id,
+							isInitializing: false,
+							wasExisting: true,
+						};
+					}
+
+					const maxTabOrder = getMaxProjectChildTabOrder(input.projectId);
+					const workspace = localDb
+						.insert(workspaces)
+						.values({
+							projectId: input.projectId,
+							type: "branch",
+							branch,
+							name: input.name ?? branch,
+							tabOrder: maxTabOrder + 1,
+						})
+						.onConflictDoNothing()
+						.returning()
+						.all();
+
+					const ws = workspace[0] ?? getBranchWorkspace(input.projectId);
+					if (!ws) {
+						throw new Error("Failed to create or find branch workspace");
+					}
+
+					setLastActiveWorkspace(ws.id);
+					activateProject(project);
+
+					track("workspace_created", {
+						workspace_id: ws.id,
+						project_id: project.id,
+						type: "branch",
+					});
+
+					return {
+						workspace: ws,
+						initialCommands: null,
+						worktreePath: project.mainRepoPath,
+						projectId: project.id,
+						isInitializing: false,
+						wasExisting: false,
+					};
+				}
+
 				let existingBranchName: string | undefined;
 				if (input.useExistingBranch) {
 					existingBranchName = input.branchName?.trim();
@@ -332,7 +414,6 @@ export const createCreateProcedures = () => {
 
 				let branchPrefix: string | undefined;
 				if (input.applyPrefix) {
-					const globalSettings = localDb.select().from(settings).get();
 					const projectOverrides = project.branchPrefixMode != null;
 					const prefixMode = projectOverrides
 						? project.branchPrefixMode

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

@@ -154,6 +154,7 @@ export const createDeleteProcedures = () => {
 					id: z.string(),
 					deleteLocalBranch: z.boolean().optional(),
 					force: z.boolean().optional(),
+					trash: z.boolean().optional(),
 				}),
 			)
 			.mutation(async ({ input }) => {
@@ -252,13 +253,28 @@ export const createDeleteProcedures = () => {
 					await workspaceInitManager.acquireProjectLock(project.id);
 
 					try {
-						const removeResult = await removeWorktreeFromDisk({
-							mainRepoPath: project.mainRepoPath,
-							worktreePath: worktree.path,
-						});
-						if (!removeResult.success) {
-							clearWorkspaceDeletingStatus(input.id);
-							return removeResult;
+						if (input.trash) {
+							// Move to Trash (recoverable) instead of permanent delete
+							const { existsSync } = await import("node:fs");
+							if (existsSync(worktree.path)) {
+								const { shell } = await import("electron");
+								await shell.trashItem(worktree.path);
+							}
+							// Clean up stale git worktree references
+							const { getSimpleGitWithShellPath } = await import(
+								"../utils/git-client"
+							);
+							const git = await getSimpleGitWithShellPath(project.mainRepoPath);
+							await git.raw(["worktree", "prune"]);
+						} else {
+							const removeResult = await removeWorktreeFromDisk({
+								mainRepoPath: project.mainRepoPath,
+								worktreePath: worktree.path,
+							});
+							if (!removeResult.success) {
+								clearWorkspaceDeletingStatus(input.id);
+								return removeResult;
+							}
 						}
 					} finally {
 						workspaceInitManager.releaseProjectLock(project.id);

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

@@ -152,6 +152,7 @@ export const createQueryProcedures = () => {
 						mainRepoPath: string;
 						hideImage: boolean;
 						iconUrl: string | null;
+						worktreeMode: string | null;
 					};
 					workspaces: WorkspaceItem[];
 					sections: SectionItem[];
@@ -184,6 +185,7 @@ export const createQueryProcedures = () => {
 						mainRepoPath: project.mainRepoPath,
 						hideImage: project.hideImage ?? false,
 						iconUrl: project.iconUrl ?? null,
+						worktreeMode: project.worktreeMode ?? null,
 					},
 					workspaces: [],
 					sections: projectSections,

apps/desktop/src/renderer/components/NewWorkspaceModal/components/NewWorkspaceModalContent/NewWorkspaceModalContent.tsx

@@ -84,7 +84,10 @@ export function NewWorkspaceModalContent({
 			<PromptGroup
 				projectId={draft.selectedProjectId}
 				selectedProject={selectedProject}
-				recentProjects={recentProjects.filter((project) => Boolean(project.id))}
+				recentProjects={recentProjects.filter(
+					(project) =>
+						Boolean(project.id) && project.worktreeMode !== "disabled",
+				)}
 				onSelectProject={(selectedProjectId) =>
 					updateDraft({ selectedProjectId })
 				}

apps/desktop/src/renderer/components/NewWorkspaceModal/components/PromptGroup/PromptGroup.tsx

@@ -471,6 +471,11 @@ function PromptGroupInner({
 	const { data: globalBranchPrefix } =
 		electronTrpc.settings.getBranchPrefix.useQuery();
 	const { data: gitInfo } = electronTrpc.settings.getGitInfo.useQuery();
+	const { data: globalWorktreeMode } =
+		electronTrpc.settings.getWorktreeMode.useQuery();
+
+	const effectiveWorktreeMode =
+		project?.worktreeMode ?? globalWorktreeMode ?? "always";
 
 	const resolvedPrefix = useMemo(() => {
 		const projectOverrides = project?.branchPrefixMode != null;
@@ -637,6 +642,9 @@ function PromptGroupInner({
 							? sanitizeBranchNameWithMaxLength(branchName.trim())
 							: branchSlug) || undefined,
 					baseBranch: baseBranch || undefined,
+					...(effectiveWorktreeMode === "disabled" && {
+						useWorktree: false,
+					}),
 				},
 				{
 					agentLaunchRequest: launchRequest ?? undefined,
@@ -661,6 +669,7 @@ function PromptGroupInner({
 		convertBlobUrlToDataUrl,
 		createFromPr,
 		createWorkspace,
+		effectiveWorktreeMode,
 		linkedPR,
 		projectId,
 		runAsyncAction,
@@ -791,7 +800,7 @@ function PromptGroupInner({
 				)}
 				<PromptInputTextarea
 					autoFocus
-					placeholder="What do you want to do?"
+					placeholder="What do you want to do? (optional)"
 					className="min-h-10"
 					value={prompt}
 					onChange={(e) => updateDraft({ prompt: e.target.value })}
@@ -903,9 +912,11 @@ function PromptGroupInner({
 						)}
 					</AnimatePresence>
 				</div>
-				<span className="text-[11px] text-muted-foreground/50">
-					{modKey}+↵ to create
-				</span>
+				<div className="flex items-center gap-2">
+					<span className="text-[11px] text-muted-foreground/50">
+						{modKey}+↵ to create
+					</span>
+				</div>
 			</div>
 		</div>
 	);

apps/desktop/src/renderer/components/WorktreeChoiceDialog/ConnectedWorktreeChoiceDialog.tsx

@@ -0,0 +1,21 @@
+import { useWorktreeChoiceDialogStore } from "renderer/stores/worktree-choice-dialog";
+import { WorktreeChoiceDialog } from "./WorktreeChoiceDialog";
+
+export function ConnectedWorktreeChoiceDialog() {
+	const { isOpen, projectName, onChoice, close } =
+		useWorktreeChoiceDialogStore();
+
+	return (
+		<WorktreeChoiceDialog
+			projectName={projectName}
+			open={isOpen}
+			onOpenChange={(open) => {
+				if (!open) close();
+			}}
+			onChoice={(enableWorktrees) => {
+				onChoice?.(enableWorktrees);
+				close();
+			}}
+		/>
+	);
+}