aidevops 2.172.17 → 2.172.19

package/setup-modules/migrations.sh

@@ -0,0 +1,961 @@
+#!/usr/bin/env bash
+# Migration functions: migrate_* and cleanup_* functions
+# Part of aidevops setup.sh modularization (t316.3)
+
+# Shell safety baseline
+set -Eeuo pipefail
+IFS=$'\n\t'
+# shellcheck disable=SC2154  # rc is assigned by $? in the trap string
+trap 'rc=$?; echo "[ERROR] ${BASH_SOURCE[0]}:${LINENO} exit $rc" >&2' ERR
+shopt -s inherit_errexit 2>/dev/null || true
+
+cleanup_deprecated_paths() {
+	local agents_dir="$HOME/.aidevops/agents"
+	local cleaned=0
+
+	# List of deprecated paths (add new ones here when reorganizing)
+	local deprecated_paths=(
+		# v2.40.7: wordpress moved from root to tools/wordpress
+		"$agents_dir/wordpress.md"
+		"$agents_dir/wordpress"
+		# v2.41.0: build-agent and build-mcp moved from root to tools/
+		"$agents_dir/build-agent.md"
+		"$agents_dir/build-agent"
+		"$agents_dir/build-mcp.md"
+		"$agents_dir/build-mcp"
+		# v2.93.3: moltbot renamed to openclaw (formerly clawdbot)
+		"$agents_dir/tools/ai-assistants/clawdbot.md"
+		"$agents_dir/tools/ai-assistants/moltbot.md"
+		# Removed non-OpenCode AI tool docs (focus on OpenCode only)
+		"$agents_dir/tools/ai-assistants/windsurf.md"
+		"$agents_dir/tools/ai-assistants/configuration.md"
+		"$agents_dir/tools/ai-assistants/status.md"
+		# Removed oh-my-opencode integration (no longer supported)
+		"$agents_dir/tools/opencode/oh-my-opencode.md"
+		# t199.8: youtube moved from root to content/distribution/youtube/
+		"$agents_dir/youtube.md"
+		"$agents_dir/youtube"
+		# osgrep removed — disproportionate CPU/disk cost vs rg + LLM comprehension
+		"$agents_dir/tools/context/osgrep.md"
+	)
+
+	for path in "${deprecated_paths[@]}"; do
+		if [[ -e "$path" ]]; then
+			rm -rf "$path"
+			((++cleaned))
+		fi
+	done
+
+	if [[ $cleaned -gt 0 ]]; then
+		print_info "Cleaned up $cleaned deprecated agent path(s)"
+	fi
+
+	# Remove oh-my-opencode remnants (no longer supported) — but respect user preference.
+	# Default: preserve user files. Override with --overwrite flag or settings.json.
+	# See: ~/.config/aidevops/settings.json { "preserve_oh_my_opencode": true }
+	local omo_config="$HOME/.config/opencode/oh-my-opencode.json"
+	if [[ -f "$omo_config" ]]; then
+		if should_overwrite_user_file "preserve_oh_my_opencode" "oh-my-opencode config ($omo_config)"; then
+			rm -f "$omo_config"
+			print_info "Removed oh-my-opencode config"
+		fi
+	fi
+
+	# Remove osgrep — disproportionate CPU/disk cost (74GB indexes, 4 CPU cores on startup)
+	# rg + fd + LLM comprehension covers the same ground at zero resource cost
+	cleanup_osgrep
+
+	# Remove oh-my-opencode from plugin array if present — guarded by same setting
+	local opencode_config
+	opencode_config=$(find_opencode_config 2>/dev/null) || true
+	if [[ -n "$opencode_config" ]] && [[ -f "$opencode_config" ]] && command -v jq &>/dev/null; then
+		if jq -e '.plugin | index("oh-my-opencode")' "$opencode_config" >/dev/null 2>&1; then
+			if should_overwrite_user_file "preserve_oh_my_opencode" "oh-my-opencode plugin entry in OpenCode config"; then
+				local tmp_file
+				tmp_file=$(mktemp)
+				trap 'rm -f "${tmp_file:-}"' RETURN
+				jq '.plugin = [.plugin[] | select(. != "oh-my-opencode")]' "$opencode_config" >"$tmp_file" && mv "$tmp_file" "$opencode_config"
+				print_info "Removed oh-my-opencode from OpenCode plugin list"
+			fi
+		fi
+	fi
+
+	return 0
+}
+
+# Remove osgrep completely — one-time cleanup for all aidevops users
+# osgrep consumed 74GB disk (lancedb indexes) and 4 CPU cores on startup.
+# rg + fd + LLM comprehension covers the same ground at zero resource cost.
+cleanup_osgrep() {
+	local cleaned=false
+
+	# 0. Kill running osgrep processes first (MCP servers, indexers)
+	# These are Node.js processes already loaded in memory — removing the
+	# binary and data won't stop them, and they may try to rebuild indexes.
+	if pgrep -f 'osgrep' >/dev/null 2>&1; then
+		print_info "Killing running osgrep processes..."
+		pkill -f 'osgrep' 2>/dev/null || true
+		# Give processes a moment to exit gracefully
+		sleep 1
+		# Force-kill any stragglers
+		pkill -9 -f 'osgrep' 2>/dev/null || true
+		cleaned=true
+	fi
+
+	# 1. Uninstall npm package (global)
+	if command -v osgrep &>/dev/null; then
+		print_info "Removing osgrep npm package..."
+		npm uninstall -g osgrep >/dev/null 2>&1 || true
+		cleaned=true
+	fi
+
+	# 2. Remove indexes, models, and config (~74GB)
+	if [[ -d "$HOME/.osgrep" ]]; then
+		print_info "Removing osgrep data directory (~74GB indexes)..."
+		rm -rf "$HOME/.osgrep"
+		cleaned=true
+	fi
+
+	# 3. Remove osgrep from OpenCode MCP config
+	local opencode_config
+	opencode_config=$(find_opencode_config 2>/dev/null) || true
+	if [[ -n "$opencode_config" ]] && [[ -f "$opencode_config" ]] && command -v jq &>/dev/null; then
+		if jq -e '.mcp["osgrep"]' "$opencode_config" >/dev/null 2>&1; then
+			local tmp_file
+			tmp_file=$(mktemp)
+			if jq 'del(.mcp["osgrep"]) | del(.tools["osgrep_*"])' "$opencode_config" >"$tmp_file" 2>/dev/null; then
+				mv "$tmp_file" "$opencode_config"
+				print_info "Removed osgrep from OpenCode MCP config"
+			else
+				rm -f "$tmp_file"
+			fi
+			cleaned=true
+		fi
+	fi
+
+	# 4. Remove osgrep from Claude Code settings
+	local claude_settings="$HOME/.claude/settings.json"
+	if [[ -f "$claude_settings" ]] && command -v jq &>/dev/null; then
+		if jq -e '.mcpServers["osgrep"] // .enabledPlugins["osgrep@osgrep"]' "$claude_settings" >/dev/null 2>&1; then
+			local tmp_file
+			tmp_file=$(mktemp)
+			if jq 'del(.mcpServers["osgrep"]) | del(.enabledPlugins["osgrep@osgrep"])' "$claude_settings" >"$tmp_file" 2>/dev/null; then
+				mv "$tmp_file" "$claude_settings"
+				print_info "Removed osgrep from Claude Code settings"
+			else
+				rm -f "$tmp_file"
+			fi
+			cleaned=true
+		fi
+	fi
+
+	# 5. Remove per-repo .osgrep directories in registered repos
+	local repos_file="$HOME/.config/aidevops/repos.json"
+	if [[ -f "$repos_file" ]] && command -v jq &>/dev/null; then
+		while IFS= read -r repo_path; do
+			[[ -z "$repo_path" ]] && continue
+			[[ ! -d "$repo_path" ]] && continue
+			if [[ -d "$repo_path/.osgrep" ]]; then
+				rm -rf "$repo_path/.osgrep"
+			fi
+		done < <(jq -r '.[]' "$repos_file" 2>/dev/null)
+	fi
+
+	if [[ "$cleaned" == "true" ]]; then
+		print_success "osgrep removed (freed CPU cores and disk space)"
+	fi
+
+	return 0
+}
+
+# Remove stale bun-installed opencode if npm version exists (v2.123.5)
+# Prior to v2.123.1, tool-version-check.sh used `bun install -g opencode-ai`.
+# This left a binary at ~/.bun/bin/opencode that shadows the npm install
+# if ~/.bun/bin is earlier in PATH than the npm bin directory.
+cleanup_stale_bun_opencode() {
+	local bun_opencode="$HOME/.bun/bin/opencode"
+	local bun_modules="$HOME/.bun/install/global/node_modules/opencode-ai"
+
+	# Only clean up if the stale bun binary exists
+	if [[ ! -f "$bun_opencode" ]] && [[ ! -d "$bun_modules" ]]; then
+		return 0
+	fi
+
+	# Only clean up if npm version is installed (don't leave user without opencode)
+	local npm_opencode
+	npm_opencode=$(npm list -g opencode-ai --json 2>/dev/null | grep -c '"opencode-ai"' || true)
+	if [[ "$npm_opencode" -eq 0 ]]; then
+		# npm version not installed — install it first, then clean up bun
+		if command -v npm >/dev/null 2>&1; then
+			print_info "Installing opencode via npm (replacing bun install)..."
+			npm_global_install "opencode-ai" >/dev/null 2>&1 || true
+		else
+			# Can't install npm version — leave bun version in place
+			return 0
+		fi
+	fi
+
+	# Remove stale bun binary and modules
+	if [[ -f "$bun_opencode" ]]; then
+		rm -f "$bun_opencode"
+		print_info "Removed stale bun opencode binary: $bun_opencode"
+	fi
+
+	if [[ -d "$bun_modules" ]]; then
+		rm -rf "$bun_modules"
+		print_info "Removed stale bun opencode modules: $bun_modules"
+	fi
+
+	print_success "Cleaned up stale bun opencode install (npm version is canonical)"
+
+	return 0
+}
+
+# Migrate .agent -> .agents in user projects and local config
+# v2.104.0: Industry converging on .agents/ folder convention (aligning with AGENTS.md)
+# This migrates:
+# 1. .agent symlinks in user projects -> .agents
+# 2. .agent/loop-state/ -> .agents/loop-state/ in user projects
+# 3. .gitignore entries in user projects
+# 4. References in user's AI assistant configs
+# 5. References in ~/.aidevops/ config files
+migrate_agent_to_agents_folder() {
+	print_info "Checking for .agent -> .agents migration..."
+
+	local migrated=0
+
+	# 1. Migrate .agent symlinks in registered repos
+	local repos_file="$HOME/.config/aidevops/repos.json"
+	if [[ -f "$repos_file" ]] && command -v jq &>/dev/null; then
+		while IFS= read -r repo_path; do
+			[[ -z "$repo_path" ]] && continue
+			[[ ! -d "$repo_path" ]] && continue
+
+			# Migrate legacy .agent symlink/directory to .agents real directory
+			if [[ -L "$repo_path/.agent" ]]; then
+				rm -f "$repo_path/.agent"
+				if [[ ! -d "$repo_path/.agents" ]]; then
+					mkdir -p "$repo_path/.agents"
+				fi
+				print_info "  Removed legacy .agent symlink in $(basename "$repo_path")"
+				((++migrated))
+			elif [[ -d "$repo_path/.agent" && ! -L "$repo_path/.agent" ]]; then
+				# Real directory (not symlink) - rename it
+				if [[ ! -e "$repo_path/.agents" ]]; then
+					mv "$repo_path/.agent" "$repo_path/.agents"
+					print_info "  Renamed directory: $repo_path/.agent -> .agents"
+					((++migrated))
+				fi
+			fi
+
+			# Migrate legacy .agents symlink to real directory
+			if [[ -L "$repo_path/.agents" ]]; then
+				rm -f "$repo_path/.agents"
+				mkdir -p "$repo_path/.agents"
+				print_info "  Replaced .agents symlink with real directory in $(basename "$repo_path")"
+				((++migrated))
+			fi
+
+			# Update .gitignore: remove legacy bare ".agents" (now tracked),
+			# add runtime artifact ignores, migrate .agent/ paths.
+			# SKIP in non-interactive mode (e.g. auto-update cron) to avoid
+			# leaving uncommitted changes in user repos (issue #2570 bug 1).
+			local gitignore="$repo_path/.gitignore"
+			if [[ "${NON_INTERACTIVE:-false}" == "true" ]]; then
+				if [[ -f "$gitignore" ]]; then
+					local needs_gitignore_update=false
+					if grep -q "^\.agents$" "$gitignore" 2>/dev/null ||
+						grep -q "^\.agent$" "$gitignore" 2>/dev/null ||
+						grep -q "^\.agent/loop-state/" "$gitignore" 2>/dev/null ||
+						! grep -q "^\.agents/loop-state/" "$gitignore" 2>/dev/null; then
+						needs_gitignore_update=true
+					fi
+					if [[ "$needs_gitignore_update" == "true" ]]; then
+						print_warning "  $(basename "$repo_path")/.gitignore needs migration (skipped in non-interactive mode)"
+						print_info "  Run 'aidevops init' in $(basename "$repo_path") or 'setup.sh -i' to apply"
+					fi
+				fi
+			else
+				if [[ -f "$gitignore" ]]; then
+					# Remove legacy bare ".agents" and ".agent" entries (added by older versions)
+					# .agents/ is now a real committed directory, not a symlink to ignore
+					if grep -q "^\.agents$" "$gitignore" 2>/dev/null; then
+						sed -i '' '/^\.agents$/d' "$gitignore" 2>/dev/null ||
+							sed -i '/^\.agents$/d' "$gitignore" 2>/dev/null || true
+						print_info "  Removed legacy bare .agents from .gitignore in $(basename "$repo_path")"
+					fi
+					if grep -q "^\.agent$" "$gitignore" 2>/dev/null; then
+						sed -i '' '/^\.agent$/d' "$gitignore" 2>/dev/null ||
+							sed -i '/^\.agent$/d' "$gitignore" 2>/dev/null || true
+					fi
+
+					# Migrate .agent/loop-state/ -> .agents/loop-state/
+					if grep -q "^\.agent/loop-state/" "$gitignore" 2>/dev/null; then
+						sed -i '' 's|^\.agent/loop-state/|.agents/loop-state/|' "$gitignore" 2>/dev/null ||
+							sed -i 's|^\.agent/loop-state/|.agents/loop-state/|' "$gitignore" 2>/dev/null || true
+					fi
+
+					# Add runtime artifact ignores if not present
+					if ! grep -q "^\.agents/loop-state/" "$gitignore" 2>/dev/null; then
+						{
+							echo ""
+							echo "# aidevops runtime artifacts"
+							echo ".agents/loop-state/"
+							echo ".agents/tmp/"
+							echo ".agents/memory/"
+						} >>"$gitignore"
+						print_info "  Added .agents/ runtime artifact ignores in $(basename "$repo_path")"
+					fi
+				fi
+			fi
+		done < <(jq -r '.initialized_repos[].path' "$repos_file" 2>/dev/null)
+	fi
+
+	# 2. Also scan ~/Git/ for any .agent symlinks or directories not in repos.json
+	if [[ -d "$HOME/Git" ]]; then
+		while IFS= read -r -d '' agent_path; do
+			local repo_dir
+			repo_dir=$(dirname "$agent_path")
+
+			if [[ -L "$agent_path" ]]; then
+				# Symlink: remove and create real directory
+				rm -f "$agent_path"
+				if [[ ! -d "$repo_dir/.agents" ]]; then
+					mkdir -p "$repo_dir/.agents"
+				fi
+				print_info "  Removed legacy .agent symlink: $agent_path"
+				((++migrated))
+			elif [[ -d "$agent_path" ]]; then
+				# Directory: rename to .agents if .agents doesn't exist
+				if [[ ! -e "$repo_dir/.agents" ]]; then
+					mv "$agent_path" "$repo_dir/.agents"
+					print_info "  Renamed directory: $agent_path -> .agents"
+					((++migrated))
+				fi
+			fi
+		done < <(find "$HOME/Git" -maxdepth 3 -name ".agent" \( -type l -o -type d \) -print0 2>/dev/null)
+	fi
+
+	# 3. Update AI assistant config files that reference .agent/
+	local ai_config_files=(
+		"$HOME/.config/opencode/agent/AGENTS.md"
+		"$HOME/.config/Claude/AGENTS.md"
+		"$HOME/.claude/commands/AGENTS.md"
+		"$HOME/.opencode/AGENTS.md"
+	)
+
+	for config_file in "${ai_config_files[@]}"; do
+		if [[ -f "$config_file" ]]; then
+			if grep -q '\.agent/' "$config_file" 2>/dev/null; then
+				sed -i '' 's|\.agent/|.agents/|g' "$config_file" 2>/dev/null ||
+					sed -i 's|\.agent/|.agents/|g' "$config_file" 2>/dev/null || true
+				print_info "  Updated references in $config_file"
+				((++migrated))
+			fi
+		fi
+	done
+
+	# 4. Update session greeting cache if it references .agent/
+	local greeting_cache="$HOME/.aidevops/cache/session-greeting.txt"
+	if [[ -f "$greeting_cache" ]]; then
+		if grep -q '\.agent/' "$greeting_cache" 2>/dev/null; then
+			sed -i '' 's|\.agent/|.agents/|g' "$greeting_cache" 2>/dev/null ||
+				sed -i 's|\.agent/|.agents/|g' "$greeting_cache" 2>/dev/null || true
+		fi
+	fi
+
+	if [[ $migrated -gt 0 ]]; then
+		print_success "Migrated $migrated .agent -> .agents reference(s)"
+	else
+		print_info "No .agent -> .agents migration needed"
+	fi
+
+	return 0
+}
+
+# Remove deprecated MCP entries from opencode.json
+# These MCPs have been replaced by curl-based subagents (zero context cost)
+cleanup_deprecated_mcps() {
+	local opencode_config
+	opencode_config=$(find_opencode_config) || return 0
+
+	if [[ ! -f "$opencode_config" ]]; then
+		return 0
+	fi
+
+	if ! command -v jq &>/dev/null; then
+		return 0
+	fi
+
+	# MCPs replaced by curl subagents in v2.79.0
+	local deprecated_mcps=(
+		"hetzner-webapp"
+		"hetzner-brandlight"
+		"hetzner-marcusquinn"
+		"hetzner-storagebox"
+		"ahrefs"
+		"serper"
+		"dataforseo"
+		"hostinger-api"
+		"shadcn"
+		"repomix"
+	)
+
+	# Tool rules to remove (for MCPs that no longer exist)
+	local deprecated_tools=(
+		"hetzner-*"
+		"hostinger-api_*"
+		"ahrefs_*"
+		"dataforseo_*"
+		"serper_*"
+		"shadcn_*"
+		"repomix_*"
+	)
+
+	local cleaned=0
+	local tmp_config
+	tmp_config=$(mktemp)
+	trap 'rm -f "${tmp_config:-}"' RETURN
+
+	cp "$opencode_config" "$tmp_config"
+
+	for mcp in "${deprecated_mcps[@]}"; do
+		if jq -e ".mcp[\"$mcp\"]" "$tmp_config" >/dev/null 2>&1; then
+			jq "del(.mcp[\"$mcp\"])" "$tmp_config" >"${tmp_config}.new" && mv "${tmp_config}.new" "$tmp_config"
+			((++cleaned))
+		fi
+	done
+
+	for tool in "${deprecated_tools[@]}"; do
+		if jq -e ".tools[\"$tool\"]" "$tmp_config" >/dev/null 2>&1; then
+			jq "del(.tools[\"$tool\"])" "$tmp_config" >"${tmp_config}.new" && mv "${tmp_config}.new" "$tmp_config"
+		fi
+	done
+
+	# Also remove deprecated tool refs from SEO agent
+	if jq -e '.agent.SEO.tools["dataforseo_*"]' "$tmp_config" >/dev/null 2>&1; then
+		jq 'del(.agent.SEO.tools["dataforseo_*"]) | del(.agent.SEO.tools["serper_*"]) | del(.agent.SEO.tools["ahrefs_*"])' "$tmp_config" >"${tmp_config}.new" && mv "${tmp_config}.new" "$tmp_config"
+	fi
+
+	# Migrate npx/pipx commands to full binary paths (faster startup, PATH-independent)
+	# Parallel arrays avoid bash associative array issues with @ in package names
+	local -a mcp_pkgs=(
+		"chrome-devtools-mcp"
+		"mcp-server-gsc"
+		"playwriter"
+		"@steipete/macos-automator-mcp"
+		"@steipete/claude-code-mcp"
+		"analytics-mcp"
+	)
+	local -a mcp_bins=(
+		"chrome-devtools-mcp"
+		"mcp-server-gsc"
+		"playwriter"
+		"macos-automator-mcp"
+		"claude-code-mcp"
+		"analytics-mcp"
+	)
+
+	local i
+	for i in "${!mcp_pkgs[@]}"; do
+		local pkg="${mcp_pkgs[$i]}"
+		local bin_name="${mcp_bins[$i]}"
+		# Find MCP key using npx/bunx/pipx for this package (single query)
+		local mcp_key
+		mcp_key=$(jq -r --arg pkg "$pkg" '.mcp | to_entries[] | select(.value.command != null) | select(.value.command | join(" ") | test("npx.*" + $pkg + "|bunx.*" + $pkg + "|pipx.*run.*" + $pkg)) | .key' "$tmp_config" 2>/dev/null | head -1)
+
+		if [[ -n "$mcp_key" ]]; then
+			# Resolve full path for the binary
+			local full_path
+			full_path=$(resolve_mcp_binary_path "$bin_name")
+			if [[ -n "$full_path" ]]; then
+				jq --arg k "$mcp_key" --arg p "$full_path" '.mcp[$k].command = [$p]' "$tmp_config" >"${tmp_config}.new" && mv "${tmp_config}.new" "$tmp_config"
+				((++cleaned))
+			fi
+		fi
+	done
+
+	# Migrate outscraper from bash -c wrapper to full binary path
+	if jq -e '.mcp.outscraper.command | join(" ") | test("bash.*outscraper")' "$tmp_config" >/dev/null 2>&1; then
+		local outscraper_path
+		outscraper_path=$(resolve_mcp_binary_path "outscraper-mcp-server")
+		if [[ -n "$outscraper_path" ]]; then
+			# Source the API key and set it in environment
+			local outscraper_key=""
+			if [[ -f "$HOME/.config/aidevops/credentials.sh" ]]; then
+				# shellcheck source=/dev/null
+				outscraper_key=$(source "$HOME/.config/aidevops/credentials.sh" && echo "${OUTSCRAPER_API_KEY:-}")
+			fi
+			jq --arg p "$outscraper_path" --arg key "$outscraper_key" '.mcp.outscraper.command = [$p] | .mcp.outscraper.environment = {"OUTSCRAPER_API_KEY": $key}' "$tmp_config" >"${tmp_config}.new" && mv "${tmp_config}.new" "$tmp_config"
+			((++cleaned))
+		fi
+	fi
+
+	if [[ $cleaned -gt 0 ]]; then
+		create_backup_with_rotation "$opencode_config" "opencode"
+		mv "$tmp_config" "$opencode_config"
+		print_info "Updated $cleaned MCP entry/entries in opencode.json (using full binary paths)"
+	else
+		rm -f "$tmp_config"
+	fi
+
+	# Always resolve bare binary names to full paths (fixes PATH-dependent startup)
+	update_mcp_paths_in_opencode
+
+	return 0
+}
+
+# Disable MCPs globally that should only be enabled on-demand via subagents
+# This reduces session startup context by disabling rarely-used MCPs
+# - playwriter: ~3K tokens - enable via @playwriter subagent
+# - augment-context-engine: ~1K tokens - enable via @augment-context-engine subagent
+# - gh_grep: ~600 tokens - replaced by @github-search subagent (uses rg/bash)
+# - google-analytics-mcp: ~800 tokens - enable via @google-analytics subagent
+# - context7: ~800 tokens - enable via @context7 subagent (for library docs lookup)
+disable_ondemand_mcps() {
+	local opencode_config
+	opencode_config=$(find_opencode_config) || return 0
+
+	if [[ ! -f "$opencode_config" ]]; then
+		return 0
+	fi
+
+	if ! command -v jq &>/dev/null; then
+		return 0
+	fi
+
+	# MCPs to disable globally (these have subagent alternatives or are unused)
+	# Note: use exact MCP key names from opencode.json
+	local -a ondemand_mcps=(
+		"playwriter"
+		"augment-context-engine"
+		"gh_grep"
+		"google-analytics-mcp"
+		"grep_app"
+		"websearch"
+		# KEEP ENABLED: context7 (library docs)
+	)
+
+	local disabled=0
+	local changed=0
+	local tmp_config
+	tmp_config=$(mktemp)
+	trap 'rm -f "${tmp_config:-}"' RETURN
+
+	cp "$opencode_config" "$tmp_config"
+
+	for mcp in "${ondemand_mcps[@]}"; do
+		# Only disable MCPs that exist in the config
+		# Don't add fake entries - they break OpenCode's config validation
+		if jq -e ".mcp[\"$mcp\"]" "$tmp_config" >/dev/null 2>&1; then
+			local current_enabled
+			current_enabled=$(jq -r ".mcp[\"$mcp\"].enabled // \"true\"" "$tmp_config")
+			if [[ "$current_enabled" != "false" ]]; then
+				jq ".mcp[\"$mcp\"].enabled = false" "$tmp_config" >"${tmp_config}.new" && mv "${tmp_config}.new" "$tmp_config"
+				((++disabled))
+			fi
+		fi
+	done
+
+	# Remove invalid MCP entries added by v2.100.16 bug
+	# These have type "stdio" (invalid - only "local" or "remote" are valid)
+	# or command ["echo", "disabled"] which breaks OpenCode
+	local invalid_mcps=("grep_app" "websearch" "context7" "augment-context-engine")
+	for mcp in "${invalid_mcps[@]}"; do
+		# Check for invalid type "stdio" or dummy command
+		if jq -e ".mcp[\"$mcp\"].type == \"stdio\" or .mcp[\"$mcp\"].command[0] == \"echo\"" "$tmp_config" >/dev/null 2>&1; then
+			jq "del(.mcp[\"$mcp\"])" "$tmp_config" >"${tmp_config}.new" && mv "${tmp_config}.new" "$tmp_config"
+			print_info "Removed invalid MCP entry: $mcp"
+			changed=1
+		fi
+	done
+
+	# Re-enable MCPs that were accidentally disabled (v2.100.16-17 bug)
+	local -a keep_enabled=("context7")
+	for mcp in "${keep_enabled[@]}"; do
+		if jq -e ".mcp[\"$mcp\"].enabled == false" "$tmp_config" >/dev/null 2>&1; then
+			jq ".mcp[\"$mcp\"].enabled = true" "$tmp_config" >"${tmp_config}.new" && mv "${tmp_config}.new" "$tmp_config"
+			print_info "Re-enabled $mcp MCP"
+			changed=1
+		fi
+	done
+
+	if [[ $disabled -gt 0 || $changed -gt 0 ]]; then
+		create_backup_with_rotation "$opencode_config" "opencode"
+		mv "$tmp_config" "$opencode_config"
+		if [[ $disabled -gt 0 ]]; then
+			print_info "Disabled $disabled MCP(s) globally (use subagents to enable on-demand)"
+		fi
+	else
+		rm -f "$tmp_config"
+	fi
+
+	return 0
+}
+
+# Validate and repair OpenCode config schema
+# Fixes common issues from manual editing or AI-generated configs:
+# - MCP entries missing "type": "local" field
+# - tools entries as objects {} instead of booleans
+# If invalid, backs up and regenerates using the generator script
+validate_opencode_config() {
+	local opencode_config
+	opencode_config=$(find_opencode_config) || return 0
+
+	if [[ ! -f "$opencode_config" ]]; then
+		return 0
+	fi
+
+	if ! command -v jq &>/dev/null; then
+		return 0
+	fi
+
+	local needs_repair=false
+	local issues=""
+
+	# Check 0: Remove deprecated top-level keys that OpenCode no longer recognizes
+	# "compaction" was removed in OpenCode v1.1.x - causes "Unrecognized key" error
+	local deprecated_keys=("compaction")
+	for key in "${deprecated_keys[@]}"; do
+		if jq -e ".[\"$key\"]" "$opencode_config" >/dev/null 2>&1; then
+			local tmp_fix
+			tmp_fix=$(mktemp)
+			trap 'rm -f "${tmp_fix:-}"' RETURN
+			if jq "del(.[\"$key\"])" "$opencode_config" >"$tmp_fix" 2>/dev/null; then
+				create_backup_with_rotation "$opencode_config" "opencode"
+				mv "$tmp_fix" "$opencode_config"
+				print_info "Removed deprecated '$key' key from OpenCode config"
+			else
+				rm -f "$tmp_fix"
+			fi
+		fi
+	done
+
+	# Check 1: MCP entries must have "type" field (usually "local")
+	# Invalid: {"mcp": {"foo": {"command": "..."}}}
+	# Valid:   {"mcp": {"foo": {"type": "local", "command": "..."}}}
+	local mcps_without_type
+	mcps_without_type=$(jq -r '.mcp // {} | to_entries[] | select(.value.type == null and .value.command != null) | .key' "$opencode_config" 2>/dev/null | head -5)
+	if [[ -n "$mcps_without_type" ]]; then
+		needs_repair=true
+		issues="${issues}\n  - MCP entries missing 'type' field: $(echo "$mcps_without_type" | tr '\n' ', ' | sed 's/,$//')"
+	fi
+
+	# Check 2: tools entries must be booleans, not objects
+	# Invalid: {"tools": {"gh_grep": {}}}
+	# Valid:   {"tools": {"gh_grep": true}}
+	local tools_as_objects
+	tools_as_objects=$(jq -r '.tools // {} | to_entries[] | select(.value | type == "object") | .key' "$opencode_config" 2>/dev/null | head -5)
+	if [[ -n "$tools_as_objects" ]]; then
+		needs_repair=true
+		issues="${issues}\n  - tools entries as objects instead of booleans: $(echo "$tools_as_objects" | tr '\n' ', ' | sed 's/,$//')"
+	fi
+
+	# Check 3: Try to parse with opencode (if available) to catch other schema issues
+	if command -v opencode &>/dev/null; then
+		local validation_output
+		if ! validation_output=$(opencode --version 2>&1); then
+			# If opencode fails to start, config might be invalid
+			if [[ "$validation_output" == *"Configuration is invalid"* ]]; then
+				needs_repair=true
+				issues="${issues}\n  - OpenCode reports invalid configuration"
+			fi
+		fi
+	fi
+
+	if [[ "$needs_repair" == "true" ]]; then
+		print_warning "OpenCode config has schema issues:$issues"
+
+		# Backup the invalid config
+		create_backup_with_rotation "$opencode_config" "opencode"
+		print_info "Backed up invalid config"
+
+		# Remove the invalid config so generator creates fresh one
+		rm -f "$opencode_config"
+
+		# Regenerate using the generator script
+		local generator_script="$HOME/.aidevops/agents/scripts/generate-opencode-agents.sh"
+		if [[ -x "$generator_script" ]]; then
+			print_info "Regenerating OpenCode config with correct schema..."
+			if "$generator_script" >/dev/null 2>&1; then
+				print_success "OpenCode config regenerated successfully"
+			else
+				print_warning "Config regeneration failed - run manually: $generator_script"
+			fi
+		else
+			print_warning "Generator script not found - run setup.sh again after agents are deployed"
+		fi
+	fi
+
+	return 0
+}
+
+# Migrate mcp-env.sh to credentials.sh (v2.105.0)
+# Renames the credential file and creates backward-compatible symlink
+migrate_mcp_env_to_credentials() {
+	local config_dir="$HOME/.config/aidevops"
+	local old_file="$config_dir/mcp-env.sh"
+	local new_file="$config_dir/credentials.sh"
+	local migrated=0
+
+	# Migrate root-level mcp-env.sh -> credentials.sh
+	if [[ -f "$old_file" && ! -L "$old_file" ]]; then
+		if [[ ! -f "$new_file" ]]; then
+			mv "$old_file" "$new_file"
+			chmod 600 "$new_file"
+			((++migrated))
+			print_info "Renamed mcp-env.sh to credentials.sh"
+		fi
+		# Create backward-compatible symlink
+		if [[ ! -L "$old_file" ]]; then
+			ln -sf "credentials.sh" "$old_file"
+			print_info "Created symlink mcp-env.sh -> credentials.sh"
+		fi
+	fi
+
+	# Migrate tenant-level mcp-env.sh -> credentials.sh
+	local tenants_dir="$config_dir/tenants"
+	if [[ -d "$tenants_dir" ]]; then
+		for tenant_dir in "$tenants_dir"/*/; do
+			[[ -d "$tenant_dir" ]] || continue
+			local tenant_old="$tenant_dir/mcp-env.sh"
+			local tenant_new="$tenant_dir/credentials.sh"
+			if [[ -f "$tenant_old" && ! -L "$tenant_old" ]]; then
+				if [[ ! -f "$tenant_new" ]]; then
+					mv "$tenant_old" "$tenant_new"
+					chmod 600 "$tenant_new"
+					((++migrated))
+				fi
+				if [[ ! -L "$tenant_old" ]]; then
+					ln -sf "credentials.sh" "$tenant_old"
+				fi
+			fi
+		done
+	fi
+
+	# Update shell rc files that source the old path
+	for rc_file in "$HOME/.zshrc" "$HOME/.bashrc" "$HOME/.bash_profile"; do
+		if [[ -f "$rc_file" ]] && grep -q 'source.*mcp-env\.sh' "$rc_file" 2>/dev/null; then
+			# shellcheck disable=SC2016
+			sed -i '' 's|source.*\.config/aidevops/mcp-env\.sh|source "$HOME/.config/aidevops/credentials.sh"|g' "$rc_file" 2>/dev/null ||
+				sed -i 's|source.*\.config/aidevops/mcp-env\.sh|source "$HOME/.config/aidevops/credentials.sh"|g' "$rc_file" 2>/dev/null || true
+			((++migrated))
+			print_info "Updated $rc_file to source credentials.sh"
+		fi
+	done
+
+	if [[ $migrated -gt 0 ]]; then
+		print_success "Migrated $migrated mcp-env.sh -> credentials.sh reference(s)"
+	fi
+
+	return 0
+}
+
+# Migrate old config-backups to new per-type backup structure
+# This runs once to clean up the legacy backup directory
+migrate_old_backups() {
+	local old_backup_dir="$HOME/.aidevops/config-backups"
+
+	# Skip if old directory doesn't exist
+	if [[ ! -d "$old_backup_dir" ]]; then
+		return 0
+	fi
+
+	# Count old backups
+	local old_count
+	old_count=$(find "$old_backup_dir" -maxdepth 1 -type d -name "20*" 2>/dev/null | wc -l | tr -d ' ')
+
+	if [[ $old_count -eq 0 ]]; then
+		# Empty directory, just remove it
+		rm -rf "$old_backup_dir"
+		return 0
+	fi
+
+	print_info "Migrating $old_count old backups to new structure..."
+
+	# Create new backup directories
+	mkdir -p "$HOME/.aidevops/agents-backups"
+	mkdir -p "$HOME/.aidevops/opencode-backups"
+
+	# Move the most recent backups (up to BACKUP_KEEP_COUNT) to new locations
+	# Old backups contained mixed content, so we'll just keep the newest ones as agents backups
+	local migrated=0
+	for backup in $(find "$old_backup_dir" -maxdepth 1 -type d -name "20*" 2>/dev/null | sort -r | head -n "$BACKUP_KEEP_COUNT"); do
+		local backup_name
+		backup_name=$(basename "$backup")
+
+		# Check if it contains agents folder (most common)
+		if [[ -d "$backup/agents" ]]; then
+			mv "$backup" "$HOME/.aidevops/agents-backups/$backup_name"
+			((++migrated))
+		# Check if it contains opencode.json
+		elif [[ -f "$backup/opencode.json" ]]; then
+			mv "$backup" "$HOME/.aidevops/opencode-backups/$backup_name"
+			((++migrated))
+		fi
+	done
+
+	# Remove remaining old backups and the old directory
+	rm -rf "$old_backup_dir"
+
+	if [[ $migrated -gt 0 ]]; then
+		print_success "Migrated $migrated recent backups, removed $((old_count - migrated)) old backups"
+	else
+		print_info "Cleaned up $old_count old backups"
+	fi
+
+	return 0
+}
+
+# Migrate loop state from .claude/ to .agents/loop-state/ in user projects
+# Also migrates from legacy .agents/loop-state/ to .agents/loop-state/
+# The migration is non-destructive: moves files, doesn't delete originals until confirmed
+migrate_loop_state_directories() {
+	print_info "Checking for legacy loop state directories..."
+
+	local migrated=0
+	local git_dirs=()
+
+	# Find Git repositories in common locations
+	# Check ~/Git/ and current directory's parent
+	for search_dir in "$HOME/Git" "$(dirname "$(pwd)")"; do
+		if [[ -d "$search_dir" ]]; then
+			while IFS= read -r -d '' git_dir; do
+				git_dirs+=("$(dirname "$git_dir")")
+			done < <(find "$search_dir" -maxdepth 3 -type d -name ".git" -print0 2>/dev/null)
+		fi
+	done
+
+	for repo_dir in "${git_dirs[@]}"; do
+		local old_state_dir="$repo_dir/.claude"
+		local legacy_state_dir="$repo_dir/.agent/loop-state"
+		local new_state_dir="$repo_dir/.agents/loop-state"
+
+		# Migrate from .claude/ (oldest legacy path)
+		if [[ -d "$old_state_dir" ]]; then
+			local has_loop_state=false
+			if [[ -f "$old_state_dir/ralph-loop.local.state" ]] ||
+				[[ -f "$old_state_dir/loop-state.json" ]] ||
+				[[ -d "$old_state_dir/receipts" ]]; then
+				has_loop_state=true
+			fi
+
+			if [[ "$has_loop_state" == "true" ]]; then
+				print_info "Found legacy loop state in: $repo_dir/.claude/"
+				mkdir -p "$new_state_dir"
+
+				for file in ralph-loop.local.state loop-state.json re-anchor.md guardrails.md; do
+					if [[ -f "$old_state_dir/$file" ]]; then
+						mv "$old_state_dir/$file" "$new_state_dir/"
+						print_info "  Moved $file"
+					fi
+				done
+
+				if [[ -d "$old_state_dir/receipts" ]]; then
+					mv "$old_state_dir/receipts" "$new_state_dir/"
+					print_info "  Moved receipts/"
+				fi
+
+				local remaining
+				remaining=$(find "$old_state_dir" -mindepth 1 -maxdepth 1 2>/dev/null | wc -l | tr -d ' ')
+
+				if [[ "$remaining" -eq 0 ]]; then
+					rmdir "$old_state_dir" 2>/dev/null && print_info "  Removed empty .claude/"
+				else
+					print_warning "  .claude/ has other files, not removing"
+				fi
+
+				((++migrated))
+			fi
+		fi
+
+		# Migrate from .agents/loop-state/ (v2.51.0-v2.103.0 path) to .agents/loop-state/
+		if [[ -d "$legacy_state_dir" ]] && [[ "$legacy_state_dir" != "$new_state_dir" ]]; then
+			print_info "Found legacy loop state in: $repo_dir/.agent/loop-state/"
+			mkdir -p "$new_state_dir"
+
+			# Move all files from old to new
+			if [[ -n "$(ls -A "$legacy_state_dir" 2>/dev/null)" ]]; then
+				cp -R "$legacy_state_dir"/* "$new_state_dir/" 2>/dev/null || true
+				rm -rf "$legacy_state_dir"
+				print_info "  Migrated .agents/loop-state/ -> .agents/loop-state/"
+				((++migrated))
+			fi
+		fi
+
+		# Update .gitignore if needed
+		local gitignore="$repo_dir/.gitignore"
+		if [[ -f "$gitignore" ]]; then
+			if ! grep -q "^\.agents/loop-state/" "$gitignore" 2>/dev/null; then
+				echo ".agents/loop-state/" >>"$gitignore"
+				print_info "  Added .agents/loop-state/ to .gitignore"
+			fi
+		fi
+	done
+
+	if [[ $migrated -gt 0 ]]; then
+		print_success "Migrated loop state in $migrated repositories"
+	else
+		print_info "No legacy loop state directories found"
+	fi
+
+	return 0
+}
+
+# Migrate pulse-repos.json into repos.json
+# pulse-repos.json had slug/path/priority for supervisor-managed repos.
+# Now repos.json is the single source of truth with slug, pulse, and priority fields.
+migrate_pulse_repos_to_repos_json() {
+	local pulse_file="$HOME/.config/aidevops/pulse-repos.json"
+	local repos_file="$HOME/.config/aidevops/repos.json"
+
+	if [[ ! -f "$pulse_file" ]]; then
+		return 0
+	fi
+
+	if ! command -v jq &>/dev/null; then
+		print_warning "jq not installed — skipping pulse-repos.json migration"
+		return 0
+	fi
+
+	if [[ ! -f "$repos_file" ]]; then
+		print_warning "repos.json not found — skipping pulse-repos.json migration"
+		return 0
+	fi
+
+	local migrated=0
+	local slug path priority
+
+	# Read each entry from pulse-repos.json and merge into repos.json
+	while IFS=$'\t' read -r slug path priority; do
+		[[ -z "$slug" ]] && continue
+		# Expand ~ in path
+		local expanded_path="${path/#\~/$HOME}"
+
+		# Check if this repo exists in repos.json by path
+		if jq -e --arg path "$expanded_path" '.initialized_repos[] | select(.path == $path)' "$repos_file" &>/dev/null; then
+			# Update existing entry: add slug, pulse, priority
+			local temp_file="${repos_file}.tmp"
+			jq --arg path "$expanded_path" --arg slug "$slug" --arg priority "$priority" \
+				'(.initialized_repos[] | select(.path == $path)) |= . + {slug: $slug, pulse: true, priority: $priority}' \
+				"$repos_file" >"$temp_file" && mv "$temp_file" "$repos_file"
+			((++migrated))
+		else
+			# Add new entry from pulse-repos.json
+			local temp_file="${repos_file}.tmp"
+			jq --arg path "$expanded_path" --arg slug "$slug" --arg priority "$priority" \
+				'.initialized_repos += [{path: $path, slug: $slug, pulse: true, priority: $priority}]' \
+				"$repos_file" >"$temp_file" && mv "$temp_file" "$repos_file"
+			((++migrated))
+		fi
+	done < <(jq -r '(.repos? // .)[] | [.slug, .path, .priority] | @tsv' "$pulse_file" 2>/dev/null)
+
+	if [[ $migrated -gt 0 ]]; then
+		print_success "Migrated $migrated repo(s) from pulse-repos.json into repos.json"
+		# Rename old file so it's not read again, but keep as backup
+		mv "$pulse_file" "${pulse_file}.migrated"
+		print_info "Renamed pulse-repos.json to pulse-repos.json.migrated"
+	fi
+
+	return 0
+}