fix(captain): align the slot-call BASE merge, freeze repair and severe-race wording across skill, CREW.md and docs; router routes on phrases; receipt head width as printed

Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
This commit is contained in:
garrytanandcapy-ai[bot] committed 2026-10-26 14:51:17 +00:00
1 parent 02ac865411
commit 1bd130fb49
8 files changed
+25 -17

No files matched your search

+4 -3
View File
@@ -373,8 +373,9 @@ the top of the digest needs.
- The controller merges; a lane never merges, enables auto-merge, or uses a merge queue
the controller does not drive. A lane's job ends at an unstamped READY.
- The controller never commits to a lane's branch. It calls slots; the lane stamps.
- Nothing merges outside a train except a one-PR `--urgent` train. Every merge outside a
train costs a backstop gate.
- Nothing merges outside a train; a single PR takes a one-PR `--urgent` train, and a
repair under a freeze takes `train build --repair`. Every merge outside a train costs a
backstop gate.
- The owner's decisions arrive through the controller, in the owner's exact words, and
are recorded before the work they approve starts.
- Paid evidence is read, never rejudged: no thresholds, trial counts, case kinds or
@@ -430,7 +431,7 @@ and adds the lines the tool cannot know. Validate every field before the pin goe
| `ci` | every `REQUIRED_CHECKS` name green at the pin, with counts (`passed=… failed=0 pending=0`) | a pending or failed required check, or a run on another head |
| `PREGATE` | `pass` for the pin's tree, remote lanes cleared with that head's own CI runs | `incomplete`, or a pass for another tree |
| `gate` | the paid evidence the lane offers: its own focused cases (named, with results), or the screen it asks for | "ran the cheap tier" offered as merge evidence |
| `SHIP_RECEIPT` | `pr=<n> head=<pin>` written by /ship at the pin | `none`, or a receipt head that is not the pin |
| `SHIP_RECEIPT` | `pr=<n> head=<pin's first 12>` written by /ship at the pin | `none`, `invalid`, or a receipt head that is not the pin |
| `screen` | `--no-screen` with the focused cases that passed, or `--screen` with the reason | no choice, or `--no-screen` with no cases named |
| `READY_RECEIPT` | the receipt path the tool wrote (local and on the notes ref) | missing |
| flaky cases | each one already in the ledger, with both runs | a rerun that is not logged, or a second failure called a flake |
+4 -3
View File
@@ -51,8 +51,9 @@ the top of the digest needs.
- The controller merges; a lane never merges, enables auto-merge, or uses a merge queue
the controller does not drive. A lane's job ends at an unstamped READY.
- The controller never commits to a lane's branch. It calls slots; the lane stamps.
- Nothing merges outside a train except a one-PR `--urgent` train. Every merge outside a
train costs a backstop gate.
- Nothing merges outside a train; a single PR takes a one-PR `--urgent` train, and a
repair under a freeze takes `train build --repair`. Every merge outside a train costs a
backstop gate.
- The owner's decisions arrive through the controller, in the owner's exact words, and
are recorded before the work they approve starts.
- Paid evidence is read, never rejudged: no thresholds, trial counts, case kinds or
@@ -108,7 +109,7 @@ and adds the lines the tool cannot know. Validate every field before the pin goe
| `ci` | every `REQUIRED_CHECKS` name green at the pin, with counts (`passed=… failed=0 pending=0`) | a pending or failed required check, or a run on another head |
| `PREGATE` | `pass` for the pin's tree, remote lanes cleared with that head's own CI runs | `incomplete`, or a pass for another tree |
| `gate` | the paid evidence the lane offers: its own focused cases (named, with results), or the screen it asks for | "ran the cheap tier" offered as merge evidence |
| `SHIP_RECEIPT` | `pr=<n> head=<pin>` written by /ship at the pin | `none`, or a receipt head that is not the pin |
| `SHIP_RECEIPT` | `pr=<n> head=<pin's first 12>` written by /ship at the pin | `none`, `invalid`, or a receipt head that is not the pin |
| `screen` | `--no-screen` with the focused cases that passed, or `--screen` with the reason | no choice, or `--no-screen` with no cases named |
| `READY_RECEIPT` | the receipt path the tool wrote (local and on the notes ref) | missing |
| flaky cases | each one already in the ledger, with both runs | a rerun that is not logged, or a second failure called a flake |
+2 -1
View File
@@ -69,7 +69,8 @@ Parameters: `REPO=<owner/name>` · `BASE=<main>` · `REQUIRED_CHECKS=<check name
scratch worktree; version files take `BASE`'s side and the CHANGELOG merges by
section, so a stale branch or a CHANGELOG-only conflict is not your problem. Merge
`BASE` only when the controller tells you `train build` refused your PR on real
code. Then merge (never rebase), run the free suite, and READY again.
code (then merge, never rebase, run the free suite, and READY again) or as part of
the stamp commit at your slot call (rule 6).
15. **CHANGELOG entry under `## [Unreleased]` before READY.** Leave the version files at
`BASE`'s version; the stamp at your slot moves the entry under the allocated version.
+1 -1
View File
@@ -12,7 +12,7 @@ Written by the lane when it finishes. The controller reads this before chat.
|---|---|---|---|---|
| #<n> | <sha40> | <unstamped or vX> | <passed=… failed=0 pending=0> | <nonce slot i, or waiting> |
READY block sent: <yes, date> · SHIP_RECEIPT: pr=<n> head=<sha40> · screen: <choice and why>
READY block sent: <yes, date> · SHIP_RECEIPT: pr=<n> head=<sha12 of the pin, as the tool prints it> · screen: <choice and why>
## Needs