feat(desktop): open project in dedicated window

apps/desktop/src/lib/electron-app/factories/app/setup.ts

@@ -18,15 +18,17 @@ export async function makeAppSetup(
 		await restoreWindows();
 	}
 
-	// If no windows were restored, create a new one
+	// Destroy any windows that macOS auto-restored from the previous session.
+	// We manage our own window lifecycle — these zombie windows would otherwise
+	// trigger will-navigate → shell.openExternal, opening Chrome tabs.
+	// destroy() is used instead of close() to prevent any navigation or events.
 	const existingWindows = BrowserWindow.getAllWindows();
-	let window: BrowserWindow;
-	if (existingWindows.length > 0) {
-		window = existingWindows[0];
-	} else {
-		window = await createWindow();
+	for (const win of existingWindows) {
+		if (!win.isDestroyed()) win.destroy();
 	}
 
+	let window: BrowserWindow = await createWindow();
+
 	app.on("activate", async () => {
 		const windows = BrowserWindow.getAllWindows();
 

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

@@ -1,14 +1,19 @@
 import { createTRPCReact } from "@trpc/react-query";
 import { initTRPC } from "@trpc/server";
+import type { BrowserWindow } from "electron";
 import superjson from "superjson";
 import type { AppRouter } from "./routers";
 import { NotGitRepoError } from "./routers/workspaces/utils/git";
 
+export interface TRPCContext {
+	callingWindow: BrowserWindow | null;
+}
+
 /**
  * Core tRPC initialization
  * This provides the base router and procedure builders used by all routers
  */
-const t = initTRPC.create({
+const t = initTRPC.context<TRPCContext>().create({
 	transformer: superjson,
 	isServer: true,
 });

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

@@ -7,20 +7,24 @@ import {
 	projects,
 	type SelectProject,
 	settings,
+	WORKTREE_MODES,
 	workspaceSections,
 	workspaces,
 	worktrees,
 } from "@superset/local-db";
 import { TRPCError } from "@trpc/server";
+import { observable } from "@trpc/server/observable";
 import { and, desc, eq, inArray, isNotNull, isNull, not } from "drizzle-orm";
 import type { BrowserWindow } from "electron";
 import { dialog } from "electron";
 import { track } from "main/lib/analytics";
+import { dataEmitter } from "main/lib/data-events";
 import { localDb } from "main/lib/local-db";
 import {
 	deleteProjectIcon,
 	saveProjectIconFromDataUrl,
 } from "main/lib/project-icons";
+import { windowManager } from "main/lib/window-manager";
 import { getWorkspaceRuntimeRegistry } from "main/lib/workspace-runtime";
 import { PROJECT_COLOR_VALUES } from "shared/constants/project-colors";
 import { z } from "zod";
@@ -116,6 +120,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 +155,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 +1273,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,11 +1312,19 @@ 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))
 					.run();
 
+				dataEmitter.emit("projectChanged", {
+					projectId: input.id,
+					updatedAt: new Date().toISOString(),
+				});
+
 				return { success: true };
 			}),
 
@@ -1366,7 +1418,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 +1451,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)
@@ -1431,6 +1538,12 @@ export const createProjectsRouter = (getWindow: () => BrowserWindow | null) => {
 
 				track("project_closed", { project_id: input.id });
 
+				// Close the project's dedicated window if one is open
+				const projectWin = windowManager.getProjectWindow(input.id);
+				if (projectWin && !projectWin.isDestroyed()) {
+					projectWin.close();
+				}
+
 				return { success: true, terminalWarning };
 			}),
 
@@ -1602,6 +1715,18 @@ export const createProjectsRouter = (getWindow: () => BrowserWindow | null) => {
 
 				return { iconUrl };
 			}),
+
+		onProjectChanged: publicProcedure.subscription(() => {
+			return observable<{ projectId: string; updatedAt: string }>((emit) => {
+				const onChange = (data: { projectId: string; updatedAt: string }) => {
+					emit.next(data);
+				};
+				dataEmitter.on("projectChanged", onChange);
+				return () => {
+					dataEmitter.off("projectChanged", onChange);
+				};
+			});
+		}),
 	});
 };
 

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/ui-state/index.ts

@@ -2,6 +2,7 @@ import { observable } from "@trpc/server/observable";
 import { appState } from "main/lib/app-state";
 import type { TabsState, ThemeState } from "main/lib/app-state/schemas";
 import { hotkeysEmitter } from "main/lib/hotkeys-events";
+import { tabsEmitter } from "main/lib/tabs-events";
 import {
 	buildOverridesFromBindings,
 	HOTKEYS_STATE_VERSION,
@@ -259,8 +260,23 @@ export const createUiStateRouter = () => {
 				.mutation(async ({ input }) => {
 					appState.data.tabsState = input;
 					await appState.write();
+					tabsEmitter.emit("change", {
+						updatedAt: new Date().toISOString(),
+					});
 					return { success: true };
 				}),
+
+			subscribe: publicProcedure.subscription(() => {
+				return observable<{ updatedAt: string }>((emit) => {
+					const onChange = (data: { updatedAt: string }) => {
+						emit.next(data);
+					};
+					tabsEmitter.on("change", onChange);
+					return () => {
+						tabsEmitter.off("change", onChange);
+					};
+				});
+			}),
 		}),
 
 		// Theme state procedures

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

@@ -3,6 +3,8 @@ import { homedir } from "node:os";
 import path from "node:path";
 import type { BrowserWindow } from "electron";
 import { dialog } from "electron";
+import { windowManager } from "main/lib/window-manager";
+import { ProjectWindow } from "main/windows/project";
 import { z } from "zod";
 import { publicProcedure, router } from "..";
 
@@ -126,6 +128,18 @@ export const createWindowRouter = (getWindow: () => BrowserWindow | null) => {
 
 			return { canceled: false, dataUrl };
 		}),
+
+		openProjectInNewWindow: publicProcedure
+			.input(z.object({ projectId: z.string() }))
+			.mutation(async ({ input }) => {
+				// If already open, just focus the existing window
+				if (windowManager.focusProjectWindow(input.projectId)) {
+					return { focused: true, opened: false };
+				}
+				// Create a new project-focused window
+				await ProjectWindow(input.projectId);
+				return { focused: false, opened: true };
+			}),
 	});
 };