Upstream sync: v2 sidebar, recently viewed, workspace fixes

apps/desktop/package.json

@@ -171,7 +171,7 @@
 		"dockerfile-utils": "0.16.3",
 		"dotenv": "^17.3.1",
 		"drizzle-orm": "0.45.1",
-		"electron-updater": "^6.7.3",
+		"electron-updater": "^6.8.3",
 		"elkjs": "^0.11.1",
 		"exceljs": "^4.4.0",
 		"execa": "^9.6.0",

apps/desktop/src/main/lib/auto-updater.ts

@@ -7,6 +7,26 @@ import { gt, prerelease, valid } from "semver";
 import { AUTO_UPDATE_STATUS, type AutoUpdateStatus } from "shared/auto-update";
 import { PLATFORM } from "shared/constants";
 
+// electron-updater's internal cache only self-invalidates when the remote
+// sha512 differs from cached metadata, so a corrupt cached download (e.g.
+// failed Squirrel install) gets retried indefinitely until the user
+// manually reinstalls. Reach into the protected helper to clear it.
+interface AppUpdaterInternals {
+	downloadedUpdateHelper: { clear(): Promise<void> } | null;
+}
+
+async function clearCachedUpdate(reason: string): Promise<void> {
+	const helper = (autoUpdater as unknown as AppUpdaterInternals)
+		.downloadedUpdateHelper;
+	if (!helper) return;
+	try {
+		await helper.clear();
+		console.info(`[auto-updater] Cleared cached update (${reason})`);
+	} catch (error) {
+		console.error("[auto-updater] Failed to clear cached update:", error);
+	}
+}
+
 const UPDATE_CHECK_INTERVAL_MS = 1000 * 60 * 60 * 4; // 4 hours
 
 /**
@@ -405,6 +425,7 @@ export function setupAutoUpdater(): void {
 			`[auto-updater] Error during update (currentVersion=${app.getVersion()}):`,
 			error?.message || error,
 		);
+		void clearCachedUpdate(`error: ${error?.message ?? "unknown"}`);
 		emitStatus(AUTO_UPDATE_STATUS.ERROR, undefined, error.message);
 	});
 

apps/desktop/src/renderer/hooks/host-service/useGitStatus/useGitStatus.ts

@@ -1,6 +1,5 @@
 import { workspaceTrpc } from "@superset/workspace-client";
 import { useCallback } from "react";
-import { useCollections } from "renderer/routes/_authenticated/providers/CollectionsProvider";
 import { useWorkspaceEvent } from "../useWorkspaceEvent";
 
 /**
@@ -15,20 +14,25 @@ import { useWorkspaceEvent } from "../useWorkspaceEvent";
  * debounce needed.
  */
 export function useGitStatus(workspaceId: string) {
-	const collections = useCollections();
-	const baseBranch: string | null =
-		collections.v2WorkspaceLocalState.get(workspaceId)?.sidebarState
-			?.baseBranch ?? null;
-
 	const utils = workspaceTrpc.useUtils();
 
+	const baseBranchQuery = workspaceTrpc.git.getBaseBranch.useQuery(
+		{ workspaceId },
+		{ staleTime: Number.POSITIVE_INFINITY, enabled: Boolean(workspaceId) },
+	);
+	const baseBranch = baseBranchQuery.data?.baseBranch ?? null;
+
 	const query = workspaceTrpc.git.getStatus.useQuery(
 		{ workspaceId, baseBranch: baseBranch ?? undefined },
 		{ refetchOnWindowFocus: true, enabled: Boolean(workspaceId) },
 	);
 
 	const invalidate = useCallback(() => {
 		void utils.git.getStatus.invalidate({ workspaceId });
+		// Current branch may have changed (external checkout), and
+		// branch.<name>.base is per-branch — drop the cache so the next read
+		// picks up the new branch's base.
+		void utils.git.getBaseBranch.invalidate({ workspaceId });
 	}, [utils, workspaceId]);
 
 	useWorkspaceEvent("git:changed", workspaceId, invalidate);

apps/desktop/src/renderer/routes/_authenticated/_dashboard/pending/$pendingId/page.tsx

@@ -134,10 +134,12 @@ function PendingWorkspacePage() {
 	// pendingId actually dispatches — otherwise the second page sticks in
 	// "creating" forever.
 	const prevPendingIdRef = useRef(pendingId);
+	const [syncTimedOut, setSyncTimedOut] = useState(false);
 	if (prevPendingIdRef.current !== pendingId) {
 		prevPendingIdRef.current = pendingId;
 		firedRef.current = false;
 		navigatedRef.current = false;
+		setSyncTimedOut(false);
 	}
 
 	const { data: pendingRows } = useLiveQuery(
@@ -215,70 +217,55 @@ function PendingWorkspacePage() {
 	const isStale =
 		pending?.status === "creating" && elapsedMs > STALE_THRESHOLD_MS;
 
-	// Fallback: if the collection never syncs (offline, slow Electric),
-	// navigate anyway after a bounded wait. Target page will show its own
-	// loading state.
-	const [syncTimedOut, setSyncTimedOut] = useState(false);
-	// FORK NOTE: reset syncTimedOut when pendingId switches — otherwise a
-	// sticky `true` from the previous pending would skip the local-sync
-	// wait on the next pending and reintroduce the `workspace not found`
-	// race this fallback is trying to paper over. Biome flags [pendingId]
-	// as unnecessary because the effect body doesn't read it, but we want
-	// the effect to *re-run on change* — that's the whole point.
-	// biome-ignore lint/correctness/useExhaustiveDependencies: intentional re-run on pendingId change
-	useEffect(() => {
-		setSyncTimedOut(false);
-	}, [pendingId]);
+	// If sync stalls past this, swap the spinner for a recoverable stall UI
+	// rather than silently navigating into "Workspace not found". syncTimedOut
+	// must stay in the deps + guard below so "Keep waiting" (which flips it
+	// false) re-arms a fresh timer instead of leaving the user stranded.
+	const SYNC_TIMEOUT_MS = 10_000;
 	useEffect(() => {
 		if (
 			pending?.status !== "succeeded" ||
 			!pending.workspaceId ||
 			workspaceSynced ||
+			syncTimedOut ||
 			navigatedRef.current
 		) {
 			return;
 		}
-		const timer = setTimeout(() => setSyncTimedOut(true), 3000);
+		const timer = setTimeout(() => setSyncTimedOut(true), SYNC_TIMEOUT_MS);
 		return () => clearTimeout(timer);
-	}, [pending?.status, pending?.workspaceId, workspaceSynced]);
+	}, [pending?.status, pending?.workspaceId, workspaceSynced, syncTimedOut]);
+
+	const doNavigate = useCallback(() => {
+		if (!pending?.workspaceId || navigatedRef.current) return;
+		navigatedRef.current = true;
+		ensureWorkspaceInSidebar(pending.workspaceId, pending.projectId);
+
+		if (pending.terminals.length > 0) {
+			const paneLayout = buildSetupPaneLayout(pending.terminals);
+			collections.v2WorkspaceLocalState.update(pending.workspaceId, (draft) => {
+				draft.paneLayout = paneLayout;
+			});
+		}
+
+		void navigate({
+			to: "/v2-workspace/$workspaceId",
+			params: { workspaceId: pending.workspaceId },
+		});
+		setTimeout(() => {
+			collections.pendingWorkspaces.delete(pendingId);
+		}, 1000);
+	}, [collections, ensureWorkspaceInSidebar, navigate, pending, pendingId]);
 
 	useEffect(() => {
 		if (
 			pending?.status === "succeeded" &&
 			pending.workspaceId &&
-			(workspaceSynced || syncTimedOut) &&
-			!navigatedRef.current
+			workspaceSynced
 		) {
-			navigatedRef.current = true;
-			ensureWorkspaceInSidebar(pending.workspaceId, pending.projectId);
-
-			if (pending.terminals.length > 0) {
-				const paneLayout = buildSetupPaneLayout(pending.terminals);
-				collections.v2WorkspaceLocalState.update(
-					pending.workspaceId,
-					(draft) => {
-						draft.paneLayout = paneLayout;
-					},
-				);
-			}
-
-			void navigate({
-				to: "/v2-workspace/$workspaceId",
-				params: { workspaceId: pending.workspaceId },
-			});
-			setTimeout(() => {
-				collections.pendingWorkspaces.delete(pendingId);
-			}, 1000);
+			doNavigate();
 		}
-	}, [
-		collections,
-		ensureWorkspaceInSidebar,
-		navigate,
-		pending,
-		pendingId,
-		workspaceSynced,
-		syncTimedOut,
-	]);
+	}, [pending?.status, pending?.workspaceId, workspaceSynced, doNavigate]);
 
 	if (!pending) {
 		return (
@@ -374,24 +361,62 @@ function PendingWorkspacePage() {
 					</div>
 				)}
 
-				{pending.status === "succeeded" && (
-					<div className="space-y-2">
-						<div className="flex items-center gap-2 text-sm text-emerald-500">
-							<HiCheck className="size-4" />
-							<span>Workspace ready — opening...</span>
+				{pending.status === "succeeded" &&
+					(syncTimedOut && !workspaceSynced ? (
+						<div className="space-y-4">
+							<div className="flex items-start gap-2 text-sm text-amber-500">
+								<HiExclamationTriangle className="size-4 mt-0.5 shrink-0" />
+								<span>
+									Workspace was created but hasn't synced to this device yet.
+									Check your connection.
+								</span>
+							</div>
+							<div className="flex gap-2">
+								<button
+									type="button"
+									className="rounded-md bg-primary px-3 py-1.5 text-sm text-primary-foreground hover:bg-primary/90"
+									onClick={() => setSyncTimedOut(false)}
+								>
+									Keep waiting
+								</button>
+								<button
+									type="button"
+									className="rounded-md border px-3 py-1.5 text-sm hover:bg-accent"
+									onClick={doNavigate}
+								>
+									Open anyway
+								</button>
+								<button
+									type="button"
+									className="rounded-md border px-3 py-1.5 text-sm text-muted-foreground hover:text-foreground hover:bg-accent"
+									onClick={() => {
+										collections.pendingWorkspaces.delete(pendingId);
+										void clearAttachments(pendingId);
+										void navigate({ to: "/" });
+									}}
+								>
+									Dismiss
+								</button>
+							</div>
 						</div>
-						{pending.warnings.length > 0 && (
-							<ul className="space-y-1 text-xs text-amber-500">
-								{pending.warnings.map((w) => (
-									<li key={w} className="flex items-start gap-1.5">
-										<HiExclamationTriangle className="size-3.5 mt-0.5 shrink-0" />
-										<span>{w}</span>
-									</li>
-								))}
-							</ul>
-						)}
-					</div>
-				)}
+					) : (
+						<div className="space-y-2">
+							<div className="flex items-center gap-2 text-sm text-emerald-500">
+								<HiCheck className="size-4" />
+								<span>Workspace ready — opening...</span>
+							</div>
+							{pending.warnings.length > 0 && (
+								<ul className="space-y-1 text-xs text-amber-500">
+									{pending.warnings.map((w) => (
+										<li key={w} className="flex items-start gap-1.5">
+											<HiExclamationTriangle className="size-3.5 mt-0.5 shrink-0" />
+											<span>{w}</span>
+										</li>
+									))}
+								</ul>
+							)}
+						</div>
+					))}
 
 				{pending.status === "failed" && (
 					<div className="space-y-4">