Add relay-fleet serialized merge queue#676
Conversation
|
Warning Review limit reached
More reviews will be available in 9 minutes and 39 seconds. Learn how PR review limits work. Your organization has run out of usage credits. Purchase more in the billing tab. ⌛ How to resolve this issue?After more reviews become available, a review can be triggered using the We recommend that you space out your commits to avoid hitting the rate limit. 🚦 How do rate limits work?CodeRabbit enforces hourly rate limits for each developer per organization. Our paid plans include higher PR review limits than trial, open-source, and free plans. In all cases, reviews become available again over time. During sustained high-volume PR review activity, CodeRabbit may temporarily slow when the next review becomes available. Please see our Fair Usage Limits Policy for further information. ℹ️ Review info⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Pro Run ID: 📒 Files selected for processing (4)
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
|
Local review LGTM. Reviewed Validation:
GitHub Actions |
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: dedf81d332
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| throw new MergeQueueInputError(`fleet manifest does not exist: ${manifestPath}`); | ||
| } | ||
|
|
||
| transitionFleetToMerging(repoRoot, fleetId, options.dryRun); |
There was a problem hiding this comment.
When merge-queue.js is run before every child has reached ready_to_merge, this line persists the fleet as merging before the script checks the child states. A fleet with review_pending or dispatched children then has an empty merge queue and can even return success because those states are not included in operator_attention, but future relay-fleet --review calls will fail trying to transition merging -> reviewing (the fleet state machine only allows merging -> merging|closed). Gate this transition on there being no non-merge-ready/nonterminal children, or report the incomplete children without changing fleet state.
Useful? React with 👍 / 👎.
1 participant
Part of #480. Completes Phase 3 queue orchestration on top of #675.
Summary
skills/relay-fleet/scripts/merge-queue.jsto serialize fleet child merges throughfinalize-run.jssubprocessesmerging, merge children in manifest order, and stop at the first failuremerge_blockedwith a merge_blocked event so recovery is explicit and non-terminalValidation
node --test tests/relay-fleet/scripts/merge-queue.test.jsnode --test tests/relay-fleet/scripts/*.test.jsnode --test tests/relay-merge/scripts/*.test.jsnode --test tests/relay-dispatch/scripts/manifest/*.test.jsnode --test tests/skills-lint/scripts/*.test.jsgit diff --check