fix(worktrees): let git delete removed checkouts so chat sends never wait behind them

config/scripts/ci-shard-timings.json

@@ -1788,7 +1788,6 @@
       "src/main/git/worktree-create-preparation-real-wsl.test.ts": 271,
       "src/main/git/worktree-created-description-real-git.test.ts": 1340,
       "src/main/git/worktree-created-disk-witness.test.ts": 149,
-      "src/main/git/worktree-deferred-removal-real-git.test.ts": 587,
       "src/main/git/worktree-diff-stamp-guest-gitdir.test.ts": 40,
       "src/main/git/worktree-diff-stamp-host-paths.test.ts": 55,
       "src/main/git/worktree-git-capabilities.test.ts": 248,
@@ -1805,6 +1804,7 @@
       "src/main/git/worktree-preparation-base-oid.test.ts": 99,
       "src/main/git/worktree-preparation-cancel-latency.bench.test.ts": 248,
       "src/main/git/worktree-removal-large-tree.bench.test.ts": 291,
+      "src/main/git/worktree-removal-real-git.test.ts": 5000,
       "src/main/git/worktree-remove-branch-deletion.test.ts": 194,
       "src/main/git/worktree-scan-cache-annotation-reuse.test.ts": 241,
       "src/main/git/worktree-scan-cache-sharing.test.ts": 284,

src/cli/handlers/worktree.ts

@@ -304,6 +304,10 @@ export const WORKTREE_HANDLERS: Record<string, CommandHandler> = {
     })
     printHookWarning(result.result, json)
     printPreservedBranchWarning(result.result, json)
-    printResult(result, json, (value) => `removed: ${value.removed}`)
+    printResult(result, json, (value) =>
+      value.removing
+        ? `removed: ${value.removed}\nOrca is still deleting the checkout in the background.`
+        : `removed: ${value.removed}`
+    )
   }
 }

src/cli/index.test.ts

@@ -120,6 +120,20 @@ describe('command aliases dispatch to the canonical handler', () => {
     )
   })
 
+  it('says the checkout is still being deleted when the host accepted a background removal', async () => {
+    queueFixtures(
+      callMock,
+      okFixture('req_show', { worktree: { hostId: 'local' } }),
+      okFixture('req', { removed: true, removing: true })
+    )
+
+    await main(['worktree', 'rm', '--worktree', 'id:wt-1'], '/tmp/repo')
+
+    expect(logSpy).toHaveBeenCalledWith(
+      'removed: true\nOrca is still deleting the checkout in the background.'
+    )
+  })
+
   it('fails closed when worktree removal cannot resolve a host', async () => {
     queueFixtures(callMock, okFixture('req_show', { worktree: { id: 'wt-1' } }))
     const priorExitCode = process.exitCode

src/main/git/add-sparse-worktree.test.ts

@@ -7,26 +7,14 @@ const {
   translateWslOutputPathsMock,
   statMock,
   readFileMock,
-  resolveGitDirMock,
-  moveWorktreeDirectoryToTrashMock,
-  restoreWorktreeDirectoryFromTrashMock,
-  scheduleWorktreeTrashDeletionMock
+  resolveGitDirMock
 } = vi.hoisted(() => ({
   gitExecFileAsyncMock: vi.fn(),
   gitExecFileSyncMock: vi.fn(),
   translateWslOutputPathsMock: vi.fn((output: string) => output),
   statMock: vi.fn(),
   readFileMock: vi.fn(),
-  resolveGitDirMock: vi.fn(),
-  moveWorktreeDirectoryToTrashMock: vi.fn(),
-  restoreWorktreeDirectoryFromTrashMock: vi.fn(),
-  scheduleWorktreeTrashDeletionMock: vi.fn()
-}))
-
-vi.mock('../worktree-trash', () => ({
-  moveWorktreeDirectoryToTrash: moveWorktreeDirectoryToTrashMock,
-  restoreWorktreeDirectoryFromTrash: restoreWorktreeDirectoryFromTrashMock,
-  scheduleWorktreeTrashDeletion: scheduleWorktreeTrashDeletionMock
+  resolveGitDirMock: vi.fn()
 }))
 
 vi.mock('./runner', () => ({
@@ -59,11 +47,7 @@ const mockGitCommands = createGitCommandMocker(gitExecFileAsyncMock)
 const getGitCalls = createGitCallReader(gitExecFileAsyncMock)
 
 beforeEach(() => {
-  resetWorktreeRemovalState({
-    moveWorktreeDirectoryToTrashMock,
-    restoreWorktreeDirectoryFromTrashMock,
-    scheduleWorktreeTrashDeletionMock
-  })
+  resetWorktreeRemovalState()
 })
 
 describe('addSparseWorktree', () => {

src/main/git/command-runner/git-admission-state.ts

@@ -8,7 +8,8 @@ export const NETWORK_HEADROOM = 1
 export const ROUTE_CAP = 2
 export const ROUTE_HEADROOM = 1
 export const GIT_ADMISSION_AGING_MS = 15_000
-// General 4+2 and network 3+1 are disjoint, so at most ten git children run globally.
+// General 4+2 and network 3+1 are disjoint, so at most ten admitted git children run globally;
+// worktree deletes bypass admission under their own limit (WORKTREE_DELETE_CONCURRENCY).
 export const MAX_GIT_CHILDREN = 10
 
 export type AdmissionClass = 'general' | 'network'

src/main/git/command-runner/git-exec-admission-exempt.test.ts

@@ -0,0 +1,62 @@
+import { EventEmitter } from 'node:events'
+import type { ChildProcess } from 'node:child_process'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+const { execFileMock } = vi.hoisted(() => ({ execFileMock: vi.fn() }))
+
+vi.mock('node:child_process', async (importOriginal) => ({
+  ...(await importOriginal()),
+  execFile: execFileMock
+}))
+
+import { gitExecFileAsync } from './git-exec-file'
+import {
+  GitAdmissionScheduler,
+  _gitAdmissionSnapshotForTests,
+  _resetGitAdmissionForTests
+} from './git-subprocess-admission'
+
+function mockChild(pid: number): ChildProcess {
+  const child = Object.assign(new EventEmitter(), {
+    pid,
+    kill: vi.fn(() => true),
+    stdin: Object.assign(new EventEmitter(), { end: vi.fn() }),
+    stdout: new EventEmitter(),
+    stderr: new EventEmitter()
+  })
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the exec wrapper only reads pid, kill, stdio and events.
+  return child as unknown as ChildProcess
+}
+
+describe('worktree deletes and general git admission', () => {
+  beforeEach(() => {
+    vi.useFakeTimers()
+    execFileMock.mockReset()
+    // The smallest general cap a host can have: deletes holding it would stall every status read.
+    _resetGitAdmissionForTests(new GitAdmissionScheduler({ generalCap: 2, generalHeadroom: 0 }))
+  })
+
+  afterEach(() => {
+    vi.useRealTimers()
+    _resetGitAdmissionForTests()
+  })
+
+  it('runs a status read while deletes that fill the general cap are still running', async () => {
+    let pid = 100
+    execFileMock.mockImplementation(() => mockChild(pid++))
+
+    for (const path of ['/wt-a', '/wt-b', '/wt-c']) {
+      void gitExecFileAsync(['worktree', 'remove', path], { cwd: '/repo', admissionExempt: true })
+    }
+    await vi.advanceTimersByTimeAsync(0)
+    expect(execFileMock).toHaveBeenCalledTimes(3)
+    expect(_gitAdmissionSnapshotForTests().budgets.general?.baseUsed ?? 0).toBe(0)
+
+    void gitExecFileAsync(['status', '--porcelain'], { cwd: '/repo' })
+    await vi.advanceTimersByTimeAsync(0)
+
+    expect(execFileMock).toHaveBeenCalledTimes(4)
+    expect(execFileMock.mock.calls[3]?.[1]).toContain('status')
+    expect(_gitAdmissionSnapshotForTests().queued).toBe(0)
+  })
+})

src/main/git/command-runner/git-exec-file.ts

@@ -65,13 +65,15 @@ async function gitExecFileAsyncUnlocked(
       const policy = effectiveOptions.useConfiguredSshCommandForNetwork
         ? await buildNetworkSshPolicyEnv(effectiveOptions)
         : { env: nonInteractiveGitEnv(effectiveOptions.env), mode: 'default' as const }
-      const grant = await acquireGitAdmission({
-        args,
-        cwd: options.cwd,
-        wslDistro: options.wslDistro,
-        tier: options.admissionTier,
-        signal: options.signal
-      })
+      const grant = options.admissionExempt
+        ? { queueWaitMs: 0, release: () => {} }
+        : await acquireGitAdmission({
+            args,
+            cwd: options.cwd,
+            wslDistro: options.wslDistro,
+            tier: options.admissionTier,
+            signal: options.signal
+          })
       span?.setAttribute('git.queue_wait_ms', grant.queueWaitMs)
       const timeoutMs = gitCommandTimeoutMs(args, options.timeout, options.timeoutMsForTest)
       const terminationState: { current: Promise<void> | null } = { current: null }

src/main/git/command-runner/git-exec-options.ts

@@ -23,4 +23,6 @@ export type GitExecOptions = {
   captureWslLoginShellOutput?: boolean
   /** Scheduler priority for this child; status is the safe default. */
   admissionTier?: GitAdmissionTier
+  /** Skips general admission; only for a caller that bounds its own concurrency (worktree deletes). */
+  admissionExempt?: true
 }

src/main/git/remove-worktree-branch-cleanup.test.ts

@@ -1,32 +1,20 @@
 import type * as FsPromises from 'node:fs/promises'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { afterEach, beforeEach, describe, expect, it, vi, type MockInstance } from 'vitest'
 
 const {
   gitExecFileAsyncMock,
   gitExecFileSyncMock,
   translateWslOutputPathsMock,
   statMock,
   readFileMock,
-  resolveGitDirMock,
-  moveWorktreeDirectoryToTrashMock,
-  restoreWorktreeDirectoryFromTrashMock,
-  scheduleWorktreeTrashDeletionMock
+  resolveGitDirMock
 } = vi.hoisted(() => ({
   gitExecFileAsyncMock: vi.fn(),
   gitExecFileSyncMock: vi.fn(),
   translateWslOutputPathsMock: vi.fn((output: string) => output),
   statMock: vi.fn(),
   readFileMock: vi.fn(),
-  resolveGitDirMock: vi.fn(),
-  moveWorktreeDirectoryToTrashMock: vi.fn(),
-  restoreWorktreeDirectoryFromTrashMock: vi.fn(),
-  scheduleWorktreeTrashDeletionMock: vi.fn()
-}))
-
-vi.mock('../worktree-trash', () => ({
-  moveWorktreeDirectoryToTrash: moveWorktreeDirectoryToTrashMock,
-  restoreWorktreeDirectoryFromTrash: restoreWorktreeDirectoryFromTrashMock,
-  scheduleWorktreeTrashDeletion: scheduleWorktreeTrashDeletionMock
+  resolveGitDirMock: vi.fn()
 }))
 
 vi.mock('./runner', () => ({
@@ -58,12 +46,16 @@ import { forceDeleteLocalBranch, removeWorktree } from './worktree'
 const mockGitCommands = createGitCommandMocker(gitExecFileAsyncMock)
 const getGitCalls = createGitCallReader(gitExecFileAsyncMock)
 
+// Why: removal argv carries core.longpaths on Windows; pin a non-Windows default for exact argv.
+let platformSpy: MockInstance<() => NodeJS.Platform>
+
 beforeEach(() => {
-  resetWorktreeRemovalState({
-    moveWorktreeDirectoryToTrashMock,
-    restoreWorktreeDirectoryFromTrashMock,
-    scheduleWorktreeTrashDeletionMock
-  })
+  resetWorktreeRemovalState()
+  platformSpy = vi.spyOn(process, 'platform', 'get').mockReturnValue('darwin')
+})
+
+afterEach(() => {
+  platformSpy.mockRestore()
 })
 
 describe('removeWorktree', () => {
@@ -460,4 +452,32 @@ branch refs/heads/feature/test
     )
     expect(getGitCalls()).not.toContain('git config --remove-section branch.feature/test')
   })
+
+  it('runs branch cleanup for one repo one removal at a time, not the checkout deletes', async () => {
+    let releaseFirstBranchDelete: () => void = () => {}
+    const firstBranchDelete = new Promise<void>((resolve) => {
+      releaseFirstBranchDelete = resolve
+    })
+    gitExecFileAsyncMock.mockImplementation(async (args: string[]) => {
+      if (args.join(' ') === 'branch -d -- feature/a') {
+        await firstBranchDelete
+      }
+      return { stdout: '', stderr: '' }
+    })
+
+    const first = removeWorktree('/repo', '/repo-a', false, {
+      knownRemovedWorktree: { branch: 'refs/heads/feature/a', head: 'aaa', locked: false }
+    })
+    await vi.waitFor(() => expect(getGitCalls()).toContain('git branch -d -- feature/a'))
+    const second = removeWorktree('/repo', '/repo-b', false, {
+      knownRemovedWorktree: { branch: 'refs/heads/feature/b', head: 'bbb', locked: false }
+    })
+    await vi.waitFor(() => expect(getGitCalls()).toContain('git worktree remove /repo-b'))
+    await new Promise((resolve) => setTimeout(resolve, 20))
+    expect(getGitCalls()).not.toContain('git branch -d -- feature/b')
+
+    releaseFirstBranchDelete()
+    await Promise.all([first, second])
+    expect(getGitCalls()).toContain('git branch -d -- feature/b')
+  })
 })

src/main/git/remove-worktree-clean-preflight.test.ts

@@ -7,26 +7,14 @@ const {
   translateWslOutputPathsMock,
   statMock,
   readFileMock,
-  resolveGitDirMock,
-  moveWorktreeDirectoryToTrashMock,
-  restoreWorktreeDirectoryFromTrashMock,
-  scheduleWorktreeTrashDeletionMock
+  resolveGitDirMock
 } = vi.hoisted(() => ({
   gitExecFileAsyncMock: vi.fn(),
   gitExecFileSyncMock: vi.fn(),
   translateWslOutputPathsMock: vi.fn((output: string) => output),
   statMock: vi.fn(),
   readFileMock: vi.fn(),
-  resolveGitDirMock: vi.fn(),
-  moveWorktreeDirectoryToTrashMock: vi.fn(),
-  restoreWorktreeDirectoryFromTrashMock: vi.fn(),
-  scheduleWorktreeTrashDeletionMock: vi.fn()
-}))
-
-vi.mock('../worktree-trash', () => ({
-  moveWorktreeDirectoryToTrash: moveWorktreeDirectoryToTrashMock,
-  restoreWorktreeDirectoryFromTrash: restoreWorktreeDirectoryFromTrashMock,
-  scheduleWorktreeTrashDeletion: scheduleWorktreeTrashDeletionMock
+  resolveGitDirMock: vi.fn()
 }))
 
 vi.mock('./runner', () => ({
@@ -50,11 +38,7 @@ import { resetWorktreeRemovalState } from './remove-worktree-test-harness'
 import { assertWorktreeCleanForRemoval, WORKTREE_REMOVAL_PREFLIGHT_TIMEOUT_MS } from './worktree'
 
 beforeEach(() => {
-  resetWorktreeRemovalState({
-    moveWorktreeDirectoryToTrashMock,
-    restoreWorktreeDirectoryFromTrashMock,
-    scheduleWorktreeTrashDeletionMock
-  })
+  resetWorktreeRemovalState()
 })
 
 describe('assertWorktreeCleanForRemoval', () => {

src/main/git/remove-worktree-test-harness.ts

@@ -80,23 +80,11 @@ export function mockSparseCheckoutEnabledConfig(readFileMock: Mock): void {
   })
 }
 
-export type WorktreeTrashMocks = {
-  moveWorktreeDirectoryToTrashMock: Mock
-  restoreWorktreeDirectoryFromTrashMock: Mock
-  scheduleWorktreeTrashDeletionMock: Mock
-}
-
-/** Per-test reset shared by every worktree suite: caches cleared, trash rename unavailable. */
-export function resetWorktreeRemovalState(trashMocks: WorktreeTrashMocks): void {
+/** Per-test reset shared by every worktree suite: caches cleared. */
+export function resetWorktreeRemovalState(): void {
   clearGitCapabilityStateForTests()
   _resetWorktreeScanCacheForTests()
   __resetSparseCheckoutStateCacheForTests()
-  // Default: the checkout cannot be renamed aside, so removal deletes it in place.
-  trashMocks.moveWorktreeDirectoryToTrashMock.mockReset()
-  trashMocks.moveWorktreeDirectoryToTrashMock.mockResolvedValue(undefined)
-  trashMocks.restoreWorktreeDirectoryFromTrashMock.mockReset()
-  trashMocks.restoreWorktreeDirectoryFromTrashMock.mockResolvedValue(true)
-  trashMocks.scheduleWorktreeTrashDeletionMock.mockReset()
 }
 
 export type WorktreeGitMocks = {