mirror of
https://github.com/obra/superpowers.git
synced 2026-08-29 09:59:20 +00:00
fix(sdd): ownership markers stop same-basename plans sharing a workspace
sdd-workspace slugged workspaces by basename alone, so docs/alpha/plan.md and docs/beta/plan.md resolved to one directory and task-brief silently overwrote the other plan's brief — the single gitignored source of task requirements, unrecoverable once clobbered. Each workspace now records its owning plan in a plan-path marker (repo-relative in-repo, absolute outside). Lookup keeps basename slugs and existing behavior for the common case: a markerless workspace is adopted in place (no migration break for in-flight plans), a marker naming this plan is a match, and a marker naming a different plan disambiguates with the plan's parent-directory name, then a counter. Plan paths are normalized (CDPATH-guarded physical cd) so relative, absolute, and ../ spellings of one plan share one workspace. task-brief and review-package delegate to sdd-workspace and need no changes. SKILL.md's workspace bullet no longer promises the exact <plan-basename> path, since disambiguated workspaces differ. Reported by @CRGDan; reproduction and test groundwork by @crisnahine in PR #2120. Fixes #2045
This commit is contained in:
Jesse Vincent
@@ -189,6 +189,128 @@ PLAN
|
||||
echo " status: $wt_status"
|
||||
fi
|
||||
|
||||
# --- Ownership markers: two plans with the same basename (#2045) ---
|
||||
mkdir -p "$repo/docs/alpha" "$repo/docs/beta"
|
||||
cat > "$repo/docs/alpha/plan.md" <<'PLAN'
|
||||
# Alpha Plan
|
||||
|
||||
## Task 1: Alpha work
|
||||
|
||||
Alpha-only requirement text.
|
||||
PLAN
|
||||
cat > "$repo/docs/beta/plan.md" <<'PLAN'
|
||||
# Beta Plan
|
||||
|
||||
## Task 1: Beta work
|
||||
|
||||
Beta-only requirement text.
|
||||
PLAN
|
||||
|
||||
local dir_alpha dir_beta
|
||||
dir_alpha="$(cd "$repo" && "$SDD_SCRIPTS/sdd-workspace" docs/alpha/plan.md)"
|
||||
dir_beta="$(cd "$repo" && "$SDD_SCRIPTS/sdd-workspace" docs/beta/plan.md)"
|
||||
if [[ "$dir_alpha" != "$dir_beta" ]]; then
|
||||
pass "same-basename plans resolve to distinct workspaces"
|
||||
else
|
||||
fail "same-basename plans resolve to distinct workspaces"
|
||||
echo " alpha: $dir_alpha"
|
||||
echo " beta: $dir_beta"
|
||||
fi
|
||||
|
||||
( cd "$repo" && "$SDD_SCRIPTS/task-brief" docs/alpha/plan.md 1 >/dev/null )
|
||||
( cd "$repo" && "$SDD_SCRIPTS/task-brief" docs/beta/plan.md 1 >/dev/null )
|
||||
if grep -q "Alpha-only requirement text." "$dir_alpha/task-1-brief.md" 2>/dev/null \
|
||||
&& grep -q "Beta-only requirement text." "$dir_beta/task-1-brief.md" 2>/dev/null; then
|
||||
pass "same-basename plans keep both task briefs intact"
|
||||
else
|
||||
fail "same-basename plans keep both task briefs intact"
|
||||
echo " alpha brief: $(cat "$dir_alpha/task-1-brief.md" 2>/dev/null)"
|
||||
echo " beta brief: $(cat "$dir_beta/task-1-brief.md" 2>/dev/null)"
|
||||
fi
|
||||
|
||||
# --- Legacy adoption: pre-existing workspace without a marker ---
|
||||
printf '# Foo\n\n## Task 1: Foo\n\nFoo.\n' > "$repo/foo.md"
|
||||
mkdir -p "$repo/.superpowers/sdd/foo"
|
||||
printf 'ledger\n' > "$repo/.superpowers/sdd/foo/progress.md"
|
||||
local dir_foo
|
||||
dir_foo="$(cd "$repo" && "$SDD_SCRIPTS/sdd-workspace" foo.md)"
|
||||
if [[ "$dir_foo" == "$repo/.superpowers/sdd/foo" \
|
||||
&& -f "$dir_foo/progress.md" \
|
||||
&& "$(cat "$dir_foo/plan-path" 2>/dev/null)" == "foo.md" ]]; then
|
||||
pass "legacy markerless workspace is adopted in place and marked"
|
||||
else
|
||||
fail "legacy markerless workspace is adopted in place and marked"
|
||||
echo " dir: $dir_foo"
|
||||
echo " marker: $(cat "$dir_foo/plan-path" 2>/dev/null)"
|
||||
fi
|
||||
|
||||
# --- Ownership conflict: marker names a different plan ---
|
||||
printf '# Bar\n\n## Task 1: Bar\n\nBar.\n' > "$repo/bar.md"
|
||||
mkdir -p "$repo/.superpowers/sdd/bar"
|
||||
printf 'somewhere-else/bar.md\n' > "$repo/.superpowers/sdd/bar/plan-path"
|
||||
printf 'other ledger\n' > "$repo/.superpowers/sdd/bar/progress.md"
|
||||
local dir_bar
|
||||
dir_bar="$(cd "$repo" && "$SDD_SCRIPTS/sdd-workspace" bar.md)"
|
||||
if [[ "$dir_bar" == "$repo/.superpowers/sdd/bar-repo" \
|
||||
&& "$(cat "$dir_bar/plan-path" 2>/dev/null)" == "bar.md" ]]; then
|
||||
pass "owned workspace disambiguates with parent-dir suffix"
|
||||
else
|
||||
fail "owned workspace disambiguates with parent-dir suffix"
|
||||
echo " got: $dir_bar"
|
||||
fi
|
||||
if [[ "$(cat "$repo/.superpowers/sdd/bar/plan-path")" == "somewhere-else/bar.md" \
|
||||
&& "$(cat "$repo/.superpowers/sdd/bar/progress.md")" == "other ledger" ]]; then
|
||||
pass "conflicting plan leaves the original workspace untouched"
|
||||
else
|
||||
fail "conflicting plan leaves the original workspace untouched"
|
||||
fi
|
||||
|
||||
# --- Counter fallback: parent-suffixed workspace is owned too ---
|
||||
printf '# Baz\n\n## Task 1: Baz\n\nBaz.\n' > "$repo/baz.md"
|
||||
mkdir -p "$repo/.superpowers/sdd/baz" "$repo/.superpowers/sdd/baz-repo"
|
||||
printf 'one/baz.md\n' > "$repo/.superpowers/sdd/baz/plan-path"
|
||||
printf 'two/baz.md\n' > "$repo/.superpowers/sdd/baz-repo/plan-path"
|
||||
local dir_baz
|
||||
dir_baz="$(cd "$repo" && "$SDD_SCRIPTS/sdd-workspace" baz.md)"
|
||||
if [[ "$dir_baz" == "$repo/.superpowers/sdd/baz-repo-2" \
|
||||
&& "$(cat "$dir_baz/plan-path" 2>/dev/null)" == "baz.md" ]]; then
|
||||
pass "double conflict falls back to a counter suffix"
|
||||
else
|
||||
fail "double conflict falls back to a counter suffix"
|
||||
echo " got: $dir_baz"
|
||||
fi
|
||||
|
||||
# --- Same plan spelled differently resolves to one workspace ---
|
||||
local dir_rel dir_abs dir_dotdot
|
||||
dir_rel="$(cd "$repo" && "$SDD_SCRIPTS/sdd-workspace" docs/alpha/plan.md)"
|
||||
dir_abs="$(cd "$repo" && "$SDD_SCRIPTS/sdd-workspace" "$repo/docs/alpha/plan.md")"
|
||||
dir_dotdot="$(cd "$repo/docs/beta" && "$SDD_SCRIPTS/sdd-workspace" ../alpha/plan.md)"
|
||||
if [[ "$dir_rel" == "$dir_abs" && "$dir_rel" == "$dir_dotdot" \
|
||||
&& "$(cat "$dir_rel/plan-path" 2>/dev/null)" == "docs/alpha/plan.md" ]]; then
|
||||
pass "relative, absolute, and ../ spellings share one workspace and marker"
|
||||
else
|
||||
fail "relative, absolute, and ../ spellings share one workspace and marker"
|
||||
echo " rel: $dir_rel"
|
||||
echo " abs: $dir_abs"
|
||||
echo " dotdot: $dir_dotdot"
|
||||
echo " marker: $(cat "$dir_rel/plan-path" 2>/dev/null)"
|
||||
fi
|
||||
|
||||
# --- Out-of-repo plans keep working, marker holds the absolute path ---
|
||||
mkdir -p "$TEST_ROOT/outside"
|
||||
printf '# Remote\n\n## Task 1: Remote\n\nRemote.\n' > "$TEST_ROOT/outside/remote-plan.md"
|
||||
local outside_abs dir_out
|
||||
outside_abs="$(cd "$TEST_ROOT/outside" && pwd -P)/remote-plan.md"
|
||||
dir_out="$(cd "$repo" && "$SDD_SCRIPTS/sdd-workspace" "$TEST_ROOT/outside/remote-plan.md")"
|
||||
if [[ "$dir_out" == "$repo/.superpowers/sdd/remote-plan" \
|
||||
&& "$(cat "$dir_out/plan-path" 2>/dev/null)" == "$outside_abs" ]]; then
|
||||
pass "out-of-repo plan gets a basename slug and an absolute-path marker"
|
||||
else
|
||||
fail "out-of-repo plan gets a basename slug and an absolute-path marker"
|
||||
echo " dir: $dir_out"
|
||||
echo " marker: $(cat "$dir_out/plan-path" 2>/dev/null)"
|
||||
fi
|
||||
|
||||
echo ""
|
||||
if [[ "$FAILURES" -ne 0 ]]; then
|
||||
echo "FAILED: $FAILURES assertion(s)."
|
||||
|
||||
Reference in New Issue
Block a user