Repository navigation
chore(quest): adopt the quest merge driver - #6728
Conversation
Quest-Claim: 0ae241c9650ea781
Bump the quest input to moq-dev/quest@42c49e8, which ships `quest resolve`, and run `quest init`: `.gitattributes` routes quest/** through the merge.quest driver, and the skill stubs refresh (new quest-afk, updated quest-recurring description). Deletes the finished quest. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
kixelated
changed the title
|
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 12 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. Comment |
Codex Review SummaryThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
kixelated
left a comment
kixelated
left a comment
There was a problem hiding this comment.
Automated review by review (OpenAI)
Reviewed commit: 2ede2eb
No actionable bugs found in the repository-side integration. The flake source and lock agree on the pinned revision, and merge-driver attribution stays confined to quest files. Adopting the purpose-built driver is preferable to union merging, which could resurrect deleted quest entries.
Verification: static review only. I did not execute the driver, reproduce the merge or run Nix checks. The upstream quest implementation was not reviewed because this automation is scoped to moq-dev/moq.
Finishes
quest/m0/quest-resolve.mdand deletes it.Problem
Concurrent PRs conflict on quest link lists (mostly
quest/m1/README.md's Required list) whenevermaindeletes a finished quest's line next to a line the branch inserts. A replay of 280 merges ofmaininto PR branches found 29 of 128 conflicted merges conflicted only in quest files.Approach
questflake input to kixelated/quest@42c49e8 (currentmain), which includesquest resolvefrom kixelated/quest#219.quest init, which wrote.gitattributes(quest/** merge=quest) and refreshed the skill stubs. Other clones need no setup: anyquestcommand registersmerge.quest.driveronce.gitattributesnames it, and the driver falls back togit merge-filewhenquestis missing or too old.quest/m1/README.md: deleting one Required entry on one side and inserting a new entry right after it on the other gives one conflict undergit merge-file;quest resolvemerges it cleanly (exit 0, no markers, entry placed correctly).Choices made without asking
main, not the add flake.nix, export moq packages, overlay and nixosModule #219 merge commit. It also picks up the newer skills (such as the newquest-afkstub), which "bump the rev to upgrade them" intends.quest-recurringstub.quest initrefuses to overwrite a stub whose text differs from what it generates; only its description changed upstream, so I deleted it and letinitwrite it again.Impact
.gitattributes,questCLI bump, new/quest-afkskill stub.main. That merge now resolves itself.Alternatives
merge=unionwas rejected: it brings back lines for quests thatmaindeleted.Checks
quest check --base origin/main: pass.just check(sequential): obs_compile, js (check + test), markdown, gh, workers, quest, shell, large_files, toml, nix, justfile pass.flakefails locally only while building thegithub-runnerVM image (unshare: write failed /proc/self/uid_map: Operation not permitted, so the agent sandbox blocks user namespaces). The image includes the dev tools, so the quest bump changes its hash and it has to be rebuilt instead of fetched from cache. CI needs to confirm it.Follow-ups
🤖 Generated with Claude Code
(Written by Claude Opus 5.5)