mirror of
https://github.com/obra/superpowers.git
synced 2026-06-28 13:39:05 +08:00
fix(sdd): write artifacts to working-tree .superpowers/sdd, not .git/ (#1780)
This commit is contained in:
committed by
Drew Ritter
parent
78ec255a2d
commit
f660e9e9d6
@@ -251,7 +251,7 @@ sequences — the single most expensive failure observed. Track progress in
|
|||||||
a ledger file, not only in todos.
|
a ledger file, not only in todos.
|
||||||
|
|
||||||
- At skill start, check for a ledger:
|
- At skill start, check for a ledger:
|
||||||
`cat "$(git rev-parse --git-path sdd)/progress.md"`. Tasks listed there
|
`cat "$(git rev-parse --show-toplevel)/.superpowers/sdd/progress.md"`. Tasks listed there
|
||||||
as complete are DONE — do not re-dispatch them; resume at the first task
|
as complete are DONE — do not re-dispatch them; resume at the first task
|
||||||
not marked complete.
|
not marked complete.
|
||||||
- When a task's review comes back clean, append one line to the ledger in
|
- When a task's review comes back clean, append one line to the ledger in
|
||||||
|
|||||||
@@ -5,9 +5,8 @@
|
|||||||
# tasks intact.
|
# tasks intact.
|
||||||
#
|
#
|
||||||
# Usage: review-package BASE HEAD [OUTFILE]
|
# Usage: review-package BASE HEAD [OUTFILE]
|
||||||
# Default OUTFILE: <git-dir>/sdd/review-<base7>..<head7>.diff — unique per
|
# Default OUTFILE: <repo-root>/.superpowers/sdd/review-<base7>..<head7>.diff
|
||||||
# repo instance and per range, so concurrent sessions cannot collide and a
|
# (named per range, so a re-review after fixes gets a distinct fresh file).
|
||||||
# re-review after fixes always gets a distinctly named fresh file.
|
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
if [ $# -lt 2 ] || [ $# -gt 3 ]; then
|
if [ $# -lt 2 ] || [ $# -gt 3 ]; then
|
||||||
@@ -24,9 +23,7 @@ git rev-parse --verify --quiet "$head" >/dev/null || { echo "bad HEAD: $head" >&
|
|||||||
if [ $# -eq 3 ]; then
|
if [ $# -eq 3 ]; then
|
||||||
out=$3
|
out=$3
|
||||||
else
|
else
|
||||||
dir=$(git rev-parse --git-path sdd)
|
dir=$("$(cd "$(dirname "$0")" && pwd)/sdd-workspace")
|
||||||
mkdir -p "$dir"
|
|
||||||
dir=$(cd "$dir" && pwd)
|
|
||||||
out="$dir/review-$(git rev-parse --short "$base")..$(git rev-parse --short "$head").diff"
|
out="$dir/review-$(git rev-parse --short "$base")..$(git rev-parse --short "$head").diff"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -4,8 +4,8 @@
|
|||||||
# through the controller's context.
|
# through the controller's context.
|
||||||
#
|
#
|
||||||
# Usage: task-brief PLAN_FILE TASK_NUMBER [OUTFILE]
|
# Usage: task-brief PLAN_FILE TASK_NUMBER [OUTFILE]
|
||||||
# Default OUTFILE: <git-dir>/sdd/task-<N>-brief.md — unique per repo
|
# Default OUTFILE: <repo-root>/.superpowers/sdd/task-<N>-brief.md
|
||||||
# instance, so concurrent sessions cannot collide.
|
# (per worktree; concurrent runs in the same working tree share it).
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
if [ $# -lt 2 ] || [ $# -gt 3 ]; then
|
if [ $# -lt 2 ] || [ $# -gt 3 ]; then
|
||||||
@@ -20,9 +20,7 @@ n=$2
|
|||||||
if [ $# -eq 3 ]; then
|
if [ $# -eq 3 ]; then
|
||||||
out=$3
|
out=$3
|
||||||
else
|
else
|
||||||
dir=$(git rev-parse --git-path sdd)
|
dir=$("$(cd "$(dirname "$0")" && pwd)/sdd-workspace")
|
||||||
mkdir -p "$dir"
|
|
||||||
dir=$(cd "$dir" && pwd)
|
|
||||||
out="$dir/task-${n}-brief.md"
|
out="$dir/task-${n}-brief.md"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -71,6 +71,42 @@ main() {
|
|||||||
echo " staged: $staged"
|
echo " staged: $staged"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
cat > "$repo/plan.md" <<'PLAN'
|
||||||
|
# Plan
|
||||||
|
|
||||||
|
## Task 1: First thing
|
||||||
|
|
||||||
|
Do the first thing.
|
||||||
|
PLAN
|
||||||
|
|
||||||
|
local brief_out brief_path
|
||||||
|
brief_out="$(cd "$repo" && "$SDD_SCRIPTS/task-brief" plan.md 1)"
|
||||||
|
brief_path="$(printf '%s\n' "$brief_out" | sed -n 's/^wrote \(.*\): [0-9][0-9]* lines$/\1/p')"
|
||||||
|
case "$brief_path" in
|
||||||
|
"$repo/.superpowers/sdd/"*) pass "task-brief writes its brief under the workspace" ;;
|
||||||
|
*)
|
||||||
|
fail "task-brief writes its brief under the workspace"
|
||||||
|
echo " got: $brief_path"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
local git_id=(-c user.email=t@example.com -c user.name=t -c commit.gpgsign=false)
|
||||||
|
( cd "$repo" \
|
||||||
|
&& git add plan.md \
|
||||||
|
&& git "${git_id[@]}" commit -qm c1 \
|
||||||
|
&& printf 'y\n' > f && git add f \
|
||||||
|
&& git "${git_id[@]}" commit -qm c2 )
|
||||||
|
local rp_out rp_path
|
||||||
|
rp_out="$(cd "$repo" && "$SDD_SCRIPTS/review-package" HEAD~1 HEAD)"
|
||||||
|
rp_path="$(printf '%s\n' "$rp_out" | sed -n 's/^wrote \(.*\): [0-9].*$/\1/p')"
|
||||||
|
case "$rp_path" in
|
||||||
|
"$repo/.superpowers/sdd/"*) pass "review-package writes its diff under the workspace" ;;
|
||||||
|
*)
|
||||||
|
fail "review-package writes its diff under the workspace"
|
||||||
|
echo " got: $rp_path"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
if [[ "$FAILURES" -ne 0 ]]; then
|
if [[ "$FAILURES" -ne 0 ]]; then
|
||||||
echo "FAILED: $FAILURES assertion(s)."
|
echo "FAILED: $FAILURES assertion(s)."
|
||||||
|
|||||||
Reference in New Issue
Block a user