fix(setup): follow configured marketplace

Author: jaromil

README.md

@@ -67,6 +67,10 @@ cd <MARKETPLACE_ROOT>
 ./gestalt-setup.sh
 ```
 
+You may also run `gestalt-setup.sh` from a development checkout. If Codex has a
+different marketplace snapshot configured, the script continues from that
+snapshot automatically and preserves its arguments.
+
 The script defaults `CODEX_HOME` to `~/.codex-gestalt`, installs both plugins,
 prepares context-mode, generates `org-plan-reviewer` and `org-plan-executor`,
 and removes the retired `org-plan-supervisor`. It does not create, validate, or

USAGE.md

@@ -18,6 +18,9 @@ cd <MARKETPLACE_ROOT>
 ./gestalt-setup.sh
 ```
 
+When setup is launched from another checkout, it automatically continues from
+the marketplace snapshot configured in `~/.codex-gestalt`.
+
 Marketplace installation does not run the setup script automatically. The
 script installs both plugins, prepares the exact installed context-mode cache,
 verifies its artifact manifest, generates the reviewer and executor profiles,

gestalt-setup.sh

@@ -6,6 +6,7 @@ script_dir=$(CDPATH='' cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd -P)
 marketplace_file="$script_dir/.agents/plugins/marketplace.json"
 context_source="$script_dir/plugins/context-mode"
 org_plan="$script_dir/plugins/gestalt/skills/org-plan/scripts/org-plan"
+setup_args=("$@")
 prepare_only=false
 force=false
 dry_run=false
@@ -117,7 +118,11 @@ else
     configured_root=$(CDPATH='' cd -- "$configured_root" 2>/dev/null && pwd -P) ||
       die "configured marketplace root is unreadable: $configured_root"
     if [[ $configured_root != "$script_dir" ]]; then
-      die "marketplace '$marketplace_name' points to $configured_root; run $configured_root/gestalt-setup.sh instead"
+      configured_setup="$configured_root/gestalt-setup.sh"
+      [[ -f $configured_setup ]] ||
+        die "configured marketplace setup script is missing: $configured_setup"
+      printf 'gestalt-setup: continuing from configured marketplace %s\n' "$configured_root"
+      exec bash "$configured_setup" "${setup_args[@]}"
     fi
   else
     run codex plugin marketplace add "$script_dir"

tests/repository/test-gestalt-setup.sh

@@ -20,4 +20,26 @@ output=$(env -u CODEX_HOME HOME="$tmp" bash "$script" --dry-run)
 [[ $output == *"org-plan-supervisor.toml"* ]]
 [[ ! -e $tmp/.codex-gestalt ]]
 
+configured="$tmp/configured marketplace"
+mkdir -p "$configured" "$tmp/bin"
+cat >"$configured/gestalt-setup.sh" <<'SH'
+#!/usr/bin/env bash
+printf 'delegated home=%s args=' "$CODEX_HOME"
+printf '<%s>' "$@"
+printf '\n'
+SH
+cat >"$tmp/bin/codex" <<SH
+#!/usr/bin/env bash
+if [[ \$* == 'plugin marketplace list' ]]; then
+  printf 'Marketplace  Path\n'
+  printf 'dyne-gestalt-agents  %s\n' '$configured'
+  exit 0
+fi
+exit 99
+SH
+chmod +x "$configured/gestalt-setup.sh" "$tmp/bin/codex"
+delegated=$(CODEX_HOME="$tmp/delegated-home" PATH="$tmp/bin:$PATH" bash "$script" --force)
+[[ $delegated == *"continuing from configured marketplace $configured"* ]]
+[[ $delegated == *"delegated home=$tmp/delegated-home args=<--force>"* ]]
+
 printf 'gestalt setup script is valid\n'