CalvinBackup/gstack
1
0
Fork 0
mirror of https://github.com/garrytan/gstack.git synced 2026-09-22 04:40:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(ship): PR/MR create aborts on a missing or empty scanned body file

Browse Source 
Both the gh and glab send blocks now guard [ -s "$PR_BODY_FILE" ] and the
prose restates that the variable comes from the scan block — bash blocks
run in separate shells, and an unset/empty path would previously send an
empty body (gh) or cat's error output (glab) instead of the scanned bytes.
Codex/factory ship goldens regenerated.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Garry Tan
2026-09-01 16:07:45 +00:00
co-authored by Claude Fable 5
parent 5a7a42fc24
commit c0db2670f8
4 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ship/sections/pr-body.md
+7 -2
View File
@@ -186,11 +186,14 @@ printf '%s' "v$NEW_VERSION <type>: <summary>" | ~/.claude/skills/gstack/bin/gsta
HIGH blocks (exit 3, no skip). MEDIUM → AskUserQuestion (PII subset offers HIGH blocks (exit 3, no skip). MEDIUM → AskUserQuestion (PII subset offers
`--auto-redact`). Same scan runs before the `gh pr edit --body` path (Step 17). `--auto-redact`). Same scan runs before the `gh pr edit --body` path (Step 17).
**If GitHub:** create from the SCANNED file (exact bytes scanned = bytes sent): **If GitHub:** create from the SCANNED file (exact bytes scanned = bytes sent).
`$PR_BODY_FILE` comes from the scan block above — restate it in this shell if
blocks ran separately, and never proceed with an empty file:
```bash ```bash
# PR title MUST start with v$NEW_VERSION — enforced on every run, no exceptions. # PR title MUST start with v$NEW_VERSION — enforced on every run, no exceptions.
# (See Step 19 idempotency block + bin/gstack-pr-title-rewrite.sh for the rule.) # (See Step 19 idempotency block + bin/gstack-pr-title-rewrite.sh for the rule.)
[ -s "$PR_BODY_FILE" ] || { echo "ERROR: scanned body file missing/empty — re-run the scan block." >&2; exit 1; }
gh pr create --base <base> --title "v$NEW_VERSION <type>: <summary>" --body-file "$PR_BODY_FILE" gh pr create --base <base> --title "v$NEW_VERSION <type>: <summary>" --body-file "$PR_BODY_FILE"
rm -f "$PR_BODY_FILE" rm -f "$PR_BODY_FILE"
``` ```
@@ -201,7 +204,9 @@ rm -f "$PR_BODY_FILE"
# MR title MUST start with v$NEW_VERSION — enforced on every run, no exceptions. # MR title MUST start with v$NEW_VERSION — enforced on every run, no exceptions.
# (See Step 19 idempotency block + bin/gstack-pr-title-rewrite.sh for the rule.) # (See Step 19 idempotency block + bin/gstack-pr-title-rewrite.sh for the rule.)
# Send the SCANNED file's bytes — scan-at-sink means never re-render the body # Send the SCANNED file's bytes — scan-at-sink means never re-render the body
# from a fresh heredoc (that reopens the scan-vs-send gap). # from a fresh heredoc (that reopens the scan-vs-send gap). $PR_BODY_FILE comes
# from the scan block above; never proceed with an empty file.
[ -s "$PR_BODY_FILE" ] || { echo "ERROR: scanned body file missing/empty — re-run the scan block." >&2; exit 1; }
glab mr create -b <base> -t "v$NEW_VERSION <type>: <summary>" -d "$(cat "$PR_BODY_FILE")" glab mr create -b <base> -t "v$NEW_VERSION <type>: <summary>" -d "$(cat "$PR_BODY_FILE")"
rm -f "$PR_BODY_FILE" rm -f "$PR_BODY_FILE"
``` ```
ship/sections/pr-body.md.tmpl
+7 -2
View File
@@ -184,11 +184,14 @@ printf '%s' "v$NEW_VERSION <type>: <summary>" | ~/.claude/skills/gstack/bin/gsta
HIGH blocks (exit 3, no skip). MEDIUM → AskUserQuestion (PII subset offers HIGH blocks (exit 3, no skip). MEDIUM → AskUserQuestion (PII subset offers
`--auto-redact`). Same scan runs before the `gh pr edit --body` path (Step 17). `--auto-redact`). Same scan runs before the `gh pr edit --body` path (Step 17).
**If GitHub:** create from the SCANNED file (exact bytes scanned = bytes sent): **If GitHub:** create from the SCANNED file (exact bytes scanned = bytes sent).
`$PR_BODY_FILE` comes from the scan block above — restate it in this shell if
blocks ran separately, and never proceed with an empty file:
```bash ```bash
# PR title MUST start with v$NEW_VERSION — enforced on every run, no exceptions. # PR title MUST start with v$NEW_VERSION — enforced on every run, no exceptions.
# (See Step 19 idempotency block + bin/gstack-pr-title-rewrite.sh for the rule.) # (See Step 19 idempotency block + bin/gstack-pr-title-rewrite.sh for the rule.)
[ -s "$PR_BODY_FILE" ] || { echo "ERROR: scanned body file missing/empty — re-run the scan block." >&2; exit 1; }
gh pr create --base <base> --title "v$NEW_VERSION <type>: <summary>" --body-file "$PR_BODY_FILE" gh pr create --base <base> --title "v$NEW_VERSION <type>: <summary>" --body-file "$PR_BODY_FILE"
rm -f "$PR_BODY_FILE" rm -f "$PR_BODY_FILE"
``` ```
@@ -199,7 +202,9 @@ rm -f "$PR_BODY_FILE"
# MR title MUST start with v$NEW_VERSION — enforced on every run, no exceptions. # MR title MUST start with v$NEW_VERSION — enforced on every run, no exceptions.
# (See Step 19 idempotency block + bin/gstack-pr-title-rewrite.sh for the rule.) # (See Step 19 idempotency block + bin/gstack-pr-title-rewrite.sh for the rule.)
# Send the SCANNED file's bytes — scan-at-sink means never re-render the body # Send the SCANNED file's bytes — scan-at-sink means never re-render the body
# from a fresh heredoc (that reopens the scan-vs-send gap). # from a fresh heredoc (that reopens the scan-vs-send gap). $PR_BODY_FILE comes
# from the scan block above; never proceed with an empty file.
[ -s "$PR_BODY_FILE" ] || { echo "ERROR: scanned body file missing/empty — re-run the scan block." >&2; exit 1; }
glab mr create -b <base> -t "v$NEW_VERSION <type>: <summary>" -d "$(cat "$PR_BODY_FILE")" glab mr create -b <base> -t "v$NEW_VERSION <type>: <summary>" -d "$(cat "$PR_BODY_FILE")"
rm -f "$PR_BODY_FILE" rm -f "$PR_BODY_FILE"
``` ```
test/fixtures/golden/codex-ship-SKILL.md
Vendored
+7 -2
View File
@@ -2468,11 +2468,14 @@ printf '%s' "v$NEW_VERSION <type>: <summary>" | $GSTACK_ROOT/bin/gstack-redact -
HIGH blocks (exit 3, no skip). MEDIUM → AskUserQuestion (PII subset offers HIGH blocks (exit 3, no skip). MEDIUM → AskUserQuestion (PII subset offers
`--auto-redact`). Same scan runs before the `gh pr edit --body` path (Step 17). `--auto-redact`). Same scan runs before the `gh pr edit --body` path (Step 17).
**If GitHub:** create from the SCANNED file (exact bytes scanned = bytes sent): **If GitHub:** create from the SCANNED file (exact bytes scanned = bytes sent).
`$PR_BODY_FILE` comes from the scan block above — restate it in this shell if
blocks ran separately, and never proceed with an empty file:
```bash ```bash
# PR title MUST start with v$NEW_VERSION — enforced on every run, no exceptions. # PR title MUST start with v$NEW_VERSION — enforced on every run, no exceptions.
# (See Step 19 idempotency block + bin/gstack-pr-title-rewrite.sh for the rule.) # (See Step 19 idempotency block + bin/gstack-pr-title-rewrite.sh for the rule.)
[ -s "$PR_BODY_FILE" ] || { echo "ERROR: scanned body file missing/empty — re-run the scan block." >&2; exit 1; }
gh pr create --base <base> --title "v$NEW_VERSION <type>: <summary>" --body-file "$PR_BODY_FILE" gh pr create --base <base> --title "v$NEW_VERSION <type>: <summary>" --body-file "$PR_BODY_FILE"
rm -f "$PR_BODY_FILE" rm -f "$PR_BODY_FILE"
``` ```
@@ -2483,7 +2486,9 @@ rm -f "$PR_BODY_FILE"
# MR title MUST start with v$NEW_VERSION — enforced on every run, no exceptions. # MR title MUST start with v$NEW_VERSION — enforced on every run, no exceptions.
# (See Step 19 idempotency block + bin/gstack-pr-title-rewrite.sh for the rule.) # (See Step 19 idempotency block + bin/gstack-pr-title-rewrite.sh for the rule.)
# Send the SCANNED file's bytes — scan-at-sink means never re-render the body # Send the SCANNED file's bytes — scan-at-sink means never re-render the body
# from a fresh heredoc (that reopens the scan-vs-send gap). # from a fresh heredoc (that reopens the scan-vs-send gap). $PR_BODY_FILE comes
# from the scan block above; never proceed with an empty file.
[ -s "$PR_BODY_FILE" ] || { echo "ERROR: scanned body file missing/empty — re-run the scan block." >&2; exit 1; }
glab mr create -b <base> -t "v$NEW_VERSION <type>: <summary>" -d "$(cat "$PR_BODY_FILE")" glab mr create -b <base> -t "v$NEW_VERSION <type>: <summary>" -d "$(cat "$PR_BODY_FILE")"
rm -f "$PR_BODY_FILE" rm -f "$PR_BODY_FILE"
``` ```
test/fixtures/golden/factory-ship-SKILL.md
Vendored
+7 -2
View File
@@ -2903,11 +2903,14 @@ printf '%s' "v$NEW_VERSION <type>: <summary>" | $GSTACK_ROOT/bin/gstack-redact -
HIGH blocks (exit 3, no skip). MEDIUM → AskUserQuestion (PII subset offers HIGH blocks (exit 3, no skip). MEDIUM → AskUserQuestion (PII subset offers
`--auto-redact`). Same scan runs before the `gh pr edit --body` path (Step 17). `--auto-redact`). Same scan runs before the `gh pr edit --body` path (Step 17).
**If GitHub:** create from the SCANNED file (exact bytes scanned = bytes sent): **If GitHub:** create from the SCANNED file (exact bytes scanned = bytes sent).
`$PR_BODY_FILE` comes from the scan block above — restate it in this shell if
blocks ran separately, and never proceed with an empty file:
```bash ```bash
# PR title MUST start with v$NEW_VERSION — enforced on every run, no exceptions. # PR title MUST start with v$NEW_VERSION — enforced on every run, no exceptions.
# (See Step 19 idempotency block + bin/gstack-pr-title-rewrite.sh for the rule.) # (See Step 19 idempotency block + bin/gstack-pr-title-rewrite.sh for the rule.)
[ -s "$PR_BODY_FILE" ] || { echo "ERROR: scanned body file missing/empty — re-run the scan block." >&2; exit 1; }
gh pr create --base <base> --title "v$NEW_VERSION <type>: <summary>" --body-file "$PR_BODY_FILE" gh pr create --base <base> --title "v$NEW_VERSION <type>: <summary>" --body-file "$PR_BODY_FILE"
rm -f "$PR_BODY_FILE" rm -f "$PR_BODY_FILE"
``` ```
@@ -2918,7 +2921,9 @@ rm -f "$PR_BODY_FILE"
# MR title MUST start with v$NEW_VERSION — enforced on every run, no exceptions. # MR title MUST start with v$NEW_VERSION — enforced on every run, no exceptions.
# (See Step 19 idempotency block + bin/gstack-pr-title-rewrite.sh for the rule.) # (See Step 19 idempotency block + bin/gstack-pr-title-rewrite.sh for the rule.)
# Send the SCANNED file's bytes — scan-at-sink means never re-render the body # Send the SCANNED file's bytes — scan-at-sink means never re-render the body
# from a fresh heredoc (that reopens the scan-vs-send gap). # from a fresh heredoc (that reopens the scan-vs-send gap). $PR_BODY_FILE comes
# from the scan block above; never proceed with an empty file.
[ -s "$PR_BODY_FILE" ] || { echo "ERROR: scanned body file missing/empty — re-run the scan block." >&2; exit 1; }
glab mr create -b <base> -t "v$NEW_VERSION <type>: <summary>" -d "$(cat "$PR_BODY_FILE")" glab mr create -b <base> -t "v$NEW_VERSION <type>: <summary>" -d "$(cat "$PR_BODY_FILE")"
rm -f "$PR_BODY_FILE" rm -f "$PR_BODY_FILE"
``` ```