48ec6cde83
- Fix rollback to handle partial branch creation (skills-yylq) - Pre-compute branch/worktree names before createWorktree - Use gitBranchExists() and dirExists() for robust cleanup - Add step context to error messages (skills-ux6h) - Track currentStep through spawn process - Error now shows which step failed - Deduplicate success output block (skills-qjln) - Consolidated to single block with conditional review line - Simplify use-skills.sh auth symlink (skills-475o) - One-liner with || instead of nested if - Fix inconsistent default branch in git.nim (skills-fext) - Changed default from "origin/integration" to "main" Closes skills-yylq, skills-ux6h, skills-qjln, skills-475o, skills-fext Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
68 lines
2 KiB
Bash
Executable file
68 lines
2 KiB
Bash
Executable file
#!/usr/bin/env bash
|
|
# Helper for per-repo skill deployment via direnv
|
|
# Source this from your .envrc or copy the functions
|
|
#
|
|
# Usage in .envrc:
|
|
# source ~/proj/skills/bin/use-skills.sh
|
|
# export CODEX_HOME="$PWD/.codex" # Optional: per-repo Codex skills
|
|
# use_skills worklog web-search
|
|
#
|
|
# Or with manifest file:
|
|
# source ~/proj/skills/bin/use-skills.sh
|
|
# load_skills_from_manifest
|
|
|
|
set -euo pipefail
|
|
|
|
# Default to per-repo Codex skills unless overridden by the caller.
|
|
export CODEX_HOME="${CODEX_HOME:-$PWD/.codex}"
|
|
|
|
# Ensure global auth is available in per-repo CODEX_HOME to prevent login resets
|
|
if [[ -n "${CODEX_HOME:-}" && -f "$HOME/.codex/auth.json" ]]; then
|
|
mkdir -p "$CODEX_HOME"
|
|
# Check before linking to avoid unnecessary unlink+link on every direnv trigger
|
|
[[ -e "$CODEX_HOME/auth.json" ]] || ln -sf "$HOME/.codex/auth.json" "$CODEX_HOME/auth.json"
|
|
fi
|
|
|
|
# Default repo - uses local git, override with SKILLS_REPO for remote
|
|
SKILLS_REPO="${SKILLS_REPO:-git+file://$HOME/proj/skills}"
|
|
|
|
# Install a single skill via nix build + symlink
|
|
use_skill() {
|
|
local skill="$1"
|
|
local out
|
|
|
|
out=$(nix build --print-out-paths --no-link "${SKILLS_REPO}#${skill}") || {
|
|
echo "use_skill: failed to build ${skill}" >&2
|
|
return 1
|
|
}
|
|
|
|
mkdir -p .claude/skills .opencode/skills
|
|
ln -sfn "$out" ".claude/skills/${skill}"
|
|
ln -sfn "$out" ".opencode/skills/${skill}"
|
|
if [[ -n "${CODEX_HOME:-}" ]]; then
|
|
mkdir -p "${CODEX_HOME}/skills"
|
|
ln -sfn "$out" "${CODEX_HOME}/skills/${skill}"
|
|
fi
|
|
echo "use_skill: ${skill}"
|
|
}
|
|
|
|
# Install multiple skills
|
|
use_skills() {
|
|
for skill in "$@"; do
|
|
use_skill "$skill" || return 1
|
|
done
|
|
}
|
|
|
|
# Load skills from .skills manifest file
|
|
load_skills_from_manifest() {
|
|
[[ ! -f .skills ]] && return 0
|
|
while IFS= read -r skill || [[ -n "$skill" ]]; do
|
|
# Skip empty lines and comments
|
|
[[ -z "$skill" || "$skill" =~ ^[[:space:]]*# ]] && continue
|
|
# Strip inline comments and whitespace
|
|
skill="${skill%%#*}"
|
|
skill="${skill// /}"
|
|
[[ -n "$skill" ]] && { use_skill "$skill" || return 1; }
|
|
done < .skills
|
|
}
|