mirror of
https://github.com/stablyai/orca.git
synced 2026-09-25 00:02:35 +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.
315 lines
9.7 KiB
TypeScript
315 lines
9.7 KiB
TypeScript
import {
|
|
normalizeGitErrorMessage,
|
|
runPullWithDivergenceFallback
|
|
} from '../../shared/git-remote-error'
|
|
import { resolveEffectiveGitUpstream } from '../../shared/git-effective-upstream'
|
|
import { gitRefTargetsBranchOnRemote } from '../../shared/git-remote-branch-name'
|
|
import { resolveGitRemoteRebaseSource } from '../../shared/git-rebase-source'
|
|
import type { GitPushTarget } from '../../shared/worktree/types'
|
|
import type { GitRuntimeOptions } from './git-runtime-options'
|
|
import { gitOptionsForWorktree } from './git-runtime-options'
|
|
import { validateGitPushTarget } from './push-target-validation'
|
|
import { gitExecFileAsync } from './runner'
|
|
import { runWithGitReadCacheInvalidation } from './status'
|
|
|
|
async function getConfiguredPushTarget(
|
|
worktreePath: string,
|
|
options: GitRuntimeOptions = {}
|
|
): Promise<{ remote: string; refspec: string } | null> {
|
|
try {
|
|
const { stdout: branchStdout } = await gitExecFileAsync(
|
|
['symbolic-ref', '--quiet', '--short', 'HEAD'],
|
|
gitOptionsForWorktree(worktreePath, options)
|
|
)
|
|
const branch = branchStdout.trim()
|
|
if (!branch) {
|
|
return null
|
|
}
|
|
|
|
const [pushRemote, { stdout: mergeStdout }] = await Promise.all([
|
|
getConfiguredPushRemote(worktreePath, branch, options),
|
|
gitExecFileAsync(
|
|
['config', '--get', `branch.${branch}.merge`],
|
|
gitOptionsForWorktree(worktreePath, options)
|
|
)
|
|
])
|
|
const remote = pushRemote?.remote
|
|
const mergeRef = mergeStdout.trim()
|
|
const branchRef = mergeRef.replace(/^refs\/heads\//, '')
|
|
if (!remote || !branchRef || remote === '.' || branchRef === mergeRef) {
|
|
return null
|
|
}
|
|
if (await branchMergeTargetsConfiguredBase(worktreePath, branch, remote, branchRef, options)) {
|
|
return null
|
|
}
|
|
if (!canPushConfiguredMergeBranch(pushRemote, branch, branchRef)) {
|
|
return null
|
|
}
|
|
return { remote, refspec: `HEAD:${branchRef}` }
|
|
} catch {
|
|
return null
|
|
}
|
|
}
|
|
|
|
async function getConfigValue(
|
|
worktreePath: string,
|
|
key: string,
|
|
options: GitRuntimeOptions = {}
|
|
): Promise<string | null> {
|
|
try {
|
|
const { stdout } = await gitExecFileAsync(
|
|
['config', '--get', key],
|
|
gitOptionsForWorktree(worktreePath, options)
|
|
)
|
|
const value = stdout.trim()
|
|
return value || null
|
|
} catch {
|
|
return null
|
|
}
|
|
}
|
|
|
|
function isUrlValuedRemote(remote: string): boolean {
|
|
return /^[A-Za-z][A-Za-z0-9+.-]*:\/\//.test(remote) || /^[^@/:]+@[^:]+:.+/.test(remote)
|
|
}
|
|
|
|
type ConfiguredPushRemote = {
|
|
remote: string
|
|
branchRemote: string | null
|
|
}
|
|
|
|
async function findRemoteNameForUrl(
|
|
worktreePath: string,
|
|
remoteUrl: string,
|
|
options: GitRuntimeOptions = {}
|
|
): Promise<string | null> {
|
|
try {
|
|
const { stdout } = await gitExecFileAsync(
|
|
['remote'],
|
|
gitOptionsForWorktree(worktreePath, options)
|
|
)
|
|
const remotes = stdout
|
|
.split(/\r?\n/)
|
|
.map((line) => line.trim())
|
|
.filter(Boolean)
|
|
for (const remoteName of remotes) {
|
|
try {
|
|
const { stdout: urlStdout } = await gitExecFileAsync(
|
|
['remote', 'get-url', remoteName],
|
|
gitOptionsForWorktree(worktreePath, options)
|
|
)
|
|
if (urlStdout.trim() === remoteUrl) {
|
|
return remoteName
|
|
}
|
|
} catch {
|
|
// Ignore a remote that disappeared or has no fetch URL.
|
|
}
|
|
}
|
|
} catch {
|
|
return null
|
|
}
|
|
return null
|
|
}
|
|
|
|
async function normalizePushRemote(
|
|
worktreePath: string,
|
|
remote: string,
|
|
options: GitRuntimeOptions = {}
|
|
): Promise<string> {
|
|
if (!isUrlValuedRemote(remote)) {
|
|
return remote
|
|
}
|
|
return (await findRemoteNameForUrl(worktreePath, remote, options)) ?? remote
|
|
}
|
|
|
|
async function getConfiguredPushRemote(
|
|
worktreePath: string,
|
|
branch: string,
|
|
options: GitRuntimeOptions = {}
|
|
): Promise<ConfiguredPushRemote | null> {
|
|
const branchRemote = await getConfigValue(worktreePath, `branch.${branch}.remote`, options)
|
|
const remote =
|
|
(await getConfigValue(worktreePath, `branch.${branch}.pushRemote`, options)) ??
|
|
(await getConfigValue(worktreePath, 'remote.pushDefault', options)) ??
|
|
branchRemote
|
|
if (!remote) {
|
|
return null
|
|
}
|
|
return {
|
|
remote: await normalizePushRemote(worktreePath, remote, options),
|
|
branchRemote: branchRemote
|
|
? await normalizePushRemote(worktreePath, branchRemote, options)
|
|
: null
|
|
}
|
|
}
|
|
|
|
async function branchMergeTargetsConfiguredBase(
|
|
worktreePath: string,
|
|
branch: string,
|
|
remote: string,
|
|
branchRef: string,
|
|
options: GitRuntimeOptions = {}
|
|
): Promise<boolean> {
|
|
return gitRefTargetsBranchOnRemote(
|
|
await getConfigValue(worktreePath, `branch.${branch}.base`, options),
|
|
remote,
|
|
branchRef
|
|
)
|
|
}
|
|
|
|
function canPushConfiguredMergeBranch(
|
|
pushRemote: ConfiguredPushRemote | null,
|
|
branch: string,
|
|
branchRef: string
|
|
): boolean {
|
|
if (!pushRemote) {
|
|
return false
|
|
}
|
|
if (branchRef === branch) {
|
|
return true
|
|
}
|
|
// Why: branch.merge belongs to branch.remote. A pushDefault fork must not
|
|
// inherit origin/main as its destination branch.
|
|
return pushRemote.remote !== 'origin' && pushRemote.branchRemote === pushRemote.remote
|
|
}
|
|
|
|
function explicitPushTarget(target: GitPushTarget): { remote: string; refspec: string } {
|
|
return { remote: target.remoteName, refspec: `HEAD:${target.branchName}` }
|
|
}
|
|
|
|
export async function gitPush(
|
|
worktreePath: string,
|
|
_publish = false,
|
|
pushTarget?: GitPushTarget,
|
|
options: { forceWithLease?: boolean } & GitRuntimeOptions = {}
|
|
): Promise<void> {
|
|
try {
|
|
if (pushTarget) {
|
|
await validateGitPushTarget(worktreePath, pushTarget, options)
|
|
}
|
|
// Why: push to the branch's configured upstream when one exists. PR-created
|
|
// worktrees can track a contributor fork remote; hardcoding origin here
|
|
// would send review commits to the upstream repository instead.
|
|
//
|
|
// When no upstream exists, keep the existing first-publish behavior:
|
|
// create/update origin/<current branch> and set it as upstream.
|
|
//
|
|
// Branch-vs-base reporting (the "Committed on Branch" section) is
|
|
// unaffected because it uses branchCompare against an explicit baseRef
|
|
// from worktree config, not the upstream relationship.
|
|
const target = pushTarget
|
|
? explicitPushTarget(pushTarget)
|
|
: await getConfiguredPushTarget(worktreePath, options)
|
|
const args = [
|
|
'push',
|
|
...(options.forceWithLease ? ['--force-with-lease'] : []),
|
|
'--set-upstream',
|
|
...(target ? [target.remote, target.refspec] : ['origin', 'HEAD'])
|
|
]
|
|
await gitExecFileAsync(args, gitOptionsForWorktree(worktreePath, options))
|
|
} catch (error) {
|
|
throw new Error(normalizeGitErrorMessage(error, 'push'))
|
|
}
|
|
}
|
|
|
|
async function gitPullWithArgs(
|
|
worktreePath: string,
|
|
pullArgs: string[],
|
|
pushTarget?: GitPushTarget,
|
|
options: GitRuntimeOptions = {}
|
|
): Promise<void> {
|
|
const runPull = async (effectiveArgs: string[]): Promise<void> => {
|
|
if (pushTarget) {
|
|
const target = await validateGitPushTarget(worktreePath, pushTarget, options)
|
|
await gitExecFileAsync(
|
|
['pull', ...effectiveArgs, target.remoteName, target.branchName],
|
|
gitOptionsForWorktree(worktreePath, options)
|
|
)
|
|
return
|
|
}
|
|
const upstream = await resolveEffectiveGitUpstream((args) =>
|
|
gitExecFileAsync(args, gitOptionsForWorktree(worktreePath, options))
|
|
)
|
|
if (upstream && !upstream.isConfiguredUpstream) {
|
|
// Why: legacy Orca branches may still track origin/main while pushes
|
|
// target origin/<branch>. Pull the same effective branch the UI reports.
|
|
await gitExecFileAsync(
|
|
['pull', ...effectiveArgs, upstream.remoteName, upstream.branchName],
|
|
gitOptionsForWorktree(worktreePath, options)
|
|
)
|
|
return
|
|
}
|
|
|
|
await gitExecFileAsync(['pull', ...effectiveArgs], gitOptionsForWorktree(worktreePath, options))
|
|
}
|
|
|
|
try {
|
|
await runPullWithDivergenceFallback(pullArgs, runPull)
|
|
} catch (error) {
|
|
throw new Error(normalizeGitErrorMessage(error, 'pull'))
|
|
}
|
|
}
|
|
|
|
export async function gitPull(
|
|
worktreePath: string,
|
|
pushTarget?: GitPushTarget,
|
|
options: GitRuntimeOptions = {}
|
|
): Promise<void> {
|
|
// Why: plain `git pull` uses the user's configured pull strategy (merge by
|
|
// default) so diverged branches reconcile instead of erroring out. Conflicts
|
|
// surface through the existing conflict-resolution flow.
|
|
await runWithGitReadCacheInvalidation(() =>
|
|
gitPullWithArgs(worktreePath, [], pushTarget, options)
|
|
)
|
|
}
|
|
|
|
export async function gitFastForward(
|
|
worktreePath: string,
|
|
pushTarget?: GitPushTarget,
|
|
options: GitRuntimeOptions = {}
|
|
): Promise<void> {
|
|
await runWithGitReadCacheInvalidation(() =>
|
|
gitPullWithArgs(worktreePath, ['--ff-only'], pushTarget, options)
|
|
)
|
|
}
|
|
|
|
export async function gitPullRebaseFromBase(
|
|
worktreePath: string,
|
|
baseRef: string,
|
|
options: GitRuntimeOptions = {}
|
|
): Promise<void> {
|
|
await runWithGitReadCacheInvalidation(async () => {
|
|
try {
|
|
const source = await resolveGitRemoteRebaseSource(
|
|
(args) => gitExecFileAsync(args, gitOptionsForWorktree(worktreePath, options)),
|
|
baseRef
|
|
)
|
|
await gitExecFileAsync(
|
|
['pull', '--rebase', source.remoteName, source.branchName],
|
|
gitOptionsForWorktree(worktreePath, options)
|
|
)
|
|
} catch (error) {
|
|
throw new Error(normalizeGitErrorMessage(error, 'pull'))
|
|
}
|
|
})
|
|
}
|
|
|
|
export async function gitFetch(
|
|
worktreePath: string,
|
|
pushTarget?: GitPushTarget,
|
|
options: GitRuntimeOptions = {}
|
|
): Promise<void> {
|
|
try {
|
|
if (pushTarget) {
|
|
const target = await validateGitPushTarget(worktreePath, pushTarget, options)
|
|
await gitExecFileAsync(
|
|
['fetch', '--prune', target.remoteName],
|
|
gitOptionsForWorktree(worktreePath, options)
|
|
)
|
|
return
|
|
}
|
|
await gitExecFileAsync(['fetch', '--prune'], gitOptionsForWorktree(worktreePath, options))
|
|
} catch (error) {
|
|
throw new Error(normalizeGitErrorMessage(error, 'fetch'))
|
|
}
|
|
}
|