Tom Boucher cfff82dcd2 fix(workflow): protect orchestrator files during worktree merge (#1756) (#1764) ...

When a worktree branch outlives a milestone transition, git merge
silently overwrites STATE.md and ROADMAP.md with stale content and
resurrects archived phase directories. Fix by backing up orchestrator
files before merge, restoring after, and detecting resurrected files.

Fixes #1761

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>

2026-04-05 11:11:38 -04:00

..

add-phase.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

add-tests.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

add-todo.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

analyze-dependencies.md

test: add stale /gsd: colon reference regression guard (#1753)

2026-04-05 10:23:41 -04:00

audit-milestone.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

audit-uat.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

autonomous.md

test: add stale /gsd: colon reference regression guard (#1753)

2026-04-05 10:23:41 -04:00

check-todos.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

cleanup.md

fix: Windows shell robustness, project_root detection, and hook stdin safety (#1343)

2026-03-23 20:20:15 -04:00

complete-milestone.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

diagnose-issues.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

discovery-phase.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

discuss-phase-assumptions.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

discuss-phase-power.md

test: add stale /gsd: colon reference regression guard (#1753)

2026-04-05 10:23:41 -04:00

discuss-phase.md

feat(references): add shared behavioral docs and wire into workflows (#1658)

2026-04-04 14:16:27 -04:00

do.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

docs-update.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

execute-phase.md

fix(workflow): protect orchestrator files during worktree merge (#1756) (#1764)

2026-04-05 11:11:38 -04:00

execute-plan.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

fast.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

forensics.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

health.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

help.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

inbox.md

test: add stale /gsd: colon reference regression guard (#1753)

2026-04-05 10:23:41 -04:00

insert-phase.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

list-phase-assumptions.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

list-workspaces.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

manager.md

test: add stale /gsd: colon reference regression guard (#1753)

2026-04-05 10:23:41 -04:00

map-codebase.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

milestone-summary.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

new-milestone.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

new-project.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

new-workspace.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

next.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

node-repair.md

feat: add node repair operator for autonomous task failure recovery (#1016)

2026-03-12 11:35:45 -06:00

note.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

pause-work.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

plan-milestone-gaps.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

plan-phase.md

feat(references): add shared behavioral docs and wire into workflows (#1658)

2026-04-04 14:16:27 -04:00

plant-seed.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

pr-branch.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

profile-user.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

progress.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

quick.md

fix(workflow): protect orchestrator files during worktree merge (#1756) (#1764)

2026-04-05 11:11:38 -04:00

remove-phase.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

remove-workspace.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

research-phase.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

resume-project.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

review.md

fix: add environment-based runtime detection for /gsd-review (#1463)

2026-04-04 14:15:56 -04:00

secure-phase.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

session-report.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

settings.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

ship.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

stats.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

transition.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

ui-phase.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

ui-review.md

test: add stale /gsd: colon reference regression guard (#1753)

2026-04-05 10:23:41 -04:00

update.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

validate-phase.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00

verify-phase.md

fix(verifier): filter gaps addressed in later milestone phases (#1624) (#1643)

2026-04-04 07:23:36 -04:00

verify-work.md

fix: replace /gsd: slash command format with /gsd- skill format in all user-facing content (#1579)

2026-04-04 07:24:31 -04:00