Merge 26707f296c into a3259400a3

setup

@@ -1380,16 +1380,22 @@ if [ "$NO_TEAM_MODE" -ne 1 ] \
     *)                       PT_DECISION="prompt" ;;
   esac
 
-  # Conductor host reliability: the PreToolUse preference hook also carries the
+  # Conductor host: do NOT auto-install the plan-tune AUQ hooks here.
-  # Conductor-prose enforcement (deny the flaky mcp__conductor__AskUserQuestion,
+  #
-  # redirect to a prose decision brief). A Conductor workspace setup otherwise
+  # The PreToolUse preference hook participates in the Agent-SDK `canUseTool`
-  # falls through to "prompt" → the non-interactive skip below, leaving Conductor
+  # elicitation flow that Conductor uses to render AskUserQuestion. Its mere
-  # users without that backstop. Treat Conductor as an implicit opt-in — but
+  # presence corrupts that round-trip — even when it returns `defer` — so the
-  # only on the silent fall-through, never overriding an explicit --no-plan-tune-hooks.
+  # tool comes back as `[Tool result missing due to internal error]` and no
-  if [ "$PT_DECISION" = "prompt" ] && { [ -n "${CONDUCTOR_WORKSPACE_PATH:-}" ] || [ -n "${CONDUCTOR_PORT:-}" ]; }; then
+  # options render. In other words, native AUQ works fine in Conductor UNTIL
-    PT_DECISION="yes"
+  # this hook is registered; the "flaky mcp__conductor__AskUserQuestion" this
-    _PT_CONDUCTOR_AUTO=1
+  # backstop was meant to work around is caused by the backstop itself.
-  fi
+  # (Codex sessions never read ~/.claude/settings.json, so they're unaffected —
+  # which is why AUQ works in Codex but breaks in Claude on the same workspace.)
+  #
+  # Fall through to the normal decision below: a Conductor workspace with no
+  # explicit --plan-tune-hooks / GSTACK_PLAN_TUNE_HOOKS / plan_tune_hooks config
+  # takes the non-interactive skip and keeps native AUQ working. Users who
+  # genuinely want the prose backstop can still opt in explicitly.
 
   _install_plan_tune_hooks() {
     "$SETTINGS_HOOK" add-event \