mirror of
https://github.com/stablyai/orca.git
synced 2026-10-17 08:03:14 +00:00
Split workspace-cleanup slice test to satisfy max-lines
Rebasing onto latest main pushed the combined store-slice test over the 800-line cap. Extract shared fixtures into a test harness and split the suite into scan-progress and removal-preflight files instead of adding a forbidden max-lines suppression.
This commit is contained in:
Brennan Benson
@@ -0,0 +1,431 @@
|
||||
import { describe, expect, it, vi } from 'vitest'
|
||||
import type { AppState } from '../types'
|
||||
import type { WorkspaceCleanupScanResult } from '../../../../shared/workspace-cleanup'
|
||||
import { enrichWorkspaceCleanupCandidates } from './workspace-cleanup'
|
||||
import {
|
||||
NOW,
|
||||
WORKTREE_ID,
|
||||
createCleanupTestStore,
|
||||
installWorkspaceCleanupApi,
|
||||
makeCandidate,
|
||||
makeState
|
||||
} from './workspace-cleanup-slice-test-harness'
|
||||
|
||||
describe('workspace cleanup removal and protection', () => {
|
||||
it('preflights cleanup removals concurrently and deletes nested workspaces globally deepest first', async () => {
|
||||
let activePreflights = 0
|
||||
let maxActivePreflights = 0
|
||||
let activeDeletes = 0
|
||||
let maxActiveDeletes = 0
|
||||
const deleteOrder: string[] = []
|
||||
const candidates = [
|
||||
makeCandidate({
|
||||
worktreeId: 'repo-a::/repo/parent',
|
||||
repoId: 'repo-a',
|
||||
path: '/repo/parent',
|
||||
displayName: 'parent'
|
||||
}),
|
||||
makeCandidate({
|
||||
worktreeId: 'repo-b::/repo/parent/child',
|
||||
repoId: 'repo-b',
|
||||
path: '/repo/parent/child',
|
||||
displayName: 'child'
|
||||
}),
|
||||
makeCandidate({
|
||||
worktreeId: 'repo-c::/other',
|
||||
repoId: 'repo-c',
|
||||
path: '/other',
|
||||
displayName: 'other',
|
||||
git: { clean: null, upstreamAhead: null, upstreamBehind: null, checkedAt: null },
|
||||
blockers: ['git-status-error']
|
||||
})
|
||||
]
|
||||
const candidateById = new Map(candidates.map((candidate) => [candidate.worktreeId, candidate]))
|
||||
const scan = vi.fn(async (args?: { worktreeId?: string }) => {
|
||||
activePreflights += 1
|
||||
maxActivePreflights = Math.max(maxActivePreflights, activePreflights)
|
||||
await new Promise((resolve) => setTimeout(resolve, 5))
|
||||
activePreflights -= 1
|
||||
return {
|
||||
scannedAt: NOW,
|
||||
candidates: args?.worktreeId ? [candidateById.get(args.worktreeId)!] : [],
|
||||
errors: []
|
||||
} satisfies WorkspaceCleanupScanResult
|
||||
})
|
||||
installWorkspaceCleanupApi(scan)
|
||||
|
||||
const removeWorktree = vi.fn(async (worktreeId: string) => {
|
||||
deleteOrder.push(worktreeId)
|
||||
activeDeletes += 1
|
||||
maxActiveDeletes = Math.max(maxActiveDeletes, activeDeletes)
|
||||
await new Promise((resolve) => setTimeout(resolve, 5))
|
||||
activeDeletes -= 1
|
||||
return { ok: true as const }
|
||||
})
|
||||
const store = createCleanupTestStore(removeWorktree)
|
||||
store.setState({
|
||||
workspaceCleanupScan: { scannedAt: NOW, candidates, errors: [] }
|
||||
} as Partial<AppState>)
|
||||
|
||||
await expect(
|
||||
store
|
||||
.getState()
|
||||
.removeWorkspaceCleanupCandidates(candidates.map((candidate) => candidate.worktreeId))
|
||||
).resolves.toEqual({
|
||||
removedIds: expect.arrayContaining(candidates.map((candidate) => candidate.worktreeId)),
|
||||
failures: []
|
||||
})
|
||||
|
||||
expect(maxActivePreflights).toBeGreaterThan(1)
|
||||
expect(maxActiveDeletes).toBe(1)
|
||||
expect(deleteOrder).toEqual([
|
||||
'repo-b::/repo/parent/child',
|
||||
'repo-a::/repo/parent',
|
||||
'repo-c::/other'
|
||||
])
|
||||
expect(removeWorktree).toHaveBeenCalledWith('repo-c::/other', true, {
|
||||
suppressPreservedBranchToast: true
|
||||
})
|
||||
expect(store.getState().workspaceCleanupScan?.candidates).toEqual([])
|
||||
})
|
||||
|
||||
it('demotes an active suggested workspace when it was not viewed from cleanup', async () => {
|
||||
const [candidate] = await enrichWorkspaceCleanupCandidates(
|
||||
[makeCandidate()],
|
||||
makeState({ activeWorktreeId: WORKTREE_ID }),
|
||||
{ applyDismissals: false }
|
||||
)
|
||||
|
||||
expect(candidate.tier).toBe('protected')
|
||||
expect(candidate.blockers).toContain('active-workspace')
|
||||
})
|
||||
|
||||
it('keeps a viewed active workspace visible but not removable', async () => {
|
||||
const [candidate] = await enrichWorkspaceCleanupCandidates(
|
||||
[makeCandidate()],
|
||||
makeState({
|
||||
activeWorktreeId: WORKTREE_ID,
|
||||
workspaceCleanupViewedCandidates: {
|
||||
[WORKTREE_ID]: {
|
||||
viewedAt: Date.now(),
|
||||
fingerprint: 'fingerprint-1',
|
||||
wasSuggested: true
|
||||
}
|
||||
}
|
||||
}),
|
||||
{ applyDismissals: false }
|
||||
)
|
||||
|
||||
expect(candidate.tier).toBe('protected')
|
||||
expect(candidate.selectedByDefault).toBe(false)
|
||||
expect(candidate.blockers).toContain('active-workspace')
|
||||
})
|
||||
|
||||
it('does not preserve the cleanup view exception after the row changes', async () => {
|
||||
const [candidate] = await enrichWorkspaceCleanupCandidates(
|
||||
[makeCandidate({ fingerprint: 'fingerprint-2' })],
|
||||
makeState({
|
||||
activeWorktreeId: WORKTREE_ID,
|
||||
workspaceCleanupViewedCandidates: {
|
||||
[WORKTREE_ID]: {
|
||||
viewedAt: Date.now(),
|
||||
fingerprint: 'fingerprint-1',
|
||||
wasSuggested: true
|
||||
}
|
||||
}
|
||||
}),
|
||||
{ applyDismissals: false }
|
||||
)
|
||||
|
||||
expect(candidate.tier).toBe('protected')
|
||||
expect(candidate.blockers).toContain('active-workspace')
|
||||
})
|
||||
|
||||
it('protects recently visible old workspaces with open context', async () => {
|
||||
const [candidate] = await enrichWorkspaceCleanupCandidates(
|
||||
[makeCandidate()],
|
||||
makeState({
|
||||
openFiles: [
|
||||
{
|
||||
id: 'file-1',
|
||||
worktreeId: WORKTREE_ID,
|
||||
filePath: '/tmp/old-workspace/src/app.ts',
|
||||
relativePath: 'src/app.ts',
|
||||
language: 'typescript',
|
||||
isDirty: false
|
||||
}
|
||||
] as AppState['openFiles'],
|
||||
lastVisitedAtByWorktreeId: {
|
||||
[WORKTREE_ID]: Date.now()
|
||||
}
|
||||
}),
|
||||
{ applyDismissals: false }
|
||||
)
|
||||
|
||||
expect(candidate.tier).toBe('protected')
|
||||
expect(candidate.selectedByDefault).toBe(false)
|
||||
expect(candidate.blockers).toContain('recent-visible-context')
|
||||
})
|
||||
|
||||
it('uses current renderer state after async delete preflight scan resolves', async () => {
|
||||
let resolveScan: (value: WorkspaceCleanupScanResult) => void
|
||||
const removeWorktree = vi.fn().mockResolvedValue({ ok: true })
|
||||
const store = createCleanupTestStore(removeWorktree)
|
||||
|
||||
;(globalThis as { window: unknown }).window = {
|
||||
api: {
|
||||
workspaceCleanup: {
|
||||
scan: vi.fn(
|
||||
(): Promise<WorkspaceCleanupScanResult> =>
|
||||
new Promise<WorkspaceCleanupScanResult>((resolve) => {
|
||||
resolveScan = resolve
|
||||
})
|
||||
),
|
||||
dismiss: vi.fn().mockResolvedValue(undefined),
|
||||
clearDismissals: vi.fn().mockResolvedValue(undefined),
|
||||
hasKillableLocalProcesses: vi.fn().mockResolvedValue({
|
||||
hasKillableProcesses: false
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const removal = store.getState().removeWorkspaceCleanupCandidates([WORKTREE_ID])
|
||||
store.setState({ activeWorktreeId: WORKTREE_ID })
|
||||
resolveScan!({ scannedAt: NOW, candidates: [makeCandidate()], errors: [] })
|
||||
|
||||
await expect(removal).resolves.toEqual({
|
||||
removedIds: [WORKTREE_ID],
|
||||
failures: []
|
||||
})
|
||||
expect(removeWorktree).toHaveBeenCalledWith(WORKTREE_ID, false, {
|
||||
suppressPreservedBranchToast: true
|
||||
})
|
||||
})
|
||||
|
||||
it('defers git checks for locally active workspaces on initial scans', async () => {
|
||||
const scan = vi.fn().mockResolvedValue({
|
||||
scannedAt: NOW,
|
||||
candidates: [],
|
||||
errors: []
|
||||
} satisfies WorkspaceCleanupScanResult)
|
||||
;(globalThis as { window: unknown }).window = {
|
||||
api: {
|
||||
workspaceCleanup: {
|
||||
scan,
|
||||
dismiss: vi.fn().mockResolvedValue(undefined),
|
||||
clearDismissals: vi.fn().mockResolvedValue(undefined),
|
||||
hasKillableLocalProcesses: vi.fn().mockResolvedValue({
|
||||
hasKillableProcesses: false
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const store = createCleanupTestStore()
|
||||
store.setState({
|
||||
activeWorktreeId: WORKTREE_ID,
|
||||
tabsByWorktree: {
|
||||
'repo1::/tmp/terminal-workspace': [
|
||||
{ id: 'tab-1', title: 'zsh' }
|
||||
] as AppState['tabsByWorktree'][string]
|
||||
},
|
||||
ptyIdsByTabId: { 'tab-1': ['pty-1'] }
|
||||
} as Partial<AppState>)
|
||||
|
||||
await store.getState().scanWorkspaceCleanup()
|
||||
|
||||
expect(scan).toHaveBeenCalledWith(
|
||||
{
|
||||
skipGitWorktreeIds: expect.arrayContaining([WORKTREE_ID, 'repo1::/tmp/terminal-workspace'])
|
||||
},
|
||||
expect.any(Function)
|
||||
)
|
||||
})
|
||||
|
||||
it('does not defer git checks for focused remove preflights', async () => {
|
||||
const scan = vi.fn().mockResolvedValue({
|
||||
scannedAt: NOW,
|
||||
candidates: [makeCandidate()],
|
||||
errors: []
|
||||
} satisfies WorkspaceCleanupScanResult)
|
||||
;(globalThis as { window: unknown }).window = {
|
||||
api: {
|
||||
workspaceCleanup: {
|
||||
scan,
|
||||
dismiss: vi.fn().mockResolvedValue(undefined),
|
||||
clearDismissals: vi.fn().mockResolvedValue(undefined),
|
||||
hasKillableLocalProcesses: vi.fn().mockResolvedValue({
|
||||
hasKillableProcesses: false
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const removeWorktree = vi.fn().mockResolvedValue({ ok: true })
|
||||
const store = createCleanupTestStore(removeWorktree)
|
||||
store.setState({ activeWorktreeId: 'repo1::/tmp/other-workspace' } as Partial<AppState>)
|
||||
|
||||
await store.getState().removeWorkspaceCleanupCandidates([WORKTREE_ID])
|
||||
|
||||
expect(scan).toHaveBeenCalledWith({ worktreeId: WORKTREE_ID })
|
||||
})
|
||||
|
||||
it('lets explicitly selected not-suggested workspaces reach the removal path', async () => {
|
||||
const scan = vi.fn().mockResolvedValue({
|
||||
scannedAt: NOW,
|
||||
candidates: [makeCandidate()],
|
||||
errors: []
|
||||
} satisfies WorkspaceCleanupScanResult)
|
||||
const removeWorktree = vi.fn().mockResolvedValue({ ok: true })
|
||||
;(globalThis as { window: unknown }).window = {
|
||||
api: {
|
||||
workspaceCleanup: {
|
||||
scan,
|
||||
dismiss: vi.fn().mockResolvedValue(undefined),
|
||||
clearDismissals: vi.fn().mockResolvedValue(undefined),
|
||||
hasKillableLocalProcesses: vi.fn().mockResolvedValue({
|
||||
hasKillableProcesses: true
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const store = createCleanupTestStore(removeWorktree)
|
||||
|
||||
store.setState({
|
||||
tabsByWorktree: {
|
||||
[WORKTREE_ID]: [{ id: 'tab-1', title: 'zsh' }] as AppState['tabsByWorktree'][string]
|
||||
},
|
||||
ptyIdsByTabId: { 'tab-1': ['pty-1'] }
|
||||
} as Partial<AppState>)
|
||||
|
||||
await expect(store.getState().removeWorkspaceCleanupCandidates([WORKTREE_ID])).resolves.toEqual(
|
||||
{
|
||||
removedIds: [WORKTREE_ID],
|
||||
failures: []
|
||||
}
|
||||
)
|
||||
expect(removeWorktree).toHaveBeenCalledWith(WORKTREE_ID, false, {
|
||||
suppressPreservedBranchToast: true
|
||||
})
|
||||
})
|
||||
|
||||
it('fails a queued removal that now needs a force the user never approved', async () => {
|
||||
const approvedCandidate = makeCandidate()
|
||||
const dirtySinceConfirmation = makeCandidate({
|
||||
tier: 'review',
|
||||
blockers: ['dirty-files'],
|
||||
git: { clean: false, upstreamAhead: 0, upstreamBehind: 0, checkedAt: NOW }
|
||||
})
|
||||
const scan = vi.fn().mockResolvedValue({
|
||||
scannedAt: NOW,
|
||||
candidates: [dirtySinceConfirmation],
|
||||
errors: []
|
||||
} satisfies WorkspaceCleanupScanResult)
|
||||
installWorkspaceCleanupApi(scan)
|
||||
const removeWorktree = vi.fn().mockResolvedValue({ ok: true })
|
||||
const store = createCleanupTestStore(removeWorktree)
|
||||
|
||||
await expect(
|
||||
store.getState().removeWorkspaceCleanupCandidates([WORKTREE_ID], {
|
||||
approvedCandidates: [approvedCandidate]
|
||||
})
|
||||
).resolves.toEqual({
|
||||
removedIds: [],
|
||||
failures: [
|
||||
{
|
||||
worktreeId: WORKTREE_ID,
|
||||
displayName: 'old-workspace',
|
||||
message: 'Workspace changed after confirmation. Refresh to review it before removing.'
|
||||
}
|
||||
]
|
||||
})
|
||||
expect(removeWorktree).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('still force-removes rows whose approved candidate already carried git risk', async () => {
|
||||
const approvedCandidate = makeCandidate({
|
||||
tier: 'review',
|
||||
blockers: ['dirty-files'],
|
||||
git: { clean: false, upstreamAhead: 0, upstreamBehind: 0, checkedAt: NOW }
|
||||
})
|
||||
const scan = vi.fn().mockResolvedValue({
|
||||
scannedAt: NOW,
|
||||
candidates: [approvedCandidate],
|
||||
errors: []
|
||||
} satisfies WorkspaceCleanupScanResult)
|
||||
installWorkspaceCleanupApi(scan)
|
||||
const removeWorktree = vi.fn().mockResolvedValue({ ok: true })
|
||||
const store = createCleanupTestStore(removeWorktree)
|
||||
|
||||
await expect(
|
||||
store.getState().removeWorkspaceCleanupCandidates([WORKTREE_ID], {
|
||||
approvedCandidates: [approvedCandidate]
|
||||
})
|
||||
).resolves.toEqual({ removedIds: [WORKTREE_ID], failures: [] })
|
||||
expect(removeWorktree).toHaveBeenCalledWith(WORKTREE_ID, true, {
|
||||
suppressPreservedBranchToast: true
|
||||
})
|
||||
})
|
||||
|
||||
it('protects old workspaces when an agent process is still foregrounded', async () => {
|
||||
;(globalThis as { window: unknown }).window = {
|
||||
api: {
|
||||
pty: {
|
||||
hasChildProcesses: vi.fn().mockResolvedValue(true),
|
||||
getForegroundProcess: vi.fn().mockResolvedValue('codex')
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const [candidate] = await enrichWorkspaceCleanupCandidates(
|
||||
[makeCandidate()],
|
||||
makeState({
|
||||
tabsByWorktree: {
|
||||
[WORKTREE_ID]: [{ id: 'tab-1', title: 'zsh' }] as AppState['tabsByWorktree'][string]
|
||||
},
|
||||
ptyIdsByTabId: { 'tab-1': ['pty-1'] }
|
||||
}),
|
||||
{ applyDismissals: false }
|
||||
)
|
||||
|
||||
expect(candidate.tier).toBe('protected')
|
||||
expect(candidate.selectedByDefault).toBe(false)
|
||||
expect(candidate.blockers).toContain('running-terminal')
|
||||
})
|
||||
|
||||
it('does not let an idle title in another tab mask a running agent process', async () => {
|
||||
;(globalThis as { window: unknown }).window = {
|
||||
api: {
|
||||
pty: {
|
||||
hasChildProcesses: vi.fn(async (ptyId: string) => ptyId === 'pty-running'),
|
||||
getForegroundProcess: vi.fn(async (ptyId: string) =>
|
||||
ptyId === 'pty-running' ? 'codex' : 'zsh'
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const [candidate] = await enrichWorkspaceCleanupCandidates(
|
||||
[makeCandidate()],
|
||||
makeState({
|
||||
tabsByWorktree: {
|
||||
[WORKTREE_ID]: [
|
||||
{ id: 'tab-running', title: 'zsh' },
|
||||
{ id: 'tab-idle', title: 'Codex done' }
|
||||
] as AppState['tabsByWorktree'][string]
|
||||
},
|
||||
ptyIdsByTabId: {
|
||||
'tab-running': ['pty-running'],
|
||||
'tab-idle': ['pty-idle']
|
||||
}
|
||||
}),
|
||||
{ applyDismissals: false }
|
||||
)
|
||||
|
||||
expect(candidate.tier).toBe('protected')
|
||||
expect(candidate.selectedByDefault).toBe(false)
|
||||
expect(candidate.blockers).toContain('running-terminal')
|
||||
})
|
||||
})
|
||||
+9
-526
@@ -1,119 +1,19 @@
|
||||
import { create } from 'zustand'
|
||||
import { describe, expect, it, vi } from 'vitest'
|
||||
import type { AppState } from '../types'
|
||||
import type {
|
||||
WorkspaceCleanupCandidate,
|
||||
WorkspaceCleanupScanProgress,
|
||||
WorkspaceCleanupScanResult
|
||||
} from '../../../../shared/workspace-cleanup'
|
||||
import { createWorkspaceCleanupSlice, enrichWorkspaceCleanupCandidates } from './workspace-cleanup'
|
||||
import {
|
||||
NOW,
|
||||
WORKTREE_ID,
|
||||
createCleanupTestStore,
|
||||
deferred,
|
||||
installWorkspaceCleanupApi,
|
||||
makeCandidate
|
||||
} from './workspace-cleanup-slice-test-harness'
|
||||
|
||||
const WORKTREE_ID = 'repo1::/tmp/old-workspace'
|
||||
const NOW = 1_700_000_000_000
|
||||
|
||||
function makeCandidate(
|
||||
overrides: Partial<WorkspaceCleanupCandidate> = {}
|
||||
): WorkspaceCleanupCandidate {
|
||||
return {
|
||||
worktreeId: WORKTREE_ID,
|
||||
repoId: 'repo1',
|
||||
repoName: 'Repo 1',
|
||||
connectionId: null,
|
||||
displayName: 'old-workspace',
|
||||
branch: 'old-workspace',
|
||||
path: '/tmp/old-workspace',
|
||||
tier: 'ready',
|
||||
selectedByDefault: true,
|
||||
reasons: ['idle-clean'],
|
||||
blockers: [],
|
||||
lastActivityAt: NOW - 30 * 24 * 60 * 60 * 1000,
|
||||
localContext: {
|
||||
terminalTabCount: 0,
|
||||
cleanEditorTabCount: 0,
|
||||
browserTabCount: 0,
|
||||
diffCommentCount: 0,
|
||||
newestDiffCommentAt: null,
|
||||
retainedDoneAgentCount: 0
|
||||
},
|
||||
git: {
|
||||
clean: true,
|
||||
upstreamAhead: 0,
|
||||
upstreamBehind: 0,
|
||||
checkedAt: NOW
|
||||
},
|
||||
fingerprint: 'fingerprint-1',
|
||||
...overrides
|
||||
}
|
||||
}
|
||||
|
||||
function makeState(overrides: Partial<AppState> = {}): AppState {
|
||||
return {
|
||||
tabsByWorktree: {},
|
||||
ptyIdsByTabId: {},
|
||||
openFiles: [],
|
||||
editorDrafts: {},
|
||||
browserTabsByWorktree: {},
|
||||
retainedAgentsByPaneKey: {},
|
||||
activeWorktreeId: null,
|
||||
agentStatusByPaneKey: {},
|
||||
runtimePaneTitlesByTabId: {},
|
||||
lastVisitedAtByWorktreeId: {},
|
||||
workspaceCleanupDismissals: {},
|
||||
workspaceCleanupViewedCandidates: {},
|
||||
...overrides
|
||||
} as AppState
|
||||
}
|
||||
|
||||
function createCleanupTestStore(removeWorktree = vi.fn()) {
|
||||
return create<AppState>()(
|
||||
(...a) =>
|
||||
({
|
||||
tabsByWorktree: {},
|
||||
ptyIdsByTabId: {},
|
||||
openFiles: [],
|
||||
editorDrafts: {},
|
||||
browserTabsByWorktree: {},
|
||||
retainedAgentsByPaneKey: {},
|
||||
activeWorktreeId: null,
|
||||
agentStatusByPaneKey: {},
|
||||
runtimePaneTitlesByTabId: {},
|
||||
lastVisitedAtByWorktreeId: {},
|
||||
removeWorktree,
|
||||
...createWorkspaceCleanupSlice(...a)
|
||||
}) as unknown as AppState
|
||||
)
|
||||
}
|
||||
|
||||
function installWorkspaceCleanupApi(scan: ReturnType<typeof vi.fn>) {
|
||||
;(globalThis as { window: unknown }).window = {
|
||||
api: {
|
||||
workspaceCleanup: {
|
||||
scan,
|
||||
dismiss: vi.fn().mockResolvedValue(undefined),
|
||||
clearDismissals: vi.fn().mockResolvedValue(undefined),
|
||||
hasKillableLocalProcesses: vi.fn().mockResolvedValue({
|
||||
hasKillableProcesses: false
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function deferred<T>(): {
|
||||
promise: Promise<T>
|
||||
resolve: (value: T) => void
|
||||
reject: (error: unknown) => void
|
||||
} {
|
||||
let resolve!: (value: T) => void
|
||||
let reject!: (error: unknown) => void
|
||||
const promise = new Promise<T>((innerResolve, innerReject) => {
|
||||
resolve = innerResolve
|
||||
reject = innerReject
|
||||
})
|
||||
return { promise, resolve, reject }
|
||||
}
|
||||
|
||||
describe('workspace cleanup viewed rows', () => {
|
||||
describe('workspace cleanup scan progress', () => {
|
||||
it('joins duplicate broad cleanup scans', async () => {
|
||||
const pending = deferred<WorkspaceCleanupScanResult>()
|
||||
const scan = vi.fn().mockReturnValue(pending.promise)
|
||||
@@ -695,421 +595,4 @@ describe('workspace cleanup viewed rows', () => {
|
||||
await broadScan
|
||||
expect(store.getState().workspaceCleanupScan?.scannedAt).toBe(NOW)
|
||||
})
|
||||
|
||||
it('preflights cleanup removals concurrently and deletes nested workspaces globally deepest first', async () => {
|
||||
let activePreflights = 0
|
||||
let maxActivePreflights = 0
|
||||
let activeDeletes = 0
|
||||
let maxActiveDeletes = 0
|
||||
const deleteOrder: string[] = []
|
||||
const candidates = [
|
||||
makeCandidate({
|
||||
worktreeId: 'repo-a::/repo/parent',
|
||||
repoId: 'repo-a',
|
||||
path: '/repo/parent',
|
||||
displayName: 'parent'
|
||||
}),
|
||||
makeCandidate({
|
||||
worktreeId: 'repo-b::/repo/parent/child',
|
||||
repoId: 'repo-b',
|
||||
path: '/repo/parent/child',
|
||||
displayName: 'child'
|
||||
}),
|
||||
makeCandidate({
|
||||
worktreeId: 'repo-c::/other',
|
||||
repoId: 'repo-c',
|
||||
path: '/other',
|
||||
displayName: 'other',
|
||||
git: { clean: null, upstreamAhead: null, upstreamBehind: null, checkedAt: null },
|
||||
blockers: ['git-status-error']
|
||||
})
|
||||
]
|
||||
const candidateById = new Map(candidates.map((candidate) => [candidate.worktreeId, candidate]))
|
||||
const scan = vi.fn(async (args?: { worktreeId?: string }) => {
|
||||
activePreflights += 1
|
||||
maxActivePreflights = Math.max(maxActivePreflights, activePreflights)
|
||||
await new Promise((resolve) => setTimeout(resolve, 5))
|
||||
activePreflights -= 1
|
||||
return {
|
||||
scannedAt: NOW,
|
||||
candidates: args?.worktreeId ? [candidateById.get(args.worktreeId)!] : [],
|
||||
errors: []
|
||||
} satisfies WorkspaceCleanupScanResult
|
||||
})
|
||||
installWorkspaceCleanupApi(scan)
|
||||
|
||||
const removeWorktree = vi.fn(async (worktreeId: string) => {
|
||||
deleteOrder.push(worktreeId)
|
||||
activeDeletes += 1
|
||||
maxActiveDeletes = Math.max(maxActiveDeletes, activeDeletes)
|
||||
await new Promise((resolve) => setTimeout(resolve, 5))
|
||||
activeDeletes -= 1
|
||||
return { ok: true as const }
|
||||
})
|
||||
const store = createCleanupTestStore(removeWorktree)
|
||||
store.setState({
|
||||
workspaceCleanupScan: { scannedAt: NOW, candidates, errors: [] }
|
||||
} as Partial<AppState>)
|
||||
|
||||
await expect(
|
||||
store
|
||||
.getState()
|
||||
.removeWorkspaceCleanupCandidates(candidates.map((candidate) => candidate.worktreeId))
|
||||
).resolves.toEqual({
|
||||
removedIds: expect.arrayContaining(candidates.map((candidate) => candidate.worktreeId)),
|
||||
failures: []
|
||||
})
|
||||
|
||||
expect(maxActivePreflights).toBeGreaterThan(1)
|
||||
expect(maxActiveDeletes).toBe(1)
|
||||
expect(deleteOrder).toEqual([
|
||||
'repo-b::/repo/parent/child',
|
||||
'repo-a::/repo/parent',
|
||||
'repo-c::/other'
|
||||
])
|
||||
expect(removeWorktree).toHaveBeenCalledWith('repo-c::/other', true, {
|
||||
suppressPreservedBranchToast: true
|
||||
})
|
||||
expect(store.getState().workspaceCleanupScan?.candidates).toEqual([])
|
||||
})
|
||||
|
||||
it('demotes an active suggested workspace when it was not viewed from cleanup', async () => {
|
||||
const [candidate] = await enrichWorkspaceCleanupCandidates(
|
||||
[makeCandidate()],
|
||||
makeState({ activeWorktreeId: WORKTREE_ID }),
|
||||
{ applyDismissals: false }
|
||||
)
|
||||
|
||||
expect(candidate.tier).toBe('protected')
|
||||
expect(candidate.blockers).toContain('active-workspace')
|
||||
})
|
||||
|
||||
it('keeps a viewed active workspace visible but not removable', async () => {
|
||||
const [candidate] = await enrichWorkspaceCleanupCandidates(
|
||||
[makeCandidate()],
|
||||
makeState({
|
||||
activeWorktreeId: WORKTREE_ID,
|
||||
workspaceCleanupViewedCandidates: {
|
||||
[WORKTREE_ID]: {
|
||||
viewedAt: Date.now(),
|
||||
fingerprint: 'fingerprint-1',
|
||||
wasSuggested: true
|
||||
}
|
||||
}
|
||||
}),
|
||||
{ applyDismissals: false }
|
||||
)
|
||||
|
||||
expect(candidate.tier).toBe('protected')
|
||||
expect(candidate.selectedByDefault).toBe(false)
|
||||
expect(candidate.blockers).toContain('active-workspace')
|
||||
})
|
||||
|
||||
it('does not preserve the cleanup view exception after the row changes', async () => {
|
||||
const [candidate] = await enrichWorkspaceCleanupCandidates(
|
||||
[makeCandidate({ fingerprint: 'fingerprint-2' })],
|
||||
makeState({
|
||||
activeWorktreeId: WORKTREE_ID,
|
||||
workspaceCleanupViewedCandidates: {
|
||||
[WORKTREE_ID]: {
|
||||
viewedAt: Date.now(),
|
||||
fingerprint: 'fingerprint-1',
|
||||
wasSuggested: true
|
||||
}
|
||||
}
|
||||
}),
|
||||
{ applyDismissals: false }
|
||||
)
|
||||
|
||||
expect(candidate.tier).toBe('protected')
|
||||
expect(candidate.blockers).toContain('active-workspace')
|
||||
})
|
||||
|
||||
it('protects recently visible old workspaces with open context', async () => {
|
||||
const [candidate] = await enrichWorkspaceCleanupCandidates(
|
||||
[makeCandidate()],
|
||||
makeState({
|
||||
openFiles: [
|
||||
{
|
||||
id: 'file-1',
|
||||
worktreeId: WORKTREE_ID,
|
||||
filePath: '/tmp/old-workspace/src/app.ts',
|
||||
relativePath: 'src/app.ts',
|
||||
language: 'typescript',
|
||||
isDirty: false
|
||||
}
|
||||
] as AppState['openFiles'],
|
||||
lastVisitedAtByWorktreeId: {
|
||||
[WORKTREE_ID]: Date.now()
|
||||
}
|
||||
}),
|
||||
{ applyDismissals: false }
|
||||
)
|
||||
|
||||
expect(candidate.tier).toBe('protected')
|
||||
expect(candidate.selectedByDefault).toBe(false)
|
||||
expect(candidate.blockers).toContain('recent-visible-context')
|
||||
})
|
||||
|
||||
it('uses current renderer state after async delete preflight scan resolves', async () => {
|
||||
let resolveScan: (value: WorkspaceCleanupScanResult) => void
|
||||
const removeWorktree = vi.fn().mockResolvedValue({ ok: true })
|
||||
const store = createCleanupTestStore(removeWorktree)
|
||||
|
||||
;(globalThis as { window: unknown }).window = {
|
||||
api: {
|
||||
workspaceCleanup: {
|
||||
scan: vi.fn(
|
||||
(): Promise<WorkspaceCleanupScanResult> =>
|
||||
new Promise<WorkspaceCleanupScanResult>((resolve) => {
|
||||
resolveScan = resolve
|
||||
})
|
||||
),
|
||||
dismiss: vi.fn().mockResolvedValue(undefined),
|
||||
clearDismissals: vi.fn().mockResolvedValue(undefined),
|
||||
hasKillableLocalProcesses: vi.fn().mockResolvedValue({
|
||||
hasKillableProcesses: false
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const removal = store.getState().removeWorkspaceCleanupCandidates([WORKTREE_ID])
|
||||
store.setState({ activeWorktreeId: WORKTREE_ID })
|
||||
resolveScan!({ scannedAt: NOW, candidates: [makeCandidate()], errors: [] })
|
||||
|
||||
await expect(removal).resolves.toEqual({
|
||||
removedIds: [WORKTREE_ID],
|
||||
failures: []
|
||||
})
|
||||
expect(removeWorktree).toHaveBeenCalledWith(WORKTREE_ID, false, {
|
||||
suppressPreservedBranchToast: true
|
||||
})
|
||||
})
|
||||
|
||||
it('defers git checks for locally active workspaces on initial scans', async () => {
|
||||
const scan = vi.fn().mockResolvedValue({
|
||||
scannedAt: NOW,
|
||||
candidates: [],
|
||||
errors: []
|
||||
} satisfies WorkspaceCleanupScanResult)
|
||||
;(globalThis as { window: unknown }).window = {
|
||||
api: {
|
||||
workspaceCleanup: {
|
||||
scan,
|
||||
dismiss: vi.fn().mockResolvedValue(undefined),
|
||||
clearDismissals: vi.fn().mockResolvedValue(undefined),
|
||||
hasKillableLocalProcesses: vi.fn().mockResolvedValue({
|
||||
hasKillableProcesses: false
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const store = createCleanupTestStore()
|
||||
store.setState({
|
||||
activeWorktreeId: WORKTREE_ID,
|
||||
tabsByWorktree: {
|
||||
'repo1::/tmp/terminal-workspace': [
|
||||
{ id: 'tab-1', title: 'zsh' }
|
||||
] as AppState['tabsByWorktree'][string]
|
||||
},
|
||||
ptyIdsByTabId: { 'tab-1': ['pty-1'] }
|
||||
} as Partial<AppState>)
|
||||
|
||||
await store.getState().scanWorkspaceCleanup()
|
||||
|
||||
expect(scan).toHaveBeenCalledWith(
|
||||
{
|
||||
skipGitWorktreeIds: expect.arrayContaining([WORKTREE_ID, 'repo1::/tmp/terminal-workspace'])
|
||||
},
|
||||
expect.any(Function)
|
||||
)
|
||||
})
|
||||
|
||||
it('does not defer git checks for focused remove preflights', async () => {
|
||||
const scan = vi.fn().mockResolvedValue({
|
||||
scannedAt: NOW,
|
||||
candidates: [makeCandidate()],
|
||||
errors: []
|
||||
} satisfies WorkspaceCleanupScanResult)
|
||||
;(globalThis as { window: unknown }).window = {
|
||||
api: {
|
||||
workspaceCleanup: {
|
||||
scan,
|
||||
dismiss: vi.fn().mockResolvedValue(undefined),
|
||||
clearDismissals: vi.fn().mockResolvedValue(undefined),
|
||||
hasKillableLocalProcesses: vi.fn().mockResolvedValue({
|
||||
hasKillableProcesses: false
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const removeWorktree = vi.fn().mockResolvedValue({ ok: true })
|
||||
const store = createCleanupTestStore(removeWorktree)
|
||||
store.setState({ activeWorktreeId: 'repo1::/tmp/other-workspace' } as Partial<AppState>)
|
||||
|
||||
await store.getState().removeWorkspaceCleanupCandidates([WORKTREE_ID])
|
||||
|
||||
expect(scan).toHaveBeenCalledWith({ worktreeId: WORKTREE_ID })
|
||||
})
|
||||
|
||||
it('lets explicitly selected not-suggested workspaces reach the removal path', async () => {
|
||||
const scan = vi.fn().mockResolvedValue({
|
||||
scannedAt: NOW,
|
||||
candidates: [makeCandidate()],
|
||||
errors: []
|
||||
} satisfies WorkspaceCleanupScanResult)
|
||||
const removeWorktree = vi.fn().mockResolvedValue({ ok: true })
|
||||
;(globalThis as { window: unknown }).window = {
|
||||
api: {
|
||||
workspaceCleanup: {
|
||||
scan,
|
||||
dismiss: vi.fn().mockResolvedValue(undefined),
|
||||
clearDismissals: vi.fn().mockResolvedValue(undefined),
|
||||
hasKillableLocalProcesses: vi.fn().mockResolvedValue({
|
||||
hasKillableProcesses: true
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const store = createCleanupTestStore(removeWorktree)
|
||||
|
||||
store.setState({
|
||||
tabsByWorktree: {
|
||||
[WORKTREE_ID]: [{ id: 'tab-1', title: 'zsh' }] as AppState['tabsByWorktree'][string]
|
||||
},
|
||||
ptyIdsByTabId: { 'tab-1': ['pty-1'] }
|
||||
} as Partial<AppState>)
|
||||
|
||||
await expect(store.getState().removeWorkspaceCleanupCandidates([WORKTREE_ID])).resolves.toEqual(
|
||||
{
|
||||
removedIds: [WORKTREE_ID],
|
||||
failures: []
|
||||
}
|
||||
)
|
||||
expect(removeWorktree).toHaveBeenCalledWith(WORKTREE_ID, false, {
|
||||
suppressPreservedBranchToast: true
|
||||
})
|
||||
})
|
||||
|
||||
it('fails a queued removal that now needs a force the user never approved', async () => {
|
||||
const approvedCandidate = makeCandidate()
|
||||
const dirtySinceConfirmation = makeCandidate({
|
||||
tier: 'review',
|
||||
blockers: ['dirty-files'],
|
||||
git: { clean: false, upstreamAhead: 0, upstreamBehind: 0, checkedAt: NOW }
|
||||
})
|
||||
const scan = vi.fn().mockResolvedValue({
|
||||
scannedAt: NOW,
|
||||
candidates: [dirtySinceConfirmation],
|
||||
errors: []
|
||||
} satisfies WorkspaceCleanupScanResult)
|
||||
installWorkspaceCleanupApi(scan)
|
||||
const removeWorktree = vi.fn().mockResolvedValue({ ok: true })
|
||||
const store = createCleanupTestStore(removeWorktree)
|
||||
|
||||
await expect(
|
||||
store.getState().removeWorkspaceCleanupCandidates([WORKTREE_ID], {
|
||||
approvedCandidates: [approvedCandidate]
|
||||
})
|
||||
).resolves.toEqual({
|
||||
removedIds: [],
|
||||
failures: [
|
||||
{
|
||||
worktreeId: WORKTREE_ID,
|
||||
displayName: 'old-workspace',
|
||||
message: 'Workspace changed after confirmation. Refresh to review it before removing.'
|
||||
}
|
||||
]
|
||||
})
|
||||
expect(removeWorktree).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('still force-removes rows whose approved candidate already carried git risk', async () => {
|
||||
const approvedCandidate = makeCandidate({
|
||||
tier: 'review',
|
||||
blockers: ['dirty-files'],
|
||||
git: { clean: false, upstreamAhead: 0, upstreamBehind: 0, checkedAt: NOW }
|
||||
})
|
||||
const scan = vi.fn().mockResolvedValue({
|
||||
scannedAt: NOW,
|
||||
candidates: [approvedCandidate],
|
||||
errors: []
|
||||
} satisfies WorkspaceCleanupScanResult)
|
||||
installWorkspaceCleanupApi(scan)
|
||||
const removeWorktree = vi.fn().mockResolvedValue({ ok: true })
|
||||
const store = createCleanupTestStore(removeWorktree)
|
||||
|
||||
await expect(
|
||||
store.getState().removeWorkspaceCleanupCandidates([WORKTREE_ID], {
|
||||
approvedCandidates: [approvedCandidate]
|
||||
})
|
||||
).resolves.toEqual({ removedIds: [WORKTREE_ID], failures: [] })
|
||||
expect(removeWorktree).toHaveBeenCalledWith(WORKTREE_ID, true, {
|
||||
suppressPreservedBranchToast: true
|
||||
})
|
||||
})
|
||||
|
||||
it('protects old workspaces when an agent process is still foregrounded', async () => {
|
||||
;(globalThis as { window: unknown }).window = {
|
||||
api: {
|
||||
pty: {
|
||||
hasChildProcesses: vi.fn().mockResolvedValue(true),
|
||||
getForegroundProcess: vi.fn().mockResolvedValue('codex')
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const [candidate] = await enrichWorkspaceCleanupCandidates(
|
||||
[makeCandidate()],
|
||||
makeState({
|
||||
tabsByWorktree: {
|
||||
[WORKTREE_ID]: [{ id: 'tab-1', title: 'zsh' }] as AppState['tabsByWorktree'][string]
|
||||
},
|
||||
ptyIdsByTabId: { 'tab-1': ['pty-1'] }
|
||||
}),
|
||||
{ applyDismissals: false }
|
||||
)
|
||||
|
||||
expect(candidate.tier).toBe('protected')
|
||||
expect(candidate.selectedByDefault).toBe(false)
|
||||
expect(candidate.blockers).toContain('running-terminal')
|
||||
})
|
||||
|
||||
it('does not let an idle title in another tab mask a running agent process', async () => {
|
||||
;(globalThis as { window: unknown }).window = {
|
||||
api: {
|
||||
pty: {
|
||||
hasChildProcesses: vi.fn(async (ptyId: string) => ptyId === 'pty-running'),
|
||||
getForegroundProcess: vi.fn(async (ptyId: string) =>
|
||||
ptyId === 'pty-running' ? 'codex' : 'zsh'
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const [candidate] = await enrichWorkspaceCleanupCandidates(
|
||||
[makeCandidate()],
|
||||
makeState({
|
||||
tabsByWorktree: {
|
||||
[WORKTREE_ID]: [
|
||||
{ id: 'tab-running', title: 'zsh' },
|
||||
{ id: 'tab-idle', title: 'Codex done' }
|
||||
] as AppState['tabsByWorktree'][string]
|
||||
},
|
||||
ptyIdsByTabId: {
|
||||
'tab-running': ['pty-running'],
|
||||
'tab-idle': ['pty-idle']
|
||||
}
|
||||
}),
|
||||
{ applyDismissals: false }
|
||||
)
|
||||
|
||||
expect(candidate.tier).toBe('protected')
|
||||
expect(candidate.selectedByDefault).toBe(false)
|
||||
expect(candidate.blockers).toContain('running-terminal')
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,110 @@
|
||||
import { create } from 'zustand'
|
||||
import { vi } from 'vitest'
|
||||
import type { AppState } from '../types'
|
||||
import type { WorkspaceCleanupCandidate } from '../../../../shared/workspace-cleanup'
|
||||
import { createWorkspaceCleanupSlice } from './workspace-cleanup'
|
||||
|
||||
export const WORKTREE_ID = 'repo1::/tmp/old-workspace'
|
||||
export const NOW = 1_700_000_000_000
|
||||
|
||||
export function makeCandidate(
|
||||
overrides: Partial<WorkspaceCleanupCandidate> = {}
|
||||
): WorkspaceCleanupCandidate {
|
||||
return {
|
||||
worktreeId: WORKTREE_ID,
|
||||
repoId: 'repo1',
|
||||
repoName: 'Repo 1',
|
||||
connectionId: null,
|
||||
displayName: 'old-workspace',
|
||||
branch: 'old-workspace',
|
||||
path: '/tmp/old-workspace',
|
||||
tier: 'ready',
|
||||
selectedByDefault: true,
|
||||
reasons: ['idle-clean'],
|
||||
blockers: [],
|
||||
lastActivityAt: NOW - 30 * 24 * 60 * 60 * 1000,
|
||||
localContext: {
|
||||
terminalTabCount: 0,
|
||||
cleanEditorTabCount: 0,
|
||||
browserTabCount: 0,
|
||||
diffCommentCount: 0,
|
||||
newestDiffCommentAt: null,
|
||||
retainedDoneAgentCount: 0
|
||||
},
|
||||
git: {
|
||||
clean: true,
|
||||
upstreamAhead: 0,
|
||||
upstreamBehind: 0,
|
||||
checkedAt: NOW
|
||||
},
|
||||
fingerprint: 'fingerprint-1',
|
||||
...overrides
|
||||
}
|
||||
}
|
||||
|
||||
export function makeState(overrides: Partial<AppState> = {}): AppState {
|
||||
return {
|
||||
tabsByWorktree: {},
|
||||
ptyIdsByTabId: {},
|
||||
openFiles: [],
|
||||
editorDrafts: {},
|
||||
browserTabsByWorktree: {},
|
||||
retainedAgentsByPaneKey: {},
|
||||
activeWorktreeId: null,
|
||||
agentStatusByPaneKey: {},
|
||||
runtimePaneTitlesByTabId: {},
|
||||
lastVisitedAtByWorktreeId: {},
|
||||
workspaceCleanupDismissals: {},
|
||||
workspaceCleanupViewedCandidates: {},
|
||||
...overrides
|
||||
} as AppState
|
||||
}
|
||||
|
||||
export function createCleanupTestStore(removeWorktree: ReturnType<typeof vi.fn> = vi.fn()) {
|
||||
return create<AppState>()(
|
||||
(...a) =>
|
||||
({
|
||||
tabsByWorktree: {},
|
||||
ptyIdsByTabId: {},
|
||||
openFiles: [],
|
||||
editorDrafts: {},
|
||||
browserTabsByWorktree: {},
|
||||
retainedAgentsByPaneKey: {},
|
||||
activeWorktreeId: null,
|
||||
agentStatusByPaneKey: {},
|
||||
runtimePaneTitlesByTabId: {},
|
||||
lastVisitedAtByWorktreeId: {},
|
||||
removeWorktree,
|
||||
...createWorkspaceCleanupSlice(...a)
|
||||
}) as unknown as AppState
|
||||
)
|
||||
}
|
||||
|
||||
export function installWorkspaceCleanupApi(scan: ReturnType<typeof vi.fn>) {
|
||||
;(globalThis as { window: unknown }).window = {
|
||||
api: {
|
||||
workspaceCleanup: {
|
||||
scan,
|
||||
dismiss: vi.fn().mockResolvedValue(undefined),
|
||||
clearDismissals: vi.fn().mockResolvedValue(undefined),
|
||||
hasKillableLocalProcesses: vi.fn().mockResolvedValue({
|
||||
hasKillableProcesses: false
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export function deferred<T>(): {
|
||||
promise: Promise<T>
|
||||
resolve: (value: T) => void
|
||||
reject: (error: unknown) => void
|
||||
} {
|
||||
let resolve!: (value: T) => void
|
||||
let reject!: (error: unknown) => void
|
||||
const promise = new Promise<T>((innerResolve, innerReject) => {
|
||||
resolve = innerResolve
|
||||
reject = innerReject
|
||||
})
|
||||
return { promise, resolve, reject }
|
||||
}
|
||||
Reference in New Issue
Block a user