mirror of
https://github.com/stablyai/orca.git
synced 2026-10-22 00:03:47 +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.
98 lines
2.8 KiB
TypeScript
98 lines
2.8 KiB
TypeScript
import type { TuiAgent } from '../../../src/shared/tui-agent'
|
|
import {
|
|
filterEnabledMobileTuiAgents,
|
|
isMobileTuiAgent,
|
|
isMobileTuiAgentEnabled,
|
|
MOBILE_TUI_AGENT_AUTO_PICK_ORDER,
|
|
MOBILE_TUI_AGENT_LABELS,
|
|
pickMobileTuiAgent
|
|
} from './mobile-tui-agents'
|
|
|
|
export type WorkspaceAgentChoice = TuiAgent | 'blank'
|
|
|
|
type WorkspaceAgentSettings = {
|
|
defaultTuiAgent?: TuiAgent | 'blank' | null
|
|
disabledTuiAgents?: unknown
|
|
}
|
|
|
|
export type WorkspaceAgentSelectionState = {
|
|
agent: WorkspaceAgentChoice | null
|
|
overridden: boolean
|
|
}
|
|
|
|
type ResolveWorkspaceAgentSelectionArgs = WorkspaceAgentSelectionState & {
|
|
selectionActive: boolean
|
|
settings: WorkspaceAgentSettings
|
|
detectedAgentIds: Set<string> | null
|
|
}
|
|
|
|
export function workspaceAgentLabel(agent: WorkspaceAgentChoice): string {
|
|
return agent === 'blank' ? 'Blank Terminal' : MOBILE_TUI_AGENT_LABELS[agent]
|
|
}
|
|
|
|
export function normalizeWorkspaceAgent(value: unknown): WorkspaceAgentChoice | null {
|
|
if (value === 'blank' || value === '__blank__') {
|
|
return 'blank'
|
|
}
|
|
return isMobileTuiAgent(value) ? value : null
|
|
}
|
|
|
|
export function pickWorkspaceAgent(
|
|
settings: WorkspaceAgentSettings,
|
|
detectedAgentIds: Set<string> | null
|
|
): WorkspaceAgentChoice {
|
|
const preferred = normalizeWorkspaceAgent(settings.defaultTuiAgent)
|
|
if (preferred === 'blank') {
|
|
return preferred
|
|
}
|
|
const disabled = settings.disabledTuiAgents
|
|
const enabledAutoPickOrder = filterEnabledMobileTuiAgents(
|
|
MOBILE_TUI_AGENT_AUTO_PICK_ORDER,
|
|
disabled
|
|
)
|
|
if (detectedAgentIds === null) {
|
|
return preferred && isMobileTuiAgentEnabled(preferred, disabled)
|
|
? preferred
|
|
: (enabledAutoPickOrder[0] ?? 'blank')
|
|
}
|
|
const detectedAgents = enabledAutoPickOrder.filter((agent) => detectedAgentIds.has(agent))
|
|
return pickMobileTuiAgent(preferred, detectedAgents, disabled) ?? 'blank'
|
|
}
|
|
|
|
export function filterWorkspaceAgents(agents: readonly TuiAgent[], disabled?: unknown): TuiAgent[] {
|
|
return filterEnabledMobileTuiAgents(agents, disabled)
|
|
}
|
|
|
|
export function isWorkspaceAgentEnabled(agent: TuiAgent, disabled?: unknown): boolean {
|
|
return isMobileTuiAgentEnabled(agent, disabled)
|
|
}
|
|
|
|
export function resolveWorkspaceAgentSelection({
|
|
selectionActive,
|
|
settings,
|
|
detectedAgentIds,
|
|
agent,
|
|
overridden
|
|
}: ResolveWorkspaceAgentSelectionArgs): WorkspaceAgentSelectionState {
|
|
const current = { agent, overridden }
|
|
if (!selectionActive) {
|
|
return current
|
|
}
|
|
|
|
const pickedAgent = pickWorkspaceAgent(settings, detectedAgentIds)
|
|
if (!overridden) {
|
|
return agent === pickedAgent ? current : { agent: pickedAgent, overridden: false }
|
|
}
|
|
|
|
if (
|
|
detectedAgentIds === null ||
|
|
!agent ||
|
|
agent === 'blank' ||
|
|
(detectedAgentIds.has(agent) && isWorkspaceAgentEnabled(agent, settings.disabledTuiAgents))
|
|
) {
|
|
return current
|
|
}
|
|
|
|
return { agent: pickedAgent, overridden: false }
|
|
}
|