Files
orca/src/relay/git-handler-diff-read-coalescing.test.ts
T
Neil 9367169888 refactor(tests): split every oversized test file off the max-lines suppression list (#14728)
* refactor(tests): split oversized test files off the max-lines suppression list

Every `*.test.ts`/`*.spec.ts` that carried an `eslint/oxlint-disable max-lines`
directive is now split into focused, behavior-scoped suites that fit the 800-line
test budget, with shared setup extracted into co-located `*-test-harness.ts` /
`*-test-fixtures.ts` modules (300-line budget). 83 files became ~930; the largest
output is 797 effective lines. `orca-runtime.test.ts` is intentionally untouched.

Test bodies were moved by scripted line-range slicing rather than retyped, so
assertions are byte-identical. The only permitted body edits were mechanical
rebinding where a shared value moved into a harness (e.g. `tmpHome` ->
`homes.tmpHome`).

Registries that enumerate test files were updated in lockstep:
- config/max-lines-baseline.txt: pruned 341 -> 258 entries (all 83 removed).
- config/reliability-gates.jsonc: 33 gates repointed at the split files, with
  assertionRefs split per file where a gate's coverage now spans several.
- .github/workflows/pr.yml: the real-zsh lane now lists the 4 split files that
  actually exercise zsh, so they keep running in the dedicated shell lane.

Also renamed agent-hooks `server-test-fixtures.ts` to `server.test-fixtures.ts`
so the global-fetch call-site audit keeps skipping it, and added `.js` extensions
to the CLI suites' dynamic harness imports (node16 resolution) to unbreak
`build:cli`.

Verification: full suite 52,449 passing vs 52,448 at baseline with zero
assertions lost; `pnpm lint`, `pnpm typecheck`, and `pnpm build:cli` all exit 0;
the terminal-pane e2e spec runs 31/31 headless.

* refactor(tests): split hook-idle arbitration suite that oxfmt pushed over budget

The pre-commit oxfmt pass reflowed pty-connection-hook-idle-arbitration.test.ts
to 811 effective lines, 11 over the test budget. Split the hook-completion side
effect and replacement-agent veto cases into their own suite; both files now sit
well under the cap and the 15 tests are unchanged.

* test: port upstream test changes into the split files after rebase

Rebasing onto main surfaced 27 tests that main had added to files this branch
deleted, plus edits to tests that had already moved. Taking the deletion side of
those modify/delete conflicts would have dropped that coverage silently, so each
upstream change is ported into the split file that now owns the behavior — for
example main's six orchestration mailbox tests land across orchestration-runs,
-send, and -check.

Also repoints `orchestration.notification-mailbox-consistency`, a gate main added
after this branch's gate remap, at those same three split files, and re-prunes
the max-lines baseline against main's (257 entries).

Verified: all 27 upstream test titles present; full suite 52,761 passing with the
only diff vs baseline being 12 tests main itself removed and 3 that moved from
skipped to passing; lint and typecheck exit 0.

* fix(test): flush pending continuations before tearing down terminal test globals

CI shard 5/16 failed on both Node 24 and 26 with `ReferenceError: window is not
defined` from pty-connection.ts, surfacing through
pty-connection-daemon-snapshot-replay.test.ts.

The reattach/settle chains `await` a real promise and then touch `window.api`.
Under fake timers those continuations cannot run, so they only become schedulable
once restoreTerminalTestGlobals() switches back to real timers — which previously
happened immediately before `delete globalThis.window`, so a late continuation
threw and failed the whole file. Flush async ticks in that window instead.

This is latent in the source rather than new: the pre-split 25k-line file kept
running other tests after these, which gave the chains time to settle before
teardown. Splitting the file moved teardown directly behind them.

* fix(test): keep an inert window after terminal test teardown instead of deleting it

The async-tick flush was not enough: the reattach/settle chain can resolve after
teardown regardless of how long we drain, so CI shard 5/16 still failed with
`ReferenceError: window is not defined` from pty-connection.ts.

A real renderer never loses `window`, so deleting it was the artificial part.
Swap in an inert proxy whose properties resolve to callables and whose calls
resolve to undefined, making a late `window.api.pty.*` call a harmless no-op.
The next test replaces it wholesale via installTerminalTestGlobals(), and no test
asserts that `window` is absent.
2026-08-15 00:54:20 -07:00

478 lines
16 KiB
TypeScript

/**
* GitHandler relay diff-read coalescing: in-flight sharing of identical
* diff/branchDiff/commitDiff blob reads, and the invalidation points that
* force a fresh read.
*/
import { describe, expect, it, vi, beforeEach, afterEach } from 'vitest'
import * as path from 'node:path'
import { mkdirSync, writeFileSync } from 'node:fs'
import { execFileSync } from 'node:child_process'
import type { GitHandler } from './git-handler'
import { gitInit, gitCommit, type MockDispatcher } from './git-handler-test-setup'
import {
createGitHandlerRelay,
createGitTempDir,
removeGitTempDir,
type GitBufferSpyTarget,
type GitSpyTarget
} from './git-handler-test-harness'
function deferredRelayBuffer(content: string): {
promise: Promise<Buffer>
resolve: () => void
} {
let resolve!: (value: Buffer) => void
const promise = new Promise<Buffer>((innerResolve) => {
resolve = innerResolve
})
return {
promise,
resolve: () => resolve(Buffer.from(content))
}
}
async function waitForSpyCalls(mock: ReturnType<typeof vi.fn>, calls: number): Promise<void> {
for (let i = 0; i < 20; i++) {
if (mock.mock.calls.length >= calls) {
return
}
await new Promise<void>((resolve) => setTimeout(resolve, 0))
}
}
describe('GitHandler', () => {
let dispatcher: MockDispatcher
let handler: GitHandler
let tmpDir: string
beforeEach(() => {
tmpDir = createGitTempDir()
;({ dispatcher, handler } = createGitHandlerRelay())
})
afterEach(async () => {
await removeGitTempDir(tmpDir)
})
describe('branchDiff', () => {
it('coalesces concurrent identical git.diff reads while in flight and reads fresh after settle', async () => {
const leftBlob = deferredRelayBuffer('left\n')
const rightBlob = deferredRelayBuffer('right\n')
const pendingBuffers = [leftBlob, rightBlob]
const gitBufferSpy = vi
.spyOn(handler as unknown as GitBufferSpyTarget, 'gitBuffer')
.mockImplementation(async () => pendingBuffers.shift()!.promise)
const reads = Array.from({ length: 8 }, () =>
dispatcher.callRequest('git.diff', {
worktreePath: tmpDir,
filePath: 'src/file.ts',
staged: true
})
)
await waitForSpyCalls(gitBufferSpy, 1)
leftBlob.resolve()
await waitForSpyCalls(gitBufferSpy, 2)
rightBlob.resolve()
await Promise.all(reads)
expect(gitBufferSpy).toHaveBeenCalledTimes(2)
gitBufferSpy
.mockResolvedValueOnce(Buffer.from('fresh-left\n'))
.mockResolvedValueOnce(Buffer.from('fresh-right\n'))
await dispatcher.callRequest('git.diff', {
worktreePath: tmpDir,
filePath: 'src/file.ts',
staged: true
})
expect(gitBufferSpy).toHaveBeenCalledTimes(4)
})
it('clears pending git.diff reads when status runs', async () => {
const firstBlob = deferredRelayBuffer('left\n')
const secondBlob = deferredRelayBuffer('fresh-left\n')
const pendingBuffers = [firstBlob, secondBlob]
const gitBufferSpy = vi
.spyOn(handler as unknown as GitBufferSpyTarget, 'gitBuffer')
.mockImplementation(async () => pendingBuffers.shift()!.promise)
const gitSpy = vi
.spyOn(handler as unknown as GitSpyTarget, 'git')
.mockResolvedValue({ stdout: '', stderr: '' })
const first = dispatcher.callRequest('git.diff', {
worktreePath: tmpDir,
filePath: 'src/file.ts',
staged: false
})
await waitForSpyCalls(gitBufferSpy, 1)
await dispatcher.callRequest('git.status', { worktreePath: tmpDir })
const second = dispatcher.callRequest('git.diff', {
worktreePath: tmpDir,
filePath: 'src/file.ts',
staged: false
})
await waitForSpyCalls(gitBufferSpy, 2)
firstBlob.resolve()
secondBlob.resolve()
await Promise.all([first, second])
expect(gitBufferSpy).toHaveBeenCalledTimes(2)
expect(gitSpy).toHaveBeenCalled()
})
it('clears pending git.diff reads when a mutation runs', async () => {
const firstBlob = deferredRelayBuffer('left\n')
const secondBlob = deferredRelayBuffer('fresh-left\n')
const pendingBuffers = [firstBlob, secondBlob]
const gitBufferSpy = vi
.spyOn(handler as unknown as GitBufferSpyTarget, 'gitBuffer')
.mockImplementation(async () => pendingBuffers.shift()!.promise)
const gitSpy = vi
.spyOn(handler as unknown as GitSpyTarget, 'git')
.mockResolvedValue({ stdout: '', stderr: '' })
const first = dispatcher.callRequest('git.diff', {
worktreePath: tmpDir,
filePath: 'src/file.ts',
staged: false
})
await waitForSpyCalls(gitBufferSpy, 1)
await dispatcher.callRequest('git.stage', { worktreePath: tmpDir, filePath: 'src/file.ts' })
const second = dispatcher.callRequest('git.diff', {
worktreePath: tmpDir,
filePath: 'src/file.ts',
staged: false
})
await waitForSpyCalls(gitBufferSpy, 2)
firstBlob.resolve()
secondBlob.resolve()
await Promise.all([first, second])
expect(gitBufferSpy).toHaveBeenCalledTimes(2)
expect(gitSpy).toHaveBeenCalledWith(['add', '--', ':(literal)src/file.ts'], tmpDir)
const submodulePathReads = gitSpy.mock.calls.filter(
([args]) => args[0] === 'config' && args.includes('.gitmodules')
)
expect(submodulePathReads).toHaveLength(2)
})
it('clears pending git.diff reads when a narrow ref fetch runs', async () => {
const firstBlob = deferredRelayBuffer('left\n')
const secondBlob = deferredRelayBuffer('fresh-left\n')
const pendingBuffers = [firstBlob, secondBlob]
const gitBufferSpy = vi
.spyOn(handler as unknown as GitBufferSpyTarget, 'gitBuffer')
.mockImplementation(async () => pendingBuffers.shift()!.promise)
const gitSpy = vi
.spyOn(handler as unknown as GitSpyTarget, 'git')
.mockImplementation(async (args: string[]) => {
if (args[0] === 'remote') {
return { stdout: 'origin\n', stderr: '' }
}
return { stdout: '', stderr: '' }
})
const first = dispatcher.callRequest('git.diff', {
worktreePath: tmpDir,
filePath: 'src/file.ts',
staged: false
})
await waitForSpyCalls(gitBufferSpy, 1)
await dispatcher.callRequest('git.fetchRemoteTrackingRef', {
worktreePath: tmpDir,
remote: 'origin',
branch: 'main',
ref: 'refs/remotes/origin/main',
skipAutoMaintenance: true
})
const second = dispatcher.callRequest('git.diff', {
worktreePath: tmpDir,
filePath: 'src/file.ts',
staged: false
})
await waitForSpyCalls(gitBufferSpy, 2)
firstBlob.resolve()
secondBlob.resolve()
await Promise.all([first, second])
expect(gitBufferSpy).toHaveBeenCalledTimes(2)
expect(gitSpy).toHaveBeenCalledWith(
[
'-c',
'maintenance.auto=false',
'-c',
'maintenance.commit-graph.auto=0',
'-c',
'gc.auto=0',
'fetch',
'--no-tags',
'origin',
'+refs/heads/main:refs/remotes/origin/main'
],
tmpDir
)
})
it('coalesces concurrent identical git.branchDiff reads while in flight', async () => {
const gitSpy = vi
.spyOn(handler as unknown as GitSpyTarget, 'git')
.mockImplementation(async (args: string[]) => {
if (args[0] === 'rev-parse' && args.includes('HEAD')) {
return { stdout: `${'c'.repeat(40)}\n`, stderr: '' }
}
if (args[0] === 'rev-parse') {
return { stdout: `${'b'.repeat(40)}\n`, stderr: '' }
}
if (args[0] === 'merge-base') {
return { stdout: `${'a'.repeat(40)}\n`, stderr: '' }
}
if (args.includes('--name-status')) {
return { stdout: 'M\tsrc/file.ts\n', stderr: '' }
}
throw new Error(`unexpected git args: ${args.join(' ')}`)
})
const leftBlob = deferredRelayBuffer('left\n')
const rightBlob = deferredRelayBuffer('right\n')
const pendingBuffers = [leftBlob, rightBlob]
const gitBufferSpy = vi
.spyOn(handler as unknown as GitBufferSpyTarget, 'gitBuffer')
.mockImplementation(async () => pendingBuffers.shift()!.promise)
const reads = Array.from({ length: 8 }, () =>
dispatcher.callRequest('git.branchDiff', {
worktreePath: tmpDir,
baseRef: 'main',
includePatch: true,
filePath: 'src/file.ts'
})
)
await waitForSpyCalls(gitBufferSpy, 1)
leftBlob.resolve()
await waitForSpyCalls(gitBufferSpy, 2)
rightBlob.resolve()
await Promise.all(reads)
expect(gitBufferSpy).toHaveBeenCalledTimes(2)
expect(gitSpy).toHaveBeenCalledTimes(4)
})
it('coalesces concurrent identical git.commitDiff reads while in flight', async () => {
const leftBlob = deferredRelayBuffer('left\n')
const rightBlob = deferredRelayBuffer('right\n')
const pendingBuffers = [leftBlob, rightBlob]
const gitBufferSpy = vi
.spyOn(handler as unknown as GitBufferSpyTarget, 'gitBuffer')
.mockImplementation(async () => pendingBuffers.shift()!.promise)
const reads = Array.from({ length: 8 }, () =>
dispatcher.callRequest('git.commitDiff', {
worktreePath: tmpDir,
commitOid: 'c'.repeat(40),
parentOid: 'b'.repeat(40),
filePath: 'src/file.ts'
})
)
await waitForSpyCalls(gitBufferSpy, 1)
leftBlob.resolve()
await waitForSpyCalls(gitBufferSpy, 2)
rightBlob.resolve()
await Promise.all(reads)
expect(gitBufferSpy).toHaveBeenCalledTimes(2)
})
it('coalesces parentless root git.commitDiff reads without a left-side blob', async () => {
const rightBlob = deferredRelayBuffer('right\n')
const gitBufferSpy = vi
.spyOn(handler as unknown as GitBufferSpyTarget, 'gitBuffer')
.mockImplementation(async () => rightBlob.promise)
const reads = Array.from({ length: 8 }, () =>
dispatcher.callRequest('git.commitDiff', {
worktreePath: tmpDir,
commitOid: 'c'.repeat(40),
parentOid: null,
filePath: 'src/file.ts'
})
)
await waitForSpyCalls(gitBufferSpy, 1)
rightBlob.resolve()
await Promise.all(reads)
expect(gitBufferSpy).toHaveBeenCalledTimes(1)
})
it('keeps distinct relay diff keys independent', async () => {
const gitBufferSpy = vi
.spyOn(handler as unknown as GitBufferSpyTarget, 'gitBuffer')
.mockResolvedValue(Buffer.from('blob\n'))
await Promise.all([
dispatcher.callRequest('git.diff', {
worktreePath: tmpDir,
filePath: 'src/file.ts',
staged: true
}),
dispatcher.callRequest('git.diff', {
worktreePath: tmpDir,
filePath: 'src/file.ts',
staged: false,
compareAgainstHead: true
})
])
expect(gitBufferSpy).toHaveBeenCalledTimes(3)
gitBufferSpy.mockClear()
const gitSpy = vi
.spyOn(handler as unknown as GitSpyTarget, 'git')
.mockImplementation(async (args: string[]) => {
if (args[0] === 'rev-parse' && args.includes('HEAD')) {
return { stdout: `${'c'.repeat(40)}\n`, stderr: '' }
}
if (args[0] === 'rev-parse' && args.includes('develop')) {
return { stdout: `${'d'.repeat(40)}\n`, stderr: '' }
}
if (args[0] === 'rev-parse') {
return { stdout: `${'b'.repeat(40)}\n`, stderr: '' }
}
if (args[0] === 'merge-base' && args.includes('d'.repeat(40))) {
return { stdout: `${'e'.repeat(40)}\n`, stderr: '' }
}
if (args[0] === 'merge-base') {
return { stdout: `${'a'.repeat(40)}\n`, stderr: '' }
}
if (args.includes('--name-status')) {
return { stdout: 'M\tsrc/file.ts\n', stderr: '' }
}
throw new Error(`unexpected git args: ${args.join(' ')}`)
})
await Promise.all([
dispatcher.callRequest('git.branchDiff', {
worktreePath: tmpDir,
baseRef: 'main',
includePatch: true,
filePath: 'src/file.ts'
}),
dispatcher.callRequest('git.branchDiff', {
worktreePath: tmpDir,
baseRef: 'main',
includePatch: false,
filePath: 'src/file.ts'
}),
dispatcher.callRequest('git.branchDiff', {
worktreePath: tmpDir,
baseRef: 'develop',
includePatch: true,
filePath: 'src/file.ts'
})
])
expect(gitSpy).toHaveBeenCalledTimes(12)
expect(gitBufferSpy).toHaveBeenCalledTimes(4)
gitBufferSpy.mockClear()
await Promise.all([
dispatcher.callRequest('git.commitDiff', {
worktreePath: tmpDir,
commitOid: 'c'.repeat(40),
parentOid: 'b'.repeat(40),
filePath: 'src/file.ts'
}),
dispatcher.callRequest('git.commitDiff', {
worktreePath: tmpDir,
commitOid: 'c'.repeat(40),
parentOid: 'a'.repeat(40),
filePath: 'src/file.ts'
}),
dispatcher.callRequest('git.commitDiff', {
worktreePath: tmpDir,
commitOid: 'c'.repeat(40),
parentOid: 'b'.repeat(40),
filePath: 'src/file.ts',
oldPath: 'src/old-a.ts'
}),
dispatcher.callRequest('git.commitDiff', {
worktreePath: tmpDir,
commitOid: 'c'.repeat(40),
parentOid: 'b'.repeat(40),
filePath: 'src/file.ts',
oldPath: 'src/old-b.ts'
})
])
expect(gitBufferSpy).toHaveBeenCalledTimes(8)
})
it('retries relay diff reads after an in-flight rejection settles', async () => {
const invalidRequest = {
worktreePath: tmpDir,
commitOid: 'not-a-full-oid',
parentOid: 'b'.repeat(40),
filePath: 'src/file.ts'
}
const first = dispatcher.callRequest('git.commitDiff', invalidRequest)
const firstBurst = [
first,
...Array.from({ length: 7 }, () => dispatcher.callRequest('git.commitDiff', invalidRequest))
]
await expect(Promise.all(firstBurst)).rejects.toThrow(
'commitOid must be a full git object id'
)
const retry = dispatcher.callRequest('git.commitDiff', invalidRequest)
expect(retry).not.toBe(first)
await expect(retry).rejects.toThrow('commitOid must be a full git object id')
})
// Why: regression for #1503 on git.branchDiff — branchDiffEntries is a separate quotePath=false path that must round-trip UTF-8.
it('preserves UTF-8 paths in branch-diff entries', async () => {
gitInit(tmpDir)
writeFileSync(path.join(tmpDir, 'base.txt'), 'base')
gitCommit(tmpDir, 'initial')
const baseRef = execFileSync('git', ['rev-parse', '--abbrev-ref', 'HEAD'], {
cwd: tmpDir,
encoding: 'utf-8'
}).trim()
execFileSync('git', ['checkout', '-b', 'feature'], { cwd: tmpDir, stdio: 'pipe' })
const utf8Dir = path.join(tmpDir, 'docs', '日本語')
mkdirSync(utf8Dir, { recursive: true })
writeFileSync(path.join(utf8Dir, 'sample.md'), 'hello')
gitCommit(tmpDir, 'feature commit')
const result = (await dispatcher.callRequest('git.branchDiff', {
worktreePath: tmpDir,
baseRef,
filePath: 'docs/日本語/sample.md'
})) as Record<string, unknown>[]
// length===1 confirms the path filter matched the raw UTF-8 path; octal-quoted (default quotePath) wouldn't match.
expect(result).toHaveLength(1)
})
})
})