mirror of
https://github.com/stablyai/orca.git
synced 2026-10-02 16:02:15 +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.
126 lines
3.4 KiB
TypeScript
126 lines
3.4 KiB
TypeScript
import type {
|
|
GitBranchCompareResult,
|
|
GitCommitCompareResult,
|
|
GitDiffResult
|
|
} from '../../shared/git-diff-compare-types'
|
|
import type {
|
|
GitConflictOperation,
|
|
GitStagingArea,
|
|
GitStatusResult,
|
|
GitUpstreamStatus
|
|
} from '../../shared/git-status-types'
|
|
import type { GitPushTarget } from '../../shared/worktree/types'
|
|
import type { GitHistoryOptions, GitHistoryResult } from '../../shared/git-history'
|
|
import type {
|
|
CommitMessageAgentCapability,
|
|
CommitMessageModelCapability
|
|
} from '../../shared/commit-message-agent-spec'
|
|
|
|
export type GitInspectionApi = {
|
|
status: (args: {
|
|
worktreePath: string
|
|
connectionId?: string
|
|
includeIgnored?: boolean
|
|
bypassEffectiveUpstreamNegativeCache?: boolean
|
|
reuseLineStats?: boolean
|
|
/** Merge-base OID to measure the branch line total against; omit to skip the work. */
|
|
branchLineTotalMergeBase?: string
|
|
requestToken?: string
|
|
}) => Promise<GitStatusResult>
|
|
cancelStatus: (args: { requestToken: string }) => Promise<void>
|
|
setStatusUpstreamRefWatch: (args: {
|
|
worktreeId: string
|
|
worktreePath: string
|
|
executionHostId: string
|
|
connectionId?: string
|
|
branch?: string
|
|
upstreamName?: string
|
|
}) => Promise<void>
|
|
submoduleStatus: (args: {
|
|
worktreePath: string
|
|
submodulePath: string
|
|
connectionId?: string
|
|
area?: GitStagingArea
|
|
}) => Promise<GitStatusResult>
|
|
checkIgnored: (args: {
|
|
worktreePath: string
|
|
paths: string[]
|
|
connectionId?: string
|
|
}) => Promise<string[]>
|
|
findHugeFoldersToIgnore: (args: { worktreePath: string }) => Promise<string[]>
|
|
history: (
|
|
args: { worktreePath: string; connectionId?: string } & GitHistoryOptions
|
|
) => Promise<GitHistoryResult>
|
|
conflictOperation: (args: {
|
|
worktreePath: string
|
|
connectionId?: string
|
|
}) => Promise<GitConflictOperation>
|
|
diff: (args: {
|
|
worktreePath: string
|
|
filePath: string
|
|
staged: boolean
|
|
compareAgainstHead?: boolean
|
|
connectionId?: string
|
|
}) => Promise<GitDiffResult>
|
|
branchCompare: (args: {
|
|
worktreePath: string
|
|
baseRef: string
|
|
connectionId?: string
|
|
}) => Promise<GitBranchCompareResult>
|
|
commitCompare: (args: {
|
|
worktreePath: string
|
|
commitId: string
|
|
connectionId?: string
|
|
}) => Promise<GitCommitCompareResult>
|
|
upstreamStatus: (args: {
|
|
worktreePath: string
|
|
connectionId?: string
|
|
pushTarget?: GitPushTarget
|
|
}) => Promise<GitUpstreamStatus>
|
|
branchDiff: (args: {
|
|
worktreePath: string
|
|
compare: {
|
|
baseRef: string
|
|
baseOid: string
|
|
headOid: string
|
|
mergeBase: string
|
|
}
|
|
filePath: string
|
|
oldPath?: string
|
|
connectionId?: string
|
|
}) => Promise<GitDiffResult>
|
|
commitDiff: (args: {
|
|
worktreePath: string
|
|
commitOid: string
|
|
parentOid?: string | null
|
|
filePath: string
|
|
oldPath?: string
|
|
connectionId?: string
|
|
}) => Promise<GitDiffResult>
|
|
discoverCommitMessageModels: (args: {
|
|
agentId: string
|
|
worktreePath?: string
|
|
connectionId?: string
|
|
}) => Promise<
|
|
| {
|
|
success: true
|
|
capability: CommitMessageAgentCapability
|
|
models: CommitMessageModelCapability[]
|
|
defaultModelId: string
|
|
catalogOrigin: 'probe' | 'spec'
|
|
}
|
|
| { success: false; error: string }
|
|
>
|
|
remoteFileUrl: (args: {
|
|
worktreePath: string
|
|
relativePath: string
|
|
line: number
|
|
connectionId?: string
|
|
}) => Promise<string | null>
|
|
remoteCommitUrl: (args: {
|
|
worktreePath: string
|
|
sha: string
|
|
connectionId?: string
|
|
}) => Promise<string | null>
|
|
}
|