mirror of
https://github.com/stablyai/orca.git
synced 2026-11-19 04:23:57 +00:00
* feat(ci): ratchet raw repo connectionId host reads; one drop-in resolver Codex review 6 class fix (#4/#6/#7): host decisions read off a repo row's legacy connectionId miss rows that name SSH only as executionHostId. - getRepoRoutingConnectionId (shared/execution-host.ts): drop-in for a raw repo.connectionId routing check that also finds executionHostId-only SSH. - check-repo-host-read-ratchet: per-file count of raw repo connectionId reads in src/main, src/shared, src/cli; counts may only shrink. - Migrated 66 cheap reads: runtime GitHub/GitLab commands, PR/MR head ref fetches, preserved-branch cleanup, ref queries, base-ref IPC, worktree preparation, trash sweep, scan cache TTL, usage metadata. * fix(ipc): PR base IPC routes executionHostId-only SSH rows; ratchet is a stated lower bound Review follow-up (Opus on #31096): - worktrees:resolvePrBase decided git/gh routing on the raw connectionId while its head-ref fetches already used the resolver; one resolved connectionId now drives all of it (test fails on main). - getRepoRoutingConnectionId's contract is stated exactly: never local when the raw field is set; on a contradictory ssh row executionHostId wins. - The ratchet regex no longer matches report.connectionId; header and docs say it is a lower bound. - Regression tests for a runtime GitHub and GitLab command site. * test(ci): pin the repo host-read ratchet step to the static phase * fix(ci): repo host-read ratchet skips verbatim field copies into projected rows A copy of connectionId into a projected row decides nothing; migrating it to the resolver would change what the projection publishes. The sidebar feed catalog's copy (added after the baseline) and two older projections no longer count; baseline pruned to 91.
115 lines
4.6 KiB
TypeScript
115 lines
4.6 KiB
TypeScript
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|
|
|
const { gitExecFileAsyncMock } = vi.hoisted(() => ({ gitExecFileAsyncMock: vi.fn() }))
|
|
vi.mock('../git/runner', () => ({ gitExecFileAsync: gitExecFileAsyncMock }))
|
|
|
|
import {
|
|
githubPullRequestHeadLocalRef,
|
|
reviewHeadRemoteRefComponent,
|
|
REVIEW_HEAD_FETCH_TIMEOUT_MS
|
|
} from '../../shared/review-head-tracking-ref'
|
|
import { fetchGitHubPullRequestHeadRef, fetchPrHeadTrackingRef } from './pr-head-tracking-ref'
|
|
|
|
const ORIGIN_URL = 'https://github.com/acme/widgets.git'
|
|
const ORIGIN_COMPONENT = reviewHeadRemoteRefComponent('origin', ORIGIN_URL)
|
|
|
|
describe('fetchPrHeadTrackingRef', () => {
|
|
beforeEach(() => {
|
|
gitExecFileAsyncMock.mockReset()
|
|
gitExecFileAsyncMock.mockImplementation(async (args: string[]) => {
|
|
if (args[0] === 'remote' && args[1] === 'get-url') {
|
|
return { stdout: `${ORIGIN_URL}\n`, stderr: '' }
|
|
}
|
|
return { stdout: '', stderr: '' }
|
|
})
|
|
})
|
|
|
|
it('fetches into the remote-tracking ref with real git for local repos', async () => {
|
|
await fetchPrHeadTrackingRef({ path: '/repo', connectionId: null }, 'origin', 'feature/x')
|
|
|
|
expect(gitExecFileAsyncMock).toHaveBeenCalledWith(
|
|
['fetch', 'origin', '+refs/heads/feature/x:refs/remotes/origin/feature/x'],
|
|
{ cwd: '/repo' }
|
|
)
|
|
})
|
|
|
|
it('throws for an SSH repo, which this process does not serve', async () => {
|
|
await expect(
|
|
fetchPrHeadTrackingRef({ path: '/repo', connectionId: 'conn-1' }, 'origin', 'feature/x')
|
|
).rejects.toThrow('SSH Git provider is not available')
|
|
expect(gitExecFileAsyncMock).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('throws for an SSH repo named only by executionHostId', async () => {
|
|
await expect(
|
|
fetchPrHeadTrackingRef({ path: '/repo', executionHostId: 'ssh:gpu' }, 'origin', 'feature/x')
|
|
).rejects.toThrow('SSH Git provider is not available')
|
|
expect(gitExecFileAsyncMock).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('fetches a GitHub pull head into its remote-scoped Orca ref for local repos', async () => {
|
|
const localRef = await fetchGitHubPullRequestHeadRef(
|
|
{ path: '/repo', connectionId: null },
|
|
'origin',
|
|
42
|
|
)
|
|
|
|
// The fetch is bounded so a stalled remote can't hang PR resolution.
|
|
expect(gitExecFileAsyncMock).toHaveBeenCalledWith(
|
|
['fetch', '--no-tags', 'origin', `+refs/pull/42/head:refs/orca/pull/${ORIGIN_COMPONENT}/42`],
|
|
{ cwd: '/repo', timeout: REVIEW_HEAD_FETCH_TIMEOUT_MS }
|
|
)
|
|
expect(localRef).toBe(githubPullRequestHeadLocalRef(ORIGIN_COMPONENT, 42))
|
|
expect(localRef).toBe(`refs/orca/pull/${ORIGIN_COMPONENT}/42`)
|
|
})
|
|
|
|
it('fails the pull-head fetch when the remote is not configured', async () => {
|
|
gitExecFileAsyncMock.mockImplementation(async (args: string[]) => {
|
|
if (args[0] === 'remote' && args[1] === 'get-url') {
|
|
throw new Error("fatal: No such remote 'origin'")
|
|
}
|
|
return { stdout: '', stderr: '' }
|
|
})
|
|
|
|
await expect(
|
|
fetchGitHubPullRequestHeadRef({ path: '/repo', connectionId: null }, 'origin', 42)
|
|
).rejects.toThrow('Remote "origin" is not configured.')
|
|
expect(gitExecFileAsyncMock).not.toHaveBeenCalledWith(
|
|
expect.arrayContaining(['fetch']),
|
|
expect.anything()
|
|
)
|
|
})
|
|
|
|
it('keeps WSL routing while bounding the pull-head fetch', async () => {
|
|
await fetchGitHubPullRequestHeadRef({ path: '/repo', connectionId: null }, 'origin', 42, {
|
|
localGitExecOptions: { cwd: '/repo', wslDistro: 'Ubuntu' }
|
|
})
|
|
|
|
expect(gitExecFileAsyncMock).toHaveBeenCalledWith(['remote', 'get-url', 'origin'], {
|
|
cwd: '/repo',
|
|
wslDistro: 'Ubuntu'
|
|
})
|
|
expect(gitExecFileAsyncMock).toHaveBeenCalledWith(
|
|
['fetch', '--no-tags', 'origin', `+refs/pull/42/head:refs/orca/pull/${ORIGIN_COMPONENT}/42`],
|
|
{ cwd: '/repo', wslDistro: 'Ubuntu', timeout: REVIEW_HEAD_FETCH_TIMEOUT_MS }
|
|
)
|
|
})
|
|
|
|
it('rejects a GitHub pull-head fetch for an SSH repo', async () => {
|
|
await expect(
|
|
fetchGitHubPullRequestHeadRef({ path: '/repo', connectionId: 'conn-1' }, 'origin', 42)
|
|
).rejects.toThrow('SSH Git provider is not available')
|
|
expect(gitExecFileAsyncMock).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('rejects invalid PR numbers and option-shaped remotes before running git', async () => {
|
|
await expect(
|
|
fetchGitHubPullRequestHeadRef({ path: '/repo', connectionId: null }, 'origin', 4.2)
|
|
).rejects.toThrow('Invalid pull request number')
|
|
await expect(
|
|
fetchGitHubPullRequestHeadRef({ path: '/repo', connectionId: null }, '--upload-pack=x', 42)
|
|
).rejects.toThrow('must not start with "-"')
|
|
expect(gitExecFileAsyncMock).not.toHaveBeenCalled()
|
|
})
|
|
})
|