mirror of
https://github.com/stablyai/orca.git
synced 2026-09-29 16:02:50 +00:00
* 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>
229 lines
7.6 KiB
TypeScript
229 lines
7.6 KiB
TypeScript
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|
import {
|
|
handlers,
|
|
store,
|
|
WORKTREE_FEATURE_PATH,
|
|
commitChangesMock,
|
|
bulkDiscardChangesMock,
|
|
getSshGitProviderMock,
|
|
resetFilesystemIpcMocks
|
|
} from './filesystem-test-harness'
|
|
|
|
vi.mock('electron', async () => (await import('./filesystem-test-harness')).electronMock)
|
|
vi.mock('fs/promises', async () => (await import('./filesystem-test-harness')).fsPromisesMock)
|
|
vi.mock(
|
|
'../wsl-unc-delete',
|
|
async () => (await import('./filesystem-test-harness')).wslUncDeleteMock
|
|
)
|
|
vi.mock(
|
|
'../crash-reporting/crash-breadcrumb-store',
|
|
async () => (await import('./filesystem-test-harness')).crashBreadcrumbMock
|
|
)
|
|
vi.mock(
|
|
'../local-downloaded-folder-promotion',
|
|
async () => (await import('./filesystem-test-harness')).folderPromotionMock
|
|
)
|
|
vi.mock(
|
|
'../git/status',
|
|
async () => (await import('./filesystem-test-harness')).gitStatusModuleMock
|
|
)
|
|
vi.mock(
|
|
'../git/check-ignored-paths',
|
|
async () => (await import('./filesystem-test-harness')).gitIgnoredPathsMock
|
|
)
|
|
vi.mock('../git/worktree', async () => (await import('./filesystem-test-harness')).gitWorktreeMock)
|
|
vi.mock(
|
|
'../providers/ssh-filesystem-dispatch',
|
|
async () => (await import('./filesystem-test-harness')).sshFilesystemDispatchMock
|
|
)
|
|
vi.mock(
|
|
'../providers/ssh-git-dispatch',
|
|
async () => (await import('./filesystem-test-harness')).sshGitDispatchMock
|
|
)
|
|
vi.mock(
|
|
'../text-generation/commit-message-text-generation',
|
|
async () => (await import('./filesystem-test-harness')).textGenerationModuleMock
|
|
)
|
|
vi.mock(
|
|
'../text-generation/pull-request-context',
|
|
async () => (await import('./filesystem-test-harness')).pullRequestContextMock
|
|
)
|
|
vi.mock(
|
|
'../source-control/pull-request-template',
|
|
async () => (await import('./filesystem-test-harness')).pullRequestTemplateMock
|
|
)
|
|
vi.mock(
|
|
'../source-control/pull-request-linked-issue',
|
|
async () => (await import('./filesystem-test-harness')).pullRequestLinkedIssueMock
|
|
)
|
|
|
|
import { registerFilesystemHandlers } from './filesystem'
|
|
import { invalidateAuthorizedRootsCache } from './registered-worktree-roots-cache'
|
|
|
|
describe('registerFilesystemHandlers', () => {
|
|
beforeEach(() => {
|
|
resetFilesystemIpcMocks()
|
|
// Reset module-level auth cache so each test starts with a fresh dirty
|
|
// flag — prevents stale worktree data from a prior test's cache rebuild.
|
|
invalidateAuthorizedRootsCache()
|
|
})
|
|
|
|
it('routes local git:commit through commitChanges and returns success', async () => {
|
|
commitChangesMock.mockResolvedValue({ success: true })
|
|
|
|
registerFilesystemHandlers(store as never)
|
|
|
|
await expect(
|
|
handlers.get('git:commit')!(null, {
|
|
worktreePath: WORKTREE_FEATURE_PATH,
|
|
message: 'feat: ship commit'
|
|
})
|
|
).resolves.toEqual({ success: true })
|
|
|
|
expect(commitChangesMock).toHaveBeenCalledWith(WORKTREE_FEATURE_PATH, 'feat: ship commit', {
|
|
admissionTier: 'interactive'
|
|
})
|
|
})
|
|
|
|
it('returns local commit hook failure payload from git:commit', async () => {
|
|
commitChangesMock.mockResolvedValue({ success: false, error: 'hook failed' })
|
|
|
|
registerFilesystemHandlers(store as never)
|
|
|
|
await expect(
|
|
handlers.get('git:commit')!(null, {
|
|
worktreePath: WORKTREE_FEATURE_PATH,
|
|
message: 'feat: ship commit'
|
|
})
|
|
).resolves.toEqual({ success: false, error: 'hook failed' })
|
|
})
|
|
|
|
it('routes ssh git:commit through the SSH provider instead of local commitChanges', async () => {
|
|
const sshCommitMock = vi.fn().mockResolvedValue({ success: true })
|
|
getSshGitProviderMock.mockReturnValue({ commit: sshCommitMock })
|
|
|
|
registerFilesystemHandlers(store as never)
|
|
|
|
await expect(
|
|
handlers.get('git:commit')!(null, {
|
|
worktreePath: '/remote/repo',
|
|
message: 'feat: remote commit',
|
|
connectionId: 'conn-1'
|
|
})
|
|
).resolves.toEqual({ success: true })
|
|
|
|
expect(sshCommitMock).toHaveBeenCalledWith('/remote/repo', 'feat: remote commit')
|
|
expect(commitChangesMock).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('routes ssh git:remoteCommitUrl through the SSH provider', async () => {
|
|
const sha = '0123456789abcdef0123456789abcdef01234567'
|
|
const sshRemoteCommitUrlMock = vi.fn().mockResolvedValue('https://github.com/org/repo/commit/x')
|
|
getSshGitProviderMock.mockReturnValue({ getRemoteCommitUrl: sshRemoteCommitUrlMock })
|
|
|
|
registerFilesystemHandlers(store as never)
|
|
|
|
await expect(
|
|
handlers.get('git:remoteCommitUrl')!(null, {
|
|
worktreePath: '/remote/repo',
|
|
sha,
|
|
connectionId: 'conn-1'
|
|
})
|
|
).resolves.toBe('https://github.com/org/repo/commit/x')
|
|
|
|
expect(sshRemoteCommitUrlMock).toHaveBeenCalledWith('/remote/repo', sha)
|
|
})
|
|
|
|
it('rejects git:remoteCommitUrl with a short hash before SSH dispatch', async () => {
|
|
const sshRemoteCommitUrlMock = vi.fn()
|
|
getSshGitProviderMock.mockReturnValue({ getRemoteCommitUrl: sshRemoteCommitUrlMock })
|
|
|
|
registerFilesystemHandlers(store as never)
|
|
|
|
await expect(
|
|
handlers.get('git:remoteCommitUrl')!(null, {
|
|
worktreePath: '/remote/repo',
|
|
sha: 'abc123',
|
|
connectionId: 'conn-1'
|
|
})
|
|
).rejects.toThrow('sha must be a full git object id')
|
|
|
|
expect(sshRemoteCommitUrlMock).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('routes ssh git:bulkDiscard through the SSH provider', async () => {
|
|
const sshBulkDiscardMock = vi.fn().mockResolvedValue(undefined)
|
|
getSshGitProviderMock.mockReturnValue({ bulkDiscardChanges: sshBulkDiscardMock })
|
|
|
|
registerFilesystemHandlers(store as never)
|
|
|
|
await handlers.get('git:bulkDiscard')!(null, {
|
|
worktreePath: '/remote/repo',
|
|
filePaths: ['a.ts', 'b.ts'],
|
|
connectionId: 'conn-1'
|
|
})
|
|
|
|
expect(sshBulkDiscardMock).toHaveBeenCalledWith('/remote/repo', ['a.ts', 'b.ts'])
|
|
expect(bulkDiscardChangesMock).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('routes ssh git:fastForward through the SSH provider', async () => {
|
|
const sshFastForwardMock = vi.fn().mockResolvedValue(undefined)
|
|
const pushTarget = { remoteName: 'fork', branchName: 'feature/fix' }
|
|
getSshGitProviderMock.mockReturnValue({ fastForwardBranch: sshFastForwardMock })
|
|
|
|
registerFilesystemHandlers(store as never)
|
|
|
|
await handlers.get('git:fastForward')!(null, {
|
|
worktreePath: '/remote/repo',
|
|
connectionId: 'conn-1',
|
|
pushTarget
|
|
})
|
|
|
|
expect(sshFastForwardMock).toHaveBeenCalledWith('/remote/repo', pushTarget)
|
|
})
|
|
|
|
it('rejects git:commit with empty message and does not call commitChanges', async () => {
|
|
registerFilesystemHandlers(store as never)
|
|
|
|
await expect(
|
|
handlers.get('git:commit')!(null, {
|
|
worktreePath: WORKTREE_FEATURE_PATH,
|
|
message: ''
|
|
})
|
|
).rejects.toThrow('Commit message is required')
|
|
|
|
expect(commitChangesMock).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('rejects git:commit with whitespace-only message and does not call commitChanges', async () => {
|
|
registerFilesystemHandlers(store as never)
|
|
|
|
await expect(
|
|
handlers.get('git:commit')!(null, {
|
|
worktreePath: WORKTREE_FEATURE_PATH,
|
|
message: ' '
|
|
})
|
|
).rejects.toThrow('Commit message is required')
|
|
|
|
expect(commitChangesMock).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('rejects git:commit with whitespace-only message before SSH dispatch', async () => {
|
|
const sshCommitMock = vi.fn().mockResolvedValue({ success: true })
|
|
getSshGitProviderMock.mockReturnValue({ commit: sshCommitMock })
|
|
|
|
registerFilesystemHandlers(store as never)
|
|
|
|
await expect(
|
|
handlers.get('git:commit')!(null, {
|
|
worktreePath: '/remote/repo',
|
|
message: '\n',
|
|
connectionId: 'conn-1'
|
|
})
|
|
).rejects.toThrow('Commit message is required')
|
|
|
|
expect(sshCommitMock).not.toHaveBeenCalled()
|
|
})
|
|
})
|