From 0a29520fc6baba77681fb87723ca323fcb6b6270 Mon Sep 17 00:00:00 2001 From: garrytan Date: Sat, 31 Oct 2026 22:49:10 +0000 Subject: [PATCH] captain: keep the skill generic and under its context budget (wave paragraph trimmed) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> --- captain/SKILL.md | 10 ++++------ captain/SKILL.md.tmpl | 10 ++++------ docs/captain.md | 2 +- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/captain/SKILL.md b/captain/SKILL.md index 337d2fe20..3299ad4d7 100644 --- a/captain/SKILL.md +++ b/captain/SKILL.md @@ -423,12 +423,10 @@ Lesson into a rule in the rules file, a line in the standing-rules file append-only and timestamped (`captain/templates/NOTES.md`); the digest is derived from it. Serial slots cost tens of minutes each, so PRs in one area travel together. When more -than `WAVE_TRIGGER` (6) PRs are READY, run `gstack-ship-queue wave plan`: it prints -`WAVE_ADVISED` and area groups of 3 to 6 with an integrator each. The integrator runs -`wave build`, /ship once and READY on the wave PR, which takes one slot and one version; -constituent heads freeze, fixes go through the integrator, `--drop` sends a changed one -back to its owner, and `wave settle` closes the rest with a link after the merge -(docs/ship-policy.md#wave-prs). While the queue stays long, plan new work as area waves. +than `WAVE_TRIGGER` (6) PRs are READY, run `gstack-ship-queue wave plan` for area groups +of 3 to 6, each with an integrator who runs `wave build`, /ship once and READY on the wave +PR: one slot, one version. Constituent heads freeze, `--drop` sends a changed one back to +its owner, and `wave settle` closes the rest after the merge (docs/ship-policy.md#wave-prs). Credit every contributor (`Contributed by @handle`, `Co-authored-by`), and never merge a contributor's PR directly from its fork. diff --git a/captain/SKILL.md.tmpl b/captain/SKILL.md.tmpl index 9958a9727..1a5fb0e40 100644 --- a/captain/SKILL.md.tmpl +++ b/captain/SKILL.md.tmpl @@ -351,12 +351,10 @@ Lesson into a rule in the rules file, a line in the standing-rules file append-only and timestamped (`captain/templates/NOTES.md`); the digest is derived from it. Serial slots cost tens of minutes each, so PRs in one area travel together. When more -than `WAVE_TRIGGER` (6) PRs are READY, run `gstack-ship-queue wave plan`: it prints -`WAVE_ADVISED` and area groups of 3 to 6 with an integrator each. The integrator runs -`wave build`, /ship once and READY on the wave PR, which takes one slot and one version; -constituent heads freeze, fixes go through the integrator, `--drop` sends a changed one -back to its owner, and `wave settle` closes the rest with a link after the merge -(docs/ship-policy.md#wave-prs). While the queue stays long, plan new work as area waves. +than `WAVE_TRIGGER` (6) PRs are READY, run `gstack-ship-queue wave plan` for area groups +of 3 to 6, each with an integrator who runs `wave build`, /ship once and READY on the wave +PR: one slot, one version. Constituent heads freeze, `--drop` sends a changed one back to +its owner, and `wave settle` closes the rest after the merge (docs/ship-policy.md#wave-prs). Credit every contributor (`Contributed by @handle`, `Co-authored-by`), and never merge a contributor's PR directly from its fork. diff --git a/docs/captain.md b/docs/captain.md index 7aab2f79f..7ae2dba59 100644 --- a/docs/captain.md +++ b/docs/captain.md @@ -299,7 +299,7 @@ anything else goes to a repair lane. An infra-only census earns one re-dispatch. backstop gate runs on every push to the base branch and freezes the queue when it finds a tree no green train covered; one repair PR at its exact head clears the freeze. -**Wave PRs when the queue is long (Garry's R46, 2026-10-31).** Every slot pays its own +**Wave PRs when the queue is long.** Every slot pays its own stamp, its own round of required checks and its own version, one after another. When more than 6 PRs are READY, `gstack-ship-queue wave plan` prints `WAVE_ADVISED` and suggested area groups of 3 to 6 (`train build` prints the same line when handed more than 6 pins). The