diff --git a/src/main/git/worktrees/removal/worktree-at-risk-local-files-real-git.test.ts b/src/main/git/worktrees/removal/worktree-at-risk-local-files-real-git.test.ts index a643197a5b0..5c475921125 100644 --- a/src/main/git/worktrees/removal/worktree-at-risk-local-files-real-git.test.ts +++ b/src/main/git/worktrees/removal/worktree-at-risk-local-files-real-git.test.ts @@ -45,10 +45,35 @@ describe('readWorktreeAtRiskLocalFiles (real git)', () => { await writeFile(join(worktreePath, '.env'), 'TOKEN=feature\n') await symlink(join(worktreePath, '.env'), join(mainPath, '.env')) - await expect(read()).resolves.toEqual({ count: 1, samplePaths: ['.env'], complete: true }) + await expect(read()).resolves.toEqual({ + count: 1, + samplePaths: ['.env'], + paths: ['.env'], + complete: true + }) } ) + it('returns the full sorted at-risk path list beyond the 3-path inline sample', async () => { + await appendEntry('.gitignore', '.anti-slop-plugin/\n.tmp/\nscratch/\n') + await writeFile(join(worktreePath, '.env.local'), 'SECRET=1\n') + await mkdir(join(worktreePath, '.anti-slop-plugin')) + await writeFile(join(worktreePath, '.anti-slop-plugin', 'rule.json'), '{}') + await mkdir(join(worktreePath, '.tmp')) + await writeFile(join(worktreePath, '.tmp', 'dump.json'), '{}') + await mkdir(join(worktreePath, 'local')) + await writeFile(join(worktreePath, 'local', 'notes.txt'), 'draft\n') + await mkdir(join(worktreePath, 'scratch')) + await writeFile(join(worktreePath, 'scratch', 'todo.md'), 'todo\n') + + await expect(read()).resolves.toEqual({ + count: 5, + samplePaths: ['.env.local', '.anti-slop-plugin/', '.tmp/'], + paths: ['.env.local', '.anti-slop-plugin/', '.tmp/', 'local/', 'scratch/'], + complete: true + }) + }) + it('reports a directory past its comparison budget as unchecked, not safe', async () => { await mkdir(join(worktreePath, 'local')) await mkdir(join(mainPath, 'local')) @@ -57,6 +82,17 @@ describe('readWorktreeAtRiskLocalFiles (real git)', () => { await writeFile(join(mainPath, 'local', `${index}.txt`), 'same\n') } - await expect(read()).resolves.toEqual({ count: 0, samplePaths: [], complete: false }) + await expect(read()).resolves.toEqual({ + count: 0, + samplePaths: [], + paths: [], + complete: false + }) }) + + async function appendEntry(relativePath: string, content: string): Promise { + await writeFile(join(worktreePath, relativePath), content, { flag: 'a' }) + git(['add', relativePath], worktreePath) + git(['commit', '-qm', 'extend gitignore'], worktreePath) + } }) diff --git a/src/main/git/worktrees/removal/worktree-at-risk-local-files.ts b/src/main/git/worktrees/removal/worktree-at-risk-local-files.ts index a90d9fc879c..3fd43f98594 100644 --- a/src/main/git/worktrees/removal/worktree-at-risk-local-files.ts +++ b/src/main/git/worktrees/removal/worktree-at-risk-local-files.ts @@ -25,6 +25,7 @@ const MAX_VISITED_ENTRIES = 1_000 const MAX_COMPARED_BYTES = 32 * 1024 * 1024 const MAX_COMPARED_FILE_BYTES = 4 * 1024 * 1024 const SAMPLE_PATH_LIMIT = 3 +const MAX_RETURNED_PATHS = 200 // Dependency, build and cache output that a fresh checkout regenerates. const REGENERABLE_DIRECTORY_NAMES: ReadonlySet = new Set([ @@ -100,11 +101,7 @@ export async function readWorktreeAtRiskLocalFiles(args: { // Git's own timer starts after admission, so queueing behind other git work cannot cut the listing short. const listing = await listIgnoredPaths(args.worktreePath, args.gitOptions, deadlineMs) if (args.mainCheckoutPath === null) { - return { - count: listing.paths.length, - samplePaths: pickNotablePaths(listing.paths), - complete: listing.complete - } + return summarizeAtRiskPaths(listing.paths, listing.complete) } const signal = abortSignalWithTimeout(parentSignal, deadlineMs) // File reads cannot all take a signal; racing the deadline keeps a stalled mount from hanging the scan. @@ -148,11 +145,7 @@ export async function readWorktreeAtRiskLocalFiles(args: { if (parentSignal?.aborted) { throw createAbortError() } - return { - count: atRiskPaths.length, - samplePaths: pickNotablePaths(atRiskPaths), - complete: listing.complete && !unverified - } + return summarizeAtRiskPaths(atRiskPaths, listing.complete && !unverified) } async function listIgnoredPaths( @@ -315,14 +308,21 @@ function hasBudgetLeft(budget: ComparisonBudget): boolean { return budget.entries > 0 && !budget.signal.aborted } -function pickNotablePaths(paths: readonly string[]): string[] { +function summarizeAtRiskPaths( + paths: readonly string[], + complete: boolean +): WorktreeAtRiskLocalFiles { const rank = (relativePath: string): number => (/(^|\/)\.env[^/]*\/?$/.test(relativePath) ? 0 : 1) - return [...paths] - .sort( - (left, right) => - rank(left) - rank(right) || - left.split('/').length - right.split('/').length || - left.localeCompare(right) - ) - .slice(0, SAMPLE_PATH_LIMIT) + const sorted = [...paths].sort( + (left, right) => + rank(left) - rank(right) || + left.split('/').length - right.split('/').length || + left.localeCompare(right) + ) + return { + count: paths.length, + samplePaths: sorted.slice(0, SAMPLE_PATH_LIMIT), + paths: sorted.slice(0, MAX_RETURNED_PATHS), + complete + } } 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 index 03644cd4a16..588a9f01eb2 100644 --- a/src/renderer/src/components/sidebar/workspace-actions/deletion/DeleteWorktreeDialog.fixture.tsx +++ b/src/renderer/src/components/sidebar/workspace-actions/deletion/DeleteWorktreeDialog.fixture.tsx @@ -2,6 +2,7 @@ import { defineFixture } from '../../../../component-fixtures/component-fixture' import type { Repo } from '../../../../../../shared/repository/repo-types' import type { Worktree } from '../../../../../../shared/worktree/types' import type { GitStatusEntry } from '../../../../../../shared/git/status/git-status-types' +import type { WorktreeAtRiskLocalFiles } from '../../../../../../shared/worktree/removal/at-risk-local-files' import DeleteWorktreeDialog from './DeleteWorktreeDialog' const repo: Repo = { @@ -38,32 +39,110 @@ const dirtyEntries: GitStatusEntry[] = Array.from({ length: 13 }, (_, index) => area: index % 3 === 0 ? 'untracked' : 'unstaged' })) -function dialogFixture(entries: GitStatusEntry[], interact?: (frame: HTMLElement) => void) { +const cleanLocalFiles: WorktreeAtRiskLocalFiles = { + count: 0, + samplePaths: [], + paths: [], + complete: true +} + +const atRiskLocalFiles: WorktreeAtRiskLocalFiles = { + count: 5, + samplePaths: ['.anti-slop-plugin/', '.tmp/', 'tests/e2e/.cross-version-checkouts/'], + paths: [ + '.anti-slop-plugin/', + '.tmp/', + 'tests/e2e/.cross-version-checkouts/', + '.env.local', + 'scratch/migration-dump.sql' + ], + complete: true +} + +const manyAtRiskLocalFiles: WorktreeAtRiskLocalFiles = { + count: 14, + samplePaths: ['.env.local', '.anti-slop-plugin/', '.tmp/'], + paths: [ + '.env.local', + '.env.development.local', + '.anti-slop-plugin/', + '.tmp/', + 'local/', + 'scratch/migration-dump.sql', + 'scratch/perf-trace.json', + 'tests/e2e/.cross-version-checkouts/', + 'tests/fixtures/.local-snapshots/', + 'packages/desktop/.orca-local/session-override.json', + 'packages/cli/.local-config.yaml', + 'scripts/private/bench-results.csv', + 'docs/drafts/notes.md', + 'tools/sandbox/state.db' + ], + complete: true +} + +function dialogFixture(options: { + entries: GitStatusEntry[] + localFiles?: WorktreeAtRiskLocalFiles | 'pending' + heightClassName?: string + interact?: (frame: HTMLElement) => void +}) { return defineFixture({ width: 640, store: { repos: [repo], worktreesByRepo: { [repo.id]: [worktree] }, - gitStatusByWorktree: { [worktree.id]: entries }, + gitStatusByWorktree: { [worktree.id]: options.entries }, activeModal: 'delete-worktree', modalData: { worktreeId: worktree.id } }, + setup: () => { + const localFiles = options.localFiles ?? cleanLocalFiles + window.api.git.atRiskLocalFiles = () => + localFiles === 'pending' ? new Promise(() => {}) : Promise.resolve(localFiles) + }, // The dialog portals to ; reserve room so the centered modal fits the frame. render: () => ( -
+
), - interact + interact: options.interact }) } -export const dirty = dialogFixture(dirtyEntries) +export const checking = dialogFixture({ entries: [], localFiles: 'pending' }) -export const clean = dialogFixture([]) +export const clean = dialogFixture({ entries: [], localFiles: cleanLocalFiles }) -export const alwaysDeleteMenu = dialogFixture(dirtyEntries, () => { - document - .querySelector('[aria-label="More delete options"]') - ?.dispatchEvent(new PointerEvent('pointerdown', { bubbles: true, button: 0 })) +export const ignoredFiles = dialogFixture({ entries: [], localFiles: atRiskLocalFiles }) + +export const ignoredFilesOpen = dialogFixture({ + entries: [], + localFiles: atRiskLocalFiles, + heightClassName: 'h-[540px]', + interact: () => { + document.querySelector('[aria-label*="Show ignored paths"]')?.click() + } +}) + +export const ignoredFilesScrolling = dialogFixture({ + entries: [], + localFiles: manyAtRiskLocalFiles, + heightClassName: 'h-[580px]', + interact: () => { + document.querySelector('[aria-label*="Show ignored paths"]')?.click() + } +}) + +export const dirty = dialogFixture({ entries: dirtyEntries, localFiles: atRiskLocalFiles }) + +export const alwaysDeleteMenu = dialogFixture({ + entries: dirtyEntries, + localFiles: cleanLocalFiles, + interact: () => { + 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/DeleteWorktreeDirtyChangeHint.tsx b/src/renderer/src/components/sidebar/workspace-actions/deletion/DeleteWorktreeDirtyChangeHint.tsx index b6e8a7dc42c..dc650c90f55 100644 --- a/src/renderer/src/components/sidebar/workspace-actions/deletion/DeleteWorktreeDirtyChangeHint.tsx +++ b/src/renderer/src/components/sidebar/workspace-actions/deletion/DeleteWorktreeDirtyChangeHint.tsx @@ -1,7 +1,7 @@ // @protected-copy import type { JSX } from 'react' import { AlertTriangle, ChevronRight } from 'lucide-react' -import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover' +import { Collapsible, CollapsibleContent, CollapsibleTrigger } from '@/components/ui/collapsible' import { useTranslate } from '@/i18n/use-translate' import { STATUS_COLORS } from '../../../../lib/source-control/paths/git-path-decoration' import { STATUS_LABELS } from '../../../../../../shared/git/status/git-status-labels' @@ -9,6 +9,7 @@ import type { DeleteWorktreeChangeCheckState, DeleteWorktreeDirtyChangePreview } from './delete-worktree-dirty-change-counts' +import { DeleteWorktreeRelativePath } from './delete-worktree-relative-path' export function DeleteWorktreeDirtyChangeHint({ changeCount, @@ -49,13 +50,6 @@ export function DeleteWorktreeDirtyChangeHint({ 'Uncommitted changes will be lost' ) - const warningLabel = ( - <> - - {label} - - ) - if (!preview?.files.length) { const detailsLabel = checkState === 'checking' @@ -66,85 +60,68 @@ export function DeleteWorktreeDirtyChangeHint({ return (
- {warningLabel} + + {label} {detailsLabel && · {detailsLabel}}
) } + const loadedPathsLabel = t( + 'auto.components.sidebar.DeleteWorktreeDirtyChangeHint.loadedChangedPaths', + 'Loaded changed paths' + ) + return ( -
- - - - - + + + + +
+
+
    + {preview.files.map((file) => ( +
  • + + {STATUS_LABELS[file.status]} + +
    + + {file.hasUnresolvedConflict ? ( + + {t( + 'auto.components.sidebar.DeleteWorktreeDirtyChangeHint.unresolvedConflict', + 'Unresolved conflict' + )} + + ) : null} +
    +
  • + ))} +
{preview.remainingPathCount > 0 ? ( -

+

{t( 'auto.components.sidebar.DeleteWorktreeDirtyChangeHint.moreLoadedPaths', 'and {{count}} more loaded paths', @@ -155,9 +132,15 @@ export function DeleteWorktreeDirtyChangeHint({ )}

) : null} +

+ {t( + 'auto.components.sidebar.DeleteWorktreeDirtyChangeHint.loadedPathsNotice', + 'Loaded paths may be incomplete or out of date.' + )} +

- - -
+
+ + ) } diff --git a/src/renderer/src/components/sidebar/workspace-actions/deletion/DeleteWorktreeLineageNotice.fixture.tsx b/src/renderer/src/components/sidebar/workspace-actions/deletion/DeleteWorktreeLineageNotice.fixture.tsx index 93bb61847b1..18c5550899d 100644 --- a/src/renderer/src/components/sidebar/workspace-actions/deletion/DeleteWorktreeLineageNotice.fixture.tsx +++ b/src/renderer/src/components/sidebar/workspace-actions/deletion/DeleteWorktreeLineageNotice.fixture.tsx @@ -1,5 +1,6 @@ import { useState } from 'react' import { defineFixture } from '../../../../component-fixtures/component-fixture' +import { getWorktreeHostIdentity } from '../../../../../../shared/worktree/host-qualified-identity' import type { Worktree } from '../../../../../../shared/worktree/types' import { DeleteWorktreeLineageNotice } from './DeleteWorktreeLineageNotice' @@ -29,8 +30,25 @@ function LineageNotice({ initialPreserve = false, canPreserve = true }) { return ( dirtyChangePreviewsByWorktreeId: ReadonlyMap changeCheckStatesByWorktreeId?: ReadonlyMap - atRiskLocalFilesByIdentity?: ReadonlyMap + atRiskLocalFilesByIdentity?: ReadonlyMap preserveChildren: boolean canPreserveChildren: boolean disabled: boolean @@ -135,7 +135,7 @@ export function DeleteWorktreeLineageNotice({ )} /> )} diff --git a/src/renderer/src/components/sidebar/workspace-actions/deletion/DeleteWorktreeLocalFilesHint.fixture.tsx b/src/renderer/src/components/sidebar/workspace-actions/deletion/DeleteWorktreeLocalFilesHint.fixture.tsx new file mode 100644 index 00000000000..bb2c788b504 --- /dev/null +++ b/src/renderer/src/components/sidebar/workspace-actions/deletion/DeleteWorktreeLocalFilesHint.fixture.tsx @@ -0,0 +1,66 @@ +import { defineFixture } from '../../../../component-fixtures/component-fixture' +import type { WorktreeAtRiskLocalFiles } from '../../../../../../shared/worktree/removal/at-risk-local-files' +import { DeleteWorktreeLocalFilesHint } from './DeleteWorktreeLocalFilesHint' + +const ROW_WIDTH = 376 + +const atRiskFiles: WorktreeAtRiskLocalFiles = { + count: 6, + samplePaths: ['.env.local', '.anti-slop-plugin/', '.tmp/'], + paths: [ + '.env.local', + '.anti-slop-plugin/', + '.tmp/', + 'scratch/migration-dump.sql', + 'tests/e2e/.cross-version-checkouts/', + 'packages/desktop/.orca-local/session-override.json' + ], + complete: true +} + +export const checking = defineFixture({ + width: ROW_WIDTH, + render: () => +}) + +export const clean = defineFixture({ + width: ROW_WIDTH, + render: () => ( + + ) +}) + +export const unsupported = defineFixture({ + width: ROW_WIDTH, + render: () => +}) + +export const unchecked = defineFixture({ + width: ROW_WIDTH, + render: () => ( + + ) +}) + +export const atRisk = defineFixture({ + width: ROW_WIDTH, + render: () => +}) + +export const atRiskWithPathsOpen = defineFixture({ + width: ROW_WIDTH, + render: () => , + interact: (frame) => { + frame.querySelector('button')?.click() + } +}) diff --git a/src/renderer/src/components/sidebar/workspace-actions/deletion/DeleteWorktreeLocalFilesHint.tsx b/src/renderer/src/components/sidebar/workspace-actions/deletion/DeleteWorktreeLocalFilesHint.tsx index 863e3d4907b..9c3a9c19610 100644 --- a/src/renderer/src/components/sidebar/workspace-actions/deletion/DeleteWorktreeLocalFilesHint.tsx +++ b/src/renderer/src/components/sidebar/workspace-actions/deletion/DeleteWorktreeLocalFilesHint.tsx @@ -1,31 +1,139 @@ +// @protected-copy import type { JSX } from 'react' -import { AlertTriangle } from 'lucide-react' +import { AlertTriangle, ChevronRight, File, Folder } from 'lucide-react' +import { Collapsible, CollapsibleContent, CollapsibleTrigger } from '@/components/ui/collapsible' import { useTranslate } from '@/i18n/use-translate' -import { formatAtRiskLocalFileNames } from '@/lib/workspace/display/at-risk-local-files-label' -import type { WorktreeAtRiskLocalFiles } from '../../../../../../shared/worktree/removal/at-risk-local-files' +import { hasWorktreeAtRiskLocalFiles } from '../../../../../../shared/worktree/removal/at-risk-local-files' +import { DeleteWorktreeRelativePath, isDirectoryDisplayPath } from './delete-worktree-relative-path' +import type { DeleteWorktreeLocalFilesState } from './use-delete-worktree-at-risk-local-files' export function DeleteWorktreeLocalFilesHint({ - files + state }: { - files: WorktreeAtRiskLocalFiles | undefined + state: DeleteWorktreeLocalFilesState | undefined }): JSX.Element | null { const t = useTranslate() - if (!files) { + if (!state) { return null } - const names = formatAtRiskLocalFileNames(files, t) - const label = names - ? t('components.workspace.delete.ignoredFilesLost', 'Ignored files will be lost: {{names}}', { - names + + if (state.status !== 'complete' || !hasWorktreeAtRiskLocalFiles(state.files)) { + const statusLabel = + state.status === 'complete' + ? t('components.workspace.delete.ignoredFiles.none', 'No ignored local files') + : state.status === 'unsupported' + ? t('components.workspace.delete.ignoredFiles.unavailable', 'Ignored files not checked') + : t('components.workspace.delete.ignoredFiles.checking', 'Checking ignored files…') + return ( +
+ {statusLabel} +
+ ) + } + + const { files } = state + const listedPaths = files.paths ?? files.samplePaths + + if (files.count === 0 || listedPaths.length === 0) { + const uncheckedLabel = t( + 'components.workspace.delete.ignoredFilesUnchecked', + 'Ignored files could not be fully checked' + ) + return ( +
+ + {uncheckedLabel} +
+ ) + } + + const countLabel = files.complete + ? t('components.workspace.delete.ignoredFiles.lost', '{{count}} ignored files will be lost', { + count: files.count, + defaultValue_one: '{{count}} ignored file will be lost' }) : t( - 'components.workspace.delete.ignoredFilesUnchecked', - 'Ignored files could not be fully checked' + 'components.workspace.delete.ignoredFiles.lostIncomplete', + '{{count}}+ ignored files will be lost', + { count: files.count } ) + const inlinePreview = files.samplePaths.join(', ') + const remainingPathCount = Math.max(0, files.count - listedPaths.length) + const listLabel = t( + 'components.workspace.delete.ignoredFiles.listLabel', + 'Ignored local files that will be lost' + ) + return ( -
- - {label} -
+ + + + + +
+
+
    + {listedPaths.map((relativePath) => { + const EntryIcon = isDirectoryDisplayPath(relativePath) ? Folder : File + return ( +
  • +
  • + ) + })} +
+ {remainingPathCount > 0 ? ( +

+ {t( + 'components.workspace.delete.ignoredFiles.morePaths', + 'and {{count}} more ignored paths', + { + count: remainingPathCount, + defaultValue_one: 'and {{count}} more ignored path' + } + )} +

+ ) : null} + {!files.complete ? ( +

+ {t( + 'components.workspace.delete.ignoredFiles.incompleteNotice', + 'Check stopped early; more ignored files in this worktree may also be deleted.' + )} +

+ ) : null} +
+
+
+
) } diff --git a/src/renderer/src/components/sidebar/workspace-actions/deletion/DeleteWorktreeTargetPreview.tsx b/src/renderer/src/components/sidebar/workspace-actions/deletion/DeleteWorktreeTargetPreview.tsx index 4b384c9c6b2..4e2f50f0940 100644 --- a/src/renderer/src/components/sidebar/workspace-actions/deletion/DeleteWorktreeTargetPreview.tsx +++ b/src/renderer/src/components/sidebar/workspace-actions/deletion/DeleteWorktreeTargetPreview.tsx @@ -5,7 +5,7 @@ import type { Worktree } from '../../../../../../shared/worktree/types' import { getWorktreeHostIdentity } from '../../../../../../shared/worktree/host-qualified-identity' import { DeleteWorktreeDirtyChangeHint } from './DeleteWorktreeDirtyChangeHint' import { DeleteWorktreeLocalFilesHint } from './DeleteWorktreeLocalFilesHint' -import type { WorktreeAtRiskLocalFiles } from '../../../../../../shared/worktree/removal/at-risk-local-files' +import type { DeleteWorktreeLocalFilesState } from './use-delete-worktree-at-risk-local-files' import type { DeleteWorktreeChangeCheckState, DeleteWorktreeDirtyChangePreview @@ -66,7 +66,7 @@ export function DeleteWorktreeTargetPreview({ dirtyChangeCountsByWorktreeId: ReadonlyMap dirtyChangePreviewsByWorktreeId: ReadonlyMap changeCheckStatesByWorktreeId?: ReadonlyMap - atRiskLocalFilesByIdentity?: ReadonlyMap + atRiskLocalFilesByIdentity?: ReadonlyMap }): JSX.Element | null { const t = useTranslate() const targetIdPrefix = useId() @@ -117,7 +117,7 @@ export function DeleteWorktreeTargetPreview({ )} /> {itemDeleteError ? (
@@ -176,7 +176,7 @@ export function DeleteWorktreeTargetPreview({ )} />
) diff --git a/src/renderer/src/components/sidebar/workspace-actions/deletion/delete-worktree-relative-path.tsx b/src/renderer/src/components/sidebar/workspace-actions/deletion/delete-worktree-relative-path.tsx new file mode 100644 index 00000000000..cbe8dbc88ee --- /dev/null +++ b/src/renderer/src/components/sidebar/workspace-actions/deletion/delete-worktree-relative-path.tsx @@ -0,0 +1,55 @@ +import { Fragment, type JSX } from 'react' + +export function isDirectoryDisplayPath(rawPath: string): boolean { + return rawPath.endsWith('/') || rawPath.endsWith('\\') +} + +type DirectorySegment = { + prefixKey: string + text: string +} + +function splitDirectoryAndLeaf(rawPath: string): { + directorySegments: DirectorySegment[] + leafName: string +} { + const isDirectory = isDirectoryDisplayPath(rawPath) + const trimmed = isDirectory ? rawPath.slice(0, -1) : rawPath + const lastSlashIndex = Math.max(trimmed.lastIndexOf('/'), trimmed.lastIndexOf('\\')) + if (lastSlashIndex < 0) { + return { directorySegments: [], leafName: rawPath } + } + const directoryPrefix = trimmed.slice(0, lastSlashIndex + 1) + // Keep trailing separators on each segment so long paths wrap at `/` before mid-filename. + const matches = [...directoryPrefix.matchAll(/[^/\\]+[/\\]+/g)] + const directorySegments = + matches.length > 0 + ? matches.map((match) => ({ + prefixKey: directoryPrefix.slice(0, (match.index ?? 0) + match[0].length), + text: match[0] + })) + : [{ prefixKey: directoryPrefix, text: directoryPrefix }] + return { + directorySegments, + leafName: rawPath.slice(lastSlashIndex + 1) + } +} + +export function DeleteWorktreeRelativePath({ path }: { path: string }): JSX.Element { + const { directorySegments, leafName } = splitDirectoryAndLeaf(path) + return ( + <> + {directorySegments.length > 0 ? ( + + {directorySegments.map((segment) => ( + + {segment.text} + + + ))} + + ) : null} + {leafName} + + ) +} diff --git a/src/renderer/src/components/sidebar/workspace-actions/deletion/use-delete-worktree-at-risk-local-files.ts b/src/renderer/src/components/sidebar/workspace-actions/deletion/use-delete-worktree-at-risk-local-files.ts index 1f3ba3301f7..7e61bb98bfd 100644 --- a/src/renderer/src/components/sidebar/workspace-actions/deletion/use-delete-worktree-at-risk-local-files.ts +++ b/src/renderer/src/components/sidebar/workspace-actions/deletion/use-delete-worktree-at-risk-local-files.ts @@ -1,18 +1,24 @@ -import { useEffect, useEffectEvent, useState } from 'react' +import { useEffect, useEffectEvent, useMemo, useState } from 'react' import { useAppStore } from '@/store' import { getRuntimeWorktreeAtRiskLocalFiles } from '@/runtime/source-control/git/runtime-git-status-client' import { RuntimeRpcCallError } from '@/runtime/rpc/calls/runtime-rpc-result' import type { Repo } from '../../../../../../shared/repository/repo-types' import type { Worktree } from '../../../../../../shared/worktree/types' -import { - hasWorktreeAtRiskLocalFiles, - type WorktreeAtRiskLocalFiles -} from '../../../../../../shared/worktree/removal/at-risk-local-files' +import type { WorktreeAtRiskLocalFiles } from '../../../../../../shared/worktree/removal/at-risk-local-files' import { getWorktreeHostIdentity } from '../../../../../../shared/worktree/host-qualified-identity' import { isFolderWorkspaceDelete } from './delete-worktree-dialog-copy' import { resolveDeleteTargetGitContext } from './use-delete-worktree-status-hydration' -/** Ignored files each delete target would lose, by host identity; hosts that can't tell stay absent. */ +export type DeleteWorktreeLocalFilesState = + | { status: 'checking' } + | { status: 'unsupported' } + | { status: 'complete'; files: WorktreeAtRiskLocalFiles } + +const CHECKING_STATE: DeleteWorktreeLocalFilesState = { status: 'checking' } +const UNSUPPORTED_STATE: DeleteWorktreeLocalFilesState = { status: 'unsupported' } +const EMPTY_STATES = new Map() + +/** Per-target ignored-file check state, pre-seeded on render so async completion never resizes the dialog. */ export function useDeleteWorktreeAtRiskLocalFiles({ isOpen, deleteTargets, @@ -21,50 +27,72 @@ export function useDeleteWorktreeAtRiskLocalFiles({ isOpen: boolean deleteTargets: readonly Worktree[] repoMap: ReadonlyMap -}): ReadonlyMap { +}): ReadonlyMap { const repos = useAppStore((state) => state.repos) - const generation = isOpen ? deleteTargets.map(getWorktreeHostIdentity).join('\n') : '' - const [result, setResult] = useState<{ + const generation = isOpen + ? deleteTargets + .map((target) => + JSON.stringify({ + identity: getWorktreeHostIdentity(target), + isMainWorktree: target.isMainWorktree, + isFolderWorkspace: isFolderWorkspaceDelete(repoMap, target), + context: resolveDeleteTargetGitContext(target, repos) + }) + ) + .sort() + .join('\n') + : '' + const [settled, setSettled] = useState<{ generation: string - files: Map - }>({ generation: '', files: new Map() }) + states: Map + }>({ generation: '', states: new Map() }) + const startScans = useEffectEvent((signal: AbortSignal) => { for (const target of deleteTargets) { if (target.isMainWorktree || isFolderWorkspaceDelete(repoMap, target)) { continue } - const gitContext = resolveDeleteTargetGitContext(target, repos) - if (!gitContext) { - continue - } const identity = getWorktreeHostIdentity(target) - const publish = (files: WorktreeAtRiskLocalFiles): void => - setResult((current) => ({ + const publish = (state: DeleteWorktreeLocalFilesState): void => + setSettled((current) => ({ generation, - files: new Map(current.generation === generation ? current.files : []).set( + states: new Map(current.generation === generation ? current.states : []).set( identity, - files + state ) })) + const gitContext = resolveDeleteTargetGitContext(target, repos) + if (!gitContext) { + publish(UNSUPPORTED_STATE) + continue + } void getRuntimeWorktreeAtRiskLocalFiles(gitContext, signal) .then((files) => { - if (!signal.aborted && hasWorktreeAtRiskLocalFiles(files)) { - publish(files) + if (!signal.aborted) { + publish({ status: 'complete', files }) } }) .catch((error: unknown) => { - // Older hosts lack the method and keep today's dialog; any other failure is an unchecked result. + if (signal.aborted) { + return + } const unsupported = error instanceof RuntimeRpcCallError && error.code === 'method_not_found' - if (!signal.aborted && !unsupported) { - publish({ count: 0, samplePaths: [], complete: false }) - } + publish( + unsupported + ? UNSUPPORTED_STATE + : { + status: 'complete', + files: { count: 0, samplePaths: [], paths: [], complete: false } + } + ) }) } }) // Store updates re-render the dialog with new array identities; each scan walks files, so run once per target set. useEffect(() => { + setSettled({ generation, states: new Map() }) if (!isOpen) { return } @@ -75,7 +103,19 @@ export function useDeleteWorktreeAtRiskLocalFiles({ } }, [generation, isOpen]) - return result.generation === generation ? result.files : EMPTY_FILES + return useMemo(() => { + if (!isOpen) { + return EMPTY_STATES + } + const currentSettled = settled.generation === generation ? settled.states : undefined + const next = new Map() + for (const target of deleteTargets) { + if (target.isMainWorktree || isFolderWorkspaceDelete(repoMap, target)) { + continue + } + const identity = getWorktreeHostIdentity(target) + next.set(identity, currentSettled?.get(identity) ?? CHECKING_STATE) + } + return next + }, [deleteTargets, generation, isOpen, repoMap, settled]) } - -const EMPTY_FILES = new Map() diff --git a/src/renderer/src/i18n/en-runtime-required.json b/src/renderer/src/i18n/en-runtime-required.json index d91b521dd0b..dc305f8a466 100644 --- a/src/renderer/src/i18n/en-runtime-required.json +++ b/src/renderer/src/i18n/en-runtime-required.json @@ -2213,6 +2213,12 @@ } }, "delete": { + "ignoredFiles": { + "lost_one": "{{count}} ignored file will be lost", + "lost_other": "{{count}} ignored files will be lost", + "morePaths_one": "and {{count}} more ignored path", + "morePaths_other": "and {{count}} more ignored paths" + }, "unsavedEdits": { "blocked_one": "Save or close {{count}} unsaved file in {{name}} first", "blocked_other": "Save or close {{count}} unsaved files in {{name}} first", diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json index b298541d092..ba452e081d1 100644 --- a/src/renderer/src/i18n/locales/en.json +++ b/src/renderer/src/i18n/locales/en.json @@ -22111,8 +22111,20 @@ "reopen": "Reopen", "reopenFailed": "Some files couldn't be reopened. Open a workspace and try Reopen again." }, - "ignoredFilesLost": "Ignored files will be lost: {{names}}", - "ignoredFilesUnchecked": "Ignored files could not be fully checked" + "ignoredFilesUnchecked": "Ignored files could not be fully checked", + "ignoredFiles": { + "none": "No ignored local files", + "unavailable": "Ignored files not checked", + "checking": "Checking ignored files…", + "lost_one": "{{count}} ignored file will be lost", + "lost_other": "{{count}} ignored files will be lost", + "lostIncomplete": "{{count}}+ ignored files will be lost", + "showPaths": "Show ignored paths", + "morePaths_one": "and {{count}} more ignored path", + "morePaths_other": "and {{count}} more ignored paths", + "listLabel": "Ignored local files that will be lost", + "incompleteNotice": "Check stopped early; more ignored files in this worktree may also be deleted." + } }, "atRiskLocalFiles": { "namesWithCount": "{{names}} +{{value0}}", diff --git a/src/renderer/src/i18n/locales/ja.json b/src/renderer/src/i18n/locales/ja.json index 491d515ffe5..fa130739129 100644 --- a/src/renderer/src/i18n/locales/ja.json +++ b/src/renderer/src/i18n/locales/ja.json @@ -20993,7 +20993,6 @@ "reopen": "再度開く", "reopenFailed": "一部のファイルを再度開けませんでした。ワークスペースを開いて、もう一度「再度開く」を試してください。" }, - "ignoredFilesLost": "無視されたファイルは失われます: {{names}}", "ignoredFilesUnchecked": "無視されたファイルを完全には確認できませんでした" }, "atRiskLocalFiles": { diff --git a/src/renderer/src/i18n/locales/zh.json b/src/renderer/src/i18n/locales/zh.json index 00f1f1b1990..d84e38558a7 100644 --- a/src/renderer/src/i18n/locales/zh.json +++ b/src/renderer/src/i18n/locales/zh.json @@ -21063,7 +21063,6 @@ "reopen": "重新打开", "reopenFailed": "部分文件无法重新打开。请打开工作区,然后再次尝试“重新打开”" }, - "ignoredFilesLost": "Git 忽略的文件将丢失:{{names}}", "ignoredFilesUnchecked": "无法完整检查 Git 忽略的文件" }, "atRiskLocalFiles": { diff --git a/src/shared/plugins/languages/protected-copy-keys.json b/src/shared/plugins/languages/protected-copy-keys.json index 7f7b622828b..31ee069d09d 100644 --- a/src/shared/plugins/languages/protected-copy-keys.json +++ b/src/shared/plugins/languages/protected-copy-keys.json @@ -837,6 +837,16 @@ "components.workspace.delete.changes.permanentLoss", "components.workspace.delete.changes.unavailable", "components.workspace.delete.changes.unavailableDetails", + "components.workspace.delete.ignoredFiles.checking", + "components.workspace.delete.ignoredFiles.incompleteNotice", + "components.workspace.delete.ignoredFiles.listLabel", + "components.workspace.delete.ignoredFiles.lost", + "components.workspace.delete.ignoredFiles.lostIncomplete", + "components.workspace.delete.ignoredFiles.morePaths", + "components.workspace.delete.ignoredFiles.none", + "components.workspace.delete.ignoredFiles.showPaths", + "components.workspace.delete.ignoredFiles.unavailable", + "components.workspace.delete.ignoredFilesUnchecked", "components.workspace.delete.unsavedEdits.blocked", "components.workspace.delete.unsavedEdits.discarded", "components.workspace.delete.unsavedEdits.moreFiles", diff --git a/src/shared/worktree/removal/at-risk-local-files.ts b/src/shared/worktree/removal/at-risk-local-files.ts index d4c065f749a..11cf3da3e15 100644 --- a/src/shared/worktree/removal/at-risk-local-files.ts +++ b/src/shared/worktree/removal/at-risk-local-files.ts @@ -4,6 +4,8 @@ export type WorktreeAtRiskLocalFiles = { count: number /** A few notable worktree-relative paths, `.env*` first; directories end in `/`. */ samplePaths: string[] + /** Sorted at-risk worktree-relative paths (up to path cap); absent on older hosts or compact summaries. */ + paths?: string[] /** False when a time or size cap or a failure cut the check short, so more files may be at risk. */ complete: boolean }