Files
orca/src/main/worktree-lineage-pruning.test.ts
T
Neil 77f23b013f refactor(shared): drop the shared/types barrel and import from the real modules (#14447)
#14397 split `shared/types.ts` into 46 per-domain modules but kept the path as
a re-export barrel so the import sites did not have to change. This removes
the barrel: every consumer now imports from the module that actually declares
the type, and `src/shared/types.ts` is deleted.

Barrels hide where a type lives, make every consumer look like it depends on
the whole domain, and let an unrelated edit invalidate a module that ~2,000
files transitively import.

2,323 import declarations across 2,321 files. Rewritten mechanically: each
specifier was resolved to an absolute path via the TypeScript AST and
recomputed, rather than string-substituted, so alias forms (`@/../../shared/
types`) and per-specifier `type` modifiers survive.

Four cases the mechanical pass had to handle, each found by a gate rather than
by reading the diff:

- Modules inside `src/shared` import the barrel as `./types`, not
  `shared/types`. A pre-filter on the latter string skipped 176 of them and
  left imports dangling at a deleted file, which surfaced as confusing
  `Property 'x' is optional in type 'Repo' but required in Pick<Repo, ...>`
  errors rather than "module not found".
- The barrel RENAMED one type on the way through
  (`WorkspaceSource as WorkspaceCreateTelemetrySource`), so the original name
  in the owning module has to be re-aliased at each consumer.
- Three test files put `;(globalThis as ...)` on the line after the import.
  TypeScript parses that `;` as the import statement's terminator, so
  replacing through `statement.getEnd()` deletes it and breaks ASI. The
  rewrite now stops at the module specifier.
- A file that already imported directly from a module got a SECOND import
  from it, because the barrel re-exported those same names — which trips
  `import/no-duplicates` under `--deny-warnings`. A post-pass merges
  declarations sharing a specifier and type-only-ness; the `import type` plus
  `import` pair from one module is left alone, since that form is allowed.

Splitting one barrel import into several genuinely adds lines, which pushed
`terminal-layout-pty-ownership.ts` to 301 counted lines: its 107-character
import must wrap, and neither local type collapses onto one line (101 and 116
characters). Rather than contort a type declaration to fit a line budget,
`collectLeafIds` and `pruneLeaves` move to `terminal-pane-layout-tree.ts` —
they are pure structural operations on the layout tree and independent of PTY
ownership. `visible-worktrees.ts` similarly loses its own mini-barrel
re-export of `isDefaultBranchWorkspace`, with the four real consumers
repointed at the declaring module. No `max-lines` bypass added.

Verified: cold `tsc --noEmit` green on node, cli, and web (buildinfo deleted
first — these projects are `composite: true` and reuse stale caches); the full
`pnpm lint` green, not just bare oxlint — the narrower local check is what let
the duplicate imports reach CI; max-lines ratchet OK at 344.
2026-08-13 22:48:24 -07:00

130 lines
4.9 KiB
TypeScript

import { describe, expect, it, vi } from 'vitest'
import type { Repo } from '../shared/repo-types'
import type { WorkspaceLineage, WorktreeLineage } from '../shared/worktree/lineage-types'
import type { WorktreeMeta } from '../shared/worktree/meta-types'
import { worktreeWorkspaceKey } from '../shared/workspace-scope'
import { pruneLineageForMissingRepoWorktrees } from './worktree-lineage-pruning'
const repo: Repo = {
id: 'repo-1',
path: '/repo',
displayName: 'repo',
badgeColor: 'blue',
addedAt: 1
}
function lineage(childId: string, parentId: string): WorktreeLineage {
return {
worktreeId: childId,
worktreeInstanceId: `${childId}-instance`,
parentWorktreeId: parentId,
parentWorktreeInstanceId: `${parentId}-instance`,
origin: 'manual',
capture: { source: 'manual-action', confidence: 'explicit' },
createdAt: 1
}
}
function workspaceLineage(childId: string, parentId: string): WorkspaceLineage {
return {
childWorkspaceKey: worktreeWorkspaceKey(childId),
childInstanceId: `${childId}-instance`,
parentWorkspaceKey: worktreeWorkspaceKey(parentId),
parentInstanceId: `${parentId}-instance`,
origin: 'manual',
capture: { source: 'manual-action', confidence: 'explicit' },
createdAt: 1
}
}
function createStore(
worktreeLineageById: Record<string, WorktreeLineage>,
workspaceLineageByChildKey: Record<string, WorkspaceLineage>,
metaById: Record<string, WorktreeMeta>
) {
return {
getRepos: () => [repo],
getAllWorktreeLineage: () => worktreeLineageById,
getAllWorkspaceLineage: () => workspaceLineageByChildKey,
getWorktreeMeta: (id: string) => metaById[id],
removeWorktreeLineage: vi.fn((id: string) => delete worktreeLineageById[id]),
removeWorkspaceLineage: vi.fn((key: string) => delete workspaceLineageByChildKey[key]),
setWorktreeMeta: vi.fn((id: string, updates: Partial<WorktreeMeta>) => {
metaById[id] = { ...metaById[id], ...updates }
return metaById[id]
})
}
}
describe('pruneLineageForMissingRepoWorktrees', () => {
it('refuses an empty scan when the repo still has registered lineage', () => {
const parentId = 'repo-1::/repo/parent'
const childId = 'repo-1::/repo/child'
const edge = lineage(childId, parentId)
const workspaceEdge = workspaceLineage(childId, parentId)
const worktreeLineageById = { [childId]: edge }
const workspaceLineageByChildKey = { [worktreeWorkspaceKey(childId)]: workspaceEdge }
const metaById = {
[parentId]: { instanceId: edge.parentWorktreeInstanceId } as WorktreeMeta
}
const store = createStore(worktreeLineageById, workspaceLineageByChildKey, metaById)
pruneLineageForMissingRepoWorktrees(store as never, repo, [])
expect(store.removeWorktreeLineage).not.toHaveBeenCalled()
expect(store.removeWorkspaceLineage).not.toHaveBeenCalled()
expect(store.setWorktreeMeta).not.toHaveBeenCalled()
expect(worktreeLineageById[childId]).toBe(edge)
expect(workspaceLineageByChildKey[worktreeWorkspaceKey(childId)]).toBe(workspaceEdge)
})
it('prunes missing children and rotates missing parents after a trusted non-empty scan', () => {
const liveParentId = 'repo-1::/repo/live-parent'
const missingChildId = 'repo-1::/repo/missing-child'
const liveChildId = 'repo-1::/repo/live-child'
const missingParentId = 'repo-1::/repo/missing-parent'
const missingChildEdge = lineage(missingChildId, liveParentId)
const missingParentEdge = lineage(liveChildId, missingParentId)
const worktreeLineageById = {
[missingChildId]: missingChildEdge,
[liveChildId]: missingParentEdge
}
const workspaceLineageByChildKey = {
[worktreeWorkspaceKey(missingChildId)]: workspaceLineage(missingChildId, liveParentId),
[worktreeWorkspaceKey(liveChildId)]: workspaceLineage(liveChildId, missingParentId)
}
const metaById = {
[liveParentId]: { instanceId: missingChildEdge.parentWorktreeInstanceId } as WorktreeMeta,
[missingParentId]: { instanceId: missingParentEdge.parentWorktreeInstanceId } as WorktreeMeta
}
const store = createStore(worktreeLineageById, workspaceLineageByChildKey, metaById)
pruneLineageForMissingRepoWorktrees(store as never, repo, [
{
path: '/repo/live-parent',
head: 'a',
branch: 'main',
isBare: false,
isMainWorktree: false
},
{
path: '/repo/live-child',
head: 'b',
branch: 'child',
isBare: false,
isMainWorktree: false
}
])
expect(store.removeWorktreeLineage).toHaveBeenCalledWith(missingChildId)
expect(store.removeWorktreeLineage).not.toHaveBeenCalledWith(liveChildId)
expect(store.setWorktreeMeta).toHaveBeenCalledWith(missingParentId, {
instanceId: expect.any(String)
})
expect(store.setWorktreeMeta).not.toHaveBeenCalledWith(liveParentId, expect.anything())
expect(metaById[missingParentId].instanceId).not.toBe(
missingParentEdge.parentWorktreeInstanceId
)
})
})