mirror of
https://github.com/garrytan/gstack.git
synced 2026-11-18 14:14:37 +01:00
Run each driven /ship phase as one command, count its calls, and stop it at 100 minutes (GST-2984) (#4451)
A driven /ship now runs each ship/DRIVER.md phase as one command, shows how many calls the run made, and stops itself with a printed line at 100 minutes. Why: measured /ship runs made 121 to 308 calls where the driver plans 9 to 12, and 10 of 12 ran past the 100-minute stop while those limits were only prose. Nothing to do: older ship records without `calls=` still validate and print. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> Review-Finding: p1/outside-voice#1 reader=outside-voice
This commit is contained in:
1 parent
9c6e0a0f85
commit
0ee5914628
19 files changed
+807
-49
No files matched your search
+17
-17
@@ -7,16 +7,16 @@ Read this, not `ship/SKILL.md`, when a parent agent runs /ship
|
||||
the `GSTACK_LAUNCH` assignments your installer printed (`. <its GSTACK_LAUNCH_FILE>`), never
|
||||
`export $(...)`, `env`, `printenv` or a bare `set` in a tool fence.
|
||||
|
||||
**Rules.** Each phase below is one call: one program (Capy: execute; else a script)
|
||||
that runs the bins, reads, dispatches and waits, returning only result lines and reader
|
||||
outputs verbatim. The model keeps only lead judgment, fixes, CHANGELOG, PR prose,
|
||||
**Rules.** Each phase below is one call: `gstack-ship-phase run --dir <run dir> --phase <n> --record <rec> -- <cmds>`
|
||||
runs its bins, reads, dispatches and waits, returning only result lines and reader
|
||||
outputs verbatim. The model keeps only judgment, fixes, CHANGELOG, PR prose,
|
||||
gates, the report. `STOP:` (exit 3) means nothing after it ran; `NEXT:` names
|
||||
the next act. Read a section only when a phase or the list below sends you, never
|
||||
up front. A STOP or decision this file does not cover: read `ship/SKILL.md` at that step, finish there,
|
||||
come back. Unattended, take a question's recommended option (log it); gate
|
||||
dispositions and approvals stay pending and end the run, except `gstack-no-stop`. Keep a record (`--record`): write its six headings at Phase 1, fill each per phase: **Checks**
|
||||
(Phases 2-4: lanes, pregate, evals, `Coverage:`, the plan checks, `Exploratory QA:`, `Scope Check:`), **Decisions** (any
|
||||
phase: each answered or auto-taken question, verbatim), **Reviews** (Phases 3-5: the plan line,
|
||||
phase: questions and answers, verbatim), **Reviews** (Phases 3-5: the plan line,
|
||||
start tokens, `Pre-Landing Review:`, `Gate edits:`, the reviewed tree), **Release** (Phases 5-7:
|
||||
version, CHANGELOG, commits), **Documentation** (Step 14.5) and **Next steps** (every phase: the next act).
|
||||
|
||||
@@ -27,18 +27,18 @@ file, unchanged; its findings reach `merged.jsonl` only via `collect`; `judge` r
|
||||
14.5 once; findings go to the PR body.
|
||||
|
||||
**Calls.** One pass with no fixes is 9 calls: Phases 1-8 and the report; at most 12 with a STOP's
|
||||
section read or fix-check, plus a keep-alive per 200 s waited.
|
||||
section read or fix-check, plus a keep-alive per 200 s waited under ~80 min (longer: end the turn on one wait; no 10-15 min polls).
|
||||
|
||||
**Budget: observe.** `gstack-ship-budget start --mode observe` records, never admits: each program ends
|
||||
with `gstack-ship-budget note --step <last step> --reading R --credits C --record <rec>`, R and C read in that program
|
||||
**Budget: observe.** `gstack-ship-budget start --mode observe` only records: each program ends
|
||||
with `gstack-ship-budget note --step <last step> --reading R --credits C --record <rec>`, R and C read in it
|
||||
(Capy: `cost.tokens`, `cost.credits`). No check per step, no reservation, no meter-only
|
||||
call, no handoff; under `--token-cap` a note past the cap prints `verdict=stop`, the one stop check.
|
||||
A dispatching program takes `BEFORE` (R and C) as readers start and passes
|
||||
`--dispatched-at <R> --dispatched-credits <C> --readers <n>` with the reading after the last settles.
|
||||
call, no handoff; under `--token-cap` a note past the cap prints `verdict=stop`, the one stop check on spend.
|
||||
A dispatching program passes `--dispatched-at <R> --dispatched-credits <C> --readers <n>` (`BEFORE`).
|
||||
|
||||
**Waits.** No call waits past 200 s: a program returns what still runs 200 s after its first line; the next
|
||||
call resumes the poll. Lanes, pregate, `finish` run in background; after a restart, rerun the same command. Never end the turn while
|
||||
readers run (each wakes it). A small waiting child saves nothing. Past 100 minutes, stop. Returns:
|
||||
readers run. A small waiting child saves nothing. Past 100 minutes the run stops:
|
||||
`STOP: past 100 minutes`, state in `stop.json`. Returns:
|
||||
≤32 KB per program; split longer reads at headings, each byte once, before first use: phase programs
|
||||
end with `gstack-ship-parts next --run <run dir> --phase <n+1> --room <32000 - its output>`; on
|
||||
`NEXT: parts` run it alone.
|
||||
@@ -63,8 +63,8 @@ Install check, this file.
|
||||
`gstack-ship-preflight --base <base> --run <run dir name> --lane <label>=<test command>...`. `CARRY: carried` ends the run on its `GSTACK_RESULT:`
|
||||
line. `ship_lanes_from`: push early (`sections/tests.md#ci-carry`). A lane passes on `tests_ran: N` with exit 0; `0` is ZERO-RUN (failed); `unknown`
|
||||
is `count unavailable`. In-branch failures stop; after a repair rerun `--tests-only`.
|
||||
`requires-remote` needs `gstack-pregate clear` before Step 18. When prompts, templates, judges or eval
|
||||
harness changed, start the eval selector and pre-merge command (detached past 30 min); else
|
||||
`requires-remote` needs `gstack-pregate clear` before Step 18. Changed prompts, templates, judges or eval
|
||||
harness: start the eval selector and pre-merge command (detached past 30 min); else
|
||||
record `evals: none affected`. Step 6.5 runs only if `gstack-greptile-early detect` finds
|
||||
Greptile. Then `gstack-ship-preflight --audit --base <base> --out <run dir>` writes the diff once
|
||||
(`CONTEXT:`) and the TODOS.md items on touched paths (`TODOS:`); prints the coverage map,
|
||||
@@ -92,7 +92,7 @@ pass with `fixCheck: {fix_list, hunks, tests, callers}`; `done` or `voices`: tha
|
||||
|
||||
Judge the voices; missing outside coverage is `unavailable`, never clean; queued fixes rerun Phases
|
||||
3-4. Then `gstack-review-dispatch verify` (`VERIFY: clean`) and `gstack-review-read`: the final Step 9 and Step 11 native rows (or `CURRENT` freshness
|
||||
after a planned skip) agree on `wtree`, `start_wtree`, `end_wtree`; save that tree and base `<b>`. Then
|
||||
after a planned skip) agree on their trees; save that tree and base `<b>`. Then
|
||||
`gstack-ship-release version --base <base> [--bump micro|patch] --why '<line>'`; MINOR, MAJOR, `BUMP_ANSWER_REQUIRED`:
|
||||
approvals; `VERSION: skipped|kept`: no write.
|
||||
|
||||
@@ -106,7 +106,7 @@ One re-audit at most.
|
||||
|
||||
## 7. Release: Steps 15, 16, 17
|
||||
|
||||
Commit in bisectable chunks; `gstack-ship-release finish --base <base> --reviewed-tree <t> --reviewed-base <b>
|
||||
Commit bisectably; `gstack-ship-release finish --base <base> --reviewed-tree <t> --reviewed-base <b>
|
||||
--docs-post <post> --lane ... [--build <cmd>] --trailer '<t>' [--plan <line>]`: `PLAN:`, `ROUTE:`, `DOCS:`, `EVIDENCE:` (FRESH;
|
||||
STALE or MISSING reruns once), `PREGATE:`; print them, the last `Gate edits:` and each `tests_ran`. Then
|
||||
`gstack-ship-release push --branch <branch> [--gate-open <n>]`: `REDACT_PREPUSH:`, `SEALED:`, `GUARDS:`, `PUSH:`
|
||||
@@ -116,9 +116,9 @@ repo gates run beside CI. Unattended, push defers the pre-push offer; else its S
|
||||
## 8. Publish: Steps 18, 19, 19-C, 20, 21, 22
|
||||
|
||||
- Step 18: the open-PR lookup; a plain `v<NEW_VERSION> ` title (`gstack-plain-title check`). `UNATTENDED_SHIP:` with no open PR at HEAD takes Step 18-H.
|
||||
- Step 19 body: plain opening sentences, then sections `sections/pr-body.md` lists, led under `CAPY_PR: on` (Step 19-C) by What changed, Why and Blast radius; Agent notes last (receipt, `gstack-approvals render --plan`, `REVIEW_LOOP:`). `gstack-prose-lint <top> --sections 'Why,Summary,Blast radius' --gate`; `gstack-issue-links`; `gstack-review-scope summary --since "$REVIEW_SINCE" --run <dir> && gstack-ship-receipt write --pr <n> --base <base> --gate @<f> --pregate <f> --issues @<f> --review-loop @<f> --docs @<f> [--review-exclude <d>] [--review-targeted @<f>] --body <body>`; `gstack-post pr-body` and `pr-title` (new PR: host PR tool; draft while a gate finding is `open`). `SHIP_RECEIPT:` opens your report.
|
||||
- Step 19 body: plain opening sentences, then sections `sections/pr-body.md` lists, led under `CAPY_PR: on` (Step 19-C) by What changed, Why and Blast radius; Agent notes last (receipt, `gstack-approvals render --plan`, `REVIEW_LOOP:`). `gstack-prose-lint <top> --sections 'Why,Summary,Blast radius' --gate`; `gstack-issue-links`; `gstack-review-scope summary --since "$REVIEW_SINCE" --run <dir> && gstack-ship-receipt write --pr <n> --base <base> --gate @<f> --pregate <f> --issues @<f> --review-loop @<f> --docs @<f> --budget-record <rec> [--review-exclude <d>] [--review-targeted @<f>] --body <body>`; `gstack-post pr-body` and `pr-title` (new PR: host PR tool; draft while a gate finding is `open`). `SHIP_RECEIPT:` opens your report.
|
||||
- Step 20: a metrics row via `gstack-review-log`.
|
||||
- Step 22: `gstack-ship-budget close --reading R --credits C` (report `BUDGET_FINAL:`, `BUDGET_TIMELINE:` (tokens, credits), any `METER:` line), then `gstack-ship-receipt result --pr <n>`: `GSTACK_RESULT: skill=ship status=complete head=<sha> run=<dir>`. Under a merge queue, `gstack-ship-queue ready --pr <n> [--screen|--no-screen]` at the pushed head; paste its output.
|
||||
- Step 22: `gstack-ship-budget close --reading R --credits C` (report `BUDGET_FINAL:`, `BUDGET_TIMELINE:`, any `METER:` line), then `gstack-ship-receipt result --pr <n>`: `GSTACK_RESULT: skill=ship status=complete head=<sha> run=<dir>`. Under a merge queue, `gstack-ship-queue ready --pr <n> [--screen|--no-screen]` at the pushed head; paste its output.
|
||||
|
||||
## Where each STOP sends you (paths under `<root>/ship/`)
|
||||
|
||||
|
||||
+17
-17
@@ -5,16 +5,16 @@ Read this, not `ship/SKILL.md`, when a parent agent runs /ship
|
||||
the `GSTACK_LAUNCH` assignments your installer printed (`. <its GSTACK_LAUNCH_FILE>`), never
|
||||
`export $(...)`, `env`, `printenv` or a bare `set` in a tool fence.
|
||||
|
||||
**Rules.** Each phase below is one call: one program (Capy: execute; else a script)
|
||||
that runs the bins, reads, dispatches and waits, returning only result lines and reader
|
||||
outputs verbatim. The model keeps only lead judgment, fixes, CHANGELOG, PR prose,
|
||||
**Rules.** Each phase below is one call: `gstack-ship-phase run --dir <run dir> --phase <n> --record <rec> -- <cmds>`
|
||||
runs its bins, reads, dispatches and waits, returning only result lines and reader
|
||||
outputs verbatim. The model keeps only judgment, fixes, CHANGELOG, PR prose,
|
||||
gates, the report. `STOP:` (exit 3) means nothing after it ran; `NEXT:` names
|
||||
the next act. Read a section only when a phase or the list below sends you, never
|
||||
up front. A STOP or decision this file does not cover: read `ship/SKILL.md` at that step, finish there,
|
||||
come back. Unattended, take a question's recommended option (log it); gate
|
||||
dispositions and approvals stay pending and end the run, except `gstack-no-stop`. Keep a record (`--record`): write its six headings at Phase 1, fill each per phase: **Checks**
|
||||
(Phases 2-4: lanes, pregate, evals, `Coverage:`, the plan checks, `Exploratory QA:`, `Scope Check:`), **Decisions** (any
|
||||
phase: each answered or auto-taken question, verbatim), **Reviews** (Phases 3-5: the plan line,
|
||||
phase: questions and answers, verbatim), **Reviews** (Phases 3-5: the plan line,
|
||||
start tokens, `Pre-Landing Review:`, `Gate edits:`, the reviewed tree), **Release** (Phases 5-7:
|
||||
version, CHANGELOG, commits), **Documentation** (Step 14.5) and **Next steps** (every phase: the next act).
|
||||
|
||||
@@ -25,18 +25,18 @@ file, unchanged; its findings reach `merged.jsonl` only via `collect`; `judge` r
|
||||
14.5 once; findings go to the PR body.
|
||||
|
||||
**Calls.** One pass with no fixes is 9 calls: Phases 1-8 and the report; at most 12 with a STOP's
|
||||
section read or fix-check, plus a keep-alive per 200 s waited.
|
||||
section read or fix-check, plus a keep-alive per 200 s waited under ~80 min (longer: end the turn on one wait; no 10-15 min polls).
|
||||
|
||||
**Budget: observe.** `gstack-ship-budget start --mode observe` records, never admits: each program ends
|
||||
with `gstack-ship-budget note --step <last step> --reading R --credits C --record <rec>`, R and C read in that program
|
||||
**Budget: observe.** `gstack-ship-budget start --mode observe` only records: each program ends
|
||||
with `gstack-ship-budget note --step <last step> --reading R --credits C --record <rec>`, R and C read in it
|
||||
(Capy: `cost.tokens`, `cost.credits`). No check per step, no reservation, no meter-only
|
||||
call, no handoff; under `--token-cap` a note past the cap prints `verdict=stop`, the one stop check.
|
||||
A dispatching program takes `BEFORE` (R and C) as readers start and passes
|
||||
`--dispatched-at <R> --dispatched-credits <C> --readers <n>` with the reading after the last settles.
|
||||
call, no handoff; under `--token-cap` a note past the cap prints `verdict=stop`, the one stop check on spend.
|
||||
A dispatching program passes `--dispatched-at <R> --dispatched-credits <C> --readers <n>` (`BEFORE`).
|
||||
|
||||
**Waits.** No call waits past 200 s: a program returns what still runs 200 s after its first line; the next
|
||||
call resumes the poll. Lanes, pregate, `finish` run in background; after a restart, rerun the same command. Never end the turn while
|
||||
readers run (each wakes it). A small waiting child saves nothing. Past 100 minutes, stop. Returns:
|
||||
readers run. A small waiting child saves nothing. Past 100 minutes the run stops:
|
||||
`STOP: past 100 minutes`, state in `stop.json`. Returns:
|
||||
≤32 KB per program; split longer reads at headings, each byte once, before first use: phase programs
|
||||
end with `gstack-ship-parts next --run <run dir> --phase <n+1> --room <32000 - its output>`; on
|
||||
`NEXT: parts` run it alone.
|
||||
@@ -61,8 +61,8 @@ Install check, this file.
|
||||
`gstack-ship-preflight --base <base> --run <run dir name> --lane <label>=<test command>...`. `CARRY: carried` ends the run on its `GSTACK_RESULT:`
|
||||
line. `ship_lanes_from`: push early (`sections/tests.md#ci-carry`). A lane passes on `tests_ran: N` with exit 0; `0` is ZERO-RUN (failed); `unknown`
|
||||
is `count unavailable`. In-branch failures stop; after a repair rerun `--tests-only`.
|
||||
`requires-remote` needs `gstack-pregate clear` before Step 18. When prompts, templates, judges or eval
|
||||
harness changed, start the eval selector and pre-merge command (detached past 30 min); else
|
||||
`requires-remote` needs `gstack-pregate clear` before Step 18. Changed prompts, templates, judges or eval
|
||||
harness: start the eval selector and pre-merge command (detached past 30 min); else
|
||||
record `evals: none affected`. Step 6.5 runs only if `gstack-greptile-early detect` finds
|
||||
Greptile. Then `gstack-ship-preflight --audit --base <base> --out <run dir>` writes the diff once
|
||||
(`CONTEXT:`) and the TODOS.md items on touched paths (`TODOS:`); prints the coverage map,
|
||||
@@ -90,7 +90,7 @@ pass with `fixCheck: {fix_list, hunks, tests, callers}`; `done` or `voices`: tha
|
||||
|
||||
Judge the voices; missing outside coverage is `unavailable`, never clean; queued fixes rerun Phases
|
||||
3-4. Then `gstack-review-dispatch verify` (`VERIFY: clean`) and `gstack-review-read`: the final Step 9 and Step 11 native rows (or `CURRENT` freshness
|
||||
after a planned skip) agree on `wtree`, `start_wtree`, `end_wtree`; save that tree and base `<b>`. Then
|
||||
after a planned skip) agree on their trees; save that tree and base `<b>`. Then
|
||||
`gstack-ship-release version --base <base> [--bump micro|patch] --why '<line>'`; MINOR, MAJOR, `BUMP_ANSWER_REQUIRED`:
|
||||
approvals; `VERSION: skipped|kept`: no write.
|
||||
|
||||
@@ -104,7 +104,7 @@ One re-audit at most.
|
||||
|
||||
## 7. Release: Steps 15, 16, 17
|
||||
|
||||
Commit in bisectable chunks; `gstack-ship-release finish --base <base> --reviewed-tree <t> --reviewed-base <b>
|
||||
Commit bisectably; `gstack-ship-release finish --base <base> --reviewed-tree <t> --reviewed-base <b>
|
||||
--docs-post <post> --lane ... [--build <cmd>] --trailer '<t>' [--plan <line>]`: `PLAN:`, `ROUTE:`, `DOCS:`, `EVIDENCE:` (FRESH;
|
||||
STALE or MISSING reruns once), `PREGATE:`; print them, the last `Gate edits:` and each `tests_ran`. Then
|
||||
`gstack-ship-release push --branch <branch> [--gate-open <n>]`: `REDACT_PREPUSH:`, `SEALED:`, `GUARDS:`, `PUSH:`
|
||||
@@ -114,9 +114,9 @@ repo gates run beside CI. Unattended, push defers the pre-push offer; else its S
|
||||
## 8. Publish: Steps 18, 19, 19-C, 20, 21, 22
|
||||
|
||||
- Step 18: the open-PR lookup; a plain `v<NEW_VERSION> ` title (`gstack-plain-title check`). `UNATTENDED_SHIP:` with no open PR at HEAD takes Step 18-H.
|
||||
- Step 19 body: plain opening sentences, then sections `sections/pr-body.md` lists, led under `CAPY_PR: on` (Step 19-C) by What changed, Why and Blast radius; Agent notes last (receipt, `gstack-approvals render --plan`, `REVIEW_LOOP:`). `gstack-prose-lint <top> --sections 'Why,Summary,Blast radius' --gate`; `gstack-issue-links`; `gstack-review-scope summary --since "$REVIEW_SINCE" --run <dir> && gstack-ship-receipt write --pr <n> --base <base> --gate @<f> --pregate <f> --issues @<f> --review-loop @<f> --docs @<f> [--review-exclude <d>] [--review-targeted @<f>] --body <body>`; `gstack-post pr-body` and `pr-title` (new PR: host PR tool; draft while a gate finding is `open`). `SHIP_RECEIPT:` opens your report.
|
||||
- Step 19 body: plain opening sentences, then sections `sections/pr-body.md` lists, led under `CAPY_PR: on` (Step 19-C) by What changed, Why and Blast radius; Agent notes last (receipt, `gstack-approvals render --plan`, `REVIEW_LOOP:`). `gstack-prose-lint <top> --sections 'Why,Summary,Blast radius' --gate`; `gstack-issue-links`; `gstack-review-scope summary --since "$REVIEW_SINCE" --run <dir> && gstack-ship-receipt write --pr <n> --base <base> --gate @<f> --pregate <f> --issues @<f> --review-loop @<f> --docs @<f> --budget-record <rec> [--review-exclude <d>] [--review-targeted @<f>] --body <body>`; `gstack-post pr-body` and `pr-title` (new PR: host PR tool; draft while a gate finding is `open`). `SHIP_RECEIPT:` opens your report.
|
||||
- Step 20: a metrics row via `gstack-review-log`.
|
||||
- Step 22: `gstack-ship-budget close --reading R --credits C` (report `BUDGET_FINAL:`, `BUDGET_TIMELINE:` (tokens, credits), any `METER:` line), then `gstack-ship-receipt result --pr <n>`: `GSTACK_RESULT: skill=ship status=complete head=<sha> run=<dir>`. Under a merge queue, `gstack-ship-queue ready --pr <n> [--screen|--no-screen]` at the pushed head; paste its output.
|
||||
- Step 22: `gstack-ship-budget close --reading R --credits C` (report `BUDGET_FINAL:`, `BUDGET_TIMELINE:`, any `METER:` line), then `gstack-ship-receipt result --pr <n>`: `GSTACK_RESULT: skill=ship status=complete head=<sha> run=<dir>`. Under a merge queue, `gstack-ship-queue ready --pr <n> [--screen|--no-screen]` at the pushed head; paste its output.
|
||||
|
||||
## Where each STOP sends you (paths under `<root>/ship/`)
|
||||
|
||||
|
||||
Reference in new issue
Block a user