@jetrabbits/agentic 0.3.3 → 0.5.0

package/agentic

@@ -3,6 +3,13 @@
 set -euo pipefail
 shopt -s inherit_errexit 2>/dev/null || true
 
+# macOS ships bash 3.2, where empty arrays and set -u interact poorly.
+# Keep the CLI quiet and compatible there while retaining nounset on newer bash.
+AGENTIC_BASH_MAJOR="${AGENTIC_TEST_BASH_MAJOR:-${BASH_VERSINFO[0]}}"
+if [[ "$AGENTIC_BASH_MAJOR" =~ ^[0-9]+$ ]] && (( AGENTIC_BASH_MAJOR < 4 )); then
+  set +u
+fi
+
 SCRIPT_SOURCE="${BASH_SOURCE[0]}"
 SCRIPT_DIR="$(cd -- "$(dirname -- "$SCRIPT_SOURCE")" && pwd -P)"
 SCRIPT_NAME="$(basename -- "$SCRIPT_SOURCE")"
@@ -24,6 +31,7 @@ XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}"
 APP_CONFIG_DIR="$XDG_CONFIG_HOME/$APP_NAME"
 APP_CONFIG_FILE="$APP_CONFIG_DIR/config"
 OPENCODE_PLUGIN_CONFIG_FILE="$APP_CONFIG_DIR/opencode-plugins.json"
+OPENCODE_USER_PROFILES_DIR="$HOME/.config/$APP_NAME/opencode/profiles"
 APP_DATA_DIR="$XDG_DATA_HOME/$APP_NAME"
 APP_REPO_DIR="$APP_DATA_DIR/repo"
 
@@ -42,6 +50,8 @@ ACTIVE_THEME="dark"
 SELECTED_AGENT_OS=("$DEFAULT_AGENT_OS")
 SELECTED_AREAS=()
 SELECTED_SPECS=()
+SELECTED_MCPS=()
+SELECTED_OPENCODE_PROFILE=""
 INSTALL_SETTINGS_REPLAY=false
 
 SELF_INSTALL_FORCE=false
@@ -749,6 +759,245 @@ ensure_agentic_runtime_requirements() {
   ensure_hash_available
 }
 
+
+MCP_REGISTRY_IDS=(opencode-docs playwright kubernetes youtube-transcript docker-mcp context7 mempalace anydb)
+MCP_NONE_OPTION="None / skip"
+OPENCODE_PROFILE_IDS=(openai githubcopilot)
+OPENCODE_PROFILE_NONE_OPTION="No OpenCode model profile"
+
+mcp_registry_contains() {
+  local expected="$1"
+  local mcp_id
+  for mcp_id in "${MCP_REGISTRY_IDS[@]}"; do
+    [[ "$mcp_id" == "$expected" ]] && return 0
+  done
+  return 1
+}
+
+mcp_title() {
+  case "$1" in
+    opencode-docs) echo "OpenCode Docs" ;;
+    playwright) echo "Playwright" ;;
+    kubernetes) echo "Kubernetes" ;;
+    youtube-transcript) echo "YouTube Transcript" ;;
+    docker-mcp) echo "Docker MCP" ;;
+    context7) echo "Context7" ;;
+    mempalace) echo "MemPalace" ;;
+    anydb) echo "AnyDB" ;;
+    *) echo "$1" ;;
+  esac
+}
+
+mcp_description() {
+  case "$1" in
+    opencode-docs) echo "OpenCode docs MCP" ;;
+    playwright) echo "Browser automation via Playwright MCP" ;;
+    kubernetes) echo "Kubernetes pods/logs/exec management" ;;
+    youtube-transcript) echo "YouTube transcript extraction" ;;
+    docker-mcp) echo "Docker MCP Gateway" ;;
+    context7) echo "Fresh library documentation" ;;
+    mempalace) echo "Persistent project memory" ;;
+    anydb) echo "Database access MCP" ;;
+    *) echo "MCP server" ;;
+  esac
+}
+
+mcp_security() {
+  case "$1" in
+    kubernetes|docker-mcp|anydb) echo "dangerous" ;;
+    playwright|mempalace) echo "sensitive" ;;
+    *) echo "safe" ;;
+  esac
+}
+
+mcp_verified() {
+  case "$1" in
+    opencode-docs|playwright|kubernetes|youtube-transcript|docker-mcp|context7|mempalace|anydb) return 0 ;;
+    *) return 1 ;;
+  esac
+}
+
+mcp_display_row() {
+  local mcp_id="$1"
+  local checked="${2:-false}"
+  local mark="[ ]"
+  [[ "$checked" == true ]] && mark="[x]"
+  printf '%s %-20s %s\n' "$mark" "$mcp_id" "$(mcp_description "$mcp_id")"
+}
+
+mcp_id_from_display_row() {
+  local row="$1"
+  row="${row#\[ \] }"
+  row="${row#\[x\] }"
+  row="${row#\[X\] }"
+  row="${row%%[[:space:]]*}"
+  printf '%s\n' "$row"
+}
+
+selected_mcp_contains() {
+  local expected="$1"
+  local mcp_id
+  for mcp_id in "${SELECTED_MCPS[@]}"; do
+    [[ "$mcp_id" == "$expected" ]] && return 0
+  done
+  return 1
+}
+
+add_selected_mcp() {
+  local mcp_id="$1"
+  mcp_registry_contains "$mcp_id" || {
+    warn "Ignoring unknown MCP integration '$mcp_id'"
+    return 0
+  }
+  mcp_verified "$mcp_id" || {
+    warn "Skipping MCP integration '$mcp_id' because its package/config is not verified"
+    return 0
+  }
+  unique_append "$mcp_id" SELECTED_MCPS
+}
+
+sync_selected_mcps_from_env() {
+  local raw="${AGENTIC_ENABLE_MCPS:-}"
+  local item
+  if [[ -n "$raw" ]]; then
+    local old_ifs="$IFS"
+    IFS=,
+    for item in $raw; do
+      item="$(trim "$item")"
+      [[ -z "$item" ]] && continue
+      add_selected_mcp "$item"
+    done
+    IFS="$old_ifs"
+  fi
+  if [[ "${AGENTIC_ENABLE_CONTEXT7:-}" =~ ^[Yy](es)?$ ]]; then
+    add_selected_mcp "context7"
+  fi
+  if [[ "${AGENTIC_ENABLE_MEMPALACE:-}" =~ ^[Yy](es)?$ ]]; then
+    add_selected_mcp "mempalace"
+  fi
+}
+
+sync_legacy_mcp_env_from_selected() {
+  if selected_mcp_contains "context7"; then
+    AGENTIC_ENABLE_CONTEXT7="y"
+  elif [[ -z "${AGENTIC_ENABLE_CONTEXT7:-}" ]]; then
+    AGENTIC_ENABLE_CONTEXT7="n"
+  fi
+  if selected_mcp_contains "mempalace"; then
+    AGENTIC_ENABLE_MEMPALACE="y"
+  elif [[ -z "${AGENTIC_ENABLE_MEMPALACE:-}" ]]; then
+    AGENTIC_ENABLE_MEMPALACE="n"
+  fi
+}
+
+selected_mcps_csv() {
+  local old_ifs="$IFS"
+  IFS=,
+  printf '%s\n' "${SELECTED_MCPS[*]:-}"
+  IFS="$old_ifs"
+}
+
+mcp_registry_json() {
+  cat <<'JSON'
+{
+  "opencode-docs": {"security":"safe", "default_enabled":false, "target":"mcpServers", "server":"opencode", "command":"npx", "args":["-y", "opencode-docs-mcp"]},
+  "playwright": {"security":"sensitive", "default_enabled":false, "target":"mcpServers", "server":"playwright", "command":"npx", "args":["@playwright/mcp@latest"]},
+  "kubernetes": {"security":"dangerous", "default_enabled":false, "target":"mcpServers", "server":"kubernetes", "command":"npx", "args":["-y", "kubernetes-mcp-server"]},
+  "youtube-transcript": {"security":"safe", "default_enabled":false, "target":"mcpServers", "server":"youtube-transcript", "command":"npx", "args":["-y", "@kimtaeyoon83/mcp-server-youtube-transcript"]},
+  "docker-mcp": {"security":"dangerous", "default_enabled":false, "target":"mcp", "server":"docker", "opencode":{"type":"local", "command":["docker", "mcp", "gateway", "run"], "enabled":true}, "generic":{"command":"docker", "args":["mcp", "gateway", "run"]}},
+  "context7": {"security":"safe", "default_enabled":false, "target":"mcpServers", "server":"context7", "command":"npx", "args":["-y", "@upstash/context7-mcp"], "remote":"https://mcp.context7.com/mcp"},
+  "mempalace": {"security":"sensitive", "default_enabled":false, "target":"mcpServers", "server":"mempalace", "command":"mempalace-mcp", "args":[]},
+  "anydb": {"security":"dangerous", "default_enabled":false, "target":"mcpServers", "server":"anydb", "command":"npx", "args":["-y", "anydb-mcp"]}
+}
+JSON
+}
+
+opencode_builtin_profile_contains() {
+  local expected="$1"
+  local profile_id
+  for profile_id in "${OPENCODE_PROFILE_IDS[@]}"; do
+    [[ "$profile_id" == "$expected" ]] && return 0
+  done
+  return 1
+}
+
+opencode_profile_contains() {
+  local expected="$1"
+  opencode_builtin_profile_contains "$expected" && return 0
+  [[ -f "$OPENCODE_USER_PROFILES_DIR/$expected/opencode.json" ]] && return 0
+  return 1
+}
+
+opencode_user_profile_ids() {
+  [[ -d "$OPENCODE_USER_PROFILES_DIR" ]] || return 0
+  find "$OPENCODE_USER_PROFILES_DIR" -mindepth 2 -maxdepth 2 -type f -name opencode.json -print 2>/dev/null | \
+    while IFS= read -r profile_config; do
+      basename -- "$(dirname -- "$profile_config")"
+    done | sort
+}
+
+opencode_profile_source_path() {
+  local profile_id="$1"
+  local bundled_src="$EXTENSIONS_ROOT/opencode/profiles/$profile_id/opencode.json"
+  local user_src="$OPENCODE_USER_PROFILES_DIR/$profile_id/opencode.json"
+  if [[ -f "$bundled_src" ]]; then
+    printf '%s\n' "$bundled_src"
+    return
+  fi
+  printf '%s\n' "$user_src"
+}
+
+opencode_profile_label() {
+  case "$1" in
+    openai) echo "OpenAI Model Profile" ;;
+    githubcopilot) echo "GitHub Copilot Model Profile" ;;
+    *) echo "$1 profile" ;;
+  esac
+}
+
+opencode_profile_id_from_label() {
+  local label="$1"
+  local profile_id
+  for profile_id in "${OPENCODE_PROFILE_IDS[@]}"; do
+    if [[ "$label" == "$(opencode_profile_label "$profile_id")" ]]; then
+      printf '%s\n' "$profile_id"
+      return
+    fi
+  done
+  case "$label" in
+    *" profile")
+      printf '%s\n' "${label%" profile"}"
+      return
+      ;;
+  esac
+  printf '%s\n' "$label"
+}
+
+opencode_plugin_label() {
+  case "$1" in
+    telegram-notification) echo "Telegram Notifications" ;;
+    agent-model-mapper) echo "Agent Model Mapping" ;;
+    *) echo "$1" ;;
+  esac
+}
+
+opencode_plugin_id_from_label() {
+  case "$1" in
+    "Telegram Notifications") echo "telegram-notification" ;;
+    "Agent Model Mapping") echo "agent-model-mapper" ;;
+    *) echo "$1" ;;
+  esac
+}
+
+opencode_profile_is_none() {
+  local profile_id
+  profile_id="$(trim "${1:-}")"
+  case "$profile_id" in
+    ""|none|None|skip|Skip|no|No) return 0 ;;
+    *) return 1 ;;
+  esac
+}
+
 selected_agent_os_contains() {
   local expected="$1"
   local agent
@@ -764,6 +1013,34 @@ project_manifest_path() {
   printf '%s\n' "$PROJECT_DIR/$PROJECT_MANIFEST_NAME"
 }
 
+normalize_project_dir_path() {
+  local raw="$1"
+  local parent base parent_real
+
+  if [[ -z "$raw" ]]; then
+    printf '%s\n' "$raw"
+    return
+  fi
+
+  if [[ -d "$raw" ]]; then
+    (cd -- "$raw" && pwd -P)
+    return
+  fi
+
+  parent="$(dirname -- "$raw")"
+  base="$(basename -- "$raw")"
+  if [[ -d "$parent" ]]; then
+    parent_real="$(cd -- "$parent" && pwd -P)" || {
+      printf '%s\n' "$raw"
+      return
+    }
+    printf '%s/%s\n' "$parent_real" "$base"
+    return
+  fi
+
+  printf '%s\n' "$raw"
+}
+
 project_rel_path() {
   local path="$1"
   local rel="${path#"$PROJECT_DIR"/}"
@@ -1040,21 +1317,11 @@ write_agentic_manifest() {
   specs_csv="${SELECTED_SPECS[*]}"
   IFS="$old_ifs"
 
-  # Build mcp_integrations list from current env selections
-  local mcp_integrations=()
-  if [[ "${AGENTIC_ENABLE_CONTEXT7:-}" =~ ^[Yy](es)?$ ]]; then
-    mcp_integrations+=("context7")
-  fi
-  if [[ "${AGENTIC_ENABLE_MEMPALACE:-}" =~ ^[Yy](es)?$ ]]; then
-    mcp_integrations+=("mempalace")
-  fi
-  old_ifs="$IFS"
-  IFS=,
-  mcp_integrations_csv="${mcp_integrations[*]:-}"
-  IFS="$old_ifs"
+  sync_legacy_mcp_env_from_selected
+  mcp_integrations_csv="$(selected_mcps_csv)"
 
   local manifest_status
-  manifest_status="$(python3 - "$manifest" "$records_file" "$skipped_file" "$APP_REPO_LINK" "$REPO_ROOT" "$agent_os_csv" "$areas_csv" "$specs_csv" "$(app_version_label)" "$mcp_integrations_csv" "$OPENCODE_TELEGRAM_ENABLED" "$OPENCODE_TELEGRAM_BOT_TOKEN" "$OPENCODE_TELEGRAM_CHAT_ID" "$OPENCODE_AGENT_MODEL_MAPPER_ENABLED" <<'PY'
+  manifest_status="$(python3 - "$manifest" "$records_file" "$skipped_file" "$APP_REPO_LINK" "$REPO_ROOT" "$agent_os_csv" "$areas_csv" "$specs_csv" "$(app_version_label)" "$mcp_integrations_csv" "$OPENCODE_TELEGRAM_ENABLED" "$OPENCODE_TELEGRAM_BOT_TOKEN" "$OPENCODE_TELEGRAM_CHAT_ID" "$OPENCODE_AGENT_MODEL_MAPPER_ENABLED" "$SELECTED_OPENCODE_PROFILE" <<'PY'
 import json
 import sys
 from datetime import datetime, timezone
@@ -1074,6 +1341,7 @@ telegram_enabled = sys.argv[11].lower() == "true" if len(sys.argv) > 11 and sys.
 telegram_bot_token = sys.argv[12] if len(sys.argv) > 12 else ""
 telegram_chat_id = sys.argv[13] if len(sys.argv) > 13 else ""
 mapper_enabled = sys.argv[14].lower() == "true" if len(sys.argv) > 14 and sys.argv[14] else None
+opencode_profile = sys.argv[15] if len(sys.argv) > 15 else ""
 now = datetime.now(timezone.utc).replace(microsecond=0).isoformat().replace("+00:00", "Z")
 
 existing = {}
@@ -1150,6 +1418,7 @@ data = {
         "areas": areas,
         "specializations": specs,
         "mcp_integrations": mcp_integrations,
+        "opencode_profile": opencode_profile,
         "opencode_plugins": opencode_plugins,
         "source_repo": repo_link,
         "source_checkout": repo_root,
@@ -1198,6 +1467,9 @@ for key in ("agent_os", "areas", "specializations", "mcp_integrations"):
     print("::" + key)
     for value in settings.get(key, []):
         print(value)
+print("::opencode_profile")
+if settings.get("opencode_profile"):
+    print(settings.get("opencode_profile"))
 plugins = settings.get("opencode_plugins", {})
 if isinstance(plugins, dict):
     telegram = plugins.get("telegram", {})
@@ -1228,6 +1500,7 @@ PY
   local loaded_telegram_bot_token=""
   local loaded_telegram_chat_id=""
   local loaded_mapper_enabled=""
+  local loaded_opencode_profile=""
   local value
   for value in "${values[@]}"; do
     case "$value" in
@@ -1235,12 +1508,18 @@ PY
       "::areas") section="areas" ;;
       "::specializations") section="specializations" ;;
       "::mcp_integrations") section="mcp_integrations" ;;
+      "::opencode_profile") section="opencode_profile" ;;
+      "::opencode_telegram_enabled") section="opencode_telegram_enabled" ;;
+      "::opencode_telegram_bot_token") section="opencode_telegram_bot_token" ;;
+      "::opencode_telegram_chat_id") section="opencode_telegram_chat_id" ;;
+      "::opencode_agent_model_mapper_enabled") section="opencode_agent_model_mapper_enabled" ;;
       *)
         case "$section" in
           agent_os) loaded_agent_os+=("$value") ;;
           areas) loaded_areas+=("$value") ;;
           specializations) loaded_specs+=("$value") ;;
           mcp_integrations) loaded_mcp_integrations+=("$value") ;;
+          opencode_profile) loaded_opencode_profile="$value" ;;
           opencode_telegram_enabled) loaded_telegram_enabled="$value" ;;
           opencode_telegram_bot_token) loaded_telegram_bot_token="$value" ;;
           opencode_telegram_chat_id) loaded_telegram_chat_id="$value" ;;
@@ -1260,23 +1539,13 @@ PY
     SELECTED_SPECS=("${loaded_specs[@]}")
   fi
 
-  # Restore MCP integration selections so configure_*_if_needed skip interactive prompts
+  # Restore MCP integration selections so MCP config replay skips interactive prompts.
   local mcp_item
   if [[ "${#loaded_mcp_integrations[@]}" -gt 0 ]]; then
     for mcp_item in "${loaded_mcp_integrations[@]}"; do
-      case "$mcp_item" in
-        context7)
-          if [[ -z "${AGENTIC_ENABLE_CONTEXT7:-}" ]]; then
-            AGENTIC_ENABLE_CONTEXT7="y"
-          fi
-          ;;
-        mempalace)
-          if [[ -z "${AGENTIC_ENABLE_MEMPALACE:-}" ]]; then
-            AGENTIC_ENABLE_MEMPALACE="y"
-          fi
-          ;;
-      esac
+      add_selected_mcp "$mcp_item"
     done
+    sync_legacy_mcp_env_from_selected
   fi
 
   if [[ -n "$loaded_telegram_enabled" ]]; then
@@ -1289,6 +1558,9 @@ PY
     OPENCODE_AGENT_MODEL_MAPPER_ENABLED="$loaded_mapper_enabled"
     OPENCODE_PLUGINS_CONFIGURED=true
   fi
+  if [[ -n "$loaded_opencode_profile" ]]; then
+    SELECTED_OPENCODE_PROFILE="$loaded_opencode_profile"
+  fi
 }
 
 path_ref_for_shell_export() {
@@ -1367,6 +1639,7 @@ ensure_bin_dir_in_shell_path() {
 copy_dir_contents() {
   local src="$1"
   local dest="$2"
+  local skip_opencode_base_config="${3:-false}"
   ensure_dir "$dest"
   if [[ "$DRY_RUN" == true ]]; then
     log "DRY-RUN copy managed contents $src -> $dest"
@@ -1376,7 +1649,7 @@ copy_dir_contents() {
 
   local event kind value events_file
   events_file="$(mktemp "${TMPDIR:-/tmp}/agentic-copy-events.XXXXXX")"
-  python3 - "$src" "$dest" "$REPO_ROOT" "$PROJECT_DIR" "$(project_manifest_path)" "$APP_REPO_LINK" "$(app_version_label)" > "$events_file" <<'PY'
+  python3 - "$src" "$dest" "$REPO_ROOT" "$PROJECT_DIR" "$(project_manifest_path)" "$APP_REPO_LINK" "$(app_version_label)" "$skip_opencode_base_config" > "$events_file" <<'PY'
 import hashlib
 import json
 import re
@@ -1390,6 +1663,7 @@ project_dir = Path(sys.argv[4])
 manifest = Path(sys.argv[5])
 repo = sys.argv[6]
 version = sys.argv[7]
+skip_opencode_base_config = sys.argv[8].lower() == "true"
 
 
 def emit(kind: str, value: str) -> None:
@@ -1495,6 +1769,12 @@ def add_marker(file_path: Path, target: Path, source_ref: str) -> str:
 emit("DIR", str(dest_root))
 for file_path in sorted(p for p in src.rglob("*") if p.is_file()):
     rel = file_path.relative_to(src)
+    if str(src).endswith("/extensions/opencode") and rel.parts and rel.parts[0] == "profiles":
+        continue
+    if str(src).endswith("/extensions/opencode") and skip_opencode_base_config and rel == Path("opencode.json"):
+        continue
+    if str(src).endswith("/extensions/opencode") and skip_opencode_base_config and rel == Path("plugins/telegram-notification.ts"):
+        continue
     target = dest_root / rel
     project_rel = rel_to_project(target)
     source_ref = rel_to_repo(file_path)
@@ -1727,11 +2007,192 @@ PY
   fi
 }
 
+
+detect_configured_mcps() {
+  local project_dir="$1"
+  [[ -n "$project_dir" ]] || return 0
+  python3 - "$project_dir" "$HOME" <<'PY'
+import json
+import re
+import sys
+from pathlib import Path
+project = Path(sys.argv[1]); home = Path(sys.argv[2]); found = set()
+server_to_id = {"opencode":"opencode-docs","playwright":"playwright","kubernetes":"kubernetes","youtube-transcript":"youtube-transcript","docker":"docker-mcp","MCP_DOCKER":"docker-mcp","context7":"context7","mempalace":"mempalace","anydb":"anydb"}
+json_paths = [project/"opencode.json", project/".opencode"/"opencode.json", project/".mcp.json", project/".cursor"/"mcp.json", project/".gemini"/"settings.json", project/".kilocode"/"mcp.json", home/".gemini"/"antigravity"/"mcp_config.json"]
+for path in json_paths:
+    if not path.exists(): continue
+    try: data = json.loads(path.read_text(encoding="utf-8"))
+    except Exception: continue
+    if not isinstance(data, dict): continue
+    for section in ("mcpServers", "mcp"):
+        value = data.get(section, {})
+        if isinstance(value, dict):
+            for server in value:
+                if server in server_to_id: found.add(server_to_id[server])
+config = project/".codex"/"config.toml"
+if config.exists():
+    try: text = config.read_text(encoding="utf-8")
+    except Exception: text = ""
+    for server, mcp_id in server_to_id.items():
+        if re.search(rf"(?m)^\[mcp_servers\.{re.escape(server)}\]", text): found.add(mcp_id)
+for mcp_id in sorted(found): print(mcp_id)
+PY
+}
+
+write_selected_mcp_json_config() {
+  local dest="$1"
+  local source_ref="$2"
+  local platform="$3"
+  shift 3
+  local selected_ids=("$@")
+  [[ "${#selected_ids[@]}" -gt 0 ]] || return 0
+  local selected_csv old_ifs registry_json
+  old_ifs="$IFS"; IFS=,; selected_csv="${selected_ids[*]}"; IFS="$old_ifs"
+  registry_json="$(mcp_registry_json)"
+  local body
+  body="$(python3 - "$platform" "$selected_csv" "$registry_json" <<'PY'
+import json, sys
+platform = sys.argv[1]
+selected = [x for x in sys.argv[2].split(",") if x]
+registry = json.loads(sys.argv[3])
+print('registry = ' + repr(registry))
+print('selected = ' + repr(selected))
+print('platform = ' + repr(platform))
+print(r'''
+def opencode_local(command, args=None):
+    values = [command] + list(args or [])
+    return {"type": "local", "command": values, "enabled": True}
+
+def opencode_remote(url, headers=None):
+    cfg = {"type": "remote", "url": url, "enabled": True}
+    if headers:
+        cfg["headers"] = headers
+    return cfg
+
+if platform == "opencode":
+    data.setdefault("$schema", "https://opencode.ai/config.json")
+    legacy_servers = data.pop("mcpServers", {})
+    mcp = data.setdefault("mcp", {})
+    if isinstance(legacy_servers, dict):
+        for legacy_server, legacy_cfg in legacy_servers.items():
+            if legacy_server in mcp:
+                continue
+            if not isinstance(legacy_cfg, dict):
+                continue
+            command = legacy_cfg.get("command")
+            args = legacy_cfg.get("args", [])
+            if isinstance(command, str):
+                mcp[legacy_server] = opencode_local(command, args if isinstance(args, list) else [])
+for mcp_id in selected:
+    entry = registry.get(mcp_id)
+    if not entry:
+        continue
+    server = entry["server"]
+    if platform == "opencode":
+        if mcp_id == "docker-mcp":
+            data.setdefault("mcp", {})[server] = dict(entry.get("opencode", {}))
+        elif mcp_id == "context7":
+            headers = {"CONTEXT7_API_KEY": context7_api_key} if context7_api_key else None
+            data.setdefault("mcp", {})[server] = opencode_remote(entry.get("remote", ""), headers)
+        else:
+            data.setdefault("mcp", {})[server] = opencode_local(entry["command"], entry.get("args", []))
+        continue
+    if mcp_id == "docker-mcp":
+        cfg = dict(entry.get("generic", {}))
+    else:
+        cfg = {"command": entry["command"]}
+        args = list(entry.get("args", []))
+        if args:
+            cfg["args"] = args
+        if mcp_id == "context7" and context7_api_key:
+            cfg["env"] = {"CONTEXT7_API_KEY": context7_api_key}
+    data.setdefault("mcpServers", {})[server] = cfg
+''')
+PY
+)"
+  write_json_config_file "$dest" "$source_ref" "$body"
+}
+
+write_selected_mcp_codex_config() {
+  local selected_ids=("$@")
+  [[ "${#selected_ids[@]}" -gt 0 ]] || return 0
+  local dest="$PROJECT_DIR/.codex/config.toml"
+  local selected_csv old_ifs registry_json
+  old_ifs="$IFS"; IFS=,; selected_csv="${selected_ids[*]}"; IFS="$old_ifs"
+  registry_json="$(mcp_registry_json)"
+  local body
+  body="$(python3 - "$dest" "$selected_csv" "$registry_json" "$CONTEXT7_API_KEY" <<'PY'
+import json, re, sys
+from pathlib import Path
+path = Path(sys.argv[1]); selected = [x for x in sys.argv[2].split(",") if x]; registry = json.loads(sys.argv[3]); context7_api_key = sys.argv[4]
+text = path.read_text(encoding="utf-8") if path.exists() else ""
+for mcp_id in selected:
+    entry = registry.get(mcp_id)
+    if not entry: continue
+    server = entry["server"]
+    text = re.sub(rf"(?ms)^\[mcp_servers\.{re.escape(server)}\]\n.*?(?=^\[|\Z)", "", text).strip()
+    if mcp_id == "docker-mcp": command, args = "docker", ["mcp", "gateway", "run"]
+    else: command, args = entry["command"], entry.get("args", [])
+    block = f"[mcp_servers.{server}]\ncommand = {json.dumps(command)}\n"
+    if args: block += "args = [" + ", ".join(json.dumps(a) for a in args) + "]\n"
+    if mcp_id == "context7" and context7_api_key: block += 'env = { "CONTEXT7_API_KEY" = ' + json.dumps(context7_api_key) + ' }\n'
+    text = (text.rstrip() + "\n\n" + block).strip() if text else block.strip()
+print(text.rstrip() + "\n", end="")
+PY
+)"
+  write_text_config_file "$dest" "generated:mcp-codex-config" "$body"
+}
+
+configure_selected_mcps_if_needed() {
+  sync_selected_mcps_from_env
+  sync_legacy_mcp_env_from_selected
+  [[ "${#SELECTED_MCPS[@]}" -gt 0 ]] || return 0
+  local generic_mcps=()
+  local mcp_id
+  for mcp_id in "${SELECTED_MCPS[@]}"; do
+    case "$mcp_id" in context7|mempalace) ;; *) generic_mcps+=("$mcp_id") ;; esac
+  done
+  [[ "${#generic_mcps[@]}" -gt 0 ]] || return 0
+  if selected_agent_os_contains "opencode"; then
+    write_selected_mcp_json_config "$PROJECT_DIR/opencode.json" "generated:mcp-opencode-config" "opencode" "${generic_mcps[@]}"
+    write_selected_mcp_json_config "$PROJECT_DIR/.opencode/opencode.json" "generated:mcp-opencode-legacy-config" "opencode" "${generic_mcps[@]}"
+  fi
+  if selected_agent_os_contains "codex"; then write_selected_mcp_codex_config "${generic_mcps[@]}"; fi
+  if selected_agent_os_contains "claude"; then write_selected_mcp_json_config "$PROJECT_DIR/.mcp.json" "generated:mcp-claude-config" "generic" "${generic_mcps[@]}"; fi
+  if selected_agent_os_contains "cursor"; then write_selected_mcp_json_config "$PROJECT_DIR/.cursor/mcp.json" "generated:mcp-cursor-config" "generic" "${generic_mcps[@]}"; fi
+  if selected_agent_os_contains "gemini"; then write_selected_mcp_json_config "$PROJECT_DIR/.gemini/settings.json" "generated:mcp-gemini-config" "gemini" "${generic_mcps[@]}"; fi
+  if selected_agent_os_contains "kilocode"; then write_selected_mcp_json_config "$PROJECT_DIR/.kilocode/mcp.json" "generated:mcp-kilocode-config" "generic" "${generic_mcps[@]}"; fi
+  if selected_agent_os_contains "antigravity"; then write_selected_mcp_json_config "$HOME/.gemini/antigravity/mcp_config.json" "generated:mcp-antigravity-config" "generic" "${generic_mcps[@]}"; fi
+}
+
+check_selected_mcp_runtime_prerequisites() {
+  if selected_mcp_contains "kubernetes"; then
+    if ! kubectl version >/dev/null 2>&1; then
+      warn "Kubernetes MCP selected, but 'kubectl version' did not complete successfully. Install or configure kubectl: https://kubernetes.io/docs/tasks/tools/"
+    fi
+  fi
+
+  if selected_mcp_contains "docker-mcp"; then
+    if ! docker mcp --version >/dev/null 2>&1; then
+      warn "Docker MCP selected, but 'docker mcp --version' did not complete successfully. Install Docker and Docker MCP support: https://docs.docker.com/get-started/get-docker/ and https://docs.docker.com/ai/mcp-catalog-and-toolkit/"
+    fi
+  fi
+}
+
 write_context7_opencode_config() {
   local dest="$PROJECT_DIR/opencode.json"
   local body
   body='
+legacy_servers = data.pop("mcpServers", {})
 mcp = data.setdefault("mcp", {})
+if isinstance(legacy_servers, dict):
+    for legacy_server, legacy_cfg in legacy_servers.items():
+        if legacy_server in mcp or not isinstance(legacy_cfg, dict):
+            continue
+        command = legacy_cfg.get("command")
+        args = legacy_cfg.get("args", [])
+        if isinstance(command, str):
+            mcp[legacy_server] = {"type": "local", "command": [command] + (args if isinstance(args, list) else []), "enabled": True}
 context7 = {
     "type": "remote",
     "url": "https://mcp.context7.com/mcp",
@@ -1748,7 +2209,16 @@ write_context7_opencode_legacy_config() {
   local dest="$PROJECT_DIR/.opencode/opencode.json"
   local body
   body='
+legacy_servers = data.pop("mcpServers", {})
 mcp = data.setdefault("mcp", {})
+if isinstance(legacy_servers, dict):
+    for legacy_server, legacy_cfg in legacy_servers.items():
+        if legacy_server in mcp or not isinstance(legacy_cfg, dict):
+            continue
+        command = legacy_cfg.get("command")
+        args = legacy_cfg.get("args", [])
+        if isinstance(command, str):
+            mcp[legacy_server] = {"type": "local", "command": [command] + (args if isinstance(args, list) else []), "enabled": True}
 context7 = {
     "type": "remote",
     "url": "https://mcp.context7.com/mcp",
@@ -1761,6 +2231,51 @@ mcp["context7"] = context7
   write_json_config_file "$dest" "generated:context7-opencode-legacy-config" "$body"
 }
 
+write_codex_features_config() {
+  local dest="$PROJECT_DIR/.codex/config.toml"
+  local body
+  body="$(python3 - "$dest" <<'PY'
+import re
+import sys
+from pathlib import Path
+
+path = Path(sys.argv[1])
+text = path.read_text(encoding="utf-8") if path.exists() else ""
+features_re = re.compile(r"(?ms)^(\[features\]\n)(.*?)(?=^\[|\Z)")
+
+
+def enable_memories(match):
+    header = match.group(1)
+    body = match.group(2)
+    lines = body.splitlines(keepends=True)
+    output = []
+    found = False
+    for line in lines:
+        if re.match(r"\s*memories\s*=", line):
+            output.append("memories = true" + ("\n" if line.endswith("\n") else ""))
+            found = True
+        else:
+            output.append(line)
+    if not found:
+        trailing = re.search(r"\n*\Z", body).group(0)
+        main = body[: len(body) - len(trailing)] if trailing else body
+        if main and not main.endswith("\n"):
+            main += "\n"
+        return header + main + "memories = true\n" + trailing
+    return header + "".join(output)
+
+
+if features_re.search(text):
+    print(features_re.sub(enable_memories, text, count=1), end="")
+elif text.strip():
+    print(text.rstrip() + "\n\n[features]\nmemories = true\n", end="")
+else:
+    print("[features]\nmemories = true\n", end="")
+PY
+)"
+  write_text_config_file "$dest" "generated:codex-features-config" "$body"
+}
+
 write_context7_codex_config() {
   local dest="$PROJECT_DIR/.codex/config.toml"
   local body
@@ -1900,12 +2415,98 @@ write_mempalace_opencode_config() {
   local dest="$1"
   local body
   body='
+legacy_servers = data.pop("mcpServers", {})
 mcp = data.setdefault("mcp", {})
+if isinstance(legacy_servers, dict):
+    for legacy_server, legacy_cfg in legacy_servers.items():
+        if legacy_server in mcp or not isinstance(legacy_cfg, dict):
+            continue
+        command = legacy_cfg.get("command")
+        args = legacy_cfg.get("args", [])
+        if isinstance(command, str):
+            mcp[legacy_server] = {"type": "local", "command": [command] + (args if isinstance(args, list) else []), "enabled": True}
 mcp["mempalace"] = {"type": "local", "command": ["mempalace-mcp"]}
 '
   write_json_config_file "$dest" "generated:mempalace-opencode-config" "$body"
 }
 
+configure_opencode_profile_if_needed() {
+  selected_agent_os_contains "opencode" || return 0
+
+  local profile_id="${AGENTIC_OPENCODE_PROFILE:-$SELECTED_OPENCODE_PROFILE}"
+  profile_id="$(trim "$profile_id")"
+  case "$profile_id" in
+    none|None|skip|Skip|no|No) return 0 ;;
+  esac
+  [[ -n "$profile_id" ]] || return 0
+  if ! opencode_profile_contains "$profile_id"; then
+    warn "Ignoring unknown OpenCode profile '$profile_id'"
+    return 0
+  fi
+  SELECTED_OPENCODE_PROFILE="$profile_id"
+
+  local src
+  src="$(opencode_profile_source_path "$profile_id")"
+  local dest="$PROJECT_DIR/.opencode/opencode.json"
+  if [[ ! -f "$src" ]]; then
+    warn "OpenCode profile not found: $src"
+    return 0
+  fi
+  if [[ "$DRY_RUN" == true ]]; then
+    log "DRY-RUN apply OpenCode profile $(opencode_profile_label "$profile_id") to $dest"
+    unique_append "$dest" COPIED_PATHS
+    return 0
+  fi
+  can_write_managed_file "$dest" || return 0
+  ensure_dir "$(dirname -- "$dest")"
+
+  local write_status
+  write_status="$(python3 - "$src" "$dest" <<'PY'
+import json
+import sys
+from pathlib import Path
+
+src = Path(sys.argv[1])
+dest = Path(sys.argv[2])
+profile = json.loads(src.read_text(encoding="utf-8"))
+if not isinstance(profile, dict):
+    raise SystemExit("OpenCode profile must be a JSON object")
+try:
+    data = json.loads(dest.read_text(encoding="utf-8")) if dest.exists() else {}
+except Exception:
+    data = {}
+if not isinstance(data, dict):
+    data = {}
+
+def merge(base, incoming):
+    for key, value in incoming.items():
+        if isinstance(value, dict) and isinstance(base.get(key), dict):
+            merge(base[key], value)
+        else:
+            base[key] = value
+    return base
+
+merge(data, profile)
+output = json.dumps(data, indent=2, ensure_ascii=False) + "\n"
+if dest.exists():
+    try:
+        if dest.read_text(encoding="utf-8") == output:
+            print("unchanged")
+            raise SystemExit(0)
+    except UnicodeDecodeError:
+        pass
+dest.write_text(output, encoding="utf-8")
+print("written")
+PY
+)"
+  if [[ "$write_status" == "unchanged" ]]; then
+    register_managed_file "$dest" "generated:opencode-profile-$profile_id" "config" false
+  else
+    register_managed_file "$dest" "generated:opencode-profile-$profile_id" "config"
+  fi
+  log "Applied OpenCode profile: $(opencode_profile_label "$profile_id")"
+}
+
 write_mempalace_codex_config() {
   local dest="$PROJECT_DIR/.codex/config.toml"
   local body
@@ -2526,7 +3127,19 @@ configure_opencode_plugins_if_needed() {
     return
   fi
 
-  local plugin_options=("telegram-notification" "agent-model-mapper")
+  local plugin_options=(
+    "$(opencode_plugin_label "telegram-notification")"
+    "$(opencode_plugin_label "agent-model-mapper")"
+    "$(opencode_profile_label "openai")"
+    "$(opencode_profile_label "githubcopilot")"
+  )
+  local user_profile_id
+  while IFS= read -r user_profile_id; do
+    [[ -z "$user_profile_id" ]] && continue
+    opencode_builtin_profile_contains "$user_profile_id" && continue
+    opencode_profile_contains "$user_profile_id" || continue
+    plugin_options+=("$(opencode_profile_label "$user_profile_id")")
+  done < <(opencode_user_profile_ids)
   local selected_plugins=()
   local use_fzf_plugins=false
   if fzf_available; then
@@ -2545,12 +3158,20 @@ configure_opencode_plugins_if_needed() {
 
   local enable_telegram="n" enable_agent_model_mapper="n"
   local selected_plugin
-  for selected_plugin in "${selected_plugins[@]}"; do
+  for selected_plugin in ${selected_plugins[@]+"${selected_plugins[@]}"}; do
     selected_plugin="$(trim "$selected_plugin")"
     [[ -z "$selected_plugin" ]] && continue
+    selected_plugin="$(opencode_plugin_id_from_label "$selected_plugin")"
     case "$selected_plugin" in
       telegram-notification|telegram-opencode-notifier) enable_telegram="y" ;;
       agent-model-mapper) enable_agent_model_mapper="y" ;;
+      *)
+        local selected_profile_id
+        selected_profile_id="$(opencode_profile_id_from_label "$selected_plugin")"
+        if opencode_profile_contains "$selected_profile_id"; then
+          SELECTED_OPENCODE_PROFILE="$selected_profile_id"
+        fi
+        ;;
     esac
   done
 
@@ -3045,7 +3666,17 @@ copy_extension_for_agent() {
     return
   fi
 
-  copy_dir_contents "$src" "$dest"
+  local skip_opencode_base_config=false
+  if [[ "$agent_os" == "opencode" ]]; then
+    local profile_id="${AGENTIC_OPENCODE_PROFILE:-$SELECTED_OPENCODE_PROFILE}"
+    if opencode_profile_is_none "$profile_id" \
+      && [[ "$OPENCODE_TELEGRAM_ENABLED" != "true" ]] \
+      && [[ "$OPENCODE_AGENT_MODEL_MAPPER_ENABLED" != "true" ]]; then
+      skip_opencode_base_config=true
+    fi
+  fi
+
+  copy_dir_contents "$src" "$dest" "$skip_opencode_base_config"
 }
 
 copy_extensions() {
@@ -3165,23 +3796,12 @@ append_root_agents_template() {
 generate_agents_md() {
   local project_dir="$1"
   local outputs=()
-  local needs_root=false
-  local agent_os
 
   if selected_agent_os_contains "opencode"; then
     unique_append "$project_dir/.opencode/AGENTS.md" outputs
   fi
 
-  for agent_os in "${SELECTED_AGENT_OS[@]}"; do
-    if [[ "$agent_os" != "opencode" ]]; then
-      needs_root=true
-      break
-    fi
-  done
-
-  if [[ "$needs_root" == true ]] || ! selected_agent_os_contains "opencode"; then
-    unique_append "$project_dir/AGENTS.md" outputs
-  fi
+  unique_append "$project_dir/AGENTS.md" outputs
 
   if [[ "$DRY_RUN" == true ]]; then
     local dry_run_out
@@ -3651,15 +4271,24 @@ run_install() {
   normalize_selected_agent_os
   validate_inputs
 
+  PROJECT_DIR="$(normalize_project_dir_path "$PROJECT_DIR")"
   ensure_dir "$PROJECT_DIR"
   configure_opencode_plugins_if_needed
   copy_extensions "$PROJECT_DIR"
+  configure_opencode_profile_if_needed
   configure_opencode_agent_model_mapper_if_needed
   copy_specialization_assets "$PROJECT_DIR"
   generate_agents_md "$PROJECT_DIR"
   copy_memory_md "$PROJECT_DIR"
+  if selected_agent_os_contains "codex"; then
+    write_codex_features_config
+  fi
+  sync_selected_mcps_from_env
+  sync_legacy_mcp_env_from_selected
   configure_context7_if_needed
   configure_mempalace_if_needed
+  configure_selected_mcps_if_needed
+  check_selected_mcp_runtime_prerequisites
   write_agentic_manifest "$PROJECT_DIR"
   print_report
   print_missing_agent_binary_guides
@@ -3865,10 +4494,12 @@ choose_multi_by_index() {
     unique_append "${options[$((idx - 1))]}" out
   done
 
-  printf '%s\n' "${out[@]}"
+  printf '%s\n' ${out[@]+"${out[@]}"}
 }
 
 fzf_available() {
+  [[ "${AGENTIC_DISABLE_FZF:-}" != "1" ]] || return 1
+  [[ "${AGENTIC_AGENT_MODEL_MAPPER_NO_FZF:-}" != "1" ]] || return 1
   command -v fzf >/dev/null 2>&1
 }
 
@@ -3931,11 +4562,88 @@ auto_install_fzf_windows() {
   return 1
 }
 
+add_fzf_to_path_if_installed() {
+  local candidate candidate_dir
+  for candidate in "/opt/homebrew/bin/fzf" "/usr/local/bin/fzf"; do
+    if [[ -x "$candidate" ]]; then
+      candidate_dir="$(dirname -- "$candidate")"
+      case ":$PATH:" in
+        *:"$candidate_dir":*) ;;
+        *) PATH="$candidate_dir:$PATH" ;;
+      esac
+      return 0
+    fi
+  done
+  return 1
+}
+
+fzf_install_hint() {
+  local platform
+  platform="$(detect_platform)"
+  case "$platform" in
+    macos)
+      cat <<'HINT'
+Install fzf on macOS with one of:
+  brew install fzf
+  /opt/homebrew/opt/fzf/install
+If Homebrew is not installed, install it from https://brew.sh/ first.
+HINT
+      ;;
+    linux)
+      cat <<'HINT'
+Install fzf with your package manager, for example:
+  sudo apt-get install -y fzf
+  sudo dnf install -y fzf
+HINT
+      ;;
+    windows)
+      cat <<'HINT'
+Install fzf with one of:
+  winget install --id junegunn.fzf -e
+  choco install fzf -y
+  scoop install fzf
+HINT
+      ;;
+    *)
+      echo "Install fzf from https://github.com/junegunn/fzf and re-run agentic tui."
+      ;;
+  esac
+}
+
+print_fzf_install_hint() {
+  while IFS= read -r line || [[ -n "$line" ]]; do
+    [[ -n "$line" ]] && warn "$line"
+  done < <(fzf_install_hint)
+}
+
 auto_install_fzf_macos() {
-  if command -v brew >/dev/null 2>&1; then
-    brew install fzf
+  if add_fzf_to_path_if_installed && fzf_available; then
+    return 0
+  fi
+
+  if ! command -v brew >/dev/null 2>&1; then
+    warn "Homebrew was not found; cannot auto-install fzf on macOS."
+    print_fzf_install_hint
+    return 1
+  fi
+
+  if ! brew install fzf; then
+    warn "Homebrew failed to install fzf."
+    print_fzf_install_hint
+    return 1
+  fi
+
+  if fzf_available; then
+    return 0
+  fi
+
+  if add_fzf_to_path_if_installed && fzf_available; then
+    log "Added installed fzf to PATH for this session"
     return 0
   fi
+
+  warn "fzf was installed but is not available in PATH for this shell."
+  print_fzf_install_hint
   return 1
 }
 
@@ -4052,7 +4760,7 @@ choose_multi_fzf_strict() {
   readlines picked < <(choose_multi_fzf "$prompt" "$sentinel" "${options[@]}")
 
   local item
-  for item in "${picked[@]}"; do
+  for item in ${picked[@]+"${picked[@]}"}; do
     item="$(trim "$item")"
     [[ -z "$item" || "$item" == "$sentinel" ]] && continue
     printf '%s\n' "$item"
@@ -4144,54 +4852,81 @@ run_tui() {
 
   local picked_agent_os=()
   if [[ "$use_fzf" == true ]]; then
-    readlines picked_agent_os < <(choose_multi_fzf "Select Agent OS target(s):" "${agentos_choices[@]}")
+    readlines picked_agent_os < <(choose_multi_fzf "Select Agent OS target(s):" ${agentos_choices[@]+"${agentos_choices[@]}"})
   else
     local picked_agent_os_output
-    picked_agent_os_output="$(choose_multi_by_index "Select Agent OS target(s):" "${agentos_choices[@]}")"
+    picked_agent_os_output="$(choose_multi_by_index "Select Agent OS target(s):" ${agentos_choices[@]+"${agentos_choices[@]}"})"
     readlines picked_agent_os <<< "$picked_agent_os_output"
   fi
   if [[ "${#picked_agent_os[@]}" -eq 0 ]]; then
     SELECTED_AGENT_OS=("$DEFAULT_AGENT_OS")
   else
-    SELECTED_AGENT_OS=("${picked_agent_os[@]}")
-  fi
+    SELECTED_AGENT_OS=(${picked_agent_os[@]+"${picked_agent_os[@]}"})
+  fi
+
+  local detected_mcps=()
+  readlines detected_mcps < <(detect_configured_mcps "$PROJECT_DIR" || true)
+  local mcp_options=("$MCP_NONE_OPTION")
+  local registry_mcp
+  for registry_mcp in "${MCP_REGISTRY_IDS[@]}"; do
+    local checked=false
+    local detected_mcp
+    for detected_mcp in ${detected_mcps[@]+"${detected_mcps[@]}"}; do
+      if [[ "$detected_mcp" == "$registry_mcp" ]]; then
+        checked=true
+        break
+      fi
+    done
+    mcp_options+=("$(mcp_display_row "$registry_mcp" "$checked")")
+  done
 
-  local mcp_options=("context7" "mempalace")
   local picked_mcps=()
   if [[ "$use_fzf" == true ]]; then
-    readlines picked_mcps < <(choose_multi_fzf_strict "Select optional MCP integration(s):" "${mcp_options[@]}")
+    readlines picked_mcps < <(choose_multi_fzf "Select MCP servers to enable:" ${mcp_options[@]+"${mcp_options[@]}"})
   else
     local picked_mcps_output
-    picked_mcps_output="$(choose_multi_by_index "Select optional MCP integration(s):" "<none>" "${mcp_options[@]}")"
+    picked_mcps_output="$(choose_multi_by_index "Select MCP servers to enable:" ${mcp_options[@]+"${mcp_options[@]}"})"
     readlines picked_mcps <<< "$picked_mcps_output"
   fi
 
+  SELECTED_MCPS=()
   AGENTIC_ENABLE_CONTEXT7="n"
   AGENTIC_ENABLE_MEMPALACE="n"
-  local picked_mcp
-  for picked_mcp in "${picked_mcps[@]}"; do
-    case "$picked_mcp" in
-      context7) AGENTIC_ENABLE_CONTEXT7="y" ;;
-      mempalace) AGENTIC_ENABLE_MEMPALACE="y" ;;
-    esac
-  done
+  local picked_mcp picked_mcp_id
+  if [[ "${#picked_mcps[@]}" -eq 0 && "${#detected_mcps[@]}" -gt 0 ]]; then
+    for picked_mcp_id in ${detected_mcps[@]+"${detected_mcps[@]}"}; do
+      add_selected_mcp "$picked_mcp_id"
+    done
+  else
+    for picked_mcp in ${picked_mcps[@]+"${picked_mcps[@]}"}; do
+      picked_mcp="$(trim "$picked_mcp")"
+      [[ -z "$picked_mcp" ]] && continue
+      if [[ "$picked_mcp" == "$MCP_NONE_OPTION" ]]; then
+        SELECTED_MCPS=()
+        break
+      fi
+      picked_mcp_id="$(mcp_id_from_display_row "$picked_mcp")"
+      add_selected_mcp "$picked_mcp_id"
+    done
+  fi
+  sync_legacy_mcp_env_from_selected
 
   local areas=()
   readlines areas < <(list_areas)
 
   local picked_areas=()
   if [[ "$use_fzf" == true ]]; then
-    readlines picked_areas < <(choose_multi_fzf "Select area(s):" "${areas[@]}")
+    readlines picked_areas < <(choose_multi_fzf "Select area(s):" ${areas[@]+"${areas[@]}"})
   else
     local picked_areas_output
-    picked_areas_output="$(choose_multi_by_index "Select area(s):" "${areas[@]}")"
+    picked_areas_output="$(choose_multi_by_index "Select area(s):" ${areas[@]+"${areas[@]}"})"
     readlines picked_areas <<< "$picked_areas_output"
   fi
 
   if [[ "${#picked_areas[@]}" -eq 0 ]]; then
     SELECTED_AREAS=(software)
   else
-    SELECTED_AREAS=("${picked_areas[@]}")
+    SELECTED_AREAS=(${picked_areas[@]+"${picked_areas[@]}"})
   fi
 
   SELECTED_SPECS=()
@@ -4202,10 +4937,10 @@ run_tui() {
 
     local chosen_specs=()
     if [[ "$use_fzf" == true ]]; then
-      readlines chosen_specs < <(choose_multi_fzf "Select specialization(s) for '$area':" "${specs[@]}")
+      readlines chosen_specs < <(choose_multi_fzf "Select specialization(s) for '$area':" ${specs[@]+"${specs[@]}"})
     else
       local chosen_specs_output
-      chosen_specs_output="$(choose_multi_by_index "Select specialization(s) for '$area':" "${specs[@]}")"
+      chosen_specs_output="$(choose_multi_by_index "Select specialization(s) for '$area':" ${specs[@]+"${specs[@]}"})"
       readlines chosen_specs <<< "$chosen_specs_output"
     fi
 
@@ -4215,7 +4950,7 @@ run_tui() {
     fi
 
     local spec
-    for spec in "${chosen_specs[@]}"; do
+    for spec in ${chosen_specs[@]+"${chosen_specs[@]}"}; do
       SELECTED_SPECS+=("$area.$spec")
     done
   done