From a0d4978673881f9c5378ced71d6a2eb357fa4e3c Mon Sep 17 00:00:00 2001 From: garrytan Date: Sat, 31 Oct 2026 13:54:30 +0000 Subject: [PATCH] fix(ship): Step 3 names merge conflicts in its STOP sentence again (ship-workflow-clarity pin) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> --- ship/SKILL.md | 2 +- ship/SKILL.md.tmpl | 2 +- test/fixtures/golden/agy-ship-SKILL.md | 2 +- test/fixtures/golden/claude-ship-SKILL.md | 2 +- test/fixtures/golden/codex-ship-SKILL.md | 2 +- test/fixtures/golden/factory-ship-SKILL.md | 2 +- test/size-ledger/ship/gst-430-notes-only-pass.json | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ship/SKILL.md b/ship/SKILL.md index 9bfbc08f2..5e25905b9 100644 --- a/ship/SKILL.md +++ b/ship/SKILL.md @@ -458,7 +458,7 @@ not web services already deployed. The preflight merges the fetched base (`git merge`) so tests and reviews cover the integrated code (`MERGE:`; `skipped` under stamp-at-merge). -**Merge conflicts:** `MERGE:` names them. Auto-resolve simple ones (VERSION, schema.rb, CHANGELOG ordering). For complex or ambiguous ones, **STOP**: show the choices, ask with AskUserQuestion and wait for the answer before editing or continuing; then commit and rerun the preflight. +**Merge conflicts:** `MERGE:` names them. Auto-resolve simple ones (VERSION, schema.rb, CHANGELOG ordering). For complex or ambiguous conflicts, **STOP**: show the choices, ask via AskUserQuestion, wait for the answer before editing or continuing; then commit and rerun the preflight. **Ship policy:** `POLICY:` is `gstack-ship-policy show-effective --base ` (docs/ship-policy.md); its `ship:` lines bind Steps 12-16 and history. `RUNTIME_LINES:` goes diff --git a/ship/SKILL.md.tmpl b/ship/SKILL.md.tmpl index 6baea48df..f98d66204 100644 --- a/ship/SKILL.md.tmpl +++ b/ship/SKILL.md.tmpl @@ -188,7 +188,7 @@ not web services already deployed. The preflight merges the fetched base (`git merge`) so tests and reviews cover the integrated code (`MERGE:`; `skipped` under stamp-at-merge). -**Merge conflicts:** `MERGE:` names them. Auto-resolve simple ones (VERSION, schema.rb, CHANGELOG ordering). For complex or ambiguous ones, **STOP**: show the choices, ask with AskUserQuestion and wait for the answer before editing or continuing; then commit and rerun the preflight. +**Merge conflicts:** `MERGE:` names them. Auto-resolve simple ones (VERSION, schema.rb, CHANGELOG ordering). For complex or ambiguous conflicts, **STOP**: show the choices, ask via AskUserQuestion, wait for the answer before editing or continuing; then commit and rerun the preflight. **Ship policy:** `POLICY:` is `gstack-ship-policy show-effective --base ` (docs/ship-policy.md); its `ship:` lines bind Steps 12-16 and history. `RUNTIME_LINES:` goes diff --git a/test/fixtures/golden/agy-ship-SKILL.md b/test/fixtures/golden/agy-ship-SKILL.md index 2f2398284..e8c902a2e 100644 --- a/test/fixtures/golden/agy-ship-SKILL.md +++ b/test/fixtures/golden/agy-ship-SKILL.md @@ -458,7 +458,7 @@ not web services already deployed. The preflight merges the fetched base (`git merge`) so tests and reviews cover the integrated code (`MERGE:`; `skipped` under stamp-at-merge). -**Merge conflicts:** `MERGE:` names them. Auto-resolve simple ones (VERSION, schema.rb, CHANGELOG ordering). For complex or ambiguous ones, **STOP**: show the choices, ask with AskUserQuestion and wait for the answer before editing or continuing; then commit and rerun the preflight. +**Merge conflicts:** `MERGE:` names them. Auto-resolve simple ones (VERSION, schema.rb, CHANGELOG ordering). For complex or ambiguous conflicts, **STOP**: show the choices, ask via AskUserQuestion, wait for the answer before editing or continuing; then commit and rerun the preflight. **Ship policy:** `POLICY:` is `gstack-ship-policy show-effective --base ` (docs/ship-policy.md); its `ship:` lines bind Steps 12-16 and history. `RUNTIME_LINES:` goes diff --git a/test/fixtures/golden/claude-ship-SKILL.md b/test/fixtures/golden/claude-ship-SKILL.md index 9bfbc08f2..5e25905b9 100644 --- a/test/fixtures/golden/claude-ship-SKILL.md +++ b/test/fixtures/golden/claude-ship-SKILL.md @@ -458,7 +458,7 @@ not web services already deployed. The preflight merges the fetched base (`git merge`) so tests and reviews cover the integrated code (`MERGE:`; `skipped` under stamp-at-merge). -**Merge conflicts:** `MERGE:` names them. Auto-resolve simple ones (VERSION, schema.rb, CHANGELOG ordering). For complex or ambiguous ones, **STOP**: show the choices, ask with AskUserQuestion and wait for the answer before editing or continuing; then commit and rerun the preflight. +**Merge conflicts:** `MERGE:` names them. Auto-resolve simple ones (VERSION, schema.rb, CHANGELOG ordering). For complex or ambiguous conflicts, **STOP**: show the choices, ask via AskUserQuestion, wait for the answer before editing or continuing; then commit and rerun the preflight. **Ship policy:** `POLICY:` is `gstack-ship-policy show-effective --base ` (docs/ship-policy.md); its `ship:` lines bind Steps 12-16 and history. `RUNTIME_LINES:` goes diff --git a/test/fixtures/golden/codex-ship-SKILL.md b/test/fixtures/golden/codex-ship-SKILL.md index 9bafcfc8b..fe2265738 100644 --- a/test/fixtures/golden/codex-ship-SKILL.md +++ b/test/fixtures/golden/codex-ship-SKILL.md @@ -457,7 +457,7 @@ not web services already deployed. The preflight merges the fetched base (`git merge`) so tests and reviews cover the integrated code (`MERGE:`; `skipped` under stamp-at-merge). -**Merge conflicts:** `MERGE:` names them. Auto-resolve simple ones (VERSION, schema.rb, CHANGELOG ordering). For complex or ambiguous ones, **STOP**: show the choices, ask with AskUserQuestion and wait for the answer before editing or continuing; then commit and rerun the preflight. +**Merge conflicts:** `MERGE:` names them. Auto-resolve simple ones (VERSION, schema.rb, CHANGELOG ordering). For complex or ambiguous conflicts, **STOP**: show the choices, ask via AskUserQuestion, wait for the answer before editing or continuing; then commit and rerun the preflight. **Ship policy:** `POLICY:` is `gstack-ship-policy show-effective --base ` (docs/ship-policy.md); its `ship:` lines bind Steps 12-16 and history. `RUNTIME_LINES:` goes diff --git a/test/fixtures/golden/factory-ship-SKILL.md b/test/fixtures/golden/factory-ship-SKILL.md index 338b3f1c9..ef86423db 100644 --- a/test/fixtures/golden/factory-ship-SKILL.md +++ b/test/fixtures/golden/factory-ship-SKILL.md @@ -459,7 +459,7 @@ not web services already deployed. The preflight merges the fetched base (`git merge`) so tests and reviews cover the integrated code (`MERGE:`; `skipped` under stamp-at-merge). -**Merge conflicts:** `MERGE:` names them. Auto-resolve simple ones (VERSION, schema.rb, CHANGELOG ordering). For complex or ambiguous ones, **STOP**: show the choices, ask with AskUserQuestion and wait for the answer before editing or continuing; then commit and rerun the preflight. +**Merge conflicts:** `MERGE:` names them. Auto-resolve simple ones (VERSION, schema.rb, CHANGELOG ordering). For complex or ambiguous conflicts, **STOP**: show the choices, ask via AskUserQuestion, wait for the answer before editing or continuing; then commit and rerun the preflight. **Ship policy:** `POLICY:` is `gstack-ship-policy show-effective --base ` (docs/ship-policy.md); its `ship:` lines bind Steps 12-16 and history. `RUNTIME_LINES:` goes diff --git a/test/size-ledger/ship/gst-430-notes-only-pass.json b/test/size-ledger/ship/gst-430-notes-only-pass.json index fd91f3258..f656d6ced 100644 --- a/test/size-ledger/ship/gst-430-notes-only-pass.json +++ b/test/size-ledger/ship/gst-430-notes-only-pass.json @@ -1,4 +1,4 @@ { - "bytes": 6, + "bytes": 7, "why": "GST-442/GST-444: Step 1.4 follows a scoped-review NEXT; Step 16 stage 2 and 3 route finish scoped-review STOP and --docs-requested with its --docs-result; trims in Steps 3, 12 and 16 keep the skill under its cap" }