aidevops 3.1.270 → 3.1.272

package/VERSION

@@ -1 +1 @@
-3.1.270
+3.1.272

package/aidevops.sh

@@ -3,7 +3,7 @@
 # AI DevOps Framework CLI
 # Usage: aidevops <command> [options]
 #
-# Version: 3.1.270
+# Version: 3.1.272
 
 set -euo pipefail
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aidevops",
-  "version": "3.1.270",
+  "version": "3.1.272",
   "description": "AI DevOps Framework - AI-assisted development workflows, code quality, and deployment automation",
   "type": "module",
   "bin": {

package/setup-modules/agent-deploy.sh

@@ -324,14 +324,33 @@ deploy_aidevops_agents() {
 inject_agents_reference() {
 	print_info "Adding aidevops reference to AI assistant configurations..."
 
+	# Delegate to prompt-injection-adapter.sh (t1665.3) which handles all runtimes.
+	# The adapter deploys AGENTS.md references via each runtime's native mechanism:
+	# OpenCode (json-instructions), Claude (AGENTS.md autodiscovery), Codex, Cursor,
+	# Droid, Gemini, Windsurf, Continue, Kilo, Kiro, Aider.
+	local adapter_script="${INSTALL_DIR}/.agents/scripts/prompt-injection-adapter.sh"
+
+	if [[ -f "$adapter_script" ]]; then
+		# shellcheck source=/dev/null
+		source "$adapter_script"
+		deploy_prompts_for_all_runtimes
+	else
+		# Fallback: adapter not yet deployed — use legacy inline logic
+		# This path is only hit during initial setup before .agents/ is deployed.
+		print_warning "prompt-injection-adapter.sh not found — using legacy deployment"
+		_inject_agents_reference_legacy
+	fi
+
+	return 0
+}
+
+# Legacy fallback for inject_agents_reference — used only when the adapter
+# script is not yet available (e.g., during initial setup before .agents/ deploy).
+# Will be removed once t1665 migration is complete.
+_inject_agents_reference_legacy() {
 	local reference_line='Add ~/.aidevops/agents/AGENTS.md to context for AI DevOps capabilities.'
 
 	# AI assistant agent directories - these receive AGENTS.md reference
-	# Format: "config_dir:agents_subdir" where agents_subdir is the folder containing agent files
-	# Only Claude Code (companion CLI) and .opencode are included here.
-	# OpenCode excluded: its agent/ dir treats every .md as a subagent, so AGENTS.md
-	# would show as a mode. OpenCode gets the reference via opencode.json instructions
-	# field and the config-root AGENTS.md (deployed by deploy_opencode_greeting below).
 	local ai_agent_dirs=(
 		"$HOME/.claude:commands"
 		"$HOME/.opencode:."
@@ -347,16 +366,12 @@ inject_agents_reference() {
 
 		# Only process if the config directory exists (tool is installed)
 		if [[ -d "$config_dir" ]]; then
-			# Create agents subdirectory if needed
 			mkdir -p "$agents_dir"
 
-			# Check if AGENTS.md exists and has our reference
 			if [[ -f "$agents_file" ]]; then
-				# Check first line for our reference
 				local first_line
 				first_line=$(head -1 "$agents_file" 2>/dev/null || echo "")
-				if [[ "$first_line" != *"~/.aidevops/agents/AGENTS.md"* ]]; then
-					# Prepend reference to existing file
+				if [[ "$first_line" != *"aidevops/agents/AGENTS.md"* ]]; then
 					local temp_file
 					temp_file=$(mktemp)
 					trap 'rm -f "${temp_file:-}"' RETURN
@@ -370,7 +385,6 @@ inject_agents_reference() {
 					print_info "Reference already exists in $agents_file"
 				fi
 			else
-				# Create new file with just the reference
 				echo "$reference_line" >"$agents_file"
 				print_success "Created $agents_file with aidevops reference"
 				((++updated_count))
@@ -384,17 +398,15 @@ inject_agents_reference() {
 		print_success "Updated $updated_count AI assistant configuration(s)"
 	fi
 
-	# Clean up stale AGENTS.md from OpenCode agent dir (was incorrectly showing as subagent)
+	# Clean up stale AGENTS.md from OpenCode agent dir
 	rm -f "$HOME/.config/opencode/agent/AGENTS.md"
 
 	# Deploy OpenCode config-level AGENTS.md from managed template
-	# This controls the session greeting (auto-loaded by OpenCode from config root)
 	local opencode_config_dir="$HOME/.config/opencode"
 	local opencode_config_agents="$opencode_config_dir/AGENTS.md"
 	local template_source="$INSTALL_DIR/templates/opencode-config-agents.md"
 
 	if [[ -d "$opencode_config_dir" && -f "$template_source" ]]; then
-		# Backup if file exists and differs from template
 		if [[ -f "$opencode_config_agents" ]]; then
 			if ! diff -q "$template_source" "$opencode_config_agents" &>/dev/null; then
 				create_backup_with_rotation "$opencode_config_agents" "opencode-agents"
@@ -407,6 +419,113 @@ inject_agents_reference() {
 		fi
 	fi
 
+	# Deploy Codex instructions.md (Codex reads ~/.codex/instructions.md as system prompt)
+	_deploy_codex_instructions
+
+	# Deploy Cursor AGENTS.md (Cursor reads ~/.cursor/rules/*.md as context)
+	_deploy_cursor_agents_reference
+
+	# Deploy Droid AGENTS.md (Droid reads ~/.factory/skills/*.md as context)
+	_deploy_droid_agents_reference
+
+	return 0
+}
+
+# Deploy instructions.md to Codex config directory.
+# Codex reads ~/.codex/instructions.md as its system-level instructions.
+_deploy_codex_instructions() {
+	local codex_dir="$HOME/.codex"
+	local instructions_file="$codex_dir/instructions.md"
+
+	# Only deploy if Codex is installed or config dir exists
+	if [[ ! -d "$codex_dir" ]] && ! command -v codex >/dev/null 2>&1; then
+		return 0
+	fi
+
+	mkdir -p "$codex_dir"
+
+	local reference_content
+	reference_content="Add ~/.aidevops/agents/AGENTS.md to context for AI DevOps capabilities."
+
+	if [[ -f "$instructions_file" ]]; then
+		# Check if our reference is already present
+		# shellcheck disable=SC2088  # Tilde is a literal grep pattern, not a path
+		if grep -q '~/.aidevops/agents/AGENTS.md' "$instructions_file" 2>/dev/null; then
+			print_info "Codex instructions.md already has aidevops reference"
+			return 0
+		fi
+		# Prepend reference to existing instructions
+		local temp_file
+		temp_file=$(mktemp)
+		echo "$reference_content" >"$temp_file"
+		echo "" >>"$temp_file"
+		cat "$instructions_file" >>"$temp_file"
+		mv "$temp_file" "$instructions_file"
+		print_success "Added aidevops reference to $instructions_file"
+	else
+		echo "$reference_content" >"$instructions_file"
+		print_success "Created $instructions_file with aidevops reference"
+	fi
+	return 0
+}
+
+# Deploy AGENTS.md reference to Cursor rules directory.
+# Cursor reads ~/.cursor/rules/*.md files as additional context.
+_deploy_cursor_agents_reference() {
+	local cursor_dir="$HOME/.cursor"
+	local rules_dir="$cursor_dir/rules"
+	local agents_file="$rules_dir/aidevops.md"
+
+	# Only deploy if Cursor is installed or config dir exists
+	if [[ ! -d "$cursor_dir" ]] && ! command -v cursor >/dev/null 2>&1 && ! command -v agent >/dev/null 2>&1; then
+		return 0
+	fi
+
+	mkdir -p "$rules_dir"
+
+	local reference_content
+	reference_content="Add ~/.aidevops/agents/AGENTS.md to context for AI DevOps capabilities."
+
+	if [[ -f "$agents_file" ]]; then
+		# shellcheck disable=SC2088  # Tilde is a literal grep pattern, not a path
+		if grep -q '~/.aidevops/agents/AGENTS.md' "$agents_file" 2>/dev/null; then
+			print_info "Cursor rules/aidevops.md already has aidevops reference"
+			return 0
+		fi
+	fi
+
+	echo "$reference_content" >"$agents_file"
+	print_success "Deployed aidevops reference to $agents_file"
+	return 0
+}
+
+# Deploy AGENTS.md reference to Droid skills directory.
+# Droid reads ~/.factory/skills/*.md files as additional context.
+_deploy_droid_agents_reference() {
+	local factory_dir="$HOME/.factory"
+	local skills_dir="$factory_dir/skills"
+	local agents_file="$skills_dir/aidevops.md"
+
+	# Only deploy if Droid is installed or config dir exists
+	if [[ ! -d "$factory_dir" ]] && ! command -v droid >/dev/null 2>&1; then
+		return 0
+	fi
+
+	mkdir -p "$skills_dir"
+
+	local reference_content
+	reference_content="Add ~/.aidevops/agents/AGENTS.md to context for AI DevOps capabilities."
+
+	if [[ -f "$agents_file" ]]; then
+		# shellcheck disable=SC2088  # Tilde is a literal grep pattern, not a path
+		if grep -q '~/.aidevops/agents/AGENTS.md' "$agents_file" 2>/dev/null; then
+			print_info "Droid skills/aidevops.md already has aidevops reference"
+			return 0
+		fi
+	fi
+
+	echo "$reference_content" >"$agents_file"
+	print_success "Deployed aidevops reference to $agents_file"
 	return 0
 }
 

package/setup-modules/config.sh

@@ -108,26 +108,31 @@ update_opencode_config() {
 
 	print_info "Updating OpenCode configuration..."
 
-	# Generate OpenCode commands (independent of opencode.json — writes to ~/.config/opencode/command/)
-	_run_generator ".agents/scripts/generate-opencode-commands.sh" \
-		"Generating OpenCode commands..." \
-		"OpenCode commands configured" \
-		"OpenCode command generation encountered issues"
-
-	# Generate OpenCode agent configuration (creates opencode.json if missing)
-	# - Primary agents: Added to opencode.json (for Tab order & MCP control)
-	# - Subagents: Generated as markdown in ~/.config/opencode/agent/
-	_run_generator ".agents/scripts/generate-opencode-agents.sh" \
-		"Generating OpenCode agent configuration..." \
-		"OpenCode agents configured (11 primary in JSON, subagents as markdown)" \
-		"OpenCode agent generation encountered issues"
-
-	# Regenerate subagent index for plugin startup (t1040)
-	_run_generator ".agents/scripts/subagent-index-helper.sh" \
-		"Regenerating subagent index..." \
-		"Subagent index regenerated" \
-		"Subagent index generation encountered issues" \
-		generate
+	# Use unified generator (t1665.4) if available, fall back to legacy scripts
+	if [[ -f ".agents/scripts/generate-runtime-config.sh" ]]; then
+		_run_generator ".agents/scripts/generate-runtime-config.sh" \
+			"Generating OpenCode configuration (unified)..." \
+			"OpenCode configuration complete (agents, commands, MCPs, prompts)" \
+			"OpenCode configuration encountered issues" \
+			all --runtime opencode
+	else
+		# Legacy fallback — remove after one release cycle
+		_run_generator ".agents/scripts/generate-opencode-commands.sh" \
+			"Generating OpenCode commands..." \
+			"OpenCode commands configured" \
+			"OpenCode command generation encountered issues"
+
+		_run_generator ".agents/scripts/generate-opencode-agents.sh" \
+			"Generating OpenCode agent configuration..." \
+			"OpenCode agents configured (11 primary in JSON, subagents as markdown)" \
+			"OpenCode agent generation encountered issues"
+
+		_run_generator ".agents/scripts/subagent-index-helper.sh" \
+			"Regenerating subagent index..." \
+			"Subagent index regenerated" \
+			"Subagent index generation encountered issues" \
+			generate
+	fi
 
 	return 0
 }
@@ -141,25 +146,250 @@ update_claude_config() {
 
 	print_info "Updating Claude Code configuration..."
 
-	# Generate Claude Code commands (writes to ~/.claude/commands/)
-	_run_generator ".agents/scripts/generate-claude-commands.sh" \
-		"Generating Claude Code commands..." \
-		"Claude Code commands configured" \
-		"Claude Code command generation encountered issues"
-
-	# Generate Claude Code agent configuration (MCPs, settings.json, slash commands)
-	# Mirrors update_opencode_config() calling generate-opencode-agents.sh (t1161.4)
-	_run_generator ".agents/scripts/generate-claude-agents.sh" \
-		"Generating Claude Code agent configuration..." \
-		"Claude Code agents configured (MCPs, settings, commands)" \
-		"Claude Code agent generation encountered issues"
-
-	# Regenerate subagent index (shared between OpenCode and Claude Code)
-	_run_generator ".agents/scripts/subagent-index-helper.sh" \
-		"Regenerating subagent index..." \
-		"Subagent index regenerated" \
-		"Subagent index generation encountered issues" \
-		generate
+	# Use unified generator (t1665.4) if available, fall back to legacy scripts
+	if [[ -f ".agents/scripts/generate-runtime-config.sh" ]]; then
+		_run_generator ".agents/scripts/generate-runtime-config.sh" \
+			"Generating Claude Code configuration (unified)..." \
+			"Claude Code configuration complete (agents, commands, MCPs, prompts)" \
+			"Claude Code configuration encountered issues" \
+			all --runtime claude-code
+	else
+		# Legacy fallback — remove after one release cycle
+		_run_generator ".agents/scripts/generate-claude-commands.sh" \
+			"Generating Claude Code commands..." \
+			"Claude Code commands configured" \
+			"Claude Code command generation encountered issues"
+
+		_run_generator ".agents/scripts/generate-claude-agents.sh" \
+			"Generating Claude Code agent configuration..." \
+			"Claude Code agents configured (MCPs, settings, commands)" \
+			"Claude Code agent generation encountered issues"
+
+		_run_generator ".agents/scripts/subagent-index-helper.sh" \
+			"Regenerating subagent index..." \
+			"Subagent index regenerated" \
+			"Subagent index generation encountered issues" \
+			generate
+	fi
+
+	return 0
+}
+
+# Unified runtime config update (t1665.4)
+# Generates config for all installed runtimes in a single pass.
+# Called by setup.sh as an alternative to separate update_opencode_config + update_claude_config.
+# Respects per-runtime opt-outs (manage_opencode_config, manage_claude_config).
+update_runtime_configs() {
+	print_info "Updating runtime configurations..."
+
+	if [[ ! -f ".agents/scripts/generate-runtime-config.sh" ]]; then
+		# Legacy fallback — use per-runtime update functions
+		print_info "Unified generator not found — falling back to per-runtime updates"
+		update_opencode_config
+		update_claude_config
+		return 0
+	fi
+
+	# Build list of runtimes to generate, respecting opt-outs
+	local runtimes_to_generate=()
+
+	if is_feature_enabled manage_opencode_config 2>/dev/null; then
+		runtimes_to_generate+=("opencode")
+	else
+		print_info "OpenCode config management disabled via config"
+	fi
+
+	if is_feature_enabled manage_claude_config 2>/dev/null; then
+		runtimes_to_generate+=("claude-code")
+	else
+		print_info "Claude Code config management disabled via config"
+	fi
+
+	# Generate for each enabled runtime
+	local runtime
+	for runtime in "${runtimes_to_generate[@]}"; do
+		_run_generator ".agents/scripts/generate-runtime-config.sh" \
+			"Generating configuration for $runtime..." \
+			"$runtime configuration updated" \
+			"$runtime configuration encountered issues" \
+			all --runtime "$runtime"
+	done
+
+	return 0
+}
+
+update_codex_config() {
+	# Only run if Codex is installed or config dir exists
+	if [[ ! -d "$HOME/.codex" ]] && ! command -v codex >/dev/null 2>&1; then
+		return 0
+	fi
+
+	print_info "Updating Codex configuration..."
+
+	# Fix broken MCP_DOCKER entry (P0 — OrbStack/Colima don't support docker mcp)
+	if type _fix_codex_docker_mcp &>/dev/null; then
+		_fix_codex_docker_mcp
+	fi
+
+	# Deploy aidevops MCP servers to Codex config.toml
+	_deploy_codex_mcps
+
+	print_success "Codex configuration updated"
+	return 0
+}
+
+# Deploy standard aidevops MCP servers to ~/.codex/config.toml
+# Codex uses TOML format: [mcp_servers.NAME] sections
+_deploy_codex_mcps() {
+	local config="$HOME/.codex/config.toml"
+	mkdir -p "$HOME/.codex"
+
+	# Touch config if it doesn't exist
+	[[ -f "$config" ]] || touch "$config"
+
+	local mcp_count=0
+
+	# Helper: add a TOML MCP section if not already present
+	# Args: $1=name, $2=type (stdio|url), $3=command_or_url, $4=args (optional, comma-separated)
+	_add_codex_mcp() {
+		local name="$1"
+		local mcp_type="$2"
+		local cmd_or_url="$3"
+		local args="${4:-}"
+
+		if grep -q "\\[mcp_servers\\.${name}\\]" "$config" 2>/dev/null; then
+			echo -e "  ${BLUE:-}=${NC:-} $name (already configured)"
+			return 0
+		fi
+
+		{
+			echo ""
+			echo "[mcp_servers.${name}]"
+			if [[ "$mcp_type" == "stdio" ]]; then
+				echo "command = '${cmd_or_url}'"
+				if [[ -n "$args" ]]; then
+					echo "args = [${args}]"
+				fi
+			else
+				echo "type = 'url'"
+				echo "url = '${cmd_or_url}'"
+			fi
+		} >>"$config"
+		((++mcp_count))
+		echo -e "  ${GREEN:-}+${NC:-} $name"
+		return 0
+	}
+
+	# --- context7 (library docs) ---
+	_add_codex_mcp "context7" "stdio" "npx" "'-y', '@upstash/context7-mcp@latest'"
+
+	# --- Playwright MCP ---
+	_add_codex_mcp "playwright" "stdio" "npx" "'-y', '@anthropic-ai/mcp-server-playwright@latest'"
+
+	# --- shadcn UI ---
+	_add_codex_mcp "shadcn" "stdio" "npx" "'shadcn@latest', 'mcp'"
+
+	# --- OpenAPI Search (remote, zero install) ---
+	_add_codex_mcp "openapi-search" "url" "https://openapi-mcp.openapisearch.com/mcp"
+
+	# --- Cloudflare API (remote) ---
+	_add_codex_mcp "cloudflare-api" "url" "https://mcp.cloudflare.com/mcp"
+
+	echo -e "  ${GREEN:-}Done${NC:-} -- $mcp_count new MCP servers added to Codex config"
+	return 0
+}
+
+update_cursor_config() {
+	# Only run if Cursor is installed or config dir exists
+	if [[ ! -d "$HOME/.cursor" ]] && ! command -v cursor >/dev/null 2>&1 && ! command -v agent >/dev/null 2>&1; then
+		return 0
+	fi
+
+	print_info "Updating Cursor configuration..."
+
+	# Deploy aidevops MCP servers to Cursor mcp.json
+	_deploy_cursor_mcps
+
+	print_success "Cursor configuration updated"
+	return 0
+}
+
+# Deploy standard aidevops MCP servers to ~/.cursor/mcp.json
+# Cursor uses JSON format: { "mcpServers": { "name": { ... } } }
+_deploy_cursor_mcps() {
+	local config="$HOME/.cursor/mcp.json"
+	mkdir -p "$HOME/.cursor"
+
+	# Ensure config file exists with valid JSON
+	if [[ ! -f "$config" ]]; then
+		echo '{}' >"$config"
+	fi
+
+	# Use the json_set_nested helper from ai-cli-config.sh if available,
+	# otherwise use python3 directly
+	local mcp_count=0
+
+	# Helper: add a JSON MCP entry if not already present
+	# Increments mcp_count only when a new entry is actually added.
+	_add_cursor_mcp() {
+		local name="$1"
+		local json_value="$2"
+
+		if ! command -v python3 >/dev/null 2>&1; then
+			print_warning "python3 not found - cannot update Cursor config"
+			return 0
+		fi
+
+		local py_output
+		py_output=$(
+			python3 - "$config" "$name" "$json_value" <<'PYEOF'
+import json, sys
+
+file_path = sys.argv[1]
+name = sys.argv[2]
+value_json = sys.argv[3]
+
+try:
+    with open(file_path, 'r') as f:
+        cfg = json.load(f)
+except (FileNotFoundError, json.JSONDecodeError):
+    cfg = {}
+
+if "mcpServers" not in cfg or not isinstance(cfg["mcpServers"], dict):
+    cfg["mcpServers"] = {}
+
+if name in cfg["mcpServers"]:
+    print(f"SKIP  = {name} (already configured)")
+else:
+    cfg["mcpServers"][name] = json.loads(value_json)
+    with open(file_path, 'w') as f:
+        json.dump(cfg, f, indent=2)
+        f.write('\n')
+    print(f"ADDED + {name}")
+PYEOF
+		) || true
+		echo "  ${py_output#* }"
+		if [[ "$py_output" == ADDED* ]]; then
+			((++mcp_count))
+		fi
+		return 0
+	}
+
+	# --- context7 (library docs) ---
+	_add_cursor_mcp "context7" '{"command":"npx","args":["-y","@upstash/context7-mcp@latest"]}'
+
+	# --- Playwright MCP ---
+	_add_cursor_mcp "playwright" '{"command":"npx","args":["-y","@anthropic-ai/mcp-server-playwright@latest"]}'
+
+	# --- shadcn UI ---
+	_add_cursor_mcp "shadcn" '{"command":"npx","args":["shadcn@latest","mcp"]}'
+
+	# --- OpenAPI Search (remote, zero install) ---
+	_add_cursor_mcp "openapi-search" '{"url":"https://openapi-mcp.openapisearch.com/mcp"}'
+
+	# --- Cloudflare API (remote) ---
+	_add_cursor_mcp "cloudflare-api" '{"url":"https://mcp.cloudflare.com/mcp"}'
 
+	echo "  Done -- $mcp_count new MCP servers added to Cursor config"
 	return 0
 }

package/setup-modules/plugins.sh

@@ -222,14 +222,15 @@ generate_agent_skills() {
 	if [[ -f "$skills_script" ]]; then
 		if bash "$skills_script" 2>/dev/null; then
 			print_success "Agent Skills SKILL.md files generated"
+			return 0
 		else
 			print_warning "Agent Skills generation encountered issues (non-critical)"
+			return 1
 		fi
 	else
 		print_warning "Agent Skills generator not found at $skills_script"
+		return 1
 	fi
-
-	return 0
 }
 
 create_skill_symlinks() {

package/setup-modules/post-setup.sh

@@ -135,33 +135,52 @@ print_final_instructions() {
 	return 0
 }
 
-# Offer to launch onboarding for new users (only if not running inside OpenCode
-# and not non-interactive).
+# Offer to launch onboarding for new users (only if not running inside an AI
+# runtime session and not non-interactive). (t1665.5 — registry-driven)
 # Respects config: aidevops config set ui.onboarding_prompt false
 setup_onboarding_prompt() {
-	if [[ "$NON_INTERACTIVE" != "true" ]] && [[ -z "${OPENCODE_SESSION:-}" ]] && is_feature_enabled onboarding_prompt 2>/dev/null && command -v opencode &>/dev/null; then
-		echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-		echo ""
-		echo "Ready to configure your services?"
+	# Skip if non-interactive or already inside a runtime session
+	[[ "$NON_INTERACTIVE" == "true" ]] && return 0
+	[[ -n "${OPENCODE_SESSION:-}" || -n "${CLAUDE_SESSION:-}" ]] && return 0
+	is_feature_enabled onboarding_prompt 2>/dev/null || return 0
+
+	# Find first available headless runtime for onboarding dispatch
+	local _onb_bin="" _onb_name=""
+	if type rt_list_headless &>/dev/null; then
+		local _onb_rt_id
+		while IFS= read -r _onb_rt_id; do
+			_onb_bin=$(rt_binary "$_onb_rt_id") || continue
+			if [[ -n "$_onb_bin" ]] && command -v "$_onb_bin" &>/dev/null; then
+				_onb_name=$(rt_display_name "$_onb_rt_id") || _onb_name="$_onb_bin"
+				break
+			fi
+			_onb_bin=""
+		done < <(rt_list_headless)
+	fi
+	# Fallback
+	if [[ -z "$_onb_bin" ]] && command -v opencode &>/dev/null; then
+		_onb_bin="opencode"
+		_onb_name="OpenCode"
+	fi
+	[[ -z "$_onb_bin" ]] && return 0
+
+	echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+	echo ""
+	echo "Ready to configure your services?"
+	echo ""
+	echo "Launch ${_onb_name} with the onboarding wizard to:"
+	echo "  - See which services are already configured"
+	echo "  - Get personalized recommendations based on your work"
+	echo "  - Set up API keys and credentials interactively"
+	echo ""
+	read -r -p "Launch ${_onb_name} with /onboarding now? [Y/n]: " launch_onboarding
+	if [[ "$launch_onboarding" =~ ^[Yy]?$ ]]; then
 		echo ""
-		echo "Launch OpenCode with the onboarding wizard to:"
-		echo "  - See which services are already configured"
-		echo "  - Get personalized recommendations based on your work"
-		echo "  - Set up API keys and credentials interactively"
+		echo "Starting ${_onb_name} with onboarding wizard..."
+		"$_onb_bin" --prompt "/onboarding"
+	else
 		echo ""
-		read -r -p "Launch OpenCode with /onboarding now? [Y/n]: " launch_onboarding
-		if [[ "$launch_onboarding" =~ ^[Yy]?$ ]]; then
-			echo ""
-			echo "Starting OpenCode with onboarding wizard..."
-			# Launch with /onboarding prompt only — don't use --agent flag because
-			# the "Onboarding" agent only exists after generate-opencode-agents.sh
-			# writes to opencode.json, which requires opencode.json to already exist.
-			# On first run it won't, so --agent "Onboarding" causes a fatal error.
-			opencode --prompt "/onboarding"
-		else
-			echo ""
-			echo "You can run /onboarding anytime in OpenCode to configure services."
-		fi
+		echo "You can run /onboarding anytime in ${_onb_name} to configure services."
 	fi
 	return 0
 }

package/setup-modules/schedulers.sh

@@ -150,9 +150,20 @@ setup_supervisor_pulse() {
 		_pulse_installed=true
 	fi
 
-	# Detect opencode binary location
+	# Detect dispatch backend binary location (t1665.5 — registry-driven)
 	local opencode_bin
-	opencode_bin=$(command -v opencode 2>/dev/null || echo "/opt/homebrew/bin/opencode")
+	if type rt_list_headless &>/dev/null; then
+		local _sched_rt_id _sched_bin
+		while IFS= read -r _sched_rt_id; do
+			_sched_bin=$(rt_binary "$_sched_rt_id") || continue
+			if [[ -n "$_sched_bin" ]] && command -v "$_sched_bin" &>/dev/null; then
+				opencode_bin=$(command -v "$_sched_bin")
+				break
+			fi
+		done < <(rt_list_headless)
+	fi
+	# Fallback if registry not loaded or no runtime found
+	opencode_bin="${opencode_bin:-$(command -v opencode 2>/dev/null || echo "/opt/homebrew/bin/opencode")}"
 
 	if [[ "$_do_install" == "true" ]]; then
 		mkdir -p "$HOME/.aidevops/logs"

package/setup-modules/tool-install.sh

@@ -1535,6 +1535,150 @@ setup_opencode_cli() {
 	return 0
 }
 
+setup_codex_cli() {
+	print_info "Setting up OpenAI Codex CLI..."
+
+	# Check if Codex is already installed
+	if command -v codex >/dev/null 2>&1; then
+		local codex_version
+		codex_version=$(codex --version 2>/dev/null | head -1 || echo "unknown")
+		print_success "Codex already installed: $codex_version"
+		# Fix broken MCP_DOCKER if present
+		_fix_codex_docker_mcp
+		return 0
+	fi
+
+	# Need either bun or npm to install
+	local installer=""
+	local install_pkg="@openai/codex@latest"
+
+	if command -v bun >/dev/null 2>&1; then
+		installer="bun"
+	elif command -v npm >/dev/null 2>&1; then
+		installer="npm"
+	else
+		print_warning "Neither bun nor npm found - cannot install Codex"
+		print_info "Install Node.js first, then re-run setup"
+		return 0
+	fi
+
+	print_info "Codex is OpenAI's AI coding CLI (terminal-based, agentic)"
+	echo "  It provides an AI-powered terminal interface using OpenAI models."
+	echo ""
+
+	local install_codex="Y"
+	if [[ "${NON_INTERACTIVE:-}" != "true" ]]; then
+		read -r -p "Install Codex via $installer? [Y/n]: " install_codex || install_codex="Y"
+	fi
+	if [[ "$install_codex" =~ ^[Yy]?$ ]]; then
+		if run_with_spinner "Installing Codex" npm_global_install "$install_pkg"; then
+			print_success "Codex installed"
+			echo ""
+			print_info "Codex needs OpenAI authentication."
+			print_info "Run 'codex' and follow the auth prompts."
+			echo ""
+			# Fix broken MCP_DOCKER if Codex created a default config
+			_fix_codex_docker_mcp
+		else
+			print_warning "Codex installation failed"
+			print_info "Try manually: npm install -g $install_pkg"
+		fi
+	else
+		print_info "Skipped Codex installation"
+		print_info "Install later: $installer install -g $install_pkg"
+	fi
+
+	return 0
+}
+
+# P0 fix: Remove broken MCP_DOCKER from Codex config.toml
+# Docker Desktop 4.40+ with MCP Toolkit extension is required for `docker mcp`.
+# OrbStack, Colima, Rancher Desktop do not support it.
+_fix_codex_docker_mcp() {
+	local config="$HOME/.codex/config.toml"
+	[[ -f "$config" ]] || return 0
+
+	# Check if MCP_DOCKER section exists
+	if ! grep -q '^\[mcp_servers\.MCP_DOCKER\]' "$config" 2>/dev/null; then
+		return 0
+	fi
+
+	# Check if `docker mcp` subcommand is actually available
+	if docker mcp --help >/dev/null 2>&1; then
+		return 0
+	fi
+
+	# Comment out the MCP_DOCKER section (from header to next section or EOF)
+	# Use sed to comment out lines from [mcp_servers.MCP_DOCKER] to the next
+	# section header or end of file. Portable sed (no -i on macOS without ext).
+	local tmp_config
+	tmp_config=$(mktemp)
+	local in_mcp_docker=false
+	while IFS= read -r line || [[ -n "$line" ]]; do
+		if [[ "$line" == "[mcp_servers.MCP_DOCKER]" ]]; then
+			in_mcp_docker=true
+			printf '# %s  # Disabled by aidevops: docker mcp not available\n' "$line" >>"$tmp_config"
+			continue
+		fi
+		# If we hit another section header, stop commenting
+		if [[ "$in_mcp_docker" == "true" ]] && [[ "$line" == "["* ]]; then
+			in_mcp_docker=false
+		fi
+		if [[ "$in_mcp_docker" == "true" ]]; then
+			printf '# %s\n' "$line" >>"$tmp_config"
+		else
+			printf '%s\n' "$line" >>"$tmp_config"
+		fi
+	done <"$config"
+	mv "$tmp_config" "$config"
+	print_info "Disabled MCP_DOCKER in Codex config (docker mcp not available on this system)"
+	return 0
+}
+
+setup_droid_cli() {
+	print_info "Setting up Factory.AI Droid CLI..."
+
+	# Check if Droid is already installed
+	if command -v droid >/dev/null 2>&1; then
+		local droid_version
+		droid_version=$(droid --version 2>/dev/null | head -1 || echo "unknown")
+		print_success "Droid already installed: $droid_version"
+		return 0
+	fi
+
+	# Droid uses its own installer — not available via npm/brew
+	print_info "Droid (Factory.AI) is an AI coding agent CLI"
+	echo "  It provides autonomous coding capabilities with Factory.AI models."
+	echo ""
+
+	local install_droid="Y"
+	if [[ "${NON_INTERACTIVE:-}" != "true" ]]; then
+		read -r -p "Install Droid CLI? [Y/n]: " install_droid || install_droid="Y"
+	fi
+	if [[ "$install_droid" =~ ^[Yy]?$ ]]; then
+		print_info "Installing Droid CLI..."
+		if command -v curl >/dev/null 2>&1; then
+			if curl -fsSL https://app.factory.ai/install.sh | bash 2>/dev/null; then
+				print_success "Droid installed"
+				echo ""
+				print_info "Run 'droid auth login' to authenticate with Factory.AI."
+				echo ""
+			else
+				print_warning "Droid installation failed"
+				print_info "Install manually from: https://docs.factory.ai/cli/installation"
+			fi
+		else
+			print_warning "curl not found - cannot install Droid"
+			print_info "Install manually from: https://docs.factory.ai/cli/installation"
+		fi
+	else
+		print_info "Skipped Droid installation"
+		print_info "Install later: curl -fsSL https://app.factory.ai/install.sh | bash"
+	fi
+
+	return 0
+}
+
 setup_google_workspace_cli() {
 	print_info "Setting up Google Workspace CLI (gws)..."
 

package/setup.sh

@@ -10,7 +10,7 @@ shopt -s inherit_errexit 2>/dev/null || true
 # AI Assistant Server Access Framework Setup Script
 # Helps developers set up the framework for their infrastructure
 #
-# Version: 3.1.270
+# Version: 3.1.272
 #
 # Quick Install:
 #   npm install -g aidevops && aidevops update          (recommended)
@@ -689,27 +689,8 @@ init_settings_json() {
 	return 0
 }
 
-# Main setup function
-main() {
-	# Bootstrap first (handles curl install)
-	bootstrap_repo "$@"
-
-	parse_args "$@"
-	local _os
-	_os="$(uname -s)"
-
-	# Auto-detect non-interactive terminals (CI/CD, agent shells, piped stdin)
-	# Must run after parse_args so explicit --interactive flag takes precedence
-	if [[ "$INTERACTIVE_MODE" != "true" && ! -t 0 ]]; then
-		NON_INTERACTIVE=true
-	fi
-
-	# Guard: --interactive and --non-interactive are mutually exclusive
-	if [[ "$INTERACTIVE_MODE" == "true" && "$NON_INTERACTIVE" == "true" ]]; then
-		print_error "--interactive and --non-interactive cannot be used together"
-		exit 1
-	fi
-
+# Print the setup header based on active mode flags.
+_setup_print_header() {
 	echo "🤖 AI DevOps Framework Setup"
 	echo "============================="
 	if [[ "$CLEAN_MODE" == "true" ]]; then
@@ -726,139 +707,157 @@ main() {
 		echo "Mode: Update (will check for tool updates after setup)"
 	fi
 	echo ""
+	return 0
+}
 
-	# Non-interactive mode: deploy agents only, skip all optional installs
-	if [[ "$NON_INTERACTIVE" == "true" ]]; then
-		print_info "Non-interactive mode: deploying agents and running safe migrations only"
-		verify_location
-		check_requirements
-		check_python_upgrade_available
-		set_permissions
-		migrate_old_backups
-		migrate_loop_state_directories
-		migrate_agent_to_agents_folder
-		migrate_mcp_env_to_credentials
-		migrate_pulse_repos_to_repos_json
-		cleanup_deprecated_paths
-		migrate_orphaned_supervisor
-		cleanup_deprecated_mcps
-		cleanup_stale_bun_opencode
-		validate_opencode_config
-		deploy_aidevops_agents
-		sync_agent_sources
-		setup_shellcheck_wrapper
-		if is_feature_enabled safety_hooks 2>/dev/null; then
-			setup_safety_hooks
-		fi
-		init_settings_json
+# Non-interactive path: deploy agents and run safe migrations only (no prompts).
+_setup_run_non_interactive() {
+	print_info "Non-interactive mode: deploying agents and running safe migrations only"
+	verify_location
+	check_requirements
+	check_python_upgrade_available
+	set_permissions
+	migrate_old_backups
+	migrate_loop_state_directories
+	migrate_agent_to_agents_folder
+	migrate_mcp_env_to_credentials
+	migrate_pulse_repos_to_repos_json
+	cleanup_deprecated_paths
+	migrate_orphaned_supervisor
+	cleanup_deprecated_mcps
+	cleanup_stale_bun_opencode
+	validate_opencode_config
+	deploy_aidevops_agents
+	sync_agent_sources
+	setup_shellcheck_wrapper
+	if is_feature_enabled safety_hooks 2>/dev/null; then
+		setup_safety_hooks
+	fi
+	init_settings_json
 
-		# Parallelise independent skill operations (t1356: ~84s serial -> ~18s parallel)
-		# generate_agent_skills (18s), create_skill_symlinks (<1s), and
-		# scan_imported_skills (66s serial, ~10s with parallel scanning) are independent.
-		generate_agent_skills &
-		local _pid_skills=$!
+	# Parallelise independent skill operations (t1356: ~84s serial -> ~18s parallel)
+	# generate_agent_skills must complete before create_skill_symlinks (symlinks
+	# depend on generated SKILL.md files). scan_imported_skills is independent.
+	local _pid_symlinks=""
+	if generate_agent_skills; then
 		create_skill_symlinks &
-		local _pid_symlinks=$!
-		scan_imported_skills &
-		local _pid_scan=$!
-		wait "$_pid_skills" 2>/dev/null || print_warning "Agent skills generation encountered issues (non-critical)"
+		_pid_symlinks=$!
+	else
+		print_warning "Agent skills generation failed — skipping skill symlinks"
+	fi
+
+	scan_imported_skills &
+	local _pid_scan=$!
+
+	if [[ -n "$_pid_symlinks" ]]; then
 		wait "$_pid_symlinks" 2>/dev/null || print_warning "Skill symlink creation encountered issues (non-critical)"
-		wait "$_pid_scan" 2>/dev/null || print_warning "Skill security scan encountered issues (non-critical)"
+	fi
+	wait "$_pid_scan" 2>/dev/null || print_warning "Skill security scan encountered issues (non-critical)"
+
+	inject_agents_reference
+	update_opencode_config
+	update_claude_config
+	update_codex_config
+	update_cursor_config
+	disable_ondemand_mcps
+	return 0
+}
 
-		inject_agents_reference
-		if is_feature_enabled manage_opencode_config 2>/dev/null; then
-			update_opencode_config
-		else
-			print_info "OpenCode config management disabled via config (integrations.manage_opencode_config)"
-		fi
-		if is_feature_enabled manage_claude_config 2>/dev/null; then
-			update_claude_config
-		else
-			print_info "Claude config management disabled via config (integrations.manage_claude_config)"
-		fi
-		disable_ondemand_mcps
-	else
-		# Required steps (always run)
-		verify_location
-		check_requirements
-
-		# Quality tools check (optional but recommended)
-		confirm_step "Check quality tools (shellcheck, shfmt)" && check_quality_tools
-
-		# Core runtime setup (early - many later steps depend on these)
-		confirm_step "Setup Node.js runtime (required for OpenCode and tools)" && setup_nodejs
-
-		# Shell environment setup (early, so later tools benefit from zsh/Oh My Zsh)
-		confirm_step "Setup Oh My Zsh (optional, enhances zsh)" && setup_oh_my_zsh
-		confirm_step "Setup cross-shell compatibility (preserve bash config in zsh)" && setup_shell_compatibility
-
-		# OrbStack (macOS only - offer VM option early)
-		confirm_step "Setup OrbStack (lightweight Linux VMs on macOS)" && setup_orbstack_vm
-
-		# Optional steps with confirmation in interactive mode
-		confirm_step "Check optional dependencies (bun, node, python)" && check_optional_deps
-		confirm_step "Check Python version (recommend upgrade if outdated)" && check_python_upgrade_available
-		confirm_step "Setup recommended tools (Tabby, Zed, etc.)" && setup_recommended_tools
-		confirm_step "Setup MiniSim (iOS/Android emulator launcher)" && setup_minisim
-		confirm_step "Setup ClaudeBar (AI quota monitor in menu bar)" && setup_claudebar
-		confirm_step "Setup Git CLIs (gh, glab, tea)" && setup_git_clis
-		confirm_step "Setup file discovery tools (fd, ripgrep, ripgrep-all)" && setup_file_discovery_tools
-		confirm_step "Setup rtk (token-optimized CLI output, 60-90% savings)" && setup_rtk
-		confirm_step "Setup shell linting tools (shellcheck, shfmt)" && setup_shell_linting_tools
+# Interactive path: all optional steps gated behind confirm_step prompts.
+_setup_run_interactive() {
+	# Required steps (always run)
+	verify_location
+	check_requirements
+
+	# Quality tools check (optional but recommended)
+	confirm_step "Check quality tools (shellcheck, shfmt)" && check_quality_tools
+
+	# Core runtime setup (early - many later steps depend on these)
+	confirm_step "Setup Node.js runtime (required for OpenCode and tools)" && setup_nodejs
+
+	# Shell environment setup (early, so later tools benefit from zsh/Oh My Zsh)
+	confirm_step "Setup Oh My Zsh (optional, enhances zsh)" && setup_oh_my_zsh
+	confirm_step "Setup cross-shell compatibility (preserve bash config in zsh)" && setup_shell_compatibility
+
+	# OrbStack (macOS only - offer VM option early)
+	confirm_step "Setup OrbStack (lightweight Linux VMs on macOS)" && setup_orbstack_vm
+
+	# Optional steps with confirmation in interactive mode
+	confirm_step "Check optional dependencies (bun, node, python)" && check_optional_deps
+	confirm_step "Check Python version (recommend upgrade if outdated)" && check_python_upgrade_available
+	confirm_step "Setup recommended tools (Tabby, Zed, etc.)" && setup_recommended_tools
+	confirm_step "Setup MiniSim (iOS/Android emulator launcher)" && setup_minisim
+	confirm_step "Setup ClaudeBar (AI quota monitor in menu bar)" && setup_claudebar
+	confirm_step "Setup Git CLIs (gh, glab, tea)" && setup_git_clis
+	confirm_step "Setup file discovery tools (fd, ripgrep, ripgrep-all)" && setup_file_discovery_tools
+	confirm_step "Setup rtk (token-optimized CLI output, 60-90% savings)" && setup_rtk
+	confirm_step "Setup shell linting tools (shellcheck, shfmt)" && {
+		setup_shell_linting_tools
 		setup_shellcheck_wrapper
-		confirm_step "Setup Qlty CLI (multi-linter code quality)" && setup_qlty_cli
-		confirm_step "Rosetta audit (Apple Silicon x86 migration)" && setup_rosetta_audit
-		confirm_step "Setup Worktrunk (git worktree management)" && setup_worktrunk
-		confirm_step "Setup SSH key" && setup_ssh_key
-		confirm_step "Setup configuration files" && setup_configs
-		confirm_step "Set secure permissions on config files" && set_permissions
-		confirm_step "Install aidevops CLI command" && install_aidevops_cli
-		confirm_step "Setup shell aliases" && setup_aliases
-		confirm_step "Setup terminal title integration" && setup_terminal_title
-		confirm_step "Deploy AI templates to home directories" && deploy_ai_templates
-		confirm_step "Migrate old backups to new structure" && migrate_old_backups
-		confirm_step "Migrate loop state from .claude/.agent/ to .agents/loop-state/" && migrate_loop_state_directories
-		confirm_step "Migrate .agent -> .agents in user projects" && migrate_agent_to_agents_folder
-		confirm_step "Migrate mcp-env.sh -> credentials.sh" && migrate_mcp_env_to_credentials
-		confirm_step "Migrate pulse-repos.json into repos.json" && migrate_pulse_repos_to_repos_json
-		confirm_step "Cleanup deprecated agent paths" && cleanup_deprecated_paths
-		confirm_step "Migrate orphaned supervisor to pulse-wrapper" && migrate_orphaned_supervisor
-		confirm_step "Cleanup deprecated MCP entries (hetzner, serper, etc.)" && cleanup_deprecated_mcps
-		confirm_step "Cleanup stale bun opencode install" && cleanup_stale_bun_opencode
-		confirm_step "Validate and repair OpenCode config schema" && validate_opencode_config
-		confirm_step "Extract OpenCode prompts" && extract_opencode_prompts
-		confirm_step "Check OpenCode prompt drift" && check_opencode_prompt_drift
-		confirm_step "Deploy aidevops agents to ~/.aidevops/agents/" && deploy_aidevops_agents
-		confirm_step "Sync agents from private repositories" && sync_agent_sources
-		confirm_step "Install Claude Code safety hooks (block destructive commands)" && setup_safety_hooks
-		confirm_step "Initialize settings.json (canonical config file)" && init_settings_json
-		confirm_step "Setup multi-tenant credential storage" && setup_multi_tenant_credentials
-		confirm_step "Generate agent skills (SKILL.md files)" && generate_agent_skills
-		confirm_step "Create symlinks for imported skills" && create_skill_symlinks
-		confirm_step "Check for skill updates from upstream" && check_skill_updates
-		confirm_step "Security scan imported skills" && scan_imported_skills
-		confirm_step "Inject agents reference into AI configs" && inject_agents_reference
-		confirm_step "Setup Python environment (DSPy, crawl4ai)" && setup_python_env
-		confirm_step "Setup Node.js environment" && setup_nodejs_env
-		confirm_step "Install MCP packages globally (fast startup)" && install_mcp_packages
-		confirm_step "Setup LocalWP MCP server" && setup_localwp_mcp
-		confirm_step "Setup Augment Context Engine MCP" && setup_augment_context_engine
-		confirm_step "Setup Beads task management" && setup_beads
-		confirm_step "Setup SEO integrations (curl subagents)" && setup_seo_mcps
-		confirm_step "Setup Google Analytics MCP" && setup_google_analytics_mcp
-		confirm_step "Setup QuickFile MCP (UK accounting)" && setup_quickfile_mcp
-		confirm_step "Setup browser automation tools" && setup_browser_tools
-		confirm_step "Setup AI orchestration frameworks info" && setup_ai_orchestration
-		confirm_step "Setup Google Workspace CLI (Gmail, Calendar, Drive)" && setup_google_workspace_cli
-		confirm_step "Setup OpenCode CLI (AI coding tool)" && setup_opencode_cli
-		confirm_step "Setup OpenCode plugins" && setup_opencode_plugins
-		# Run AFTER OpenCode CLI install so opencode.json may exist for agent config
-		confirm_step "Update OpenCode configuration" && update_opencode_config
-		# Run AFTER OpenCode config so Claude Code gets equivalent setup
-		confirm_step "Update Claude Code configuration (slash commands, MCPs, settings)" && update_claude_config
-		# Run AFTER all MCP setup functions to ensure disabled state persists
-		confirm_step "Disable on-demand MCPs globally" && disable_ondemand_mcps
-	fi
+	}
+	confirm_step "Setup Qlty CLI (multi-linter code quality)" && setup_qlty_cli
+	confirm_step "Rosetta audit (Apple Silicon x86 migration)" && setup_rosetta_audit
+	confirm_step "Setup Worktrunk (git worktree management)" && setup_worktrunk
+	confirm_step "Setup SSH key" && setup_ssh_key
+	confirm_step "Setup configuration files" && setup_configs
+	confirm_step "Set secure permissions on config files" && set_permissions
+	confirm_step "Install aidevops CLI command" && install_aidevops_cli
+	confirm_step "Setup shell aliases" && setup_aliases
+	confirm_step "Setup terminal title integration" && setup_terminal_title
+	confirm_step "Deploy AI templates to home directories" && deploy_ai_templates
+	confirm_step "Migrate old backups to new structure" && migrate_old_backups
+	confirm_step "Migrate loop state from .claude/.agent/ to .agents/loop-state/" && migrate_loop_state_directories
+	confirm_step "Migrate .agent -> .agents in user projects" && migrate_agent_to_agents_folder
+	confirm_step "Migrate mcp-env.sh -> credentials.sh" && migrate_mcp_env_to_credentials
+	confirm_step "Migrate pulse-repos.json into repos.json" && migrate_pulse_repos_to_repos_json
+	confirm_step "Cleanup deprecated agent paths" && cleanup_deprecated_paths
+	confirm_step "Migrate orphaned supervisor to pulse-wrapper" && migrate_orphaned_supervisor
+	confirm_step "Cleanup deprecated MCP entries (hetzner, serper, etc.)" && cleanup_deprecated_mcps
+	confirm_step "Cleanup stale bun opencode install" && cleanup_stale_bun_opencode
+	confirm_step "Validate and repair OpenCode config schema" && validate_opencode_config
+	confirm_step "Extract OpenCode prompts" && extract_opencode_prompts
+	confirm_step "Check OpenCode prompt drift" && check_opencode_prompt_drift
+	confirm_step "Deploy aidevops agents to ~/.aidevops/agents/" && deploy_aidevops_agents
+	confirm_step "Sync agents from private repositories" && sync_agent_sources
+	is_feature_enabled safety_hooks 2>/dev/null && confirm_step "Install Claude Code safety hooks (block destructive commands)" && setup_safety_hooks
+	confirm_step "Initialize settings.json (canonical config file)" && init_settings_json
+	confirm_step "Setup multi-tenant credential storage" && setup_multi_tenant_credentials
+	confirm_step "Generate agent skills (SKILL.md files)" && generate_agent_skills
+	confirm_step "Create symlinks for imported skills" && create_skill_symlinks
+	confirm_step "Check for skill updates from upstream" && check_skill_updates
+	confirm_step "Security scan imported skills" && scan_imported_skills
+	confirm_step "Inject agents reference into AI configs" && inject_agents_reference
+	confirm_step "Setup Python environment (DSPy, crawl4ai)" && setup_python_env
+	confirm_step "Setup Node.js environment" && setup_nodejs_env
+	confirm_step "Install MCP packages globally (fast startup)" && install_mcp_packages
+	confirm_step "Setup LocalWP MCP server" && setup_localwp_mcp
+	confirm_step "Setup Augment Context Engine MCP" && setup_augment_context_engine
+	confirm_step "Setup Beads task management" && setup_beads
+	confirm_step "Setup SEO integrations (curl subagents)" && setup_seo_mcps
+	confirm_step "Setup Google Analytics MCP" && setup_google_analytics_mcp
+	confirm_step "Setup QuickFile MCP (UK accounting)" && setup_quickfile_mcp
+	confirm_step "Setup browser automation tools" && setup_browser_tools
+	confirm_step "Setup AI orchestration frameworks info" && setup_ai_orchestration
+	confirm_step "Setup Google Workspace CLI (Gmail, Calendar, Drive)" && setup_google_workspace_cli
+	confirm_step "Setup OpenCode CLI (AI coding tool)" && setup_opencode_cli
+	confirm_step "Setup OpenCode plugins" && setup_opencode_plugins
+	confirm_step "Setup Codex CLI (OpenAI AI coding tool)" && setup_codex_cli
+	confirm_step "Setup Droid CLI (Factory.AI coding tool)" && setup_droid_cli
+	# Run AFTER CLI installs so config dirs may exist for agent config
+	confirm_step "Update OpenCode configuration" && update_opencode_config
+	# Run AFTER OpenCode config so Claude Code gets equivalent setup
+	confirm_step "Update Claude Code configuration (slash commands, MCPs, settings)" && update_claude_config
+	# Run AFTER Claude Code config so Codex/Cursor get equivalent setup
+	confirm_step "Update Codex configuration (MCPs, instructions)" && update_codex_config
+	confirm_step "Update Cursor configuration (MCPs)" && update_cursor_config
+	# Run AFTER all MCP setup functions to ensure disabled state persists
+	confirm_step "Disable on-demand MCPs globally" && disable_ondemand_mcps
+	return 0
+}
+
+# Post-setup steps: schedulers, final instructions, optional tool update check.
+_setup_post_setup_steps() {
+	local os="$1"
 
 	# Print setup summary before final success message (GH#5240)
 	print_setup_summary
@@ -866,9 +865,15 @@ main() {
 	echo ""
 	print_success "Setup complete!"
 
+	# Non-interactive mode: deploy + migrations only — skip schedulers,
+	# services, and optional post-setup work (CI/agent shells don't need them).
+	if [[ "$NON_INTERACTIVE" == "true" ]]; then
+		return 0
+	fi
+
 	# Post-setup: auto-update, schedulers, final instructions (GH#5793)
 	setup_auto_update
-	setup_supervisor_pulse "$_os"
+	setup_supervisor_pulse "$os"
 	setup_stats_wrapper "${PULSE_ENABLED:-}"
 	setup_repo_sync
 	setup_process_guard
@@ -887,6 +892,39 @@ main() {
 	fi
 
 	setup_onboarding_prompt
+	return 0
+}
+
+# Main setup function — orchestrates init, mode dispatch, and post-setup.
+main() {
+	# Bootstrap first (handles curl install)
+	bootstrap_repo "$@"
+
+	parse_args "$@"
+	local _os
+	_os="$(uname -s)"
+
+	# Auto-detect non-interactive terminals (CI/CD, agent shells, piped stdin)
+	# Must run after parse_args so explicit --interactive flag takes precedence
+	if [[ "$INTERACTIVE_MODE" != "true" && ! -t 0 ]]; then
+		NON_INTERACTIVE=true
+	fi
+
+	# Guard: --interactive and --non-interactive are mutually exclusive
+	if [[ "$INTERACTIVE_MODE" == "true" && "$NON_INTERACTIVE" == "true" ]]; then
+		print_error "--interactive and --non-interactive cannot be used together"
+		exit 1
+	fi
+
+	_setup_print_header
+
+	if [[ "$NON_INTERACTIVE" == "true" ]]; then
+		_setup_run_non_interactive
+	else
+		_setup_run_interactive
+	fi
+
+	_setup_post_setup_steps "$_os"
 
 	return 0
 }