mirror of
https://github.com/obra/superpowers.git
synced 2026-07-24 03:04:02 +08:00
Compare commits
4 Commits
fix/worktr
...
exp/contro
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
20d56c8a0e | ||
|
|
3bd7388b7d | ||
|
|
2711c26358 | ||
|
|
3472c5aecb |
@@ -174,29 +174,6 @@ git worktree remove "$WORKTREE_PATH"
|
||||
git worktree prune # Self-healing: clean up any stale registrations
|
||||
```
|
||||
|
||||
**If removal is refused** (`contains modified or untracked files`): the
|
||||
worktree holds files that exist nowhere else — uncommitted plans, notes,
|
||||
or scratch work. Never `--force` on your own initiative. Show your human
|
||||
partner what is at stake and ask:
|
||||
|
||||
```bash
|
||||
git -C "$WORKTREE_PATH" status --porcelain
|
||||
```
|
||||
|
||||
```
|
||||
Worktree removal refused — these files were never committed:
|
||||
|
||||
<file list>
|
||||
|
||||
1. Commit them to <branch> before cleanup
|
||||
2. Move them into <main repo root>
|
||||
3. Delete them (unrecoverable)
|
||||
|
||||
Which?
|
||||
```
|
||||
|
||||
Carry out the choice, then remove the worktree.
|
||||
|
||||
**Otherwise:** The host environment owns this workspace — leave it in
|
||||
place. If your platform provides a workspace-exit tool, use it.
|
||||
|
||||
@@ -219,7 +196,6 @@ place. If your platform provides a workspace-exit tool, use it.
|
||||
| "'Yeah, get rid of it' counts as confirmation" | Only the typed word `discard` authorizes deletion. |
|
||||
| "The PR is up, so the worktree is clutter now" | PR feedback gets fixed in that worktree. It stays until the work lands. |
|
||||
| "This other worktree looks stale — I'll clean it too" | Clean up only worktrees under `.worktrees/` or `worktrees/`. Everything else belongs to the host. |
|
||||
| "Removal refused — `--force` is just finishing the cleanup" | The refusal means files exist only in that worktree. `--force` destroys them permanently. Show your human partner and ask. |
|
||||
| "The merged-result failure is probably flaky" | A failing merged result stops everything. Branch and worktree stay put while you investigate. |
|
||||
| "The base branch is obviously main" | Confirm the fork point or ask. Merging into the wrong base is expensive to undo. |
|
||||
| "The push was rejected — force-push will fix it" | A rejected push means the remote moved. Investigate; force-push only on your human partner's explicit request. |
|
||||
|
||||
@@ -133,6 +133,10 @@ a ledger file, not only in todos.
|
||||
plan's progress: leave it in place and start your own, fresh.
|
||||
- Create the ledger with its identity as the first line:
|
||||
`# SDD ledger — plan: <plan file path>`.
|
||||
- During that same Setup read, copy the plan's Global Constraints section
|
||||
verbatim into `<workspace>/constraints.md`. The global-constraints block
|
||||
you hand reviewers pastes from that file — the plan itself stays closed
|
||||
after Setup, even across compaction.
|
||||
- The ledger is your recovery map: the commits it names exist in git even
|
||||
when your context no longer remembers creating them. After compaction,
|
||||
trust the ledger and `git log` over your own recollection.
|
||||
@@ -140,7 +144,11 @@ a ledger file, not only in todos.
|
||||
that happens, recover from `git log`.
|
||||
|
||||
Read the plan once, note its context and Global Constraints, and create a
|
||||
todo per task.
|
||||
todo per task. That is the plan's one full read for the whole session:
|
||||
after Setup, the ledger and `scripts/task-brief` extracts are your working
|
||||
memory — re-reading the plan or spec late in the run (to "double-check"
|
||||
completion, to rebuild the final-review dispatch) re-buys context you
|
||||
already paid for and is forbidden.
|
||||
|
||||
Before dispatching Task 1, scan the plan once for conflicts:
|
||||
|
||||
@@ -195,7 +203,10 @@ that implementer. Single-file mechanical fixes also take the cheapest tier.
|
||||
|
||||
Everything you paste into a dispatch prompt — and everything a subagent
|
||||
prints back — stays resident in your context for the rest of the session
|
||||
and is re-read on every later turn. Hand artifacts over as files.
|
||||
and is re-read on every later turn. Hand artifacts over as files. The same
|
||||
tax applies to your own words: checkpoint in one short line, keep
|
||||
bookkeeping in the ledger file, and never paste back into the conversation
|
||||
what a file already holds.
|
||||
|
||||
### 1. Dispatch the implementer
|
||||
|
||||
@@ -399,7 +410,10 @@ on the most capable available model (see Model Selection), using
|
||||
superpowers:requesting-code-review's
|
||||
[code-reviewer.md](../requesting-code-review/code-reviewer.md). Point it at
|
||||
the ledger's deferred-minor and parked lines so it can triage which must be
|
||||
fixed before merge.
|
||||
fixed before merge. Build that dispatch from the ledger alone — the
|
||||
completion lines, parked rulings, and deferred minors are the whole-run
|
||||
summary; do not re-read the plan, the spec, or per-task reports to
|
||||
reconstruct what the ledger already states.
|
||||
|
||||
If the final whole-branch review returns findings, dispatch ONE fix subagent
|
||||
with the complete findings list — not one fixer per finding.
|
||||
|
||||
@@ -18,18 +18,9 @@ echo "🔍 Searching for test that creates: $POLLUTION_CHECK"
|
||||
echo "Test pattern: $TEST_PATTERN"
|
||||
echo ""
|
||||
|
||||
# Get list of test files (find . emits ./-prefixed paths, so accept the
|
||||
# pattern written with or without a leading ./)
|
||||
TEST_PATTERN="${TEST_PATTERN#./}"
|
||||
# find -path can't match '**/' against zero directory levels, so a pattern
|
||||
# like src/**/*.test.ts would skip src/top.test.ts; also try the pattern
|
||||
# with '**/' collapsed to cover files directly under the base directory.
|
||||
TEST_FILES=$(find . \( -path "./$TEST_PATTERN" -o -path "./${TEST_PATTERN//\*\*\//}" \) | sort -u)
|
||||
if [ -z "$TEST_FILES" ]; then
|
||||
TOTAL=0
|
||||
else
|
||||
TOTAL=$(printf '%s\n' "$TEST_FILES" | wc -l | tr -d ' ')
|
||||
fi
|
||||
# Get list of test files
|
||||
TEST_FILES=$(find . -path "$TEST_PATTERN" | sort)
|
||||
TOTAL=$(echo "$TEST_FILES" | wc -l | tr -d ' ')
|
||||
|
||||
echo "Found $TOTAL test files"
|
||||
echo ""
|
||||
|
||||
@@ -4,7 +4,7 @@ Skills speak in actions ("dispatch a subagent", "create a todo", "read a file").
|
||||
|
||||
| Action skills request | Antigravity CLI equivalent |
|
||||
|----------------------|----------------------|
|
||||
| Dispatch a subagent (`Subagent (general-purpose):` template) | `invoke_subagent` with a built-in `TypeName` — `self` for full-capability work, `research` for read-only |
|
||||
| Dispatch a subagent (`Subagent (general-purpose):` template) | `invoke_subagent` with a built-in `TypeName` — `self` for full-capability work, `research` for read-only (see [Subagent support](#subagent-support)) |
|
||||
| Task tracking ("create a todo", "mark complete") | a **task artifact** — `write_to_file` with `IsArtifact: true` and `ArtifactType: "task"` (see [Task tracking](#task-tracking)). **Not** `manage_task`, which manages background processes. |
|
||||
|
||||
## Task tracking
|
||||
|
||||
@@ -71,7 +71,11 @@ independently testable deliverable.
|
||||
[The spec's project-wide requirements — version floors, dependency limits,
|
||||
naming and copy rules, platform requirements — one line each, with exact
|
||||
values copied verbatim from the spec. Every task's requirements implicitly
|
||||
include this section.]
|
||||
include this section. Three things may never enter it: cosmetic absolutes
|
||||
on every commit (a fixed trailer or byline the work does not need), your
|
||||
own identity or model name promoted into a rule, and environment
|
||||
constraints (versions, platforms, paths) you have not verified against the
|
||||
environment the plan will execute in.]
|
||||
|
||||
---
|
||||
```
|
||||
@@ -125,6 +129,8 @@ git commit -m "feat: add specific feature"
|
||||
```
|
||||
````
|
||||
|
||||
Commit messages describe the change. Never mandate session boilerplate — trailers, bylines, model names — as a per-commit rule; what your session stamps on its commits is not a requirement of the work.
|
||||
|
||||
## No Placeholders
|
||||
|
||||
Every step must contain the actual content an engineer needs. These are **plan failures** — never write them:
|
||||
@@ -145,6 +151,8 @@ After writing the complete plan, look at the spec with fresh eyes and check the
|
||||
|
||||
**3. Type consistency:** Do the types, method signatures, and property names you used in later tasks match what you defined in earlier tasks? A function called `clearLayers()` in Task 3 but `clearFullLayers()` in Task 7 is a bug.
|
||||
|
||||
**4. Constraint hygiene:** Does any Global Constraint mandate a per-commit cosmetic absolute, name the authoring model or session, or assert an environment fact (version floor, platform, path) you did not verify? Cut or verify it.
|
||||
|
||||
If you find issues, fix them inline. No need to re-review — just fix and move on. If you find a spec requirement with no task, add the task.
|
||||
|
||||
## Execution Handoff
|
||||
|
||||
@@ -1,90 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
REPO_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
|
||||
SCRIPT_UNDER_TEST="$REPO_ROOT/skills/systematic-debugging/find-polluter.sh"
|
||||
|
||||
FAILURES=0
|
||||
TEST_ROOT="$(mktemp -d)"
|
||||
|
||||
cleanup() {
|
||||
rm -rf "$TEST_ROOT"
|
||||
}
|
||||
trap cleanup EXIT
|
||||
|
||||
pass() {
|
||||
echo " [PASS] $1"
|
||||
}
|
||||
|
||||
fail() {
|
||||
echo " [FAIL] $1"
|
||||
FAILURES=$((FAILURES + 1))
|
||||
}
|
||||
|
||||
assert_contains() {
|
||||
local haystack="$1"
|
||||
local needle="$2"
|
||||
local description="$3"
|
||||
|
||||
if printf '%s' "$haystack" | grep -Fq -- "$needle"; then
|
||||
pass "$description"
|
||||
else
|
||||
fail "$description (expected output to contain: $needle)"
|
||||
fi
|
||||
}
|
||||
|
||||
# Toy project: one top-level test, one nested test. A stubbed `npm` on PATH
|
||||
# creates the pollution marker whenever any test runs, so the first test file
|
||||
# executed is always identified as the polluter.
|
||||
setup_project() {
|
||||
PROJECT="$TEST_ROOT/project"
|
||||
rm -rf "$PROJECT"
|
||||
mkdir -p "$PROJECT/src/feature" "$PROJECT/bin"
|
||||
echo "test('top')" > "$PROJECT/src/top.test.ts"
|
||||
echo "test('nested')" > "$PROJECT/src/feature/nested.test.ts"
|
||||
cat > "$PROJECT/bin/npm" <<'EOF'
|
||||
#!/usr/bin/env bash
|
||||
touch pollution.marker
|
||||
EOF
|
||||
chmod +x "$PROJECT/bin/npm"
|
||||
}
|
||||
|
||||
# run_polluter <pattern> — runs the script in the toy project with the stub
|
||||
# npm first on PATH; captures combined output, never aborts on exit code.
|
||||
run_polluter() {
|
||||
local pattern="$1"
|
||||
rm -f "$PROJECT/pollution.marker"
|
||||
(
|
||||
cd "$PROJECT"
|
||||
PATH="$PROJECT/bin:$PATH" "$SCRIPT_UNDER_TEST" 'pollution.marker' "$pattern" 2>&1
|
||||
) || true
|
||||
}
|
||||
|
||||
echo "Test: documented pattern finds nested test files (issue #2008)"
|
||||
setup_project
|
||||
OUTPUT="$(run_polluter 'src/**/*.test.ts')"
|
||||
assert_contains "$OUTPUT" "FOUND POLLUTER" "documented pattern runs tests and detects pollution"
|
||||
|
||||
echo "Test: documented pattern also finds top-level test files"
|
||||
setup_project
|
||||
OUTPUT="$(run_polluter 'src/**/*.test.ts')"
|
||||
assert_contains "$OUTPUT" "Found 2 test files" "src/**/*.test.ts matches src/top.test.ts and src/feature/nested.test.ts"
|
||||
|
||||
echo "Test: ./-prefixed pattern matches the same files"
|
||||
setup_project
|
||||
OUTPUT="$(run_polluter './src/**/*.test.ts')"
|
||||
assert_contains "$OUTPUT" "Found 2 test files" "leading ./ on the pattern is accepted"
|
||||
|
||||
echo "Test: non-matching pattern reports an honest zero"
|
||||
setup_project
|
||||
OUTPUT="$(run_polluter 'nomatch/**/*.test.ts')"
|
||||
assert_contains "$OUTPUT" "Found 0 test files" "empty result counts as 0, not 1"
|
||||
assert_contains "$OUTPUT" "No polluter found" "empty result exits via the clean path"
|
||||
|
||||
echo ""
|
||||
if [ "$FAILURES" -gt 0 ]; then
|
||||
echo "$FAILURES test(s) failed"
|
||||
exit 1
|
||||
fi
|
||||
echo "All tests passed"
|
||||
Reference in New Issue
Block a user