feat(profile): set symmetric on managed externals + MCPs (BDR-079)
- MANAGED_EXTERNALS (emil-design-eng, frontend-design, design-motion-principles, impeccable) + MANAGED_MCPS (magic): cmd_set now trims both when the profile does not list them — design leftovers no longer survive a 'set backend' - cmd_set refactored to 4 symmetric trim helpers; nothing outside the MANAGED_* allowlists is ever auto-toggled (darwin-skill manual) - enable_skill external: from-source fallback (ln -sf skills-external/<name>), mirrors toggle-external.sh - stale usage() NOTE + SKILL.md updated to the both-ways reality - hermetic test: 16 checks, fixture repo + fake claude shim (gstack on-demand, from-source, park/restore, magic add/remove, non-managed untouched); shellcheck + full make test green
This commit is contained in:
Bastien Chanot
+80
-15
@@ -14,6 +14,9 @@
|
||||
# - MCPs: delegated to lib/toggle-external.sh for known servers (magic),
|
||||
# advisory otherwise
|
||||
# - CLIs: advisory only (rtk, gsd, ctx7, graphify — installed externally)
|
||||
# - `set` is SYMMETRIC on managed items (BDR-079): plugins, external packs
|
||||
# and MCPs in the MANAGED_* allowlists are disabled when the profile
|
||||
# does not list them — nothing outside those lists is ever auto-toggled.
|
||||
#
|
||||
# Always-on plugins (never toggled by `set`): security-guidance,
|
||||
# superpowers + rtk hook + .claude internal. The script refuses to disable
|
||||
@@ -61,6 +64,23 @@ MANAGED_PLUGINS=(
|
||||
"pr-review-toolkit@claude-code-plugins"
|
||||
)
|
||||
|
||||
# External skill packs that are toggle-managed by `set` — same allowlist
|
||||
# doctrine as MANAGED_PLUGINS: listed here only when the enabled state is
|
||||
# task-type-driven. `set` disables these when the profile does not list
|
||||
# them; anything else external (e.g. darwin-skill) is never auto-touched.
|
||||
MANAGED_EXTERNALS=(
|
||||
emil-design-eng
|
||||
frontend-design
|
||||
design-motion-principles
|
||||
impeccable
|
||||
)
|
||||
|
||||
# MCP servers that are toggle-managed by `set`, both ways (enable AND
|
||||
# disable), delegated to lib/toggle-external.sh. Same allowlist doctrine.
|
||||
MANAGED_MCPS=(
|
||||
magic
|
||||
)
|
||||
|
||||
# Plugins that MUST stay enabled — `set` will refuse to disable these even if
|
||||
# they're not in the profile. (Defensive: belt-and-suspenders alongside
|
||||
# MANAGED_PLUGINS allowlist.)
|
||||
@@ -271,6 +291,11 @@ enable_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
|
||||
@@ -422,6 +447,48 @@ parked_gstack_count() {
|
||||
find "$DISABLED_DIR" -maxdepth 1 -name 'gstack__*' 2>/dev/null | wc -l | tr -d ' '
|
||||
}
|
||||
|
||||
# ── `set` trim helpers — one per managed category ─────────────
|
||||
# Each disables the managed items NOT listed in the given profile. Allowlist
|
||||
# doctrine: only MANAGED_* entries are ever auto-disabled.
|
||||
|
||||
disable_plugins_not_in() {
|
||||
local prof="$1" keep_file p plugin_name marketplace
|
||||
keep_file="$(mktemp)"
|
||||
read_profile "$prof" \
|
||||
| awk -F'\t' '$2 ~ /^plugin@/ { sub(/^plugin@/, "", $2); print $1"@"$2 }' \
|
||||
| sort -u > "$keep_file"
|
||||
for p in "${MANAGED_PLUGINS[@]}"; do
|
||||
if ! grep -qx "$p" "$keep_file"; then
|
||||
plugin_name="${p%@*}"
|
||||
marketplace="${p#*@}"
|
||||
disable_skill "$plugin_name" "plugin@${marketplace}"
|
||||
fi
|
||||
done
|
||||
rm -f "$keep_file"
|
||||
}
|
||||
|
||||
disable_externals_not_in() {
|
||||
local prof="$1" keep_file x
|
||||
keep_file="$(mktemp)"
|
||||
read_profile "$prof" | awk -F'\t' '$2 == "external" { print $1 }' \
|
||||
| sort -u > "$keep_file"
|
||||
for x in "${MANAGED_EXTERNALS[@]}"; do
|
||||
grep -qx "$x" "$keep_file" || disable_skill "$x" external
|
||||
done
|
||||
rm -f "$keep_file"
|
||||
}
|
||||
|
||||
disable_mcps_not_in() {
|
||||
local prof="$1" keep_file s
|
||||
keep_file="$(mktemp)"
|
||||
read_profile "$prof" | awk -F'\t' '$2 == "mcp" { print $1 }' \
|
||||
| sort -u > "$keep_file"
|
||||
for s in "${MANAGED_MCPS[@]}"; do
|
||||
grep -qx "$s" "$keep_file" || disable_skill "$s" mcp
|
||||
done
|
||||
rm -f "$keep_file"
|
||||
}
|
||||
|
||||
# ── Commands ──────────────────────────────────────────────
|
||||
|
||||
cmd_list() {
|
||||
@@ -506,24 +573,20 @@ cmd_apply() {
|
||||
|
||||
cmd_set() {
|
||||
local prof="$1"
|
||||
info "Setting profile: $prof (exclusive — disables non-listed gstack skills + managed plugins)"
|
||||
info "Setting profile: $prof (exclusive — disables non-listed gstack skills + managed plugins/externals/MCPs)"
|
||||
|
||||
# Disable gstack-origin skills not in profile.
|
||||
disable_gstack_not_in "$prof"
|
||||
|
||||
# Disable managed plugins not in profile (PROTECTED_PLUGINS are excluded
|
||||
# by disable_skill itself — belt and suspenders).
|
||||
local plugin_keep_file p plugin_name marketplace
|
||||
plugin_keep_file="$(mktemp)"
|
||||
read_profile "$prof" | awk -F'\t' '$2 ~ /^plugin@/ { sub(/^plugin@/, "", $2); print $1"@"$2 }' | sort -u > "$plugin_keep_file"
|
||||
for p in "${MANAGED_PLUGINS[@]}"; do
|
||||
if ! grep -qx "$p" "$plugin_keep_file"; then
|
||||
plugin_name="${p%@*}"
|
||||
marketplace="${p#*@}"
|
||||
disable_skill "$plugin_name" "plugin@${marketplace}"
|
||||
fi
|
||||
done
|
||||
rm -f "$plugin_keep_file"
|
||||
disable_plugins_not_in "$prof"
|
||||
|
||||
# Symmetry (BDR-079): a profile switch also parks the managed external
|
||||
# packs and unregisters the managed MCPs the new profile does not need —
|
||||
# design leftovers (emil, magic…) no longer survive a `set backend`.
|
||||
disable_externals_not_in "$prof"
|
||||
disable_mcps_not_in "$prof"
|
||||
|
||||
# Enable everything listed in the profile.
|
||||
cmd_apply "$prof"
|
||||
@@ -679,9 +742,11 @@ EXAMPLES:
|
||||
bash lib/profile.sh reset # restore everything
|
||||
|
||||
NOTE:
|
||||
Plugin and MCP entries print advisory commands — they are NOT toggled
|
||||
automatically. Run "claude plugin enable|disable" or "claude mcp add|remove"
|
||||
yourself for those.
|
||||
"set" toggles the MANAGED items automatically, both ways: plugins
|
||||
(ui-ux-pro-max, plugin-dev, pr-review-toolkit), external packs
|
||||
(emil-design-eng, frontend-design, design-motion-principles, impeccable)
|
||||
and the magic MCP. Anything outside those allowlists stays advisory —
|
||||
run "claude plugin enable|disable" or "claude mcp add|remove" yourself.
|
||||
EOF
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,76 @@
|
||||
#!/usr/bin/env bash
|
||||
# lib/tests/profile-set-managed.test.sh — `set` symmetry on managed
|
||||
# externals + MCPs, gstack on-demand, external from-source (BDR-079).
|
||||
# Hermetic: fixture repo via *_REPO_OVERRIDE + fake `claude` on PATH.
|
||||
set -u
|
||||
ROOT="$(cd "$(dirname "$0")/../.." && pwd)"
|
||||
pass=0; fail=0
|
||||
check() { if [ "$2" = "$3" ]; then pass=$((pass+1)); else fail=$((fail+1));
|
||||
printf 'FAIL %s: got[%s] want[%s]\n' "$1" "$2" "$3"; fi; }
|
||||
|
||||
FX="$(mktemp -d)"; trap 'rm -rf "$FX"' EXIT
|
||||
mkdir -p "$FX/skills" "$FX/skills-disabled" "$FX/lib/profiles" "$FX/bin" \
|
||||
"$FX/skills-external/emil-design-eng" "$FX/skills-external/other-ext"
|
||||
for g in gs-a gs-b gs-c; do
|
||||
mkdir -p "$FX/skills-external/gstack/$g"
|
||||
touch "$FX/skills-external/gstack/$g/SKILL.md"
|
||||
done
|
||||
cp "$ROOT/lib/profile.sh" "$ROOT/lib/toggle-external.sh" "$FX/lib/"
|
||||
printf 'MAGIC_API_KEY=test-secret-000\n' > "$FX/.env"
|
||||
|
||||
# Non-managed external, enabled from the start — must never be touched.
|
||||
ln -s "$FX/skills-external/other-ext" "$FX/skills/other-ext"
|
||||
|
||||
cat > "$FX/lib/profiles/designish.profile" <<'EOF'
|
||||
gs-a
|
||||
gs-b
|
||||
emil-design-eng external
|
||||
magic mcp
|
||||
EOF
|
||||
cat > "$FX/lib/profiles/backendish.profile" <<'EOF'
|
||||
gs-c
|
||||
EOF
|
||||
|
||||
# Fake claude: logs every call; keeps MCP registry state in a flat file.
|
||||
cat > "$FX/bin/claude" <<EOF
|
||||
#!/usr/bin/env bash
|
||||
FX="$FX"
|
||||
echo "\$*" >> "\$FX/claude-calls.log"
|
||||
case "\$1 \${2:-}" in
|
||||
"mcp list") cat "\$FX/mcp-state" 2>/dev/null ;;
|
||||
"mcp add") echo "magic: stub" > "\$FX/mcp-state" ;;
|
||||
"mcp remove") : > "\$FX/mcp-state" ;;
|
||||
esac
|
||||
exit 0
|
||||
EOF
|
||||
chmod +x "$FX/bin/claude"
|
||||
|
||||
run() { PATH="$FX/bin:$PATH" PROFILE_REPO_OVERRIDE="$FX" \
|
||||
TOGGLE_EXTERNAL_REPO_OVERRIDE="$FX" bash "$FX/lib/profile.sh" "$@"; }
|
||||
|
||||
# --- set designish: gstack on-demand + external from-source + magic on ---
|
||||
run set designish >/dev/null 2>&1
|
||||
check T1-gsa-on "$([ -e "$FX/skills/gs-a" ] && echo on || echo off)" on
|
||||
check T2-gsb-on "$([ -e "$FX/skills/gs-b" ] && echo on || echo off)" on
|
||||
check T3-gsc-off "$([ -e "$FX/skills/gs-c" ] && echo on || echo off)" off
|
||||
check T4-emil-src "$([ -L "$FX/skills/emil-design-eng" ] && echo on || echo off)" on
|
||||
check T5-magic-on "$(grep -c '^magic:' "$FX/mcp-state" 2>/dev/null)" 1
|
||||
check T6-add-call "$(grep -c '^mcp add magic' "$FX/claude-calls.log")" 1
|
||||
|
||||
# --- set backendish: managed leftovers parked/unregistered ---
|
||||
run set backendish >/dev/null 2>&1
|
||||
check T7-gsc-on "$([ -e "$FX/skills/gs-c" ] && echo on || echo off)" on
|
||||
check T8-gsa-park "$([ -e "$FX/skills-disabled/gstack__gs-a" ] && echo p || echo n)" p
|
||||
check T9-emil-off "$([ -e "$FX/skills/emil-design-eng" ] && echo on || echo off)" off
|
||||
check T10-emil-park "$([ -e "$FX/skills-disabled/emil-design-eng" ] && echo p || echo n)" p
|
||||
check T11-magic-off "$(grep -c '^magic:' "$FX/mcp-state" 2>/dev/null || true)" 0
|
||||
check T12-rm-call "$(grep -c '^mcp remove magic' "$FX/claude-calls.log")" 1
|
||||
check T13-other-untouched "$([ -e "$FX/skills/other-ext" ] && echo on || echo off)" on
|
||||
|
||||
# --- back to designish: parked external restored (not re-sourced) ---
|
||||
run set designish >/dev/null 2>&1
|
||||
check T14-emil-back "$([ -e "$FX/skills/emil-design-eng" ] && echo on || echo off)" on
|
||||
check T15-park-gone "$([ -e "$FX/skills-disabled/emil-design-eng" ] && echo p || echo n)" n
|
||||
check T16-magic-back "$(grep -c '^magic:' "$FX/mcp-state" 2>/dev/null)" 1
|
||||
|
||||
printf 'PASS=%s FAIL=%s\n' "$pass" "$fail"; [ "$fail" -eq 0 ]
|
||||
Reference in New Issue
Block a user