feat(desktop): allow force delete when teardown fails

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

@@ -150,7 +150,11 @@ export const createDeleteProcedures = () => {
 
 		delete: publicProcedure
 			.input(
-				z.object({ id: z.string(), deleteLocalBranch: z.boolean().optional() }),
+				z.object({
+					id: z.string(),
+					deleteLocalBranch: z.boolean().optional(),
+					force: z.boolean().optional(),
+				}),
 			)
 			.mutation(async ({ input }) => {
 				const workspace = getWorkspace(input.id);
@@ -225,16 +229,23 @@ export const createDeleteProcedures = () => {
 				]);
 
 				if (teardownResult && !teardownResult.success) {
-					console.error(
-						`[workspace/delete] Teardown failed:`,
-						teardownResult.error,
-					);
-					clearWorkspaceDeletingStatus(input.id);
-					return {
-						success: false,
-						error: `Teardown failed: ${teardownResult.error}`,
-						output: teardownResult.output,
-					};
+					if (input.force) {
+						console.warn(
+							`[workspace/delete] Teardown failed but force=true, continuing deletion:`,
+							teardownResult.error,
+						);
+					} else {
+						console.error(
+							`[workspace/delete] Teardown failed:`,
+							teardownResult.error,
+						);
+						clearWorkspaceDeletingStatus(input.id);
+						return {
+							success: false,
+							error: `Teardown failed: ${teardownResult.error}`,
+							output: teardownResult.output,
+						};
+					}
 				}
 
 				if (worktree && project) {
@@ -403,7 +414,12 @@ export const createDeleteProcedures = () => {
 			}),
 
 		deleteWorktree: publicProcedure
-			.input(z.object({ worktreeId: z.string() }))
+			.input(
+				z.object({
+					worktreeId: z.string(),
+					force: z.boolean().optional(),
+				}),
+			)
 			.mutation(async ({ input }) => {
 				const worktree = getWorktree(input.worktreeId);
 
@@ -433,11 +449,18 @@ export const createDeleteProcedures = () => {
 							projectName: project.name,
 						});
 						if (!teardownResult.success) {
-							return {
-								success: false,
-								error: `Teardown failed: ${teardownResult.error}`,
-								output: teardownResult.output,
-							};
+							if (input.force) {
+								console.warn(
+									`[worktree/delete] Teardown failed but force=true, continuing deletion:`,
+									teardownResult.error,
+								);
+							} else {
+								return {
+									success: false,
+									error: `Teardown failed: ${teardownResult.error}`,
+									output: teardownResult.output,
+								};
+							}
 						}
 					}
 

apps/desktop/src/renderer/routes/_authenticated/components/TeardownLogsDialog/TeardownLogsDialog.tsx

@@ -2,12 +2,15 @@ import {
 	CodeBlock,
 	CodeBlockCopyButton,
 } from "@superset/ui/ai-elements/code-block";
+import { Button } from "@superset/ui/button";
 import {
 	Dialog,
 	DialogContent,
+	DialogFooter,
 	DialogHeader,
 	DialogTitle,
 } from "@superset/ui/dialog";
+import { toast } from "@superset/ui/sonner";
 import { useState } from "react";
 
 // biome-ignore lint/suspicious/noControlCharactersInRegex: matching ANSI escape sequences
@@ -17,31 +20,92 @@ function stripAnsi(text: string): string {
 	return text.replace(ANSI_REGEX, "");
 }
 
-let showLogsFn: ((logs: string) => void) | null = null;
+let showLogsFn:
+	| ((logs: string, options?: { onDeleteAnyway?: () => void }) => void)
+	| null = null;
 
-export const showTeardownLogs = (logs: string) => {
+export const showTeardownLogs = (
+	logs: string,
+	options?: { onDeleteAnyway?: () => void },
+) => {
 	if (!showLogsFn) {
 		console.error(
 			"[teardown-logs] TeardownLogsDialog not mounted. Make sure to render <TeardownLogsDialog /> in your app",
 		);
 		return;
 	}
-	showLogsFn(logs);
+	showLogsFn(logs, options);
 };
 
+export function showTeardownFailedToast({
+	toastId,
+	output,
+	onForceDelete,
+}: {
+	toastId: string | number;
+	output: string;
+	onForceDelete: () => void;
+}) {
+	toast.error("Teardown failed", {
+		id: toastId,
+		action: {
+			label: "Delete Anyway",
+			onClick: onForceDelete,
+		},
+		cancel: {
+			label: "View Logs",
+			onClick: () =>
+				showTeardownLogs(output, { onDeleteAnyway: onForceDelete }),
+		},
+	});
+}
+
+export async function forceDeleteWithToast({
+	name,
+	deleteFn,
+}: {
+	name: string;
+	deleteFn: () => Promise<{ success: boolean; error?: string }>;
+}) {
+	const toastId = toast.loading(`Deleting "${name}" (skipping teardown)...`);
+
+	try {
+		const result = await deleteFn();
+		if (result.success) {
+			toast.success(`Deleted "${name}"`, { id: toastId });
+		} else {
+			toast.error(result.error ?? "Failed to delete", { id: toastId });
+		}
+	} catch (error) {
+		toast.error(error instanceof Error ? error.message : "Failed to delete", {
+			id: toastId,
+		});
+	}
+}
+
 export function TeardownLogsDialog() {
 	const [logs, setLogs] = useState<string | null>(null);
 	const [isOpen, setIsOpen] = useState(false);
+	const [onDeleteAnyway, setOnDeleteAnyway] = useState<(() => void) | null>(
+		null,
+	);
 
-	showLogsFn = (newLogs) => {
+	showLogsFn = (newLogs, options) => {
 		setLogs(newLogs);
+		setOnDeleteAnyway(() => options?.onDeleteAnyway ?? null);
 		setIsOpen(true);
 	};
 
 	const strippedLogs = logs ? stripAnsi(logs) : "";
 
 	const handleClose = () => {
 		setIsOpen(false);
+		setOnDeleteAnyway(null);
+	};
+
+	const handleDeleteAnyway = () => {
+		handleClose();
+		onDeleteAnyway?.();
 	};
 
 	return (
@@ -63,6 +127,18 @@ export function TeardownLogsDialog() {
 						<CodeBlockCopyButton />
 					</CodeBlock>
 				</div>
+				{onDeleteAnyway && (
+					<DialogFooter className="px-4 pb-4 pt-0">
+						<Button
+							variant="destructive"
+							size="sm"
+							className="h-7 px-3 text-xs"
+							onClick={handleDeleteAnyway}
+						>
+							Delete Anyway
+						</Button>
+					</DialogFooter>
+				)}
 			</DialogContent>
 		</Dialog>
 	);

apps/desktop/src/renderer/routes/_authenticated/components/TeardownLogsDialog/index.ts

@@ -1 +1,6 @@
-export { showTeardownLogs, TeardownLogsDialog } from "./TeardownLogsDialog";
+export {
+	forceDeleteWithToast,
+	showTeardownFailedToast,
+	showTeardownLogs,
+	TeardownLogsDialog,
+} from "./TeardownLogsDialog";

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

@@ -17,7 +17,10 @@ import {
 	useCloseWorkspace,
 	useDeleteWorkspace,
 } from "renderer/react-query/workspaces";
-import { showTeardownLogs } from "renderer/routes/_authenticated/components/TeardownLogsDialog";
+import {
+	forceDeleteWithToast,
+	showTeardownFailedToast,
+} from "renderer/routes/_authenticated/components/TeardownLogsDialog";
 
 interface DeleteWorkspaceDialogProps {
 	workspaceId: string;
@@ -98,6 +101,17 @@ export function DeleteWorkspaceDialog({
 		});
 	};
 
+	const handleForceDelete = () =>
+		forceDeleteWithToast({
+			name: workspaceName,
+			deleteFn: () =>
+				deleteWorkspace.mutateAsync({
+					id: workspaceId,
+					deleteLocalBranch: deleteLocalBranchChecked,
+					force: true,
+				}),
+		});
+
 	const handleDelete = async () => {
 		onOpenChange(false);
 
@@ -116,12 +130,10 @@ export function DeleteWorkspaceDialog({
 			if (!result.success) {
 				const { output } = result;
 				if (output) {
-					toast.error("Teardown failed", {
-						id: toastId,
-						action: {
-							label: "View Logs",
-							onClick: () => showTeardownLogs(output),
-						},
+					showTeardownFailedToast({
+						toastId,
+						output,
+						onForceDelete: handleForceDelete,
 					});
 				} else {
 					toast.error(result.error ?? "Failed to delete", { id: toastId });

apps/desktop/src/renderer/screens/main/components/WorkspacesListView/WorkspaceRow/DeleteWorktreeDialog.tsx

@@ -11,7 +11,10 @@ import { toast } from "@superset/ui/sonner";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@superset/ui/tooltip";
 import { electronTrpc } from "renderer/lib/electron-trpc";
 import { useDeleteWorktree } from "renderer/react-query/workspaces/useDeleteWorktree";
-import { showTeardownLogs } from "renderer/routes/_authenticated/components/TeardownLogsDialog";
+import {
+	forceDeleteWithToast,
+	showTeardownFailedToast,
+} from "renderer/routes/_authenticated/components/TeardownLogsDialog";
 
 interface DeleteWorktreeDialogProps {
 	worktreeId: string;
@@ -37,6 +40,12 @@ export function DeleteWorktreeDialog({
 			},
 		);
 
+	const handleForceDelete = () =>
+		forceDeleteWithToast({
+			name: worktreeName,
+			deleteFn: () => deleteWorktree.mutateAsync({ worktreeId, force: true }),
+		});
+
 	const handleDelete = async () => {
 		onOpenChange(false);
 
@@ -48,12 +57,10 @@ export function DeleteWorktreeDialog({
 			if (!result.success) {
 				const { output } = result;
 				if (output) {
-					toast.error("Teardown failed", {
-						id: toastId,
-						action: {
-							label: "View Logs",
-							onClick: () => showTeardownLogs(output),
-						},
+					showTeardownFailedToast({
+						toastId,
+						output,
+						onForceDelete: handleForceDelete,
 					});
 				} else {
 					toast.error(result.error ?? "Failed to delete", { id: toastId });