Brennan Benson 1a0e1e9414 PR conflict previews fetch the base branch through the shared fetch controller (#30654) ...

* fix(github): PR conflict previews fetch the base branch through the fetch controller

The conflict summary on a PR card spawned its own `git fetch origin <base>`,
outside RuntimeRemoteFetchController: it refetched a base a worktree create
had just refreshed (and vice versa), ran git's auto-maintenance in the
background, and never armed the idle loose-ref sweep.

It now asks the runtime's controller for the exact-base refresh creates
already use (same argv, per-remote queue, dedupe and freshness), waiting at
most the old 10 s before falling back to the local ref. The runtime registers
its controller at construction, since the IPC and poller paths have no
runtime handle.

Also corrects the controller comment that claimed every fetch skips
auto-maintenance: full fetches keep it on purpose (#8039).

* test(github): read the mocked fetch's WSL option without a type assertion

* test(github): give the conflicting fallback-lookup test a git mock for its conflict summary

* test(github): check WSL routing without duplicating fetch policy

* fix(git): bound preview fetch ownership without cancelling create

* Preserve repository identity after preview cancellation

2026-10-20 17:14:25 -07:00

..

__fixtures__

fix(tasks): preserve repository results under GitHub search quota (#20460)

2026-09-13 15:43:12 -07:00

client

Recover failed-job log retrieval onto main (#29180)

2026-10-15 10:36:21 -07:00

project-view

feat(github-projects): render Board project views as a kanban with drag-and-drop (#19074)

2026-10-05 22:23:57 -07:00

account-binding-required-host.test.ts

fix(github): resolve SSH host aliases for account binding (#29018)

2026-10-15 23:11:42 -07:00

account-binding-required-host.ts

fix(github): resolve SSH host aliases for account binding (#29018)

2026-10-15 23:11:42 -07:00

auth-diagnose.test.ts

fix(github): load PR diffs for Enterprise remotes (#8932)

2026-07-20 18:55:45 -07:00

auth-diagnose.ts

feat(github): bind projects to a specific gh account (#13664)

2026-09-18 20:39:52 -07:00

client-create-pr.test.ts

refactor(providers): delete the SSH git and filesystem providers and relay-only wiring (#27644)

2026-10-11 17:48:43 -07:00

client-file-viewed.test.ts

test: load GitHub operations from their public modules (#26384)

2026-10-07 21:44:12 -07:00

client-issue-origin-preference.test.ts

test: load GitHub operations from their public modules (#26384)

2026-10-07 21:44:12 -07:00

client-issue-source.test.ts

test: load GitHub operations from their public modules (#26384)

2026-10-07 21:44:12 -07:00

client-merge-queue-auto-merge.test.ts

PR conflict previews fetch the base branch through the shared fetch controller (#30654)

2026-10-20 17:14:25 -07:00

client-merged-pr-visibility.test.ts

refactor(providers): delete the SSH git and filesystem providers and relay-only wiring (#27644)

2026-10-11 17:48:43 -07:00

client-pr-branch-discovery.test.ts

refactor(providers): delete the SSH git and filesystem providers and relay-only wiring (#27644)

2026-10-11 17:48:43 -07:00

client-pr-check-details.test.ts

Recover failed-job log retrieval onto main (#29180)

2026-10-15 10:36:21 -07:00

client-pr-checks.test.ts

test: load GitHub operations from their public modules (#26384)

2026-10-07 21:44:12 -07:00

client-pr-comment-reactions.test.ts

refactor(providers): delete the SSH git and filesystem providers and relay-only wiring (#27644)

2026-10-11 17:48:43 -07:00

client-pr-conflict-summary.test.ts

PR conflict previews fetch the base branch through the shared fetch controller (#30654)

2026-10-20 17:14:25 -07:00

client-pr-fallback-number.test.ts

refactor(providers): delete the SSH git and filesystem providers and relay-only wiring (#27644)

2026-10-11 17:48:43 -07:00

client-pr-linked-lookup.test.ts

PR conflict previews fetch the base branch through the shared fetch controller (#30654)

2026-10-20 17:14:25 -07:00

client-pr-local-runtime.test.ts

refactor(providers): delete the SSH git and filesystem providers and relay-only wiring (#27644)

2026-10-11 17:48:43 -07:00

client-pr-lookup-coalescing.test.ts

refactor(providers): delete the SSH git and filesystem providers and relay-only wiring (#27644)

2026-10-11 17:48:43 -07:00

client-pr-push-target.test.ts

refactor(providers): delete the SSH git and filesystem providers and relay-only wiring (#27644)

2026-10-11 17:48:43 -07:00

client-pr-state.test.ts

refactor(providers): delete the SSH git and filesystem providers and relay-only wiring (#27644)

2026-10-11 17:48:43 -07:00

client-rate-limit-block.test.ts

refactor(providers): delete the SSH git and filesystem providers and relay-only wiring (#27644)

2026-10-11 17:48:43 -07:00

client-ssh-provider-execution-boundary.test.ts

refactor(providers): delete the SSH git and filesystem providers and relay-only wiring (#27644)

2026-10-11 17:48:43 -07:00

client-stack-merge-guard.test.ts

refactor(providers): delete the SSH git and filesystem providers and relay-only wiring (#27644)

2026-10-11 17:48:43 -07:00

client-starred.test.ts

refactor(providers): delete the SSH git and filesystem providers and relay-only wiring (#27644)

2026-10-11 17:48:43 -07:00

client-test-harness.ts

refactor(providers): delete the SSH git and filesystem providers and relay-only wiring (#27644)

2026-10-11 17:48:43 -07:00

client-test-mocks.ts

fix(git): keep merge-tree's throwaway trees out of the real object store (#22356)

2026-10-15 15:23:18 -07:00

client-tracked-upstream-default-branch.test.ts

refactor(providers): delete the SSH git and filesystem providers and relay-only wiring (#27644)

2026-10-11 17:48:43 -07:00

client-tracked-upstream-fork-owner.test.ts

refactor(providers): delete the SSH git and filesystem providers and relay-only wiring (#27644)

2026-10-11 17:48:43 -07:00

client-tracked-upstream-snapshot.test.ts

refactor(providers): delete the SSH git and filesystem providers and relay-only wiring (#27644)

2026-10-11 17:48:43 -07:00

client-work-item-check-summary.test.ts

test: load GitHub operations from their public modules (#26384)

2026-10-07 21:44:12 -07:00

client-work-items-query-paging.test.ts

test: load GitHub operations from their public modules (#26384)

2026-10-07 21:44:12 -07:00

client-work-items.test.ts

test: load GitHub operations from their public modules (#26384)

2026-10-07 21:44:12 -07:00

client.ts

Keep opened issue details and edits in the selected repository (#24729)

2026-10-03 23:19:55 -07:00

comment-reactions.test.ts

feat(github): add PR comment reactions (#13470)

2026-08-09 22:11:54 -07:00

comment-reactions.ts

refactor(shared): drop the shared/types barrel and import from the real modules (#14447)

2026-08-13 22:48:24 -07:00

conflict-summary-cache.ts

perf(codex): share one launch-prep hook install across a spawn burst (#17669)

2026-08-31 15:16:38 -07:00

conflict-summary.test.ts

PR conflict previews fetch the base branch through the shared fetch controller (#30654)

2026-10-20 17:14:25 -07:00

conflict-summary.ts

PR conflict previews fetch the base branch through the shared fetch controller (#30654)

2026-10-20 17:14:25 -07:00

default-branch-stale-pr.test.ts

refactor(providers): delete the SSH git and filesystem providers and relay-only wiring (#27644)

2026-10-11 17:48:43 -07:00

gh-account-binding-inventory.ts

feat(github): bind projects to a specific gh account (#13664)

2026-09-18 20:39:52 -07:00

gh-account-token.test.ts

Recover failed-job log retrieval onto main (#29180)

2026-10-15 10:36:21 -07:00

gh-account-token.ts

Recover failed-job log retrieval onto main (#29180)

2026-10-15 10:36:21 -07:00

gh-capability-state.test.ts

Recover failed-job log retrieval onto main (#29180)

2026-10-15 10:36:21 -07:00

gh-capability-state.ts

Recover failed-job log retrieval onto main (#29180)

2026-10-15 10:36:21 -07:00

gh-error-classification.ts

Split github client (#15214)

2026-08-17 21:18:44 -07:00

gh-utils-concurrency.test.ts

Fix static analysis page stuck in loading state (#13674)

2026-08-10 23:11:45 -07:00

gh-utils.test.ts

refactor(providers): delete the SSH git and filesystem providers and relay-only wiring (#27644)

2026-10-11 17:48:43 -07:00

gh-utils.ts

Split github client (#15214)

2026-08-17 21:18:44 -07:00

github-api-repository-probe.ts

refactor(providers): delete the SSH git and filesystem providers and relay-only wiring (#27644)

2026-10-11 17:48:43 -07:00

github-api-repository-remote-probe.ts

fix(git): skip upstream remote probes when the remote is absent (#18455)

2026-09-13 20:18:22 -07:00

github-api-repository-validation.test.ts

Keep opened issue details and edits in the selected repository (#24729)

2026-10-03 23:19:55 -07:00

github-api-repository-validation.ts

Keep opened issue details and edits in the selected repository (#24729)

2026-10-03 23:19:55 -07:00

github-api-repository.test.ts

refactor(providers): delete the SSH git and filesystem providers and relay-only wiring (#27644)

2026-10-11 17:48:43 -07:00

github-api-repository.ts

fix(git): skip upstream remote probes when the remote is absent (#18455)

2026-09-13 20:18:22 -07:00

github-enterprise-repository.test.ts

refactor(ssh): group system-ssh transport, ssh config and remote exec into ssh/{system-transport,config,remote-exec}/ (#30355)

2026-10-18 07:26:10 -07:00

github-enterprise-repository.ts

refactor(providers): delete the SSH git and filesystem providers and relay-only wiring (#27644)

2026-10-11 17:48:43 -07:00

github-owner-repo-selection.ts

fix(git): skip upstream remote probes when the remote is absent (#18455)

2026-09-13 20:18:22 -07:00

github-pr-stack-async-merge.ts

refactor(shared): drop the shared/types barrel and import from the real modules (#14447)

2026-08-13 22:48:24 -07:00

github-pr-stack.test.ts

refactor(shared): drop the shared/types barrel and import from the real modules (#14447)

2026-08-13 22:48:24 -07:00

github-pr-stack.ts

refactor(shared): drop the shared/types barrel and import from the real modules (#14447)

2026-08-13 22:48:24 -07:00

github-read-execution-scope.ts

Refresh visible reviews automatically and stop settled merged polling (#25788)

2026-10-06 00:53:49 -07:00

github-remote-identity-parsing.test.ts

The workspace you're on disappearing lands you where a sidebar delete does, whatever removed it (#30428)

2026-10-19 11:56:03 -07:00

github-remote-identity-parsing.ts

fix(github): accept SSH certificate org remotes (org-<id>@github.com) (#30659)

2026-10-19 04:43:32 -07:00

github-repository-host.ts

fix(github): fail closed instead of running client git against a remote repoPath when the SSH provider is unregistered (#14945)

2026-08-17 00:12:14 -07:00

github-repository-identity.fork-owner-repo.test.ts

refactor(providers): delete the SSH git and filesystem providers and relay-only wiring (#27644)

2026-10-11 17:48:43 -07:00

github-repository-identity.gh-account.test.ts

feat(github): bind projects to a specific gh account (#13664)

2026-09-18 20:39:52 -07:00

github-repository-identity.signed-cache.test.ts

refactor(providers): delete the SSH git and filesystem providers and relay-only wiring (#27644)

2026-10-11 17:48:43 -07:00

github-repository-identity.ssh-host-alias.test.ts

refactor(ssh): group system-ssh transport, ssh config and remote exec into ssh/{system-transport,config,remote-exec}/ (#30355)

2026-10-18 07:26:10 -07:00

github-repository-identity.ts

refactor(providers): delete the SSH git and filesystem providers and relay-only wiring (#27644)

2026-10-11 17:48:43 -07:00

github-ssh-host-alias-resolution.ts

refactor(ssh): group system-ssh transport, ssh config and remote exec into ssh/{system-transport,config,remote-exec}/ (#30355)

2026-10-18 07:26:10 -07:00

github-stack-api-responses.ts

feat(github): create stacked pull requests (#13750)

2026-08-11 15:48:57 -07:00

issue-comment.ts

Keep opened issue details and edits in the selected repository (#24729)

2026-10-03 23:19:55 -07:00

issue-create.ts

refactor(integrations): split issue-tracker clients under the max-lines budget (#14704)

2026-08-15 18:17:20 -07:00

issue-field-options.ts

Keep opened issue details and edits in the selected repository (#24729)

2026-10-03 23:19:55 -07:00

issue-mutation-source.test.ts

Keep opened issue details and edits in the selected repository (#24729)

2026-10-03 23:19:55 -07:00

issue-timeline.ts

refactor: split GitHub backend modules (#16194)

2026-08-24 20:46:07 -07:00

issue-update.ts

Keep opened issue details and edits in the selected repository (#24729)

2026-10-03 23:19:55 -07:00

issue-work-item-details.ts

chore: update oxlint and oxfmt (#17150)

2026-08-29 14:13:35 -07:00

issues.test.ts

refactor(integrations): split issue-tracker clients under the max-lines budget (#14704)

2026-08-15 18:17:20 -07:00

issues.ts

refactor(integrations): split issue-tracker clients under the max-lines budget (#14704)

2026-08-15 18:17:20 -07:00

local-git-config-signature.ts

fix(P1-D): bound hosted-review in-flight lookups so a wedged provider cannot pin a branch (#12030)

2026-08-01 22:10:18 -07:00

mappers.ts

refactor(shared): drop the shared/types barrel and import from the real modules (#14447)

2026-08-13 22:48:24 -07:00

merged-pr-commit-membership.ts

refactor(shared): group worktree, github, and linear modules into folders (#14437)

2026-08-13 20:44:16 -07:00

pr-head-tracking-ref.test.ts

feat(ci): ratchet raw repo connectionId host checks; migrate the cheap ones (#31096)

2026-10-20 14:00:32 -07:00

pr-head-tracking-ref.ts

feat(ci): ratchet raw repo connectionId host checks; migrate the cheap ones (#31096)

2026-10-20 14:00:32 -07:00

pr-mutation-review-invalidation.test.ts

refactor(providers): delete the SSH git and filesystem providers and relay-only wiring (#27644)

2026-10-11 17:48:43 -07:00

pr-mutation-review-invalidation.ts

Refresh visible reviews automatically and stop settled merged polling (#25788)

2026-10-06 00:53:49 -07:00

pr-refresh-candidate-policy.ts

Refresh visible reviews automatically and stop settled merged polling (#25788)

2026-10-06 00:53:49 -07:00

pr-refresh-coordinator-active-burst-pacing.test.ts

refactor(tests): split every oversized test file off the max-lines suppression list (#14728)

2026-08-15 00:54:20 -07:00

pr-refresh-coordinator-active-visible-priority.test.ts

refactor(tests): split every oversized test file off the max-lines suppression list (#14728)

2026-08-15 00:54:20 -07:00

pr-refresh-coordinator-alias-coalescing.test.ts

Refresh visible reviews automatically and stop settled merged polling (#25788)

2026-10-06 00:53:49 -07:00

pr-refresh-coordinator-completion-order.test.ts

Refresh visible reviews automatically and stop settled merged polling (#25788)

2026-10-06 00:53:49 -07:00

pr-refresh-coordinator-error-cadence.test.ts

Refresh visible reviews automatically and stop settled merged polling (#25788)

2026-10-06 00:53:49 -07:00

pr-refresh-coordinator-foreground-pacing.test.ts

Refresh visible reviews automatically and stop settled merged polling (#25788)

2026-10-06 00:53:49 -07:00

pr-refresh-coordinator-rate-limit-budget.test.ts

fix(git): stop starting Git in deleted project folders and for removed projects (#28822)

2026-10-18 22:25:27 -07:00

pr-refresh-coordinator-refresh-events.test.ts

fix(checks): show a PR found by Refresh, not "already exists" (#29231)

2026-10-16 21:38:26 +00:00

pr-refresh-coordinator-test-harness.ts

refactor(tests): split every oversized test file off the max-lines suppression list (#14728)

2026-08-15 00:54:20 -07:00

pr-refresh-coordinator-test-mocks.ts

refactor(tests): split every oversized test file off the max-lines suppression list (#14728)

2026-08-15 00:54:20 -07:00

pr-refresh-coordinator-visibility-policy.test.ts

Refresh visible reviews automatically and stop settled merged polling (#25788)

2026-10-06 00:53:49 -07:00

pr-refresh-coordinator-visible-follow-up.test.ts

Refresh visible reviews automatically and stop settled merged polling (#25788)

2026-10-06 00:53:49 -07:00

pr-refresh-coordinator.ts

fix(git): stop starting Git in deleted project folders and for removed projects (#28822)

2026-10-18 22:25:27 -07:00

pr-refresh-error-classification.test.ts

Implement confirm-only PR panel composer with classified error blocking (#9428)

2026-07-19 16:32:36 -07:00

pr-refresh-error-classification.ts

refactor(shared): drop the shared/types barrel and import from the real modules (#14447)

2026-08-13 22:48:24 -07:00

pr-refresh-event-publisher.ts

refactor: split GitHub backend modules (#16194)

2026-08-24 20:46:07 -07:00

pr-refresh-pacing.ts

Refresh visible reviews automatically and stop settled merged polling (#25788)

2026-10-06 00:53:49 -07:00

pr-refresh-queue-drainer.ts

fix(git): stop starting Git in deleted project folders and for removed projects (#28822)

2026-10-18 22:25:27 -07:00

pr-refresh-queue-growth-bound.test.ts

Refresh visible reviews automatically and stop settled merged polling (#25788)

2026-10-06 00:53:49 -07:00

pr-refresh-queue.ts

Refresh visible reviews automatically and stop settled merged polling (#25788)

2026-10-06 00:53:49 -07:00

pr-refresh-rate-limit-gate.ts

refactor: split GitHub backend modules (#16194)

2026-08-24 20:46:07 -07:00

pr-refresh-retry-state.ts

Refresh visible reviews automatically and stop settled merged polling (#25788)

2026-10-06 00:53:49 -07:00

pr-refresh-validation-backoff.test.ts

…

pr-refresh-validation-backoff.ts

Revert "fix(memory): bound OOM-prone accumulators (#10179)" (#10255)

2026-07-23 18:35:31 -07:00

pr-refresh-visibility.ts

Refresh visible reviews automatically and stop settled merged polling (#25788)

2026-10-06 00:53:49 -07:00

pr-review-comment-lines.test.ts

fix(github): count PR diff lines whose added content starts with ++ (#6819)

2026-07-03 17:25:32 -07:00

pr-review-comment-lines.ts

fix(github): count PR diff lines whose added content starts with ++ (#6819)

2026-07-03 17:25:32 -07:00

pr-start-point-compare-base.test.ts

Fix fork PR/MR worktree creation race via durable review-head refs (#10429)

2026-07-24 12:53:18 -07:00

pr-start-point.test.ts

feat(github): bind projects to a specific gh account (#13664)

2026-09-18 20:39:52 -07:00

pr-start-point.ts

feat(github): bind projects to a specific gh account (#13664)

2026-09-18 20:39:52 -07:00

project-view-host-auth.test.ts

fix: accept enterprise managed GitHub owner logins (#20450)

2026-09-16 14:41:15 -07:00

project-view.test.ts

fix: accept enterprise managed GitHub owner logins (#20450)

2026-09-16 14:41:15 -07:00

project-view.ts

Split GitHub project view read path (#17266)

2026-08-29 20:22:10 -07:00

pull-request-file-contents.ts

refactor: split GitHub backend modules (#16194)

2026-08-24 20:46:07 -07:00

pull-request-file-data.ts

refactor: split GitHub backend modules (#16194)

2026-08-24 20:46:07 -07:00

rate-limit.test.ts

fix(github): load PR diffs for Enterprise remotes (#8932)

2026-07-20 18:55:45 -07:00

rate-limit.ts

feat(github): bind projects to a specific gh account (#13664)

2026-09-18 20:39:52 -07:00

review-head-remote.test.ts

perf(git): reuse queries and stop canceled catalog scans (#24923)

2026-10-03 02:54:20 -07:00

review-head-remote.ts

perf(git): reuse queries and stop canceled catalog scans (#24923)

2026-10-03 02:54:20 -07:00

stacked-pr-creation.test.ts

fix(source-control): route hosted reviews by resolved execution host (#18382)

2026-09-03 01:32:46 -07:00

stacked-pr-creation.ts

fix(source-control): route hosted reviews by resolved execution host (#18382)

2026-09-03 01:32:46 -07:00

work-item-details-concurrency.test.ts

Keep opened issue details and edits in the selected repository (#24729)

2026-10-03 23:19:55 -07:00

work-item-details-config-change.test.ts

Extract subprocess handling into @orca/process-host (#26963)

2026-10-09 18:32:28 -07:00

work-item-details-enterprise-host.test.ts

Keep opened issue details and edits in the selected repository (#24729)

2026-10-03 23:19:55 -07:00

work-item-details-file-viewed.test.ts

Keep opened issue details and edits in the selected repository (#24729)

2026-10-03 23:19:55 -07:00

work-item-details-issue-source.test.ts

Keep opened issue details and edits in the selected repository (#24729)

2026-10-03 23:19:55 -07:00

work-item-details-pr-files.test.ts

Keep opened issue details and edits in the selected repository (#24729)

2026-10-03 23:19:55 -07:00

work-item-details-test-lookup.ts

Keep opened issue details and edits in the selected repository (#24729)

2026-10-03 23:19:55 -07:00

work-item-details.test.ts

Keep opened issue details and edits in the selected repository (#24729)

2026-10-03 23:19:55 -07:00

work-item-details.ts

Keep opened issue details and edits in the selected repository (#24729)

2026-10-03 23:19:55 -07:00

work-item-participants.ts

refactor: split GitHub backend modules (#16194)

2026-08-24 20:46:07 -07:00

work-item-search-fallback-environment.test.ts

fix(tasks): preserve repository results under GitHub search quota (#20460)

2026-09-13 15:43:12 -07:00

work-item-search-freshness.test.ts

fix(tasks): preserve repository results under GitHub search quota (#20460)

2026-09-13 15:43:12 -07:00

work-item-search-isolation.test.ts

fix(tasks): preserve repository results under GitHub search quota (#20460)

2026-09-13 15:43:12 -07:00

work-item-search-pagination.test.ts

fix(tasks): preserve repository results under GitHub search quota (#20460)

2026-09-13 15:43:12 -07:00

work-item-search-semantics.test.ts

fix(tasks): preserve repository results under GitHub search quota (#20460)

2026-09-13 15:43:12 -07:00

work-item-search-test-harness.ts

fix(lint): enable anti-slop/no-module-mocking (#20783)

2026-09-15 00:41:17 -07:00