mirror of
https://github.com/stablyai/orca.git
synced 2026-10-23 08:03:39 +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.
109 lines
4.0 KiB
TypeScript
109 lines
4.0 KiB
TypeScript
import type { TerminalQuickCommand } from '../../../src/shared/terminal-quick-command-types'
|
|
import type { TuiAgent } from '../../../src/shared/tui-agent'
|
|
import {
|
|
applyTerminalQuickCommandMutation,
|
|
flattenTerminalQuickCommand,
|
|
getTerminalQuickCommandBody,
|
|
isTerminalAgentQuickCommand,
|
|
MAX_QUICK_COMMANDS,
|
|
MAX_QUICK_COMMAND_AGENT_PROMPT_LENGTH,
|
|
MAX_QUICK_COMMAND_LABEL_LENGTH,
|
|
MAX_QUICK_COMMAND_TERMINAL_TEXT_LENGTH,
|
|
parseNormalizedTerminalQuickCommands,
|
|
supportsTerminalAgentQuickCommand,
|
|
terminalQuickCommandMatchesRepo,
|
|
type TerminalQuickCommandMutation
|
|
} from '../../../src/shared/terminal-quick-commands'
|
|
import { TERMINAL_QUICK_COMMANDS_RUNTIME_CAPABILITY } from '../../../src/shared/protocol-version'
|
|
import { MOBILE_TUI_AGENT_LABELS } from '../tasks/mobile-tui-agents'
|
|
|
|
// Reuse the canonical desktop quick-command logic (pure, no heavy deps) so
|
|
// mobile behaves identically to desktop. Only genuinely mobile-specific pieces
|
|
// — agent-branded labels, native row truncation, and the launch plan — live here.
|
|
export {
|
|
isTerminalAgentQuickCommand as isAgentQuickCommand,
|
|
getTerminalQuickCommandBody,
|
|
terminalQuickCommandMatchesRepo as quickCommandMatchesRepo,
|
|
supportsTerminalAgentQuickCommand,
|
|
MAX_QUICK_COMMANDS,
|
|
MAX_QUICK_COMMAND_AGENT_PROMPT_LENGTH,
|
|
MAX_QUICK_COMMAND_LABEL_LENGTH,
|
|
MAX_QUICK_COMMAND_TERMINAL_TEXT_LENGTH,
|
|
parseNormalizedTerminalQuickCommands,
|
|
applyTerminalQuickCommandMutation,
|
|
type TerminalQuickCommandMutation
|
|
}
|
|
|
|
const MAX_QUICK_COMMAND_DISPLAY_PREVIEW_LENGTH = 240
|
|
|
|
export function supportsMobileQuickCommands(capabilities: readonly string[] | undefined): boolean {
|
|
return capabilities?.includes(TERMINAL_QUICK_COMMANDS_RUNTIME_CAPABILITY) === true
|
|
}
|
|
|
|
export type MobileQuickCommandLaunch = {
|
|
agent?: TuiAgent
|
|
options: {
|
|
agentPrompt?: string
|
|
startupCommand?: string
|
|
startupCommandDelivery?: 'shell-ready'
|
|
initialPrompt?: string
|
|
enter?: boolean
|
|
successToast?: string
|
|
}
|
|
}
|
|
|
|
export function buildMobileQuickCommandLaunch(
|
|
command: TerminalQuickCommand
|
|
): MobileQuickCommandLaunch | null {
|
|
if (isTerminalAgentQuickCommand(command)) {
|
|
if (!command.prompt.trim() || !supportsTerminalAgentQuickCommand(command.agent)) {
|
|
return null
|
|
}
|
|
return { agent: command.agent, options: { agentPrompt: command.prompt } }
|
|
}
|
|
if (!command.command.trim()) {
|
|
return null
|
|
}
|
|
return command.appendEnter === false
|
|
? {
|
|
options: {
|
|
initialPrompt: command.command,
|
|
enter: false,
|
|
successToast: `${command.label.trim() || 'Quick command'} inserted`
|
|
}
|
|
}
|
|
: {
|
|
// Why: raw commands that resemble bare agent launches can otherwise
|
|
// select the fast path and race slow native, WSL, or SSH shell startup.
|
|
// flattenTerminalQuickCommand joins multiline bodies exactly as desktop
|
|
// does so the same saved command runs identically on both.
|
|
options: {
|
|
startupCommand: flattenTerminalQuickCommand(command).command,
|
|
startupCommandDelivery: 'shell-ready'
|
|
}
|
|
}
|
|
}
|
|
|
|
export function getQuickCommandAgentLabel(agent: TuiAgent): string {
|
|
return MOBILE_TUI_AGENT_LABELS[agent] ?? agent
|
|
}
|
|
|
|
// The subtitle desktop shows under each quick command: agent prompts read
|
|
// "Codex: <prompt>", terminal commands show the raw command text.
|
|
export function getQuickCommandPreview(command: TerminalQuickCommand): string {
|
|
if (isTerminalAgentQuickCommand(command)) {
|
|
return `${getQuickCommandAgentLabel(command.agent)}: ${command.prompt}`
|
|
}
|
|
return command.command
|
|
}
|
|
|
|
export function getQuickCommandDisplayPreview(command: TerminalQuickCommand): string {
|
|
const preview = getQuickCommandPreview(command)
|
|
if (preview.length <= MAX_QUICK_COMMAND_DISPLAY_PREVIEW_LENGTH) {
|
|
return preview
|
|
}
|
|
// Why: one-line rows should not send up to 6 KB each through native text
|
|
// layout; full command bodies remain available to search, edit, and launch.
|
|
return `${preview.slice(0, MAX_QUICK_COMMAND_DISPLAY_PREVIEW_LENGTH - 1)}…`
|
|
}
|