superpowers-manager 0.1.4 → 0.2.0

package/scripts/probe

@@ -2,49 +2,81 @@
 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/selection.sh"
+. "$root/scripts/core/provenance.sh"
+. "$root/scripts/core/status.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
-identity_snapshot=$(spw_codex_identity_snapshot "$codex_bin")
-identity_state=$(spw_snapshot_get "$identity_snapshot" identity_state)
-
-upstream_url="${SUPERPOWERS_UPSTREAM_URL:-$SPW_UPSTREAM_URL_DEFAULT}"
-requested_ref=$(spw_config_ref "$root")
-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)
+tmp_parent="${TMPDIR:-/tmp}"
+if ! probe_workspace=$(spw_make_workspace "$tmp_parent" "superpowers-manager.probe"); then
+  spw_die "cannot create probe workspace under $tmp_parent"
 fi
-if [ -z "$installed_commit" ] && [ -n "$installed_manifest" ]; then
-  installed_commit=$(spw_manifest_short_sha_or_empty "$installed_manifest" || true)
+spw_install_workspace_trap "$probe_workspace"
+fingerprint_result="$probe_workspace/fingerprint.json"
+ownership_result="$probe_workspace/ownership.json"
+update_control_result="$probe_workspace/update-control.json"
+
+TMPDIR="$probe_workspace"
+export TMPDIR
+spw_compute_effective_selection "$root" "$probe_workspace"
+effective_source=$(spw_display_source "$SPW_EFFECTIVE_SOURCE")
+if [ -n "$SPW_SAVED_SOURCE" ]; then
+  saved_source=$(spw_display_source "$SPW_SAVED_SOURCE")
+else
+  saved_source=""
 fi
 
-status=$(spw_status_for_commits "$desired_commit" "$generated_commit" "$installed_commit")
+generated_commit=$(spw_generated_commit_or_empty "$root")
+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")
+spw_inspect_update_control "$update_control_result"
+update_control=$(spw_adapter_result_get "$update_control_result" "update_control")
+
+status=$(spw_status_for_commits "$SPW_DESIRED_COMMIT" "$generated_commit" "$installed_commit")
 
 if [ "${1:-}" = "--porcelain" ]; then
-  printf 'requested_ref=%s\n' "$requested_ref"
-  printf 'resolved_ref=%s\n' "$resolved_ref"
-  printf 'desired_commit=%s\n' "$desired_commit"
+  printf 'requested_ref=%s\n' "$SPW_REQUESTED_REF"
+  printf 'resolved_ref=%s\n' "$SPW_RESOLVED_REF"
+  printf 'desired_commit=%s\n' "$SPW_DESIRED_COMMIT"
   printf 'generated_commit=%s\n' "$generated_commit"
   printf 'installed_commit=%s\n' "$installed_commit"
   printf 'identity_state=%s\n' "$identity_state"
   printf 'status=%s\n' "$status"
+  printf 'selection_origin=%s\n' "$SPW_SELECTION_ORIGIN"
+  printf 'selection_mode=%s\n' "$SPW_SELECTION_MODE"
+  printf 'upstream_source_origin=%s\n' "$SPW_UPSTREAM_SOURCE_ORIGIN"
+  printf 'effective_source=%s\n' "$effective_source"
+  printf 'saved_mode=%s\n' "$SPW_SAVED_MODE"
+  printf 'saved_source=%s\n' "$saved_source"
+  printf 'saved_requested_ref=%s\n' "$SPW_SAVED_REQUESTED_REF"
+  printf 'saved_resolved_ref=%s\n' "$SPW_SAVED_RESOLVED_REF"
+  printf 'saved_commit=%s\n' "$SPW_SAVED_COMMIT"
+  printf 'update_control=%s\n' "$update_control"
 else
-  printf 'requested ref: %s\n' "$requested_ref"
-  printf 'resolved ref: %s\n' "$resolved_ref"
-  printf 'desired commit: %s\n' "$desired_commit"
+  printf 'requested ref: %s\n' "$SPW_REQUESTED_REF"
+  printf 'resolved ref: %s\n' "$SPW_RESOLVED_REF"
+  printf 'desired commit: %s\n' "$SPW_DESIRED_COMMIT"
   printf 'generated plugin commit: %s\n' "${generated_commit:-not present}"
   printf 'installed manager commit or fingerprint: %s\n' "${installed_commit:-not detected}"
   printf 'Codex identity state: %s\n' "$identity_state"
   printf 'status: %s\n' "$status"
+  printf 'selection origin: %s\n' "$SPW_SELECTION_ORIGIN"
+  printf 'selection mode: %s\n' "$SPW_SELECTION_MODE"
+  printf 'upstream source origin: %s\n' "$SPW_UPSTREAM_SOURCE_ORIGIN"
+  printf 'effective source: %s\n' "$effective_source"
+  printf 'saved mode: %s\n' "$SPW_SAVED_MODE"
+  printf 'saved source: %s\n' "$saved_source"
+  printf 'saved requested ref: %s\n' "$SPW_SAVED_REQUESTED_REF"
+  printf 'saved resolved ref: %s\n' "$SPW_SAVED_RESOLVED_REF"
+  printf 'saved commit: %s\n' "$SPW_SAVED_COMMIT"
+  printf 'update control: %s\n' "$update_control"
+  if [ "$SPW_SELECTION_ORIGIN" != "$SPW_UPSTREAM_SOURCE_ORIGIN" ]; then
+    printf 'warning: effective ref and source have mixed origins (ref: %s, source: %s)\n' \
+      "$SPW_SELECTION_ORIGIN" "$SPW_UPSTREAM_SOURCE_ORIGIN"
+  fi
 fi

package/scripts/track-latest

@@ -0,0 +1,30 @@
+#!/bin/sh
+set -eu
+
+root=$(CDPATH= cd -- "$(dirname "$0")/.." && pwd)
+. "$root/scripts/core/common.sh"
+. "$root/scripts/core/upstream.sh"
+. "$root/scripts/core/selection.sh"
+
+[ "$#" -eq 0 ] || spw_usage_error 'usage: superpowers-manager track-latest'
+
+spw_require_command python3
+state_path=$(spw_selection_state_path)
+tmp_parent="${TMPDIR:-/tmp}"
+if ! track_workspace=$(spw_make_workspace "$tmp_parent" "superpowers-manager.track-latest"); then
+  spw_die "cannot create track-latest workspace under $tmp_parent"
+fi
+spw_install_workspace_trap "$track_workspace"
+
+normalized="$track_workspace/selection.json"
+spw_selection_state "$root" read \
+  --path="$state_path" --output="$normalized"
+
+source="${SUPERPOWERS_UPSTREAM_URL:-$SPW_UPSTREAM_URL_DEFAULT}"
+spw_selection_state "$root" \
+  validate-source --source="$source"
+
+spw_selection_state "$root" write-track-latest \
+  --path="$state_path" --source="$source"
+
+printf '%s\n' 'saved upstream selection: latest stable release'

package/scripts/uninstall

@@ -2,60 +2,34 @@
 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"
+tmp_parent="${TMPDIR:-/tmp}"
+if ! uninstall_workspace=$(spw_make_workspace "$tmp_parent" "superpowers-manager.uninstall"); then
+  spw_die "cannot create uninstall workspace under $tmp_parent"
 fi
+spw_install_workspace_trap "$uninstall_workspace"
+inspect_result="$uninstall_workspace/inspect.json"
+uninstall_result="$uninstall_workspace/uninstall.json"
 
-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"
-fi
+TMPDIR="$uninstall_workspace"
+export TMPDIR
 
-# 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
+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"
 
-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
+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/unpin

@@ -0,0 +1,41 @@
+#!/bin/sh
+set -eu
+
+root=$(CDPATH= cd -- "$(dirname "$0")/.." && pwd)
+. "$root/scripts/core/common.sh"
+. "$root/scripts/core/upstream.sh"
+. "$root/scripts/core/selection.sh"
+
+[ "$#" -eq 0 ] || spw_usage_error 'usage: superpowers-manager unpin'
+
+state_path=$(spw_selection_state_path)
+fallback=$(SUPERPOWERS_REF= spw_config_ref "$root")
+removed=false
+
+if [ -L "$state_path" ]; then
+  spw_die "selection state path is not a regular file; remove it manually after inspecting: $state_path"
+elif [ -e "$state_path" ]; then
+  if [ ! -f "$state_path" ]; then
+    spw_die "selection state path is not a regular file; remove it manually after inspecting: $state_path"
+  fi
+  if ! rm -f "$state_path"; then
+    spw_die "cannot remove selection state: $state_path"
+  fi
+  removed=true
+fi
+
+if [ -e "$state_path" ] || [ -L "$state_path" ]; then
+  spw_die "selection state remains after removal attempt: $state_path"
+fi
+
+if [ "$removed" = true ]; then
+  printf 'removed saved upstream selection; packaged fallback is %s\n' "$fallback"
+else
+  printf 'no saved upstream selection; packaged fallback is %s\n' "$fallback"
+fi
+if [ -n "${SUPERPOWERS_REF:-}" ]; then
+  printf '%s\n' 'note: active SUPERPOWERS_REF override remains effective'
+fi
+if [ -n "${SUPERPOWERS_UPSTREAM_URL:-}" ]; then
+  printf '%s\n' 'note: active SUPERPOWERS_UPSTREAM_URL override remains effective'
+fi

package/scripts/update

@@ -2,31 +2,29 @@
 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"
+identity_state=$(spw_probe_field "$probe_output" 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 }')
+status=$(spw_probe_field "$probe_output" status)
+update_control=$(spw_probe_field "$probe_output" update_control)
+[ -n "$update_control" ] || spw_die "probe did not report adapter update-control capability"
 
 case "$status" in
   current)
+    spw_require_managed_update_control "$update_control"
     printf '%s\n' "$probe_output"
     echo "manager is current"
     ;;
   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"