Repository navigation
fix: preserve version planning after verified integration merges - #79
Conversation
📝 Summary
Merge Risk:
 |
| Check name | Status | Explanation |
|---|---|---|
| Title check |  |
The title clearly and concisely describes the main change: preserving version planning after verified integration merges. |
| Description check | |
The description directly explains the nested integration merge issue, the resolver behavior, preserved refusal cases, and validation results. It is fully related to the changeset. |
| Docstring Coverage | |
Docstring coverage is 80.00% which is sufficient. The required threshold is 80.00%. Docstring coverage is scoped to functions touched by this diff with cyclomatic complexity of at least 2. Documentati… |
| Linked Issues check | |
Check skipped because no linked issues were found for this pull request. |
| Out of Scope Changes check | |
Check skipped because no linked issues were found for this pull request. |
Full details: Docstring Coverage
-
Explanation
Docstring coverage is 80.00% which is sufficient. The required threshold is 80.00%. Docstring coverage is scoped to functions touched by this diff with cyclomatic complexity of at least 2. Documentation-only edits and deletions within surviving functions are included; unchanged diff context and fully deleted functions are excluded. Analyzed 5 functions across 4 files. (2 skipped: 2 unsupported.)
Finishing Touches
-
📝 Generate docstrings
-
- Commit to this branch
- Create a new PR
🧪 Generate unit tests (beta)
-
- Commit to this branch
- Create a new PR
-
- Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts
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.
A rabbit checks the merge-side trail,
And leaves the integrator off the tale.
If proof is missing, plans must wait,
If proof is clear, no link need state.
The fragment keeps its words in view,
And hops along with provenance true.
Comment @coderabbitai help to get the list of available commands.
Changelog✅ Contribution check passed. Head: Base: Contribution: 1 new valid fragment(s). Policy: ordinary.
|
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. |
Code Coverage Report: Only Changed Files listed
Minimum allowed coverage is |
|
@codex review |
|
Codex Review: Didn't find any major issues. Delightful! Reviewed commit: ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
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". |
🛡️ Codex Security Review · Automatically triggeredSecurity review completed. No security issues were found in this pull request. Reviewed commit: Only the user who started this review can view the report in Codex. ℹ️ About Codex security reviews in GitHubThis is an experimental Codex feature. Security reviews are triggered when:
Once complete, Codex will leave suggestions, or a comment if no findings are found. |
After squash-merging a PR that contains nested integration merges, version preparation refused the entire transaction when the original PR head proved that a fragment came unchanged from a merge side parent. The post-merge Changelog run 40975395070 hit this case for
.changelog/acquire-verified-squash-pr-head.mdin PR #78. It used runtime/basead36660a95affb7ee7444e9009f4b98f8bea21f3; major-channel updates were not involved.The resolver now excludes only a fully verified candidate whose direct-origin check returns false. It leaves the fragment without an inferred PR link if none qualify, while still considering other qualified candidates. Missing original-head origin, origin outside the complete PR commit delta, repository/merge/blob disagreement, API/Git errors and multiple qualifying PRs continue to refuse. No explicit fragment metadata or reference policy is bypassed.
A read-only replay against the same source base now returns a
0.5.0dry-run plan with no diagnostics. The replay HTTP adapter rejects remote mutations; no version PR, release or channel was created. This prepares a fix for review, not a deployment or a live workflow rerun.Validation
composer --no-plugins checkpassed: 2851 unit tests and 100% executable line coverage (6254/6254).No workflow contract, channel rule, credentials, existing managed branch or published history changed. Packaging was not rerun: no packaged resources or dependency contract changed. Hosted checks at final head
8b9a8c64a91ec598549774f48c84f9b82897d768: 22 passed, zero failed; the automatic CodeRabbit review is still pending at this checkpoint. No review approval is inferred.Separate consumer check: Framework run
40976292702used runtime203db95e68fc974e95ba1a921f08d01f88851be1at source6f6743f6aba53d4944495a3faf1ae9ca99336283; Docker failed while fetching the Alpine APK index over TLS, before the version CLI ran. Isolated read-only replays with that old runtime and this provider fix both produce the same1.5.4plan. This PR does not change Framework or retry that run.