T-OB74-stash-roundtrip-worktree-guard
Status: closed/superseded · Impact: medium · Complexity: small
A stash captured in one worktree (or session) can be re-applied into a
different worktree mid-run, landing unrelated changes where they don’t
belong. During T-0010 this surfaced as a stray stash-apply from a
parallel session producing UU merge conflicts on docs/skills/*.md
plus dropped planning-WIP copies, all of which forced manual triage.
Stash round-trips performed by the SDLC tooling (skills, scripts)
should carry a guard that they re-apply only in the worktree they were
captured from, so a stash never bleeds across worktrees or sessions.
A stray stash-apply from a parallel session landed in this task’s worktree mid-run (UU conflicts on
docs/skills/*.mdplus dropped planning WIP copies), forcing manual triage — stash round-trips need a guard that they re-apply in the worktree they were captured from.
— from T-0010 post-mortem (Friction and automation gaps)
TBD — receiver to fill before promoting from planning/draft.
Proposed
Section titled “Proposed”TBD — receiver to fill before promoting from planning/draft.
Approach
Section titled “Approach”TBD — receiver to fill before promoting from planning/draft.
Files to touch
Section titled “Files to touch”TBD — receiver to fill before promoting from planning/draft.
Acceptance criteria
Section titled “Acceptance criteria”TBD — receiver to fill before promoting from planning/draft.
Out of scope
Section titled “Out of scope”- none
Dependencies
Section titled “Dependencies”- none
Discovery context
Section titled “Discovery context”Spawned by /sdlc:spawn-task-pr on 2026-06-04 UTC from T-0010 in git@github.com:sksizer/dev.git.