Install Agent Skills into all 3 AI CLIs, and use Bun instead of npm
Adds scripts/install-skills.sh: pulls this repo's extensions/ skill bundles (SKILL.md-format) at workspace startup and installs them into Claude Code (~/.claude/skills), GitHub Copilot CLI (~/.copilot/skills), and Antigravity CLI (~/.gemini/config/skills). Every env gets the common awesome-skills-plugin bundle; COBOL/3D/TTRPG additionally get their matching skill(s) from custom-specialty-plugin via a per-template SPECIALTY_SKILLS value. Each template also installs Bun via a coder_script and hooks ~/.bun/bin onto PATH in .bashrc (the bun.sh installer doesn't reliably do this in a scripted shell). The CLI setup wizard now uses `bun install -g` instead of `npm install -g` for GitHub Copilot CLI and Claude Code CLI. All six templates re-validated with terraform init/validate against the real coder-server container on octo-winsrv. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
@@ -19,7 +19,8 @@ WIZARD_DONE_FILE="${HOME}/.cache/coder-cli-wizard/done"
|
||||
FORCE=0
|
||||
[ "${1:-}" = "--force" ] && FORCE=1
|
||||
|
||||
export PATH="${HOME}/.local/bin:${PATH}"
|
||||
export BUN_INSTALL="${HOME}/.bun"
|
||||
export PATH="${BUN_INSTALL}/bin:${HOME}/.local/bin:${PATH}"
|
||||
|
||||
# Only bother interactive shells with a real terminal attached, and only until
|
||||
# the user marks the wizard as done.
|
||||
@@ -53,16 +54,16 @@ echo "==================================================================="
|
||||
# --- GitHub Copilot CLI ---
|
||||
if command -v copilot >/dev/null 2>&1; then
|
||||
echo "GitHub Copilot CLI already installed, skipping."
|
||||
elif command -v npm >/dev/null 2>&1; then
|
||||
elif command -v bun >/dev/null 2>&1; then
|
||||
if ask_yes_no "Install GitHub Copilot CLI and log in?"; then
|
||||
if npm install -g @github/copilot; then
|
||||
if bun install -g @github/copilot; then
|
||||
copilot login || echo "Install succeeded but login didn't complete. Retry any time with: copilot login"
|
||||
else
|
||||
echo "Copilot CLI install failed. Retry later with: npm install -g @github/copilot && copilot login"
|
||||
echo "Copilot CLI install failed. Retry later with: bun install -g @github/copilot && copilot login"
|
||||
fi
|
||||
fi
|
||||
else
|
||||
echo "Skipping GitHub Copilot CLI: npm not found on this workspace image."
|
||||
echo "Skipping GitHub Copilot CLI: bun not found on this workspace image."
|
||||
fi
|
||||
|
||||
# --- Google Antigravity CLI (agy) ---
|
||||
@@ -82,17 +83,17 @@ fi
|
||||
# --- Claude Code CLI ---
|
||||
if command -v claude >/dev/null 2>&1; then
|
||||
echo "Claude Code CLI already installed, skipping."
|
||||
elif command -v npm >/dev/null 2>&1; then
|
||||
elif command -v bun >/dev/null 2>&1; then
|
||||
if ask_yes_no "Install Claude Code CLI and log in?"; then
|
||||
if npm install -g @anthropic-ai/claude-code; then
|
||||
if bun install -g @anthropic-ai/claude-code; then
|
||||
echo "Launching 'claude' once to complete sign-in (use /login if not prompted; Ctrl+C to exit when done)..."
|
||||
claude || echo "Sign-in didn't complete. Retry any time by running: claude"
|
||||
else
|
||||
echo "Claude Code CLI install failed. Retry later with: npm install -g @anthropic-ai/claude-code"
|
||||
echo "Claude Code CLI install failed. Retry later with: bun install -g @anthropic-ai/claude-code"
|
||||
fi
|
||||
fi
|
||||
else
|
||||
echo "Skipping Claude Code CLI: npm not found on this workspace image."
|
||||
echo "Skipping Claude Code CLI: bun not found on this workspace image."
|
||||
fi
|
||||
|
||||
echo ""
|
||||
|
||||
@@ -0,0 +1,68 @@
|
||||
#!/usr/bin/env bash
|
||||
# Installs this repo's Agent Skills (extensions/{awesome-skills-plugin,
|
||||
# custom-specialty-plugin}/skills/*, each a SKILL.md-based skill directory)
|
||||
# into every AI CLI's personal skills directory:
|
||||
#
|
||||
# Claude Code CLI -> ~/.claude/skills/<name>/
|
||||
# GitHub Copilot CLI -> ~/.copilot/skills/<name>/
|
||||
# Antigravity CLI -> ~/.gemini/config/skills/<name>/ (per antigravity.google/docs/skills;
|
||||
# worth a spot-check if agy doesn't pick these up, some third-party
|
||||
# docs disagree on the exact path)
|
||||
#
|
||||
# Run once at workspace startup via coder_script. Pulls this repo fresh from
|
||||
# Gitea rather than embedding ~2.5MB of skill files into Terraform state.
|
||||
#
|
||||
# Env vars:
|
||||
# SPECIALTY_SKILLS - optional space-separated skill names from
|
||||
# extensions/custom-specialty-plugin/skills/ to install in addition to
|
||||
# the common awesome-skills-plugin bundle (every env gets that one).
|
||||
|
||||
set -e
|
||||
|
||||
REPO_ZIP_URL="https://git.octoturge.com/octoturge/Profiles-for-Coder/archive/main.zip"
|
||||
ZIP_PATH="/tmp/coder-skills-src.zip"
|
||||
WORK_DIR="/tmp/coder-skills-src"
|
||||
|
||||
rm -rf "$WORK_DIR" "$ZIP_PATH"
|
||||
curl -fsSL "$REPO_ZIP_URL" -o "$ZIP_PATH"
|
||||
mkdir -p "$WORK_DIR"
|
||||
unzip -q -o "$ZIP_PATH" -d "$WORK_DIR"
|
||||
|
||||
INNER_DIR=$(find "$WORK_DIR" -mindepth 1 -maxdepth 1 -type d | head -n1)
|
||||
if [ -z "$INNER_DIR" ]; then
|
||||
echo "install-skills: couldn't find extracted repo contents, skipping." >&2
|
||||
rm -rf "$WORK_DIR" "$ZIP_PATH"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
TARGET_DIRS=("$HOME/.claude/skills" "$HOME/.copilot/skills" "$HOME/.gemini/config/skills")
|
||||
for dir in "${TARGET_DIRS[@]}"; do
|
||||
mkdir -p "$dir"
|
||||
done
|
||||
|
||||
# Common skill bundle, installed for every environment.
|
||||
COMMON_SKILLS_SRC="$INNER_DIR/extensions/awesome-skills-plugin/skills"
|
||||
if [ -d "$COMMON_SKILLS_SRC" ]; then
|
||||
for dir in "${TARGET_DIRS[@]}"; do
|
||||
cp -r "$COMMON_SKILLS_SRC/." "$dir/"
|
||||
done
|
||||
echo "install-skills: installed common skill bundle into ${TARGET_DIRS[*]}"
|
||||
else
|
||||
echo "install-skills: common skill bundle not found at $COMMON_SKILLS_SRC, skipping." >&2
|
||||
fi
|
||||
|
||||
# Environment-specific specialty skills, if any were requested.
|
||||
for skill in ${SPECIALTY_SKILLS:-}; do
|
||||
SRC="$INNER_DIR/extensions/custom-specialty-plugin/skills/$skill"
|
||||
if [ -d "$SRC" ]; then
|
||||
for dir in "${TARGET_DIRS[@]}"; do
|
||||
cp -r "$SRC" "$dir/$skill"
|
||||
done
|
||||
echo "install-skills: installed specialty skill '$skill'"
|
||||
else
|
||||
echo "install-skills: specialty skill '$skill' not found at $SRC, skipping." >&2
|
||||
fi
|
||||
done
|
||||
|
||||
rm -rf "$WORK_DIR" "$ZIP_PATH"
|
||||
echo "install-skills: done."
|
||||
Reference in New Issue
Block a user