Skip to content

v1.91.282.0 fix(ship-queue): one CHANGELOG rule before and after the merge, base keys stay in slot stamps, a stacked child carries past its released parent - #3518

Merged
capy-ai[bot] merged 11 commits into
mainfrom
gsta129-train-tooling
Oct 27, 2026
Merged

capy-ai[bot] merged 11 commits into
mainfrom
gsta129-train-tooling

Conversation

@garrytan

@garrytan garrytan commented Oct 27, 2026 •

Copy link
Copy Markdown
Owner
{
  "schema_version": 1,
  "pr": 3518,
  "head": "c98f7b1b5aaae6da0eda3c391c5b13dadb927872",
  "version": "1.91.281.0",
  "base": "main",
  "gate": {
    "focused free lanes (bun test --timeout=30000: test/ship-queue-train, changelog-merge-damage, restamp-base-merge, captain-skill, free-fixtures, gstack-restamp-queue, ship-queue-train-logic, gstack-ship-queue)": {
      "pass": 141,
      "fail": 0,
      "skip": 0
    },
    "train files rerun on the final tree c98f7b1b (main 392f50d4 merged in under the second rule-19 grant) (ship-queue-train, ship-queue-train-logic, gstack-ship-queue)": {
      "pass": 84,
      "fail": 0,
      "skip": 0
    },
    "docs tests (troubleshooting-anchors, captain-skill)": {
      "pass": 264,
      "fail": 0,
      "skip": 0
    },
    "typecheck (bun run typecheck)": {
      "pass": 1,
      "fail": 0,
      "skip": 0
    },
    "prose lint (CHANGELOG.md, docs/ship-policy.md, docs/troubleshooting.md, docs/captain.md, slot-call.md)": {
      "pass": 1,
      "fail": 0,
      "skip": 0
    }
  },
  "session_kind": "unattended",
  "issues": {
    "fixes": [],
    "refs": [
      3451,
      3453
    ],
    "flakes": []
  },
  "docs": {
    "status": "updated",
    "scope": "docs/, captain/templates/, README.md, AGENTS.md, CLAUDE.md, CONTRIBUTING.md against the 17-file diff 1f246e35..ada2acce"
  },
  "review_loop": {
    "passes": 4,
    "blocking_found": 0,
    "deferred": 0,
    "noted": 7,
    "fixed": 11,
    "scope": "frozen"
  }
}

What changed

A head the pre-merge verify accepted used to freeze the queue after its squash merge (train 24: a $31 backstop); post-merge now applies the same CHANGELOG rule and confirms the slot.

A head the pre-merge verify accepted used to freeze the queue after its squash merge (train 24: a $31 backstop); post-merge now applies the same CHANGELOG rule and confirms the slot.

Before/after as text: A head the pre-merge verify accepted used to freeze the queue after its squash merge (train 24: a $31 backstop); post-merge now applies the same CHANGELOG rule and confirms the slot.
--- Before · verify-before.txt · captured output
+++ After · verify-after.txt · captured output
 $ gstack-ship-queue verify --pr 2 --train <nonce>   # before the merge
+TRAIN: gate.train-… slot 2/2 #2 pinned e509579c0203
+main: 22cbb2dd7651 = T1 (same modulo stamps (2 stamp file(s)))
+head: 5411c5986733 (T2 with main merged in, same modulo stamps (1 stamp file(s)) except CHANGELOG.md, resolved as main's CHANGELOG.md plus #2's own entry)
+SHIP_RECEIPT: pr=2 head=e509579c0203 version=- base=main (binds the pinned head)
-TRAIN: gate.train-… slot 2/2 #2 pinned d084660ee45e
-main: 70631d62d063 = T1 (same modulo stamps (2 stamp file(s)))
-head: 27287e8bf1d1 (T2 with main merged in, same modulo stamps (1 stamp file(s)) except CHANGELOG.md, resolved as main's CHANGELOG.md plus #2's own entry)
-SHIP_RECEIPT: pr=2 head=d084660ee45e version=- base=main (binds the pinned head)
 VERIFY_TRAIN: #2 may merge as slot 2 of train gate.train-… (green run 101, gstack/full-gate success)
+MERGE_CONDITION: sha=5411c5986733
+NEXT: merge #2 with expected head 5411c5986733 (gstack-restamp stamps at merge), then gstack-ship-queue verify --pr 2 --train gate.train-…
-MERGE_CONDITION: sha=27287e8bf1d1
-NEXT: merge #2 with expected head 27287e8bf1d1 (gstack-restamp stamps at merge), then gstack-ship-queue verify --pr 2 --train gate.train-…
 GSTACK_RESULT: skill=ship-queue status=complete run=…
 
+$ gh pr merge 2 --squash --match-head-commit 5411c5986733
-$ gh pr merge 2 --squash --match-head-commit 27287e8bf1d1
 
 $ gstack-ship-queue verify --pr 2 --train <nonce>   # after the merge
+TRAIN: gate.train-… slot 2/2 #2 pinned e509579c0203
+main: 73f90ec8087a = T2 (same modulo stamps (1 stamp file(s)) except CHANGELOG.md, main 22cbb2dd7651's CHANGELOG.md plus #2's own entry)
+VERIFY_TRAIN: #2 merged; main's tree is T2 of train gate.train-… (2/2 merged)
+NEXT: gstack-ship-queue train prune --train gate.train-…
+GSTACK_RESULT: skill=ship-queue status=complete run=…
-TRAIN: gate.train-… slot 2/2 #2 pinned d084660ee45e
-QUEUE_TRAIN_FROZEN: train gate.train-… merged #1; main 7fe2bef84a5f tree 71cbf064abb2; backstop dispatched run 102 (nonce gate.backstop-…)
-freeze: main 7fe2bef84a5f is neither T1 nor T2 modulo stamps (vs T2: differs: CHANGELOG.md); unmerged #2; repair none admitted
-NEXT: gstack-ship-queue train build --repair --prs <repair-pr>@<sha>
-GSTACK_RESULT: skill=ship-queue status=refused run=…
-gstack-ship-queue verify: main 7fe2bef84a5f is neither T1 nor T2 modulo stamps (vs T2: differs: CHANGELOG.md); the queue is frozen; fix: stop merging; if earlier PRs of the train merged, the queue is frozen (QUEUE_TRAIN_FROZEN); otherwise rebuild the train on current main (QUEUE_TRAIN_TREE_MISMATCH)
 

The slot one-liner refused #3453's CHANGELOG, so the lane hand-resolved it and two wording fixes to the released 1.91.276.0 entry were lost; the merge now carries them as Gate integrity corrections in the child's own entry.

The slot one-liner refused #3453's CHANGELOG, so the lane hand-resolved it and two wording fixes to the released 1.91.276.0 entry were lost; the merge now carries them as Gate integrity corrections in the child's own entry.

Before/after as text: The slot one-liner refused #3453's CHANGELOG, so the lane hand-resolved it and two wording fixes to the released 1.91.276.0 entry were lost; the merge now carries them as Gate integrity corrections in the child's own entry.
--- Before · changelog-before.txt · captured output
+++ After · changelog-after.txt · captured output
 $ git merge --no-ff --no-commit origin/main          # slot 2 of train 24: #3453 after #3434 became 1.91.276.0
 CONFLICT (content): Merge conflict in CHANGELOG.md
 $ bun -e "… mergeChangelogs(s(2), s(3), s(1)) …"       # the slot one-liner from docs/ship-policy.md
+CHANGELOG: carried as a Gate integrity correction: 1.91.276.0: "copies of shared sections twice until a follow-up dedupes them." -> "versions of shared sections beside the shared file (office-hours' copies are deduped in the entry above)."
+CHANGELOG: carried as a Gate integrity correction: 1.91.276.0: "shrinks and 89 size pins go down." -> "loses 3 characters from it and the 89 size pins go down by 3 (plan-ceo-review still grows overall, below)."
+$ grep -n "^## " CHANGELOG.md | head -3
+3:## [Unreleased]
+22:## [1.91.276.0] - 2026-10-27
+72:## [1.91.275.0] - 2026-10-27
+$ sed -n "/^### Gate integrity/,/^## /p" CHANGELOG.md | tail -4
+- Corrections to the shared-preamble entry below: its post-v1.91.260.0 bullet should say the size allowlist carries 31 pin raises from #3433 and #3481 (23 and 8), not 30, and that `alwaysOnTotal` s…
+- Correction to the 1.91.276.0 entry below: "copies of shared sections twice until a follow-up dedupes them." should read "versions of shared sections beside the shared file (office-hours' copies a…
+- Correction to the 1.91.276.0 entry below: "shrinks and 89 size pins go down." should read "loses 3 characters from it and the 89 size pins go down by 3 (plan-ceo-review still grows overall, below…
-CHANGELOG needs a hand merge
-$ echo $?
-1
-# changelogDamage: ours's Unreleased section holds released 1.91.276.0 text ("**Tier 2+ skills load the shared preamble once per session i"); a released heading was dropped or renamed
-# hand resolve: main's CHANGELOG plus #3453's own entry; #3453's two edits to the 1.91.276.0 entry are dropped
 

Why

GSTA-96 (train 24, 2026-10-27) asked: "The rule the pre-merge path applies to CHANGELOG.md must be the same rule the post-merge path applies, and the freeze record must not list a merged PR (#3453) as unmerged." The train merged #3434 and #3453, then froze on #3453's post-merge check and paid a $31 backstop, because the pre-merge verify accepted the lane's CHANGELOG as main's plus the pin's own entry while the post-merge check compared main to T2 section by section. In both slots gstack-restamp also listed lib/ship-policy.ts as a fifth stamp file and moved main's own DOCS_CAPS_KEY_VERSION, and the slot one-liner refused #3453's stacked CHANGELOG so two wording fixes to the released 1.91.276.0 entry were lost. After this PR a merge the pre-merge verify accepted confirms post-merge under the same rule, a freeze lists a slot GitHub reports MERGED as merged, the restamp leaves lines the base added alone, and a stacked child's edits to its released parent become Gate integrity corrections in its own entry (restored here for #3453's two edits).

Blast radius

Four library modules (lib/ship-queue-train-verify.ts, lib/ship-queue-train.ts, lib/changelog-check.ts, lib/restamp.ts) behind gstack-ship-queue verify --train, train build and gstack-restamp, plus the docs and the slot-call template that describe them. The released 1.91.276.0, 1.91.277.0 and 1.91.278.0 CHANGELOG sections stay byte for byte main's (changelogDamage and verify check this; QA probe 005 read the diff against origin/main and found zero removed lines), the real train-24 CHANGELOGs are fixtures under test/fixtures/merge-train-3453/, and every new rule has a test that fails at the base (regression proof below). lib/ship-policy.ts, .gstack/ship-policy.json, the paid gate and its thresholds are untouched. One file beyond the lane's owned list changes by one row: test/helpers/free-fixtures-data.ts registers the new fixtures in the FREE_FIXTURES inventory. The captain/templates/** row this PR had added to scripts/test-pr-profile.ts (with its scripts/harness-version.json pin) landed on main in #3499 first; the merges of main 703b004 (v1.91.280.0) and 392f50d (v1.91.281.0), one merge commit each under GStack Minder's rule-19 grants, CHANGELOG by section with the released entries byte for byte main's, take main's content for both files, so against main they are unchanged. The released 1.91.279.0, 1.91.280.0 and 1.91.281.0 sections are main's as well.

Approvals

No approvals recorded for branch gsta129-train-tooling.

Summary

Train 24 froze a queue the pre-merge verify had already cleared and stamped a file it should not have; this PR makes the train's tooling apply one CHANGELOG rule before and after the merge, keep the base's lines out of a slot stamp, and carry a stacked child past its released parent instead of refusing. Commit themes: the verify and freeze rules (published, freezeQueue, stopped), the restamp stamp_paths provenance rule, mergeChangelogs' carry (carryReleasedParent, mergeChangelogsWithNotes) and mergeStep's carried union, three review-pass fixes, the docs audit's corrections to docs/ship-policy.md and docs/troubleshooting.md, and the HARNESS_VERSION record the remote free tier asked for.

Defect 4 (digest freshness) turned out to be closed already by #3451 (regeneratedAtBase); docs/ship-policy.md now says how an unstamped head changes a release output. The #3514-slot datum: #3514 forked at 1.91.273.0, so 1.91.270.0 was never a tentative candidate for its restamp; GSTA-96's pins forked earlier, which is why the same code moved the key there. The restamp code was not the difference.

Test Coverage

All new code paths have test coverage. Coverage: 87% value-weighted (26 of 30 paths by any test before rating; the three remaining paths were rated ★★★ by the read-only rating dispatch, weak gaps none).

Test value: 13 tests written (2 of them added by the Step 7 coverage dispatch, 2 by the pass-4 freeze-record fix), 0 rejected by the authoring gate, 2 existing tests extended, 0 paths weakly covered.

Regression proof (each fails at the base and passes here; proved by reverse-applying the fix range in a scratch copy during review pass 2): the train-24 post-merge confirm, the MERGED-slot freeze record, the slot-1 GitHub-MERGED freeze and unreadable-state refusal, the stacked child behind another slot (carried union), ownEntryAboveMain's no-own-entry refusal, branchAddedLines' fail-closed base diff, the train-24 mergeChangelogs carry on the real CHANGELOGs, and the restamp base-merge key test for a key older than and equal to the base version, and the freeze record built from stopped()'s one GitHub read (fails at 73a678e with unmerged #1,#2).

Tests ran: focused free lanes 141 (8 files, --timeout=30000, on the final tree c98f7b1, which merges main 392f50d (v1.91.281.0) under GStack Minder's second rule-19 grant after the first screen came back red on an unchanged judge case; train files 84 of those; docs tests 264; bun run typecheck 0 errors; mapping tests 153 (eval-select profile and free-fixtures inventory). Remote free tier: see the receipt's pregate record.

Pre-Landing Review

Pass 1 (six specialists and the Red Team): six INFORMATIONAL findings, five fixed in a2077ff (mergeStep unioned the uncarried child from slot 2 on; stopped() keyed the freeze on t.merged alone; ownEntryAboveMain accepted a CHANGELOG equal to main's; branchAddedLines read a failed base diff as "nothing added"; slot-call.md and docs/captain.md contradicted docs/ship-policy.md on a *_KEY_VERSION stamp file), one noted. Pass 2 (seven reviewers): nothing blocking; five of them independently flagged that stopped() read an unreadable gh pr view as "not merged", fixed in ada2acc as a QUEUE_PROOF_MISSING refusal although it sat below the floor, because the fail-open was in pass 1's own fix. Pass 3: nothing blocking, no edits. Pass 4 (GStack Minder's rule-23 word for one pass beyond the cap, on the range 73a678e..5905c76 that fixes the freezeQueue second read): five specialists, six INFORMATIONAL findings, five fixed in 351cc55 (the reason, docs and CHANGELOG promised a later read of an unreadable slot that no code performs; the unreadable-beside-merged cell had no test), one noted.

REVIEW_LOOP: passes=4 blocking_found=0 deferred=0 noted=7 fixed=11 scope=frozen

Gate edits: none detected (11 listed, 1 read; patterns: RH-1,RH-3,RH-4,RH-12,RH-13,RH-14,RH-15,RH-16; unlisted idioms: none). The one read hunk is an import line in test/changelog-merge-damage.test.ts.

Outside review: unavailable (Codex not installed on this machine), listed as missing coverage. The Claude adversarial pass completed: one FIXABLE (the freezeQueue second read, fixed in 5905c76 on GStack Minder's word) and one INVESTIGATE (a sustained gh outage after a bad slot-1 squash leaves main unfrozen, since verify is the only writer of a freeze and no manual freeze command exists).

Review notes

Below the blocking floor (advisory, informational, test-gap or wording items); recorded here and not fixed in this PR. One pass-3 note was fixed after the loop closed, on GStack Minder's word (it is defect 1's record half): freezeQueue re-read GitHub per unverified slot after stopped() had read it, so a slot that read MERGED and was unreadable a moment later was filed under unmerged; the record is now built from stopped()'s one read, with a test that changes GitHub's answer between two reads. Pass 4 (five specialists on that range, all informational) fixed its own wording in 351cc55: the reason, docs and CHANGELOG said an unreadable slot beside a merged one was kept out of unmerged "until read", but nothing reads it again, so they now say the operator seats it in a train by hand once gh pr view answers, and a test pins that record (merged [1], unmerged []).

  • INFORMATIONAL lib/ship-queue-train-verify.ts:128 freezeQueue recomputes the unverified slots from t.slots instead of the states Map its caller built over the same filter, so the two sets agree by convention; a second caller with a narrower Map would file a missing slot under unmerged

  • INFORMATIONAL lib/changelog-check.ts:303 a child bullet appended at the end of a shared sub-list inside the parent's entry is attributed to the parent as an Addition; a child that edits every block of the parent's entry skips the carry and keeps the duplicated parent text

  • INFORMATIONAL lib/restamp.ts:524 (a) a failed base diff reads as 'nothing added' and moves base lines again; (b) base-added exclusion matches by line text across the file; (c) the gate-ahead and gate callers of mergeChangelogs discard the carry notes

  • INFORMATIONAL [ADVISORY] lib/ship-queue-train.ts:184 own runs carryReleasedParent eagerly on every CHANGELOG step although it is read only when mergeChangelogs returned null (also raised by maintainability)

  • INFORMATIONAL test/restamp-base-merge.test.ts:111 the fail-closed test calls branchAddedLines directly; nothing drives restamp() to show the refusal surfaces as status refused with an untouched worktree

  • INFORMATIONAL lib/ship-queue-train-verify.ts:189 untested cell: slot-1 × stop-moved with the slot MERGED on GitHub but not in t.merged (shares the landed test with the tested tree-mismatch cell)

  • INFORMATIONAL test/ship-queue-train.test.ts:1026 untested cell: unreadable-no-merged × moved-stop (shares stopped() with the covered TREE_MISMATCH cell)

Of the lib/restamp.ts:524 note, part (a) is fixed in a2077ff; parts (b) and (c) stand as noted.

Exploratory QA

Seven probes under .gstack/qa-reports/gsta129-ship (evidence verdict pass): the carry on the real train-24 CHANGELOGs (merged, 2 corrections, released 1.91.276.0 entry unchanged), the no-base case stays null, changelogDamage still refuses the merge-train-3345 dropped heading, the CHANGELOG diff against origin/main removes 0 lines, PROSE_LINT ok, and the restamp base-merge tests. Not run: a live train (no train is building; the fixture trains in test/ship-queue-train.test.ts stand in).

Design Review

No frontend files changed — design review skipped.

Eval Results

No prompt-related files changed — evals skipped (bun run scripts/eval-select.ts prints Profile: pr (dependents) after the two dependency-map rows).

Plan Completion

Plan audit: no item NOT DONE or PARTIAL; defect 4 CHANGED (already closed by #3451, documented instead of re-fixed); the plan's ship, report and trail items were unverifiable at audit time and are done by this PR and the READY.

Issues

Refs #3451
Refs #3453

Documentation

Status: updated — two docs outside the PR's own edits corrected to the shipped behaviour; no blockers.

Scope. Audited the 17-file diff 1f246e3..ada2acc (lib/ship-queue-train.ts, lib/ship-queue-train-verify.ts, lib/changelog-check.ts, lib/restamp.ts, their tests and fixtures) against the docs the PR touched (docs/ship-policy.md § Run a merge train, docs/captain.md § Merge trains, captain/templates/slot-call.md, the CHANGELOG entry) and every other doc naming train, stamp, freeze or CHANGELOG-merge behaviour (docs/troubleshooting.md, captain/SKILL.md.tmpl, docs/recommended-harness.md, docs/pregate.md, docs/unattended.md, docs/review-policy.md, README, CONTRIBUTING, ARCHITECTURE, TESTING_INTERNALS). The PR's own doc changes match the code: the one CHANGELOG rule and its main: line, the stamp files the slot call names, the stacked-child carry and its correction bullets, the GitHub-MERGED freeze record, the QUEUE_PROOF_MISSING refusal, and the base-added *_KEY_VERSION line staying.

Documentation health.

  • docs/ship-policy.md: Updated (§ 2 build excepts the carried stacked child from the released-text conflict; § 5 verify adds the slot-1 GitHub-MERGED freeze and the QUEUE_PROOF_MISSING refusal on an unreadable state; restamp stage 4 states that base-added lines since the fork point stay and that an unrunnable base diff refuses with POLICY_SOURCE_UNAVAILABLE).
  • docs/troubleshooting.md: Updated (QUEUE_TRAIN_TREE_MISMATCH meaning/fix, QUEUE_PROOF_MISSING train use, QUEUE_TRAIN_FROZEN merged list, POLICY_SOURCE_UNAVAILABLE restamp case).
  • docs/captain.md, captain/templates/slot-call.md: Current.
  • CHANGELOG.md: Current (not edited; its ### Docs bullet does not list docs/troubleshooting.md).
  • README.md, CONTRIBUTING.md, AGENTS.md, CLAUDE.md, ARCHITECTURE.md, captain/SKILL.md.tmpl, docs/recommended-harness.md, docs/pregate.md, docs/unattended.md, docs/review-policy.md, docs/TESTING_INTERNALS.md: Current.

Coverage debt. Reference, how-to and explanation coverage exist for the four changed surfaces (post-merge CHANGELOG rule, QUEUE_PROOF_MISSING on unreadable GitHub state, restamp base-added lines, mergeChangelogsWithNotes/carryReleasedParent); none has a tutorial, which is the existing state for all controller tooling. prState export and the FREE_ONLY_PR_FILES/FREE_FIXTURES rows are internal. Diagram drift: none.

Test plan

  • bun --no-env-file --config=/dev/null test test/ship-queue-train.test.ts test/changelog-merge-damage.test.ts test/restamp-base-merge.test.ts test/captain-skill.test.ts test/free-fixtures.test.ts test/gstack-restamp-queue.test.ts test/ship-queue-train-logic.test.ts test/gstack-ship-queue.test.ts --timeout=30000 on the final tree c98f7b1: 141 pass, 0 fail (train files 84 of those)
  • bun --no-env-file --config=/dev/null test test/troubleshooting-anchors.test.ts test/captain-skill.test.ts: 264 pass, 0 fail
  • bun run typecheck: 0 errors; bun run typecheck:test: 819 known diagnostics, none new
  • bun --no-env-file --config=/dev/null bin/gstack-prose-lint CHANGELOG.md docs/ship-policy.md docs/troubleshooting.md docs/captain.md captain/templates/slot-call.md --base origin/main --gate: PROSE_LINT: ok files=5
  • gstack-pregate --stage all --remote --spend-cap 2 --timeout 2700 --allow-repo-commands: run 10 on c98f7b1, remote free tier 11329 tests 0 failed ($0.05), 7 local checks, two requires-remote lanes (macOS named regressions, Windows shard) cleared from the head's own CI runs

🤖 Generated with Claude Code

garrytan and others added 5 commits October 27, 2026 15:20
…-child carry (GSTA-129)

Four train-24 (GSTA-96) defects in one change.

verify --train applies the same CHANGELOG rule before and after the merge:
main's CHANGELOG plus the PR's own lines (its authored diff plus what
mergeChangelogs writes for it). A head the pre-merge verify accepted no longer
freezes the queue after its squash merge, and a freeze record lists a slot
GitHub reports MERGED as merged.

restamp's stamp_paths stage leaves a *_KEY_VERSION line the base introduced
after the fork point alone, base merge committed or staged, and says so.

mergeChangelogs with a base carries a stacked child's edits to its released
parent entry as "Correction to the <version> entry below" bullets under the
child's own Gate integrity section instead of returning null; the slot
one-liner prints each carried correction. #3453's two 1.91.276.0 corrections
are restored that way here.

The digest-freshness defect is already closed by #3451 (regeneratedAtBase);
docs/ship-policy.md now says how an unstamped generator change ships.

Docs: ship-policy § Run a merge train, captain.md § Merge trains and the
slot-call template carry the stamp-files and stacked-child rules.

Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
… no-own-entry refusal, fail-closed base diff (GSTA-129)

Pre-landing review pass 1 (six specialists and the Red Team, all INFORMATIONAL):
- mergeStep unions the carried child from slot 2 on, so a stacked child behind
  another slot never repeats its released parent's text under a second
  [Unreleased] (Red Team, lib/ship-queue-train.ts).
- stopped() freezes the queue when any slot is MERGED on GitHub, so a slot-1
  squash that fails the post-merge check no longer answers "nothing merged"
  (Red Team, lib/ship-queue-train-verify.ts).
- ownEntryAboveMain refuses a CHANGELOG equal to main's: no entry of the PR's own
  (state-machines, lib/changelog-check.ts).
- branchAddedLines refuses when the base diff cannot run instead of reading it as
  "nothing added" (Red Team, lib/restamp.ts).
- slot-call.md and docs/captain.md name the stamp files as the ones the slot
  call names, STAMP_FILES plus a *_KEY_VERSION file the PR introduced, matching
  docs/ship-policy.md (maintainability).

Also: the coverage tests Step 7 added (post-merge parent check, carry shapes),
and two dependency-map rows (test/helpers/free-fixtures-data.ts for the
merge-train-3453 fixtures, scripts/test-pr-profile.ts for captain/templates/**)
so the paid-gate selector and the FREE_FIXTURES inventory accept the new files.

Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
…ever "nothing merged" (GSTA-129)

stopped() read prState's 'unreadable' as "not merged": with nothing in
t.merged, a slot-1 squash already on main while gh pr view failed answered
"nothing of the train merged, so the queue is not frozen". It now refuses with
QUEUE_PROOF_MISSING ("whether #<n> merged on GitHub could not be read, so
whether the queue must freeze is unknown") and asks for the verify to be rerun;
no freeze, no backstop. Raised independently by five pass-2 reviewers.

Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
…shipped train rules (GSTA-129)

The /document-release audit (edit mode) corrected two docs the PR had not
reached: docs/troubleshooting.md's QUEUE_TRAIN_TREE_MISMATCH, QUEUE_PROOF_MISSING,
QUEUE_TRAIN_FROZEN and POLICY_SOURCE_UNAVAILABLE entries, and docs/ship-policy.md's
train build conflict rule (the carried stacked child is the exception), the
verify freeze paragraph (slot-1 GitHub-MERGED freeze, unreadable-state refusal)
and the restamp stamp_paths stage (base-added lines stay; an unrunnable base diff
refuses). Five mid-sentence colons in the PR's own paragraphs are rewritten for
the prose lint, and the CHANGELOG Docs bullet names docs/troubleshooting.md.

Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
…al at version 6 (GSTA-129)

The remote free tier's only red was the HARNESS_VERSION guard: scripts/test-pr-profile.ts is a pinned shared-harness file and gained the captain/templates/** FREE_ONLY_PR_FILES row. Recorded with bump-harness-version.ts --non-behavioral: no paid case reads the crew templates, so no selection, input or verdict changes and no pass-rate series resets.

Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
@trunk-io

trunk-io Bot commented Oct 27, 2026 •

Copy link
Copy Markdown

😎 This pull request was merged.

garrytan and others added 4 commits October 27, 2026 16:55
CI's typecheck:test ratchet refused one new TS2698 (spread of a loosely typed fixture row) in the slot-1 freeze test; the row is read as any, as the neighbouring state writes already do.

Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
…hat decided to freeze

freezeQueue took a second prState read per unverified slot and filed anything
but an exact MERGED under unmerged, so a slot that read MERGED at stopped()
and was unreadable a moment later was recorded as unmerged (the record half of
train 24's #3453 misfile). stopped() now reads each unverified slot once and
passes those states in; a MERGED slot stays merged, and a slot unreadable
beside a merged one is kept out of unmerged and named in the reason. The
fixture's gh shim gains a per-PR vanish count so a test can change GitHub's
answer between two reads.

Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
…ged one

The freeze reason, docs and CHANGELOG said the slot was kept out of unmerged
'until read', but nothing reads it again: the NEXT after the repair is built
from unmerged alone. Say so (the operator seats it in a train by hand once gh
answers) and pin the record shape with a test.

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>

# Conflicts:
#	CHANGELOG.md
#	scripts/harness-version.json
#	scripts/test-pr-profile.ts
@github-actions

github-actions Bot commented Oct 27, 2026 •

Copy link
Copy Markdown
Contributor

E2E Evals: ✅ PASS (flaky: 1 case(s) passed on their one rerun)

[test:paid] VERDICT GREEN — lane gate/pr, attempt 1
  rule 112/112 · behavior 1/1 · judge 24/24 · quarantined 0 (0 failing the lane)
  SKIPPED 0 · INFRA 0 · INCOMPLETE 0 · unattributed 0 · ACTION REQUIRED 0
  wall 6m48s · cost $32.96 known + 32 of 139 trial(s) cost unknown
  FLAKY 1 (failed once, passed on its one rule-16 rerun) · 1 rerun execution(s), cost $0.06

125 executed, 0 reused rule/judge records | 0 manual accepted (unscored; no score-cache credit) | $32.31 rule/judge cost | reconcile exit: 0

Profile: pr / mode dependents; selected behaviors: 113, judges: 24. Deferred to scheduled/release coverage: 142 behaviors and 0 changed prompt files. Deferred checks did not run and receive no PR-pass credit.

Derived dependents (scripts/pr-dependencies.ts):

  • lib/changelog-check.ts: 254 case(s), 24 judge(s)
  • lib/restamp.ts: 254 case(s), 24 judge(s)
  • lib/ship-queue-train-verify.ts: 254 case(s), 24 judge(s)
  • lib/ship-queue-train.ts: 254 case(s), 24 judge(s)
  • test/helpers/ship-queue-train-fixture.ts: 254 case(s), 24 judge(s)
Rule and judge shards
Shard Automated result Manual/unscored Executed Reused Status Cost
e2e-hermetic/skill-e2e-hermetic-canary 2/2 0 2 0 ✅ $0.02
e2e-ship-docsync/skill-e2e-ship-docsync--ship-docsync-completion 1/1 0 1 0 ✅ $0.91
e2e-skillify/skill-e2e-skillify 3/3 0 3 0 ✅ $0.75
e2e-ship-docsync/skill-e2e-ship-docsync--ship-docsync-failure 1/1 0 1 0 ✅ $0.71
e2e/skill-e2e-shared-libs-paths--shared-libs-review-path-eligibility 1/1 0 1 0 ✅ $1.41
e2e-qa-callers/skill-e2e-qa-callers--ship-exploratory-unavailable 1/1 0 1 0 ✅ $0.65
e2e/skill-e2e-plan--plan-review-report 1/1 0 1 0 ✅ $1.21
e2e-retro/skill-e2e-retro 1/1 0 1 0 ✅ $0.34
e2e-qa-functional-fix/skill-e2e-qa-functional-fix 2/2 0 2 0 ✅ $0.98
e2e-review-army/skill-e2e-review-army--review-army-quality-score 1/1 0 1 0 ✅ $0.13
e2e-browse/skill-e2e-bws 6/6 0 6 0 ✅ $0.28
e2e-ship-docsync/skill-e2e-ship-docsync--ship-docsync-missing-asset 1/1 0 1 0 ✅ $0.27
e2e-design/skill-e2e-design--design-review-plugin-handoff 1/1 0 1 0 ✅ $0.14
e2e-design/skill-e2e-design--design-review-detector-shim-dom 1/1 0 1 0 ✅ $0.23
e2e-safety-ship-evidence/skill-e2e-safety-ship-evidence 1/1 0 1 0 ✅ $0.12
e2e-ship-docsync/skill-e2e-ship-docsync--ship-docsync-missing-marker 1/1 0 1 0 ✅ $0.17
e2e/skill-e2e-shared-libs--shared-libs-unsupported-git 1/1 0 1 0 ✅ $0.19
e2e/skill-e2e-ship-skip 1/1 0 1 0 ✅ $0.25
e2e-qa-workflow/skill-e2e-qa-workflow--qa-quick 1/1 0 1 0 ✅ $0.5
e2e-ship-docsync/skill-e2e-ship-docsync--ship-docsync-stale-before 1/1 0 1 0 ✅ $0.39
e2e-review-attribution/skill-e2e-review-attribution 3/3 0 3 0 ✅ $0.29
e2e/skill-e2e-shared-libs-paths--shared-libs-review-prior-coverage 1/1 0 1 0 ✅ $1.02
e2e/skill-e2e-shared-libs--shared-libs-review-lifecycle 1/1 0 1 0 ✅ $0.89
e2e-ship-docsync/skill-e2e-ship-docsync--ship-docsync-late-result 1/1 0 1 0 ✅ $0.34
e2e-deploy/skill-e2e-deploy--benchmark-workflow 1/1 0 1 0 ✅ $0.2
e2e/skill-e2e-investigate-owned-completion 1/1 0 1 0 ✅ $0.07
e2e/skill-e2e-shared-libs-paths--shared-libs-review-index-flags 1/1 0 1 0 ✅ $0.95
e2e-qa-callers/skill-e2e-qa-callers--ship-exploratory-small-cli 1/1 0 1 0 ✅ $0.82
e2e-review-army/skill-e2e-review-army--review-army-perf-n-plus-one 1/1 0 1 0 ✅ $0.24
e2e-qa-functional/skill-e2e-qa-functional 2/2 0 2 0 ✅ $0.82
e2e-cso/skill-e2e-cso 1/1 0 1 0 ✅ $0.4
e2e-qa-callers/skill-e2e-qa-callers--ship-exploratory-late-input 1/1 0 1 0 ✅ $1
e2e-qa-callers/skill-e2e-qa-callers--ship-exploratory-plan-checks 1/1 0 1 0 ✅ $0.76
e2e/skill-e2e-test-value 3/3 0 3 0 ✅ $0.66
e2e-qa-callers/skill-e2e-qa-callers--review-exploratory-small-cli 1/1 0 1 0 ✅ $0.77
e2e-qa-workflow/skill-e2e-qa-workflow--qa-only-no-fix 1/1 0 1 0 ✅ $0.53
e2e-deploy/skill-e2e-deploy--setup-deploy-workflow 1/1 0 1 0 ✅ $0.08
e2e/skill-e2e-coverage-audit 2/2 0 2 0 ✅ $0.24
llm-judge/skill-llm-eval 23/24 0 24 0 ❌ $1.44
e2e-ship-docsync/skill-e2e-ship-docsync--ship-docsync-current 1/1 0 1 0 ✅ $0.87
e2e-learnings/skill-e2e-learnings 1/1 0 1 0 ✅ $0.08
e2e-triage/skill-e2e-triage 1/1 0 1 0 ✅ $0.1
e2e-qa-workflow/skill-e2e-qa-workflow--qa-bootstrap 1/1 0 1 0 ✅ $0.08
e2e-third-party-actions/skill-e2e-third-party-actions 5/5 0 5 0 ✅ $0.4
e2e-design/skill-e2e-design--plan-design-review-no-ui-scope 1/1 0 1 0 ✅ $0.08
e2e-deploy/skill-e2e-deploy--canary-workflow 1/1 0 1 0 ✅ $0.11
e2e/skill-e2e-investigate-owned-termination 2/2 0 2 0 ✅ $0.17
e2e/skill-e2e-ship-hook-consent 2/2 0 2 0 ✅ $0.25
e2e-review-army/skill-e2e-review-army--review-army-delivery-audit 1/1 0 1 0 ✅ $0.14
e2e-ship-docsync/skill-e2e-ship-docsync--ship-docsync-timeout-unsettled 1/1 0 1 0 ✅ $0.21
e2e-session-intelligence/skill-e2e-session-intelligence 4/4 0 4 0 ✅ $0.28
e2e-design/skill-e2e-design--design-review-detector-shim 1/1 0 1 0 ✅ $0.12
e2e-plan-tune/skill-e2e-plan-tune 1/1 0 1 0 ✅ $0.12
e2e-safety-pair-agent/skill-e2e-safety-pair-agent 1/1 0 1 0 ✅ $0.1
e2e-ship-docsync/skill-e2e-ship-docsync--ship-docsync-launch-failure 1/1 0 1 0 ✅ $0.16
e2e/skill-e2e-ship-hook-refresh 1/1 0 1 0 ✅ $0.1
e2e/skill-e2e-shared-libs--shared-libs-read-only 1/1 0 1 0 ✅ $0.28
e2e-docsync-spawned/skill-e2e-docsync-spawned 1/1 0 1 0 ✅ $0.42
e2e-deploy/skill-e2e-deploy--land-and-deploy-first-run 1/1 0 1 0 ✅ $0.33
e2e-deploy/skill-e2e-deploy--land-and-deploy-review-gate 1/1 0 1 0 ✅ $0.22
e2e-review-army/skill-e2e-review-army--review-army-migration-safety 1/1 0 1 0 ✅ $0.3
e2e-ship-docsync/skill-e2e-ship-docsync--ship-docsync-stale-after 1/1 0 1 0 ✅ $0.42
e2e-ship-docsync/skill-e2e-ship-docsync--ship-docsync-store 1/1 0 1 0 ✅ $0.95
e2e-review-army/skill-e2e-review-army--review-army-json-findings 1/1 0 1 0 ✅ $0.07
e2e-safety-codex-consult/skill-e2e-safety-codex-consult 1/1 0 1 0 ✅ $0.27
e2e-deploy/skill-e2e-deploy--land-and-deploy-workflow 1/1 0 1 0 ✅ $0.5
e2e/skill-e2e-workflow 4/4 0 4 0 ✅ $0.91
e2e-failure-routing/skill-e2e-failure-routing 4/4 0 4 0 ✅ $0.42
e2e-ship-docsync/skill-e2e-ship-docsync--ship-docsync-recovery 1/1 0 1 0 ✅ $0.39
e2e-review/skill-e2e-review 2/2 0 2 0 ✅ $0.37
e2e/skill-e2e-shared-libs--shared-libs-review-revalidation 1/1 0 1 0 ✅ $1.92
Fail-closed reconciliation
        50s  test/skill-e2e-third-party-actions.test.ts
  slice 16  passed             27s  test/skill-e2e-plan-tune.test.ts
  slice 16  passed             22s  test/skill-e2e-triage.test.ts
  slice 16  passed             45s  test/skill-e2e-ship-docsync.test.ts#ship-docsync-timeout-unsettled
  slice 16  passed             39s  test/skill-e2e-ask-user-question-format-compliance.test.ts
  slice 16  passed             25s  test/skill-e2e-ship-docsync.test.ts#ship-docsync-launch-failure
  slice 16  passed             28s  test/skill-e2e-session-intelligence.test.ts
  slice 16  passed             34s  test/skill-e2e-ship-hook-consent.test.ts
  slice 16  passed             25s  test/skill-e2e-investigate-owned-termination.test.ts
  slice 16  passed             24s  test/skill-e2e-design.test.ts#design-review-detector-shim
  slice 16  passed             25s  test/skill-e2e-deploy.test.ts#canary-workflow
  slice 16  passed             30s  test/skill-e2e-ship-hook-refresh.test.ts
  slice 16  passed             14s  test/skill-e2e-design.test.ts#plan-design-review-no-ui-scope
  slice 16  passed             29s  test/skill-e2e-review-army.test.ts#review-army-delivery-audit
  slice 16  passed             25s  test/skill-e2e-safety-pair-agent.test.ts
  slice 16  passed             26s  test/skill-e2e-qa-workflow.test.ts#qa-bootstrap
  slice 17  passed             13s  test/skill-e2e-learnings.test.ts
  slice 17  passed             16s  test/skill-e2e-diagram.test.ts
[test:paid] collector final outcomes: 125 executed, 0 reused; 124 passed, 1 failed, 0 manual accepted (unscored; no score-cache credit) (125 attempt records from 71 collectors; every record counts)
[test:paid] deselected testcases, zero credit (316):
[test:paid]    302  sibling case of a case shard (its own shard runs it)
[test:paid]      8  periodic-tier case (this lane runs gate)
[test:paid]      6  Bun hook placeholder of a skipped describe block (not a test)
[test:paid] VERDICT GREEN — lane gate/pr, attempt 1
  rule 112/112 · behavior 1/1 · judge 24/24 · quarantined 0 (0 failing the lane)
  SKIPPED 0 · INFRA 0 · INCOMPLETE 0 · unattributed 0 · ACTION REQUIRED 0
  wall 6m48s · cost $32.96 known + 32 of 139 trial(s) cost unknown
  FLAKY 1 (failed once, passed on its one rule-16 rerun) · 1 rerun execution(s), cost $0.06
[test:paid] flaky (rule 16: failed once, passed on its one rerun; green with this annotation):
  ⚑ benchmark/SKILL.md perf collection  judge  FLAKY: failed in attempt 1 (paid-slice-5-a1), passed on its one rerun in attempt 1 rerun (slice 1 attempt 1); rerun cost $0.06; first failure: assertion: expect(received).toBeGreaterThanOrEqual(expected)
[test:paid] exercised-path map (shadow, non-blocking): 7 MAP_GAP line(s) over 105 executed case(s) with recorded commands
  MAP_GAP document-release bin/gstack-banned-terms: non-blocking for this PR; the next census refresh widens the map (docs/TESTING_INTERNALS.md#exercised-path-map)
  MAP_GAP plan-review-report bin/gstack-plan-reality: non-blocking for this PR; the next census refresh widens the map (docs/TESTING_INTERNALS.md#exercised-path-map)
  MAP_GAP plan-review-report browse/dist/browse: non-blocking for this PR; the next census refresh widens the map (docs/TESTING_INTERNALS.md#exercised-path-map)
  MAP_GAP plan-review-report design/dist/design: non-blocking for this PR; the next census refresh widens the map (docs/TESTING_INTERNALS.md#exercised-path-map)
  MAP_GAP review-gate-integrity browse/dist/browse: non-blocking for this PR; the next census refresh widens the map (docs/TESTING_INTERNALS.md#exercised-path-map)
  MAP_GAP test-audit-report-only design/dist/design: non-blocking for this PR; the next census refresh widens the map (docs/TESTING_INTERNALS.md#exercised-path-map)
  MAP_GAP timeline-event-flow bin/gstack-skill-end: non-blocking for this PR; the next census refresh widens the map (docs/TESTING_INTERNALS.md#exercised-path-map)
[test:paid] report: every planned shard accounted and passed

Sliced lane: planner → duration-packed executors → fail-closed report. Behavior cases run a pre-registered 3-trial panel (PASS at 2/3 with no contract violation); a PASS 2/3 is shown with its failed trial, never as a clean pass. Reused results retain their original provenance and expiry.

Flaky: failed once, passed on its one rerun (rule 16)

⚑ benchmark/SKILL.md perf collection  judge  FLAKY: failed in attempt 1 (paid-slice-5-a1), passed on its one rerun in attempt 1 rerun (slice 1 attempt 1); rerun cost $0.06; first failure: assertion: expect(received).toBeGreaterThanOrEqual(expected)

Each failed and passed on its rerun in run 40575759184 at the attempts named above. Logged for the daily flaky-fix pass in this run's flake-records-a1 artifact (docs/TESTING_INTERNALS.md#flaky-reruns).

Dispatched narrow screen (gstack-ship-queue ready --screen) of merge commit 417c3039dc180f1c1f6d31bc7dd1dd78423c7cfd.

garrytan and others added 2 commits October 27, 2026 19:42
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>

# Conflicts:
#	CHANGELOG.md
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
@github-actions github-actions Bot changed the title fix(ship-queue): one CHANGELOG rule before and after the merge, base keys stay in slot stamps, a stacked child carries past its released parent v1.91.282.0 fix(ship-queue): one CHANGELOG rule before and after the merge, base keys stay in slot stamps, a stacked child carries past its released parent Oct 27, 2026
@capy-ai
capy-ai Bot merged commit 9ccb523 into main Oct 27, 2026
63 checks passed
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