Repository navigation
v1.94.16.0 fix(stamp): declared placeholder restamps are stamps; carry records HEAD's version (GST-1026, GST-1030) - #3892
Merged
Conversation
…kept VERSION claim (GST-979, GST-980) BranchSide carries the positions of the branch-added lines and stampOnlyLine takes the removed line position, so a base line whose text duplicates a branch line keeps the old-version floor. At equal versions only the branch own lines may move. stampOnlyText and stampedFiles accept a kept claim for those lines, and the carry leaves a stamp file out of the product comparison when its only change since the reviewed head is a stamp on the branch own rows and the base did not touch it. Failing-first: all five new tests fail on main fc292e2. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
…e by line at the branch's positions, and keeps its mode) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
…-980) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
…ence already states the carry rule Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
…980 sentence already states the carry rule" This reverts commit f926ccb.
…is a stamp; the carry names HEAD's version (GST-1026, GST-1030) stamp_placeholders (default []) lets a repo declare literals such as TBD that its restamp replaces with the new version inside a stamp_patterns template. stampOnlyLine accepts that move only on a branch line named by position; finish's stampedFiles, the receipt carry and the tree receipt share it. The carried receipt's version is HEAD's, read the way write reads it. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
…s version without a version source; a placeholder fill composes with a stamp move; a bare {version} template and a blank placeholder take no placeholder)
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
|
😎 This pull request was merged. |
…p PR (GST-1030, GBEV-3) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
2 tasks done
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> # Conflicts: # lib/ship-policy.ts
…stamps.ts for the module-size ratchet Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
1.94.0.0 shipped as #3901 without the key, so the released-key test reds once main's CHANGELOG is in the tree. The slot stamp moves the tentative value through stamp_paths. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
…ex so the mode-change carry case holds on Windows Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
2 tasks done
garrytan
added a commit
that referenced
this pull request
Nov 3, 2026
Resolve lib/ship-policy.ts against #3892: keep both POLICY_KEY_INTRODUCED entries (release_gate and stamp_placeholders); main's stamped STAMP_PLACEHOLDERS_KEY_VERSION is kept as is. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
3 tasks done
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.
What changed
stamp_placeholders(default[]). A repo can declare literals such as["TBD"]. On a line the branch added itself, a placeholder inside astamp_patternstemplate (gbrain'ssince: 'TBD') may become the new version, and finish's route, the receipt carry and the tree receipt read that as a stamp. They share one predicate,stampOnlyLinein lib/stamp-only.ts (GST-1026, gbrain #8444).writereads it, instead of copying the old receipt's version after a main merge and a restamp (GST-1030 point 1).Was stacked on #3889 (GST-979/980), which landed as b42ad1e (v1.93.42.0). One rule 19 main merge (1039996) took main's landed text for every #3889 hunk, so this diff against main is now only GST-1026, GST-1030 and GBEV-3.
Why
gbrain's finish refused a receipt whose only change since review was its own restamp of a BEHAVIOR_CHANGES row from
since: 'TBD'tosince: '<version>'. The carry and the tree receipt would have refused the same row. GGST-1 reported that carried receipts showed a stale version.Reproduction (failing tests first)
1.2.4.0when HEAD was1.2.5.0. This PR fixes it.stamp_filesgot RECEIPT_CARRY_PRODUCT_CHANGED) but not on the v1.93.42.0 fix(stamp): name branch lines by position; carry and finish accept a kept VERSION claim (GST-979, GST-980) #3889 base: GST-980's own-row carry already accepts it. This PR adds the test as proof and changes no code for it. An undeclared EVIDENCE.md stays product (tested).versionfield. Fixed in 5923767: the carry compares that package.json at all four sides with onlyversionmasked. The negative control (the pin moved since review) still refuses.Blast radius
Nothing changes for a repo that leaves
stamp_placeholdersunset, including gstack itself. The carry's version change touches every carried receipt. No queue or ready code comparesreceipt.version, and a receipt with no version stays versionless.Security read
No network calls, environment reads, permission changes, workflow, setup or install edits, and no new dependencies.
Pre-Landing Review
Pre-Landing Review: 5 issues: 3 auto-fixed, 0 asked, 0 deferred, 2 noted.
--classes gatetargeted reader, the native adversarial reader and the gpt-6.1-sol outside voice. The first three found nothing. The adversarial reader and the outside voice found three CRITICAL-labelled issues, fixed in one batch in 1b02200, each with a test that fails without the fix:--versionwhen HEAD has no version source; it now keeps that version;{version}template let a placeholder anywhere on a branch line move, and a blank placeholder validated; both are refused now.Gate edits: none detected (8 listed, 2 read; patterns: RH-1,RH-3,RH-4,RH-12,RH-13,RH-14,RH-15,RH-16; unlisted idioms: none)
Review notes (open, below the blocking floor)
bin/gstack-ship-receiptcarry: in a repo whose HEAD has no VERSION, no package.json version, no stamp files and no CHANGELOG,receiptVersionreturnsnone, which replaces a versionwrite --versionrecorded. The new test covers the CHANGELOG-only case.scripts/train-gate.tsstampFreeTextdoes not collapse a declared placeholder. So on a train whose slot is stamped after the gate, a placeholder the slot'srestamp_commandfills gives main a different stamp-free digest, and the backstop dispatches its own gate on main. Exact-tree trains are not affected, and gstack declares no placeholders.lib/pregate/remote-receipt.tsclassifies without a branch side, so a remote pregate receipt does not accept a placeholder restamp. That costs a rerun, not a bypass.bin/gstack-ship-receiptcarry, pin-bump mask (fix-check): a failedgit show, or JSON that is not an object, masks to{}instead of refusing. If the read fails on both sides of a pair, package.json is left out of the rest comparison.Documentation
Scope: I audited 16 selected files on
gst-1026-1030-stamp-placeholders(base 40a3170, head 666efd3), with nothing staged, unstaged or untracked. That covers committed docs, changelog fragments and the lib/bin/test changes that drive the docs. I searched the other docs forstamp_patternsandstamp_placeholdersmentions.Result: The docs already match the code.
docs/ship-policy.mdhas a newstamp_placeholderspolicy-key row (default, limits, behavior, min_gstack_version note). It also has a new receipt-carry row and an updated restamp stage 4 paragraph on position-based branch lines and the kept-VERSION rule.docs/troubleshooting.mdlists the new carry case. Both changelog fragments describe the changes accurately. No edits were made.Debt: None found. The
since: 'TBD'behavior is documented only in the policy-key row, not in the stage 4 prose. That is acceptable, and I'm not treating it as debt.Tests and pregate
--stage tests --remote, us-east-a2) at tree f47b1f7, first run: 10,712 tests with 5 failed, all in files this PR does not touch. They are flaky: rule 16 allows one rerun at the same tree, and all 5 passed:rejects legacy-third(5009 ms) andrejects mutate-index(5058 ms).rejects legacy-thirdalso fails on main 9cc40e0 (5005 ms). This PR touches no docsync file.lib/ship-policy.tsconflict was resolved by keeping both keys, and the scoped carry reviewer called it clean). The mergedlib/ship-policy.tswas 821 lines, over the 800-line ratchet, so 20a525a moves the stamp key validation intolib/ship-policy-stamps.tswith no behavior change (one scoped fix-check: no findings).PREGATE_VERIFY: ok. The VM-only reds from the merged-tree run (red-team, seed-submission, session-runner, docsync) are not in this PR's files; GStack Minder is recording them in the flaky ledger.stamp_placeholdersnamed 1.94.0.0, which shipped as v1.94.0.0 ship: CI is the one full test run (CI carry, tree cache, /ship beside CI) #3901 without the key. Reproduced in-tree after one main merge (082543f of 5f705f3): 19 pass, 1 fail. Fix ef8ed53 movesSTAMP_PLACEHOLDERS_KEY_VERSIONto the next minor, 1.95.0.0; the slot stamp moves it through stamp_paths. Then 70 pass, 0 fail across gstack-ship-policy, module-size-ratchet, tree-receipt-stamp-sensitive and restamp-mentions; typecheck clean. One scoped fix-check (Opus): VERDICT: clean. Pregate at tree 82f90d7 (head ef8ed53) by CI carry: Free Tests 41581032557 (34,603 tests) cleared remote_gate, the same run cleared macOS and 41581032561 cleared windows-smoke; PREGATE_VERIFY: ok.git update-index --chmod=+x), so the case keeps its coverage on Windows: the windows-scoped-tests dispatch 41607849069 ran test/restamp-mentions.test.ts (31 tests, 0 failed), and it passes on Linux. One scoped fix-check (Opus): VERDICT: clean. 13601c0 then returns VERSION, package.json, CHANGELOG and the digest to main f6d6215's values, restores the changelog fragment, and puts the tentative key version back at 1.95.0.0, because the Version Gate refuses a stamped head that isn't a stamp commit. This PR's own diff against main is the reviewed one plus that test hunk. Pregate at tree f3b93f3 (head 13601c0) by CI carry: Free Tests 41609300552 (34,703 tests), macOS from the same run, windows-smoke 41609300594; PREGATE_VERIFY: ok.Approvals
None needed beyond the crew's standing rules (rule 5 spend, rule 22 /ship before READY).