mirror of
https://github.com/stablyai/orca.git
synced 2026-09-29 16:02:50 +00:00
Neil
77f23b013f
#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.
94 lines
2.9 KiB
TypeScript
94 lines
2.9 KiB
TypeScript
import type {
|
|
TerminalLayoutSnapshot,
|
|
TerminalPaneLayoutNode
|
|
} from '../../shared/terminal-tab-types'
|
|
|
|
export function terminalLayoutContainsLeaf(
|
|
node: TerminalPaneLayoutNode | null | undefined,
|
|
leafId: string
|
|
): boolean {
|
|
if (!node) {
|
|
return false
|
|
}
|
|
return node.type === 'leaf'
|
|
? node.leafId === leafId
|
|
: terminalLayoutContainsLeaf(node.first, leafId) ||
|
|
terminalLayoutContainsLeaf(node.second, leafId)
|
|
}
|
|
|
|
/**
|
|
* Insert a newly split-off leaf into a terminal tab's persisted layout tree.
|
|
*
|
|
* Why: a headless ("Orca server") split only updated the live session snapshot,
|
|
* never the persisted workspace-session layout, so a later snapshot rebuild
|
|
* re-derived from the stale single-leaf layout and collapsed the split. This
|
|
* builds the durable post-split layout so the split survives rebuilds.
|
|
*/
|
|
export function buildHeadlessTerminalSplitLayout(
|
|
existing: TerminalLayoutSnapshot | undefined,
|
|
args: {
|
|
leafId: string
|
|
ptyId: string
|
|
splitFromLeafId: string
|
|
direction: 'horizontal' | 'vertical'
|
|
}
|
|
): TerminalLayoutSnapshot {
|
|
const removeProvisionalLeaf = (node: TerminalPaneLayoutNode): TerminalPaneLayoutNode | null => {
|
|
if (node.type === 'leaf') {
|
|
return node.leafId === args.leafId ? null : node
|
|
}
|
|
const first = removeProvisionalLeaf(node.first)
|
|
const second = removeProvisionalLeaf(node.second)
|
|
if (!first) {
|
|
return second
|
|
}
|
|
if (!second) {
|
|
return first
|
|
}
|
|
return { ...node, first, second }
|
|
}
|
|
// Why: PTY admission durably appends a fallback vertical leaf before this exact-direction commit.
|
|
const currentRoot = existing?.root ? removeProvisionalLeaf(existing.root) : null
|
|
const existingRoot: TerminalPaneLayoutNode = currentRoot ?? {
|
|
type: 'leaf',
|
|
leafId: args.splitFromLeafId
|
|
}
|
|
const insertSplit = (node: TerminalPaneLayoutNode): TerminalPaneLayoutNode => {
|
|
if (node.type === 'leaf') {
|
|
if (node.leafId !== args.splitFromLeafId) {
|
|
return node
|
|
}
|
|
return {
|
|
type: 'split',
|
|
direction: args.direction,
|
|
first: node,
|
|
second: { type: 'leaf', leafId: args.leafId }
|
|
}
|
|
}
|
|
return { ...node, first: insertSplit(node.first), second: insertSplit(node.second) }
|
|
}
|
|
const ptyIdsByLeafId = { ...existing?.ptyIdsByLeafId }
|
|
delete ptyIdsByLeafId[args.leafId]
|
|
return {
|
|
...existing,
|
|
root: insertSplit(existingRoot),
|
|
activeLeafId: args.leafId,
|
|
expandedLeafId: existing?.expandedLeafId ?? null,
|
|
ptyIdsByLeafId: {
|
|
...ptyIdsByLeafId,
|
|
[args.leafId]: args.ptyId
|
|
}
|
|
}
|
|
}
|
|
|
|
/** Count the leaves in a layout tree (a split has ≥2; a single pane has 1). */
|
|
export function countTerminalLayoutLeaves(node: TerminalPaneLayoutNode | null | undefined): number {
|
|
if (!node) {
|
|
return 0
|
|
}
|
|
if (node.type === 'leaf') {
|
|
return 1
|
|
}
|
|
return countTerminalLayoutLeaves(node.first) + countTerminalLayoutLeaves(node.second)
|
|
}
|