Merge origin/main (v1.67.2.0) — v1.68.0.0 stays on top

CHANGELOG keeps both entries in release order (1.68.0.0 above 1.67.2.0);
VERSION and package.json keep the branch's higher claim. Generated
SKILL.md files verified byte-exact against a fresh regen from the merged
templates.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Garry Tan
2026-08-18 17:09:29 -07:00
co-authored by Claude Fable 5
37 changed files with 1193 additions and 71 deletions
+3 -3
View File
@@ -160,7 +160,7 @@ those commits. Gate it (#2517):
cd "$INSTALL_DIR"
STASH_OUTPUT=$(git stash 2>&1)
git reset --hard origin/main
./setup
{{SETUP_COMMAND}}
```
If `$STASH_OUTPUT` contains "Saved working directory", warn the user: "Note: local changes were stashed (any modified generated SKILL.md/sections files were discarded first — they regenerate on setup). Run `git stash pop` in the skill directory to restore your own changes."
@@ -171,7 +171,7 @@ TMP_DIR=$(mktemp -d)
git clone --depth 1 https://github.com/garrytan/gstack.git "$TMP_DIR/gstack"
mv "$INSTALL_DIR" "$INSTALL_DIR.bak"
mv "$TMP_DIR/gstack" "$INSTALL_DIR"
cd "$INSTALL_DIR" && ./setup
cd "$INSTALL_DIR" && {{SETUP_COMMAND}}
rm -rf "$INSTALL_DIR.bak" "$TMP_DIR"
```
@@ -211,7 +211,7 @@ Tell user: "Removed vendored copy at `$LOCAL_GSTACK` (team mode active — globa
mv "$LOCAL_GSTACK" "$LOCAL_GSTACK.bak"
cp -Rf "$INSTALL_DIR" "$LOCAL_GSTACK"
rm -rf "$LOCAL_GSTACK/.git"
cd "$LOCAL_GSTACK" && ./setup
cd "$LOCAL_GSTACK" && {{SETUP_COMMAND}}
rm -rf "$LOCAL_GSTACK.bak"
```
Tell user: "Also updated vendored copy at `$LOCAL_GSTACK` — commit `.claude/skills/gstack/` when you're ready."