rogee/superpowers
1
0
Fork 0
mirror of https://github.com/obra/superpowers.git synced 2026-04-22 01:19:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(finishing-skill): move environment detection before test verification (PRI-823)

Browse Source 
Path A (detached HEAD in externally managed worktree) was unreachable
because Step 1 halted on test failure before Step 1.5 could detect the
restricted environment. Reorder so detection runs first — Path A now
skips test verification entirely since the toolchain may not be available
in sandbox environments.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Drew Ritter
2026-03-23 14:26:30 -07:00
committed by Drew Ritter
parent 2cbbd8ce88
commit f146752b8d
1 changed files with 38 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
skills/finishing-a-development-branch/SKILL.md
View File

@@ -15,29 +15,9 @@ Guide completion of development work by presenting clear options and handling ch
## The Process ## The Process
### Step 1: Verify Tests ### Step 1: Detect Environment
**Before presenting options, verify tests pass:** Run this FIRST, before test verification:
```bash
# Run project's test suite
npm test / cargo test / pytest / go test ./...
```
**If tests fail:**
```
Tests failing (<N> failures). Must fix before completing:
[Show failures]
Cannot proceed with merge/PR until tests pass.
```
Stop. Don't proceed to Step 2.
**If tests pass:** Continue to Step 2.
### Step 1.5: Detect Environment
````bash ````bash
GIT_DIR=$(cd "$(git rev-parse --git-dir)" 2>/dev/null && pwd -P) GIT_DIR=$(cd "$(git rev-parse --git-dir)" 2>/dev/null && pwd -P)
@@ -47,12 +27,14 @@ BRANCH=$(git branch --show-current)
**Path A — `GIT_DIR` differs from `GIT_COMMON` AND `BRANCH` is empty (externally managed worktree, detached HEAD):** **Path A — `GIT_DIR` differs from `GIT_COMMON` AND `BRANCH` is empty (externally managed worktree, detached HEAD):**
First, ensure all work is staged and committed (`git add` + `git commit`). This is a restricted sandbox environment (e.g., Codex App worktree thread). The test toolchain may not be available. Do NOT attempt test verification — skip directly to the handoff.
First, ensure all work is staged and committed (`git add` + `git commit`). If staging/committing fails due to sandbox restrictions, note the uncommitted files in the handoff message.
Then present this to the user (do NOT present the 4-option menu): Then present this to the user (do NOT present the 4-option menu):
``` ```
Implementation complete. All tests passing. Implementation complete.
Current HEAD: <full-commit-sha> Current HEAD: <full-commit-sha>
This workspace is externally managed (detached HEAD). This workspace is externally managed (detached HEAD).
@@ -71,17 +53,39 @@ Suggested commit message: <summary-of-work>
Branch name: use ticket ID if available (e.g., `pri-823/codex-compat`), otherwise slugify the first 5 words of the plan title, otherwise omit. Avoid sensitive content in branch names. Branch name: use ticket ID if available (e.g., `pri-823/codex-compat`), otherwise slugify the first 5 words of the plan title, otherwise omit. Avoid sensitive content in branch names.
Skip to Step 5 (cleanup is a no-op — see guard below). Skip to Step 6 (cleanup is a no-op — see guard below).
**Path B — `GIT_DIR` differs from `GIT_COMMON` AND `BRANCH` exists (externally managed worktree, named branch):** **Path B — `GIT_DIR` differs from `GIT_COMMON` AND `BRANCH` exists (externally managed worktree, named branch):**
Proceed to Step 2 and present the 4-option menu as normal. Proceed to Step 2 (verify tests, then 4-option menu).
**Path C — `GIT_DIR` equals `GIT_COMMON` (normal environment):** **Path C — `GIT_DIR` equals `GIT_COMMON` (normal environment):**
Proceed to Step 2 and present the 4-option menu as normal. Proceed to Step 2 (verify tests, then 4-option menu).
### Step 2: Determine Base Branch ### Step 2: Verify Tests
**Before presenting options, verify tests pass:**
```bash
# Run project's test suite
npm test / cargo test / pytest / go test ./...
```
**If tests fail:**
```
Tests failing (<N> failures). Must fix before completing:
[Show failures]
Cannot proceed with merge/PR until tests pass.
```
Stop. Don't proceed to Step 3.
**If tests pass:** Continue to Step 3.
### Step 3: Determine Base Branch
```bash ```bash
# Try common base branches # Try common base branches
@@ -90,7 +94,7 @@ git merge-base HEAD main 2>/dev/null || git merge-base HEAD master 2>/dev/null
Or ask: "This branch split from main - is that correct?" Or ask: "This branch split from main - is that correct?"
### Step 3: Present Options ### Step 4: Present Options
Present exactly these 4 options: Present exactly these 4 options:
@@ -107,7 +111,7 @@ Which option?
**Don't add explanation** - keep options concise. **Don't add explanation** - keep options concise.
### Step 4: Execute Choice ### Step 5: Execute Choice
#### Option 1: Merge Locally #### Option 1: Merge Locally
@@ -128,7 +132,7 @@ git merge <feature-branch>
git branch -d <feature-branch> git branch -d <feature-branch>
``` ```
Then: Cleanup worktree (Step 5) Then: Cleanup worktree (Step 6)
#### Option 2: Push and Create PR #### Option 2: Push and Create PR
@@ -147,7 +151,7 @@ EOF
)" )"
``` ```
Then: Cleanup worktree (Step 5) Then: Cleanup worktree (Step 6)
#### Option 3: Keep As-Is #### Option 3: Keep As-Is
@@ -175,9 +179,9 @@ git checkout <base-branch>
git branch -D <feature-branch> git branch -D <feature-branch>
``` ```
Then: Cleanup worktree (Step 5) Then: Cleanup worktree (Step 6)
### Step 5: Cleanup Worktree ### Step 6: Cleanup Worktree
**First, check if worktree is externally managed:** **First, check if worktree is externally managed:**