garrytan · garrytan · May 30, 2026 · May 30, 2026 · May 30, 2026 · May 30, 2026
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,32 @@
 # Changelog
 
+## [1.53.1.0] - 2026-05-30
+
+## **Workspace and scripted setup never hang on a hidden prompt again. Installing the plan-tune hooks is now flag-driven with safe defaults.**
+
+`./setup` asked "Install both hooks now? [y/N]" with a blocking read. Run under a Conductor workspace or any forwarded terminal, that prompt had nobody to answer it, so setup hung forever. Now the decision comes from a flag, an env var, or saved config, and when nobody is there to answer it takes a safe default instead of waiting. A real terminal still gets the prompt, but it is time-bounded (auto-skips after 10s) so it can never stall a pipeline.
+
+### What this means for you
+
+- Spinning up a new workspace just works. `bin/dev-setup` runs fully non-interactively and never rewrites your global Claude settings behind your back.
+- Want the plan-tune hooks installed without a prompt? `./setup --plan-tune-hooks` (or `GSTACK_PLAN_TUNE_HOOKS=yes`, or `gstack-config set plan_tune_hooks yes`). Don't want them? `--no-plan-tune-hooks`. Leave it unset and a real terminal still asks once, then remembers.
+
+### Added
+
+- `--plan-tune-hooks` / `--no-plan-tune-hooks` / `--plan-tune-hooks=yes|no|prompt` flags on `./setup`, plus the `GSTACK_PLAN_TUNE_HOOKS` env var and a `plan_tune_hooks` config key (default `prompt`). Precedence: flag > env > saved config > prompt on a real terminal.
+
+### Fixed
+
+- `./setup` no longer hangs in non-interactive or forwarded-TTY contexts (Conductor workspaces, CI). The plan-tune consent prompt is time-bounded and defaults to skip.
+- `bin/dev-setup` runs setup non-interactively and can no longer silently rewrite your global `~/.claude/settings.json` to point at an ephemeral workspace path that breaks when the workspace is deleted.
+- Opt-in values like `YES`, `Yes`, or ` yes` are honored instead of being silently downgraded to skip, and `gstack-config` now rejects out-of-domain `plan_tune_hooks` values.
+
+### For contributors
+
+- New regression suite `test/setup-plan-tune-hooks-noninteractive.test.ts` (flag wiring, no-blocking-read guard, decision normalization, config round-trip + domain rejection, dev-setup pin) with host-config isolation via a temp `GSTACK_HOME`.
+- Rebaselined `test/parity-suite.test.ts` from the stale v1.44.1 anchor to v1.53.0.0. The 1.05 per-skill ratio is kept (only the anchor moved), absorbing legitimate v1.49–v1.53 planning-skill growth and clearing the 5 pre-existing parity failures noted in the v1.53.0.0 entry. Historical baselines retained for the v1→v2 audit trail.
+- De-flaked `test/plan-tune.test.ts` "derive pushes scope_appetite up" (was ~25–50% flaky, worse on main): it now sets `GSTACK_QUESTION_LOG_NO_DERIVE=1` so gstack-question-log's fire-and-forget background `--derive` can't race the test's explicit one.
+
 ## [1.53.0.0] - 2026-05-29
 
 ## **Secrets, PII, and legal landmines get caught before they reach a public sink. One redaction engine now guards /spec, /ship, /cso, and the /document-* skills.**

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -326,11 +326,13 @@ If you're using [Conductor](https://conductor.build) to run multiple Claude Code
 
 | Hook | Script | What it does |
 |------|--------|-------------|
-| `setup` | `bin/dev-setup` | Copies `.env` from main worktree, installs deps, symlinks skills |
+| `setup` | `bin/dev-setup` | Copies `.env` from main worktree, installs deps, symlinks skills, runs `./setup` non-interactively |
 | `archive` | `bin/dev-teardown` | Removes skill symlinks, cleans up `.claude/` directory |
 
 When Conductor creates a new workspace, `bin/dev-setup` runs automatically. It detects the main worktree (via `git worktree list`), copies your `.env` so API keys carry over, and sets up dev mode — no manual steps needed.
 
+`bin/dev-setup` runs `./setup` fully non-interactively (it passes `--plan-tune-hooks=prompt` and closes stdin), so a forwarded Conductor TTY can never hang on a hidden setup prompt. It also never installs the plan-tune Claude Code hooks, which means a throwaway workspace can't rewrite your global `~/.claude/settings.json` to point at an ephemeral worktree path. To install the plan-tune hooks deliberately, run `./setup --plan-tune-hooks` outside dev-setup (or `gstack-config set plan_tune_hooks yes`).
+
 **First-time setup:** Put your `ANTHROPIC_API_KEY` in `.env` in the main repo (see `.env.example`). Every Conductor workspace inherits it automatically.
 
 **`GSTACK_*` env prefix (Conductor-injected keys).** Conductor explicitly strips `ANTHROPIC_API_KEY` and `OPENAI_API_KEY` from every workspace's process env. The `.env` copy path doesn't restore them either — the strip happens after env inheritance. Users who want paid evals, `/sync-gbrain` embeddings, or `claude-agent-sdk` calls to work in a Conductor workspace must set `GSTACK_ANTHROPIC_API_KEY` and `GSTACK_OPENAI_API_KEY` in Conductor's workspace env config; Conductor passes those through untouched. On the gstack side, TS entry points import `lib/conductor-env-shim.ts` as a side effect, which promotes `GSTACK_FOO_API_KEY` to `FOO_API_KEY` when the canonical name is empty. If you add a new TS entry point that hits a paid API, add `import "../lib/conductor-env-shim";` to the top of the file. Today the shim is imported from `bin/gstack-gbrain-sync.ts`, `bin/gstack-model-benchmark`, `scripts/preflight-agent-sdk.ts`, and `test/helpers/e2e-helpers.ts`.

diff --git a/TODOS.md b/TODOS.md
@@ -2,27 +2,22 @@
 
 ## Test infrastructure
 
-### P0: Rebaseline parity-suite (v1.44.1) — stale, 5 pre-existing failures
-
-**What:** `test/parity-suite.test.ts` checks every skill's SKILL.md size against
-the frozen `test/fixtures/parity-baseline-v1.44.1.json`. Five planning skills now
-exceed the 1.05x ceiling: `plan-ceo-review` (1.052), `plan-eng-review` (1.062),
-`plan-design-review` (1.068), `investigate` (1.053), `office-hours` (1.065).
-
-**Why:** These grew during the brain-aware-planning releases (v1.49–v1.52) which
-added the `BRAIN_PREFLIGHT`/`BRAIN_CACHE_REFRESH`/`BRAIN_WRITE_BACK` resolvers to
-those skills. The v1.44.1 baseline was never regenerated, so it's four releases
-stale. The failures are pre-existing on `origin/main` (proven: they fail with the
-redaction branch absent). The active size gate (`skill-size-budget`, v1.47 baseline)
-passes, and parity-suite is not in CI's `test:gate`, so nothing is blocked — but the
-local `bun test` shows red until rebaselined.
-
-**How to start:** Either regenerate the fixture to a current baseline
-(`bun run scripts/capture-baseline.ts <tag>` and point the test at it), or bump the
-per-skill ratio for the planning skills. Decide whether v1.44.1 should be retired in
-favor of the v1.47 baseline the size-budget test already uses.
-
-**Depends on:** nothing. Standalone.
+### ✅ DONE (v1.53.1.0): Rebaseline parity-suite (v1.44.1 → v1.53.0.0)
+
+**What:** `test/parity-suite.test.ts` checked every skill's SKILL.md size against
+the frozen `test/fixtures/parity-baseline-v1.44.1.json`. Five planning skills had
+crept past the 1.05x ceiling: `plan-ceo-review` (1.052), `plan-eng-review` (1.062),
+`plan-design-review` (1.068), `investigate` (1.053), `office-hours` (1.065) — growth
+from the brain-aware-planning releases (v1.49–v1.52) plus the v1.53 redaction guard.
+
+**Resolved:** Captured a fresh baseline at HEAD via
+`bun run scripts/capture-baseline.ts --tag v1.53.0.0` and re-pointed the test at
+`test/fixtures/parity-baseline-v1.53.0.0.json`. The per-skill 1.05 ratio is kept, so
+future bloat is still caught — only the stale anchor moved. Mirrors the earlier
+`skill-size-budget` rebase (v1.44.1 → v1.47.0.0). Historical v1.44.1 / v1.46.0.0 /
+v1.47.0.0 baselines retained in `test/fixtures/` for the v1→v2 audit trail. The
+captured skill bytes match `origin/main` exactly (the rebasing branch left every
+SKILL.md untouched). `bun test` is green again.
 
 ## gbrowser memory follow-ups (filed via /plan-eng-review + /codex on the v1.49 leak-fix PR)
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.53.0.0
+1.53.1.0
diff --git a/bin/dev-setup b/bin/dev-setup
@@ -56,8 +56,23 @@ if [ ! -e "$AGENTS_LINK" ]; then
   ln -s "$REPO_ROOT" "$AGENTS_LINK"
 fi
 
-# 6. Run setup via the symlink so it detects .claude/skills/ as its parent
-"$GSTACK_LINK/setup"
+# 6. Run setup via the symlink so it detects .claude/skills/ as its parent.
+#
+# Workspace/dev setup MUST be non-interactive: Conductor runs this under a
+# forwarded pty, so any `read` in setup (skill-prefix prompt, plan-tune hook
+# consent) would hang the workspace forever. Detaching stdin makes every setup
+# prompt take its smart non-interactive default (flat skill names, etc.).
+#
+# `--plan-tune-hooks=prompt` is load-bearing, not redundant: stdin alone only
+# suppresses the *prompt* branch. A saved `plan_tune_hooks: yes` or an exported
+# GSTACK_PLAN_TUNE_HOOKS=yes would still resolve to "install" and rewrite the
+# user's global ~/.claude/settings.json to point at THIS ephemeral worktree —
+# which breaks once the workspace is deleted. The flag has highest precedence,
+# so it pins resolution to "prompt", and closed stdin then makes prompt-mode a
+# no-op skip (no install, no decline marker). A dev workspace must never mutate
+# global settings.json. To install the hooks, run `./setup --plan-tune-hooks`
+# directly (outside dev-setup). Saved prefix/other config preferences still apply.
+"$GSTACK_LINK/setup" --plan-tune-hooks=prompt </dev/null
 
 echo ""
 echo "Dev mode active. Skills resolve from this working tree."

diff --git a/bin/gstack-config b/bin/gstack-config
@@ -75,6 +75,16 @@ CONFIG_HEADER='# gstack configuration — edit freely, changes take effect on ne
 #                           # Set to true once the privacy gate has asked the user.
 #                           # Flip back to false to be re-prompted.
 #
+# ─── Plan-tune hooks ─────────────────────────────────────────────────
+# plan_tune_hooks: prompt   # Controls whether ./setup installs the plan-tune
+#                           #   Claude Code hooks (PostToolUse capture +
+#                           #   PreToolUse preference enforcement).
+#                           #   prompt — ask on a real TTY, skip otherwise (default)
+#                           #   yes    — install non-interactively
+#                           #   no     — skip non-interactively
+#                           # Override per-run: ./setup --plan-tune-hooks /
+#                           #   --no-plan-tune-hooks, or env GSTACK_PLAN_TUNE_HOOKS.
+#
 # ─── Advanced ────────────────────────────────────────────────────────
 # codex_reviews: enabled    # disabled = skip Codex adversarial reviews in /ship
 # gstack_contributor: false # true = file field reports when gstack misbehaves
@@ -110,6 +120,8 @@ lookup_default() {
     cross_project_learnings) echo "" ;; # intentionally empty → unset triggers first-time prompt
     artifacts_sync_mode) echo "off" ;;
     artifacts_sync_mode_prompted) echo "false" ;;
+    plan_tune_hooks) echo "prompt" ;; # prompt | yes | no — controls ./setup plan-tune hook install
+
     redact_repo_visibility) echo "" ;; # empty → fall through to gh/glab detection
     redact_prepush_hook) echo "false" ;;
     # Brain-aware planning (v1.48 / T5+T10+T16). Defaults documented inline:
@@ -286,6 +298,10 @@ case "${1:-}" in
       echo "Warning: redact_prepush_hook '$VALUE' not recognized. Valid values: true, false. Using false." >&2
       VALUE="false"
     fi
+    if [ "$KEY" = "plan_tune_hooks" ] && [ "$VALUE" != "prompt" ] && [ "$VALUE" != "yes" ] && [ "$VALUE" != "no" ]; then
+      echo "Warning: plan_tune_hooks '$VALUE' not recognized. Valid values: prompt, yes, no. Using prompt." >&2
+      VALUE="prompt"
+    fi
     mkdir -p "$STATE_DIR"
     # Write annotated header on first creation
     if [ ! -f "$CONFIG_FILE" ]; then
@@ -315,7 +331,7 @@ case "${1:-}" in
     for KEY in proactive routing_declined telemetry auto_upgrade update_check \
                skill_prefix checkpoint_mode checkpoint_push explain_level \
                codex_reviews gstack_contributor skip_eng_review workspace_root \
-               artifacts_sync_mode artifacts_sync_mode_prompted; do
+               artifacts_sync_mode artifacts_sync_mode_prompted plan_tune_hooks; do
       VALUE=$(grep -E "^${KEY}:" "$CONFIG_FILE" 2>/dev/null | tail -1 | awk '{print $2}' | tr -d '[:space:]' || true)
       SOURCE="default"
       if [ -n "$VALUE" ]; then
@@ -331,7 +347,7 @@ case "${1:-}" in
     for KEY in proactive routing_declined telemetry auto_upgrade update_check \
                skill_prefix checkpoint_mode checkpoint_push explain_level \
                codex_reviews gstack_contributor skip_eng_review workspace_root \
-               artifacts_sync_mode artifacts_sync_mode_prompted; do
+               artifacts_sync_mode artifacts_sync_mode_prompted plan_tune_hooks; do
       printf '  %-24s %s\n' "$KEY:" "$(lookup_default "$KEY")"
     done
     ;;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gstack",
-  "version": "1.53.0.0",
+  "version": "1.53.1.0",
   "description": "Garry's Stack — Claude Code skills + fast headless browser. One repo, one install, entire AI engineering workflow.",
   "license": "MIT",
   "type": "module",

diff --git a/setup b/setup
@@ -82,6 +82,7 @@ SKILL_PREFIX=1
 SKILL_PREFIX_FLAG=0
 TEAM_MODE=0
 NO_TEAM_MODE=0
+PLAN_TUNE_HOOKS_MODE=""   # "" = resolve from env/config/prompt; "yes"/"no" = explicit
 while [ $# -gt 0 ]; do
   case "$1" in
     --host) [ -z "$2" ] && echo "Missing value for --host (expected claude, codex, kiro, factory, opencode, openclaw, hermes, gbrain, or auto)" >&2 && exit 1; HOST="$2"; shift 2 ;;
@@ -91,6 +92,9 @@ while [ $# -gt 0 ]; do
     --no-prefix) SKILL_PREFIX=0; SKILL_PREFIX_FLAG=1; shift ;;
     --team)    TEAM_MODE=1; shift ;;
     --no-team) NO_TEAM_MODE=1; shift ;;
+    --plan-tune-hooks)    PLAN_TUNE_HOOKS_MODE="yes"; shift ;;
+    --no-plan-tune-hooks) PLAN_TUNE_HOOKS_MODE="no"; shift ;;
+    --plan-tune-hooks=*)  PLAN_TUNE_HOOKS_MODE="${1#--plan-tune-hooks=}"; shift ;;
     -q|--quiet) QUIET=1; shift ;;
     *) shift ;;
   esac
@@ -1304,14 +1308,65 @@ if [ "$NO_TEAM_MODE" -ne 1 ] \
     ALREADY_INSTALLED=1
   fi
 
+  # Resolve the desired action without ever blocking.
+  # Priority: CLI flag (--plan-tune-hooks / --no-plan-tune-hooks)
+  #         > env (GSTACK_PLAN_TUNE_HOOKS=yes|no)
+  #         > saved config (plan_tune_hooks)
+  #         > smart default ("prompt" → timed prompt on a real TTY, else skip).
+  # This guarantees scripted/workspace setups (conductor, CI) are never
+  # interactive: pass --no-plan-tune-hooks (or --plan-tune-hooks) and the
+  # block runs to completion with no `read`.
+  PT_DECISION="$PLAN_TUNE_HOOKS_MODE"
+  [ -z "$PT_DECISION" ] && PT_DECISION="${GSTACK_PLAN_TUNE_HOOKS:-}"
+  [ -z "$PT_DECISION" ] && PT_DECISION="$("$GSTACK_CONFIG" get plan_tune_hooks 2>/dev/null || true)"
+  # Normalize: strip whitespace + lowercase so "YES", "Yes", " yes" from a flag
+  # or env var all resolve correctly (an unrecognized opt-in must NOT silently
+  # downgrade to skip). Unknown values fall through to "prompt".
+  PT_DECISION=$(printf '%s' "$PT_DECISION" | tr '[:upper:]' '[:lower:]' | tr -d '[:space:]')
+  case "$PT_DECISION" in
+    y|yes|true|install|on|1) PT_DECISION="yes" ;;
+    n|no|false|skip|off|0)   PT_DECISION="no" ;;
+    *)                       PT_DECISION="prompt" ;;
+  esac
+
+  _install_plan_tune_hooks() {
+    "$SETTINGS_HOOK" add-event \
+      --event PostToolUse \
+      --matcher '(AskUserQuestion|mcp__.*__AskUserQuestion)' \
+      --command "$PLAN_TUNE_LOG_HOOK" \
+      --source plan-tune-cathedral \
+      --timeout 5
+    "$SETTINGS_HOOK" add-event \
+      --event PreToolUse \
+      --matcher '(AskUserQuestion|mcp__.*__AskUserQuestion)' \
+      --command "$PLAN_TUNE_PREF_HOOK" \
+      --source plan-tune-cathedral \
+      --timeout 5
+  }
+
   if [ "$ALREADY_INSTALLED" -eq 1 ]; then
     log ""
     log "Plan-tune hooks already installed. Run \`$SETTINGS_HOOK list-sources\` to inspect."
+  elif [ "$PT_DECISION" = "yes" ]; then
+    # Explicit opt-in (flag / env / config). Non-interactive.
+    _install_plan_tune_hooks
+    log ""
+    log "Plan-tune hooks installed. Run /plan-tune anytime to inspect."
+    touch "$PLAN_TUNE_INSTALL_MARKER"
+  elif [ "$PT_DECISION" = "no" ]; then
+    # Explicit opt-out (flag / env / config). Non-interactive.
+    log ""
+    log "Plan-tune cathedral hooks not installed (opted out)."
+    log "Install later with: ./setup --plan-tune-hooks  (or /update-config)."
+    touch "$PLAN_TUNE_INSTALL_MARKER"
   elif [ -f "$PLAN_TUNE_INSTALL_MARKER" ]; then
     # Previously declined. Don't re-ask. User can re-enable via /update-config.
     :
-  elif [ -t 0 ] && [ -t 1 ]; then
-    # Interactive install with explicit consent + diff preview.
+  elif [ "$QUIET" -ne 1 ] && [ -t 0 ] && [ -t 1 ]; then
+    # Real interactive terminal with no recorded preference: ask, with explicit
+    # consent + diff preview. The read is time-bounded and defaults to "skip" so
+    # it can never hang an automated/forwarded TTY (the conductor failure mode).
+    _PT_PROMPT_TIMEOUT=10  # single source of truth for the read + the countdown text
     log ""
     log "──────────────────────────────────────────────────────────"
     log "Plan-tune cathedral: install Claude Code hooks?"
@@ -1336,33 +1391,32 @@ if [ "$NO_TEAM_MODE" -ne 1 ] \
     log "Backup: settings.json.bak.<ts> written before any mutation."
     log "Rollback: $SETTINGS_HOOK rollback"
     log ""
-    printf "Install both hooks now? [y/N] "
-    read -r PLAN_TUNE_INSTALL_REPLY
-    if [ "$PLAN_TUNE_INSTALL_REPLY" = "y" ] || [ "$PLAN_TUNE_INSTALL_REPLY" = "Y" ]; then
-      "$SETTINGS_HOOK" add-event \
-        --event PostToolUse \
-        --matcher '(AskUserQuestion|mcp__.*__AskUserQuestion)' \
-        --command "$PLAN_TUNE_LOG_HOOK" \
-        --source plan-tune-cathedral \
-        --timeout 5
-      "$SETTINGS_HOOK" add-event \
-        --event PreToolUse \
-        --matcher '(AskUserQuestion|mcp__.*__AskUserQuestion)' \
-        --command "$PLAN_TUNE_PREF_HOOK" \
-        --source plan-tune-cathedral \
-        --timeout 5
-      log ""
-      log "Plan-tune hooks installed. Run /plan-tune anytime to inspect."
-    else
-      log ""
-      log "Skipped. Re-run ./setup or use /update-config to install later."
-    fi
-    touch "$PLAN_TUNE_INSTALL_MARKER"
+    printf "Install both hooks now? [y/N] (default: N, auto-skips in %ss): " "$_PT_PROMPT_TIMEOUT"
+    read -t "$_PT_PROMPT_TIMEOUT" -r PLAN_TUNE_INSTALL_REPLY </dev/tty 2>/dev/null || PLAN_TUNE_INSTALL_REPLY=""
+    case "$PLAN_TUNE_INSTALL_REPLY" in
+      y|Y)
+        _install_plan_tune_hooks
+        log ""
+        log "Plan-tune hooks installed. Run /plan-tune anytime to inspect."
+        touch "$PLAN_TUNE_INSTALL_MARKER"
+        ;;
+      n|N)
+        log ""
+        log "Skipped. Re-run ./setup --plan-tune-hooks or use /update-config to install later."
+        touch "$PLAN_TUNE_INSTALL_MARKER"
+        ;;
+      *)
+        # Empty / timed out — treat as "ask me again" (don't persist a decline).
+        log ""
+        log "No response — skipped for now. Re-run ./setup --plan-tune-hooks to install."
+        ;;
+    esac
   else
-    # Non-interactive (CI, scripted setup). Don't prompt; print one-liner.
+    # Non-interactive (CI, scripted/workspace setup, quiet). Never prompt.
     log ""
     log "Plan-tune cathedral hooks not installed (non-interactive setup)."
-    log "Install with:"
+    log "Install with: ./setup --plan-tune-hooks"
+    log "  (or set GSTACK_PLAN_TUNE_HOOKS=yes, or run the commands below)"
     log "  $SETTINGS_HOOK add-event --event PostToolUse \\"
     log "    --matcher '(AskUserQuestion|mcp__.*__AskUserQuestion)' \\"
     log "    --command $PLAN_TUNE_LOG_HOOK --source plan-tune-cathedral --timeout 5"