fix(upgrade): migrations see the real install dir; stash can no longer resurrect stale renders

Two ways the v1.67 render-dirt cleanup was inert in the wired upgrade flow:

- Both migration runners invoked `bash "$migration"` without
  GSTACK_INSTALL_DIR, so migrations that clean the INSTALL (v1.67.0.0.sh
  defaults to ~/.claude/skills/gstack when unset) silently no-oped for
  repo-local installs. setup now passes "$SOURCE_GSTACK_DIR" and the
  /gstack-upgrade Step 4.75 runner passes the detected "$INSTALL_DIR".
- /gstack-upgrade Step 4 ran `git stash` BEFORE reset+setup, so the tree
  was always clean by the time the migration ran, the legacy render dirt
  landed in stash@{0}, and Step 4's own note then told the user to
  `git stash pop` — restoring stale generated SKILL.md over the fresh
  checkout permanently. Step 4 now discards the render footprint
  (generated SKILL.md and sections/*.md modifications only, the same
  classification as migrations/v1.67.0.0.sh) BEFORE stashing, so the stash
  only ever carries real user changes; the stash-pop note says the render
  dirt was discarded and regenerates. The migration stays for manual
  git-pull flows.

Template change regenerated for all 3 hosts (claude tree checked in;
codex/factory trees are gitignored render outputs).

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Garry Tan
2026-08-16 14:13:15 -07:00
co-authored by Claude Fable 5
parent 2f8638a3e2
commit 68006e219c
3 changed files with 35 additions and 5 deletions
+5 -1
View File
@@ -1731,7 +1731,11 @@ if [ -d "$MIGRATIONS_DIR" ] && [ "$CURRENT_VERSION" != "unknown" ] && [ "$LAST_S
if [ "$(printf '%s\n%s' "$LAST_SETUP_VERSION" "$m_ver" | sort -V | head -1)" = "$LAST_SETUP_VERSION" ] && [ "$LAST_SETUP_VERSION" != "$m_ver" ] \
&& [ "$(printf '%s\n%s' "$m_ver" "$CURRENT_VERSION" | sort -V | tail -1)" = "$CURRENT_VERSION" ]; then
echo " running migration $m_ver..."
bash "$migration" || echo " warning: migration $m_ver had errors (non-fatal)"
# GSTACK_INSTALL_DIR: migrations that clean the INSTALL (not just
# ~/.gstack state) default to ~/.claude/skills/gstack when unset —
# a repo-local ./setup would silently no-op them against the wrong
# tree without this.
GSTACK_INSTALL_DIR="$SOURCE_GSTACK_DIR" bash "$migration" || echo " warning: migration $m_ver had errors (non-fatal)"
fi
done
fi