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,
@@ -116,6 +117,27 @@ function upsertProject(mainRepoPath: string, defaultBranch: string): Project {
 			.set({ lastOpenedAt: Date.now(), defaultBranch })
 			.where(eq(projects.id, existing.id))
 			.run();
+
+		// Discover favicon if no icon is set yet (fire-and-forget)
+		if (!existing.iconUrl) {
+			discoverAndSaveProjectIcon({
+				projectId: existing.id,
+				repoPath: mainRepoPath,
+			})
+				.then((iconUrl) => {
+					if (iconUrl) {
+						localDb
+							.update(projects)
+							.set({ iconUrl })
+							.where(eq(projects.id, existing.id))
+							.run();
+					}
+				})
+				.catch((err) => {
+					console.error("[upsertProject] Favicon discovery failed:", err);
+				});
+		}
+
 		return { ...existing, lastOpenedAt: Date.now(), defaultBranch };
 	}
 
@@ -130,6 +152,24 @@ function upsertProject(mainRepoPath: string, defaultBranch: string): Project {
 		.returning()
 		.get();
 
+	// Discover favicon for new project (fire-and-forget)
+	discoverAndSaveProjectIcon({
+		projectId: project.id,
+		repoPath: mainRepoPath,
+	})
+		.then((iconUrl) => {
+			if (iconUrl) {
+				localDb
+					.update(projects)
+					.set({ iconUrl })
+					.where(eq(projects.id, project.id))
+					.run();
+			}
+		})
+		.catch((err) => {
+			console.error("[upsertProject] Favicon discovery failed:", err);
+		});
+
 	return project;
 }
 
@@ -1230,6 +1270,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 +1309,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 +1410,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 +1443,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/projects/utils/favicon-discovery.ts

@@ -6,8 +6,9 @@ import {
 	saveProjectIconFromFile,
 } from "main/lib/project-icons";
 
-/** Common favicon file names to search for in project roots */
+/** Common favicon file names to search for in project roots and subdirectories */
 const FAVICON_PATTERNS = [
+	// Root level
 	"favicon.ico",
 	"favicon.png",
 	"favicon.svg",
@@ -17,6 +18,7 @@ const FAVICON_PATTERNS = [
 	"icon.svg",
 	".github/logo.png",
 	".github/logo.svg",
+	// Common static/public directories
 	"public/favicon.ico",
 	"public/favicon.png",
 	"public/favicon.svg",
@@ -28,6 +30,19 @@ const FAVICON_PATTERNS = [
 	"assets/favicon.ico",
 	"assets/favicon.png",
 	"assets/icon.png",
+	// Next.js / app directory patterns (up to 2 levels deep)
+	"app/favicon.ico",
+	"app/icon.png",
+	"app/icon.svg",
+	"**/app/favicon.ico",
+	"**/app/icon.png",
+	"**/app/icon.svg",
+	// Deeper public directories in monorepos/nested projects
+	"**/public/favicon.ico",
+	"**/public/favicon.png",
+	"**/public/favicon.svg",
+	"**/public/logo.png",
+	"**/public/logo.svg",
 ];
 
 /** Max file size for discovered favicons: 256KB */
@@ -48,6 +63,7 @@ export async function discoverAndSaveProjectIcon({
 		const matches = await fg(FAVICON_PATTERNS, {
 			cwd: repoPath,
 			absolute: true,
+			deep: 4,
 			ignore: ["**/node_modules/**", "**/.git/**", "**/dist/**", "**/build/**"],
 			onlyFiles: true,
 		});

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,
@@ -750,6 +751,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

@@ -1,4 +1,4 @@
-import { projects, workspaces, worktrees } from "@superset/local-db";
+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";
@@ -294,6 +294,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 }) => {
@@ -306,6 +307,92 @@ 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");
+					}
+
+					// Checkout the target branch so the main repo matches the workspace
+					if (input.branchName?.trim()) {
+						await safeCheckoutBranch(project.mainRepoPath, 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();

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

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