Repository navigation
feat(land): rebuild a conflicted lockfile from the base's copy - #410
Merged
Merged
Conversation
Quest-Claim: ca26a9bbdb6a0e36
The fixer's only lockfile rule was "regenerate lockfiles", with no side to start from, so a fixer merge on moq-dev/moq#7318 rebuilt bun.lock from the PR and reverted the base's advisory fix. The prompt now gives a Lockfiles procedure: take the base's copy, run the package manager's minimal resolve against the merged manifests, reapply the PR's own lockfile-only bumps with a pinned update, check every change traces to the PR, and hand back when it cannot. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
kixelated
changed the title
kixelated
marked this pull request as ready for review
November 3, 2026 03:01
|
Warning Review limit reachedYou've used all free OSS reviews for now. Wait for the free limit to reset to keep reviewing this public repository. Next included review available in 59 minutes. View limit details
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. CodeRabbit Verify
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Completes quest/m0/land-fixer/lockfile.md.
Summary
The fixer's only lockfile rule was "regenerate lockfiles/generated files", which didn't say which side to start from. On moq-dev/moq#7318 a fixer merge rebuilt
bun.lockfrom the PR's side and reverted moq-dev/moq#7443's glob/minimatch advisory fix.assets/land-fix.mdgets a## Lockfilessection, linked from the allowed-fixes list. When merging the base leaves a lockfile conflicted or stale, the fixer:git checkout base -- <lockfile>;bun install,cargo update --workspaceor a build,uv lock,go mod tidy), and nevercargo generate-lockfile,bun update,uv lock --upgradeor a barecargo update;The reason names the rebuilt lockfiles. The fixer hands back, quoting the output or diff, when the rebuild fails, a change doesn't trace to the PR, or the two sides' versions disagree (for example, the PR pins below the base's security bump).
flake.lockstays protected. Now that moq-dev/quest#409 lets the fixer make a protected edit and hands it back as a ready commit, the section says such an edit toflake.lockfollows the same rule: rebuild it from the base's copy, withnix flake lockas the minimal resolve. This is what the quest's Plan on main asks for.test/land.test.tsasserts the new prompt wording and checks that the old "regenerate lockfiles" rule is gone.Deletes the quest. The epic README now records where the decision landed. The m0 listing drops "lockfile merges", and also "protected edits as ready commits", which feat(land): hand back a fixer's protected edit as a ready commit #409 finished.
Choices made without asking
cargo update -p. Step 4 reapplies it with a pinned update. If the base also moved that package, the base's version wins when it is at or past the PR's; otherwise the fixer hands back.## Flaky testssection follows## Lockfiles.Review
quest review --base origin/main --branch quest/m0/land-fixer/lockfile, round 1 of a new session)origin/main(d7ef15e) resolving conflicts with moq-dev/quest#409 and moq-dev/quest#406 inassets/land-fix.mdandquest/m0/land-fixer/README.md, plus a modify/delete conflict on the quest file, which stays deleted. The resolution also rewords theflake.lockline and drops the stale m0 listing phrase (see Summary), and adds a test assertion for the new wording. Since that changes the diff, the head was reviewed again rather than exempted.Earlier rounds (Codex, gpt-6.1-sol, medium) covered e24581a and 08b8fa2, with no findings either time.
Local checks on 2f136d4:
just checkandjust testpass (995 passed, 2 skipped; 505 passed).quest check --base origin/mainis OK.Follow-ups
None.
🤖 Generated with Claude Code
(Written by Claude Opus 5.5)