Files
orca/src/shared/external-worktree-inbox.ts
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

145 lines
4.5 KiB
TypeScript

import { normalizeRuntimePathForComparison } from './cross-platform-path'
import type { Repo } from './repo-types'
import type { DetectedWorktree, DetectedWorktreeListResult } from './worktree/types'
import {
effectiveExternalWorktreeVisibility,
isLegacyRepoForExternalWorktreeVisibility
} from './external-worktree-visibility'
export function normalizeExternalWorktreeInboxPath(path: string): string {
return normalizeRuntimePathForComparison(path)
}
export function areExternalWorktreeInboxPathsEqual(leftPath: string, rightPath: string): boolean {
return (
normalizeExternalWorktreeInboxPath(leftPath) === normalizeExternalWorktreeInboxPath(rightPath)
)
}
export function mergeExternalWorktreeInboxPaths(
existing: readonly string[] | undefined,
additions: readonly string[]
): string[] {
const seen = new Set((existing ?? []).map((path) => normalizeExternalWorktreeInboxPath(path)))
const merged = [...(existing ?? [])]
for (const path of additions) {
const normalized = normalizeExternalWorktreeInboxPath(path)
if (!normalized || seen.has(normalized)) {
continue
}
seen.add(normalized)
merged.push(path)
}
return merged
}
export function getHiddenExternalWorktrees(
detected: DetectedWorktreeListResult | undefined
): DetectedWorktree[] {
if (detected?.authoritative !== true) {
return []
}
return detected.worktrees.filter(
(worktree) => !worktree.visible && isUserFacingExternalWorktree(worktree)
)
}
export function getVisibleExternalWorktrees(
detected: DetectedWorktreeListResult | undefined
): DetectedWorktree[] {
if (detected?.authoritative !== true) {
return []
}
return detected.worktrees.filter(
(worktree) => worktree.visible && isUserFacingExternalWorktree(worktree)
)
}
function isUserFacingExternalWorktree(worktree: DetectedWorktree): boolean {
// Why: agent plumbing stays outside the discovery inbox even when its separate visibility policy shows it.
return (
!worktree.selectedCheckout &&
worktree.ownership !== 'orca-managed' &&
worktree.ownership !== 'agent-scratch'
)
}
// Why: per-path recovery remains available while either repo visibility policy is off.
function isImportableExternalWorktree(worktree: DetectedWorktree): boolean {
return !worktree.selectedCheckout && worktree.ownership !== 'orca-managed'
}
export function getHiddenImportableExternalWorktrees(
detected: DetectedWorktreeListResult | undefined
): DetectedWorktree[] {
if (detected?.authoritative !== true) {
return []
}
return detected.worktrees.filter(
(worktree) => !worktree.visible && isImportableExternalWorktree(worktree)
)
}
export function getVisibleNonOrcaWorktrees(
detected: DetectedWorktreeListResult | undefined
): DetectedWorktree[] {
if (detected?.authoritative !== true) {
return []
}
return detected.worktrees.filter(
(worktree) =>
worktree.visible && !worktree.selectedCheckout && worktree.ownership !== 'orca-managed'
)
}
export function isExternalWorktreeDiscoverySuppressed(
repo: Pick<Repo, 'externalWorktreeDiscoverySuppressedAt'>
): boolean {
return typeof repo.externalWorktreeDiscoverySuppressedAt === 'number'
}
export function hasCompletedInitialExternalWorktreeImportPrompt(
repo: Pick<Repo, 'externalWorktreeVisibilityPromptDismissedAt'>
): boolean {
return typeof repo.externalWorktreeVisibilityPromptDismissedAt === 'number'
}
export function shouldOfferNewExternalWorktreeInbox(repo: Repo): boolean {
if (isExternalWorktreeDiscoverySuppressed(repo)) {
return false
}
if (!hasCompletedInitialExternalWorktreeImportPrompt(repo)) {
return false
}
return (
effectiveExternalWorktreeVisibility(repo, isLegacyRepoForExternalWorktreeVisibility(repo)) ===
'hide'
)
}
export function getNewExternalWorktreeInboxWorktrees(
detected: DetectedWorktreeListResult | undefined,
repo: Repo
): DetectedWorktree[] {
if (!shouldOfferNewExternalWorktreeInbox(repo)) {
return []
}
const baseline = new Set(
(repo.externalWorktreeInboxBaselinePaths ?? []).map((path) =>
normalizeExternalWorktreeInboxPath(path)
)
)
return getHiddenExternalWorktrees(detected).filter(
(worktree) => !baseline.has(normalizeExternalWorktreeInboxPath(worktree.path))
)
}
export function isExplicitlyImportedExternalWorktreePath(
worktreePath: string,
repo: { importedExternalWorktreePaths?: readonly string[] }
): boolean {
return (repo.importedExternalWorktreePaths ?? []).some((path) =>
areExternalWorktreeInboxPathsEqual(path, worktreePath)
)
}