fix(git): stabilize worktree row while deleting

src/App.tsx

@@ -2039,6 +2039,9 @@ const ProjectWorkspace = forwardRef<
 	>({});
 	const [worktreePanelStatus, setWorktreePanelStatus] =
 		useState<WorktreePanelStatus | null>(null);
+	const [deletingWorktreePaths, setDeletingWorktreePaths] = useState<
+		Set<string>
+	>(() => new Set());
 	const [gitPushMenuPosition, setGitPushMenuPosition] = useState<{
 		target: GitPushMenuTarget;
 		x: number;
@@ -3749,6 +3752,12 @@ const ProjectWorkspace = forwardRef<
 				return;
 			}
 
+			setDeletingWorktreePaths((current) => {
+				const next = new Set(current);
+				next.add(worktree.path);
+				return next;
+			});
+
 			try {
 				await window.terminay.removeGitWorktree({
 					force: true,
@@ -3760,6 +3769,11 @@ const ProjectWorkspace = forwardRef<
 				void loadDirectory(parentDir || project.rootFolder);
 				void refreshGitStatuses();
 			} catch (error) {
+				setDeletingWorktreePaths((current) => {
+					const next = new Set(current);
+					next.delete(worktree.path);
+					return next;
+				});
 				setErrorText(`Failed to delete worktree: ${String(error)}`);
 				void refreshGitStatuses();
 			}
@@ -4311,6 +4325,7 @@ const ProjectWorkspace = forwardRef<
 		setDirectoryChildren({});
 		setDirectoryErrors({});
 		setGitStatuses({});
+		setDeletingWorktreePaths(new Set());
 		setLoadingPaths({});
 		setExpandedPaths(project.rootFolder ? { [project.rootFolder]: true } : {});
 
@@ -4320,6 +4335,22 @@ const ProjectWorkspace = forwardRef<
 		}
 	}, [loadDirectory, project.rootFolder, refreshGitStatuses]);
 
+	useEffect(() => {
+		if (!worktreePanelStatus?.repoRoot) {
+			return;
+		}
+
+		const visibleWorktreePaths = new Set(
+			worktreePanelStatus.worktrees.map((worktree) => worktree.path),
+		);
+		setDeletingWorktreePaths((current) => {
+			const next = new Set(
+				Array.from(current).filter((path) => visibleWorktreePaths.has(path)),
+			);
+			return next.size === current.size ? current : next;
+		});
+	}, [worktreePanelStatus]);
+
 	useEffect(() => {
 		if (!project.rootFolder || !project.isFileExplorerOpen) {
 			return;
@@ -7141,6 +7172,7 @@ const ProjectWorkspace = forwardRef<
 										activePushMenuWorktreePath={
 											gitPushMenuPosition?.target?.worktreePath ?? null
 										}
+										deletingWorktreePaths={deletingWorktreePaths}
 										status={worktreePanelStatus}
 										viewMode={settings.sidebar.gitPanelViewMode}
 										onDeleteWorktree={handleDeleteWorktree}

src/components/git-panel/WorktreesPanel.tsx

@@ -23,6 +23,7 @@ import './gitPanel.css';
 
 export type WorktreesPanelProps = {
 	activePushMenuWorktreePath?: string | null;
+	deletingWorktreePaths?: ReadonlySet<string>;
 	status: WorktreePanelStatus | null;
 	viewMode: 'list' | 'tree';
 	onDeleteWorktree: (worktree: GitWorktreeStatus) => void;
@@ -90,6 +91,7 @@ function formatWorktreeDate(value: string | null): string {
 export function WorktreesPanel(props: WorktreesPanelProps): JSX.Element {
 	const {
 		activePushMenuWorktreePath,
+		deletingWorktreePaths,
 		status,
 		viewMode,
 		onDeleteWorktree,
@@ -199,12 +201,15 @@ export function WorktreesPanel(props: WorktreesPanelProps): JSX.Element {
 	return (
 		<div className="worktrees-panel">
 			{status.worktrees.map((worktree) => {
+				const isDeleting = deletingWorktreePaths?.has(worktree.path) ?? false;
 				const collapsed = collapsedWorktrees.has(worktree.path);
 				const hasUnmergedOrUncommittedWork =
-					worktree.isDirtyBranch || worktree.entries.length > 0;
+					!isDeleting &&
+					(worktree.isDirtyBranch || worktree.entries.length > 0);
 				const hasLineChanges =
-					(worktree.lineAdditions ?? 0) > 0 ||
-					(worktree.lineDeletions ?? 0) > 0;
+					!isDeleting &&
+					((worktree.lineAdditions ?? 0) > 0 ||
+						(worktree.lineDeletions ?? 0) > 0);
 				const WorktreeIcon = worktree.isMain ? FolderGit : GitBranch;
 				const pushUnavailable =
 					worktree.isBare || worktree.isPrunable || !!worktree.errorMessage;
@@ -217,7 +222,13 @@ export function WorktreesPanel(props: WorktreesPanelProps): JSX.Element {
 				};
 
 				return (
-					<section key={worktree.path} className="worktrees-panel__worktree">
+					<section
+						key={worktree.path}
+						className={`worktrees-panel__worktree${
+							isDeleting ? ' worktrees-panel__worktree--deleting' : ''
+						}`}
+						aria-busy={isDeleting}
+					>
 						<div
 							className={[
 								'worktrees-panel__worktree-header',
@@ -231,12 +242,24 @@ export function WorktreesPanel(props: WorktreesPanelProps): JSX.Element {
 							]
 								.filter(Boolean)
 								.join(' ')}
-							onContextMenu={(event) => openContextMenu(event, worktree)}
-							title={getWorktreeTitle(worktree)}
+							onContextMenu={(event) => {
+								if (isDeleting) {
+									event.preventDefault();
+									event.stopPropagation();
+									return;
+								}
+								openContextMenu(event, worktree);
+							}}
+							title={
+								isDeleting
+									? `${worktree.path}\nDeleting…`
+									: getWorktreeTitle(worktree)
+							}
 						>
 							<button
 								type="button"
 								className="worktrees-panel__worktree-toggle"
+								disabled={isDeleting}
 								onClick={() => toggleWorktree(worktree.path)}
 								aria-expanded={!collapsed}
 							>
@@ -269,7 +292,11 @@ export function WorktreesPanel(props: WorktreesPanelProps): JSX.Element {
 										</span>
 									</span>
 									<span className="worktrees-panel__worktree-meta">
-										{hasLineChanges ? (
+										{isDeleting ? (
+											<span className="worktrees-panel__deleting">
+												deleting…
+											</span>
+										) : hasLineChanges ? (
 											<>
 												<span className="worktrees-panel__delta worktrees-panel__delta--additions">
 													+{worktree.lineAdditions ?? 0}
@@ -292,7 +319,7 @@ export function WorktreesPanel(props: WorktreesPanelProps): JSX.Element {
 								className={`worktrees-panel__push-button${
 									pushMenuOpen ? ' worktrees-panel__push-button--active' : ''
 								}`}
-								disabled={pushUnavailable}
+								disabled={pushUnavailable || isDeleting}
 								onClick={(event) => {
 									event.stopPropagation();
 									if (pushUnavailable) {
@@ -316,7 +343,7 @@ export function WorktreesPanel(props: WorktreesPanelProps): JSX.Element {
 								<Upload size={14} aria-hidden="true" />
 							</button>
 						</div>
-						{collapsed ? null : worktree.errorMessage ? (
+						{isDeleting || collapsed ? null : worktree.errorMessage ? (
 							<div className="git-panel__message">{worktree.errorMessage}</div>
 						) : worktree.isBare ? (
 							<div className="git-panel__message">Bare worktree</div>

src/components/git-panel/gitPanel.css

@@ -258,6 +258,10 @@
 	border-top: 1px solid rgba(255, 255, 255, 0.05);
 }
 
+.worktrees-panel__worktree--deleting {
+	opacity: 0.52;
+}
+
 .worktrees-panel__worktree-header {
 	box-sizing: border-box;
 	min-height: 48px;
@@ -276,6 +280,10 @@
 	background: rgba(255, 255, 255, 0.05);
 }
 
+.worktrees-panel__worktree--deleting .worktrees-panel__worktree-header:hover {
+	background: transparent;
+}
+
 .worktrees-panel__worktree-toggle {
 	all: unset;
 	box-sizing: border-box;
@@ -443,6 +451,13 @@
 	font-weight: 600;
 }
 
+.worktrees-panel__deleting {
+	flex: 0 0 auto;
+	color: rgba(220, 226, 240, 0.72);
+	font-style: italic;
+	font-weight: 600;
+}
+
 .worktrees-panel__changes {
 	position: relative;
 	display: flex;