Repository navigation
fix(release): annotate-shipped passes over a reverted cut instead of reading it as the version commit - #25607
Merged
Conversation
…reading it as the version commit #25605 reverted the unpublished 18.1.0 version commit 74fa3cb, moving the CLI back to 18.0.0. locateLastVersionCommit took that revert as the commit that introduced 18.0.0 and, 18.0.0 being on npm, stamped every changeset the revert restored with "Shipped in 18.0.0": 412 wrong lead lines in the regenerated Version Packages PR #25606. A commit that moves the version back now passes over itself and the reverted cut's span, and the walk reads the forward cut before it. On main that is 06cab48 (18.0.0-next.5 -> 18.0.0), which leaves the same 8 changesets unconsumed that 74fa3cb annotated. Claude-Session: https://claude.ai/code/session_014C7q5Hm34g4EPdirar9SzN Co-authored-by: Claude <noreply@anthropic.com>
objectstack-fleet
Bot
added
the
skip-changeset
os-sales
pushed a commit
that referenced
this pull request
Oct 24, 2026
…-pluvu5 One conflict, in showcase-d3-d4-capabilities.dogfood.test.ts: #25605 loosened the same contrast to the prefix "consulted only for an external member" on the absent record. Kept this branch's side, which grants on a real showcase_project to a staff member of its organization and pins "and the recipient is not one". Main's other incoming change (#25607) is scripts/release-pending-publish.mjs only. Claude-Session: https://claude.ai/code/session_014rFBGqoBLiroi35e82xEa7 Co-authored-by: Claude <noreply@anthropic.com>
This was referenced Oct 24, 2026
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.
Clause-②: no
Metadata-protocol: none
Release fix for 18.1.0. This is the second landing the merge freeze lets through, after #25605.
Defect
#25605 reverted the unpublished 18.1.0 version commit
74fa3cb6d, which movedpackages/cli/package.jsonback to 18.0.0. When the refresh stroke regenerated the Version Packages PR as #25606, the rootversionscript's first step,release-pending-publish.mjs annotate-shipped, went wrong:locateLastVersionCommittook the revert as the commit that introduced 18.0.0.Fix
compareVersionsordersX.Y.ZandX.Y.Z-tag.N. A prerelease sorts before its release, and numeric prerelease ids compare as numbers.findVersionCommit, the release gate'sselect, is unchanged. After the next cut, the head's version (18.1.0) is introduced by a forward commit, so it never meets this case.Evidence
node scripts/release-pending-publish.mjs --self-test: 115 cases across 29 batteries pass. That includes a new battery that builds the 18.1.0 shape: a cut that leaves one changeset unconsumed, then a later cut that consumes everything, is never published, and is reverted. Only the first cut's leak is annotated.main(393769720),annotate-shippedwith this change reads the last version commit as06cab4849a(18.0.0-next.5 → 18.0.0) and annotates 8 changesets. Their adding commits are6b9e6df,7cacad5,950f949,9a06f0b,abd5acd,de9cd1f,df8bb40ande5b3de0, exactly the 8 that74fa3cb6d's own cut annotated.After it lands
The relay's refresh stroke regenerates the Version Packages PR again. Its CHANGELOGs then carry the 8 true "Shipped in 18.0.0" lines and no others.
skip-changeset:scripts/publishes nothing from any released package.🤖 Generated with Claude Code