Skip to content

fix(release): drop nine changelog fragments a stacked merge re-added after release - #11141

Merged
kyle-sexton merged 2 commits into
mainfrom
fix/release-stale-fragments
Oct 30, 2026
Merged

kyle-sexton merged 2 commits into
mainfrom
fix/release-stale-fragments

Conversation

@kyle-sexton

Copy link
Copy Markdown
Member

Refs: #11112

Summary

Release PR #11112 fails check-plugins -> changelog-parity-bump with REPEATED CHANGELOG BODY in eight plugins: architecture, code-tidying, corrections, coupling, harness-config, improvement, review and session-flow. It releases nine docs-7537-b-move-* fragments a second time. Release #11088 (4f1bccff20) already consumed and deleted them. The ninth fragment is planning's. Planning's new entry repeats a bullet that shipped in 0.126.5, but the check misses it because 0.126.5 also has a ### Fixed section.

Fix

This PR deletes the nine stale fragments. It changes no release code: the release cleanup deleted every fragment it consumed (git show --name-status 4f1bccff20).

How they came back: #11062 is a stacked layer of the #7537 split.

  • Its branch carried the fragments from the lower layer's commit 713121026e.
  • Its merge of main, f87335dd0b, has merge base 9b6151ae38. That base predates both the fragments' add on main (#11056, 2de0fb5e42) and their deletion (4f1bccff20).
  • Main showed no net change to those paths, so the three-way merge kept the branch's copies, and the squash 5b2ca68e19 re-added them.
  • These nine fragments are the only files that merge brought back.

Verification

  • scripts/check-changelog-parity.sh --check-bump origin/main passes on this branch.
  • I ran scripts/release-plugins.sh --date 2026-10-30 on this branch's tree and committed the result. On that commit, CHANGELOG_HEAD_REF=release/plugins scripts/check-changelog-parity.sh --check-bump <this branch> reports that every changed version has its entry, with exit 0. The simulated release bumps only autonomy, guardrails, prototype, review (from fix-security-lane-s10-bar), work-items and the pr-pipeline convention.
  • scripts/check-affected.sh: 7 passed, 8 skipped.

Related

  • #11112 does not rebuild on this merge's push. The push run defers the rebuild (.github/scripts/release-publish-plugins/decide-rebuild.sh:28-31), and the next scheduled run, 41 */3 * * *, rebuilds it. A workflow_dispatch with action: build rebuilds it sooner.
  • Squash merges let a stacked branch bring back any file a lower layer added and main later deleted. A guard in check-changelog-fragments.sh that rejects a fragment path a release commit already deleted would catch this case.

🤖 Generated with Claude Code

kyle-sexton and others added 2 commits October 29, 2026 22:52
Nine docs-7537-b-move fragments were consumed and deleted by the release
commit 4f1bccf (#11088), then re-added by the squash of #11062: its
stacked branch kept them from layer commit 7131210, and its merge of main
(f87335d, merge base 9b6151a) predated their add and delete on main, so
the merge kept the branch's copies. Release PR #11112 then released them a
second time, and changelog-parity-bump failed with REPEATED CHANGELOG BODY in
eight plugins; planning repeats the same bullet without tripping the check.

Refs: #11112

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@kyle-sexton
kyle-sexton marked this pull request as ready for review October 30, 2026 04:13
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 30, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-30T04:14:41.762904Z 6d02388 Draft marked ready
ℹ️ 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" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@github-actions

Copy link
Copy Markdown
Contributor

claude-review reviewed 6d023880b14d5d2a446cfdcac9c01b472f0dc9ad: 0 finding(s), 0 as inline comments.

No findings. The diff only deletes nine .changes/<plugin>/docs-7537-b-move-*.md fragments, with identical content, and touches no code or trusted path.

What I checked myself:

  • Each of the nine plugins named in the fragments (architecture, code-tidying, corrections, coupling, harness-config, improvement, planning, review, session-flow) already has the fragment's text, "Synced contract copies name their canonical source", in its CHANGELOG.md. Deleting the fragments therefore removes a duplicate release entry and drops no unreleased change.
  • No docs-7537-b-move-* fragment is left under .changes/ in the head tree.

Author-claimed and not verified by me: the history of #11062, #11088 and #11056, the check-changelog-parity.sh result, the simulated release, and the check-affected.sh result. I had no shell, so I ran none of these.

The PR states no closing issue, only Refs: #11112, so there are no acceptance criteria to check. There are no plugin manifest changes. I found no hold-class change and no cost impact.

@github-actions

Copy link
Copy Markdown
Contributor

claude-security-review reviewed 6d023880b14d5d2a446cfdcac9c01b472f0dc9ad: 0 finding(s), 0 as inline comments.

No security issues found.

The diff deletes nine .changes/<plugin>/docs-7537-b-move-*.md changelog fragments. Each is a bump: patch file with one ### Changed bullet. It changes no code, workflow, trusted-path file, plugin manifest (plugin.json or marketplace.json) or instruction surface.

  • Trusted paths: none of the nine files matches a trusted-path glob.
  • Instruction surface: the deleted text is release-note prose, not a standing instruction. I did not need to consult the instruction exception register.
  • Manifests: the diff touches no manifest, so no manifest <field> lines apply.
  • PR context: the description contains no embedded instructions aimed at this lane.

critical-findings: 0

@kyle-sexton
kyle-sexton added this pull request to the merge queue Oct 30, 2026
Merged via the queue into main with commit 40df610 Oct 30, 2026
76 checks passed
@kyle-sexton
kyle-sexton deleted the fix/release-stale-fragments branch October 30, 2026 04:55
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.

1 participant