mirror of
https://github.com/stablyai/orca.git
synced 2026-09-30 08:03:12 +00:00
#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.
105 lines
3.4 KiB
TypeScript
105 lines
3.4 KiB
TypeScript
import { isTuiAgent } from './tui-agent-config'
|
|
import { YOLO_TUI_AGENT_ARGS, YOLO_TUI_AGENT_ENV } from './tui-agent-permissions'
|
|
import type { TuiAgent } from './tui-agent'
|
|
|
|
const UNSUPPORTED_TUI_AGENT_ARGS: Partial<Record<TuiAgent, readonly string[]>> = {
|
|
opencode: ['--dangerously-skip-permissions'],
|
|
kilo: ['--dangerously-skip-permissions']
|
|
}
|
|
|
|
export const DEFAULT_TUI_AGENT_ARGS: Partial<Record<TuiAgent, string>> = YOLO_TUI_AGENT_ARGS
|
|
|
|
export const DEFAULT_TUI_AGENT_ENV: Partial<Record<TuiAgent, Record<string, string>>> =
|
|
YOLO_TUI_AGENT_ENV
|
|
|
|
function argPattern(arg: string): RegExp {
|
|
return new RegExp(`(^|\\s)${arg.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}(?=\\s|$)`, 'g')
|
|
}
|
|
|
|
export function hasUnsupportedTuiAgentArgs(agent: TuiAgent, value: unknown): boolean {
|
|
if (typeof value !== 'string') {
|
|
return false
|
|
}
|
|
return (UNSUPPORTED_TUI_AGENT_ARGS[agent] ?? []).some((arg) => argPattern(arg).test(value))
|
|
}
|
|
|
|
function sanitizeTuiAgentLaunchArgs(agent: TuiAgent, args: string): string {
|
|
const unsupportedArgs = UNSUPPORTED_TUI_AGENT_ARGS[agent]
|
|
if (!unsupportedArgs) {
|
|
return args.trim()
|
|
}
|
|
// Why: a few agents have removed, relocated, or never exposed Claude-style
|
|
// skip-permission flags on the interactive TUI command Orca launches.
|
|
return unsupportedArgs.reduce((next, arg) => next.replace(argPattern(arg), ' '), args).trim()
|
|
}
|
|
|
|
export function normalizeTuiAgentArgsRecord(value: unknown): Partial<Record<TuiAgent, string>> {
|
|
const normalized: Partial<Record<TuiAgent, string>> = {}
|
|
if (!value || typeof value !== 'object') {
|
|
return normalized
|
|
}
|
|
for (const [agent, args] of Object.entries(value)) {
|
|
if (!isTuiAgent(agent) || typeof args !== 'string') {
|
|
continue
|
|
}
|
|
normalized[agent] = sanitizeTuiAgentLaunchArgs(agent, args)
|
|
}
|
|
return normalized
|
|
}
|
|
|
|
export function normalizeTuiAgentEnvRecord(
|
|
value: unknown
|
|
): Partial<Record<TuiAgent, Record<string, string>>> {
|
|
const normalized: Partial<Record<TuiAgent, Record<string, string>>> = {}
|
|
if (!value || typeof value !== 'object') {
|
|
return normalized
|
|
}
|
|
for (const [agent, env] of Object.entries(value)) {
|
|
if (!isTuiAgent(agent) || !env || typeof env !== 'object') {
|
|
continue
|
|
}
|
|
const nextEnv: Record<string, string> = {}
|
|
for (const [name, raw] of Object.entries(env)) {
|
|
const key = name.trim()
|
|
if (!key || typeof raw !== 'string') {
|
|
continue
|
|
}
|
|
nextEnv[key] = raw
|
|
}
|
|
normalized[agent] = nextEnv
|
|
}
|
|
return normalized
|
|
}
|
|
|
|
export function getTuiAgentDefaultArgs(agent: TuiAgent): string {
|
|
return DEFAULT_TUI_AGENT_ARGS[agent] ?? ''
|
|
}
|
|
|
|
export function getTuiAgentDefaultEnv(agent: TuiAgent): Record<string, string> {
|
|
return { ...DEFAULT_TUI_AGENT_ENV[agent] }
|
|
}
|
|
|
|
export function resolveTuiAgentLaunchArgs(
|
|
agent: TuiAgent,
|
|
configuredArgs: Partial<Record<TuiAgent, string>> | null | undefined
|
|
): string {
|
|
if (
|
|
configuredArgs &&
|
|
Object.hasOwn(configuredArgs, agent) &&
|
|
typeof configuredArgs[agent] === 'string'
|
|
) {
|
|
return configuredArgs[agent] ?? ''
|
|
}
|
|
return getTuiAgentDefaultArgs(agent)
|
|
}
|
|
|
|
export function resolveTuiAgentLaunchEnv(
|
|
agent: TuiAgent,
|
|
configuredEnv: Partial<Record<TuiAgent, Record<string, string>>> | null | undefined
|
|
): Record<string, string> {
|
|
if (configuredEnv && Object.hasOwn(configuredEnv, agent)) {
|
|
return { ...configuredEnv[agent] }
|
|
}
|
|
return getTuiAgentDefaultEnv(agent)
|
|
}
|