superpowers-manager 0.1.4 → 0.1.6

package/scripts/prepare

@@ -2,22 +2,39 @@
 set -eu
 
 root=$(CDPATH= cd -- "$(dirname "$0")/.." && pwd)
-. "$root/scripts/lib.sh"
+. "$root/scripts/core/common.sh"
+. "$root/scripts/core/upstream.sh"
+. "$root/scripts/core/provenance.sh"
+. "$root/scripts/core/lifecycle.sh"
+. "$root/scripts/core/adapter.sh"
 
 upstream_url="${SUPERPOWERS_UPSTREAM_URL:-$SPW_UPSTREAM_URL_DEFAULT}"
 cache_parent="${SUPERPOWERS_CACHE_DIR:-$root/.cache/upstream}"
-cache="$cache_parent/superpowers"
 plugin_root="${SUPERPOWERS_PLUGIN_ROOT:-$root/plugins/superpowers}"
 manifest_template="${SUPERPOWERS_MANIFEST_TEMPLATE:-$root/plugins/superpowers/.codex-plugin/plugin.template.json}"
-builtin_validator="$root/scripts/validate-generated-plugin.py"
 additional_validator="${SUPERPOWERS_VALIDATOR:-}"
+invocation_root=$(pwd -P)
+case "$cache_parent" in
+  /*) ;;
+  *) cache_parent="$invocation_root/$cache_parent" ;;
+esac
+case "$plugin_root" in
+  /*) ;;
+  *) plugin_root="$invocation_root/$plugin_root" ;;
+esac
+cache="$cache_parent/superpowers"
 tmp_parent=$(dirname "$plugin_root")
-tmp_plugin="$tmp_parent/.superpowers.tmp.$$"
+mkdir -p "$tmp_parent"
+if ! prepare_workspace=$(mktemp -d "$tmp_parent/.superpowers.prepare.XXXXXX"); then
+  spw_die "cannot create prepare workspace under $tmp_parent"
+fi
+tmp_plugin="$prepare_workspace/superpowers"
+adapter_result="$prepare_workspace/adapter-build.json"
 
 cleanup_tmp_plugin() {
   status=$?
   trap - 0 HUP INT TERM
-  rm -rf "$tmp_plugin" || :
+  rm -rf "$prepare_workspace" || :
   exit "$status"
 }
 
@@ -26,12 +43,15 @@ trap 'exit 129' HUP
 trap 'exit 130' INT
 trap 'exit 143' TERM
 
+TMPDIR="$prepare_workspace"
+export TMPDIR
+
 requested_ref=$(spw_config_ref "$root")
 
 spw_require_command git
 spw_require_command python3
+spw_require_command "$SPW_ADAPTER"
 [ -f "$manifest_template" ] || spw_die "missing fallback manifest template: $manifest_template"
-[ -f "$builtin_validator" ] || spw_die "missing built-in plugin validator: $builtin_validator"
 
 resolved_record=$(spw_resolve_ref "$upstream_url" "$requested_ref")
 resolution_kind=$(printf '%s\n' "$resolved_record" | awk '{ print $1 }')
@@ -60,11 +80,6 @@ spw_require_upstream_path "$cache/CODE_OF_CONDUCT.md" "CODE_OF_CONDUCT.md"
 rm -rf "$tmp_plugin"
 mkdir -p "$tmp_plugin/.codex-plugin"
 upstream_manifest="$cache/.codex-plugin/plugin.json"
-if [ -f "$upstream_manifest" ]; then
-  cp "$upstream_manifest" "$tmp_plugin/.codex-plugin/plugin.json"
-else
-  cp "$manifest_template" "$tmp_plugin/.codex-plugin/plugin.json"
-fi
 
 spw_copy_path_if_present "$cache/skills" "$tmp_plugin/skills"
 spw_copy_path_if_present "$cache/assets" "$tmp_plugin/assets"
@@ -88,23 +103,15 @@ spw_write_metadata_json \
 manager_version=$(
   spw_manifest_version_for_ref "$requested_ref" "$resolution_kind" "$resolved_ref" "$commit"
 )
-spw_apply_manifest_overlay \
-  "$tmp_plugin/.codex-plugin/plugin.json" \
-  "$manager_version"
-
-# The validator must inspect the exact complete tree that will be swapped.
-cp "$manifest_template" "$tmp_plugin/.codex-plugin/plugin.template.json"
-
-if ! python3 -S "$builtin_validator" \
-  --plugin-root "$tmp_plugin" \
-  --source "$upstream_url" \
+spw_invoke_adapter build "$adapter_result" "" -- \
+  --upstream-root "$cache" \
+  --candidate-root "$tmp_plugin" \
   --requested-ref "$requested_ref" \
   --resolved-ref "$resolved_ref" \
   --commit "$commit" \
-  --manifest-version "$manager_version" \
-  --upstream-manifest-version "$upstream_manifest_version"; then
-  spw_die "built-in generated plugin validation failed"
-fi
+  --manager-version "$manager_version" \
+  --upstream-manifest-version "$upstream_manifest_version" \
+  --fallback-manifest "$manifest_template"
 
 if [ -n "$additional_validator" ]; then
   [ -f "$additional_validator" ] || \
@@ -114,23 +121,6 @@ if [ -n "$additional_validator" ]; then
   fi
 fi
 
-# Replace the live tree with a single atomic rename, keeping a backup so a
-# failed swap restores the previous working generated tree (the spec requires
-# that a failed prepare never destroy it). tmp_plugin is a same-filesystem
-# sibling of plugin_root, so the renames cannot fail mid-copy.
-backup="$tmp_parent/.superpowers.bak.$$"
-rm -rf "$backup"
-if [ -e "$plugin_root" ]; then
-  mv "$plugin_root" "$backup"
-fi
-if mv "$tmp_plugin" "$plugin_root"; then
-  rm -rf "$backup"
-else
-  if [ -e "$backup" ]; then
-    mv "$backup" "$plugin_root"
-  fi
-  rm -rf "$tmp_plugin"
-  spw_die "failed to install generated tree into $plugin_root; previous tree restored"
-fi
+spw_replace_generated_tree "$tmp_plugin" "$plugin_root"
 
 echo "prepared $resolved_ref at $commit"

package/scripts/probe

@@ -2,13 +2,12 @@
 set -eu
 
 root=$(CDPATH= cd -- "$(dirname "$0")/.." && pwd)
-. "$root/scripts/lib.sh"
-
-codex_bin="${SUPERPOWERS_CODEX:-codex}"
-spw_require_command "$codex_bin"
-spw_require_command python3
-identity_snapshot=$(spw_codex_identity_snapshot "$codex_bin")
-identity_state=$(spw_snapshot_get "$identity_snapshot" identity_state)
+. "$root/scripts/core/common.sh"
+. "$root/scripts/core/upstream.sh"
+. "$root/scripts/core/provenance.sh"
+. "$root/scripts/core/status.sh"
+. "$root/scripts/core/lifecycle.sh"
+. "$root/scripts/core/adapter.sh"
 
 upstream_url="${SUPERPOWERS_UPSTREAM_URL:-$SPW_UPSTREAM_URL_DEFAULT}"
 requested_ref=$(spw_config_ref "$root")
@@ -16,18 +15,30 @@ resolved_record=$(spw_resolve_ref "$upstream_url" "$requested_ref")
 resolved_ref=$(printf '%s\n' "$resolved_record" | awk '{ print $2 }')
 desired_commit=$(printf '%s\n' "$resolved_record" | awk '{ print $3 }')
 
-generated_metadata="$root/plugins/superpowers/.superpowers-upstream.json"
-generated_commit=$(spw_metadata_commit_or_empty "$generated_metadata" || true)
-
-installed_metadata=$(spw_find_installed_metadata || true)
-installed_manifest=$(spw_find_installed_manifest || true)
-installed_commit=""
-if [ -n "$installed_metadata" ]; then
-  installed_commit=$(spw_metadata_commit_or_empty "$installed_metadata" || true)
-fi
-if [ -z "$installed_commit" ] && [ -n "$installed_manifest" ]; then
-  installed_commit=$(spw_manifest_short_sha_or_empty "$installed_manifest" || true)
+generated_commit=$(spw_generated_commit_or_empty "$root")
+tmp_parent="${TMPDIR:-/tmp}"
+if ! probe_workspace=$(mktemp -d "$tmp_parent/superpowers-manager.probe.XXXXXX"); then
+  spw_die "cannot create probe workspace under $tmp_parent"
 fi
+fingerprint_result="$probe_workspace/fingerprint.json"
+ownership_result="$probe_workspace/ownership.json"
+cleanup() {
+  status=$?
+  trap - 0 HUP INT TERM
+  rm -rf "$probe_workspace" || :
+  exit "$status"
+}
+trap cleanup 0
+trap 'exit 129' HUP
+trap 'exit 130' INT
+trap 'exit 143' TERM
+
+TMPDIR="$probe_workspace"
+export TMPDIR
+spw_inspect_fingerprint "$fingerprint_result"
+installed_commit=$(spw_adapter_result_get "$fingerprint_result" "fingerprint")
+spw_inspect_ownership "$ownership_result"
+identity_state=$(spw_adapter_result_get "$ownership_result" "identity_state")
 
 status=$(spw_status_for_commits "$desired_commit" "$generated_commit" "$installed_commit")
 

package/scripts/uninstall

@@ -2,60 +2,43 @@
 set -eu
 
 root=$(CDPATH= cd -- "$(dirname "$0")/.." && pwd)
-. "$root/scripts/lib.sh"
+. "$root/scripts/core/common.sh"
+. "$root/scripts/core/provenance.sh"
+. "$root/scripts/core/lifecycle.sh"
+. "$root/scripts/core/adapter.sh"
 
-codex_bin="${SUPERPOWERS_CODEX:-codex}"
-
-spw_require_command "$codex_bin"
 spw_require_command python3
 
-# Preflight: read and parse BOTH Codex listings before removing anything, so a
-# read/parse failure aborts before any removal (fail closed).
-ownership=$(spw_codex_identity_snapshot "$codex_bin")
-plugin_present=$(spw_snapshot_get "$ownership" manager_plugin)
-marketplace_present=$(spw_snapshot_get "$ownership" manager_marketplace)
-
-# Remove the plugin first, then the marketplace, so an installed plugin is
-# never orphaned from a just-removed marketplace source.
-if [ "$plugin_present" = true ]; then
-  if ! "$codex_bin" plugin remove "$SPW_PLUGIN_ID"; then
-    spw_die "codex plugin remove failed for $SPW_PLUGIN_ID"
-  fi
-  echo "removed plugin $SPW_PLUGIN_ID"
-else
-  echo "plugin not installed; skipping"
-fi
-
-if [ "$marketplace_present" = true ]; then
-  if ! "$codex_bin" plugin marketplace remove "$SPW_MARKETPLACE_NAME"; then
-    spw_die "codex plugin marketplace remove failed for $SPW_MARKETPLACE_NAME"
-  fi
-  echo "removed marketplace $SPW_MARKETPLACE_NAME"
-else
-  echo "marketplace not registered; skipping"
+tmp_parent="${TMPDIR:-/tmp}"
+if ! uninstall_workspace=$(mktemp -d "$tmp_parent/superpowers-manager.uninstall.XXXXXX"); then
+  spw_die "cannot create uninstall workspace under $tmp_parent"
 fi
-
-# Verify-after: re-query and refuse to claim success while either manager
-# target survives. The strict snapshot also records whether legacy state is
-# still present without ever mutating that state.
-ownership=$(spw_codex_identity_snapshot "$codex_bin")
-plugin_present=$(spw_snapshot_get "$ownership" manager_plugin)
-marketplace_present=$(spw_snapshot_get "$ownership" manager_marketplace)
-identity_state=$(spw_snapshot_get "$ownership" identity_state)
-if [ "$plugin_present" = true ]; then
-  spw_die "plugin $SPW_PLUGIN_ID is still installed after removal"
-fi
-if [ "$marketplace_present" = true ]; then
-  spw_die "marketplace $SPW_MARKETPLACE_NAME is still registered after removal"
-fi
-
-case "$identity_state" in
-  legacy|both)
-    printf '%s\n' \
-      'Legacy superpowers-wrapper Codex state remains installed.' \
-      'Run: npx superpowers-wrapper@0.1.1 uninstall'
-    ;;
-esac
+inspect_result="$uninstall_workspace/inspect.json"
+uninstall_result="$uninstall_workspace/uninstall.json"
+cleanup() {
+  status=$?
+  trap - 0 HUP INT TERM
+  rm -rf "$uninstall_workspace" || :
+  exit "$status"
+}
+trap cleanup 0
+trap 'exit 129' HUP
+trap 'exit 130' INT
+trap 'exit 143' TERM
+
+TMPDIR="$uninstall_workspace"
+export TMPDIR
+
+spw_inspect_ownership "$inspect_result"
+plugin_present=$(spw_adapter_result_boolean "$inspect_result" "resources.plugin")
+marketplace_present=$(spw_adapter_result_boolean "$inspect_result" "resources.marketplace")
+
+spw_adapter_uninstall "$uninstall_result" "$plugin_present" "$marketplace_present"
+
+spw_inspect_ownership "$inspect_result"
+spw_verify_uninstalled_resources "$inspect_result"
+identity_state=$(spw_adapter_result_get "$inspect_result" "identity_state")
+spw_report_legacy_state "$identity_state"
 
 echo "uninstall complete"
 echo "note: local generated artifacts under plugins/superpowers/ and .cache/upstream/ were left in place; remove them manually or regenerate with scripts/prepare."

package/scripts/update

@@ -2,11 +2,12 @@
 set -eu
 
 root=$(CDPATH= cd -- "$(dirname "$0")/.." && pwd)
-. "$root/scripts/lib.sh"
+. "$root/scripts/core/common.sh"
+. "$root/scripts/core/lifecycle.sh"
 
 probe_output=$(sh "$root/scripts/probe" --porcelain)
 identity_state=$(printf '%s\n' "$probe_output" | awk -F= '$1 == "identity_state" { print $2 }')
-[ -n "$identity_state" ] || spw_die "probe did not report Codex identity state"
+[ -n "$identity_state" ] || spw_die "probe did not report adapter identity state"
 spw_require_no_legacy_state "$identity_state"
 status=$(printf '%s\n' "$probe_output" | awk -F= '$1 == "status" { print $2 }')
 
@@ -18,15 +19,9 @@ case "$status" in
   needs\ prepare)
     sh "$root/scripts/prepare"
     sh "$root/scripts/install"
-    desired_commit=$(spw_metadata_commit_or_empty "$root/plugins/superpowers/.superpowers-upstream.json" || true)
-    [ -n "$desired_commit" ] || spw_die "generated metadata missing desired commit after install"
-    spw_verify_refresh "$desired_commit"
     ;;
   needs\ install)
     sh "$root/scripts/install"
-    desired_commit=$(spw_metadata_commit_or_empty "$root/plugins/superpowers/.superpowers-upstream.json" || true)
-    [ -n "$desired_commit" ] || spw_die "generated metadata missing desired commit after install"
-    spw_verify_refresh "$desired_commit"
     ;;
   *)
     echo "$probe_output"