mirror of
https://github.com/stablyai/orca.git
synced 2026-09-23 00:02:29 +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.
117 lines
3.4 KiB
TypeScript
117 lines
3.4 KiB
TypeScript
import type {
|
|
TerminalQuickCommand,
|
|
TerminalQuickCommandAction,
|
|
TerminalQuickCommandScope
|
|
} from '../../../src/shared/terminal-quick-command-types'
|
|
import type { TuiAgent } from '../../../src/shared/tui-agent'
|
|
import {
|
|
isAgentQuickCommand,
|
|
MAX_QUICK_COMMAND_AGENT_PROMPT_LENGTH,
|
|
MAX_QUICK_COMMAND_LABEL_LENGTH,
|
|
MAX_QUICK_COMMAND_TERMINAL_TEXT_LENGTH,
|
|
supportsTerminalAgentQuickCommand
|
|
} from '../terminal/quick-commands'
|
|
|
|
// A single mutable draft covering both quick-command actions. Both the command
|
|
// text and the agent/prompt are kept while editing so toggling Action back and
|
|
// forth doesn't discard what the user already typed (mirrors desktop's draft).
|
|
export type QuickCommandDraft = {
|
|
id: string | null
|
|
label: string
|
|
action: TerminalQuickCommandAction
|
|
command: string
|
|
appendEnter: boolean
|
|
agent: TuiAgent | null
|
|
prompt: string
|
|
scope: TerminalQuickCommandScope
|
|
}
|
|
|
|
export function createEmptyQuickCommandDraft(scope: TerminalQuickCommandScope): QuickCommandDraft {
|
|
return {
|
|
id: null,
|
|
label: '',
|
|
action: 'terminal-command',
|
|
command: '',
|
|
appendEnter: true,
|
|
agent: null,
|
|
prompt: '',
|
|
scope
|
|
}
|
|
}
|
|
|
|
export function quickCommandToDraft(command: TerminalQuickCommand): QuickCommandDraft {
|
|
const scope: TerminalQuickCommandScope =
|
|
command.scope?.type === 'repo' && command.scope.repoId
|
|
? { type: 'repo', repoId: command.scope.repoId }
|
|
: { type: 'global' }
|
|
if (isAgentQuickCommand(command)) {
|
|
return {
|
|
id: command.id,
|
|
label: command.label,
|
|
action: 'agent-prompt',
|
|
command: '',
|
|
appendEnter: true,
|
|
agent: command.agent,
|
|
prompt: command.prompt,
|
|
scope
|
|
}
|
|
}
|
|
return {
|
|
id: command.id,
|
|
label: command.label,
|
|
action: 'terminal-command',
|
|
command: command.command,
|
|
appendEnter: command.appendEnter !== false,
|
|
agent: null,
|
|
prompt: '',
|
|
scope
|
|
}
|
|
}
|
|
|
|
export function isQuickCommandDraftValid(draft: QuickCommandDraft): boolean {
|
|
if (!draft.label.trim()) {
|
|
return false
|
|
}
|
|
if (draft.action === 'agent-prompt') {
|
|
return Boolean(
|
|
draft.agent &&
|
|
supportsTerminalAgentQuickCommand(draft.agent) &&
|
|
draft.prompt.trim().length > 0
|
|
)
|
|
}
|
|
return draft.command.trim().length > 0
|
|
}
|
|
|
|
// Build the persisted command from a draft. Returns null when incomplete so the
|
|
// caller can keep the editor open. The server re-normalizes, but we trim/cap
|
|
// here so optimistic local state matches what will be saved.
|
|
export function draftToQuickCommand(draft: QuickCommandDraft): TerminalQuickCommand | null {
|
|
if (!isQuickCommandDraftValid(draft)) {
|
|
return null
|
|
}
|
|
// Why: timestamps alone collide when desktop and mobile add commands in the
|
|
// same millisecond, which would turn an atomic upsert into an overwrite.
|
|
const id =
|
|
draft.id ??
|
|
`quick-command-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 10)}`
|
|
const label = draft.label.trim().slice(0, MAX_QUICK_COMMAND_LABEL_LENGTH)
|
|
if (draft.action === 'agent-prompt' && draft.agent) {
|
|
return {
|
|
id,
|
|
label,
|
|
action: 'agent-prompt',
|
|
agent: draft.agent,
|
|
prompt: draft.prompt.trimEnd().slice(0, MAX_QUICK_COMMAND_AGENT_PROMPT_LENGTH),
|
|
scope: draft.scope
|
|
}
|
|
}
|
|
return {
|
|
id,
|
|
label,
|
|
action: 'terminal-command',
|
|
command: draft.command.trimEnd().slice(0, MAX_QUICK_COMMAND_TERMINAL_TEXT_LENGTH),
|
|
appendEnter: draft.appendEnter,
|
|
scope: draft.scope
|
|
}
|
|
}
|