mirror of
https://github.com/stablyai/orca.git
synced 2026-09-27 00:02:37 +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.
86 lines
2.9 KiB
TypeScript
86 lines
2.9 KiB
TypeScript
import type { TuiAgent } from './tui-agent'
|
|
|
|
/**
|
|
* The community `skills` CLI's own `--agent` key for each agent Orca detects.
|
|
*
|
|
* Why: `skills add` validates `--agent` against its own namespace and exits 1 on
|
|
* an unknown key, so anything we are not certain of maps to null and is dropped
|
|
* rather than guessed. Orca ids and skills keys agree less often than they look
|
|
* (`claude` is `claude-code`, `rovo` is `rovodev`, `aug` is `augment`), and some
|
|
* near-matches are different products — Orca's `aider` CLI is not the CLI's
|
|
* `aider-desk`, and Orca's `openclaude` is its `openclaw` in name only, so it
|
|
* follows Orca's own rule that OpenClaude reads Claude-owned roots.
|
|
*/
|
|
export const SKILLS_CLI_AGENT_KEY_BY_TUI_AGENT = {
|
|
claude: 'claude-code',
|
|
'claude-agent-teams': 'claude-code',
|
|
// Why: Orca states OpenClaude reads Claude-owned roots (native-chat-agent-profiles).
|
|
openclaude: 'claude-code',
|
|
codex: 'codex',
|
|
autohand: 'autohand-code',
|
|
opencode: 'opencode',
|
|
'mimo-code': null,
|
|
pi: 'pi',
|
|
omp: null,
|
|
'prime-agent': null,
|
|
gemini: 'gemini-cli',
|
|
antigravity: 'antigravity',
|
|
aider: null,
|
|
goose: 'goose',
|
|
amp: 'amp',
|
|
kilo: 'kilo',
|
|
kiro: 'kiro-cli',
|
|
crush: 'crush',
|
|
aug: 'augment',
|
|
cline: 'cline',
|
|
codebuff: null,
|
|
'command-code': 'command-code',
|
|
continue: 'continue',
|
|
cursor: 'cursor',
|
|
droid: 'droid',
|
|
kimi: 'kimi-code-cli',
|
|
'mistral-vibe': 'mistral-vibe',
|
|
'qwen-code': 'qwen-code',
|
|
rovo: 'rovodev',
|
|
hermes: 'hermes-agent',
|
|
openclaw: 'openclaw',
|
|
copilot: 'github-copilot',
|
|
grok: 'grok',
|
|
devin: 'devin',
|
|
ante: null,
|
|
// Why: Orca detects trae by `traecli`, an alias only TRAE CN ships.
|
|
trae: 'trae-cn'
|
|
} satisfies Record<TuiAgent, string | null>
|
|
|
|
/**
|
|
* The shared `.agents/skills` target every universal agent reads. Always included
|
|
* so agents Orca cannot map still receive the skill.
|
|
*/
|
|
export const SKILLS_CLI_UNIVERSAL_AGENT_KEY = 'universal'
|
|
|
|
/**
|
|
* Whether a value is shaped like a `skills --agent` key, or its explicit all-agents
|
|
* wildcard.
|
|
*
|
|
* Why: the skills CLI silently DROPS a `--agent` value that starts with `-`, which
|
|
* empties its target list and drops it into the same all-agents branch an omitted
|
|
* --agent does. `--agent -y` is enough to trigger it, so shape is checked, not just
|
|
* emptiness. An unknown-but-plausible key is left to the CLI, which rejects it
|
|
* loudly with its own valid list before writing anything.
|
|
*/
|
|
export function isSkillsCliAgentKeyShaped(value: string): boolean {
|
|
return /^(?:\*|[a-z0-9][a-z0-9.-]*)$/i.test(value)
|
|
}
|
|
|
|
/** Map detected Orca agents onto `skills --agent` keys, plus the universal target. */
|
|
export function toSkillsCliAgentKeys(detectedAgents: readonly TuiAgent[]): string[] {
|
|
const keys = new Set<string>([SKILLS_CLI_UNIVERSAL_AGENT_KEY])
|
|
for (const agent of detectedAgents) {
|
|
const key = SKILLS_CLI_AGENT_KEY_BY_TUI_AGENT[agent]
|
|
if (key) {
|
|
keys.add(key)
|
|
}
|
|
}
|
|
return [...keys].sort()
|
|
}
|