diff --git a/src/renderer/src/components/sidebar/workspace-actions/deletion/DeleteWorktreeDialog.fixture.tsx b/src/renderer/src/components/sidebar/workspace-actions/deletion/DeleteWorktreeDialog.fixture.tsx
new file mode 100644
index 00000000000..dd47f72c745
--- /dev/null
+++ b/src/renderer/src/components/sidebar/workspace-actions/deletion/DeleteWorktreeDialog.fixture.tsx
@@ -0,0 +1,69 @@
+import { defineFixture } from '../../../../component-fixtures/component-fixture'
+import type { Repo } from '../../../../../../shared/repo-types'
+import type { Worktree } from '../../../../../../shared/worktree/types'
+import type { GitStatusEntry } from '../../../../../../shared/git/status/git-status-types'
+import DeleteWorktreeDialog from './DeleteWorktreeDialog'
+
+const repo: Repo = {
+ id: 'orca-plugins',
+ path: '/Users/me/orca/orca-plugins',
+ displayName: 'orca-plugins',
+ badgeColor: '',
+ addedAt: 1
+}
+
+const worktree: Worktree = {
+ id: 'orca-plugins::/Users/me/orca/workspaces/orca-plugins/support-editable-excalidraw',
+ repoId: repo.id,
+ path: '/Users/me/orca/workspaces/orca-plugins/support-editable-excalidraw',
+ displayName: 'Support editable .excalidraw.svg and .excalidraw.png files',
+ branch: 'support-editable-excalidraw',
+ head: 'abc123',
+ isBare: false,
+ isMainWorktree: false,
+ comment: '',
+ linkedIssue: null,
+ linkedPR: null,
+ linkedLinearIssue: null,
+ isArchived: false,
+ isUnread: false,
+ isPinned: false,
+ sortOrder: 0,
+ lastActivityAt: 1
+}
+
+const dirtyEntries: GitStatusEntry[] = Array.from({ length: 13 }, (_, index) => ({
+ path: `src/excalidraw/file-${index}.ts`,
+ status: index % 3 === 0 ? 'untracked' : 'modified',
+ area: index % 3 === 0 ? 'untracked' : 'unstaged'
+}))
+
+function dialogFixture(entries: GitStatusEntry[], interact?: (frame: HTMLElement) => void) {
+ return defineFixture({
+ width: 640,
+ store: {
+ repos: [repo],
+ worktreesByRepo: { [repo.id]: [worktree] },
+ gitStatusByWorktree: { [worktree.id]: entries },
+ activeModal: 'delete-worktree',
+ modalData: { worktreeId: worktree.id }
+ },
+ // The dialog portals to
; reserve room so the centered modal fits the frame.
+ render: () => (
+
+
+
+ ),
+ interact
+ })
+}
+
+export const dirty = dialogFixture(dirtyEntries)
+
+export const clean = dialogFixture([])
+
+export const alwaysDeleteMenu = dialogFixture(dirtyEntries, () => {
+ document
+ .querySelector('[aria-label="More delete options"]')
+ ?.dispatchEvent(new PointerEvent('pointerdown', { bubbles: true, button: 0 }))
+})
diff --git a/src/renderer/src/components/sidebar/workspace-actions/deletion/DeleteWorktreeDialog.tsx b/src/renderer/src/components/sidebar/workspace-actions/deletion/DeleteWorktreeDialog.tsx
index 5edd80d3521..ea7c8ac15cc 100644
--- a/src/renderer/src/components/sidebar/workspace-actions/deletion/DeleteWorktreeDialog.tsx
+++ b/src/renderer/src/components/sidebar/workspace-actions/deletion/DeleteWorktreeDialog.tsx
@@ -13,7 +13,6 @@ import { runWorktreeDeletesInParallel } from './worktree-delete-execution'
import { getWorktreeDeleteErrorToShow } from './worktree-delete-error-display'
import { getWorkspaceDeleteLineage } from './workspace-delete-lineage'
import { DeleteWorktreeLineageNotice } from './DeleteWorktreeLineageNotice'
-import { DeleteWorktreeSkipConfirmOption } from './DeleteWorktreeSkipConfirmOption'
import { DeleteWorktreeDialogFooter } from './DeleteWorktreeDialogFooter'
import { DeleteWorktreeDialogDescription } from './DeleteWorktreeDialogDescription'
import { DeleteWorktreeTargetPreview } from './DeleteWorktreeTargetPreview'
@@ -55,7 +54,7 @@ const DeleteWorktreeDialog = React.memo(function DeleteWorktreeDialog() {
const allWorktrees = useAllWorktrees()
const repos = useAppStore((s) => s.repos)
const worktreeLineageById = useAppStore((s) => s.worktreeLineageById)
- const updateSettings = useAppStore((s) => s.updateSettings)
+ const updateSettingsOrThrow = useAppStore((s) => s.updateSettingsOrThrow)
const openSettingsTarget = useAppStore((s) => s.openSettingsTarget)
const openSettingsPage = useAppStore((s) => s.openSettingsPage)
const gitStatusByWorktree = useAppStore((s) => s.gitStatusByWorktree)
@@ -139,7 +138,6 @@ const DeleteWorktreeDialog = React.memo(function DeleteWorktreeDialog() {
)
const allowSkipConfirm =
!isBatchDelete && modalData.allowSkipConfirm !== false && childWorkspaceCount === 0
- const [dontAskAgain, setDontAskAgain] = useState(false)
const [isSavingForcePreference, setIsSavingForcePreference] = useState(false)
const deleteTargets = useMemo(
() => (canDeleteAllLineage ? lineageDelete.deleteAllTargets : worktrees),
@@ -182,11 +180,10 @@ const DeleteWorktreeDialog = React.memo(function DeleteWorktreeDialog() {
gitStatusByWorktreeIdentity,
repoMap
])
-
- if (!isOpen && dontAskAgain) {
- // Do not carry a canceled one-shot checkbox into later deletions.
- setDontAskAgain(false)
- }
+ // Per-target hints only warn once changes are known; pending or failed checks still lose data.
+ const hasUnknownChangeState = [...dirtyChanges.checkStates].some(
+ ([key, state]) => state !== 'complete' && !dirtyChanges.counts.has(key)
+ )
useEffect(() => {
if (isOpen && worktreeIds.length > 0 && worktrees.length === 0 && !isDeleting) {
@@ -237,13 +234,15 @@ const DeleteWorktreeDialog = React.memo(function DeleteWorktreeDialog() {
]
)
- const persistDontAskAgainPreference = useCallback((): void => {
- persistDeleteWorktreeConfirmSkipPreference({
- updateSettings,
- openSettingsPage,
- openSettingsTarget
- })
- }, [openSettingsPage, openSettingsTarget, updateSettings])
+ const persistSkipConfirmPreference = useCallback(
+ (): Promise =>
+ persistDeleteWorktreeConfirmSkipPreference({
+ updateSettingsOrThrow,
+ openSettingsPage,
+ openSettingsTarget
+ }),
+ [openSettingsPage, openSettingsTarget, updateSettingsOrThrow]
+ )
const handleForceDeletedFromToast = useCallback(
(deletedTarget: WorktreeRemovalTarget): void => onDeleted?.([deletedTarget]),
@@ -260,10 +259,6 @@ const DeleteWorktreeDialog = React.memo(function DeleteWorktreeDialog() {
return
}
const confirmedDiscards = confirmUnsavedDiscard(useAppStore.getState, unsavedTargets)
- // Force delete is recovery, not consent to skip future confirmations; persist that preference only on primary confirmation.
- if (dontAskAgain && allowSkipConfirm && !force) {
- persistDontAskAgainPreference()
- }
if (force) {
runDialogForceDelete({
worktreeId,
@@ -291,12 +286,9 @@ const DeleteWorktreeDialog = React.memo(function DeleteWorktreeDialog() {
},
[
closeModal,
- dontAskAgain,
- allowSkipConfirm,
handleForceDeletedFromToast,
forceOnConfirm,
onDeleted,
- persistDontAskAgainPreference,
removeWorktree,
worktreeIds.length,
worktreeDeleteIdentities,
@@ -344,7 +336,7 @@ const DeleteWorktreeDialog = React.memo(function DeleteWorktreeDialog() {
: t('auto.components.sidebar.DeleteWorktreeDialog.fc23c4cbdf', 'Delete Workspace')}
0}
+ showUnknownChangeLossWarning={hasUnknownChangeState}
targetClassName={deleteCopy.targetClassName}
targetName={isBatchDelete ? undefined : worktree?.displayName}
description={canDeleteAllLineage ? lineageDeleteDescription : deleteCopy.description}
@@ -384,12 +376,6 @@ const DeleteWorktreeDialog = React.memo(function DeleteWorktreeDialog() {
deleteError={deleteError}
/>
- setDontAskAgain((prev) => !prev)}
- />
-
handleDelete(true)}
onSavingChange={setIsSavingForcePreference}
onDelete={canDeleteAllLineage ? handleDeleteAll : () => handleDelete(false)}
+ onAlwaysDelete={allowSkipConfirm ? persistSkipConfirmPreference : undefined}
confirmButtonRef={confirmButtonRef}
/>
diff --git a/src/renderer/src/components/sidebar/workspace-actions/deletion/DeleteWorktreeDialogDescription.tsx b/src/renderer/src/components/sidebar/workspace-actions/deletion/DeleteWorktreeDialogDescription.tsx
index 31262defa5f..bdd307d99e5 100644
--- a/src/renderer/src/components/sidebar/workspace-actions/deletion/DeleteWorktreeDialogDescription.tsx
+++ b/src/renderer/src/components/sidebar/workspace-actions/deletion/DeleteWorktreeDialogDescription.tsx
@@ -7,13 +7,14 @@ export function DeleteWorktreeDialogDescription({
description,
targetClassName,
targetName,
- showChangeLossWarning
+ showUnknownChangeLossWarning
}: {
/** Translated sentence from delete-worktree-dialog-copy with / tags. */
description: string
targetClassName: string
targetName: string | undefined
- showChangeLossWarning?: boolean
+ /** Default Delete forces removal, so warn while a target's Git status is unknown. */
+ showUnknownChangeLossWarning?: boolean
}): React.JSX.Element {
const t = useTranslate()
return (
@@ -26,7 +27,7 @@ export function DeleteWorktreeDialogDescription({
descendants:
}}
/>
- {showChangeLossWarning && (
+ {showUnknownChangeLossWarning && (
{t(
'components.workspace.delete.changes.permanentLoss',
diff --git a/src/renderer/src/components/sidebar/workspace-actions/deletion/DeleteWorktreeDialogFooter.tsx b/src/renderer/src/components/sidebar/workspace-actions/deletion/DeleteWorktreeDialogFooter.tsx
index 882bb2d5cc3..0c3ee59dc7b 100644
--- a/src/renderer/src/components/sidebar/workspace-actions/deletion/DeleteWorktreeDialogFooter.tsx
+++ b/src/renderer/src/components/sidebar/workspace-actions/deletion/DeleteWorktreeDialogFooter.tsx
@@ -19,6 +19,7 @@ export function DeleteWorktreeDialogFooter({
onForceDelete,
onSavingChange,
onDelete,
+ onAlwaysDelete,
confirmButtonRef
}: {
isMainWorktree: boolean
@@ -32,6 +33,8 @@ export function DeleteWorktreeDialogFooter({
onForceDelete: () => void
onSavingChange: (saving: boolean) => void
onDelete: () => void
+ /** Saves the skip-confirmation preference; omitted where skipping is not allowed. */
+ onAlwaysDelete?: () => Promise
confirmButtonRef: Ref
}): JSX.Element {
const t = useTranslate()
@@ -71,6 +74,24 @@ export function DeleteWorktreeDialogFooter({
{isDeleting ? : }
{label}
+ ) : !isMainWorktree && onAlwaysDelete ? (
+
+ {isDeleting ? : }
+ {label}
+
) : !isMainWorktree ? (