Skip to content

Fix generated Codex skill paths #2115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
msr-hickory wants to merge 1 commit into from
Closed

Fix generated Codex skill paths #2115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
124 changes: 62 additions & 62 deletions SKILL.md
View file
Open in desktop

Large diffs are not rendered by default.

256 changes: 129 additions & 127 deletions autoplan/SKILL.md
View file
Open in desktop

Large diffs are not rendered by default.

141 changes: 72 additions & 69 deletions benchmark-models/SKILL.md
View file
Open in desktop

Large diffs are not rendered by default.

128 changes: 65 additions & 63 deletions benchmark/SKILL.md
View file
Open in desktop

Large diffs are not rendered by default.

124 changes: 62 additions & 62 deletions browse/SKILL.md
View file
Open in desktop

Large diffs are not rendered by default.

136 changes: 68 additions & 68 deletions canary/SKILL.md
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions careful/SKILL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ hooks:
- type: command
command: "bash ${CLAUDE_SKILL_DIR}/bin/check-careful.sh"
statusMessage: "Checking for destructive commands..."
sensitive: true
---
<!-- AUTO-GENERATED from SKILL.md.tmpl — do not edit directly -->
<!-- Regenerate: bun run gen:skill-docs -->
Expand Down
174 changes: 87 additions & 87 deletions codex/SKILL.md
View file
Open in desktop

Large diffs are not rendered by default.

136 changes: 68 additions & 68 deletions context-restore/SKILL.md
View file
Open in desktop

Large diffs are not rendered by default.

144 changes: 72 additions & 72 deletions context-save/SKILL.md
View file
Open in desktop

Large diffs are not rendered by default.

156 changes: 81 additions & 75 deletions cso/SKILL.md
View file
Open in desktop

Large diffs are not rendered by default.

180 changes: 90 additions & 90 deletions design-consultation/SKILL.md
View file
Open in desktop

Large diffs are not rendered by default.

151 changes: 77 additions & 74 deletions design-html/SKILL.md
View file
Open in desktop

Large diffs are not rendered by default.

176 changes: 88 additions & 88 deletions design-review/SKILL.md
View file
Open in desktop

Large diffs are not rendered by default.

146 changes: 73 additions & 73 deletions design-shotgun/SKILL.md
View file
Open in desktop

Large diffs are not rendered by default.

156 changes: 80 additions & 76 deletions devex-review/SKILL.md
View file
Open in desktop

Large diffs are not rendered by default.

144 changes: 72 additions & 72 deletions document-release/SKILL.md
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion freeze/SKILL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ echo "$FREEZE_DIR"
2. Ensure trailing slash and save to the freeze state file:
```bash
FREEZE_DIR="${FREEZE_DIR%/}/"
eval "$(~/.claude/skills/gstack/bin/gstack-paths)"
eval "$(~/.codex/skills/gstack/bin/gstack-paths)"
STATE_DIR="$GSTACK_STATE_ROOT"
mkdir -p "$STATE_DIR"
echo "$FREEZE_DIR" > "$STATE_DIR/freeze-dir.txt"
Expand Down
52 changes: 28 additions & 24 deletions gstack-upgrade/SKILL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ description: |
Upgrade gstack to the latest version. Detects global vs vendored install,
runs the upgrade, and shows what's new. Use when asked to "upgrade gstack",
"update gstack", or "get latest version".
Voice triggers (speech-to-text aliases): "upgrade the tools", "update the tools", "gee stack upgrade", "g stack upgrade".
voice-triggers:
- "upgrade the tools"
- "update the tools"
- "gee stack upgrade"
- "g stack upgrade"
triggers:
- upgrade gstack
- update gstack version
Expand Down Expand Up @@ -33,7 +37,7 @@ First, check if auto-upgrade is enabled:
```bash
_AUTO=""
[ "${GSTACK_AUTO_UPGRADE:-}" = "1" ] && _AUTO="true"
[ -z "$_AUTO" ] && _AUTO=$(~/.claude/skills/gstack/bin/gstack-config get auto_upgrade 2>/dev/null || true)
[ -z "$_AUTO" ] && _AUTO=$(~/.codex/skills/gstack/bin/gstack-config get auto_upgrade 2>/dev/null || true)
echo "AUTO_UPGRADE=$_AUTO"
```

Expand All @@ -47,7 +51,7 @@ echo "AUTO_UPGRADE=$_AUTO"

**If "Always keep me up to date":**
```bash
~/.claude/skills/gstack/bin/gstack-config set auto_upgrade true
~/.codex/skills/gstack/bin/gstack-config set auto_upgrade true
```
Tell user: "Auto-upgrade enabled. Future updates will install automatically." Then proceed to Step 2.

Expand All @@ -73,32 +77,32 @@ Tell user the snooze duration: "Next reminder in 24h" (or 48h or 1 week, dependi

**If "Never ask again":**
```bash
~/.claude/skills/gstack/bin/gstack-config set update_check false
~/.codex/skills/gstack/bin/gstack-config set update_check false
```
Tell user: "Update checks disabled. Run `~/.claude/skills/gstack/bin/gstack-config set update_check true` to re-enable."
Tell user: "Update checks disabled. Run `~/.codex/skills/gstack/bin/gstack-config set update_check true` to re-enable."
Continue with the current skill.

### Step 2: Detect install type

```bash
if [ -d "$HOME/.claude/skills/gstack/.git" ]; then
if [ -d "$HOME/.codex/skills/gstack/.git" ]; then
INSTALL_TYPE="global-git"
INSTALL_DIR="$HOME/.claude/skills/gstack"
INSTALL_DIR="$HOME/.codex/skills/gstack"
elif [ -d "$HOME/.gstack/repos/gstack/.git" ]; then
INSTALL_TYPE="global-git"
INSTALL_DIR="$HOME/.gstack/repos/gstack"
elif [ -d ".claude/skills/gstack/.git" ]; then
elif [ -d ".codex/skills/gstack/.git" ]; then
INSTALL_TYPE="local-git"
INSTALL_DIR=".claude/skills/gstack"
INSTALL_DIR=".codex/skills/gstack"
elif [ -d ".agents/skills/gstack/.git" ]; then
INSTALL_TYPE="local-git"
INSTALL_DIR=".agents/skills/gstack"
elif [ -d ".claude/skills/gstack" ]; then
elif [ -d ".codex/skills/gstack" ]; then
INSTALL_TYPE="vendored"
INSTALL_DIR=".claude/skills/gstack"
elif [ -d "$HOME/.claude/skills/gstack" ]; then
INSTALL_DIR=".codex/skills/gstack"
elif [ -d "$HOME/.codex/skills/gstack" ]; then
INSTALL_TYPE="vendored-global"
INSTALL_DIR="$HOME/.claude/skills/gstack"
INSTALL_DIR="$HOME/.codex/skills/gstack"
else
echo "ERROR: gstack not found"
exit 1
Expand Down Expand Up @@ -148,14 +152,14 @@ Use the install directory from Step 2. Check if there's also a local vendored co
```bash
_ROOT=$(git rev-parse --show-toplevel 2>/dev/null)
LOCAL_GSTACK=""
if [ -n "$_ROOT" ] && [ -d "$_ROOT/.claude/skills/gstack" ]; then
_RESOLVED_LOCAL=$(cd "$_ROOT/.claude/skills/gstack" && pwd -P)
if [ -n "$_ROOT" ] && [ -d "$_ROOT/.codex/skills/gstack" ]; then
_RESOLVED_LOCAL=$(cd "$_ROOT/.codex/skills/gstack" && pwd -P)
_RESOLVED_PRIMARY=$(cd "$INSTALL_DIR" && pwd -P)
if [ "$_RESOLVED_LOCAL" != "$_RESOLVED_PRIMARY" ]; then
LOCAL_GSTACK="$_ROOT/.claude/skills/gstack"
LOCAL_GSTACK="$_ROOT/.codex/skills/gstack"
fi
fi
_TEAM_MODE=$(~/.claude/skills/gstack/bin/gstack-config get team_mode 2>/dev/null || echo "false")
_TEAM_MODE=$(~/.codex/skills/gstack/bin/gstack-config get team_mode 2>/dev/null || echo "false")
echo "LOCAL_GSTACK=$LOCAL_GSTACK"
echo "TEAM_MODE=$_TEAM_MODE"
```
Expand All @@ -164,9 +168,9 @@ echo "TEAM_MODE=$_TEAM_MODE"

```bash
cd "$_ROOT"
git rm -r --cached .claude/skills/gstack/ 2>/dev/null || true
if ! grep -qF '.claude/skills/gstack/' .gitignore 2>/dev/null; then
echo '.claude/skills/gstack/' >> .gitignore
git rm -r --cached .codex/skills/gstack/ 2>/dev/null || true
if ! grep -qF '.codex/skills/gstack/' .gitignore 2>/dev/null; then
echo '.codex/skills/gstack/' >> .gitignore
fi
rm -rf "$LOCAL_GSTACK"
```
Expand All @@ -180,7 +184,7 @@ rm -rf "$LOCAL_GSTACK/.git"
cd "$LOCAL_GSTACK" && ./setup
rm -rf "$LOCAL_GSTACK.bak"
```
Tell user: "Also updated vendored copy at `$LOCAL_GSTACK` — commit `.claude/skills/gstack/` when you're ready."
Tell user: "Also updated vendored copy at `$LOCAL_GSTACK` — commit `.codex/skills/gstack/` when you're ready."

If `./setup` fails, restore from backup and warn the user:
```bash
Expand Down Expand Up @@ -252,8 +256,8 @@ When invoked directly as `/gstack-upgrade` (not from a preamble):

1. Force a fresh update check (bypass cache):
```bash
~/.claude/skills/gstack/bin/gstack-update-check --force 2>/dev/null || \
.claude/skills/gstack/bin/gstack-update-check --force 2>/dev/null || true
~/.codex/skills/gstack/bin/gstack-update-check --force 2>/dev/null || \
.codex/skills/gstack/bin/gstack-update-check --force 2>/dev/null || true
```
Use the output to determine if an upgrade is available.

Expand All @@ -274,6 +278,6 @@ LOCAL_VER=$(cat "$LOCAL_GSTACK/VERSION" 2>/dev/null || echo "unknown")
echo "PRIMARY=$PRIMARY_VER LOCAL=$LOCAL_VER"
```

**If versions differ:** follow the Step 4.5 sync bash block above to update the local copy from the primary. Tell user: "Global v{PRIMARY_VER} is up to date. Updated local vendored copy from v{LOCAL_VER} → v{PRIMARY_VER}. Commit `.claude/skills/gstack/` when you're ready."
**If versions differ:** follow the Step 4.5 sync bash block above to update the local copy from the primary. Tell user: "Global v{PRIMARY_VER} is up to date. Updated local vendored copy from v{LOCAL_VER} → v{PRIMARY_VER}. Commit `.codex/skills/gstack/` when you're ready."

**If versions match:** tell the user "You're on the latest version (v{PRIMARY_VER}). Global and local vendored copy are both up to date."
2 changes: 1 addition & 1 deletion guard/SKILL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ echo "$FREEZE_DIR"
2. Ensure trailing slash and save to the freeze state file:
```bash
FREEZE_DIR="${FREEZE_DIR%/}/"
eval "$(~/.claude/skills/gstack/bin/gstack-paths)"
eval "$(~/.codex/skills/gstack/bin/gstack-paths)"
STATE_DIR="$GSTACK_STATE_ROOT"
mkdir -p "$STATE_DIR"
echo "$FREEZE_DIR" > "$STATE_DIR/freeze-dir.txt"
Expand Down
Loading