own-rag-cli 0.0.6-snapshot → 0.0.7-snapshot

package/bin/postinstall.sh

@@ -123,10 +123,22 @@ PYEOF
 }
 
 ensure_codex_mcp_config() {
+    if command -v codex >/dev/null 2>&1; then
+        codex mcp remove rag-codebase >/dev/null 2>&1 || true
+        if codex mcp add rag-codebase \
+            --env "OWN_RAG_CLI_CONFIG_FILE=${OWN_RAG_CONFIG_FILE}" \
+            --env "TOKENIZERS_PARALLELISM=false" \
+            --env "MCP_FORCE_SEMANTIC_FALLBACK=true" \
+            -- "${MCP_SERVER_COMMAND}" >/dev/null 2>&1; then
+            log_info "Codex MCP configurado via codex mcp add."
+            return 0
+        fi
+        log_warn "Falha ao configurar Codex MCP via codex CLI. Tentando fallback em config.toml..."
+    fi
+
     local update_result
     if ! update_result="$(
         python3 - "${CODEX_CONFIG_FILE}" "${MCP_SERVER_COMMAND}" "${OWN_RAG_CONFIG_FILE}" <<'PYEOF'
-import re
 import sys
 from pathlib import Path
 
@@ -150,15 +162,25 @@ block = (
     'MCP_FORCE_SEMANTIC_FALLBACK = "true"\n'
 )
 
-pattern = re.compile(
-    r"(?ms)^\[mcp_servers\.rag-codebase\]\n.*?(?=^\[mcp_servers\.|^\[[^\]]+\]|$)"
-)
-
-if pattern.search(text):
-    new_text = pattern.sub(block + "\n", text, count=1)
-else:
-    suffix = "" if not text or text.endswith("\n") else "\n"
-    new_text = f"{text}{suffix}\n{block}"
+target_headers = {"[mcp_servers.rag-codebase]", "[mcp_servers.rag-codebase.env]"}
+lines = text.splitlines()
+cleaned_lines: list[str] = []
+skipping = False
+
+for line in lines:
+    stripped = line.strip()
+    is_header = stripped.startswith("[") and stripped.endswith("]")
+    if is_header and stripped in target_headers:
+        skipping = True
+        continue
+    if is_header and skipping:
+        skipping = False
+    if not skipping:
+        cleaned_lines.append(line)
+
+cleaned = "\n".join(cleaned_lines).strip()
+prefix = f"{cleaned}\n\n" if cleaned else ""
+new_text = f"{prefix}{block}\n"
 
 if new_text == text:
     print("skip:already_set")
@@ -276,18 +298,18 @@ ensure_own_rag_cli_config
 log_info "Config criada/ok: ${OWN_RAG_CONFIG_FILE}"
 
 if command -v cursor >/dev/null 2>&1 || [[ -d "${HOME}/.cursor" ]] || [[ -d "${HOME}/.config/Cursor" ]]; then
-    ensure_mcp_json_config "${CURSOR_MCP_CONFIG_1}" "Cursor"
-    ensure_mcp_json_config "${CURSOR_MCP_CONFIG_2}" "Cursor"
+    ensure_mcp_json_config "${CURSOR_MCP_CONFIG_1}" "Cursor" || true
+    ensure_mcp_json_config "${CURSOR_MCP_CONFIG_2}" "Cursor" || true
     ensure_cursor_semantic_rule_files
     ensure_cursor_force_fallback_env
 fi
 
 if command -v claude >/dev/null 2>&1 || [[ -d "${HOME}/.claude" ]] || [[ -f "${CLAUDE_CONFIG_FILE}" ]]; then
-    ensure_mcp_json_config "${CLAUDE_CONFIG_FILE}" "Claude"
+    ensure_mcp_json_config "${CLAUDE_CONFIG_FILE}" "Claude" || true
 fi
 
 if command -v codex >/dev/null 2>&1 || [[ -d "${HOME}/.codex" ]] || [[ -f "${CODEX_CONFIG_FILE}" ]]; then
-    ensure_codex_mcp_config
+    ensure_codex_mcp_config || true
 fi
 
 if [[ -f "${WRAPPER_SRC}" ]]; then

package/bin/rag-remove.sh

@@ -131,7 +131,8 @@ done
 
 python3 - <<'PY'
 import json
-import re
+import shutil
+import subprocess
 from pathlib import Path
 
 home = Path.home()
@@ -157,6 +158,23 @@ for path in config_paths:
         except Exception as exc:
             print(f"[!] Não foi possível atualizar {path}: {exc}")
 
+codex_bin = shutil.which("codex")
+if codex_bin:
+    try:
+        proc = subprocess.run(
+            [codex_bin, "mcp", "remove", "rag-codebase"],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            text=True,
+            check=False,
+        )
+        if proc.returncode == 0:
+            print("[+] MCP removido do Codex via codex mcp remove.")
+        else:
+            print(f"[!] codex mcp remove falhou (fallback para config.toml): {proc.stderr.strip()}")
+    except Exception as exc:
+        print(f"[!] Falha ao executar codex mcp remove (fallback para config.toml): {exc}")
+
 codex_toml = home / ".codex" / "config.toml"
 if codex_toml.exists():
     try:
@@ -165,13 +183,24 @@ if codex_toml.exists():
         text = ""
 
     if text:
-        # Remove bloco [mcp_servers.rag-codebase] até o próximo cabeçalho TOML.
-        pattern = re.compile(
-            r"(?ms)^\[mcp_servers\.rag-codebase\]\n.*?(?=^\[mcp_servers\.|^\[[^\]]+\]|$)"
-        )
-        new_text = pattern.sub("", text)
-        # Compacta excesso de linhas em branco para manter o arquivo limpo.
-        new_text = re.sub(r"\n{3,}", "\n\n", new_text).rstrip() + "\n"
+        target_headers = {"[mcp_servers.rag-codebase]", "[mcp_servers.rag-codebase.env]"}
+        lines = text.splitlines()
+        cleaned_lines = []
+        skipping = False
+
+        for line in lines:
+            stripped = line.strip()
+            is_header = stripped.startswith("[") and stripped.endswith("]")
+            if is_header and stripped in target_headers:
+                skipping = True
+                continue
+            if is_header and skipping:
+                skipping = False
+            if not skipping:
+                cleaned_lines.append(line)
+
+        new_text = "\n".join(cleaned_lines).strip()
+        new_text = f"{new_text}\n" if new_text else ""
         if new_text != text:
             try:
                 codex_toml.write_text(new_text, encoding="utf-8")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "own-rag-cli",
-  "version": "0.0.6-snapshot",
+  "version": "0.0.7-snapshot",
   "description": "Local RAG setup with ChromaDB + MCP server (Jina/BGE hybrid support).",
   "license": "MIT",
   "private": false,

package/rag-setup-macos.run

@@ -152,7 +152,7 @@ t() {
             mod_ms_installed) echo "Optional provider module installed" ;;
             shebang_set) echo "Shebang" ;;
             path_added) echo "Added ~/.local/bin to PATH in" ;;
-            section_mcp_cfg) echo "Optional MCP configuration (Claude/Cursor)" ;;
+            section_mcp_cfg) echo "Optional MCP configuration (Claude/Cursor/Codex)" ;;
             no_cfg_files) echo "No config files detected for automatic MCP update." ;;
             cfg_all_current) echo "MCP 'rag-codebase' already up to date in detected files. Skipping." ;;
             cfg_detected) echo "Config files pending update" ;;
@@ -244,7 +244,7 @@ t() {
             mod_ms_installed) echo "Módulo de provider opcional instalado" ;;
             shebang_set) echo "Shebang" ;;
             path_added) echo "Adicionado ~/.local/bin ao PATH em" ;;
-            section_mcp_cfg) echo "Configuração opcional de MCP (Claude/Cursor)" ;;
+            section_mcp_cfg) echo "Configuração opcional de MCP (Claude/Cursor/Codex)" ;;
             no_cfg_files) echo "Nenhum arquivo de config detectado para atualização automática do MCP." ;;
             cfg_all_current) echo "MCP 'rag-codebase' já está atualizado nos arquivos detectados. Pulando." ;;
             cfg_detected) echo "Arquivos de config pendentes de atualização" ;;
@@ -1095,8 +1095,125 @@ log_info "$(t section_mcp_cfg)"
 CLAUDE_JSON="${USER_HOME}/.claude.json"
 CURSOR_MCP_JSON_1="${USER_HOME}/.cursor/mcp.json"
 CURSOR_MCP_JSON_2="${USER_HOME}/Library/Application Support/Cursor/User/mcp.json"
+CODEX_CONFIG_TOML="${USER_HOME}/.codex/config.toml"
 MCP_VERSION="$(detect_current_mcp_version)"
 
+CODEX_APP_INSTALLED=false
+if command -v codex &>/dev/null || [[ -d "${USER_HOME}/.codex" ]]; then
+    CODEX_APP_INSTALLED=true
+fi
+
+configure_codex_mcp() {
+    if command -v codex &>/dev/null; then
+        codex mcp remove rag-codebase >/dev/null 2>&1 || true
+        if codex mcp add rag-codebase \
+            --env "OWN_RAG_CLI_CONFIG_FILE=${OWN_RAG_CONFIG_FILE}" \
+            --env "TOKENIZERS_PARALLELISM=false" \
+            --env "MCP_FORCE_SEMANTIC_FALLBACK=true" \
+            -- "${MCP_SERVER_DEST}" >/dev/null 2>&1; then
+            echo "ok:updated_rag_codebase"
+            return 0
+        fi
+    fi
+
+    python3 - "${CODEX_CONFIG_TOML}" "${MCP_SERVER_DEST}" "${OWN_RAG_CONFIG_FILE}" <<'PYEOF'
+import sys
+from pathlib import Path
+
+cfg_path = Path(sys.argv[1]).expanduser()
+mcp_server_command = sys.argv[2]
+own_rag_cli_config_file = sys.argv[3]
+
+cfg_path.parent.mkdir(parents=True, exist_ok=True)
+text = cfg_path.read_text(encoding="utf-8") if cfg_path.exists() else ""
+
+block = (
+    "[mcp_servers.rag-codebase]\n"
+    f'command = "{mcp_server_command}"\n'
+    "args = []\n\n"
+    "[mcp_servers.rag-codebase.env]\n"
+    f'OWN_RAG_CLI_CONFIG_FILE = "{own_rag_cli_config_file}"\n'
+    'TOKENIZERS_PARALLELISM = "false"\n'
+    'MCP_FORCE_SEMANTIC_FALLBACK = "true"\n'
+)
+
+target_headers = {"[mcp_servers.rag-codebase]", "[mcp_servers.rag-codebase.env]"}
+lines = text.splitlines()
+cleaned_lines = []
+skipping = False
+
+for line in lines:
+    stripped = line.strip()
+    is_header = stripped.startswith("[") and stripped.endswith("]")
+    if is_header and stripped in target_headers:
+        skipping = True
+        continue
+    if is_header and skipping:
+        skipping = False
+    if not skipping:
+        cleaned_lines.append(line)
+
+cleaned = "\n".join(cleaned_lines).strip()
+prefix = f"{cleaned}\n\n" if cleaned else ""
+new_text = f"{prefix}{block}\n"
+
+if new_text == text:
+    print("ok:already_exists")
+    raise SystemExit(0)
+
+cfg_path.write_text(new_text, encoding="utf-8")
+print("ok:updated_rag_codebase")
+PYEOF
+}
+
+check_codex_mcp_up_to_date() {
+    if command -v codex &>/dev/null && codex mcp get rag-codebase >/dev/null 2>&1; then
+        return 0
+    fi
+    if [[ ! -f "${CODEX_CONFIG_TOML}" ]]; then
+        return 1
+    fi
+    local check_result
+    check_result="$(
+        python3 - "${CODEX_CONFIG_TOML}" "${MCP_SERVER_DEST}" "${OWN_RAG_CONFIG_FILE}" <<'PYEOF'
+import sys
+from pathlib import Path
+
+cfg_path = Path(sys.argv[1]).expanduser()
+mcp_server_command = sys.argv[2]
+own_rag_cli_config_file = sys.argv[3]
+
+try:
+    text = cfg_path.read_text(encoding="utf-8")
+except Exception:
+    print("needs_update")
+    raise SystemExit(0)
+
+if text.count("[mcp_servers.rag-codebase]") != 1:
+    print("needs_update")
+    raise SystemExit(0)
+if text.count("[mcp_servers.rag-codebase.env]") != 1:
+    print("needs_update")
+    raise SystemExit(0)
+if f'command = "{mcp_server_command}"' not in text:
+    print("needs_update")
+    raise SystemExit(0)
+if f'OWN_RAG_CLI_CONFIG_FILE = "{own_rag_cli_config_file}"' not in text:
+    print("needs_update")
+    raise SystemExit(0)
+if 'TOKENIZERS_PARALLELISM = "false"' not in text:
+    print("needs_update")
+    raise SystemExit(0)
+if 'MCP_FORCE_SEMANTIC_FALLBACK = "true"' not in text:
+    print("needs_update")
+    raise SystemExit(0)
+
+print("already_up_to_date")
+PYEOF
+    )"
+    [[ "${check_result}" == "already_up_to_date" ]]
+}
+
 TARGET_CONFIGS=()
 TARGET_LABELS=()
 
@@ -1122,7 +1239,12 @@ if [[ -f "${CURSOR_MCP_JSON_2}" ]]; then
     _append_target "${CURSOR_MCP_JSON_2}" "Cursor"
 fi
 
-if [[ "${#TARGET_CONFIGS[@]}" -eq 0 ]]; then
+HAS_TARGETS=false
+if [[ "${#TARGET_CONFIGS[@]}" -gt 0 || "${CODEX_APP_INSTALLED}" == "true" ]]; then
+    HAS_TARGETS=true
+fi
+
+if [[ "${HAS_TARGETS}" != "true" ]]; then
     log_info "$(t no_cfg_files)"
 else
     PENDING_CONFIGS=()
@@ -1165,6 +1287,7 @@ desired = {
     "env": {
         "OWN_RAG_CLI_CONFIG_FILE": own_rag_cli_config_file,
         "TOKENIZERS_PARALLELISM": "false",
+        "MCP_FORCE_SEMANTIC_FALLBACK": "true",
     },
     "version": mcp_version,
 }
@@ -1194,6 +1317,11 @@ PYEOF
         fi
     done
 
+    if [[ "${CODEX_APP_INSTALLED}" == "true" ]] && ! check_codex_mcp_up_to_date; then
+        PENDING_CONFIGS+=("${CODEX_CONFIG_TOML}")
+        PENDING_LABELS+=("Codex")
+    fi
+
     if [[ "${#PENDING_CONFIGS[@]}" -eq 0 ]]; then
         log_info "$(t cfg_all_current)"
     else
@@ -1216,7 +1344,12 @@ PYEOF
                 CFG_PATH="${PENDING_CONFIGS[$i]}"
                 CFG_LABEL="${PENDING_LABELS[$i]}"
 
-                if ! RESULT=$(
+                if [[ "${CFG_LABEL}" == "Codex" ]]; then
+                    if ! RESULT="$(configure_codex_mcp)"; then
+                        log_warn "$(t cannot_update_cfg) ${CFG_LABEL} (${CFG_PATH}): ${RESULT}"
+                        continue
+                    fi
+                elif ! RESULT=$(
                     python3 - "${CFG_PATH}" "${MCP_SERVER_DEST}" "${MCP_VERSION}" "${OWN_RAG_CONFIG_FILE}" <<'PYEOF'
 import json
 import sys
@@ -1250,6 +1383,7 @@ desired = {
     "env": {
         "OWN_RAG_CLI_CONFIG_FILE": own_rag_cli_config_file,
         "TOKENIZERS_PARALLELISM": "false",
+        "MCP_FORCE_SEMANTIC_FALLBACK": "true",
     },
     "version": mcp_version,
 }

package/rag-setup.run

@@ -176,8 +176,8 @@ t() {
             mod_provider_installed) echo "Optional provider module installed:" ;;
             shebang) echo "Shebang:" ;;
             path_added) echo "Added ~/.local/bin to PATH in" ;;
-            section_mcp_cfg) echo "Optional MCP setup (Claude/Cursor)" ;;
-            no_default_cfg) echo "No default config file detected for automatic setup (Claude/Cursor)." ;;
+            section_mcp_cfg) echo "Optional MCP setup (Claude/Cursor/Codex)" ;;
+            no_default_cfg) echo "No default config file detected for automatic setup (Claude/Cursor/Codex)." ;;
             detected_cfg_files) echo "Detected files available for configuration:" ;;
             ask_apply_cfg) echo "Do you want to add/update MCP 'rag-codebase' in these files? $YES_NO_HINT " ;;
             non_interactive_cfg_skip) echo "No interactive terminal; automatic MCP setup will not be applied." ;;
@@ -288,8 +288,8 @@ t() {
             mod_provider_installed) echo "Módulo de provider opcional instalado:" ;;
             shebang) echo "Shebang:" ;;
             path_added) echo "Adicionado ~/.local/bin ao PATH em" ;;
-            section_mcp_cfg) echo "Configuração opcional de MCP (Claude/Cursor)" ;;
-            no_default_cfg) echo "Nenhum arquivo default detectado para configuração automática (Claude/Cursor)." ;;
+            section_mcp_cfg) echo "Configuração opcional de MCP (Claude/Cursor/Codex)" ;;
+            no_default_cfg) echo "Nenhum arquivo default detectado para configuração automática (Claude/Cursor/Codex)." ;;
             detected_cfg_files) echo "Arquivos detectados para possível configuração:" ;;
             ask_apply_cfg) echo "Deseja adicionar/atualizar o MCP 'rag-codebase' nesses arquivos? $YES_NO_HINT " ;;
             non_interactive_cfg_skip) echo "Sem terminal interativo; configuração automática de MCP não será aplicada." ;;
@@ -1117,24 +1117,140 @@ for RC in "${USER_HOME}/.bashrc" "${USER_HOME}/.zshrc"; do
 done
 
 # ---------------------------------------------------------------------------
-# Configuração opcional do MCP no Claude/Cursor
+# Configuração opcional do MCP no Claude/Cursor/Codex
 # ---------------------------------------------------------------------------
 log_section "$(t section_mcp_cfg)"
 
 CLAUDE_JSON="${USER_HOME}/.claude.json"
 CURSOR_MCP_JSON_1="${USER_HOME}/.cursor/mcp.json"
 CURSOR_MCP_JSON_2="${USER_HOME}/.config/Cursor/User/mcp.json"
+CODEX_CONFIG_TOML="${USER_HOME}/.codex/config.toml"
 MCP_VERSION="$(detect_current_mcp_version)"
 log_info "$(t mcp_version_detected) ${MCP_VERSION}"
 
 CLAUDE_APP_INSTALLED=false
 CURSOR_APP_INSTALLED=false
+CODEX_APP_INSTALLED=false
 if command -v claude &>/dev/null || [[ -d "${USER_HOME}/.claude" ]] || [[ -d "${USER_HOME}/.config/Claude" ]]; then
     CLAUDE_APP_INSTALLED=true
 fi
 if command -v cursor &>/dev/null || [[ -d "${USER_HOME}/.cursor" ]] || [[ -d "${USER_HOME}/.config/Cursor" ]]; then
     CURSOR_APP_INSTALLED=true
 fi
+if command -v codex &>/dev/null || [[ -d "${USER_HOME}/.codex" ]]; then
+    CODEX_APP_INSTALLED=true
+fi
+
+configure_codex_mcp() {
+    if command -v codex &>/dev/null; then
+        codex mcp remove rag-codebase >/dev/null 2>&1 || true
+        if codex mcp add rag-codebase \
+            --env "OWN_RAG_CLI_CONFIG_FILE=${OWN_RAG_CONFIG_FILE}" \
+            --env "TOKENIZERS_PARALLELISM=false" \
+            --env "MCP_FORCE_SEMANTIC_FALLBACK=true" \
+            -- "${MCP_SERVER_DEST}" >/dev/null 2>&1; then
+            echo "ok:updated_rag_codebase"
+            return 0
+        fi
+    fi
+
+    python3 - "${CODEX_CONFIG_TOML}" "${MCP_SERVER_DEST}" "${OWN_RAG_CONFIG_FILE}" <<'PYEOF'
+import sys
+from pathlib import Path
+
+cfg_path = Path(sys.argv[1]).expanduser()
+mcp_server_command = sys.argv[2]
+own_rag_cli_config_file = sys.argv[3]
+
+cfg_path.parent.mkdir(parents=True, exist_ok=True)
+text = cfg_path.read_text(encoding="utf-8") if cfg_path.exists() else ""
+
+block = (
+    "[mcp_servers.rag-codebase]\n"
+    f'command = "{mcp_server_command}"\n'
+    "args = []\n\n"
+    "[mcp_servers.rag-codebase.env]\n"
+    f'OWN_RAG_CLI_CONFIG_FILE = "{own_rag_cli_config_file}"\n'
+    'TOKENIZERS_PARALLELISM = "false"\n'
+    'MCP_FORCE_SEMANTIC_FALLBACK = "true"\n'
+)
+
+target_headers = {"[mcp_servers.rag-codebase]", "[mcp_servers.rag-codebase.env]"}
+lines = text.splitlines()
+cleaned_lines = []
+skipping = False
+
+for line in lines:
+    stripped = line.strip()
+    is_header = stripped.startswith("[") and stripped.endswith("]")
+    if is_header and stripped in target_headers:
+        skipping = True
+        continue
+    if is_header and skipping:
+        skipping = False
+    if not skipping:
+        cleaned_lines.append(line)
+
+cleaned = "\n".join(cleaned_lines).strip()
+prefix = f"{cleaned}\n\n" if cleaned else ""
+new_text = f"{prefix}{block}\n"
+
+if new_text == text:
+    print("ok:already_exists")
+    raise SystemExit(0)
+
+cfg_path.write_text(new_text, encoding="utf-8")
+print("ok:updated_rag_codebase")
+PYEOF
+}
+
+check_codex_mcp_up_to_date() {
+    if command -v codex &>/dev/null && codex mcp get rag-codebase >/dev/null 2>&1; then
+        return 0
+    fi
+    if [[ ! -f "${CODEX_CONFIG_TOML}" ]]; then
+        return 1
+    fi
+    local check_result
+    check_result="$(
+        python3 - "${CODEX_CONFIG_TOML}" "${MCP_SERVER_DEST}" "${OWN_RAG_CONFIG_FILE}" <<'PYEOF'
+import sys
+from pathlib import Path
+
+cfg_path = Path(sys.argv[1]).expanduser()
+mcp_server_command = sys.argv[2]
+own_rag_cli_config_file = sys.argv[3]
+
+try:
+    text = cfg_path.read_text(encoding="utf-8")
+except Exception:
+    print("needs_update")
+    raise SystemExit(0)
+
+if text.count("[mcp_servers.rag-codebase]") != 1:
+    print("needs_update")
+    raise SystemExit(0)
+if text.count("[mcp_servers.rag-codebase.env]") != 1:
+    print("needs_update")
+    raise SystemExit(0)
+if f'command = "{mcp_server_command}"' not in text:
+    print("needs_update")
+    raise SystemExit(0)
+if f'OWN_RAG_CLI_CONFIG_FILE = "{own_rag_cli_config_file}"' not in text:
+    print("needs_update")
+    raise SystemExit(0)
+if 'TOKENIZERS_PARALLELISM = "false"' not in text:
+    print("needs_update")
+    raise SystemExit(0)
+if 'MCP_FORCE_SEMANTIC_FALLBACK = "true"' not in text:
+    print("needs_update")
+    raise SystemExit(0)
+
+print("already_up_to_date")
+PYEOF
+    )"
+    [[ "${check_result}" == "already_up_to_date" ]]
+}
 
 TARGET_CONFIGS=()
 TARGET_LABELS=()
@@ -1161,7 +1277,12 @@ if [[ "$CURSOR_APP_INSTALLED" == "true" ]] && [[ -f "${CURSOR_MCP_JSON_2}" ]]; t
     _append_target "${CURSOR_MCP_JSON_2}" "Cursor"
 fi
 
-if [[ "${#TARGET_CONFIGS[@]}" -eq 0 ]]; then
+HAS_TARGETS=false
+if [[ "${#TARGET_CONFIGS[@]}" -gt 0 || "${CODEX_APP_INSTALLED}" == "true" ]]; then
+    HAS_TARGETS=true
+fi
+
+if [[ "${HAS_TARGETS}" != "true" ]]; then
     log_info "$(t no_default_cfg)"
 else
     PENDING_CONFIGS=()
@@ -1204,6 +1325,7 @@ desired = {
     "env": {
         "OWN_RAG_CLI_CONFIG_FILE": own_rag_cli_config_file,
         "TOKENIZERS_PARALLELISM": "false",
+        "MCP_FORCE_SEMANTIC_FALLBACK": "true",
     },
     "version": mcp_version,
 }
@@ -1233,34 +1355,45 @@ PYEOF
         fi
     done
 
+    if [[ "${CODEX_APP_INSTALLED}" == "true" ]] && ! check_codex_mcp_up_to_date; then
+        PENDING_CONFIGS+=("${CODEX_CONFIG_TOML}")
+        PENDING_LABELS+=("Codex")
+    fi
+
     if [[ "${#PENDING_CONFIGS[@]}" -eq 0 ]]; then
         log_info "$(t mcp_cfg_all_current)"
     else
-    echo ""
-    log_info "$(t detected_cfg_files)"
-    for i in "${!PENDING_CONFIGS[@]}"; do
-        echo -e "  - ${PENDING_LABELS[$i]}: ${PENDING_CONFIGS[$i]}"
-    done
-
-    APPLY_MCP_CONFIG=false
-    if [[ -t 0 ]]; then
         echo ""
-        if ask_yes_no_loop "$(t ask_apply_cfg)"; then
-            APPLY_MCP_CONFIG=true
+        log_info "$(t detected_cfg_files)"
+        for i in "${!PENDING_CONFIGS[@]}"; do
+            echo -e "  - ${PENDING_LABELS[$i]}: ${PENDING_CONFIGS[$i]}"
+        done
+
+        APPLY_MCP_CONFIG=false
+        if [[ -t 0 ]]; then
+            echo ""
+            if ask_yes_no_loop "$(t ask_apply_cfg)"; then
+                APPLY_MCP_CONFIG=true
+            else
+                APPLY_MCP_CONFIG=false
+            fi
         else
-            APPLY_MCP_CONFIG=false
+            log_info "$(t non_interactive_cfg_skip)"
         fi
-    else
-        log_info "$(t non_interactive_cfg_skip)"
-    fi
-
-    if [[ "$APPLY_MCP_CONFIG" == "true" ]]; then
-        for i in "${!PENDING_CONFIGS[@]}"; do
-            CFG_PATH="${PENDING_CONFIGS[$i]}"
-            CFG_LABEL="${PENDING_LABELS[$i]}"
 
-            if ! RESULT=$(
-                python3 - "${CFG_PATH}" "${MCP_SERVER_DEST}" "${MCP_VERSION}" "${OWN_RAG_CONFIG_FILE}" <<'PYEOF'
+        if [[ "$APPLY_MCP_CONFIG" == "true" ]]; then
+            for i in "${!PENDING_CONFIGS[@]}"; do
+                CFG_PATH="${PENDING_CONFIGS[$i]}"
+                CFG_LABEL="${PENDING_LABELS[$i]}"
+
+                if [[ "${CFG_LABEL}" == "Codex" ]]; then
+                    if ! RESULT="$(configure_codex_mcp)"; then
+                        log_warn "$(t cannot_update_cfg) ${CFG_LABEL} (${CFG_PATH}): ${RESULT}"
+                        continue
+                    fi
+                else
+                    if ! RESULT=$(
+                        python3 - "${CFG_PATH}" "${MCP_SERVER_DEST}" "${MCP_VERSION}" "${OWN_RAG_CONFIG_FILE}" <<'PYEOF'
 import json
 import sys
 from pathlib import Path
@@ -1293,6 +1426,7 @@ desired = {
     "env": {
         "OWN_RAG_CLI_CONFIG_FILE": own_rag_cli_config_file,
         "TOKENIZERS_PARALLELISM": "false",
+        "MCP_FORCE_SEMANTIC_FALLBACK": "true",
     },
     "version": mcp_version,
 }
@@ -1332,33 +1466,34 @@ data["mcpServers"] = mcp_servers
 cfg_path.write_text(json.dumps(data, ensure_ascii=False, indent=2) + "\n", encoding="utf-8")
 print("ok:added")
 PYEOF
-            ); then
-                log_warn "$(t cannot_update_cfg) ${CFG_LABEL} (${CFG_PATH}): ${RESULT}"
-                continue
-            fi
+                    ); then
+                        log_warn "$(t cannot_update_cfg) ${CFG_LABEL} (${CFG_PATH}): ${RESULT}"
+                        continue
+                    fi
+                fi
 
-            case "${RESULT}" in
-                ok:already_exists)
-                    log_info "${CFG_LABEL}: $(t already_updated)"
-                    ;;
-                ok:updated_rag_codebase)
-                    log_info "${CFG_LABEL}: $(t updated_version) ${MCP_VERSION}."
-                    ;;
-                ok:replaced_old:*)
-                    OLD_KEY="${RESULT#ok:replaced_old:}"
-                    log_info "${CFG_LABEL}: $(t replaced_old) ${MCP_VERSION})."
-                    ;;
-                ok:added)
-                    log_info "${CFG_LABEL}: $(t added_cfg) ${MCP_VERSION})."
-                    ;;
-                *)
-                    log_warn "${CFG_LABEL}: $(t unexpected_return) ${RESULT}"
-                    ;;
-            esac
-        done
-    else
-        log_info "$(t user_skipped_cfg)"
-    fi
+                case "${RESULT}" in
+                    ok:already_exists)
+                        log_info "${CFG_LABEL}: $(t already_updated)"
+                        ;;
+                    ok:updated_rag_codebase)
+                        log_info "${CFG_LABEL}: $(t updated_version) ${MCP_VERSION}."
+                        ;;
+                    ok:replaced_old:*)
+                        OLD_KEY="${RESULT#ok:replaced_old:}"
+                        log_info "${CFG_LABEL}: $(t replaced_old) ${MCP_VERSION})."
+                        ;;
+                    ok:added)
+                        log_info "${CFG_LABEL}: $(t added_cfg) ${MCP_VERSION})."
+                        ;;
+                    *)
+                        log_warn "${CFG_LABEL}: $(t unexpected_return) ${RESULT}"
+                        ;;
+                esac
+            done
+        else
+            log_info "$(t user_skipped_cfg)"
+        fi
     fi
 fi