From 5ecc503b4206299c6b3c120b157af58a4e131190 Mon Sep 17 00:00:00 2001 From: garrytan Date: Tue, 3 Nov 2026 02:34:12 +0000 Subject: [PATCH] fix: pre-landing review fixes (proof is a repro on current main or a failing test written first) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> --- captain/SKILL.md | 2 +- captain/SKILL.md.tmpl | 2 +- captain/templates/CREW.md | 4 ++-- capy/skill/gstack/SKILL.md | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/captain/SKILL.md b/captain/SKILL.md index e8e988f11..897b7b312 100644 --- a/captain/SKILL.md +++ b/captain/SKILL.md @@ -375,7 +375,7 @@ New scope taken on part-way gets its own plan. Read-only lanes, the flaky pass's slot stamps, CHANGELOG resolves, cap re-pins under a grant, S1 emergencies (broken install or upgrade, red main, a security bug) and fixes from an already-diagnosed, audited problem list are exempt. Other bug fixes skip plan review (`--kind fix`, R65) but carry a repro -or failing test; features get the lean run (`--kind feature`). The brief a +on current main or a failing test written first; features get the lean run (`--kind feature`). The brief a controller hands a lane, with its `Plan: required | approved | exempt` line, is `captain/templates/brief.md`; the rule is `docs/captain.md` (Plan before build). diff --git a/captain/SKILL.md.tmpl b/captain/SKILL.md.tmpl index 9c5d13804..b234f7d31 100644 --- a/captain/SKILL.md.tmpl +++ b/captain/SKILL.md.tmpl @@ -303,7 +303,7 @@ New scope taken on part-way gets its own plan. Read-only lanes, the flaky pass's slot stamps, CHANGELOG resolves, cap re-pins under a grant, S1 emergencies (broken install or upgrade, red main, a security bug) and fixes from an already-diagnosed, audited problem list are exempt. Other bug fixes skip plan review (`--kind fix`, R65) but carry a repro -or failing test; features get the lean run (`--kind feature`). The brief a +on current main or a failing test written first; features get the lean run (`--kind feature`). The brief a controller hands a lane, with its `Plan: required | approved | exempt` line, is `captain/templates/brief.md`; the rule is `docs/captain.md` (Plan before build). diff --git a/captain/templates/CREW.md b/captain/templates/CREW.md index 1b440fc06..fb6ac2fda 100644 --- a/captain/templates/CREW.md +++ b/captain/templates/CREW.md @@ -136,8 +136,8 @@ Homes are paths in the gstack checkout the lane checked at session start. lanes, the daily flaky pass's repairs, slot stamps, CHANGELOG-only resolves, cap re-pins under a written grant, S1 emergencies (broken install or upgrade, red main, a security bug) and fixes from an already-diagnosed, audited problem list. Any other - bug fix is exempt too (`gstack-autoplan next --kind fix`, R65) and carries a repro or - failing test in the PR; a feature gets the lean run (`--kind feature`). Home: `docs/captain.md` (Plan before build), + bug fix is exempt too (`gstack-autoplan next --kind fix`, R65) and carries a repro on + current main or a failing test written first in the PR; a feature gets the lean run (`--kind feature`). Home: `docs/captain.md` (Plan before build), `captain/templates/brief.md`. ## Crew-specific rules diff --git a/capy/skill/gstack/SKILL.md b/capy/skill/gstack/SKILL.md index a9c56d4d2..9e837424d 100644 --- a/capy/skill/gstack/SKILL.md +++ b/capy/skill/gstack/SKILL.md @@ -58,7 +58,7 @@ Every Capy thread that uses gstack follows these for new work, under a Captain o - **Stop a finished /ship subagent.** When a /ship subagent opens its PR, the parent subscribes to that PR with Capy's subscribe tool and keeps that one subscription until the PR merges or closes, re-subscribing if the watch expires, then cancels it. Once the subscription is in place and READY arrives, the parent stops the subagent and owns the PR from then on, slot stamp, re-READY and receipt carry included. A stopped /ship subagent woken by a check, review or merge notice, not by its parent, reports one line naming what woke it, its pin and the PR head (`gh pr view --json headRefOid --jq .headRefOid`) and ends the turn without acting, whether or not the head moved. A message from its parent is an instruction it carries out. - **No merge without the owner's word.** A thread never merges on its own; under a Captain the controller merges on a recorded standing approval, and a thread with no Captain asks the person. -Exempt from the plan step: read-only work, the daily flaky pass's repairs, slot stamps, CHANGELOG-only resolves, cap re-pins under a written grant, S1 emergencies (a broken install or upgrade, a red main, a security bug) and fixes from an already-diagnosed, audited problem list. Other bug fixes skip plan review (`--kind fix`, R65) but carry a repro or failing test; features get the lean run (`--kind feature`). +Exempt from the plan step: read-only work, the daily flaky pass's repairs, slot stamps, CHANGELOG-only resolves, cap re-pins under a written grant, S1 emergencies (a broken install or upgrade, a red main, a security bug) and fixes from an already-diagnosed, audited problem list. Other bug fixes skip plan review (`--kind fix`, R65) but carry a repro on current main or a failing test written first; features get the lean run (`--kind feature`). ## Working under a Captain