Skip to content

Retry contended path claims during branchless attachment - #3610

Merged
SawyerHood merged 1 commit into
mainfrom
slopcop/issue-3609
Sep 14, 2026
Merged

SawyerHood merged 1 commit into
mainfrom
slopcop/issue-3609

Conversation

@bb-slop-cop

@bb-slop-cop bb-slop-cop Bot commented Sep 13, 2026

Copy link
Copy Markdown
Contributor

🚨 SLOP COP 🚨 · new-issue-autopilot

Human comments

What was wrong

Branchless checkout attachment failed immediately when another preparation held the path claim. That claim remains held until the first thread finishes attaching. Reproduction report.

What changed

Retry branchless claims every 50 ms for up to the existing 15-minute attachment timeout, honoring cancellation. Preserve exclusive claims and immediate refusal of competing branch changes. Report preparation contention accurately.

The environment provisioning change totals 171 text lines (163 additions, 8 deletions) across 3 files. No dependency, generated file, stored-data, public API, or protocol changes.

How you verified

  • The focused real-SQLite regression failed on trusted main in two clean checkouts: expected ready, received error. It passes after the fix and verifies reuse of the same environment.
  • Turbo server environment orchestration tests: 65 passed.
  • Turbo checkout-plugin tests: 34 passed, including cancellation, timeout, and competing branch refusal.
  • Turbo server and plugin typechecks, plugin bundle preparation, and git diff --check passed.
  • Live provider turns and CLI failure rates were not tested.

Fixes #3609

AGENT GENERATED

@SawyerHood
SawyerHood merged commit fda7666 into main Sep 14, 2026
16 checks passed
@SawyerHood
SawyerHood deleted the slopcop/issue-3609 branch September 14, 2026 18:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Concurrent spawns attaching to the same checkout path fail with "Cannot checkout branch" though no branch is requested

1 participant