mirror of
https://github.com/stablyai/orca.git
synced 2026-09-23 00:02:29 +00:00
Brennan BensonandMerge Sim
b5a85890ac
* perf(git): bound git subprocess execution with an atomic admission scheduler Field traces (#16038, #11363) show Windows freeze storms driven by unbounded concurrent git children (12+ at once, 50-65s status convoys for 25+ minutes). Admit every main-process git child against atomic per-budget base+headroom counters (general / network / per-route), with reserved interactive capacity, ordering-only aging, close-bound permit release, a 120s fail-safe read timeout that feeds scheduler backoff, tier plumbing through every option carrier, and coalesced+jittered visibility pollers. Killswitch: ORCA_GIT_ADMISSION_DISABLED=1. Storm harness A/B: max concurrent children 65 -> 6, interactive p95 791ms -> 88ms; output-parity battery byte-identical with admission on vs off. * test(git): run the admission output-parity battery on every platform Parity needs real git, not the storm harness's PATH stub, so it must not share that file's POSIX gate - Windows is the platform where parity evidence matters. * fix(git): preserve interactive admission invariants * perf(git): keep admission queue drains linear * fix(git): close final admission gaps * perf(git): bound eligible route selection * fix(merge): remove unrelated stale snapshot changes * fix(git): preserve refresh lifecycle authority * test(git): align admission lifetime contracts * fix(git): harden admission across runtime paths * fix(git): restore freshness for bulk status reads * test(git): repoint delete-dialog source pins after admission plumbing The hydration effect now orders its targets through orderDeleteWorktreeStatusHydrationTargets and passes includeLineStats alongside the abort signal, so both literal anchors stopped matching. The invariants are unchanged and still pinned: dropping the signal, the main-worktree/folder filter, or getState-instead-of-subscribe each still reddens this test. * Fix git admission tier propagation and lock ordering Decode optional Git status tiers permissively and default runtime RPC status reads to the status lane while preserving renderer caller intent. Acquire the FETCH_HEAD mutex before atomic admission so same-repository fetch waiters hold no global or route permits. Preserve automatic pull-request refresh reasons, keep explicit hosted-review refreshes interactive, remove the dead candidate tier, and keep relay scheduling unchanged. Use tier-aware status lease keys because a shared lease cannot be safely promoted after its admission request is queued or granted. * test: align expectations with admission plumbing * refactor(child-process): move the process contract types to process-spec run-process.ts crossed its line cap after gaining the termination observer; the public types and defaults move out with re-exports so no caller changes. * chore: restore pnpm-lock.yaml to main (unintended local drift) --------- Co-authored-by: Merge Sim <sim@local>
39 lines
1.1 KiB
TypeScript
39 lines
1.1 KiB
TypeScript
import type { GitAdmissionTier } from './command-runner/git-exec-options'
|
|
|
|
export type GitRuntimeOptions = {
|
|
wslDistro?: string
|
|
signal?: AbortSignal
|
|
admissionTier?: GitAdmissionTier
|
|
}
|
|
|
|
export function gitOptionsForWorktree(
|
|
cwd: string,
|
|
options: GitRuntimeOptions = {}
|
|
): { cwd: string; wslDistro?: string; signal?: AbortSignal; admissionTier?: GitAdmissionTier } {
|
|
return {
|
|
cwd,
|
|
...(options.wslDistro ? { wslDistro: options.wslDistro } : {}),
|
|
...(options.signal ? { signal: options.signal } : {}),
|
|
...(options.admissionTier ? { admissionTier: options.admissionTier } : {})
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Options for a git invocation that only reads. Opting in explicitly keeps the
|
|
* shell-free WSL route from depending on `wsl-direct-git-read-commands`
|
|
* classifying the argv, which is a heuristic these call sites already know the
|
|
* answer to.
|
|
*/
|
|
export function gitReadOptionsForWorktree(
|
|
cwd: string,
|
|
options: GitRuntimeOptions = {}
|
|
): {
|
|
cwd: string
|
|
wslDistro?: string
|
|
signal?: AbortSignal
|
|
admissionTier?: GitAdmissionTier
|
|
preferWslDirectGit: true
|
|
} {
|
|
return { ...gitOptionsForWorktree(cwd, options), preferWslDirectGit: true }
|
|
}
|