feat(desktop): show ahead/behind status on local workspace

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

@@ -732,6 +732,8 @@ export const createCreateProcedures = () => {
 								gitStatus: {
 									branch: existingWorktree.branch,
 									needsRebase: false,
+									ahead: 0,
+									behind: 0,
 									lastRefreshed: Date.now(),
 								},
 							})
@@ -816,6 +818,8 @@ export const createCreateProcedures = () => {
 						gitStatus: {
 							branch: input.branch,
 							needsRebase: false,
+							ahead: 0,
+							behind: 0,
 							lastRefreshed: Date.now(),
 						},
 					})

apps/desktop/src/lib/trpc/routers/workspaces/procedures/git-status.ts

@@ -10,8 +10,8 @@ import {
 	updateProjectDefaultBranch,
 } from "../utils/db-helpers";
 import {
-	checkNeedsRebase,
 	fetchDefaultBranch,
+	getAheadBehindCount,
 	getDefaultBranch,
 	listExternalWorktrees,
 	refreshDefaultBranch,
@@ -42,7 +42,6 @@ export const createGitStatusProcedures = () => {
 					throw new Error(`Project ${workspace.projectId} not found`);
 				}
 
-				// Sync with remote in case the default branch changed (e.g. master -> main)
 				const remoteDefaultBranch = await refreshDefaultBranch(
 					project.mainRepoPath,
 				);
@@ -59,22 +58,21 @@ export const createGitStatusProcedures = () => {
 					updateProjectDefaultBranch(project.id, defaultBranch);
 				}
 
-				// Fetch default branch to get latest
 				await fetchDefaultBranch(project.mainRepoPath, defaultBranch);
 
-				// Check if worktree branch is behind origin/{defaultBranch}
-				const needsRebase = await checkNeedsRebase(
-					worktree.path,
+				const { ahead, behind } = await getAheadBehindCount({
+					repoPath: worktree.path,
 					defaultBranch,
-				);
+				});
 
 				const gitStatus = {
 					branch: worktree.branch,
-					needsRebase,
+					needsRebase: behind > 0,
+					ahead,
+					behind,
 					lastRefreshed: Date.now(),
 				};
 
-				// Update worktree in db
 				localDb
 					.update(worktrees)
 					.set({ gitStatus })
@@ -84,6 +82,25 @@ export const createGitStatusProcedures = () => {
 				return { gitStatus, defaultBranch };
 			}),
 
+		getAheadBehind: publicProcedure
+			.input(z.object({ workspaceId: z.string() }))
+			.query(async ({ input }) => {
+				const workspace = getWorkspace(input.workspaceId);
+				if (!workspace) {
+					return { ahead: 0, behind: 0 };
+				}
+
+				const project = getProject(workspace.projectId);
+				if (!project) {
+					return { ahead: 0, behind: 0 };
+				}
+
+				return getAheadBehindCount({
+					repoPath: project.mainRepoPath,
+					defaultBranch: workspace.branch,
+				});
+			}),
+
 		getGitHubStatus: publicProcedure
 			.input(z.object({ workspaceId: z.string() }))
 			.query(async ({ input }) => {
@@ -99,10 +116,8 @@ export const createGitStatusProcedures = () => {
 					return null;
 				}
 
-				// Always fetch fresh data on hover
 				const freshStatus = await fetchGitHubPRStatus(worktree.path);
 
-				// Update cache if we got data
 				if (freshStatus) {
 					localDb
 						.update(worktrees)
@@ -129,7 +144,6 @@ export const createGitStatusProcedures = () => {
 					return null;
 				}
 
-				// Extract worktree name from path (last segment)
 				const worktreeName = worktree.path.split("/").pop() ?? worktree.branch;
 				const branchName = worktree.branch;
 

apps/desktop/src/lib/trpc/routers/workspaces/utils/git.ts

@@ -1090,6 +1090,31 @@ export async function checkNeedsRebase(
 	return Number.parseInt(behindCount.trim(), 10) > 0;
 }
 
+export async function getAheadBehindCount({
+	repoPath,
+	defaultBranch,
+}: {
+	repoPath: string;
+	defaultBranch: string;
+}): Promise<{ ahead: number; behind: number }> {
+	const git = simpleGit(repoPath);
+	try {
+		const output = await git.raw([
+			"rev-list",
+			"--left-right",
+			"--count",
+			`origin/${defaultBranch}...HEAD`,
+		]);
+		const [behindStr, aheadStr] = output.trim().split(/\s+/);
+		return {
+			ahead: Number.parseInt(aheadStr || "0", 10),
+			behind: Number.parseInt(behindStr || "0", 10),
+		};
+	} catch {
+		return { ahead: 0, behind: 0 };
+	}
+}
+
 export async function hasUncommittedChanges(
 	worktreePath: string,
 ): Promise<boolean> {

apps/desktop/src/lib/trpc/routers/workspaces/utils/workspace-init.ts

@@ -118,6 +118,8 @@ export async function initializeWorkspaceWorktree({
 					gitStatus: {
 						branch,
 						needsRebase: false,
+						ahead: 0,
+						behind: 0,
 						lastRefreshed: Date.now(),
 					},
 				})
@@ -438,6 +440,8 @@ export async function initializeWorkspaceWorktree({
 				gitStatus: {
 					branch,
 					needsRebase: false,
+					ahead: 0,
+					behind: 0,
 					lastRefreshed: Date.now(),
 				},
 			})

apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/CollapsedWorkspaceItem.tsx

@@ -0,0 +1,131 @@
+import {
+	ContextMenu,
+	ContextMenuContent,
+	ContextMenuItem,
+	ContextMenuSeparator,
+	ContextMenuTrigger,
+} from "@superset/ui/context-menu";
+import {
+	HoverCard,
+	HoverCardContent,
+	HoverCardTrigger,
+} from "@superset/ui/hover-card";
+import { Tooltip, TooltipContent, TooltipTrigger } from "@superset/ui/tooltip";
+import { cn } from "@superset/ui/utils";
+import type { RefObject } from "react";
+import { LuCopy, LuX } from "react-icons/lu";
+import type { ActivePaneStatus } from "shared/tabs-types";
+import { STROKE_WIDTH } from "../constants";
+import { DeleteWorkspaceDialog, WorkspaceHoverCardContent } from "./components";
+import { HOVER_CARD_CLOSE_DELAY, HOVER_CARD_OPEN_DELAY } from "./constants";
+import { WorkspaceIcon } from "./WorkspaceIcon";
+
+interface CollapsedWorkspaceItemProps {
+	id: string;
+	name: string;
+	branch: string;
+	type: "worktree" | "branch";
+	isActive: boolean;
+	isUnread: boolean;
+	workspaceStatus: ActivePaneStatus | null;
+	itemRef: RefObject<HTMLElement | null>;
+	showDeleteDialog: boolean;
+	setShowDeleteDialog: (open: boolean) => void;
+	onMouseEnter: () => void;
+	onClick: () => void;
+	onDeleteClick: () => void;
+	onCopyPath: () => void;
+}
+
+export function CollapsedWorkspaceItem({
+	id,
+	name,
+	branch,
+	type,
+	isActive,
+	isUnread,
+	workspaceStatus,
+	itemRef,
+	showDeleteDialog,
+	setShowDeleteDialog,
+	onMouseEnter,
+	onClick,
+	onDeleteClick,
+	onCopyPath,
+}: CollapsedWorkspaceItemProps) {
+	const isBranchWorkspace = type === "branch";
+
+	const collapsedButton = (
+		<button
+			ref={(node) => {
+				(itemRef as React.MutableRefObject<HTMLElement | null>).current = node;
+			}}
+			type="button"
+			onClick={onClick}
+			onMouseEnter={onMouseEnter}
+			className={cn(
+				"relative flex items-center justify-center size-8 rounded-md",
+				"hover:bg-muted/50 transition-colors",
+				isActive && "bg-muted",
+			)}
+		>
+			<WorkspaceIcon
+				isBranchWorkspace={isBranchWorkspace}
+				isActive={isActive}
+				isUnread={isUnread}
+				workspaceStatus={workspaceStatus}
+				variant="collapsed"
+			/>
+		</button>
+	);
+
+	if (isBranchWorkspace) {
+		return (
+			<Tooltip delayDuration={300}>
+				<TooltipTrigger asChild>{collapsedButton}</TooltipTrigger>
+				<TooltipContent side="right" className="flex flex-col gap-0.5">
+					<span className="font-medium">local</span>
+					<span className="text-xs text-muted-foreground font-mono">
+						{branch}
+					</span>
+				</TooltipContent>
+			</Tooltip>
+		);
+	}
+
+	return (
+		<>
+			<HoverCard
+				openDelay={HOVER_CARD_OPEN_DELAY}
+				closeDelay={HOVER_CARD_CLOSE_DELAY}
+			>
+				<ContextMenu>
+					<HoverCardTrigger asChild>
+						<ContextMenuTrigger asChild>{collapsedButton}</ContextMenuTrigger>
+					</HoverCardTrigger>
+					<ContextMenuContent>
+						<ContextMenuItem onSelect={onCopyPath}>
+							<LuCopy className="size-4 mr-2" strokeWidth={STROKE_WIDTH} />
+							Copy Path
+						</ContextMenuItem>
+						<ContextMenuSeparator />
+						<ContextMenuItem onSelect={() => onDeleteClick()}>
+							<LuX className="size-4 mr-2" strokeWidth={STROKE_WIDTH} />
+							Close Worktree
+						</ContextMenuItem>
+					</ContextMenuContent>
+				</ContextMenu>
+				<HoverCardContent side="right" align="start" className="w-72">
+					<WorkspaceHoverCardContent workspaceId={id} workspaceAlias={name} />
+				</HoverCardContent>
+			</HoverCard>
+			<DeleteWorkspaceDialog
+				workspaceId={id}
+				workspaceName={name}
+				workspaceType={type}
+				open={showDeleteDialog}
+				onOpenChange={setShowDeleteDialog}
+			/>
+		</>
+	);
+}

apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceAheadBehind.tsx

@@ -0,0 +1,20 @@
+interface WorkspaceAheadBehindProps {
+	ahead: number;
+	behind: number;
+}
+
+export function WorkspaceAheadBehind({
+	ahead,
+	behind,
+}: WorkspaceAheadBehindProps) {
+	if (ahead === 0 && behind === 0) {
+		return null;
+	}
+
+	return (
+		<div className="flex items-center gap-1.5 text-[10px] font-mono tabular-nums shrink-0">
+			{behind > 0 && <span className="text-amber-500">↓{behind}</span>}
+			{ahead > 0 && <span className="text-emerald-500">↑{ahead}</span>}
+		</div>
+	);
+}

apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceDiffStats.tsx

@@ -24,18 +24,15 @@ export function WorkspaceDiffStats({
 					: "bg-muted/50 group-hover:bg-transparent",
 			)}
 		>
-			{/* Diff stats - hidden on card hover when onClose provided */}
 			<div
-				className={
-					onClose
-						? "flex items-center gap-1.5 group-hover:hidden"
-						: "flex items-center gap-1.5"
-				}
+				className={cn(
+					"flex items-center gap-1.5",
+					onClose && "group-hover:hidden",
+				)}
 			>
 				<span className="text-emerald-500/90">+{additions}</span>
 				<span className="text-red-400/90">−{deletions}</span>
 			</div>
-			{/* X icon - shown on card hover */}
 			{onClose && (
 				<Tooltip delayDuration={300}>
 					<TooltipTrigger asChild>