diff --git a/lib/gstack-removed.sh b/lib/gstack-removed.sh index dfd8643..76e2976 100644 --- a/lib/gstack-removed.sh +++ b/lib/gstack-removed.sh @@ -19,6 +19,12 @@ # house permissions.deny is stricter (BDR-095) # design-shotgun mockups need OPENAI_API_KEY, absent # +# Also hosts the gstack helpers the two scripts share (gstack_skills and +# the park/unpark moves below). They live in this file because it is the +# only one the fixture suites copy next to profile.sh / toggle-external.sh: +# a new sourced file would be missing there. Each takes its directories as +# arguments (no reliance on the caller's globals). +# # No `set -euo pipefail` here (sourced lib, mirrors lib/detect-plugins.sh). # ============================================================ @@ -33,3 +39,47 @@ gstack_is_removed() { done return 1 } + +# gstack_skills — prints the directory basenames under +# /*/ that hold a SKILL.md; nothing when the dir is absent. +# Source of truth for "which skills belong to gstack". +gstack_skills() { + local src="$1" d + [ -d "$src" ] || return 0 + for d in "$src"/*/; do + [ -f "${d}SKILL.md" ] || continue + basename "$d" + done +} + +# gstack_parked_names — prints for every +# /gstack__ entry (a dangling symlink is skipped). +gstack_parked_names() { + local entry + [ -d "$1" ] || return 0 + for entry in "$1"/gstack__*; do + [ -e "$entry" ] || continue + basename "$entry" | sed 's/^gstack__//' + done +} + +# gstack_park — moves skills/ to +# skills-disabled/gstack__. A stale destination is clobbered first: +# gstack ./setup creates skills// as directories, so mv onto an +# existing dir would nest it (gstack__//) instead of renaming. +# Content is symlinks to the submodule, `gstack ./setup` regenerates it. +# Call as a plain statement (never `|| …`, `if`, `!`): errexit must stay on. +gstack_park() { + local skills_dir="$1" disabled_dir="$2" name="$3" + rm -rf "$disabled_dir/gstack__$name" + mv "$skills_dir/$name" "$disabled_dir/gstack__$name" +} + +# gstack_unpark — moves +# skills-disabled/gstack__ back to skills/, replacing whatever +# sits there. Same plain-statement rule as gstack_park. +gstack_unpark() { + local skills_dir="$1" disabled_dir="$2" name="$3" + rm -rf "${skills_dir:?}/${name:?}" + mv "$disabled_dir/gstack__$name" "$skills_dir/$name" +} diff --git a/lib/profile.sh b/lib/profile.sh index 9c1f911..20c9800 100755 --- a/lib/profile.sh +++ b/lib/profile.sh @@ -58,7 +58,9 @@ ACTIVE_CACHE="$REPO/.active-profile" # statusline reads this — keep fast (sin DEFAULT_PROFILE="full" # profile in force when none is selected (cache absent, empty, or legacy "none") # GSTACK_REMOVED + gstack_is_removed() — single source, honored by every -# "bring gstack back" path below (enable_all_gstack, enable_skill). +# "bring gstack back" path below (enable_all_gstack, enable_skill) — plus the +# gstack helpers shared with toggle-external.sh (gstack_skills, gstack_park, +# gstack_unpark, gstack_parked_names). # shellcheck source=lib/gstack-removed.sh disable=SC1091 source "$(dirname "${BASH_SOURCE[0]}")/gstack-removed.sh" @@ -181,16 +183,6 @@ read_profile() { done < "$file" } -# All skills bundled in skills-external/gstack/ -gstack_skills() { - local src="$REPO/skills-external/gstack" - [ -d "$src" ] || return 0 - for d in "$src"/*/; do - [ -f "${d}SKILL.md" ] || continue - basename "$d" - done -} - # Profile description (line starting with "# DESC: …") profile_desc() { local file="$1" @@ -318,73 +310,84 @@ profile_match() { # ── Enable / disable ────────────────────────────────────── +# Enables a gstack skill: unpark it, or link it from the submodule. +enable_gstack_skill() { + local skill="$1" + if gstack_is_removed "$skill"; then + warn "refusing to enable removed skill: $skill (lib/gstack-removed.sh \ +— a profile census failure, not a crash)" + return 0 + elif [ -e "$DISABLED_DIR/gstack__$skill" ]; then + gstack_unpark "$SKILLS_DIR" "$DISABLED_DIR" "$skill" + ok "enabled: $skill" + elif [ -e "$DISABLED_DIR/$skill" ]; then + rm -rf "${SKILLS_DIR:?}/${skill:?}" + mv "$DISABLED_DIR/$skill" "$SKILLS_DIR/$skill" + ok "enabled: $skill" + elif [ -e "$SKILLS_DIR/$skill" ]; then + : # already enabled — silent + elif [ -d "$GSTACK_SRC/$skill" ]; then + # gstack is OFF by default: its skills live only in the submodule, + # never pre-symlinked into skills/. A profile that lists this gstack + # skill activates it on demand by symlinking the submodule skill dir + # in. disable_gstack_not_in() parks it again when an unrelated profile + # is set. The gstack/bin + browse/dist infra it relies on is created + # by link.sh, independent of this. + ln -sf "$GSTACK_SRC/$skill" "$SKILLS_DIR/$skill" + ok "enabled: $skill (gstack on-demand)" + elif [ ! -d "$GSTACK_SRC" ]; then + warn "missing: $skill — gstack submodule absent, run: git submodule update --init" + else + warn "missing: $skill — not found in gstack submodule ($GSTACK_SRC)" + fi +} + +# Enables an external|personal skill: unpark it, or recreate the symlink. +enable_linked_skill() { + local skill="$1" type="$2" + if [ -e "$DISABLED_DIR/$skill" ]; then + rm -rf "${SKILLS_DIR:?}/${skill:?}" + mv "$DISABLED_DIR/$skill" "$SKILLS_DIR/$skill" + ok "enabled: $skill ($type)" + elif [ -e "$SKILLS_DIR/$skill" ]; then + : + elif [ "$type" = external ] && [ -d "$REPO/skills-external/$skill" ]; then + # Symlink never created (or hand-removed): recreate it from the + # vendored pack — mirrors toggle-external.sh's from-source path. + ln -sf "$REPO/skills-external/$skill" "$SKILLS_DIR/$skill" + ok "enabled: $skill (external, symlink created)" + else + warn "missing: $skill ($type)" + fi +} + +# Enables a plugin@ skill through the claude CLI. +enable_plugin_skill() { + local skill="$1" type="$2" + # type holds the marketplace: plugin@ + local marketplace="${type#plugin@}" + if [ "$(skill_status "$skill" "$type")" = "enabled" ]; then + : # already on + elif command -v "$CLAUDE_BIN" >/dev/null 2>&1; then + # CLI call stays inside the condition: a failing CLI must not abort + if grep -qiE "enabled|already" \ + <<<"$("$CLAUDE_BIN" plugin enable \ + "${skill}@${marketplace}" 2>&1)"; then + ok "enabled plugin: ${skill}@${marketplace}" + else + warn "could not enable plugin: ${skill}@${marketplace}" + fi + else + info "claude CLI not in PATH — manual: claude plugin enable ${skill}@${marketplace}" + fi +} + enable_skill() { local skill="$1" type="$2" case "$type" in - gstack) - if gstack_is_removed "$skill"; then - warn "refusing to enable removed skill: $skill (lib/gstack-removed.sh \ -— a profile census failure, not a crash)" - return 0 - elif [ -e "$DISABLED_DIR/gstack__$skill" ]; then - rm -rf "${SKILLS_DIR:?}/${skill:?}" - mv "$DISABLED_DIR/gstack__$skill" "$SKILLS_DIR/$skill" - ok "enabled: $skill" - elif [ -e "$DISABLED_DIR/$skill" ]; then - rm -rf "${SKILLS_DIR:?}/${skill:?}" - mv "$DISABLED_DIR/$skill" "$SKILLS_DIR/$skill" - ok "enabled: $skill" - elif [ -e "$SKILLS_DIR/$skill" ]; then - : # already enabled — silent - elif [ -d "$GSTACK_SRC/$skill" ]; then - # gstack is OFF by default: its skills live only in the submodule, - # never pre-symlinked into skills/. A profile that lists this gstack - # skill activates it on demand by symlinking the submodule skill dir - # in. disable_gstack_not_in() parks it again when an unrelated profile - # is set. The gstack/bin + browse/dist infra it relies on is created - # by link.sh, independent of this. - ln -sf "$GSTACK_SRC/$skill" "$SKILLS_DIR/$skill" - ok "enabled: $skill (gstack on-demand)" - elif [ ! -d "$GSTACK_SRC" ]; then - warn "missing: $skill — gstack submodule absent, run: git submodule update --init" - else - warn "missing: $skill — not found in gstack submodule ($GSTACK_SRC)" - fi - ;; - external|personal) - if [ -e "$DISABLED_DIR/$skill" ]; then - rm -rf "${SKILLS_DIR:?}/${skill:?}" - mv "$DISABLED_DIR/$skill" "$SKILLS_DIR/$skill" - ok "enabled: $skill ($type)" - elif [ -e "$SKILLS_DIR/$skill" ]; then - : - elif [ "$type" = external ] && [ -d "$REPO/skills-external/$skill" ]; then - # Symlink never created (or hand-removed): recreate it from the - # vendored pack — mirrors toggle-external.sh's from-source path. - ln -sf "$REPO/skills-external/$skill" "$SKILLS_DIR/$skill" - ok "enabled: $skill (external, symlink created)" - else - warn "missing: $skill ($type)" - fi - ;; - plugin@*) - # type holds the marketplace: plugin@ - local marketplace="${type#plugin@}" - if [ "$(skill_status "$skill" "$type")" = "enabled" ]; then - : # already on - elif command -v "$CLAUDE_BIN" >/dev/null 2>&1; then - # CLI call stays inside the condition: a failing CLI must not abort - if grep -qiE "enabled|already" \ - <<<"$("$CLAUDE_BIN" plugin enable \ - "${skill}@${marketplace}" 2>&1)"; then - ok "enabled plugin: ${skill}@${marketplace}" - else - warn "could not enable plugin: ${skill}@${marketplace}" - fi - else - info "claude CLI not in PATH — manual: claude plugin enable ${skill}@${marketplace}" - fi - ;; + gstack) enable_gstack_skill "$skill" ;; + external|personal) enable_linked_skill "$skill" "$type" ;; + plugin@*) enable_plugin_skill "$skill" "$type" ;; plugin) # No marketplace specified — purely advisory. if [ "$(skill_status "$skill" plugin)" = "enabled" ]; then @@ -419,8 +422,7 @@ disable_skill() { gstack) if [ -e "$SKILLS_DIR/$skill" ]; then mkdir -p "$DISABLED_DIR" - rm -rf "$DISABLED_DIR/gstack__$skill" - mv "$SKILLS_DIR/$skill" "$DISABLED_DIR/gstack__$skill" + gstack_park "$SKILLS_DIR" "$DISABLED_DIR" "$skill" ok "disabled: $skill" fi ;; @@ -477,20 +479,17 @@ disable_skill() { # stdout so the caller can report it accurately; per-skill confirmations # go to stderr so that count is the only thing captured with `$(...)`. enable_all_gstack() { - local entry name restored=0 + local name restored=0 [ -d "$DISABLED_DIR" ] || { echo 0; return 0; } - for entry in "$DISABLED_DIR"/gstack__*; do - [ -e "$entry" ] || continue - name="$(basename "$entry" | sed 's/^gstack__//')" + while IFS= read -r name; do if gstack_is_removed "$name"; then info "skipped (removed by policy, lib/gstack-removed.sh): $name" >&2 continue fi - rm -rf "${SKILLS_DIR:?}/${name:?}" - mv "$entry" "$SKILLS_DIR/$name" + gstack_unpark "$SKILLS_DIR" "$DISABLED_DIR" "$name" ok "re-enabled: $name" >&2 restored=$((restored + 1)) - done + done < <(gstack_parked_names "$DISABLED_DIR") echo "$restored" } @@ -504,7 +503,7 @@ disable_gstack_not_in() { while read -r name; do [ -n "$name" ] || continue grep -qx "$name" "$keep_file" || disable_skill "$name" gstack - done < <(gstack_skills | sort -u) + done < <(gstack_skills "$GSTACK_SRC" | sort -u) rm -f "$keep_file" } @@ -572,29 +571,58 @@ cmd_list() { done } +# Snapshot of a profile's entries, claude-free: "" lines, +# canonical name. A plugin's marketplace (plugin@) collapses to the +# category "plugin". +_show_entries() { + local skill type cat + while IFS=$'\t' read -r skill type; do + case "$type" in plugin@*|plugin) cat=plugin ;; *) cat="$type" ;; esac + printf '%s\t%s\n' "$cat" "$skill" + done < <(read_profile "$1") +} + +# --plain: parsable contract for the design gate. One "" +# per line, grouped by type, NO status, NO claude calls. +_show_plain() { + local entries=() cat e line + while IFS= read -r line; do entries+=("$line"); done < <(_show_entries "$1") + for cat in gstack external personal plugin mcp cli; do + for e in "${entries[@]}"; do + [ "${e%%$'\t'*}" = "$cat" ] && printf '%s\t%s\n' "$cat" "${e#*$'\t'}" + done + done + return 0 +} + +# Grouped by type, fixed order; empty groups skipped. Canonical name + +# runtime status (existing skill_status — degrades to disabled if no claude). +_show_grouped() { + local entries=() cat e line names skill status + while IFS= read -r line; do entries+=("$line"); done < <(_show_entries "$1") + for cat in gstack external personal plugin mcp cli; do + names=() + for e in "${entries[@]}"; do + [ "${e%%$'\t'*}" = "$cat" ] && names+=("${e#*$'\t'}") + done + [ "${#names[@]}" -eq 0 ] && continue + printf '%s (%d):\n' "$cat" "${#names[@]}" + for skill in "${names[@]}"; do + status="$(skill_status "$skill" "$cat")" + printf ' %-24s %s\n' "$skill" "$status" + done + done + return 0 +} + cmd_show() { local prof="$1" plain=0 [ "${2:-}" = "--plain" ] && plain=1 local file="$PROFILES_DIR/$prof.profile" [ -f "$file" ] || { err "Profile not found: $prof"; return 1; } - # Snapshot entries once (claude-free): "", canonical name. - # A plugin's marketplace (plugin@) collapses to category "plugin". - local entries=() skill type cat - while IFS=$'\t' read -r skill type; do - case "$type" in plugin@*|plugin) cat=plugin ;; *) cat="$type" ;; esac - entries+=("$cat"$'\t'"$skill") - done < <(read_profile "$prof") - - # --plain: parsable contract for the design gate. One "" - # per line, grouped by type, NO status, NO claude calls. if [ "$plain" -eq 1 ]; then - local e - for cat in gstack external personal plugin mcp cli; do - for e in "${entries[@]}"; do - [ "${e%%$'\t'*}" = "$cat" ] && printf '%s\t%s\n' "$cat" "${e#*$'\t'}" - done - done + _show_plain "$prof" return 0 fi @@ -611,21 +639,7 @@ cmd_show() { fi echo "" - # Grouped by type, fixed order; empty groups skipped. Canonical name + - # runtime status (existing skill_status — degrades to disabled if no claude). - local e names status - for cat in gstack external personal plugin mcp cli; do - names=() - for e in "${entries[@]}"; do - [ "${e%%$'\t'*}" = "$cat" ] && names+=("${e#*$'\t'}") - done - [ "${#names[@]}" -eq 0 ] && continue - printf '%s (%d):\n' "$cat" "${#names[@]}" - for skill in "${names[@]}"; do - status="$(skill_status "$skill" "$cat")" - printf ' %-24s %s\n' "$skill" "$status" - done - done + _show_grouped "$prof" } cmd_apply() { diff --git a/lib/toggle-external.sh b/lib/toggle-external.sh index 1f6ba68..12b0f30 100755 --- a/lib/toggle-external.sh +++ b/lib/toggle-external.sh @@ -42,10 +42,13 @@ set -euo pipefail REPO="${TOGGLE_EXTERNAL_REPO_OVERRIDE:-$(cd -P "$(dirname "$0")/.." && pwd)}" SKILLS_DIR="$REPO/skills" DISABLED_DIR="$REPO/skills-disabled" +GSTACK_SRC="$REPO/skills-external/gstack" # gstack submodule: its skills # GSTACK_REMOVED + gstack_is_removed() — single source, honored by the -# `enable gstack` loop below. Resolved from $0 like REPO above, not from -# $REPO/lib — gstack-removed.sh sits next to this file wherever it runs. +# `enable gstack` loop below — plus the gstack helpers shared with +# profile.sh (gstack_skills, gstack_park, gstack_unpark, gstack_parked_names). +# Resolved from $0 like REPO above, not from $REPO/lib — gstack-removed.sh +# sits next to this file wherever it runs. # shellcheck source=lib/gstack-removed.sh disable=SC1091 source "$(dirname "$0")/gstack-removed.sh" @@ -54,14 +57,40 @@ ok() { echo -e "${GREEN}✓${NC} $1"; } warn() { echo -e "${YELLOW}⚠${NC} $1"; } err() { echo -e "${RED}✗${NC} $1"; } -# All non-plugin tools this script can toggle. +# All non-plugin tools this script can toggle, in `list` order. The one +# roster: tool_kind() derives every tool's kind from it. MANAGED_TOOLS=(gstack emil-design-eng darwin-skill 21st higgsfield higgsfield-websites - observability-and-instrumentation deprecation-and-migration ci-cd-and-automation + observability-and-instrumentation deprecation-and-migration + ci-cd-and-automation scroll-world-storytelling build-threejs-scroll-worlds scroll-scrubbed-visual-sequence scroll-scrubbed-word-reveal scroll-progress-timeline) +# Prints the kind of a tool: gstack | pack (21st, higgsfield) | single (one +# symlink: every other MANAGED_TOOLS entry) | unknown. Exact-match loop, so +# a name with spaces or glob characters can never match a roster entry. +tool_kind() { + local tool="$1" managed + case "$tool" in + gstack) echo gstack; return ;; + 21st|higgsfield) echo pack; return ;; + esac + for managed in "${MANAGED_TOOLS[@]}"; do + [ "$managed" = "$tool" ] && { echo single; return; } + done + echo unknown +} + +# Prints where a single-symlink tool is linked from: ~/.agents/skills for +# darwin-skill, skills-external/ for the others. +tool_source() { + case "$1" in + darwin-skill) echo "$HOME/.agents/skills/$1" ;; + *) echo "$REPO/skills-external/$1" ;; + esac +} + # Prints the skill names that belong to the "21st" pack. Source of truth: # skills-external/21st-* — the `21st skills install` run in install-plugins.sh # owns that list, so adding a skill upstream needs no edit here. @@ -117,8 +146,8 @@ pack_skills() { # tool exists (`timeout`, or `gtimeout` from Homebrew coreutils on macOS): # a closed-source binary must never hang a toggle, and what it prints (a # token) must never reach the terminal. Twin of _higgsfield_probe in -# lib/higgsfield-skills.sh, kept here because this script takes no extra -# `source` (the fixture suites copy it alone). +# lib/higgsfield-skills.sh, kept here so the only file sourced beside this +# script stays gstack-removed.sh (the fixture suites copy just those two). bounded() { local tool for tool in timeout gtimeout; do @@ -158,41 +187,22 @@ pack_hints() { esac } -# Prints the names (directory basenames) that belong to "gstack". -# Source of truth: skills-external/gstack/*/SKILL.md. The repo's -# skills/ symlinks are generated from these by gstack ./setup. -gstack_skills() { - local gstack_src="$REPO/skills-external/gstack" - [ -d "$gstack_src" ] || return 0 - for d in "$gstack_src"/*/; do - [ -f "${d}SKILL.md" ] || continue - basename "$d" - done -} - # Prints "enabled" / "disabled" / "missing" for a tool. status_tool() { - local tool="$1" - case "$tool" in + local tool="$1" installed=0 name + case "$(tool_kind "$tool")" in gstack) - [ -d "$REPO/skills-external/gstack" ] || { echo "missing"; return; } + [ -d "$GSTACK_SRC" ] || { echo "missing"; return; } while read -r name; do [ -e "$SKILLS_DIR/$name" ] && { echo "enabled"; return; } - done < <(gstack_skills) + done < <(gstack_skills "$GSTACK_SRC") echo "disabled" ;; - emil-design-eng|observability-and-instrumentation|deprecation-and-migration|ci-cd-and-automation| \ - scroll-world-storytelling|build-threejs-scroll-worlds|scroll-scrubbed-visual-sequence| \ - scroll-scrubbed-word-reveal|scroll-progress-timeline|higgsfield-websites) - [ -d "$REPO/skills-external/$tool" ] || { echo "missing"; return; } + single) + [ -d "$(tool_source "$tool")" ] || { echo "missing"; return; } [ -e "$SKILLS_DIR/$tool" ] && echo "enabled" || echo "disabled" ;; - darwin-skill) - [ -d "$HOME/.agents/skills/$tool" ] || { echo "missing"; return; } - [ -e "$SKILLS_DIR/$tool" ] && echo "enabled" || echo "disabled" - ;; - 21st|higgsfield) - local installed=0 + pack) while read -r name; do installed=1 [ -e "$SKILLS_DIR/$name" ] && { echo "enabled"; return; } @@ -204,141 +214,145 @@ status_tool() { esac } +# Parks every live gstack skill (twin of profile.sh's disable_skill gstack +# arm, kept separate: the messages differ). +disable_gstack() { + local moved=0 name + while read -r name; do + [ -e "$SKILLS_DIR/$name" ] || continue + gstack_park "$SKILLS_DIR" "$DISABLED_DIR" "$name" + moved=$((moved + 1)) + done < <(gstack_skills "$GSTACK_SRC") + ok "gstack disabled ($moved symlinks moved)" +} + +# Parks one single-symlink external tool. +disable_external_single() { + local tool="$1" + if [ -e "$SKILLS_DIR/$tool" ]; then + rm -rf "${DISABLED_DIR:?}/${tool:?}" + mv "$SKILLS_DIR/$tool" "$DISABLED_DIR/$tool" + ok "$tool disabled" + else + warn "$tool already disabled" + fi +} + +# Parks every live skill of a pack (21st, higgsfield). Parked under the +# plain skill name — same convention as the other externals, so profile.sh's +# park/restore path stays interoperable. +disable_pack() { + local tool="$1" parked=0 name + while read -r name; do + [ -e "$SKILLS_DIR/$name" ] || continue + rm -rf "${DISABLED_DIR:?}/${name:?}" + mv "$SKILLS_DIR/$name" "$DISABLED_DIR/$name" + parked=$((parked + 1)) + done < <(pack_skills "$tool") + if [ "$parked" -gt 0 ]; then + ok "$tool disabled ($parked skills parked)" + else + warn "$tool already disabled" + fi +} + disable_tool() { local tool="$1" mkdir -p "$DISABLED_DIR" - case "$tool" in - gstack) - local moved=0 - while read -r name; do - [ -e "$SKILLS_DIR/$name" ] || continue - # Clobber any stale destination. gstack ./setup now creates - # skills// as directories, so mv onto an existing dir - # would nest it (gstack__//) instead of renaming. - # Content is symlinks to the submodule — `gstack ./setup` regenerates. - rm -rf "$DISABLED_DIR/gstack__$name" - mv "$SKILLS_DIR/$name" "$DISABLED_DIR/gstack__$name" - moved=$((moved + 1)) - done < <(gstack_skills) - ok "gstack disabled ($moved symlinks moved)" - ;; - emil-design-eng|darwin-skill|observability-and-instrumentation|deprecation-and-migration| \ - ci-cd-and-automation|scroll-world-storytelling|build-threejs-scroll-worlds| \ - scroll-scrubbed-visual-sequence|scroll-scrubbed-word-reveal|scroll-progress-timeline| \ - higgsfield-websites) - if [ -e "$SKILLS_DIR/$tool" ]; then - rm -rf "${DISABLED_DIR:?}/${tool:?}" - mv "$SKILLS_DIR/$tool" "$DISABLED_DIR/$tool" - ok "$tool disabled" - else - warn "$tool already disabled" - fi - ;; - 21st|higgsfield) - # Parked under the plain skill name — same convention as the other - # externals, so profile.sh's park/restore path stays interoperable. - local parked=0 - while read -r name; do - [ -e "$SKILLS_DIR/$name" ] || continue - rm -rf "${DISABLED_DIR:?}/${name:?}" - mv "$SKILLS_DIR/$name" "$DISABLED_DIR/$name" - parked=$((parked + 1)) - done < <(pack_skills "$tool") - if [ "$parked" -gt 0 ]; then - ok "$tool disabled ($parked skills parked)" - else - warn "$tool already disabled" - fi - ;; + case "$(tool_kind "$tool")" in + gstack) disable_gstack ;; + single) disable_external_single "$tool" ;; + pack) disable_pack "$tool" ;; *) err "Unknown tool: $tool"; return 1 ;; esac } +# Re-links the gstack skills parked as gstack__, honoring the +# policy denylist (lib/gstack-removed.sh). +enable_gstack() { + local moved=0 skipped=0 name + while IFS= read -r name; do + if gstack_is_removed "$name"; then + warn "skipped (removed by policy, lib/gstack-removed.sh): $name" + skipped=$((skipped + 1)) + continue + fi + gstack_unpark "$SKILLS_DIR" "$DISABLED_DIR" "$name" + moved=$((moved + 1)) + done < <(gstack_parked_names "$DISABLED_DIR") + if [ "$moved" -eq 0 ] && [ "$skipped" -ge 1 ]; then + warn "only policy-removed skills remain parked (lib/gstack-removed.sh)" + elif [ "$moved" -eq 0 ]; then + warn "gstack was not disabled — re-run gstack setup to (re)create symlinks" + else + ok "gstack enabled ($moved symlinks restored)" + fi +} + +# Enables one single-symlink external tool: restore from the parking dir, +# else link its source (see tool_source). +enable_external_single() { + local tool="$1" src + src="$(tool_source "$tool")" + if [ -e "$DISABLED_DIR/$tool" ]; then + rm -rf "${SKILLS_DIR:?}/${tool:?}" + mv "$DISABLED_DIR/$tool" "$SKILLS_DIR/$tool" + ok "$tool enabled" + elif [ -e "$SKILLS_DIR/$tool" ]; then + warn "$tool already enabled" + elif [ -d "$src" ]; then + ln -sf "$src" "$SKILLS_DIR/$tool" + ok "$tool enabled (symlink created → $src)" + else + err "$tool not installed at $src — run: make plugin" + return 1 + fi + if [ "$tool" = "higgsfield-websites" ]; then pack_hints higgsfield; fi +} + +# Enables a multi-skill pack (21st, higgsfield): restore parked skills, +# link the missing ones, then print the CLI hints. +enable_pack() { + local tool="$1" restored=0 linked=0 + while read -r name; do + if [ -e "$DISABLED_DIR/$name" ]; then + rm -rf "${SKILLS_DIR:?}/${name:?}" + mv "$DISABLED_DIR/$name" "$SKILLS_DIR/$name" + restored=$((restored + 1)) + elif [ -e "$SKILLS_DIR/$name" ]; then + : # already enabled + else + ln -sf "$REPO/skills-external/$name" "$SKILLS_DIR/$name" + linked=$((linked + 1)) + fi + done < <(pack_skills "$tool") + if [ "$((restored + linked))" -eq 0 ]; then + if [ "$(status_tool "$tool")" = "missing" ]; then + err "$tool pack not installed in $REPO/skills-external — run: make plugin" + return 1 + fi + warn "$tool already enabled" + # Enabled is the steady state, and Claude re-runs this on every + # media ask: the hints (upstream drift, CLI, session) show here too. + if [ "$tool" = "higgsfield" ]; then pack_hints higgsfield; fi + return 0 + fi + ok "$tool enabled ($((restored + linked)) skills: $restored restored, $linked linked)" + pack_hints "$tool" +} + enable_tool() { local tool="$1" - case "$tool" in - gstack) - local moved=0 skipped=0 - if [ -d "$DISABLED_DIR" ]; then - for entry in "$DISABLED_DIR"/gstack__*; do - [ -e "$entry" ] || continue - local name - name="$(basename "$entry" | sed 's/^gstack__//')" - if gstack_is_removed "$name"; then - warn "skipped (removed by policy, lib/gstack-removed.sh): $name" - skipped=$((skipped + 1)) - continue - fi - rm -rf "${SKILLS_DIR:?}/${name:?}" - mv "$entry" "$SKILLS_DIR/$name" - moved=$((moved + 1)) - done - fi - if [ "$moved" -eq 0 ] && [ "$skipped" -ge 1 ]; then - warn "only policy-removed skills remain parked (lib/gstack-removed.sh)" - elif [ "$moved" -eq 0 ]; then - warn "gstack was not disabled — re-run gstack setup to (re)create symlinks" - else - ok "gstack enabled ($moved symlinks restored)" - fi - ;; - emil-design-eng|darwin-skill|observability-and-instrumentation|deprecation-and-migration| \ - ci-cd-and-automation|scroll-world-storytelling|build-threejs-scroll-worlds| \ - scroll-scrubbed-visual-sequence|scroll-scrubbed-word-reveal|scroll-progress-timeline| \ - higgsfield-websites) - local src - case "$tool" in - darwin-skill) src="$HOME/.agents/skills/$tool" ;; - *) src="$REPO/skills-external/$tool" ;; - esac - if [ -e "$DISABLED_DIR/$tool" ]; then - rm -rf "${SKILLS_DIR:?}/${tool:?}" - mv "$DISABLED_DIR/$tool" "$SKILLS_DIR/$tool" - ok "$tool enabled" - elif [ -e "$SKILLS_DIR/$tool" ]; then - warn "$tool already enabled" - elif [ -d "$src" ]; then - ln -sf "$src" "$SKILLS_DIR/$tool" - ok "$tool enabled (symlink created → $src)" - else - err "$tool not installed at $src — run: make plugin" - return 1 - fi - if [ "$tool" = "higgsfield-websites" ]; then pack_hints higgsfield; fi - ;; - 21st|higgsfield) - local restored=0 linked=0 - while read -r name; do - if [ -e "$DISABLED_DIR/$name" ]; then - rm -rf "${SKILLS_DIR:?}/${name:?}" - mv "$DISABLED_DIR/$name" "$SKILLS_DIR/$name" - restored=$((restored + 1)) - elif [ -e "$SKILLS_DIR/$name" ]; then - : # already enabled - else - ln -sf "$REPO/skills-external/$name" "$SKILLS_DIR/$name" - linked=$((linked + 1)) - fi - done < <(pack_skills "$tool") - if [ "$((restored + linked))" -eq 0 ]; then - if [ "$(status_tool "$tool")" = "missing" ]; then - err "$tool pack not installed in $REPO/skills-external — run: make plugin" - return 1 - fi - warn "$tool already enabled" - # Enabled is the steady state, and Claude re-runs this on every - # media ask: the hints (upstream drift, CLI, session) show here too. - if [ "$tool" = "higgsfield" ]; then pack_hints higgsfield; fi - return 0 - fi - ok "$tool enabled ($((restored + linked)) skills: $restored restored, $linked linked)" - pack_hints "$tool" - ;; + case "$(tool_kind "$tool")" in + gstack) enable_gstack ;; + single) enable_external_single "$tool" ;; + pack) enable_pack "$tool" ;; *) err "Unknown tool: $tool"; return 1 ;; esac } list_all() { + local t printf "%-20s %s\n" "TOOL" "STATUS" printf "%-20s %s\n" "----" "------" for t in "${MANAGED_TOOLS[@]}"; do