mirror of
https://github.com/stablyai/orca.git
synced 2026-10-31 00:57:45 +00:00
Combine the completed comment cleanup from 319 stacked PRs into one change against `main`, so the full CI suite validates the combined result once. This replaces the previous audit stack; no additional audit work is included. The change shortens redundant comments across 2,753 source and shell-snapshot files (25,235 net lines removed). Conflicts preserve current-main executable code. Runtime behavior, test assertions, directives, licenses, generated notices, SAFETY rationales, and compatibility markers are preserved. The audit tracker remains local, outside the repository. Validation: - Equivalent source/emitted AST and executable tokens across all 2,750 source files, with separate checks for embedded shell, SQL, JavaScript, CSS, and generated fixtures. - Identical executable lines in the three shell snapshots; protected comments unchanged. - Changed-code quality gate passed with no new findings. - 358 tests passed, 2 skipped across 23 focused test files. - `git diff --check` passed.
161 lines
5.1 KiB
TypeScript
161 lines
5.1 KiB
TypeScript
import { isFolderRepo } from '../shared/repo-kind'
|
|
import type { Repo } from '../shared/repo-types'
|
|
import { isFullGitObjectId } from './git/commit-object-ref'
|
|
import { hasLocalWorktreeBaseRef } from './git/worktree-base-ref-probe'
|
|
import { getBaseRefDefault } from './git/repo'
|
|
import { resolveWorktreeCreateBase } from './worktree-create-base'
|
|
|
|
type WorktreeCreateBaseGitOptions = {
|
|
wslDistro?: string
|
|
}
|
|
|
|
type RemoteTrackingBaseForPrefetch = {
|
|
remote: string
|
|
branch: string
|
|
ref: string
|
|
base: string
|
|
}
|
|
|
|
type WorktreeCreateBasePrefetchRuntime = {
|
|
resolveRemoteTrackingBase: (
|
|
repoPath: string,
|
|
baseBranch: string,
|
|
options?: WorktreeCreateBaseGitOptions
|
|
) => Promise<RemoteTrackingBaseForPrefetch | null>
|
|
hasRemoteTrackingRef: (
|
|
repoPath: string,
|
|
base: RemoteTrackingBaseForPrefetch,
|
|
options?: WorktreeCreateBaseGitOptions
|
|
) => Promise<boolean>
|
|
getOrStartRemoteTrackingBaseRefresh: (
|
|
repoPath: string,
|
|
base: RemoteTrackingBaseForPrefetch,
|
|
options?: WorktreeCreateBaseGitOptions
|
|
) => Promise<{ ok: boolean }>
|
|
fetchRemoteWithCache: (
|
|
repoPath: string,
|
|
remote: string,
|
|
options?: WorktreeCreateBaseGitOptions
|
|
) => Promise<void>
|
|
}
|
|
|
|
async function prefetchLocalWorktreeCreateBase(
|
|
repo: Repo,
|
|
baseBranch: string | undefined,
|
|
runtime: WorktreeCreateBasePrefetchRuntime,
|
|
options: WorktreeCreateBaseGitOptions,
|
|
prepareLocalCheckout: (base: string, beforeMaterialization?: Promise<void>) => void
|
|
): Promise<string | undefined> {
|
|
// Omit options for host-routed calls so the runtime retains its own defaults.
|
|
const optionArgs: [] | [WorktreeCreateBaseGitOptions] = options.wslDistro ? [options] : []
|
|
const resolvedBaseBranch = await resolveWorktreeCreateBase({
|
|
requestedBaseBranch: baseBranch,
|
|
repoWorktreeBaseRef: repo.worktreeBaseRef,
|
|
resolveDefaultBaseRef: () => getBaseRefDefault(repo.path, ...optionArgs),
|
|
isBaseUsable: async (baseBranchCandidate) => {
|
|
const remoteTrackingBase = await runtime.resolveRemoteTrackingBase(
|
|
repo.path,
|
|
baseBranchCandidate,
|
|
...optionArgs
|
|
)
|
|
if (remoteTrackingBase) {
|
|
if (await runtime.hasRemoteTrackingRef(repo.path, remoteTrackingBase, ...optionArgs)) {
|
|
return true
|
|
}
|
|
return hasLocalWorktreeBaseRef(repo.path, baseBranchCandidate, options)
|
|
}
|
|
return hasLocalWorktreeBaseRef(repo.path, baseBranchCandidate, options)
|
|
}
|
|
})
|
|
if (!resolvedBaseBranch) {
|
|
return undefined
|
|
}
|
|
if (
|
|
isFullGitObjectId(resolvedBaseBranch) &&
|
|
(await hasLocalWorktreeBaseRef(repo.path, resolvedBaseBranch, options))
|
|
) {
|
|
return resolvedBaseBranch
|
|
}
|
|
const remoteTrackingBase = await runtime.resolveRemoteTrackingBase(
|
|
repo.path,
|
|
resolvedBaseBranch,
|
|
...optionArgs
|
|
)
|
|
if (remoteTrackingBase) {
|
|
const hasTrackingRef = await runtime.hasRemoteTrackingRef(
|
|
repo.path,
|
|
remoteTrackingBase,
|
|
...optionArgs
|
|
)
|
|
if (
|
|
hasTrackingRef ||
|
|
!(await hasLocalWorktreeBaseRef(repo.path, resolvedBaseBranch, options))
|
|
) {
|
|
const refresh = runtime.getOrStartRemoteTrackingBaseRefresh(
|
|
repo.path,
|
|
remoteTrackingBase,
|
|
...optionArgs
|
|
)
|
|
if (hasTrackingRef) {
|
|
// Register during fetch, then materialize the settled base once; offline keeps its local tip.
|
|
const beforeMaterialization = refresh.then(
|
|
() => {},
|
|
() => {}
|
|
)
|
|
prepareLocalCheckout(resolvedBaseBranch, beforeMaterialization)
|
|
}
|
|
await refresh
|
|
return resolvedBaseBranch
|
|
}
|
|
}
|
|
if (await hasLocalWorktreeBaseRef(repo.path, resolvedBaseBranch, options)) {
|
|
// Local branch and hosted-review refs cannot be refreshed by a broad remote fetch.
|
|
return resolvedBaseBranch
|
|
}
|
|
|
|
// Share create's fallback fetch key so it can reuse this work.
|
|
await runtime.fetchRemoteWithCache(repo.path, 'origin', ...optionArgs)
|
|
return resolvedBaseBranch
|
|
}
|
|
|
|
export async function prefetchWorktreeCreateBase(args: {
|
|
repo: Repo
|
|
baseBranch?: string
|
|
runtime: WorktreeCreateBasePrefetchRuntime
|
|
/** Git-host routing; pass {} for host Git. */
|
|
gitOptions: WorktreeCreateBaseGitOptions
|
|
prepareCheckout?: (base: string, beforeMaterialization?: Promise<void>) => Promise<void>
|
|
}): Promise<string | undefined> {
|
|
if (isFolderRepo(args.repo)) {
|
|
return undefined
|
|
}
|
|
// An `ssh:` repo is not served here, so there is no ref store to warm.
|
|
if (args.repo.connectionId) {
|
|
return undefined
|
|
}
|
|
const prepareCheckout = args.prepareCheckout
|
|
let preparation: Promise<void> | undefined
|
|
const prepare = (base: string, beforeMaterialization?: Promise<void>): void => {
|
|
if (!preparation && prepareCheckout) {
|
|
preparation = Promise.resolve().then(() => prepareCheckout(base, beforeMaterialization))
|
|
}
|
|
void preparation?.catch(() => {})
|
|
}
|
|
try {
|
|
const base = await prefetchLocalWorktreeCreateBase(
|
|
args.repo,
|
|
args.baseBranch,
|
|
args.runtime,
|
|
args.gitOptions,
|
|
prepare
|
|
)
|
|
if (base) {
|
|
prepare(base)
|
|
}
|
|
return base
|
|
} finally {
|
|
// Settle speculative work even if refresh fails; Create owns error reporting.
|
|
await preparation?.catch(() => {})
|
|
}
|
|
}
|