fix(desktop): prevent InitGitDialog errors from being hidden by navigation

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

@@ -40,34 +40,23 @@ type Project = SelectProject;
 
 // Return types for openNew procedure (single project)
 type OpenNewCanceled = { canceled: true };
-type OpenNewSuccess = { canceled: false; project: Project };
-type OpenNewNeedsGitInit = {
-	canceled: false;
-	needsGitInit: true;
-	selectedPath: string;
-};
 type OpenNewError = { canceled: false; error: string };
-export type OpenNewResult =
+type OpenNewResult =
 	| OpenNewCanceled
-	| OpenNewSuccess
-	| OpenNewNeedsGitInit
+	| { canceled: false; project: Project }
+	| { canceled: false; needsGitInit: true; selectedPath: string }
 	| OpenNewError;
 
 // Per-folder outcome for multi-select
-export type FolderOutcome =
+type FolderOutcome =
 	| { status: "success"; project: Project }
 	| { status: "needsGitInit"; selectedPath: string }
 	| { status: "error"; selectedPath: string; error: string };
 
 // Return types for openNew procedure (multi-select)
-type OpenNewMultiSuccess = {
-	canceled: false;
-	multi: true;
-	results: FolderOutcome[];
-};
-export type OpenNewMultiResult =
+type OpenNewMultiResult =
 	| OpenNewCanceled
-	| OpenNewMultiSuccess
+	| { canceled: false; multi: true; results: FolderOutcome[] }
 	| OpenNewError;
 
 /**
@@ -515,7 +504,7 @@ export const createProjectsRouter = (getWindow: () => BrowserWindow | null) => {
 					outcomes.push({
 						status: "error",
 						selectedPath,
-						error: "Failed to open project",
+						error: error instanceof Error ? error.message : String(error),
 					});
 				}
 			}

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

@@ -39,7 +39,10 @@ import {
 import { LuFolderOpen } from "react-icons/lu";
 import { electronTrpc } from "renderer/lib/electron-trpc";
 import { formatRelativeTime } from "renderer/lib/formatRelativeTime";
-import { useOpenNew } from "renderer/react-query/projects";
+import {
+	processOpenNewResults,
+	useOpenNew,
+} from "renderer/react-query/projects";
 import { useCreateWorkspace } from "renderer/react-query/workspaces";
 import {
 	useCloseNewWorkspaceModal,
@@ -201,47 +204,25 @@ export function NewWorkspaceModal() {
 			const result = await openNew.mutateAsync(undefined);
 			if (result.canceled) return;
 
-			if ("error" in result && !("multi" in result)) {
+			if ("error" in result) {
 				toast.error("Failed to open project", { description: result.error });
 				return;
 			}
 
-			if ("multi" in result) {
-				const successes = result.results.filter((r) => r.status === "success");
-				const needsGitInit = result.results.filter(
-					(r) => r.status === "needsGitInit",
-				);
-				const errors = result.results.filter((r) => r.status === "error");
+			if ("results" in result) {
+				const { successes } = processOpenNewResults({
+					results: result.results,
+					showSuccessToast: false,
+					showGitInitToast: true,
+				});
 
-				// Show summary toast when multiple projects imported
 				if (successes.length > 1) {
 					toast.success(`${successes.length} projects imported`);
 				}
 
-				// Select the first successful project
 				if (successes.length > 0) {
 					setSelectedProjectId(successes[0].project.id);
 				}
-
-				// Show errors
-				for (const err of errors) {
-					toast.error(`Failed to open ${err.selectedPath.split("/").pop()}`, {
-						description: err.error,
-					});
-				}
-
-				// Show git init warnings
-				if (needsGitInit.length > 0) {
-					const names = needsGitInit
-						.map((r) => r.selectedPath.split("/").pop())
-						.join(", ");
-					toast.error(
-						needsGitInit.length === 1
-							? "Folder is not a git repository"
-							: `${needsGitInit.length} folders are not git repositories`,
-						{ description: names },
-					);
-				}
 			}
 		} catch (error) {
 			toast.error("Failed to open project", {

apps/desktop/src/renderer/react-query/projects/index.ts

@@ -1,3 +1,4 @@
+export { processOpenNewResults } from "./processOpenNewResults";
 export { useOpenFromPath } from "./useOpenFromPath";
 export { useOpenNew } from "./useOpenNew";
 export { useReorderProjects } from "./useReorderProjects";

apps/desktop/src/renderer/react-query/projects/processOpenNewResults.ts

@@ -0,0 +1,78 @@
+import { toast } from "@superset/ui/sonner";
+import type { ElectronRouterOutputs } from "renderer/lib/electron-trpc";
+
+type OpenNewResult = ElectronRouterOutputs["projects"]["openNew"];
+
+type MultiResults = Extract<OpenNewResult, { multi: true }>["results"];
+
+type SuccessOutcome = Extract<MultiResults[number], { status: "success" }>;
+type NeedsGitInitOutcome = Extract<
+	MultiResults[number],
+	{ status: "needsGitInit" }
+>;
+type ErrorOutcome = Extract<MultiResults[number], { status: "error" }>;
+
+export interface CategorizedResults {
+	successes: SuccessOutcome[];
+	needsGitInit: NeedsGitInitOutcome[];
+	errors: ErrorOutcome[];
+}
+
+/**
+ * Categorizes multi-select open-project results and shows standard toasts.
+ *
+ * Always:
+ * - Categorizes results into successes / needsGitInit / errors
+ * - Shows per-error toasts
+ *
+ * Optionally:
+ * - Shows a success summary toast ("N projects opened") — on by default
+ * - Shows a git-init warning toast (used by sidebar + modal where no InitGitDialog is available)
+ */
+export function processOpenNewResults({
+	results,
+	showSuccessToast = true,
+	showGitInitToast = false,
+}: {
+	results: MultiResults;
+	showSuccessToast?: boolean;
+	showGitInitToast?: boolean;
+}): CategorizedResults {
+	const successes = results.filter(
+		(r): r is SuccessOutcome => r.status === "success",
+	);
+	const needsGitInit = results.filter(
+		(r): r is NeedsGitInitOutcome => r.status === "needsGitInit",
+	);
+	const errors = results.filter((r): r is ErrorOutcome => r.status === "error");
+
+	for (const err of errors) {
+		toast.error(`Failed to open ${err.selectedPath.split("/").pop()}`, {
+			description: err.error,
+		});
+	}
+
+	if (showSuccessToast && successes.length > 0) {
+		toast.success(
+			successes.length === 1
+				? "Project opened"
+				: `${successes.length} projects opened`,
+		);
+	}
+
+	if (showGitInitToast && needsGitInit.length > 0) {
+		const names = needsGitInit
+			.map((r) => r.selectedPath.split("/").pop())
+			.join(", ");
+		toast.error(
+			needsGitInit.length === 1
+				? "Folder is not a git repository"
+				: `${needsGitInit.length} folders are not git repositories`,
+			{
+				description: `${names} - use 'Open project' from the start view to initialize git.`,
+			},
+		);
+	}
+
+	return { successes, needsGitInit, errors };
+}

apps/desktop/src/renderer/screens/main/components/StartView/index.tsx

@@ -1,10 +1,13 @@
 import { Button } from "@superset/ui/button";
-import { toast } from "@superset/ui/sonner";
 import { cn } from "@superset/ui/utils";
 import { useNavigate } from "@tanstack/react-router";
 import { useCallback, useEffect, useState } from "react";
 import { LuFolderGit, LuFolderOpen, LuX } from "react-icons/lu";
-import { useOpenFromPath, useOpenNew } from "renderer/react-query/projects";
+import {
+	processOpenNewResults,
+	useOpenFromPath,
+	useOpenNew,
+} from "renderer/react-query/projects";
 import { SupersetLogo } from "renderer/routes/sign-in/components/SupersetLogo";
 import { CloneRepoDialog } from "./CloneRepoDialog";
 import { InitGitDialog } from "./InitGitDialog";
@@ -19,6 +22,9 @@ export function StartView() {
 		selectedPath: string;
 		selectedPaths?: string[];
 	}>({ isOpen: false, selectedPath: "" });
+	const [pendingNavigateProjectId, setPendingNavigateProjectId] = useState<
+		string | null
+	>(null);
 	const [isCloneDialogOpen, setIsCloneDialogOpen] = useState(false);
 	const [isDragOver, setIsDragOver] = useState(false);
 
@@ -52,56 +58,35 @@ export function StartView() {
 					return;
 				}
 
-				if ("error" in result && !("multi" in result)) {
+				if ("error" in result) {
 					setError(result.error);
 					return;
 				}
 
-				if ("multi" in result) {
-					const successes = result.results.filter(
-						(r) => r.status === "success",
-					);
-					const needsGitInit = result.results.filter(
-						(r) => r.status === "needsGitInit",
-					);
-					const errors = result.results.filter((r) => r.status === "error");
-
-					// Show summary toast for opened projects
-					if (successes.length > 0) {
-						toast.success(
-							successes.length === 1
-								? "Project opened"
-								: `${successes.length} projects opened`,
-						);
-
-						// Navigate to the first successfully opened project
-						navigate({
-							to: "/project/$projectId",
-							params: { projectId: successes[0].project.id },
-							replace: true,
-						});
-					}
+				if ("results" in result) {
+					const { successes, needsGitInit } = processOpenNewResults({
+						results: result.results,
+					});
 
-					// Show errors
-					if (errors.length > 0) {
-						for (const err of errors) {
-							toast.error(
-								`Failed to open ${err.selectedPath.split("/").pop()}`,
-								{
-									description: err.error,
-								},
-							);
-						}
-					}
+					const firstProjectId = successes[0]?.project.id;
 
-					// Prompt for git init if needed
 					if (needsGitInit.length > 0) {
 						const paths = needsGitInit.map((r) => r.selectedPath);
+						// Defer navigation until git-init dialog is closed
+						if (firstProjectId) {
+							setPendingNavigateProjectId(firstProjectId);
+						}
 						setInitGitDialog({
 							isOpen: true,
 							selectedPath: paths[0],
 							selectedPaths: paths,
 						});
+					} else if (firstProjectId) {
+						navigate({
+							to: "/project/$projectId",
+							params: { projectId: firstProjectId },
+							replace: true,
+						});
 					}
 
 					return;
@@ -305,8 +290,21 @@ export function StartView() {
 				isOpen={initGitDialog.isOpen}
 				selectedPath={initGitDialog.selectedPath}
 				selectedPaths={initGitDialog.selectedPaths}
-				onClose={() => setInitGitDialog({ isOpen: false, selectedPath: "" })}
-				onError={setError}
+				onClose={() => {
+					setInitGitDialog({ isOpen: false, selectedPath: "" });
+					if (pendingNavigateProjectId) {
+						navigate({
+							to: "/project/$projectId",
+							params: { projectId: pendingNavigateProjectId },
+							replace: true,
+						});
+						setPendingNavigateProjectId(null);
+					}
+				}}
+				onError={(msg) => {
+					setError(msg);
+					setPendingNavigateProjectId(null);
+				}}
 			/>
 
 			<CloneRepoDialog