diff --git a/src/nls/ar/lastTranslated.json b/src/nls/ar/lastTranslated.json
index 61b0783d87..6d76128e4f 100644
--- a/src/nls/ar/lastTranslated.json
+++ b/src/nls/ar/lastTranslated.json
@@ -33,6 +33,11 @@
   "AI_CHAT_CLAUDE_LOGIN_MSG": "Claude Code is installed but needs to be configured.",
   "AI_CHAT_CLAUDE_LOGIN_RESTART_NOTE": "Restart {APP_NAME} after configuration completes.",
   "AI_CHAT_CLAUDE_LOGIN_TITLE": "Setup Claude Code",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "That file did not run as {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "No file exists at that path.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "That file is not executable.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "That path contains characters that cannot be used.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "That file did not respond in time.",
   "AI_CHAT_CLI_INSTALLING": "Installing…",
   "AI_CHAT_CLI_INSTALLING_MSG": "Installing Claude Code, please wait. This may take a while...",
   "AI_CHAT_CLI_INSTALL_BTN": "Install Claude Code",
@@ -40,6 +45,12 @@
   "AI_CHAT_CLI_NEW_CONFIRM_MSG": "This will end the running Claude Code CLI session and start a fresh one. Continue?",
   "AI_CHAT_CLI_NEW_CONFIRM_TITLE": "End this CLI session?",
   "AI_CHAT_CLI_NOT_FOUND": "Claude Code Not Installed",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "The path set for {0} could not be used: {1} Enter a different path, or clear the box to detect it automatically.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Install {0}",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installation instructions",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} could not be found on this system. Install it, or enter the full path to its executable below.",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Save & Retry",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} not found",
   "AI_CHAT_CLI_RESTART_NOTE": "Restart {APP_NAME} after installation completes.",
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "This Claude Code CLI session is still running in {0} — the open project is now {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Stay on “{0}”",
@@ -48,6 +59,9 @@
   "AI_CHAT_CLI_UPSELL_OPEN_TERMINAL_BTN": "Open in Terminal",
   "AI_CHAT_CLI_UPSELL_TITLE": "Available in Phoenix Pro",
   "AI_CHAT_CLI_UPSELL_UPGRADE_BTN": "Upgrade to Pro",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "This will end the running Codex CLI session and start a fresh one. Continue?",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "This Codex CLI session is still running in {0} — the open project is now {1}.",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Running Codex inside the Phoenix AI panel is a Pro feature. You can still run the Codex CLI for free from the Terminal.",
   "AI_CHAT_CODE_COLLAPSE": "Collapse",
   "AI_CHAT_CODE_COLLAPSE_FOOTER": "Click to collapse",
   "AI_CHAT_CODE_DEFAULT_LANG": "text",
@@ -106,6 +120,7 @@
   "AI_CHAT_MODE_AUTO": "Auto",
   "AI_CHAT_MODE_CHAT": "Claude Code",
   "AI_CHAT_MODE_CLI": "Claude Code CLI",
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
   "AI_CHAT_MODE_EDIT": "AI Edit Mode",
   "AI_CHAT_MODE_FULL_AUTO": "Allow Everything",
   "AI_CHAT_MODE_INFO_AUTO": "AI uses judgment to auto-approve safe actions and asks about risky ones (Click to switch)",
@@ -113,7 +128,7 @@
   "AI_CHAT_MODE_INFO_FULL_AUTO": "AI can edit files and run commands without approval (Click to switch)",
   "AI_CHAT_MODE_INFO_PLAN": "AI will propose a plan before making changes (Click to switch)",
   "AI_CHAT_MODE_PLAN": "Plan Mode",
-  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded Claude Code CLI terminal",
+  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded CLI terminal",
   "AI_CHAT_NEW_BTN": "New",
   "AI_CHAT_NEW_SESSION_TITLE": "Start a new conversation",
   "AI_CHAT_NEW_WHILE_STREAMING_MSG": "AI is currently working on a task. Starting a new conversation will stop it. Continue?",
@@ -180,7 +195,7 @@
   "AI_CHAT_SEND_ERROR": "Failed to send message: {0}",
   "AI_CHAT_SEND_TITLE": "Send message",
   "AI_CHAT_SESSION_RESUMED": "Resumed session",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code Settings",
+  "AI_CHAT_SETTINGS_TITLE": "AI Settings",
   "AI_CHAT_SETUP_LEARN_MORE": "Learn More",
   "AI_CHAT_SETUP_NEED_HELP": "Need Help?",
   "AI_CHAT_SHOW_DIFF": "Show diff",
@@ -287,8 +302,10 @@
   "AI_SETTINGS_API_TIMEOUT_PLACEHOLDER": "Leave blank for default",
   "AI_SETTINGS_BASE_URL": "Base URL",
   "AI_SETTINGS_BASE_URL_PLACEHOLDER": "Leave blank for default",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Leave blank to detect automatically.",
   "AI_SETTINGS_CUSTOM_ENDPOINT_NOTICE": "Using custom API endpoint: {0}",
   "AI_SETTINGS_DEFAULT_PROVIDER": "Default (Local Claude Code)",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Default (Local {0})",
   "AI_SETTINGS_DELETE": "Delete",
   "AI_SETTINGS_DELETE_ACTIVE_CONFIRM": "\"{0}\" is the active provider. Deleting it will revert to the default. Continue?",
   "AI_SETTINGS_DELETE_PROVIDER": "Delete Provider",
@@ -301,6 +318,7 @@
   "AI_SETTINGS_PROVIDERS": "Providers",
   "AI_SETTINGS_PROVIDER_NAME": "Name",
   "AI_SETTINGS_PROVIDER_NAME_PLACEHOLDER": "e.g. My API Provider",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "These providers configure {0}. The API key is passed to it as {1}.",
   "AI_SETTINGS_RESET": "Reset",
   "AI_SETTINGS_SAVE": "Save",
   "AI_SETTINGS_SAVE_PROVIDER": "Save Provider",
diff --git a/src/nls/ar/strings.js b/src/nls/ar/strings.js
index d937a70704..a1113c9840 100644
--- a/src/nls/ar/strings.js
+++ b/src/nls/ar/strings.js
@@ -812,6 +812,8 @@ define({
   "LIVE_PREVIEW_LAYERS_EMPTY_PAGE_STYLES": "الصفحة فارغة. أضف عنصرًا لرؤية أنماطه.",
   "LIVE_PREVIEW_LAYERS_SHOW_SELECTED": "إظهار العنصر المحدد",
   "LIVE_PREVIEW_LAYERS_SCRUB_HINT": "اسحب للضبط، وانقر نقرًا مزدوجًا للتحرير",
+  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "خاصية",
+  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "قيمة",
   "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS": "تم إلغاء المعاينة المباشرة لأن أدوات مطوّري المتصفح كانت مفتوحة",
   "LIVE_DEV_DETACHED_TARGET_CLOSED": "تم إلغاء المعاينة المباشرة لأن الصفحة تم إغلاقها في المتصفح",
   "LIVE_DEV_NAVIGATED_AWAY": "تم إلغاء المعاينة المباشرة لأن المتصفح انتقل إلى صفحة ليست جزءًا من المشروع الحالي",
@@ -2546,7 +2548,6 @@ define({
   "AI_CHAT_MODEL_DESC_SONNET": "توازن بين السرعة والقدرة للبرمجة اليومية",
   "AI_CHAT_MODEL_DESC_HAIKU": "النموذج الأسرع للمهام السريعة والبسيطة",
   "AI_CHAT_MODEL_SELECT_TITLE": "اختر نموذج الذكاء الاصطناعي لهذه المحادثة",
-  "AI_CHAT_MODE_SELECT_TITLE": "التبديل بين دردشة Claude Code وطرفية Claude Code CLI مدمجة",
   "AI_CHAT_MODEL_SWITCHED_NOTICE": "تم التبديل إلى {0}. يُطبّق هذا بدءًا من رسالتك التالية؛ قد تستغرق الاستجابة الأولى وقتًا أطول قليلًا أثناء إعادة بناء ذاكرة التخزين المؤقت.",
   "AI_CHAT_INPUT_HINT": "اضغط على {0} للإرسال · {1} لسطر جديد",
   "AI_CHAT_BASH_CONFIRM_TITLE": "السماح بالأمر؟",
@@ -2618,7 +2619,6 @@ define({
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "لا تزال جلسة Claude Code CLI هذه قيد التشغيل في {0} — المشروع المفتوح الآن هو {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_SWITCH_BTN": "التبديل إلى ”{0}“",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "البقاء في ”{0}“",
-  "AI_CHAT_SETTINGS_TITLE": "إعدادات Claude Code",
   "AI_SETTINGS_API_KEY": "مفتاح API",
   "AI_SETTINGS_BASE_URL": "عنوان URL الأساسي",
   "AI_SETTINGS_API_TIMEOUT": "مهلة API (مللي ثانية)",
@@ -2762,6 +2762,24 @@ define({
   "MIGRATE_UNREACHABLE_TITLE": "تعذر الوصول إلى الموقع القديم",
   "MIGRATE_UNREACHABLE_MESSAGE": "لم يتمكن {APP_NAME} من الاتصال بـ {0} للبحث عن مشاريعك وإعداداتك، لذا لم يتم تغيير أي شيء. تحقق من اتصالك بالإنترنت، ثم حاول مرة أخرى باستخدام {1}.",
   "CMD_MIGRATE_DATA": "ترحيل بياناتي من {0}…",
-  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "خاصية",
-  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "قيمة"
+  "AI_CHAT_MODE_CODEX_CLI": "سطر أوامر Codex",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "لم يتم العثور على {0}",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "تعذر العثور على {0} على هذا النظام. قم بتثبيته، أو أدخل المسار الكامل لملفه التنفيذي أدناه.",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "تعذر استخدام المسار المحدد لـ {0}: {1}. أدخل مسارًا مختلفًا، أو امسح المربع لاكتشافه تلقائيًا.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "تثبيت {0}",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "حفظ وإعادة المحاولة",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "تعليمات التثبيت",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "لا يوجد ملف في ذلك المسار.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "هذا الملف غير قابل للتنفيذ.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "لم يتم تشغيل هذا الملف كـ {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "لم يستجب ذلك الملف في الوقت المحدد.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "يحتوي ذلك المسار على أحرف لا يمكن استخدامها.",
+  "AI_CHAT_MODE_SELECT_TITLE": "التبديل بين محادثة Claude Code وطرفية CLI مدمجة",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "سيؤدي هذا إلى إنهاء جلسة Codex CLI قيد التشغيل وبدء جلسة جديدة. هل تريد المتابعة؟",
+  "AI_CHAT_CODEX_UPSELL_MSG": "تشغيل Codex داخل لوحة Phoenix AI هي ميزة Pro. لا يزال بإمكانك تشغيل Codex CLI مجانًا من الطرفية.",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "جلسة Codex CLI هذه لا تزال قيد التشغيل في {0} — المشروع المفتوح الآن هو {1}.",
+  "AI_CHAT_SETTINGS_TITLE": "إعدادات الذكاء الاصطناعي",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "افتراضي (محلي {0})",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "تُكوِّن جهات التوفير هذه {0}. يتم تمرير مفتاح API إليه كـ {1}.",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "اتركه فارغًا للكشف التلقائي."
 });
\ No newline at end of file
diff --git a/src/nls/bg/lastTranslated.json b/src/nls/bg/lastTranslated.json
index 61b0783d87..9fb162a6f3 100644
--- a/src/nls/bg/lastTranslated.json
+++ b/src/nls/bg/lastTranslated.json
@@ -33,6 +33,11 @@
   "AI_CHAT_CLAUDE_LOGIN_MSG": "Claude Code is installed but needs to be configured.",
   "AI_CHAT_CLAUDE_LOGIN_RESTART_NOTE": "Restart {APP_NAME} after configuration completes.",
   "AI_CHAT_CLAUDE_LOGIN_TITLE": "Setup Claude Code",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "That file did not run as {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "No file exists at that path.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "That file is not executable.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "That path contains characters that cannot be used.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "That file did not respond in time.",
   "AI_CHAT_CLI_INSTALLING": "Installing…",
   "AI_CHAT_CLI_INSTALLING_MSG": "Installing Claude Code, please wait. This may take a while...",
   "AI_CHAT_CLI_INSTALL_BTN": "Install Claude Code",
@@ -40,6 +45,12 @@
   "AI_CHAT_CLI_NEW_CONFIRM_MSG": "This will end the running Claude Code CLI session and start a fresh one. Continue?",
   "AI_CHAT_CLI_NEW_CONFIRM_TITLE": "End this CLI session?",
   "AI_CHAT_CLI_NOT_FOUND": "Claude Code Not Installed",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "The path set for {0} could not be used: {1} Enter a different path, or clear the box to detect it automatically.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Install {0}",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installation instructions",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} could not be found on this system. Install it, or enter the full path to its executable below.",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Save & Retry",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} not found",
   "AI_CHAT_CLI_RESTART_NOTE": "Restart {APP_NAME} after installation completes.",
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "This Claude Code CLI session is still running in {0} — the open project is now {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Stay on “{0}”",
@@ -48,6 +59,9 @@
   "AI_CHAT_CLI_UPSELL_OPEN_TERMINAL_BTN": "Open in Terminal",
   "AI_CHAT_CLI_UPSELL_TITLE": "Available in Phoenix Pro",
   "AI_CHAT_CLI_UPSELL_UPGRADE_BTN": "Upgrade to Pro",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "This will end the running Codex CLI session and start a fresh one. Continue?",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "This Codex CLI session is still running in {0} — the open project is now {1}.",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Running Codex inside the Phoenix AI panel is a Pro feature. You can still run the Codex CLI for free from the Terminal.",
   "AI_CHAT_CODE_COLLAPSE": "Collapse",
   "AI_CHAT_CODE_COLLAPSE_FOOTER": "Click to collapse",
   "AI_CHAT_CODE_DEFAULT_LANG": "text",
@@ -106,6 +120,7 @@
   "AI_CHAT_MODE_AUTO": "Auto",
   "AI_CHAT_MODE_CHAT": "Claude Code",
   "AI_CHAT_MODE_CLI": "Claude Code CLI",
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
   "AI_CHAT_MODE_EDIT": "AI Edit Mode",
   "AI_CHAT_MODE_FULL_AUTO": "Allow Everything",
   "AI_CHAT_MODE_INFO_AUTO": "AI uses judgment to auto-approve safe actions and asks about risky ones (Click to switch)",
@@ -113,7 +128,7 @@
   "AI_CHAT_MODE_INFO_FULL_AUTO": "AI can edit files and run commands without approval (Click to switch)",
   "AI_CHAT_MODE_INFO_PLAN": "AI will propose a plan before making changes (Click to switch)",
   "AI_CHAT_MODE_PLAN": "Plan Mode",
-  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded Claude Code CLI terminal",
+  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded CLI terminal",
   "AI_CHAT_NEW_BTN": "New",
   "AI_CHAT_NEW_SESSION_TITLE": "Start a new conversation",
   "AI_CHAT_NEW_WHILE_STREAMING_MSG": "AI is currently working on a task. Starting a new conversation will stop it. Continue?",
@@ -180,7 +195,7 @@
   "AI_CHAT_SEND_ERROR": "Failed to send message: {0}",
   "AI_CHAT_SEND_TITLE": "Send message",
   "AI_CHAT_SESSION_RESUMED": "Resumed session",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code Settings",
+  "AI_CHAT_SETTINGS_TITLE": "AI Settings",
   "AI_CHAT_SETUP_LEARN_MORE": "Learn More",
   "AI_CHAT_SETUP_NEED_HELP": "Need Help?",
   "AI_CHAT_SHOW_DIFF": "Show diff",
@@ -287,8 +302,11 @@
   "AI_SETTINGS_API_TIMEOUT_PLACEHOLDER": "Leave blank for default",
   "AI_SETTINGS_BASE_URL": "Base URL",
   "AI_SETTINGS_BASE_URL_PLACEHOLDER": "Leave blank for default",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Leave blank to detect automatically.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Path to the {0} executable",
   "AI_SETTINGS_CUSTOM_ENDPOINT_NOTICE": "Using custom API endpoint: {0}",
   "AI_SETTINGS_DEFAULT_PROVIDER": "Default (Local Claude Code)",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Default (Local {0})",
   "AI_SETTINGS_DELETE": "Delete",
   "AI_SETTINGS_DELETE_ACTIVE_CONFIRM": "\"{0}\" is the active provider. Deleting it will revert to the default. Continue?",
   "AI_SETTINGS_DELETE_PROVIDER": "Delete Provider",
@@ -301,6 +319,7 @@
   "AI_SETTINGS_PROVIDERS": "Providers",
   "AI_SETTINGS_PROVIDER_NAME": "Name",
   "AI_SETTINGS_PROVIDER_NAME_PLACEHOLDER": "e.g. My API Provider",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "These providers configure {0}. The API key is passed to it as {1}.",
   "AI_SETTINGS_RESET": "Reset",
   "AI_SETTINGS_SAVE": "Save",
   "AI_SETTINGS_SAVE_PROVIDER": "Save Provider",
diff --git a/src/nls/bg/strings.js b/src/nls/bg/strings.js
index c3b104d278..2142a014f4 100644
--- a/src/nls/bg/strings.js
+++ b/src/nls/bg/strings.js
@@ -812,6 +812,8 @@ define({
   "LIVE_PREVIEW_LAYERS_EMPTY_PAGE_STYLES": "Страницата е празна. Добавете елемент, за да видите стиловете му.",
   "LIVE_PREVIEW_LAYERS_SHOW_SELECTED": "Показване на избрания елемент",
   "LIVE_PREVIEW_LAYERS_SCRUB_HINT": "Плъзнете за настройка, щракнете двукратно за редакция",
+  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "свойство",
+  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "стойност",
   "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS": "Прегледът на живо беше прекъснат, тъй като бяха отворени инструментите за разработчици на браузъра.",
   "LIVE_DEV_DETACHED_TARGET_CLOSED": "Прегледът на живо беше прекъснат, тъй като страницата в браузъра беше затворена.",
   "LIVE_DEV_NAVIGATED_AWAY": "Прегледът на живо беше прекъснат, тъй като бръузърът премина към страница, която не е част от текущия проект.",
@@ -2546,7 +2548,6 @@ define({
   "AI_CHAT_MODEL_DESC_SONNET": "Балансирана скорост и възможности за ежедневно програмиране",
   "AI_CHAT_MODEL_DESC_HAIKU": "Най-бързият модел за бързи, прости задачи",
   "AI_CHAT_MODEL_SELECT_TITLE": "Изберете AI модел за този чат",
-  "AI_CHAT_MODE_SELECT_TITLE": "Превключване между чата на Claude Code и вграден терминал на Claude Code CLI",
   "AI_CHAT_MODEL_SWITCHED_NOTICE": "Преминахте към {0}. Прилага се от следващото ви съобщение; първият отговор може да отнеме малко повече време, докато кешът се преизгради.",
   "AI_CHAT_INPUT_HINT": "Натиснете {0} за изпращане · {1} за нов ред",
   "AI_CHAT_BASH_CONFIRM_TITLE": "Да се разреши ли командата?",
@@ -2618,7 +2619,6 @@ define({
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "Тази сесия на Claude Code CLI все още работи в {0} — отвореният проект вече е {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_SWITCH_BTN": "Превключване към „{0}“",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Оставане в „{0}“",
-  "AI_CHAT_SETTINGS_TITLE": "Настройки на Claude Code",
   "AI_SETTINGS_API_KEY": "API ключ",
   "AI_SETTINGS_BASE_URL": "Базов URL",
   "AI_SETTINGS_API_TIMEOUT": "Време за изчакване на API (мс)",
@@ -2762,6 +2762,25 @@ define({
   "MIGRATE_UNREACHABLE_TITLE": "Не може да се осъществи връзка със стария сайт",
   "MIGRATE_UNREACHABLE_MESSAGE": "{APP_NAME} не можа да се свърже с {0}, за да потърси Вашите проекти и настройки, така че нищо не е променено. Проверете интернет връзката си, след това опитайте отново с {1}.",
   "CMD_MIGRATE_DATA": "Мигриране на данните ми от {0}…",
-  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "свойство",
-  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "стойност"
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} не е намерен",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} не беше открит в тази система. Инсталирайте го или въведете пълния път до изпълнимия му файл по-долу.",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "Зададеният път за {0} не може да бъде използван: {1} Въведете друг път или изчистете полето за автоматично откриване.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Инсталирайте {0}",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Запазете и опитайте отново",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Инструкции за инсталиране",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "На посочения път не съществува файл.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "Този файл не е изпълним.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "Този файл не се изпълни като {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "Файлът не отговори навреме.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "Пътят съдържа символи, които не могат да бъдат използвани.",
+  "AI_CHAT_MODE_SELECT_TITLE": "Превключване между чата на Claude Code и вграден CLI терминал",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "Това ще прекрати текущата Codex CLI сесия и ще стартира нова. Да продължите ли?",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Използването на Codex в AI панела на Phoenix е Pro функция. Все още можете да използвате Codex CLI безплатно от Терминала.",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "Тази Codex CLI сесия все още работи в {0} — отвореният проект вече е {1}.",
+  "AI_CHAT_SETTINGS_TITLE": "Настройки на AI",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "По подразбиране (Локален {0})",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "Тези доставчици конфигурират {0}. API ключът се предава към него като {1}.",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Оставете празно за автоматично откриване.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Път до изпълнимия файл на {0}"
 });
\ No newline at end of file
diff --git a/src/nls/cs/lastTranslated.json b/src/nls/cs/lastTranslated.json
index 61b0783d87..9fb162a6f3 100644
--- a/src/nls/cs/lastTranslated.json
+++ b/src/nls/cs/lastTranslated.json
@@ -33,6 +33,11 @@
   "AI_CHAT_CLAUDE_LOGIN_MSG": "Claude Code is installed but needs to be configured.",
   "AI_CHAT_CLAUDE_LOGIN_RESTART_NOTE": "Restart {APP_NAME} after configuration completes.",
   "AI_CHAT_CLAUDE_LOGIN_TITLE": "Setup Claude Code",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "That file did not run as {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "No file exists at that path.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "That file is not executable.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "That path contains characters that cannot be used.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "That file did not respond in time.",
   "AI_CHAT_CLI_INSTALLING": "Installing…",
   "AI_CHAT_CLI_INSTALLING_MSG": "Installing Claude Code, please wait. This may take a while...",
   "AI_CHAT_CLI_INSTALL_BTN": "Install Claude Code",
@@ -40,6 +45,12 @@
   "AI_CHAT_CLI_NEW_CONFIRM_MSG": "This will end the running Claude Code CLI session and start a fresh one. Continue?",
   "AI_CHAT_CLI_NEW_CONFIRM_TITLE": "End this CLI session?",
   "AI_CHAT_CLI_NOT_FOUND": "Claude Code Not Installed",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "The path set for {0} could not be used: {1} Enter a different path, or clear the box to detect it automatically.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Install {0}",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installation instructions",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} could not be found on this system. Install it, or enter the full path to its executable below.",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Save & Retry",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} not found",
   "AI_CHAT_CLI_RESTART_NOTE": "Restart {APP_NAME} after installation completes.",
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "This Claude Code CLI session is still running in {0} — the open project is now {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Stay on “{0}”",
@@ -48,6 +59,9 @@
   "AI_CHAT_CLI_UPSELL_OPEN_TERMINAL_BTN": "Open in Terminal",
   "AI_CHAT_CLI_UPSELL_TITLE": "Available in Phoenix Pro",
   "AI_CHAT_CLI_UPSELL_UPGRADE_BTN": "Upgrade to Pro",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "This will end the running Codex CLI session and start a fresh one. Continue?",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "This Codex CLI session is still running in {0} — the open project is now {1}.",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Running Codex inside the Phoenix AI panel is a Pro feature. You can still run the Codex CLI for free from the Terminal.",
   "AI_CHAT_CODE_COLLAPSE": "Collapse",
   "AI_CHAT_CODE_COLLAPSE_FOOTER": "Click to collapse",
   "AI_CHAT_CODE_DEFAULT_LANG": "text",
@@ -106,6 +120,7 @@
   "AI_CHAT_MODE_AUTO": "Auto",
   "AI_CHAT_MODE_CHAT": "Claude Code",
   "AI_CHAT_MODE_CLI": "Claude Code CLI",
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
   "AI_CHAT_MODE_EDIT": "AI Edit Mode",
   "AI_CHAT_MODE_FULL_AUTO": "Allow Everything",
   "AI_CHAT_MODE_INFO_AUTO": "AI uses judgment to auto-approve safe actions and asks about risky ones (Click to switch)",
@@ -113,7 +128,7 @@
   "AI_CHAT_MODE_INFO_FULL_AUTO": "AI can edit files and run commands without approval (Click to switch)",
   "AI_CHAT_MODE_INFO_PLAN": "AI will propose a plan before making changes (Click to switch)",
   "AI_CHAT_MODE_PLAN": "Plan Mode",
-  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded Claude Code CLI terminal",
+  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded CLI terminal",
   "AI_CHAT_NEW_BTN": "New",
   "AI_CHAT_NEW_SESSION_TITLE": "Start a new conversation",
   "AI_CHAT_NEW_WHILE_STREAMING_MSG": "AI is currently working on a task. Starting a new conversation will stop it. Continue?",
@@ -180,7 +195,7 @@
   "AI_CHAT_SEND_ERROR": "Failed to send message: {0}",
   "AI_CHAT_SEND_TITLE": "Send message",
   "AI_CHAT_SESSION_RESUMED": "Resumed session",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code Settings",
+  "AI_CHAT_SETTINGS_TITLE": "AI Settings",
   "AI_CHAT_SETUP_LEARN_MORE": "Learn More",
   "AI_CHAT_SETUP_NEED_HELP": "Need Help?",
   "AI_CHAT_SHOW_DIFF": "Show diff",
@@ -287,8 +302,11 @@
   "AI_SETTINGS_API_TIMEOUT_PLACEHOLDER": "Leave blank for default",
   "AI_SETTINGS_BASE_URL": "Base URL",
   "AI_SETTINGS_BASE_URL_PLACEHOLDER": "Leave blank for default",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Leave blank to detect automatically.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Path to the {0} executable",
   "AI_SETTINGS_CUSTOM_ENDPOINT_NOTICE": "Using custom API endpoint: {0}",
   "AI_SETTINGS_DEFAULT_PROVIDER": "Default (Local Claude Code)",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Default (Local {0})",
   "AI_SETTINGS_DELETE": "Delete",
   "AI_SETTINGS_DELETE_ACTIVE_CONFIRM": "\"{0}\" is the active provider. Deleting it will revert to the default. Continue?",
   "AI_SETTINGS_DELETE_PROVIDER": "Delete Provider",
@@ -301,6 +319,7 @@
   "AI_SETTINGS_PROVIDERS": "Providers",
   "AI_SETTINGS_PROVIDER_NAME": "Name",
   "AI_SETTINGS_PROVIDER_NAME_PLACEHOLDER": "e.g. My API Provider",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "These providers configure {0}. The API key is passed to it as {1}.",
   "AI_SETTINGS_RESET": "Reset",
   "AI_SETTINGS_SAVE": "Save",
   "AI_SETTINGS_SAVE_PROVIDER": "Save Provider",
diff --git a/src/nls/cs/strings.js b/src/nls/cs/strings.js
index 54dcc8c093..c249973b27 100644
--- a/src/nls/cs/strings.js
+++ b/src/nls/cs/strings.js
@@ -812,6 +812,8 @@ define({
   "LIVE_PREVIEW_LAYERS_EMPTY_PAGE_STYLES": "Stránka je prázdná. Přidejte prvek, abyste viděli jeho styly.",
   "LIVE_PREVIEW_LAYERS_SHOW_SELECTED": "Zobrazit vybraný prvek",
   "LIVE_PREVIEW_LAYERS_SCRUB_HINT": "Táhněte pro úpravu, poklepejte pro editaci",
+  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "vlastnost",
+  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "hodnota",
   "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS": "Živý náhled byl zrušen, protože byly otevřeny vývojářské nástroje prohlížeče",
   "LIVE_DEV_DETACHED_TARGET_CLOSED": "Živý náhled byl zrušen, protože dokument byl zavřen v prohlížeči",
   "LIVE_DEV_NAVIGATED_AWAY": "Živý náhled byl zrušen, protože prohlížeč přešel na stránku, která není součástí projektu",
@@ -2546,7 +2548,6 @@ define({
   "AI_CHAT_MODEL_DESC_SONNET": "Vyvážená rychlost a schopnosti pro každodenní kódování",
   "AI_CHAT_MODEL_DESC_HAIKU": "Nejrychlejší model pro rychlé a jednoduché úkoly",
   "AI_CHAT_MODEL_SELECT_TITLE": "Vyberte model AI pro tento chat",
-  "AI_CHAT_MODE_SELECT_TITLE": "Přepnout mezi chatem Claude Code a vestavěným terminálem Claude Code CLI",
   "AI_CHAT_MODEL_SWITCHED_NOTICE": "Přepnuto na {0}. Platí od vaší další zprávy; první odpověď může trvat o chvíli déle, zatímco se znovu sestavuje mezipaměť.",
   "AI_CHAT_INPUT_HINT": "Stiskněte {0} pro odeslání · {1} pro nový řádek",
   "AI_CHAT_BASH_CONFIRM_TITLE": "Povolit příkaz?",
@@ -2618,7 +2619,6 @@ define({
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "Tato relace Claude Code CLI stále běží v {0} – otevřený projekt je nyní {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_SWITCH_BTN": "Přepnout na „{0}“",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Zůstat u „{0}“",
-  "AI_CHAT_SETTINGS_TITLE": "Nastavení Claude Code",
   "AI_SETTINGS_API_KEY": "Klíč API",
   "AI_SETTINGS_BASE_URL": "Základní URL",
   "AI_SETTINGS_API_TIMEOUT": "Časový limit API (ms)",
@@ -2762,6 +2762,25 @@ define({
   "MIGRATE_UNREACHABLE_TITLE": "Nepodařilo se připojit k původnímu webu",
   "MIGRATE_UNREACHABLE_MESSAGE": "Aplikaci {APP_NAME} se nepodařilo připojit k {0} a vyhledat vaše projekty a nastavení, takže se nic nezměnilo. Zkontrolujte své připojení k internetu a zkuste to znovu pomocí {1}.",
   "CMD_MIGRATE_DATA": "Přenést moje data z {0}…",
-  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "vlastnost",
-  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "hodnota"
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} nenalezeno",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "Nástroj {0} se v tomto systému nepodařilo najít. Nainstalujte jej, nebo níže zadejte úplnou cestu k jeho spustitelnému souboru.",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "Zadanou cestu pro {0} nelze použít: {1} Zadejte jinou cestu, nebo vymažte pole pro automatickou detekci.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Nainstalovat {0}",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Uložit a zkusit znovu",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Pokyny k instalaci",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "Soubor na zadané cestě neexistuje.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "Tento soubor není spustitelný.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "Tento soubor se nepodařilo spustit jako {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "Soubor neodpověděl včas.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "Cesta obsahuje nepovolené znaky.",
+  "AI_CHAT_MODE_SELECT_TITLE": "Přepnout mezi chatem Claude Code a vloženým terminálem CLI",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "Tímto se ukončí běžící relace Codex CLI a spustí se nová. Pokračovat?",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Spouštění Codexu v panelu Phoenix AI je funkce verze Pro. Codex CLI můžete stále zdarma spouštět z Terminálu.",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "Tato relace Codex CLI stále běží v {0} — otevřený projekt je nyní {1}.",
+  "AI_CHAT_SETTINGS_TITLE": "Nastavení AI",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Výchozí (místní {0})",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "Tito poskytovatelé konfigurují {0}. Klíč API se mu předává jako {1}.",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Ponechte prázdné pro automatickou detekci.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Cesta ke spustitelnému souboru {0}"
 });
\ No newline at end of file
diff --git a/src/nls/da/lastTranslated.json b/src/nls/da/lastTranslated.json
index 61b0783d87..9fb162a6f3 100644
--- a/src/nls/da/lastTranslated.json
+++ b/src/nls/da/lastTranslated.json
@@ -33,6 +33,11 @@
   "AI_CHAT_CLAUDE_LOGIN_MSG": "Claude Code is installed but needs to be configured.",
   "AI_CHAT_CLAUDE_LOGIN_RESTART_NOTE": "Restart {APP_NAME} after configuration completes.",
   "AI_CHAT_CLAUDE_LOGIN_TITLE": "Setup Claude Code",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "That file did not run as {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "No file exists at that path.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "That file is not executable.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "That path contains characters that cannot be used.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "That file did not respond in time.",
   "AI_CHAT_CLI_INSTALLING": "Installing…",
   "AI_CHAT_CLI_INSTALLING_MSG": "Installing Claude Code, please wait. This may take a while...",
   "AI_CHAT_CLI_INSTALL_BTN": "Install Claude Code",
@@ -40,6 +45,12 @@
   "AI_CHAT_CLI_NEW_CONFIRM_MSG": "This will end the running Claude Code CLI session and start a fresh one. Continue?",
   "AI_CHAT_CLI_NEW_CONFIRM_TITLE": "End this CLI session?",
   "AI_CHAT_CLI_NOT_FOUND": "Claude Code Not Installed",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "The path set for {0} could not be used: {1} Enter a different path, or clear the box to detect it automatically.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Install {0}",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installation instructions",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} could not be found on this system. Install it, or enter the full path to its executable below.",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Save & Retry",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} not found",
   "AI_CHAT_CLI_RESTART_NOTE": "Restart {APP_NAME} after installation completes.",
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "This Claude Code CLI session is still running in {0} — the open project is now {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Stay on “{0}”",
@@ -48,6 +59,9 @@
   "AI_CHAT_CLI_UPSELL_OPEN_TERMINAL_BTN": "Open in Terminal",
   "AI_CHAT_CLI_UPSELL_TITLE": "Available in Phoenix Pro",
   "AI_CHAT_CLI_UPSELL_UPGRADE_BTN": "Upgrade to Pro",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "This will end the running Codex CLI session and start a fresh one. Continue?",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "This Codex CLI session is still running in {0} — the open project is now {1}.",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Running Codex inside the Phoenix AI panel is a Pro feature. You can still run the Codex CLI for free from the Terminal.",
   "AI_CHAT_CODE_COLLAPSE": "Collapse",
   "AI_CHAT_CODE_COLLAPSE_FOOTER": "Click to collapse",
   "AI_CHAT_CODE_DEFAULT_LANG": "text",
@@ -106,6 +120,7 @@
   "AI_CHAT_MODE_AUTO": "Auto",
   "AI_CHAT_MODE_CHAT": "Claude Code",
   "AI_CHAT_MODE_CLI": "Claude Code CLI",
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
   "AI_CHAT_MODE_EDIT": "AI Edit Mode",
   "AI_CHAT_MODE_FULL_AUTO": "Allow Everything",
   "AI_CHAT_MODE_INFO_AUTO": "AI uses judgment to auto-approve safe actions and asks about risky ones (Click to switch)",
@@ -113,7 +128,7 @@
   "AI_CHAT_MODE_INFO_FULL_AUTO": "AI can edit files and run commands without approval (Click to switch)",
   "AI_CHAT_MODE_INFO_PLAN": "AI will propose a plan before making changes (Click to switch)",
   "AI_CHAT_MODE_PLAN": "Plan Mode",
-  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded Claude Code CLI terminal",
+  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded CLI terminal",
   "AI_CHAT_NEW_BTN": "New",
   "AI_CHAT_NEW_SESSION_TITLE": "Start a new conversation",
   "AI_CHAT_NEW_WHILE_STREAMING_MSG": "AI is currently working on a task. Starting a new conversation will stop it. Continue?",
@@ -180,7 +195,7 @@
   "AI_CHAT_SEND_ERROR": "Failed to send message: {0}",
   "AI_CHAT_SEND_TITLE": "Send message",
   "AI_CHAT_SESSION_RESUMED": "Resumed session",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code Settings",
+  "AI_CHAT_SETTINGS_TITLE": "AI Settings",
   "AI_CHAT_SETUP_LEARN_MORE": "Learn More",
   "AI_CHAT_SETUP_NEED_HELP": "Need Help?",
   "AI_CHAT_SHOW_DIFF": "Show diff",
@@ -287,8 +302,11 @@
   "AI_SETTINGS_API_TIMEOUT_PLACEHOLDER": "Leave blank for default",
   "AI_SETTINGS_BASE_URL": "Base URL",
   "AI_SETTINGS_BASE_URL_PLACEHOLDER": "Leave blank for default",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Leave blank to detect automatically.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Path to the {0} executable",
   "AI_SETTINGS_CUSTOM_ENDPOINT_NOTICE": "Using custom API endpoint: {0}",
   "AI_SETTINGS_DEFAULT_PROVIDER": "Default (Local Claude Code)",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Default (Local {0})",
   "AI_SETTINGS_DELETE": "Delete",
   "AI_SETTINGS_DELETE_ACTIVE_CONFIRM": "\"{0}\" is the active provider. Deleting it will revert to the default. Continue?",
   "AI_SETTINGS_DELETE_PROVIDER": "Delete Provider",
@@ -301,6 +319,7 @@
   "AI_SETTINGS_PROVIDERS": "Providers",
   "AI_SETTINGS_PROVIDER_NAME": "Name",
   "AI_SETTINGS_PROVIDER_NAME_PLACEHOLDER": "e.g. My API Provider",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "These providers configure {0}. The API key is passed to it as {1}.",
   "AI_SETTINGS_RESET": "Reset",
   "AI_SETTINGS_SAVE": "Save",
   "AI_SETTINGS_SAVE_PROVIDER": "Save Provider",
diff --git a/src/nls/da/strings.js b/src/nls/da/strings.js
index 52a222e864..646d769734 100644
--- a/src/nls/da/strings.js
+++ b/src/nls/da/strings.js
@@ -812,6 +812,8 @@ define({
   "LIVE_PREVIEW_LAYERS_EMPTY_PAGE_STYLES": "Siden er tom. Tilføj et element for at se dets stilarter.",
   "LIVE_PREVIEW_LAYERS_SHOW_SELECTED": "Vis det valgte element",
   "LIVE_PREVIEW_LAYERS_SCRUB_HINT": "Træk for at justere, dobbeltklik for at redigere",
+  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "egenskab",
+  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "værdi",
   "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS": "Live-Forhåndsvisning blev afbrudt fordi udviklerværktøjer blev åbnet i browseren",
   "LIVE_DEV_DETACHED_TARGET_CLOSED": "Live-Forhåndsvisning blev afbrudt fordi siden blev lukket i browseren",
   "LIVE_DEV_NAVIGATED_AWAY": "Live-Forhåndsvisning blev afbrudt fordi browseren navigerede til en side udenfor projektet",
@@ -2546,7 +2548,6 @@ define({
   "AI_CHAT_MODEL_DESC_SONNET": "Balanceret hastighed og kapacitet til daglig kodning",
   "AI_CHAT_MODEL_DESC_HAIKU": "Hurtigste model til hurtige, simple opgaver",
   "AI_CHAT_MODEL_SELECT_TITLE": "Vælg AI-modellen til denne chat",
-  "AI_CHAT_MODE_SELECT_TITLE": "Skift mellem Claude Code-chatten og en indlejret Claude Code CLI-terminal",
   "AI_CHAT_MODEL_SWITCHED_NOTICE": "Skiftet til {0}. Gælder fra din næste besked; det første svar kan tage lidt længere tid, mens cachen genopbygges.",
   "AI_CHAT_INPUT_HINT": "Tryk på {0} for at sende · {1} for en ny linje",
   "AI_CHAT_BASH_CONFIRM_TITLE": "Tillad kommando?",
@@ -2618,7 +2619,6 @@ define({
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "Denne Claude Code CLI-session kører stadig i {0} — det åbne projekt er nu {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_SWITCH_BTN": "Skift til “{0}”",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Bliv i “{0}”",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code-indstillinger",
   "AI_SETTINGS_API_KEY": "API-nøgle",
   "AI_SETTINGS_BASE_URL": "Basis-URL",
   "AI_SETTINGS_API_TIMEOUT": "API-timeout (ms)",
@@ -2762,6 +2762,25 @@ define({
   "MIGRATE_UNREACHABLE_TITLE": "Kunne ikke få forbindelse til den gamle side",
   "MIGRATE_UNREACHABLE_MESSAGE": "{APP_NAME} kunne ikke oprette forbindelse til {0} for at finde dine projekter og indstillinger, så der er ikke blevet ændret noget. Tjek din internetforbindelse, og prøv derefter igen med {1}.",
   "CMD_MIGRATE_DATA": "Migrer mine data fra {0}…",
-  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "egenskab",
-  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "værdi"
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} ikke fundet",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} kunne ikke findes på dette system. Installer det, eller indtast den fulde sti til den eksekverbare fil nedenfor.",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "Stien, der er angivet for {0}, kunne ikke bruges: {1} Indtast en anden sti, eller ryd feltet for at finde den automatisk.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Installer {0}",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Gem og prøv igen",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installationsvejledning",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "Der findes ingen fil på den sti.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "Filen er ikke eksekverbar.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "Filen kørte ikke som {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "Den fil svarede ikke i tide.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "Den sti indeholder tegn, som ikke kan bruges.",
+  "AI_CHAT_MODE_SELECT_TITLE": "Skift mellem Claude Code-chatten og en indlejret CLI-terminal.",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "Dette vil afslutte den kørende Codex CLI-session og starte en ny. Fortsæt?",
+  "AI_CHAT_CODEX_UPSELL_MSG": "At køre Codex i Phoenix AI-panelet er en Pro-funktion. Du kan stadig køre Codex CLI gratis fra terminalen.",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "Denne Codex CLI-session kører stadig i {0} — det åbne projekt er nu {1}.",
+  "AI_CHAT_SETTINGS_TITLE": "AI-indstillinger",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Standard (Lokal {0})",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "Disse udbydere konfigurerer {0}. API-nøglen videregives til den som {1}.",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Lad stå tomt for automatisk registrering.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Sti til {0}-eksekverbaren"
 });
\ No newline at end of file
diff --git a/src/nls/de/lastTranslated.json b/src/nls/de/lastTranslated.json
index 61b0783d87..9fb162a6f3 100644
--- a/src/nls/de/lastTranslated.json
+++ b/src/nls/de/lastTranslated.json
@@ -33,6 +33,11 @@
   "AI_CHAT_CLAUDE_LOGIN_MSG": "Claude Code is installed but needs to be configured.",
   "AI_CHAT_CLAUDE_LOGIN_RESTART_NOTE": "Restart {APP_NAME} after configuration completes.",
   "AI_CHAT_CLAUDE_LOGIN_TITLE": "Setup Claude Code",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "That file did not run as {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "No file exists at that path.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "That file is not executable.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "That path contains characters that cannot be used.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "That file did not respond in time.",
   "AI_CHAT_CLI_INSTALLING": "Installing…",
   "AI_CHAT_CLI_INSTALLING_MSG": "Installing Claude Code, please wait. This may take a while...",
   "AI_CHAT_CLI_INSTALL_BTN": "Install Claude Code",
@@ -40,6 +45,12 @@
   "AI_CHAT_CLI_NEW_CONFIRM_MSG": "This will end the running Claude Code CLI session and start a fresh one. Continue?",
   "AI_CHAT_CLI_NEW_CONFIRM_TITLE": "End this CLI session?",
   "AI_CHAT_CLI_NOT_FOUND": "Claude Code Not Installed",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "The path set for {0} could not be used: {1} Enter a different path, or clear the box to detect it automatically.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Install {0}",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installation instructions",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} could not be found on this system. Install it, or enter the full path to its executable below.",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Save & Retry",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} not found",
   "AI_CHAT_CLI_RESTART_NOTE": "Restart {APP_NAME} after installation completes.",
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "This Claude Code CLI session is still running in {0} — the open project is now {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Stay on “{0}”",
@@ -48,6 +59,9 @@
   "AI_CHAT_CLI_UPSELL_OPEN_TERMINAL_BTN": "Open in Terminal",
   "AI_CHAT_CLI_UPSELL_TITLE": "Available in Phoenix Pro",
   "AI_CHAT_CLI_UPSELL_UPGRADE_BTN": "Upgrade to Pro",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "This will end the running Codex CLI session and start a fresh one. Continue?",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "This Codex CLI session is still running in {0} — the open project is now {1}.",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Running Codex inside the Phoenix AI panel is a Pro feature. You can still run the Codex CLI for free from the Terminal.",
   "AI_CHAT_CODE_COLLAPSE": "Collapse",
   "AI_CHAT_CODE_COLLAPSE_FOOTER": "Click to collapse",
   "AI_CHAT_CODE_DEFAULT_LANG": "text",
@@ -106,6 +120,7 @@
   "AI_CHAT_MODE_AUTO": "Auto",
   "AI_CHAT_MODE_CHAT": "Claude Code",
   "AI_CHAT_MODE_CLI": "Claude Code CLI",
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
   "AI_CHAT_MODE_EDIT": "AI Edit Mode",
   "AI_CHAT_MODE_FULL_AUTO": "Allow Everything",
   "AI_CHAT_MODE_INFO_AUTO": "AI uses judgment to auto-approve safe actions and asks about risky ones (Click to switch)",
@@ -113,7 +128,7 @@
   "AI_CHAT_MODE_INFO_FULL_AUTO": "AI can edit files and run commands without approval (Click to switch)",
   "AI_CHAT_MODE_INFO_PLAN": "AI will propose a plan before making changes (Click to switch)",
   "AI_CHAT_MODE_PLAN": "Plan Mode",
-  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded Claude Code CLI terminal",
+  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded CLI terminal",
   "AI_CHAT_NEW_BTN": "New",
   "AI_CHAT_NEW_SESSION_TITLE": "Start a new conversation",
   "AI_CHAT_NEW_WHILE_STREAMING_MSG": "AI is currently working on a task. Starting a new conversation will stop it. Continue?",
@@ -180,7 +195,7 @@
   "AI_CHAT_SEND_ERROR": "Failed to send message: {0}",
   "AI_CHAT_SEND_TITLE": "Send message",
   "AI_CHAT_SESSION_RESUMED": "Resumed session",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code Settings",
+  "AI_CHAT_SETTINGS_TITLE": "AI Settings",
   "AI_CHAT_SETUP_LEARN_MORE": "Learn More",
   "AI_CHAT_SETUP_NEED_HELP": "Need Help?",
   "AI_CHAT_SHOW_DIFF": "Show diff",
@@ -287,8 +302,11 @@
   "AI_SETTINGS_API_TIMEOUT_PLACEHOLDER": "Leave blank for default",
   "AI_SETTINGS_BASE_URL": "Base URL",
   "AI_SETTINGS_BASE_URL_PLACEHOLDER": "Leave blank for default",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Leave blank to detect automatically.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Path to the {0} executable",
   "AI_SETTINGS_CUSTOM_ENDPOINT_NOTICE": "Using custom API endpoint: {0}",
   "AI_SETTINGS_DEFAULT_PROVIDER": "Default (Local Claude Code)",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Default (Local {0})",
   "AI_SETTINGS_DELETE": "Delete",
   "AI_SETTINGS_DELETE_ACTIVE_CONFIRM": "\"{0}\" is the active provider. Deleting it will revert to the default. Continue?",
   "AI_SETTINGS_DELETE_PROVIDER": "Delete Provider",
@@ -301,6 +319,7 @@
   "AI_SETTINGS_PROVIDERS": "Providers",
   "AI_SETTINGS_PROVIDER_NAME": "Name",
   "AI_SETTINGS_PROVIDER_NAME_PLACEHOLDER": "e.g. My API Provider",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "These providers configure {0}. The API key is passed to it as {1}.",
   "AI_SETTINGS_RESET": "Reset",
   "AI_SETTINGS_SAVE": "Save",
   "AI_SETTINGS_SAVE_PROVIDER": "Save Provider",
diff --git a/src/nls/de/strings.js b/src/nls/de/strings.js
index 7dc6a14a3f..acd8631325 100644
--- a/src/nls/de/strings.js
+++ b/src/nls/de/strings.js
@@ -812,6 +812,8 @@ define({
   "LIVE_PREVIEW_LAYERS_EMPTY_PAGE_STYLES": "Die Seite ist leer. Fügen Sie ein Element hinzu, um dessen Stile zu sehen.",
   "LIVE_PREVIEW_LAYERS_SHOW_SELECTED": "Ausgewähltes Element anzeigen",
   "LIVE_PREVIEW_LAYERS_SCRUB_HINT": "Ziehen zum Anpassen, Doppelklick zum Bearbeiten",
+  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "Eigenschaft",
+  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "Wert",
   "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS": "Die Live-Vorschau wurde abgebrochen, weil die Entwickler-Tools des Browsers geöffnet wurden",
   "LIVE_DEV_DETACHED_TARGET_CLOSED": "Die Live-Vorschau wurde abgebrochen, weil die Seite im Browser geschlossen wurde",
   "LIVE_DEV_NAVIGATED_AWAY": "Die Live-Vorschau wurde abgebrochen, weil der Browser eine Seite geladen hat, die nicht Teil des aktuellen Projekts ist",
@@ -2546,7 +2548,6 @@ define({
   "AI_CHAT_MODEL_DESC_SONNET": "Ausgewogene Geschwindigkeit und Leistung für alltägliche Programmieraufgaben",
   "AI_CHAT_MODEL_DESC_HAIKU": "Schnellstes Modell für schnelle, einfache Aufgaben",
   "AI_CHAT_MODEL_SELECT_TITLE": "Wählen Sie das KI-Modell für diesen Chat",
-  "AI_CHAT_MODE_SELECT_TITLE": "Umschalten zwischen dem Claude Code-Chat und einem eingebetteten Claude Code-CLI-Terminal",
   "AI_CHAT_MODEL_SWITCHED_NOTICE": "Zu {0} gewechselt. Gilt ab Ihrer nächsten Nachricht; die erste Antwort kann einen Moment länger dauern, während der Cache neu aufgebaut wird.",
   "AI_CHAT_INPUT_HINT": "{0} zum Senden · {1} für neue Zeile",
   "AI_CHAT_BASH_CONFIRM_TITLE": "Befehl zulassen?",
@@ -2618,7 +2619,6 @@ define({
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "Diese Claude Code-CLI-Sitzung läuft noch in {0} – das geöffnete Projekt ist jetzt {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_SWITCH_BTN": "Zu „{0}“ wechseln",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Auf „{0}“ bleiben",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code-Einstellungen",
   "AI_SETTINGS_API_KEY": "API-Schlüssel",
   "AI_SETTINGS_BASE_URL": "Basis-URL",
   "AI_SETTINGS_API_TIMEOUT": "API-Timeout (ms)",
@@ -2762,6 +2762,25 @@ define({
   "MIGRATE_UNREACHABLE_TITLE": "Die alte Seite konnte nicht erreicht werden",
   "MIGRATE_UNREACHABLE_MESSAGE": "{APP_NAME} konnte keine Verbindung zu {0} herstellen, um Ihre Projekte und Einstellungen zu suchen, sodass nichts geändert wurde. Überprüfen Sie Ihre Internetverbindung und versuchen Sie es dann mit {1} erneut.",
   "CMD_MIGRATE_DATA": "Meine Daten von {0} migrieren…",
-  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "Eigenschaft",
-  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "Wert"
+  "AI_CHAT_MODE_CODEX_CLI": "Codex-CLI",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} nicht gefunden",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} konnte auf diesem System nicht gefunden werden. Installieren Sie es oder geben Sie unten den vollständigen Pfad zur ausführbaren Datei ein.",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "Der für {0} festgelegte Pfad konnte nicht verwendet werden: {1} Geben Sie einen anderen Pfad ein oder leeren Sie das Feld, um ihn automatisch zu erkennen.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "{0} installieren",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Speichern & erneut versuchen",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installationsanleitung",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "Unter diesem Pfad existiert keine Datei.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "Diese Datei ist nicht ausführbar.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "Diese Datei wurde nicht als {0} ausgeführt.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "Die Datei hat nicht rechtzeitig reagiert.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "Dieser Pfad enthält Zeichen, die nicht verwendet werden können.",
+  "AI_CHAT_MODE_SELECT_TITLE": "Zwischen dem Claude-Code-Chat und einem eingebetteten CLI-Terminal wechseln",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "Dies beendet die laufende Codex-CLI-Sitzung und startet eine neue. Fortfahren?",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Die Ausführung von Codex im Phoenix-AI-Panel ist eine Pro-Funktion. Sie können die Codex-CLI weiterhin kostenlos über das Terminal ausführen.",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "Diese Codex-CLI-Sitzung wird noch in {0} ausgeführt — das geöffnete Projekt ist jetzt {1}.",
+  "AI_CHAT_SETTINGS_TITLE": "KI-Einstellungen",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Standard (Lokal {0})",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "Diese Anbieter konfigurieren {0}. Der API-Schlüssel wird ihm als {1} übergeben.",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Für automatische Erkennung leer lassen.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Pfad zur ausführbaren {0}-Datei"
 });
\ No newline at end of file
diff --git a/src/nls/el/lastTranslated.json b/src/nls/el/lastTranslated.json
index 61b0783d87..9fb162a6f3 100644
--- a/src/nls/el/lastTranslated.json
+++ b/src/nls/el/lastTranslated.json
@@ -33,6 +33,11 @@
   "AI_CHAT_CLAUDE_LOGIN_MSG": "Claude Code is installed but needs to be configured.",
   "AI_CHAT_CLAUDE_LOGIN_RESTART_NOTE": "Restart {APP_NAME} after configuration completes.",
   "AI_CHAT_CLAUDE_LOGIN_TITLE": "Setup Claude Code",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "That file did not run as {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "No file exists at that path.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "That file is not executable.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "That path contains characters that cannot be used.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "That file did not respond in time.",
   "AI_CHAT_CLI_INSTALLING": "Installing…",
   "AI_CHAT_CLI_INSTALLING_MSG": "Installing Claude Code, please wait. This may take a while...",
   "AI_CHAT_CLI_INSTALL_BTN": "Install Claude Code",
@@ -40,6 +45,12 @@
   "AI_CHAT_CLI_NEW_CONFIRM_MSG": "This will end the running Claude Code CLI session and start a fresh one. Continue?",
   "AI_CHAT_CLI_NEW_CONFIRM_TITLE": "End this CLI session?",
   "AI_CHAT_CLI_NOT_FOUND": "Claude Code Not Installed",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "The path set for {0} could not be used: {1} Enter a different path, or clear the box to detect it automatically.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Install {0}",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installation instructions",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} could not be found on this system. Install it, or enter the full path to its executable below.",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Save & Retry",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} not found",
   "AI_CHAT_CLI_RESTART_NOTE": "Restart {APP_NAME} after installation completes.",
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "This Claude Code CLI session is still running in {0} — the open project is now {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Stay on “{0}”",
@@ -48,6 +59,9 @@
   "AI_CHAT_CLI_UPSELL_OPEN_TERMINAL_BTN": "Open in Terminal",
   "AI_CHAT_CLI_UPSELL_TITLE": "Available in Phoenix Pro",
   "AI_CHAT_CLI_UPSELL_UPGRADE_BTN": "Upgrade to Pro",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "This will end the running Codex CLI session and start a fresh one. Continue?",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "This Codex CLI session is still running in {0} — the open project is now {1}.",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Running Codex inside the Phoenix AI panel is a Pro feature. You can still run the Codex CLI for free from the Terminal.",
   "AI_CHAT_CODE_COLLAPSE": "Collapse",
   "AI_CHAT_CODE_COLLAPSE_FOOTER": "Click to collapse",
   "AI_CHAT_CODE_DEFAULT_LANG": "text",
@@ -106,6 +120,7 @@
   "AI_CHAT_MODE_AUTO": "Auto",
   "AI_CHAT_MODE_CHAT": "Claude Code",
   "AI_CHAT_MODE_CLI": "Claude Code CLI",
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
   "AI_CHAT_MODE_EDIT": "AI Edit Mode",
   "AI_CHAT_MODE_FULL_AUTO": "Allow Everything",
   "AI_CHAT_MODE_INFO_AUTO": "AI uses judgment to auto-approve safe actions and asks about risky ones (Click to switch)",
@@ -113,7 +128,7 @@
   "AI_CHAT_MODE_INFO_FULL_AUTO": "AI can edit files and run commands without approval (Click to switch)",
   "AI_CHAT_MODE_INFO_PLAN": "AI will propose a plan before making changes (Click to switch)",
   "AI_CHAT_MODE_PLAN": "Plan Mode",
-  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded Claude Code CLI terminal",
+  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded CLI terminal",
   "AI_CHAT_NEW_BTN": "New",
   "AI_CHAT_NEW_SESSION_TITLE": "Start a new conversation",
   "AI_CHAT_NEW_WHILE_STREAMING_MSG": "AI is currently working on a task. Starting a new conversation will stop it. Continue?",
@@ -180,7 +195,7 @@
   "AI_CHAT_SEND_ERROR": "Failed to send message: {0}",
   "AI_CHAT_SEND_TITLE": "Send message",
   "AI_CHAT_SESSION_RESUMED": "Resumed session",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code Settings",
+  "AI_CHAT_SETTINGS_TITLE": "AI Settings",
   "AI_CHAT_SETUP_LEARN_MORE": "Learn More",
   "AI_CHAT_SETUP_NEED_HELP": "Need Help?",
   "AI_CHAT_SHOW_DIFF": "Show diff",
@@ -287,8 +302,11 @@
   "AI_SETTINGS_API_TIMEOUT_PLACEHOLDER": "Leave blank for default",
   "AI_SETTINGS_BASE_URL": "Base URL",
   "AI_SETTINGS_BASE_URL_PLACEHOLDER": "Leave blank for default",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Leave blank to detect automatically.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Path to the {0} executable",
   "AI_SETTINGS_CUSTOM_ENDPOINT_NOTICE": "Using custom API endpoint: {0}",
   "AI_SETTINGS_DEFAULT_PROVIDER": "Default (Local Claude Code)",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Default (Local {0})",
   "AI_SETTINGS_DELETE": "Delete",
   "AI_SETTINGS_DELETE_ACTIVE_CONFIRM": "\"{0}\" is the active provider. Deleting it will revert to the default. Continue?",
   "AI_SETTINGS_DELETE_PROVIDER": "Delete Provider",
@@ -301,6 +319,7 @@
   "AI_SETTINGS_PROVIDERS": "Providers",
   "AI_SETTINGS_PROVIDER_NAME": "Name",
   "AI_SETTINGS_PROVIDER_NAME_PLACEHOLDER": "e.g. My API Provider",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "These providers configure {0}. The API key is passed to it as {1}.",
   "AI_SETTINGS_RESET": "Reset",
   "AI_SETTINGS_SAVE": "Save",
   "AI_SETTINGS_SAVE_PROVIDER": "Save Provider",
diff --git a/src/nls/el/strings.js b/src/nls/el/strings.js
index ec479b4476..2e005d4778 100644
--- a/src/nls/el/strings.js
+++ b/src/nls/el/strings.js
@@ -812,6 +812,8 @@ define({
   "LIVE_PREVIEW_LAYERS_EMPTY_PAGE_STYLES": "Η σελίδα είναι κενή. Προσθέστε ένα στοιχείο για να δείτε τα στυλ του.",
   "LIVE_PREVIEW_LAYERS_SHOW_SELECTED": "Εμφάνιση του επιλεγμένου στοιχείου",
   "LIVE_PREVIEW_LAYERS_SCRUB_HINT": "Σύρετε για προσαρμογή, διπλό κλικ για επεξεργασία",
+  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "Ιδιότητα",
+  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "Τιμή",
   "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS": "Το Live Preview ακυρώθηκε επειδή τα developer tools του browser ανοίχτηκαν",
   "LIVE_DEV_DETACHED_TARGET_CLOSED": "Το Live Preview ακυρώθηκε επειδή η σελίδα στον browser έκλεισε",
   "LIVE_DEV_NAVIGATED_AWAY": "Το Live Preview ακυρώθηκε επειδή ο browser πήγε σε μια σελίδα που δεν είναι μέρος του τρέχων project",
@@ -2546,7 +2548,6 @@ define({
   "AI_CHAT_MODEL_DESC_SONNET": "Ισορροπία ταχύτητας και δυνατοτήτων για την καθημερινή κωδικοποίηση",
   "AI_CHAT_MODEL_DESC_HAIKU": "Το ταχύτερο μοντέλο για γρήγορες, απλές εργασίες",
   "AI_CHAT_MODEL_SELECT_TITLE": "Επιλέξτε το μοντέλο AI για αυτήν τη συνομιλία",
-  "AI_CHAT_MODE_SELECT_TITLE": "Εναλλαγή μεταξύ της συνομιλίας Claude Code και ενός ενσωματωμένου τερματικού Claude Code CLI",
   "AI_CHAT_MODEL_SWITCHED_NOTICE": "Έγινε εναλλαγή σε {0}. Ισχύει από το επόμενο μήνυμά σας. Η πρώτη απόκριση ενδέχεται να καθυστερήσει λίγο περισσότερο, καθώς η κρυφή μνήμη αναδημιουργείται.",
   "AI_CHAT_INPUT_HINT": "Πατήστε {0} για αποστολή · {1} για νέα γραμμή",
   "AI_CHAT_BASH_CONFIRM_TITLE": "Να επιτραπεί η εντολή;",
@@ -2618,7 +2619,6 @@ define({
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "Αυτή η συνεδρία Claude Code CLI εξακολουθεί να εκτελείται στο {0} — το ανοιχτό έργο είναι τώρα το {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_SWITCH_BTN": "Μετάβαση στο «{0}»",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Παραμονή στο «{0}»",
-  "AI_CHAT_SETTINGS_TITLE": "Ρυθμίσεις Claude Code",
   "AI_SETTINGS_API_KEY": "Κλειδί API",
   "AI_SETTINGS_BASE_URL": "URL Βάσης",
   "AI_SETTINGS_API_TIMEOUT": "Χρονικό όριο API (ms)",
@@ -2762,6 +2762,25 @@ define({
   "MIGRATE_UNREACHABLE_TITLE": "Αδυναμία πρόσβασης στον παλιό ιστότοπο",
   "MIGRATE_UNREACHABLE_MESSAGE": "Το {APP_NAME} δεν μπόρεσε να συνδεθεί στο {0} για την αναζήτηση των έργων και των ρυθμίσεών σας, επομένως δεν έχει αλλάξει τίποτα. Ελέγξτε τη σύνδεσή σας στο διαδίκτυο και, στη συνέχεια, δοκιμάστε ξανά με το {1}.",
   "CMD_MIGRATE_DATA": "Μεταφορά των δεδομένων μου από το {0}…",
-  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "Ιδιότητα",
-  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "Τιμή"
+  "AI_CHAT_MODE_CODEX_CLI": "Γραμμή εντολών Codex",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "Το {0} δεν βρέθηκε",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "Το {0} δεν βρέθηκε σε αυτό το σύστημα. Εγκαταστήστε το ή εισαγάγετε παρακάτω την πλήρη διαδρομή προς το εκτελέσιμο αρχείο του.",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "Δεν ήταν δυνατή η χρήση της διαδρομής που έχει οριστεί για το {0}: {1} Εισαγάγετε μια διαφορετική διαδρομή ή αδειάστε το πλαίσιο για αυτόματο εντοπισμό.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Εγκατάσταση του {0}",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Αποθήκευση και Επανάληψη",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Οδηγίες εγκατάστασης",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "Δεν υπάρχει αρχείο σε αυτήν τη διαδρομή.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "Αυτό το αρχείο δεν είναι εκτελέσιμο.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "Αυτό το αρχείο δεν εκτελέστηκε ως {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "Αυτό το αρχείο δεν ανταποκρίθηκε εγκαίρως.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "Αυτή η διαδρομή περιέχει μη επιτρεπτούς χαρακτήρες.",
+  "AI_CHAT_MODE_SELECT_TITLE": "Εναλλαγή μεταξύ της συνομιλίας Claude Code και ενός ενσωματωμένου τερματικού CLI",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "Αυτό θα τερματίσει την τρέχουσα συνεδρία Codex CLI και θα ξεκινήσει μια νέα. Συνέχεια;",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Η εκτέλεση του Codex εντός του πίνακα Phoenix AI είναι μια λειτουργία Pro. Μπορείτε ακόμα να εκτελέσετε το Codex CLI δωρεάν από το Τερματικό.",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "Αυτή η συνεδρία Codex CLI εξακολουθεί να εκτελείται στο {0} — το ανοιχτό έργο είναι τώρα το {1}.",
+  "AI_CHAT_SETTINGS_TITLE": "Ρυθμίσεις AI",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Προεπιλογή (Τοπικό {0})",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "Αυτοί οι πάροχοι διαμορφώνουν το {0}. Το κλειδί API μεταβιβάζεται σε αυτό ως {1}.",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Αφήστε κενό για αυτόματο εντοπισμό.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Διαδρομή προς το εκτελέσιμο {0}"
 });
\ No newline at end of file
diff --git a/src/nls/en-gb/lastTranslated.json b/src/nls/en-gb/lastTranslated.json
index 61b0783d87..9fb162a6f3 100644
--- a/src/nls/en-gb/lastTranslated.json
+++ b/src/nls/en-gb/lastTranslated.json
@@ -33,6 +33,11 @@
   "AI_CHAT_CLAUDE_LOGIN_MSG": "Claude Code is installed but needs to be configured.",
   "AI_CHAT_CLAUDE_LOGIN_RESTART_NOTE": "Restart {APP_NAME} after configuration completes.",
   "AI_CHAT_CLAUDE_LOGIN_TITLE": "Setup Claude Code",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "That file did not run as {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "No file exists at that path.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "That file is not executable.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "That path contains characters that cannot be used.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "That file did not respond in time.",
   "AI_CHAT_CLI_INSTALLING": "Installing…",
   "AI_CHAT_CLI_INSTALLING_MSG": "Installing Claude Code, please wait. This may take a while...",
   "AI_CHAT_CLI_INSTALL_BTN": "Install Claude Code",
@@ -40,6 +45,12 @@
   "AI_CHAT_CLI_NEW_CONFIRM_MSG": "This will end the running Claude Code CLI session and start a fresh one. Continue?",
   "AI_CHAT_CLI_NEW_CONFIRM_TITLE": "End this CLI session?",
   "AI_CHAT_CLI_NOT_FOUND": "Claude Code Not Installed",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "The path set for {0} could not be used: {1} Enter a different path, or clear the box to detect it automatically.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Install {0}",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installation instructions",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} could not be found on this system. Install it, or enter the full path to its executable below.",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Save & Retry",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} not found",
   "AI_CHAT_CLI_RESTART_NOTE": "Restart {APP_NAME} after installation completes.",
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "This Claude Code CLI session is still running in {0} — the open project is now {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Stay on “{0}”",
@@ -48,6 +59,9 @@
   "AI_CHAT_CLI_UPSELL_OPEN_TERMINAL_BTN": "Open in Terminal",
   "AI_CHAT_CLI_UPSELL_TITLE": "Available in Phoenix Pro",
   "AI_CHAT_CLI_UPSELL_UPGRADE_BTN": "Upgrade to Pro",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "This will end the running Codex CLI session and start a fresh one. Continue?",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "This Codex CLI session is still running in {0} — the open project is now {1}.",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Running Codex inside the Phoenix AI panel is a Pro feature. You can still run the Codex CLI for free from the Terminal.",
   "AI_CHAT_CODE_COLLAPSE": "Collapse",
   "AI_CHAT_CODE_COLLAPSE_FOOTER": "Click to collapse",
   "AI_CHAT_CODE_DEFAULT_LANG": "text",
@@ -106,6 +120,7 @@
   "AI_CHAT_MODE_AUTO": "Auto",
   "AI_CHAT_MODE_CHAT": "Claude Code",
   "AI_CHAT_MODE_CLI": "Claude Code CLI",
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
   "AI_CHAT_MODE_EDIT": "AI Edit Mode",
   "AI_CHAT_MODE_FULL_AUTO": "Allow Everything",
   "AI_CHAT_MODE_INFO_AUTO": "AI uses judgment to auto-approve safe actions and asks about risky ones (Click to switch)",
@@ -113,7 +128,7 @@
   "AI_CHAT_MODE_INFO_FULL_AUTO": "AI can edit files and run commands without approval (Click to switch)",
   "AI_CHAT_MODE_INFO_PLAN": "AI will propose a plan before making changes (Click to switch)",
   "AI_CHAT_MODE_PLAN": "Plan Mode",
-  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded Claude Code CLI terminal",
+  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded CLI terminal",
   "AI_CHAT_NEW_BTN": "New",
   "AI_CHAT_NEW_SESSION_TITLE": "Start a new conversation",
   "AI_CHAT_NEW_WHILE_STREAMING_MSG": "AI is currently working on a task. Starting a new conversation will stop it. Continue?",
@@ -180,7 +195,7 @@
   "AI_CHAT_SEND_ERROR": "Failed to send message: {0}",
   "AI_CHAT_SEND_TITLE": "Send message",
   "AI_CHAT_SESSION_RESUMED": "Resumed session",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code Settings",
+  "AI_CHAT_SETTINGS_TITLE": "AI Settings",
   "AI_CHAT_SETUP_LEARN_MORE": "Learn More",
   "AI_CHAT_SETUP_NEED_HELP": "Need Help?",
   "AI_CHAT_SHOW_DIFF": "Show diff",
@@ -287,8 +302,11 @@
   "AI_SETTINGS_API_TIMEOUT_PLACEHOLDER": "Leave blank for default",
   "AI_SETTINGS_BASE_URL": "Base URL",
   "AI_SETTINGS_BASE_URL_PLACEHOLDER": "Leave blank for default",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Leave blank to detect automatically.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Path to the {0} executable",
   "AI_SETTINGS_CUSTOM_ENDPOINT_NOTICE": "Using custom API endpoint: {0}",
   "AI_SETTINGS_DEFAULT_PROVIDER": "Default (Local Claude Code)",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Default (Local {0})",
   "AI_SETTINGS_DELETE": "Delete",
   "AI_SETTINGS_DELETE_ACTIVE_CONFIRM": "\"{0}\" is the active provider. Deleting it will revert to the default. Continue?",
   "AI_SETTINGS_DELETE_PROVIDER": "Delete Provider",
@@ -301,6 +319,7 @@
   "AI_SETTINGS_PROVIDERS": "Providers",
   "AI_SETTINGS_PROVIDER_NAME": "Name",
   "AI_SETTINGS_PROVIDER_NAME_PLACEHOLDER": "e.g. My API Provider",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "These providers configure {0}. The API key is passed to it as {1}.",
   "AI_SETTINGS_RESET": "Reset",
   "AI_SETTINGS_SAVE": "Save",
   "AI_SETTINGS_SAVE_PROVIDER": "Save Provider",
diff --git a/src/nls/en-gb/strings.js b/src/nls/en-gb/strings.js
index 3d8480c115..31e4a8b931 100644
--- a/src/nls/en-gb/strings.js
+++ b/src/nls/en-gb/strings.js
@@ -812,6 +812,8 @@ define({
   "LIVE_PREVIEW_LAYERS_EMPTY_PAGE_STYLES": "The page is empty. Add an element to see its styles.",
   "LIVE_PREVIEW_LAYERS_SHOW_SELECTED": "Show the selected element",
   "LIVE_PREVIEW_LAYERS_SCRUB_HINT": "Drag to adjust, double-click to edit",
+  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "property",
+  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "value",
   "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS": "Live Preview was cancelled because the browser's developer tools were opened",
   "LIVE_DEV_DETACHED_TARGET_CLOSED": "Live Preview was cancelled because the page was closed in the browser",
   "LIVE_DEV_NAVIGATED_AWAY": "Live Preview was cancelled because the browser navigated to a page that isn't part of the current project",
@@ -2546,7 +2548,6 @@ define({
   "AI_CHAT_MODEL_DESC_SONNET": "Balanced speed and capability for everyday coding",
   "AI_CHAT_MODEL_DESC_HAIKU": "Fastest model for quick, simple tasks",
   "AI_CHAT_MODEL_SELECT_TITLE": "Choose the AI model for this chat",
-  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded Claude Code CLI terminal",
   "AI_CHAT_MODEL_SWITCHED_NOTICE": "Switched to {0}. Applies from your next message; the first response may take a moment longer while the cache rebuilds.",
   "AI_CHAT_INPUT_HINT": "Press {0} to send · {1} for new line",
   "AI_CHAT_BASH_CONFIRM_TITLE": "Allow command?",
@@ -2618,7 +2619,6 @@ define({
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "This Claude Code CLI session is still running in {0} — the open project is now {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_SWITCH_BTN": "Switch to “{0}”",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Stay on “{0}”",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code Settings",
   "AI_SETTINGS_API_KEY": "API Key",
   "AI_SETTINGS_BASE_URL": "Base URL",
   "AI_SETTINGS_API_TIMEOUT": "API Timeout (ms)",
@@ -2762,6 +2762,25 @@ define({
   "MIGRATE_UNREACHABLE_TITLE": "Could not reach the old site",
   "MIGRATE_UNREACHABLE_MESSAGE": "{APP_NAME} could not connect to {0} to look for your projects and settings, so nothing has been changed. Check your internet connection, then try again with {1}.",
   "CMD_MIGRATE_DATA": "Migrate My Data From {0}…",
-  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "property",
-  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "value"
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} not found",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} could not be found on this system. Install it, or enter the full path to its executable below.",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "The path set for {0} could not be used: {1} Enter a different path, or clear the box to detect it automatically.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Install {0}",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Save & Retry",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installation instructions",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "No file exists at that path.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "That file is not executable.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "That file did not run as {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "That file did not respond in time.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "That path contains characters that cannot be used.",
+  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded CLI terminal",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "This will end the running Codex CLI session and start a fresh one. Continue?",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Running Codex inside the Phoenix AI panel is a Pro feature. You can still run the Codex CLI for free from the Terminal.",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "This Codex CLI session is still running in {0} — the open project is now {1}.",
+  "AI_CHAT_SETTINGS_TITLE": "AI Settings",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Default (Local {0})",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "These providers configure {0}. The API key is passed to it as {1}.",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Leave blank to detect automatically.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Path to the {0} executable"
 });
\ No newline at end of file
diff --git a/src/nls/es/lastTranslated.json b/src/nls/es/lastTranslated.json
index 61b0783d87..9fb162a6f3 100644
--- a/src/nls/es/lastTranslated.json
+++ b/src/nls/es/lastTranslated.json
@@ -33,6 +33,11 @@
   "AI_CHAT_CLAUDE_LOGIN_MSG": "Claude Code is installed but needs to be configured.",
   "AI_CHAT_CLAUDE_LOGIN_RESTART_NOTE": "Restart {APP_NAME} after configuration completes.",
   "AI_CHAT_CLAUDE_LOGIN_TITLE": "Setup Claude Code",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "That file did not run as {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "No file exists at that path.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "That file is not executable.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "That path contains characters that cannot be used.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "That file did not respond in time.",
   "AI_CHAT_CLI_INSTALLING": "Installing…",
   "AI_CHAT_CLI_INSTALLING_MSG": "Installing Claude Code, please wait. This may take a while...",
   "AI_CHAT_CLI_INSTALL_BTN": "Install Claude Code",
@@ -40,6 +45,12 @@
   "AI_CHAT_CLI_NEW_CONFIRM_MSG": "This will end the running Claude Code CLI session and start a fresh one. Continue?",
   "AI_CHAT_CLI_NEW_CONFIRM_TITLE": "End this CLI session?",
   "AI_CHAT_CLI_NOT_FOUND": "Claude Code Not Installed",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "The path set for {0} could not be used: {1} Enter a different path, or clear the box to detect it automatically.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Install {0}",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installation instructions",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} could not be found on this system. Install it, or enter the full path to its executable below.",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Save & Retry",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} not found",
   "AI_CHAT_CLI_RESTART_NOTE": "Restart {APP_NAME} after installation completes.",
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "This Claude Code CLI session is still running in {0} — the open project is now {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Stay on “{0}”",
@@ -48,6 +59,9 @@
   "AI_CHAT_CLI_UPSELL_OPEN_TERMINAL_BTN": "Open in Terminal",
   "AI_CHAT_CLI_UPSELL_TITLE": "Available in Phoenix Pro",
   "AI_CHAT_CLI_UPSELL_UPGRADE_BTN": "Upgrade to Pro",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "This will end the running Codex CLI session and start a fresh one. Continue?",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "This Codex CLI session is still running in {0} — the open project is now {1}.",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Running Codex inside the Phoenix AI panel is a Pro feature. You can still run the Codex CLI for free from the Terminal.",
   "AI_CHAT_CODE_COLLAPSE": "Collapse",
   "AI_CHAT_CODE_COLLAPSE_FOOTER": "Click to collapse",
   "AI_CHAT_CODE_DEFAULT_LANG": "text",
@@ -106,6 +120,7 @@
   "AI_CHAT_MODE_AUTO": "Auto",
   "AI_CHAT_MODE_CHAT": "Claude Code",
   "AI_CHAT_MODE_CLI": "Claude Code CLI",
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
   "AI_CHAT_MODE_EDIT": "AI Edit Mode",
   "AI_CHAT_MODE_FULL_AUTO": "Allow Everything",
   "AI_CHAT_MODE_INFO_AUTO": "AI uses judgment to auto-approve safe actions and asks about risky ones (Click to switch)",
@@ -113,7 +128,7 @@
   "AI_CHAT_MODE_INFO_FULL_AUTO": "AI can edit files and run commands without approval (Click to switch)",
   "AI_CHAT_MODE_INFO_PLAN": "AI will propose a plan before making changes (Click to switch)",
   "AI_CHAT_MODE_PLAN": "Plan Mode",
-  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded Claude Code CLI terminal",
+  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded CLI terminal",
   "AI_CHAT_NEW_BTN": "New",
   "AI_CHAT_NEW_SESSION_TITLE": "Start a new conversation",
   "AI_CHAT_NEW_WHILE_STREAMING_MSG": "AI is currently working on a task. Starting a new conversation will stop it. Continue?",
@@ -180,7 +195,7 @@
   "AI_CHAT_SEND_ERROR": "Failed to send message: {0}",
   "AI_CHAT_SEND_TITLE": "Send message",
   "AI_CHAT_SESSION_RESUMED": "Resumed session",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code Settings",
+  "AI_CHAT_SETTINGS_TITLE": "AI Settings",
   "AI_CHAT_SETUP_LEARN_MORE": "Learn More",
   "AI_CHAT_SETUP_NEED_HELP": "Need Help?",
   "AI_CHAT_SHOW_DIFF": "Show diff",
@@ -287,8 +302,11 @@
   "AI_SETTINGS_API_TIMEOUT_PLACEHOLDER": "Leave blank for default",
   "AI_SETTINGS_BASE_URL": "Base URL",
   "AI_SETTINGS_BASE_URL_PLACEHOLDER": "Leave blank for default",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Leave blank to detect automatically.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Path to the {0} executable",
   "AI_SETTINGS_CUSTOM_ENDPOINT_NOTICE": "Using custom API endpoint: {0}",
   "AI_SETTINGS_DEFAULT_PROVIDER": "Default (Local Claude Code)",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Default (Local {0})",
   "AI_SETTINGS_DELETE": "Delete",
   "AI_SETTINGS_DELETE_ACTIVE_CONFIRM": "\"{0}\" is the active provider. Deleting it will revert to the default. Continue?",
   "AI_SETTINGS_DELETE_PROVIDER": "Delete Provider",
@@ -301,6 +319,7 @@
   "AI_SETTINGS_PROVIDERS": "Providers",
   "AI_SETTINGS_PROVIDER_NAME": "Name",
   "AI_SETTINGS_PROVIDER_NAME_PLACEHOLDER": "e.g. My API Provider",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "These providers configure {0}. The API key is passed to it as {1}.",
   "AI_SETTINGS_RESET": "Reset",
   "AI_SETTINGS_SAVE": "Save",
   "AI_SETTINGS_SAVE_PROVIDER": "Save Provider",
diff --git a/src/nls/es/strings.js b/src/nls/es/strings.js
index 70f6525bcd..cfb96cd7fc 100644
--- a/src/nls/es/strings.js
+++ b/src/nls/es/strings.js
@@ -812,6 +812,8 @@ define({
   "LIVE_PREVIEW_LAYERS_EMPTY_PAGE_STYLES": "La página está vacía. Añade un elemento para ver sus estilos.",
   "LIVE_PREVIEW_LAYERS_SHOW_SELECTED": "Mostrar el elemento seleccionado",
   "LIVE_PREVIEW_LAYERS_SCRUB_HINT": "Arrastra para ajustar, doble clic para editar",
+  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "propiedad",
+  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "valor",
   "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS": "Vista previa dinámica se ha detenido porque se han abierto las herramientas de desarrollo",
   "LIVE_DEV_DETACHED_TARGET_CLOSED": "Vista previa dinámica se ha detenido porque se ha cerrado la página en el navegador",
   "LIVE_DEV_NAVIGATED_AWAY": "Vista previa dinámica se ha detenido porque se ha accedido a una página que no es parte del proyecto actual",
@@ -2546,7 +2548,6 @@ define({
   "AI_CHAT_MODEL_DESC_SONNET": "Equilibrio entre velocidad y capacidad para la programación diaria",
   "AI_CHAT_MODEL_DESC_HAIKU": "El modelo más rápido para tareas rápidas y sencillas",
   "AI_CHAT_MODEL_SELECT_TITLE": "Elige el modelo de IA para este chat",
-  "AI_CHAT_MODE_SELECT_TITLE": "Cambiar entre el chat de Claude Code y la terminal CLI de Claude Code integrada",
   "AI_CHAT_MODEL_SWITCHED_NOTICE": "Se ha cambiado a {0}. Se aplicará a partir de tu próximo mensaje; la primera respuesta puede tardar un poco más mientras se reconstruye la caché.",
   "AI_CHAT_INPUT_HINT": "Pulsa {0} para enviar · {1} para nueva línea",
   "AI_CHAT_BASH_CONFIRM_TITLE": "¿Permitir comando?",
@@ -2618,7 +2619,6 @@ define({
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "Esta sesión de Claude Code CLI sigue en ejecución en {0} — el proyecto abierto ahora es {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_SWITCH_BTN": "Cambiar a “{0}”",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Permanecer en “{0}”",
-  "AI_CHAT_SETTINGS_TITLE": "Ajustes de Claude Code",
   "AI_SETTINGS_API_KEY": "Clave de API",
   "AI_SETTINGS_BASE_URL": "URL base",
   "AI_SETTINGS_API_TIMEOUT": "Tiempo de espera de la API (ms)",
@@ -2762,6 +2762,25 @@ define({
   "MIGRATE_UNREACHABLE_TITLE": "No se pudo acceder al sitio antiguo",
   "MIGRATE_UNREACHABLE_MESSAGE": "{APP_NAME} no se pudo conectar a {0} para buscar tus proyectos y configuración, por lo que no se ha modificado nada. Comprueba tu conexión a internet y vuelve a intentarlo con {1}.",
   "CMD_MIGRATE_DATA": "Migrar mis datos desde {0}…",
-  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "propiedad",
-  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "valor"
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} no encontrado",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "No se encontró {0} en este sistema. Instálalo o introduce la ruta completa a su ejecutable a continuación.",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "La ruta establecida para {0} no se pudo utilizar: {1} Introduce una ruta diferente o deja el campo en blanco para detectarlo automáticamente.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Instalar {0}",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Guardar y reintentar",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Instrucciones de instalación",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "No existe ningún archivo en esa ruta.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "Ese archivo no es ejecutable.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "Ese archivo no se ejecutó como {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "Ese archivo no respondió a tiempo.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "Esa ruta contiene caracteres que no se pueden usar.",
+  "AI_CHAT_MODE_SELECT_TITLE": "Cambiar entre el chat de Claude Code y un terminal CLI integrado",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "Esto finalizará la sesión de Codex CLI en ejecución e iniciará una nueva. ¿Desea continuar?",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Ejecutar Codex dentro del panel de IA de Phoenix es una función Pro. Todavía puede ejecutar Codex CLI de forma gratuita desde el terminal.",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "Esta sesión de Codex CLI todavía se está ejecutando en {0} — el proyecto abierto ahora es {1}.",
+  "AI_CHAT_SETTINGS_TITLE": "Configuración de IA",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Predeterminado (Local {0})",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "Estos proveedores configuran {0}. La clave de API se le pasa como {1}.",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Dejar en blanco para detectar automáticamente.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Ruta del ejecutable {0}"
 });
\ No newline at end of file
diff --git a/src/nls/fa-ir/lastTranslated.json b/src/nls/fa-ir/lastTranslated.json
index 61b0783d87..9fb162a6f3 100644
--- a/src/nls/fa-ir/lastTranslated.json
+++ b/src/nls/fa-ir/lastTranslated.json
@@ -33,6 +33,11 @@
   "AI_CHAT_CLAUDE_LOGIN_MSG": "Claude Code is installed but needs to be configured.",
   "AI_CHAT_CLAUDE_LOGIN_RESTART_NOTE": "Restart {APP_NAME} after configuration completes.",
   "AI_CHAT_CLAUDE_LOGIN_TITLE": "Setup Claude Code",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "That file did not run as {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "No file exists at that path.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "That file is not executable.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "That path contains characters that cannot be used.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "That file did not respond in time.",
   "AI_CHAT_CLI_INSTALLING": "Installing…",
   "AI_CHAT_CLI_INSTALLING_MSG": "Installing Claude Code, please wait. This may take a while...",
   "AI_CHAT_CLI_INSTALL_BTN": "Install Claude Code",
@@ -40,6 +45,12 @@
   "AI_CHAT_CLI_NEW_CONFIRM_MSG": "This will end the running Claude Code CLI session and start a fresh one. Continue?",
   "AI_CHAT_CLI_NEW_CONFIRM_TITLE": "End this CLI session?",
   "AI_CHAT_CLI_NOT_FOUND": "Claude Code Not Installed",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "The path set for {0} could not be used: {1} Enter a different path, or clear the box to detect it automatically.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Install {0}",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installation instructions",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} could not be found on this system. Install it, or enter the full path to its executable below.",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Save & Retry",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} not found",
   "AI_CHAT_CLI_RESTART_NOTE": "Restart {APP_NAME} after installation completes.",
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "This Claude Code CLI session is still running in {0} — the open project is now {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Stay on “{0}”",
@@ -48,6 +59,9 @@
   "AI_CHAT_CLI_UPSELL_OPEN_TERMINAL_BTN": "Open in Terminal",
   "AI_CHAT_CLI_UPSELL_TITLE": "Available in Phoenix Pro",
   "AI_CHAT_CLI_UPSELL_UPGRADE_BTN": "Upgrade to Pro",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "This will end the running Codex CLI session and start a fresh one. Continue?",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "This Codex CLI session is still running in {0} — the open project is now {1}.",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Running Codex inside the Phoenix AI panel is a Pro feature. You can still run the Codex CLI for free from the Terminal.",
   "AI_CHAT_CODE_COLLAPSE": "Collapse",
   "AI_CHAT_CODE_COLLAPSE_FOOTER": "Click to collapse",
   "AI_CHAT_CODE_DEFAULT_LANG": "text",
@@ -106,6 +120,7 @@
   "AI_CHAT_MODE_AUTO": "Auto",
   "AI_CHAT_MODE_CHAT": "Claude Code",
   "AI_CHAT_MODE_CLI": "Claude Code CLI",
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
   "AI_CHAT_MODE_EDIT": "AI Edit Mode",
   "AI_CHAT_MODE_FULL_AUTO": "Allow Everything",
   "AI_CHAT_MODE_INFO_AUTO": "AI uses judgment to auto-approve safe actions and asks about risky ones (Click to switch)",
@@ -113,7 +128,7 @@
   "AI_CHAT_MODE_INFO_FULL_AUTO": "AI can edit files and run commands without approval (Click to switch)",
   "AI_CHAT_MODE_INFO_PLAN": "AI will propose a plan before making changes (Click to switch)",
   "AI_CHAT_MODE_PLAN": "Plan Mode",
-  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded Claude Code CLI terminal",
+  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded CLI terminal",
   "AI_CHAT_NEW_BTN": "New",
   "AI_CHAT_NEW_SESSION_TITLE": "Start a new conversation",
   "AI_CHAT_NEW_WHILE_STREAMING_MSG": "AI is currently working on a task. Starting a new conversation will stop it. Continue?",
@@ -180,7 +195,7 @@
   "AI_CHAT_SEND_ERROR": "Failed to send message: {0}",
   "AI_CHAT_SEND_TITLE": "Send message",
   "AI_CHAT_SESSION_RESUMED": "Resumed session",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code Settings",
+  "AI_CHAT_SETTINGS_TITLE": "AI Settings",
   "AI_CHAT_SETUP_LEARN_MORE": "Learn More",
   "AI_CHAT_SETUP_NEED_HELP": "Need Help?",
   "AI_CHAT_SHOW_DIFF": "Show diff",
@@ -287,8 +302,11 @@
   "AI_SETTINGS_API_TIMEOUT_PLACEHOLDER": "Leave blank for default",
   "AI_SETTINGS_BASE_URL": "Base URL",
   "AI_SETTINGS_BASE_URL_PLACEHOLDER": "Leave blank for default",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Leave blank to detect automatically.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Path to the {0} executable",
   "AI_SETTINGS_CUSTOM_ENDPOINT_NOTICE": "Using custom API endpoint: {0}",
   "AI_SETTINGS_DEFAULT_PROVIDER": "Default (Local Claude Code)",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Default (Local {0})",
   "AI_SETTINGS_DELETE": "Delete",
   "AI_SETTINGS_DELETE_ACTIVE_CONFIRM": "\"{0}\" is the active provider. Deleting it will revert to the default. Continue?",
   "AI_SETTINGS_DELETE_PROVIDER": "Delete Provider",
@@ -301,6 +319,7 @@
   "AI_SETTINGS_PROVIDERS": "Providers",
   "AI_SETTINGS_PROVIDER_NAME": "Name",
   "AI_SETTINGS_PROVIDER_NAME_PLACEHOLDER": "e.g. My API Provider",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "These providers configure {0}. The API key is passed to it as {1}.",
   "AI_SETTINGS_RESET": "Reset",
   "AI_SETTINGS_SAVE": "Save",
   "AI_SETTINGS_SAVE_PROVIDER": "Save Provider",
diff --git a/src/nls/fa-ir/strings.js b/src/nls/fa-ir/strings.js
index 7fdd00c51f..1293c83cb5 100644
--- a/src/nls/fa-ir/strings.js
+++ b/src/nls/fa-ir/strings.js
@@ -812,6 +812,8 @@ define({
   "LIVE_PREVIEW_LAYERS_EMPTY_PAGE_STYLES": "صفحه خالی است. برای دیدن استایل‌های آن، یک عنصر اضافه کنید.",
   "LIVE_PREVIEW_LAYERS_SHOW_SELECTED": "نمایش عنصر انتخاب‌شده",
   "LIVE_PREVIEW_LAYERS_SCRUB_HINT": "برای تنظیم بکشید، برای ویرایش دو بار کلیک کنید",
+  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "ویژگی",
+  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "مقدار",
   "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS": "پیش نمایش زنده لغو شد زیرا از برخی از ابزارهای توسعه مختص مرورگرتان استفاده کرده اید.",
   "LIVE_DEV_DETACHED_TARGET_CLOSED": "پیش نمایش زنده لغو شد زیرا پنجره یا زبانه مربوط به صفحه در مرورگر بسته شده.",
   "LIVE_DEV_NAVIGATED_AWAY": "پیش نمایش زنده لغو شد زیرا پنجره یا زبانه موجود در مرورگر آدرس دیگری را پیمایش کرده است.",
@@ -2546,7 +2548,6 @@ define({
   "AI_CHAT_MODEL_DESC_SONNET": "تعادل بین سرعت و قابلیت برای کدنویسی روزمره",
   "AI_CHAT_MODEL_DESC_HAIKU": "سریع‌ترین مدل برای وظایف سریع و ساده",
   "AI_CHAT_MODEL_SELECT_TITLE": "مدل هوش مصنوعی برای این گفتگو را انتخاب کنید",
-  "AI_CHAT_MODE_SELECT_TITLE": "جابجایی بین چت Claude Code و ترمینال داخلی Claude Code CLI",
   "AI_CHAT_MODEL_SWITCHED_NOTICE": "به {0} تغییر یافت. از پیام بعدی شما اعمال می‌شود؛ اولین پاسخ ممکن است در حین بازسازی کش، کمی بیشتر طول بکشد.",
   "AI_CHAT_INPUT_HINT": "برای ارسال {0} را فشار دهید · {1} برای خط جدید",
   "AI_CHAT_BASH_CONFIRM_TITLE": "اجازه اجرای دستور؟",
@@ -2618,7 +2619,6 @@ define({
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "جلسهٔ Claude Code CLI هنوز در {0} در حال اجرا است — پروژهٔ فعلی شما اکنون {1} است.",
   "AI_CHAT_CLI_STALE_PROJECT_SWITCH_BTN": "جابجایی به «{0}»",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "ماندن در «{0}»",
-  "AI_CHAT_SETTINGS_TITLE": "تنظیمات Claude Code",
   "AI_SETTINGS_API_KEY": "کلید API",
   "AI_SETTINGS_BASE_URL": "URL پایه",
   "AI_SETTINGS_API_TIMEOUT": "زمان انتظار API (میلی‌ثانیه)",
@@ -2762,6 +2762,25 @@ define({
   "MIGRATE_UNREACHABLE_TITLE": "عدم دسترسی به سایت قدیمی",
   "MIGRATE_UNREACHABLE_MESSAGE": "‏{APP_NAME} نتوانست به {0} متصل شود تا پروژه‌ها و تنظیمات شما را جستجو کند، بنابراین هیچ تغییری ایجاد نشده است. اتصال اینترنت خود را بررسی کنید، سپس با {1} دوباره تلاش کنید.",
   "CMD_MIGRATE_DATA": "انتقال داده‌های من از {0}…",
-  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "ویژگی",
-  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "مقدار"
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} پیدا نشد",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} روی این سیستم پیدا نشد. آن را نصب کنید، یا مسیر کامل فایل اجرایی آن را در زیر وارد نمایید.",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "مسیر تنظیم‌شده برای {0} قابل استفاده نبود: {1} یک مسیر دیگر وارد کنید، یا کادر را برای تشخیص خودکار خالی کنید.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "نصب {0}",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "ذخیره و تلاش مجدد",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "راهنمای نصب",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "فایلی در این مسیر وجود ندارد.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "این فایل اجرایی نیست.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "این فایل به‌عنوان {0} اجرا نشد.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "آن فایل به موقع پاسخ نداد.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "آن مسیر حاوی کاراکترهای غیرمجاز است.",
+  "AI_CHAT_MODE_SELECT_TITLE": "جابجایی بین چت Claude Code و ترمینال CLI تعبیه‌شده",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "این کار جلسه در حال اجرای Codex CLI را پایان داده و یک جلسه جدید را شروع می‌کند. ادامه می‌دهید؟",
+  "AI_CHAT_CODEX_UPSELL_MSG": "اجرای Codex در پنل هوش مصنوعی Phoenix یک قابلیت Pro است. شما همچنان می‌توانید Codex CLI را به صورت رایگان از ترمینال اجرا کنید.",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "این جلسه Codex CLI همچنان در {0} در حال اجرا است — پروژه باز شده اکنون {1} است.",
+  "AI_CHAT_SETTINGS_TITLE": "تنظیمات هوش مصنوعی",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "پیش‌فرض (محلی {0})",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "این ارائه‌دهندگان {0} را پیکربندی می‌کنند. کلید API به عنوان {1} به آن ارسال می‌شود.",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "برای تشخیص خودکار، خالی بگذارید.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "مسیر فایل اجرایی {0}"
 });
\ No newline at end of file
diff --git a/src/nls/fi/lastTranslated.json b/src/nls/fi/lastTranslated.json
index 61b0783d87..9fb162a6f3 100644
--- a/src/nls/fi/lastTranslated.json
+++ b/src/nls/fi/lastTranslated.json
@@ -33,6 +33,11 @@
   "AI_CHAT_CLAUDE_LOGIN_MSG": "Claude Code is installed but needs to be configured.",
   "AI_CHAT_CLAUDE_LOGIN_RESTART_NOTE": "Restart {APP_NAME} after configuration completes.",
   "AI_CHAT_CLAUDE_LOGIN_TITLE": "Setup Claude Code",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "That file did not run as {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "No file exists at that path.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "That file is not executable.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "That path contains characters that cannot be used.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "That file did not respond in time.",
   "AI_CHAT_CLI_INSTALLING": "Installing…",
   "AI_CHAT_CLI_INSTALLING_MSG": "Installing Claude Code, please wait. This may take a while...",
   "AI_CHAT_CLI_INSTALL_BTN": "Install Claude Code",
@@ -40,6 +45,12 @@
   "AI_CHAT_CLI_NEW_CONFIRM_MSG": "This will end the running Claude Code CLI session and start a fresh one. Continue?",
   "AI_CHAT_CLI_NEW_CONFIRM_TITLE": "End this CLI session?",
   "AI_CHAT_CLI_NOT_FOUND": "Claude Code Not Installed",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "The path set for {0} could not be used: {1} Enter a different path, or clear the box to detect it automatically.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Install {0}",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installation instructions",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} could not be found on this system. Install it, or enter the full path to its executable below.",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Save & Retry",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} not found",
   "AI_CHAT_CLI_RESTART_NOTE": "Restart {APP_NAME} after installation completes.",
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "This Claude Code CLI session is still running in {0} — the open project is now {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Stay on “{0}”",
@@ -48,6 +59,9 @@
   "AI_CHAT_CLI_UPSELL_OPEN_TERMINAL_BTN": "Open in Terminal",
   "AI_CHAT_CLI_UPSELL_TITLE": "Available in Phoenix Pro",
   "AI_CHAT_CLI_UPSELL_UPGRADE_BTN": "Upgrade to Pro",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "This will end the running Codex CLI session and start a fresh one. Continue?",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "This Codex CLI session is still running in {0} — the open project is now {1}.",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Running Codex inside the Phoenix AI panel is a Pro feature. You can still run the Codex CLI for free from the Terminal.",
   "AI_CHAT_CODE_COLLAPSE": "Collapse",
   "AI_CHAT_CODE_COLLAPSE_FOOTER": "Click to collapse",
   "AI_CHAT_CODE_DEFAULT_LANG": "text",
@@ -106,6 +120,7 @@
   "AI_CHAT_MODE_AUTO": "Auto",
   "AI_CHAT_MODE_CHAT": "Claude Code",
   "AI_CHAT_MODE_CLI": "Claude Code CLI",
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
   "AI_CHAT_MODE_EDIT": "AI Edit Mode",
   "AI_CHAT_MODE_FULL_AUTO": "Allow Everything",
   "AI_CHAT_MODE_INFO_AUTO": "AI uses judgment to auto-approve safe actions and asks about risky ones (Click to switch)",
@@ -113,7 +128,7 @@
   "AI_CHAT_MODE_INFO_FULL_AUTO": "AI can edit files and run commands without approval (Click to switch)",
   "AI_CHAT_MODE_INFO_PLAN": "AI will propose a plan before making changes (Click to switch)",
   "AI_CHAT_MODE_PLAN": "Plan Mode",
-  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded Claude Code CLI terminal",
+  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded CLI terminal",
   "AI_CHAT_NEW_BTN": "New",
   "AI_CHAT_NEW_SESSION_TITLE": "Start a new conversation",
   "AI_CHAT_NEW_WHILE_STREAMING_MSG": "AI is currently working on a task. Starting a new conversation will stop it. Continue?",
@@ -180,7 +195,7 @@
   "AI_CHAT_SEND_ERROR": "Failed to send message: {0}",
   "AI_CHAT_SEND_TITLE": "Send message",
   "AI_CHAT_SESSION_RESUMED": "Resumed session",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code Settings",
+  "AI_CHAT_SETTINGS_TITLE": "AI Settings",
   "AI_CHAT_SETUP_LEARN_MORE": "Learn More",
   "AI_CHAT_SETUP_NEED_HELP": "Need Help?",
   "AI_CHAT_SHOW_DIFF": "Show diff",
@@ -287,8 +302,11 @@
   "AI_SETTINGS_API_TIMEOUT_PLACEHOLDER": "Leave blank for default",
   "AI_SETTINGS_BASE_URL": "Base URL",
   "AI_SETTINGS_BASE_URL_PLACEHOLDER": "Leave blank for default",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Leave blank to detect automatically.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Path to the {0} executable",
   "AI_SETTINGS_CUSTOM_ENDPOINT_NOTICE": "Using custom API endpoint: {0}",
   "AI_SETTINGS_DEFAULT_PROVIDER": "Default (Local Claude Code)",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Default (Local {0})",
   "AI_SETTINGS_DELETE": "Delete",
   "AI_SETTINGS_DELETE_ACTIVE_CONFIRM": "\"{0}\" is the active provider. Deleting it will revert to the default. Continue?",
   "AI_SETTINGS_DELETE_PROVIDER": "Delete Provider",
@@ -301,6 +319,7 @@
   "AI_SETTINGS_PROVIDERS": "Providers",
   "AI_SETTINGS_PROVIDER_NAME": "Name",
   "AI_SETTINGS_PROVIDER_NAME_PLACEHOLDER": "e.g. My API Provider",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "These providers configure {0}. The API key is passed to it as {1}.",
   "AI_SETTINGS_RESET": "Reset",
   "AI_SETTINGS_SAVE": "Save",
   "AI_SETTINGS_SAVE_PROVIDER": "Save Provider",
diff --git a/src/nls/fi/strings.js b/src/nls/fi/strings.js
index 2f4573b94a..cfccbd19b2 100644
--- a/src/nls/fi/strings.js
+++ b/src/nls/fi/strings.js
@@ -812,6 +812,8 @@ define({
   "LIVE_PREVIEW_LAYERS_EMPTY_PAGE_STYLES": "Sivu on tyhjä. Lisää elementti nähdäksesi sen tyylit.",
   "LIVE_PREVIEW_LAYERS_SHOW_SELECTED": "Näytä valittu elementti",
   "LIVE_PREVIEW_LAYERS_SCRUB_HINT": "Säädä vetämällä, muokkaa kaksoisnapsauttamalla",
+  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "Ominaisuus",
+  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "Arvo",
   "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS": "Esikatselu peruutettiin, koska selaimen kehitystyökalut avattiin",
   "LIVE_DEV_DETACHED_TARGET_CLOSED": "Esikatselu peruutettiin, koska sivu suljettiin selaimessa",
   "LIVE_DEV_NAVIGATED_AWAY": "Esikatselu peruutettiin, koska selain siirtyi sivulle, joka ei kuulu nykyiseen projektiin",
@@ -2546,7 +2548,6 @@ define({
   "AI_CHAT_MODEL_DESC_SONNET": "Tasapainoinen nopeus ja suorituskyky jokapäiväiseen koodaukseen",
   "AI_CHAT_MODEL_DESC_HAIKU": "Nopein malli nopeisiin, yksinkertaisiin tehtäviin",
   "AI_CHAT_MODEL_SELECT_TITLE": "Valitse tekoälymalli tälle keskustelulle",
-  "AI_CHAT_MODE_SELECT_TITLE": "Vaihda Claude Code -keskustelun ja upotetun Claude Code CLI -terminaalin välillä",
   "AI_CHAT_MODEL_SWITCHED_NOTICE": "Vaihdettu malliin {0}. Muutos koskee seuraavaa viestiäsi; ensimmäinen vastaus voi kestää hetken kauemmin, kun välimuistia rakennetaan uudelleen.",
   "AI_CHAT_INPUT_HINT": "Paina {0} lähettääksesi · {1} rivinvaihto",
   "AI_CHAT_BASH_CONFIRM_TITLE": "Sallitaanko komento?",
@@ -2618,7 +2619,6 @@ define({
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "Tämä Claude Code CLI -istunto on yhä käynnissä projektissa {0} — avoinna oleva projekti on nyt {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_SWITCH_BTN": "Vaihda kohteeseen ”{0}”",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Pysy kohteessa ”{0}”",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code -asetukset",
   "AI_SETTINGS_API_KEY": "API-avain",
   "AI_SETTINGS_BASE_URL": "Perus-URL",
   "AI_SETTINGS_API_TIMEOUT": "API-aikakatkaisu (ms)",
@@ -2762,6 +2762,25 @@ define({
   "MIGRATE_UNREACHABLE_TITLE": "Ei saatu yhteyttä vanhaan sivustoon",
   "MIGRATE_UNREACHABLE_MESSAGE": "{APP_NAME} ei saanut yhteyttä kohteeseen {0} hakeakseen projektejasi ja asetuksiasi, joten mitään ei ole muutettu. Tarkista internetyhteytesi ja yritä sitten uudelleen valitsemalla {1}.",
   "CMD_MIGRATE_DATA": "Siirrä omat tiedot lähteestä {0}…",
-  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "Ominaisuus",
-  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "Arvo"
+  "AI_CHAT_MODE_CODEX_CLI": "Codex-komentorivi",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} ei löytynyt",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "Ohjelmaa {0} ei löytynyt tästä järjestelmästä. Asenna se tai anna sen suoritettavan tiedoston koko polku alla.",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "Asetettua polkua ohjelmalle {0} ei voitu käyttää: {1} Anna toinen polku tai tyhjennä kenttä, jotta se tunnistetaan automaattisesti.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Asenna {0}",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Tallenna ja yritä uudelleen",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Asennusohjeet",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "Kyseisessä polussa ei ole tiedostoa.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "Kyseinen tiedosto ei ole suoritettava.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "Tiedostoa ei voitu suorittaa ohjelmana {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "Tiedosto ei vastannut ajoissa.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "Polku sisältää merkkejä, joita ei voi käyttää.",
+  "AI_CHAT_MODE_SELECT_TITLE": "Vaihda Claude Code -keskustelun ja upotetun CLI-päätteen välillä.",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "Tämä päättää käynnissä olevan Codex CLI -istunnon ja aloittaa uuden. Jatketaanko?",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Codexin käyttäminen Phoenix AI -paneelissa on Pro-ominaisuus. Voit silti käyttää Codex CLI:tä ilmaiseksi Päätteestä.",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "Tämä Codex CLI -istunto on yhä käynnissä kohteessa {0} — avoinna oleva projekti on nyt {1}.",
+  "AI_CHAT_SETTINGS_TITLE": "Tekoälyasetukset",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Oletus (paikallinen {0})",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "Nämä palveluntarjoajat määrittävät kohteen {0}. API-avain välitetään sille muodossa {1}.",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Jätä tyhjäksi automaattista tunnistusta varten.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Polku {0}-suoritettavaan"
 });
\ No newline at end of file
diff --git a/src/nls/fr/lastTranslated.json b/src/nls/fr/lastTranslated.json
index 61b0783d87..9fb162a6f3 100644
--- a/src/nls/fr/lastTranslated.json
+++ b/src/nls/fr/lastTranslated.json
@@ -33,6 +33,11 @@
   "AI_CHAT_CLAUDE_LOGIN_MSG": "Claude Code is installed but needs to be configured.",
   "AI_CHAT_CLAUDE_LOGIN_RESTART_NOTE": "Restart {APP_NAME} after configuration completes.",
   "AI_CHAT_CLAUDE_LOGIN_TITLE": "Setup Claude Code",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "That file did not run as {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "No file exists at that path.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "That file is not executable.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "That path contains characters that cannot be used.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "That file did not respond in time.",
   "AI_CHAT_CLI_INSTALLING": "Installing…",
   "AI_CHAT_CLI_INSTALLING_MSG": "Installing Claude Code, please wait. This may take a while...",
   "AI_CHAT_CLI_INSTALL_BTN": "Install Claude Code",
@@ -40,6 +45,12 @@
   "AI_CHAT_CLI_NEW_CONFIRM_MSG": "This will end the running Claude Code CLI session and start a fresh one. Continue?",
   "AI_CHAT_CLI_NEW_CONFIRM_TITLE": "End this CLI session?",
   "AI_CHAT_CLI_NOT_FOUND": "Claude Code Not Installed",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "The path set for {0} could not be used: {1} Enter a different path, or clear the box to detect it automatically.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Install {0}",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installation instructions",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} could not be found on this system. Install it, or enter the full path to its executable below.",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Save & Retry",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} not found",
   "AI_CHAT_CLI_RESTART_NOTE": "Restart {APP_NAME} after installation completes.",
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "This Claude Code CLI session is still running in {0} — the open project is now {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Stay on “{0}”",
@@ -48,6 +59,9 @@
   "AI_CHAT_CLI_UPSELL_OPEN_TERMINAL_BTN": "Open in Terminal",
   "AI_CHAT_CLI_UPSELL_TITLE": "Available in Phoenix Pro",
   "AI_CHAT_CLI_UPSELL_UPGRADE_BTN": "Upgrade to Pro",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "This will end the running Codex CLI session and start a fresh one. Continue?",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "This Codex CLI session is still running in {0} — the open project is now {1}.",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Running Codex inside the Phoenix AI panel is a Pro feature. You can still run the Codex CLI for free from the Terminal.",
   "AI_CHAT_CODE_COLLAPSE": "Collapse",
   "AI_CHAT_CODE_COLLAPSE_FOOTER": "Click to collapse",
   "AI_CHAT_CODE_DEFAULT_LANG": "text",
@@ -106,6 +120,7 @@
   "AI_CHAT_MODE_AUTO": "Auto",
   "AI_CHAT_MODE_CHAT": "Claude Code",
   "AI_CHAT_MODE_CLI": "Claude Code CLI",
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
   "AI_CHAT_MODE_EDIT": "AI Edit Mode",
   "AI_CHAT_MODE_FULL_AUTO": "Allow Everything",
   "AI_CHAT_MODE_INFO_AUTO": "AI uses judgment to auto-approve safe actions and asks about risky ones (Click to switch)",
@@ -113,7 +128,7 @@
   "AI_CHAT_MODE_INFO_FULL_AUTO": "AI can edit files and run commands without approval (Click to switch)",
   "AI_CHAT_MODE_INFO_PLAN": "AI will propose a plan before making changes (Click to switch)",
   "AI_CHAT_MODE_PLAN": "Plan Mode",
-  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded Claude Code CLI terminal",
+  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded CLI terminal",
   "AI_CHAT_NEW_BTN": "New",
   "AI_CHAT_NEW_SESSION_TITLE": "Start a new conversation",
   "AI_CHAT_NEW_WHILE_STREAMING_MSG": "AI is currently working on a task. Starting a new conversation will stop it. Continue?",
@@ -180,7 +195,7 @@
   "AI_CHAT_SEND_ERROR": "Failed to send message: {0}",
   "AI_CHAT_SEND_TITLE": "Send message",
   "AI_CHAT_SESSION_RESUMED": "Resumed session",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code Settings",
+  "AI_CHAT_SETTINGS_TITLE": "AI Settings",
   "AI_CHAT_SETUP_LEARN_MORE": "Learn More",
   "AI_CHAT_SETUP_NEED_HELP": "Need Help?",
   "AI_CHAT_SHOW_DIFF": "Show diff",
@@ -287,8 +302,11 @@
   "AI_SETTINGS_API_TIMEOUT_PLACEHOLDER": "Leave blank for default",
   "AI_SETTINGS_BASE_URL": "Base URL",
   "AI_SETTINGS_BASE_URL_PLACEHOLDER": "Leave blank for default",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Leave blank to detect automatically.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Path to the {0} executable",
   "AI_SETTINGS_CUSTOM_ENDPOINT_NOTICE": "Using custom API endpoint: {0}",
   "AI_SETTINGS_DEFAULT_PROVIDER": "Default (Local Claude Code)",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Default (Local {0})",
   "AI_SETTINGS_DELETE": "Delete",
   "AI_SETTINGS_DELETE_ACTIVE_CONFIRM": "\"{0}\" is the active provider. Deleting it will revert to the default. Continue?",
   "AI_SETTINGS_DELETE_PROVIDER": "Delete Provider",
@@ -301,6 +319,7 @@
   "AI_SETTINGS_PROVIDERS": "Providers",
   "AI_SETTINGS_PROVIDER_NAME": "Name",
   "AI_SETTINGS_PROVIDER_NAME_PLACEHOLDER": "e.g. My API Provider",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "These providers configure {0}. The API key is passed to it as {1}.",
   "AI_SETTINGS_RESET": "Reset",
   "AI_SETTINGS_SAVE": "Save",
   "AI_SETTINGS_SAVE_PROVIDER": "Save Provider",
diff --git a/src/nls/fr/strings.js b/src/nls/fr/strings.js
index 0cd82ad4bc..89d7030bad 100644
--- a/src/nls/fr/strings.js
+++ b/src/nls/fr/strings.js
@@ -812,6 +812,8 @@ define({
   "LIVE_PREVIEW_LAYERS_EMPTY_PAGE_STYLES": "La page est vide. Ajoutez un élément pour voir ses styles.",
   "LIVE_PREVIEW_LAYERS_SHOW_SELECTED": "Afficher l'élément sélectionné",
   "LIVE_PREVIEW_LAYERS_SCRUB_HINT": "Glisser pour ajuster, double-cliquer pour modifier",
+  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "propriété",
+  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "valeur",
   "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS": "Aperçu en direct annulé car les outils de développement du navigateur étaient ouverts",
   "LIVE_DEV_DETACHED_TARGET_CLOSED": "Aperçu en direct annulé car la page a été fermée dans le navigateur",
   "LIVE_DEV_NAVIGATED_AWAY": "Aperçu en direct annulé car le navigateur a accédé à une page qui ne fait pas partie du projet actuel",
@@ -2546,7 +2548,6 @@ define({
   "AI_CHAT_MODEL_DESC_SONNET": "Vitesse et capacité équilibrées pour le codage quotidien",
   "AI_CHAT_MODEL_DESC_HAIKU": "Modèle le plus rapide pour les tâches simples et rapides",
   "AI_CHAT_MODEL_SELECT_TITLE": "Choisissez le modèle d'IA pour cette discussion",
-  "AI_CHAT_MODE_SELECT_TITLE": "Basculer entre le chat Claude Code et un terminal Claude Code CLI intégré",
   "AI_CHAT_MODEL_SWITCHED_NOTICE": "Passage à {0}. S'applique à partir de votre prochain message ; la première réponse peut prendre un peu plus de temps pendant que le cache se reconstruit.",
   "AI_CHAT_INPUT_HINT": "Appuyez sur {0} pour envoyer · {1} pour aller à la ligne",
   "AI_CHAT_BASH_CONFIRM_TITLE": "Autoriser la commande ?",
@@ -2618,7 +2619,6 @@ define({
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "Cette session Claude Code CLI est toujours en cours dans {0} — le projet ouvert est maintenant {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_SWITCH_BTN": "Passer à “{0}”",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Rester sur “{0}”",
-  "AI_CHAT_SETTINGS_TITLE": "Paramètres de Claude Code",
   "AI_SETTINGS_API_KEY": "Clé d'API",
   "AI_SETTINGS_BASE_URL": "URL de base",
   "AI_SETTINGS_API_TIMEOUT": "Délai d'attente de l'API (ms)",
@@ -2762,6 +2762,25 @@ define({
   "MIGRATE_UNREACHABLE_TITLE": "Impossible d'atteindre l'ancien site",
   "MIGRATE_UNREACHABLE_MESSAGE": "{APP_NAME} n'a pas pu se connecter à {0} pour rechercher vos projets et paramètres, donc rien n'a été modifié. Vérifiez votre connexion Internet, puis réessayez avec {1}.",
   "CMD_MIGRATE_DATA": "Migrer mes données depuis {0}…",
-  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "propriété",
-  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "valeur"
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} introuvable",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} n'a pas été trouvé sur ce système. Installez-le, ou saisissez le chemin d'accès complet à son exécutable ci-dessous.",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "Le chemin d'accès défini pour {0} n'a pas pu être utilisé : {1} Saisissez un autre chemin d'accès, ou videz le champ pour le détecter automatiquement.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Installer {0}",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Enregistrer & réessayer",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Instructions d'installation",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "Aucun fichier n'existe à ce chemin d'accès.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "Ce fichier n'est pas exécutable.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "Ce fichier ne s'est pas exécuté en tant que {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "Le fichier n'a pas répondu à temps.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "Ce chemin contient des caractères non autorisés.",
+  "AI_CHAT_MODE_SELECT_TITLE": "Basculer entre le chat Claude Code et un terminal CLI intégré",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "Ceci mettra fin à la session Codex CLI en cours et en démarrera une nouvelle. Continuer ?",
+  "AI_CHAT_CODEX_UPSELL_MSG": "L'exécution de Codex dans le panneau Phoenix AI est une fonctionnalité Pro. Vous pouvez toujours exécuter Codex CLI gratuitement depuis le Terminal.",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "Cette session Codex CLI est toujours en cours d'exécution dans {0} — le projet ouvert est maintenant {1}.",
+  "AI_CHAT_SETTINGS_TITLE": "Paramètres de l'IA",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Par défaut (Local {0})",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "Ces fournisseurs configurent {0}. La clé d'API lui est transmise en tant que {1}.",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Laisser vide pour une détection automatique.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Chemin d'accès à l'exécutable {0}"
 });
\ No newline at end of file
diff --git a/src/nls/gl/lastTranslated.json b/src/nls/gl/lastTranslated.json
index 61b0783d87..9fb162a6f3 100644
--- a/src/nls/gl/lastTranslated.json
+++ b/src/nls/gl/lastTranslated.json
@@ -33,6 +33,11 @@
   "AI_CHAT_CLAUDE_LOGIN_MSG": "Claude Code is installed but needs to be configured.",
   "AI_CHAT_CLAUDE_LOGIN_RESTART_NOTE": "Restart {APP_NAME} after configuration completes.",
   "AI_CHAT_CLAUDE_LOGIN_TITLE": "Setup Claude Code",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "That file did not run as {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "No file exists at that path.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "That file is not executable.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "That path contains characters that cannot be used.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "That file did not respond in time.",
   "AI_CHAT_CLI_INSTALLING": "Installing…",
   "AI_CHAT_CLI_INSTALLING_MSG": "Installing Claude Code, please wait. This may take a while...",
   "AI_CHAT_CLI_INSTALL_BTN": "Install Claude Code",
@@ -40,6 +45,12 @@
   "AI_CHAT_CLI_NEW_CONFIRM_MSG": "This will end the running Claude Code CLI session and start a fresh one. Continue?",
   "AI_CHAT_CLI_NEW_CONFIRM_TITLE": "End this CLI session?",
   "AI_CHAT_CLI_NOT_FOUND": "Claude Code Not Installed",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "The path set for {0} could not be used: {1} Enter a different path, or clear the box to detect it automatically.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Install {0}",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installation instructions",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} could not be found on this system. Install it, or enter the full path to its executable below.",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Save & Retry",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} not found",
   "AI_CHAT_CLI_RESTART_NOTE": "Restart {APP_NAME} after installation completes.",
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "This Claude Code CLI session is still running in {0} — the open project is now {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Stay on “{0}”",
@@ -48,6 +59,9 @@
   "AI_CHAT_CLI_UPSELL_OPEN_TERMINAL_BTN": "Open in Terminal",
   "AI_CHAT_CLI_UPSELL_TITLE": "Available in Phoenix Pro",
   "AI_CHAT_CLI_UPSELL_UPGRADE_BTN": "Upgrade to Pro",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "This will end the running Codex CLI session and start a fresh one. Continue?",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "This Codex CLI session is still running in {0} — the open project is now {1}.",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Running Codex inside the Phoenix AI panel is a Pro feature. You can still run the Codex CLI for free from the Terminal.",
   "AI_CHAT_CODE_COLLAPSE": "Collapse",
   "AI_CHAT_CODE_COLLAPSE_FOOTER": "Click to collapse",
   "AI_CHAT_CODE_DEFAULT_LANG": "text",
@@ -106,6 +120,7 @@
   "AI_CHAT_MODE_AUTO": "Auto",
   "AI_CHAT_MODE_CHAT": "Claude Code",
   "AI_CHAT_MODE_CLI": "Claude Code CLI",
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
   "AI_CHAT_MODE_EDIT": "AI Edit Mode",
   "AI_CHAT_MODE_FULL_AUTO": "Allow Everything",
   "AI_CHAT_MODE_INFO_AUTO": "AI uses judgment to auto-approve safe actions and asks about risky ones (Click to switch)",
@@ -113,7 +128,7 @@
   "AI_CHAT_MODE_INFO_FULL_AUTO": "AI can edit files and run commands without approval (Click to switch)",
   "AI_CHAT_MODE_INFO_PLAN": "AI will propose a plan before making changes (Click to switch)",
   "AI_CHAT_MODE_PLAN": "Plan Mode",
-  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded Claude Code CLI terminal",
+  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded CLI terminal",
   "AI_CHAT_NEW_BTN": "New",
   "AI_CHAT_NEW_SESSION_TITLE": "Start a new conversation",
   "AI_CHAT_NEW_WHILE_STREAMING_MSG": "AI is currently working on a task. Starting a new conversation will stop it. Continue?",
@@ -180,7 +195,7 @@
   "AI_CHAT_SEND_ERROR": "Failed to send message: {0}",
   "AI_CHAT_SEND_TITLE": "Send message",
   "AI_CHAT_SESSION_RESUMED": "Resumed session",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code Settings",
+  "AI_CHAT_SETTINGS_TITLE": "AI Settings",
   "AI_CHAT_SETUP_LEARN_MORE": "Learn More",
   "AI_CHAT_SETUP_NEED_HELP": "Need Help?",
   "AI_CHAT_SHOW_DIFF": "Show diff",
@@ -287,8 +302,11 @@
   "AI_SETTINGS_API_TIMEOUT_PLACEHOLDER": "Leave blank for default",
   "AI_SETTINGS_BASE_URL": "Base URL",
   "AI_SETTINGS_BASE_URL_PLACEHOLDER": "Leave blank for default",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Leave blank to detect automatically.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Path to the {0} executable",
   "AI_SETTINGS_CUSTOM_ENDPOINT_NOTICE": "Using custom API endpoint: {0}",
   "AI_SETTINGS_DEFAULT_PROVIDER": "Default (Local Claude Code)",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Default (Local {0})",
   "AI_SETTINGS_DELETE": "Delete",
   "AI_SETTINGS_DELETE_ACTIVE_CONFIRM": "\"{0}\" is the active provider. Deleting it will revert to the default. Continue?",
   "AI_SETTINGS_DELETE_PROVIDER": "Delete Provider",
@@ -301,6 +319,7 @@
   "AI_SETTINGS_PROVIDERS": "Providers",
   "AI_SETTINGS_PROVIDER_NAME": "Name",
   "AI_SETTINGS_PROVIDER_NAME_PLACEHOLDER": "e.g. My API Provider",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "These providers configure {0}. The API key is passed to it as {1}.",
   "AI_SETTINGS_RESET": "Reset",
   "AI_SETTINGS_SAVE": "Save",
   "AI_SETTINGS_SAVE_PROVIDER": "Save Provider",
diff --git a/src/nls/gl/strings.js b/src/nls/gl/strings.js
index 5b33b5a267..c80f36170b 100644
--- a/src/nls/gl/strings.js
+++ b/src/nls/gl/strings.js
@@ -812,6 +812,8 @@ define({
   "LIVE_PREVIEW_LAYERS_EMPTY_PAGE_STYLES": "A páxina está baleira. Engada un elemento para ver os seus estilos.",
   "LIVE_PREVIEW_LAYERS_SHOW_SELECTED": "Amosar o elemento seleccionado",
   "LIVE_PREVIEW_LAYERS_SCRUB_HINT": "Arrastre para axustar, faga dobre clic para editar",
+  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "propiedade",
+  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "valor",
   "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS": "Vista Previa en Vivo detiuse porque abríronse as ferramentas de desenvolvemento",
   "LIVE_DEV_DETACHED_TARGET_CLOSED": "Vista Previa en Vivo detiuse porque cerrouse a páxina no navegador",
   "LIVE_DEV_NAVIGATED_AWAY": "Vista Previa en Vivo detiuse porque accediuse a unha páxina que non é parte do proxecto actual",
@@ -2546,7 +2548,6 @@ define({
   "AI_CHAT_MODEL_DESC_SONNET": "Velocidade e capacidade equilibradas para a programación do día a día",
   "AI_CHAT_MODEL_DESC_HAIKU": "O modelo máis rápido para tarefas rápidas e sinxelas",
   "AI_CHAT_MODEL_SELECT_TITLE": "Escolla o modelo de IA para esta conversa",
-  "AI_CHAT_MODE_SELECT_TITLE": "Alternar entre o chat de Claude Code e un terminal CLI de Claude Code integrado",
   "AI_CHAT_MODEL_SWITCHED_NOTICE": "Cambiouse a {0}. Aplícase a partir da súa seguinte mensaxe; a primeira resposta pode tardar un pouco máis mentres se reconstrúe a caché.",
   "AI_CHAT_INPUT_HINT": "Preme {0} para enviar · {1} para unha nova liña",
   "AI_CHAT_BASH_CONFIRM_TITLE": "Permitir o comando?",
@@ -2618,7 +2619,6 @@ define({
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "Esta sesión da CLI de Claude Code segue en execución en {0} — o proxecto aberto agora é {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_SWITCH_BTN": "Cambiar a “{0}”",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Permanecer en “{0}”",
-  "AI_CHAT_SETTINGS_TITLE": "Configuración de Claude Code",
   "AI_SETTINGS_API_KEY": "Chave de API",
   "AI_SETTINGS_BASE_URL": "URL base",
   "AI_SETTINGS_API_TIMEOUT": "Tempo de espera da API (ms)",
@@ -2762,6 +2762,25 @@ define({
   "MIGRATE_UNREACHABLE_TITLE": "Non se puido acceder ao sitio antigo",
   "MIGRATE_UNREACHABLE_MESSAGE": "{APP_NAME} non se puido conectar a {0} para buscar os seus proxectos e configuracións, polo que non se cambiou nada. Comprobe a súa conexión a internet e despois ténteo de novo con {1}.",
   "CMD_MIGRATE_DATA": "Migrar os meus datos desde {0}…",
-  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "propiedade",
-  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "valor"
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "Non se atopou {0}",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "Non se puido atopar {0} neste sistema. Instálao ou introduce a ruta completa ao seu executábel a continuación.",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "Non se puido usar a ruta establecida para {0}: {1} Introduce unha ruta diferente ou baleira a caixa para detectala automaticamente.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Instalar {0}",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Gardar e tentar de novo",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Instrucións de instalación",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "Non existe ningún ficheiro nesa ruta.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "Ese ficheiro non é executábel.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "Ese ficheiro non se executou como {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "O ficheiro non respondeu a tempo.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "A ruta contén caracteres que non se poden usar.",
+  "AI_CHAT_MODE_SELECT_TITLE": "Cambiar entre o chat de Claude Code e un terminal da CLI integrado",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "Isto rematará a sesión da CLI de Codex en execución e iniciará unha nova. Desexa continuar?",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Executar Codex dentro do panel de IA de Phoenix é unha característica Pro. Aínda pode executar a CLI de Codex de balde dende o terminal.",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "Esta sesión da CLI de Codex aínda está en execución en {0} — o proxecto aberto agora é {1}.",
+  "AI_CHAT_SETTINGS_TITLE": "Configuración da IA",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Por defecto (Local {0})",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "Estes provedores configuran {0}. A clave da API pásaselle como {1}.",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Deixe en branco para detectar automaticamente.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Camiño do executábel {0}"
 });
\ No newline at end of file
diff --git a/src/nls/hi/lastTranslated.json b/src/nls/hi/lastTranslated.json
index 61b0783d87..9fb162a6f3 100644
--- a/src/nls/hi/lastTranslated.json
+++ b/src/nls/hi/lastTranslated.json
@@ -33,6 +33,11 @@
   "AI_CHAT_CLAUDE_LOGIN_MSG": "Claude Code is installed but needs to be configured.",
   "AI_CHAT_CLAUDE_LOGIN_RESTART_NOTE": "Restart {APP_NAME} after configuration completes.",
   "AI_CHAT_CLAUDE_LOGIN_TITLE": "Setup Claude Code",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "That file did not run as {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "No file exists at that path.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "That file is not executable.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "That path contains characters that cannot be used.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "That file did not respond in time.",
   "AI_CHAT_CLI_INSTALLING": "Installing…",
   "AI_CHAT_CLI_INSTALLING_MSG": "Installing Claude Code, please wait. This may take a while...",
   "AI_CHAT_CLI_INSTALL_BTN": "Install Claude Code",
@@ -40,6 +45,12 @@
   "AI_CHAT_CLI_NEW_CONFIRM_MSG": "This will end the running Claude Code CLI session and start a fresh one. Continue?",
   "AI_CHAT_CLI_NEW_CONFIRM_TITLE": "End this CLI session?",
   "AI_CHAT_CLI_NOT_FOUND": "Claude Code Not Installed",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "The path set for {0} could not be used: {1} Enter a different path, or clear the box to detect it automatically.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Install {0}",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installation instructions",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} could not be found on this system. Install it, or enter the full path to its executable below.",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Save & Retry",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} not found",
   "AI_CHAT_CLI_RESTART_NOTE": "Restart {APP_NAME} after installation completes.",
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "This Claude Code CLI session is still running in {0} — the open project is now {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Stay on “{0}”",
@@ -48,6 +59,9 @@
   "AI_CHAT_CLI_UPSELL_OPEN_TERMINAL_BTN": "Open in Terminal",
   "AI_CHAT_CLI_UPSELL_TITLE": "Available in Phoenix Pro",
   "AI_CHAT_CLI_UPSELL_UPGRADE_BTN": "Upgrade to Pro",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "This will end the running Codex CLI session and start a fresh one. Continue?",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "This Codex CLI session is still running in {0} — the open project is now {1}.",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Running Codex inside the Phoenix AI panel is a Pro feature. You can still run the Codex CLI for free from the Terminal.",
   "AI_CHAT_CODE_COLLAPSE": "Collapse",
   "AI_CHAT_CODE_COLLAPSE_FOOTER": "Click to collapse",
   "AI_CHAT_CODE_DEFAULT_LANG": "text",
@@ -106,6 +120,7 @@
   "AI_CHAT_MODE_AUTO": "Auto",
   "AI_CHAT_MODE_CHAT": "Claude Code",
   "AI_CHAT_MODE_CLI": "Claude Code CLI",
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
   "AI_CHAT_MODE_EDIT": "AI Edit Mode",
   "AI_CHAT_MODE_FULL_AUTO": "Allow Everything",
   "AI_CHAT_MODE_INFO_AUTO": "AI uses judgment to auto-approve safe actions and asks about risky ones (Click to switch)",
@@ -113,7 +128,7 @@
   "AI_CHAT_MODE_INFO_FULL_AUTO": "AI can edit files and run commands without approval (Click to switch)",
   "AI_CHAT_MODE_INFO_PLAN": "AI will propose a plan before making changes (Click to switch)",
   "AI_CHAT_MODE_PLAN": "Plan Mode",
-  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded Claude Code CLI terminal",
+  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded CLI terminal",
   "AI_CHAT_NEW_BTN": "New",
   "AI_CHAT_NEW_SESSION_TITLE": "Start a new conversation",
   "AI_CHAT_NEW_WHILE_STREAMING_MSG": "AI is currently working on a task. Starting a new conversation will stop it. Continue?",
@@ -180,7 +195,7 @@
   "AI_CHAT_SEND_ERROR": "Failed to send message: {0}",
   "AI_CHAT_SEND_TITLE": "Send message",
   "AI_CHAT_SESSION_RESUMED": "Resumed session",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code Settings",
+  "AI_CHAT_SETTINGS_TITLE": "AI Settings",
   "AI_CHAT_SETUP_LEARN_MORE": "Learn More",
   "AI_CHAT_SETUP_NEED_HELP": "Need Help?",
   "AI_CHAT_SHOW_DIFF": "Show diff",
@@ -287,8 +302,11 @@
   "AI_SETTINGS_API_TIMEOUT_PLACEHOLDER": "Leave blank for default",
   "AI_SETTINGS_BASE_URL": "Base URL",
   "AI_SETTINGS_BASE_URL_PLACEHOLDER": "Leave blank for default",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Leave blank to detect automatically.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Path to the {0} executable",
   "AI_SETTINGS_CUSTOM_ENDPOINT_NOTICE": "Using custom API endpoint: {0}",
   "AI_SETTINGS_DEFAULT_PROVIDER": "Default (Local Claude Code)",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Default (Local {0})",
   "AI_SETTINGS_DELETE": "Delete",
   "AI_SETTINGS_DELETE_ACTIVE_CONFIRM": "\"{0}\" is the active provider. Deleting it will revert to the default. Continue?",
   "AI_SETTINGS_DELETE_PROVIDER": "Delete Provider",
@@ -301,6 +319,7 @@
   "AI_SETTINGS_PROVIDERS": "Providers",
   "AI_SETTINGS_PROVIDER_NAME": "Name",
   "AI_SETTINGS_PROVIDER_NAME_PLACEHOLDER": "e.g. My API Provider",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "These providers configure {0}. The API key is passed to it as {1}.",
   "AI_SETTINGS_RESET": "Reset",
   "AI_SETTINGS_SAVE": "Save",
   "AI_SETTINGS_SAVE_PROVIDER": "Save Provider",
diff --git a/src/nls/hi/strings.js b/src/nls/hi/strings.js
index 32c799ec19..2054e19f9e 100644
--- a/src/nls/hi/strings.js
+++ b/src/nls/hi/strings.js
@@ -812,6 +812,8 @@ define({
   "LIVE_PREVIEW_LAYERS_EMPTY_PAGE_STYLES": "पेज खाली है। इसकी स्टाइल देखने के लिए एक एलीमेंट जोड़ें।",
   "LIVE_PREVIEW_LAYERS_SHOW_SELECTED": "चुने हुए एलीमेंट को दिखाएँ",
   "LIVE_PREVIEW_LAYERS_SCRUB_HINT": "एडजस्ट करने के लिए ड्रैग करें, एडिट करने के लिए डबल-क्लिक करें",
+  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "गुण",
+  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "मान",
   "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS": "लाइव प्रीव्यू रद्द कर दिया गया क्योंकि ब्राउज़र के डेवलपर टूल खोले गए थे",
   "LIVE_DEV_DETACHED_TARGET_CLOSED": "लाइव प्रीव्यू रद्द कर दिया गया क्योंकि ब्राउज़र में पृष्ठ बंद कर दिया गया था",
   "LIVE_DEV_NAVIGATED_AWAY": "लाइव प्रीव्यू रद्द कर दिया गया क्योंकि ब्राउज़र ने ऐसे पृष्ठ पर नेविगेट किया जो वर्तमान प्रोजेक्ट का हिस्सा नहीं है",
@@ -2546,7 +2548,6 @@ define({
   "AI_CHAT_MODEL_DESC_SONNET": "रोज़मर्रा की कोडिंग के लिए संतुलित गति और क्षमता",
   "AI_CHAT_MODEL_DESC_HAIKU": "त्वरित, सरल कार्यों के लिए सबसे तेज़ मॉडल",
   "AI_CHAT_MODEL_SELECT_TITLE": "इस चैट के लिए AI मॉडल चुनें",
-  "AI_CHAT_MODE_SELECT_TITLE": "Claude Code चैट और एम्बेडेड Claude Code सीएलआई टर्मिनल के बीच स्विच करें",
   "AI_CHAT_MODEL_SWITCHED_NOTICE": "{0} पर स्विच किया गया। आपके अगले संदेश से लागू होगा; कैश के फिर से बनने के दौरान पहली प्रतिक्रिया में थोड़ा अधिक समय लग सकता है।",
   "AI_CHAT_INPUT_HINT": "भेजने के लिए {0} दबाएँ · नई लाइन के लिए {1}",
   "AI_CHAT_BASH_CONFIRM_TITLE": "कमांड की अनुमति दें?",
@@ -2618,7 +2619,6 @@ define({
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "यह Claude Code सीएलआई सत्र अभी भी {0} में चल रहा है — खुला हुआ प्रोजेक्ट अब {1} है।",
   "AI_CHAT_CLI_STALE_PROJECT_SWITCH_BTN": "“{0}” पर स्विच करें",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "“{0}” पर बने रहें",
-  "AI_CHAT_SETTINGS_TITLE": "क्लॉड कोड सेटिंग्स",
   "AI_SETTINGS_API_KEY": "API कुंजी",
   "AI_SETTINGS_BASE_URL": "बेस URL",
   "AI_SETTINGS_API_TIMEOUT": "API टाइमआउट (ms)",
@@ -2762,6 +2762,25 @@ define({
   "MIGRATE_UNREACHABLE_TITLE": "पुरानी साइट तक नहीं पहुंच सके",
   "MIGRATE_UNREACHABLE_MESSAGE": "{APP_NAME} आपके प्रोजेक्ट और सेटिंग्स को खोजने के लिए {0} से कनेक्ट नहीं हो सका, इसलिए कुछ भी नहीं बदला गया है। अपना इंटरनेट कनेक्शन जाँचें, फिर {1} के साथ फिर से प्रयास करें।",
   "CMD_MIGRATE_DATA": "{0} से मेरा डेटा माइग्रेट करें…",
-  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "गुण",
-  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "मान"
+  "AI_CHAT_MODE_CODEX_CLI": "कोडेक्स सीएलआई",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} नहीं मिला",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} इस सिस्टम पर नहीं मिला। इसे इंस्टॉल करें, या नीचे इसके एक्जीक्यूटेबल का पूरा पाथ दर्ज करें।",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "{0} के लिए सेट किया गया पाथ उपयोग नहीं किया जा सका: {1} एक अलग पाथ दर्ज करें, या इसे स्वचालित रूप से खोजने के लिए बॉक्स को खाली करें।",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "{0} इंस्टॉल करें",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "सहेजें और फिर से प्रयास करें",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "इंस्टॉलेशन निर्देश",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "उस पाथ पर कोई फ़ाइल मौजूद नहीं है।",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "वह फ़ाइल एक्जीक्यूटेबल नहीं है।",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "वह फ़ाइल {0} के रूप में रन नहीं हुई।",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "उस फ़ाइल ने समय पर जवाब नहीं दिया।",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "उस पथ में ऐसे वर्ण हैं जिनका उपयोग नहीं किया जा सकता।",
+  "AI_CHAT_MODE_SELECT_TITLE": "Claude Code चैट और एक एम्बेडेड CLI टर्मिनल के बीच स्विच करें",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "यह चल रहे Codex CLI सत्र को समाप्त कर देगा और एक नया सत्र शुरू कर देगा। जारी रखें?",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Phoenix AI पैनल के अंदर Codex चलाना एक Pro फ़ीचर है। आप अभी भी टर्मिनल से Codex CLI को मुफ़्त में चला सकते हैं।",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "यह Codex CLI सत्र अभी भी {0} में चल रहा है — अब खुला हुआ प्रोजेक्ट {1} है।",
+  "AI_CHAT_SETTINGS_TITLE": "AI सेटिंग्स",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "डिफ़ॉल्ट (लोकल {0})",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "ये प्रदाता {0} को कॉन्फ़िगर करते हैं। API कुंजी इसे {1} के रूप में पास की जाती है।",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "स्वचालित रूप से पता लगाने के लिए खाली छोड़ दें।",
+  "AI_SETTINGS_CLI_PATH_LABEL": "{0} एक्जीक्यूटेबल तक का पथ"
 });
\ No newline at end of file
diff --git a/src/nls/hr/lastTranslated.json b/src/nls/hr/lastTranslated.json
index 61b0783d87..9fb162a6f3 100644
--- a/src/nls/hr/lastTranslated.json
+++ b/src/nls/hr/lastTranslated.json
@@ -33,6 +33,11 @@
   "AI_CHAT_CLAUDE_LOGIN_MSG": "Claude Code is installed but needs to be configured.",
   "AI_CHAT_CLAUDE_LOGIN_RESTART_NOTE": "Restart {APP_NAME} after configuration completes.",
   "AI_CHAT_CLAUDE_LOGIN_TITLE": "Setup Claude Code",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "That file did not run as {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "No file exists at that path.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "That file is not executable.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "That path contains characters that cannot be used.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "That file did not respond in time.",
   "AI_CHAT_CLI_INSTALLING": "Installing…",
   "AI_CHAT_CLI_INSTALLING_MSG": "Installing Claude Code, please wait. This may take a while...",
   "AI_CHAT_CLI_INSTALL_BTN": "Install Claude Code",
@@ -40,6 +45,12 @@
   "AI_CHAT_CLI_NEW_CONFIRM_MSG": "This will end the running Claude Code CLI session and start a fresh one. Continue?",
   "AI_CHAT_CLI_NEW_CONFIRM_TITLE": "End this CLI session?",
   "AI_CHAT_CLI_NOT_FOUND": "Claude Code Not Installed",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "The path set for {0} could not be used: {1} Enter a different path, or clear the box to detect it automatically.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Install {0}",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installation instructions",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} could not be found on this system. Install it, or enter the full path to its executable below.",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Save & Retry",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} not found",
   "AI_CHAT_CLI_RESTART_NOTE": "Restart {APP_NAME} after installation completes.",
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "This Claude Code CLI session is still running in {0} — the open project is now {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Stay on “{0}”",
@@ -48,6 +59,9 @@
   "AI_CHAT_CLI_UPSELL_OPEN_TERMINAL_BTN": "Open in Terminal",
   "AI_CHAT_CLI_UPSELL_TITLE": "Available in Phoenix Pro",
   "AI_CHAT_CLI_UPSELL_UPGRADE_BTN": "Upgrade to Pro",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "This will end the running Codex CLI session and start a fresh one. Continue?",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "This Codex CLI session is still running in {0} — the open project is now {1}.",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Running Codex inside the Phoenix AI panel is a Pro feature. You can still run the Codex CLI for free from the Terminal.",
   "AI_CHAT_CODE_COLLAPSE": "Collapse",
   "AI_CHAT_CODE_COLLAPSE_FOOTER": "Click to collapse",
   "AI_CHAT_CODE_DEFAULT_LANG": "text",
@@ -106,6 +120,7 @@
   "AI_CHAT_MODE_AUTO": "Auto",
   "AI_CHAT_MODE_CHAT": "Claude Code",
   "AI_CHAT_MODE_CLI": "Claude Code CLI",
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
   "AI_CHAT_MODE_EDIT": "AI Edit Mode",
   "AI_CHAT_MODE_FULL_AUTO": "Allow Everything",
   "AI_CHAT_MODE_INFO_AUTO": "AI uses judgment to auto-approve safe actions and asks about risky ones (Click to switch)",
@@ -113,7 +128,7 @@
   "AI_CHAT_MODE_INFO_FULL_AUTO": "AI can edit files and run commands without approval (Click to switch)",
   "AI_CHAT_MODE_INFO_PLAN": "AI will propose a plan before making changes (Click to switch)",
   "AI_CHAT_MODE_PLAN": "Plan Mode",
-  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded Claude Code CLI terminal",
+  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded CLI terminal",
   "AI_CHAT_NEW_BTN": "New",
   "AI_CHAT_NEW_SESSION_TITLE": "Start a new conversation",
   "AI_CHAT_NEW_WHILE_STREAMING_MSG": "AI is currently working on a task. Starting a new conversation will stop it. Continue?",
@@ -180,7 +195,7 @@
   "AI_CHAT_SEND_ERROR": "Failed to send message: {0}",
   "AI_CHAT_SEND_TITLE": "Send message",
   "AI_CHAT_SESSION_RESUMED": "Resumed session",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code Settings",
+  "AI_CHAT_SETTINGS_TITLE": "AI Settings",
   "AI_CHAT_SETUP_LEARN_MORE": "Learn More",
   "AI_CHAT_SETUP_NEED_HELP": "Need Help?",
   "AI_CHAT_SHOW_DIFF": "Show diff",
@@ -287,8 +302,11 @@
   "AI_SETTINGS_API_TIMEOUT_PLACEHOLDER": "Leave blank for default",
   "AI_SETTINGS_BASE_URL": "Base URL",
   "AI_SETTINGS_BASE_URL_PLACEHOLDER": "Leave blank for default",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Leave blank to detect automatically.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Path to the {0} executable",
   "AI_SETTINGS_CUSTOM_ENDPOINT_NOTICE": "Using custom API endpoint: {0}",
   "AI_SETTINGS_DEFAULT_PROVIDER": "Default (Local Claude Code)",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Default (Local {0})",
   "AI_SETTINGS_DELETE": "Delete",
   "AI_SETTINGS_DELETE_ACTIVE_CONFIRM": "\"{0}\" is the active provider. Deleting it will revert to the default. Continue?",
   "AI_SETTINGS_DELETE_PROVIDER": "Delete Provider",
@@ -301,6 +319,7 @@
   "AI_SETTINGS_PROVIDERS": "Providers",
   "AI_SETTINGS_PROVIDER_NAME": "Name",
   "AI_SETTINGS_PROVIDER_NAME_PLACEHOLDER": "e.g. My API Provider",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "These providers configure {0}. The API key is passed to it as {1}.",
   "AI_SETTINGS_RESET": "Reset",
   "AI_SETTINGS_SAVE": "Save",
   "AI_SETTINGS_SAVE_PROVIDER": "Save Provider",
diff --git a/src/nls/hr/strings.js b/src/nls/hr/strings.js
index 94c74908df..fdec00cab5 100644
--- a/src/nls/hr/strings.js
+++ b/src/nls/hr/strings.js
@@ -812,6 +812,8 @@ define({
   "LIVE_PREVIEW_LAYERS_EMPTY_PAGE_STYLES": "Stranica je prazna. Dodajte element da biste vidjeli njegove stilove.",
   "LIVE_PREVIEW_LAYERS_SHOW_SELECTED": "Prikaži odabrani element",
   "LIVE_PREVIEW_LAYERS_SCRUB_HINT": "Povucite za podešavanje, dvokliknite za uređivanje",
+  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "svojstvo",
+  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "vrijednost",
   "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS": "Prikaz uživo je otkazan jer su u pregledniku bili otvoreni razvojni alati",
   "LIVE_DEV_DETACHED_TARGET_CLOSED": "Prikaz uživo je otkazan jer je stranica zatvorena u pregledniku",
   "LIVE_DEV_NAVIGATED_AWAY": "Prikaz uživo je otkazan jer je preglednik otišao na stranicu koja nije dio trenutnog projekta.",
@@ -2546,7 +2548,6 @@ define({
   "AI_CHAT_MODEL_DESC_SONNET": "Uravnotežena brzina i sposobnost za svakodnevno kodiranje",
   "AI_CHAT_MODEL_DESC_HAIKU": "Najbrži model za brze, jednostavne zadatke",
   "AI_CHAT_MODEL_SELECT_TITLE": "Odaberite AI model za ovaj razgovor",
-  "AI_CHAT_MODE_SELECT_TITLE": "Prebacujte se između Claude Code chata i ugrađenog Claude Code CLI terminala",
   "AI_CHAT_MODEL_SWITCHED_NOTICE": "Prebačeno na {0}. Primjenjuje se od vaše sljedeće poruke; prvi odgovor može potrajati malo duže dok se predmemorija ponovno izgradi.",
   "AI_CHAT_INPUT_HINT": "Pritisnite {0} za slanje · {1} za novi redak",
   "AI_CHAT_BASH_CONFIRM_TITLE": "Dopustiti naredbu?",
@@ -2618,7 +2619,6 @@ define({
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "Ova Claude Code CLI sesija još uvijek je pokrenuta u {0} — otvoreni projekt sada je {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_SWITCH_BTN": "Prebaci na „{0}”",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Ostani na „{0}”",
-  "AI_CHAT_SETTINGS_TITLE": "Postavke za Claude Code",
   "AI_SETTINGS_API_KEY": "API ključ",
   "AI_SETTINGS_BASE_URL": "Osnovni URL",
   "AI_SETTINGS_API_TIMEOUT": "Vremensko ograničenje API-ja (ms)",
@@ -2762,6 +2762,25 @@ define({
   "MIGRATE_UNREACHABLE_TITLE": "Nije moguće pristupiti staroj stranici",
   "MIGRATE_UNREACHABLE_MESSAGE": "{APP_NAME} se nije mogao povezati s {0} kako bi potražio vaše projekte i postavke, stoga ništa nije promijenjeno. Provjerite internetsku vezu, a zatim ponovno pokušajte pomoću {1}.",
   "CMD_MIGRATE_DATA": "Migrirati moje podatke s {0}…",
-  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "svojstvo",
-  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "vrijednost"
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} nije pronađen",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} nije pronađen na ovom sustavu. Instalirajte ga ili unesite punu putanju do njegove izvršne datoteke u nastavku.",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "Postavljenu putanju za {0} nije moguće koristiti: {1} Unesite drugu putanju ili ispraznite polje za automatsko otkrivanje.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Instalirajte {0}",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Spremite i pokušajte ponovno",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Upute za instalaciju",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "Na toj putanji ne postoji datoteka.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "Ta datoteka nije izvršna.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "Ta datoteka se nije pokrenula kao {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "Ta datoteka nije odgovorila na vrijeme.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "Taj put sadrži znakove koji se ne mogu koristiti.",
+  "AI_CHAT_MODE_SELECT_TITLE": "Prebacivanje između Claude Code chata i ugrađenog CLI terminala",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "Ovo će prekinuti pokrenutu Codex CLI sesiju i pokrenuti novu. Nastaviti?",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Pokretanje Codexa unutar Phoenix AI panela je Pro značajka. I dalje možete besplatno pokrenuti Codex CLI iz Terminala.",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "Ova Codex CLI sesija još uvijek je pokrenuta u {0} — otvoreni projekt sada je {1}.",
+  "AI_CHAT_SETTINGS_TITLE": "AI postavke",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Zadano (Lokalni {0})",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "Ovi pružatelji konfiguriraju {0}. API ključ prosljeđuje mu se kao {1}.",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Ostavite prazno za automatsko otkrivanje.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Putanja do {0} izvršne datoteke"
 });
\ No newline at end of file
diff --git a/src/nls/hu/lastTranslated.json b/src/nls/hu/lastTranslated.json
index 61b0783d87..9fb162a6f3 100644
--- a/src/nls/hu/lastTranslated.json
+++ b/src/nls/hu/lastTranslated.json
@@ -33,6 +33,11 @@
   "AI_CHAT_CLAUDE_LOGIN_MSG": "Claude Code is installed but needs to be configured.",
   "AI_CHAT_CLAUDE_LOGIN_RESTART_NOTE": "Restart {APP_NAME} after configuration completes.",
   "AI_CHAT_CLAUDE_LOGIN_TITLE": "Setup Claude Code",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "That file did not run as {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "No file exists at that path.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "That file is not executable.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "That path contains characters that cannot be used.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "That file did not respond in time.",
   "AI_CHAT_CLI_INSTALLING": "Installing…",
   "AI_CHAT_CLI_INSTALLING_MSG": "Installing Claude Code, please wait. This may take a while...",
   "AI_CHAT_CLI_INSTALL_BTN": "Install Claude Code",
@@ -40,6 +45,12 @@
   "AI_CHAT_CLI_NEW_CONFIRM_MSG": "This will end the running Claude Code CLI session and start a fresh one. Continue?",
   "AI_CHAT_CLI_NEW_CONFIRM_TITLE": "End this CLI session?",
   "AI_CHAT_CLI_NOT_FOUND": "Claude Code Not Installed",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "The path set for {0} could not be used: {1} Enter a different path, or clear the box to detect it automatically.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Install {0}",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installation instructions",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} could not be found on this system. Install it, or enter the full path to its executable below.",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Save & Retry",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} not found",
   "AI_CHAT_CLI_RESTART_NOTE": "Restart {APP_NAME} after installation completes.",
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "This Claude Code CLI session is still running in {0} — the open project is now {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Stay on “{0}”",
@@ -48,6 +59,9 @@
   "AI_CHAT_CLI_UPSELL_OPEN_TERMINAL_BTN": "Open in Terminal",
   "AI_CHAT_CLI_UPSELL_TITLE": "Available in Phoenix Pro",
   "AI_CHAT_CLI_UPSELL_UPGRADE_BTN": "Upgrade to Pro",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "This will end the running Codex CLI session and start a fresh one. Continue?",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "This Codex CLI session is still running in {0} — the open project is now {1}.",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Running Codex inside the Phoenix AI panel is a Pro feature. You can still run the Codex CLI for free from the Terminal.",
   "AI_CHAT_CODE_COLLAPSE": "Collapse",
   "AI_CHAT_CODE_COLLAPSE_FOOTER": "Click to collapse",
   "AI_CHAT_CODE_DEFAULT_LANG": "text",
@@ -106,6 +120,7 @@
   "AI_CHAT_MODE_AUTO": "Auto",
   "AI_CHAT_MODE_CHAT": "Claude Code",
   "AI_CHAT_MODE_CLI": "Claude Code CLI",
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
   "AI_CHAT_MODE_EDIT": "AI Edit Mode",
   "AI_CHAT_MODE_FULL_AUTO": "Allow Everything",
   "AI_CHAT_MODE_INFO_AUTO": "AI uses judgment to auto-approve safe actions and asks about risky ones (Click to switch)",
@@ -113,7 +128,7 @@
   "AI_CHAT_MODE_INFO_FULL_AUTO": "AI can edit files and run commands without approval (Click to switch)",
   "AI_CHAT_MODE_INFO_PLAN": "AI will propose a plan before making changes (Click to switch)",
   "AI_CHAT_MODE_PLAN": "Plan Mode",
-  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded Claude Code CLI terminal",
+  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded CLI terminal",
   "AI_CHAT_NEW_BTN": "New",
   "AI_CHAT_NEW_SESSION_TITLE": "Start a new conversation",
   "AI_CHAT_NEW_WHILE_STREAMING_MSG": "AI is currently working on a task. Starting a new conversation will stop it. Continue?",
@@ -180,7 +195,7 @@
   "AI_CHAT_SEND_ERROR": "Failed to send message: {0}",
   "AI_CHAT_SEND_TITLE": "Send message",
   "AI_CHAT_SESSION_RESUMED": "Resumed session",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code Settings",
+  "AI_CHAT_SETTINGS_TITLE": "AI Settings",
   "AI_CHAT_SETUP_LEARN_MORE": "Learn More",
   "AI_CHAT_SETUP_NEED_HELP": "Need Help?",
   "AI_CHAT_SHOW_DIFF": "Show diff",
@@ -287,8 +302,11 @@
   "AI_SETTINGS_API_TIMEOUT_PLACEHOLDER": "Leave blank for default",
   "AI_SETTINGS_BASE_URL": "Base URL",
   "AI_SETTINGS_BASE_URL_PLACEHOLDER": "Leave blank for default",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Leave blank to detect automatically.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Path to the {0} executable",
   "AI_SETTINGS_CUSTOM_ENDPOINT_NOTICE": "Using custom API endpoint: {0}",
   "AI_SETTINGS_DEFAULT_PROVIDER": "Default (Local Claude Code)",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Default (Local {0})",
   "AI_SETTINGS_DELETE": "Delete",
   "AI_SETTINGS_DELETE_ACTIVE_CONFIRM": "\"{0}\" is the active provider. Deleting it will revert to the default. Continue?",
   "AI_SETTINGS_DELETE_PROVIDER": "Delete Provider",
@@ -301,6 +319,7 @@
   "AI_SETTINGS_PROVIDERS": "Providers",
   "AI_SETTINGS_PROVIDER_NAME": "Name",
   "AI_SETTINGS_PROVIDER_NAME_PLACEHOLDER": "e.g. My API Provider",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "These providers configure {0}. The API key is passed to it as {1}.",
   "AI_SETTINGS_RESET": "Reset",
   "AI_SETTINGS_SAVE": "Save",
   "AI_SETTINGS_SAVE_PROVIDER": "Save Provider",
diff --git a/src/nls/hu/strings.js b/src/nls/hu/strings.js
index dd6deb2519..59d93d7632 100644
--- a/src/nls/hu/strings.js
+++ b/src/nls/hu/strings.js
@@ -812,6 +812,8 @@ define({
   "LIVE_PREVIEW_LAYERS_EMPTY_PAGE_STYLES": "Az oldal üres. Adjon hozzá egy elemet a stílusok megtekintéséhez.",
   "LIVE_PREVIEW_LAYERS_SHOW_SELECTED": "A kiválasztott elem megjelenítése",
   "LIVE_PREVIEW_LAYERS_SCRUB_HINT": "Húzás a beállításhoz, dupla kattintás a szerkesztéshez",
+  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "tulajdonság",
+  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "érték",
   "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS": "Az Élő Előnézet lecsatlakozott mert a bongésző fejlesztő eszközei meg lettek nyitva",
   "LIVE_DEV_DETACHED_TARGET_CLOSED": "Az Élő Előnézet lecsatlakozott mert az oldal be lett zárva a böngészőben",
   "LIVE_DEV_NAVIGATED_AWAY": "Az Élő Előnézet lecsatlakozott mert a böngésző olyan oldalra lépett amely nem része a jelenlegi projektnek",
@@ -2546,7 +2548,6 @@ define({
   "AI_CHAT_MODEL_DESC_SONNET": "Kiegyensúlyozott sebesség és képesség a mindennapi kódoláshoz",
   "AI_CHAT_MODEL_DESC_HAIKU": "A leggyorsabb modell gyors, egyszerű feladatokhoz",
   "AI_CHAT_MODEL_SELECT_TITLE": "Válassza ki a MI-modellt ehhez a csevegéshez",
-  "AI_CHAT_MODE_SELECT_TITLE": "Váltás a Claude Code csevegés és a beágyazott Claude Code CLI-terminál között",
   "AI_CHAT_MODEL_SWITCHED_NOTICE": "Átváltott a(z) {0} modellre. A következő üzenettől érvényes; az első válasz némileg tovább tarthat, amíg a gyorsítótár újraépül.",
   "AI_CHAT_INPUT_HINT": "{0} a küldéshez · {1} új sorhoz",
   "AI_CHAT_BASH_CONFIRM_TITLE": "Engedélyezi a parancsot?",
@@ -2618,7 +2619,6 @@ define({
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "A Claude Code CLI-munkamenet még a(z) {0} projektben fut – a jelenleg megnyitott projekt a(z) {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_SWITCH_BTN": "Váltás a(z) „{0}” projektre",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Maradás a(z) „{0}” projekten",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code beállítások",
   "AI_SETTINGS_API_KEY": "API-kulcs",
   "AI_SETTINGS_BASE_URL": "Alap URL",
   "AI_SETTINGS_API_TIMEOUT": "API időtúllépés (ms)",
@@ -2762,6 +2762,25 @@ define({
   "MIGRATE_UNREACHABLE_TITLE": "A régi oldal nem érhető el",
   "MIGRATE_UNREACHABLE_MESSAGE": "A {APP_NAME} nem tudott csatlakozni a(z) {0} szolgáltatáshoz a projektjei és beállításai megkereséséhez, ezért semmi sem változott. Ellenőrizze az internetkapcsolatát, majd próbálja újra a(z) {1} lehetőséggel.",
   "CMD_MIGRATE_DATA": "Adataim migrálása a(z) {0} helyről…",
-  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "tulajdonság",
-  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "érték"
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "A(z) {0} nem található",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "A(z) {0} nem található ezen a rendszeren. Telepítse, vagy adja meg alább a futtatható fájl teljes elérési útját.",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "A(z) {0} számára beállított elérési út nem használható: {1} Adjon meg egy másik elérési utat, vagy törölje a mező tartalmát az automatikus észleléshez.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "A(z) {0} telepítése",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Mentés és újrapróbálkozás",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Telepítési útmutató",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "A megadott elérési úton nem létezik fájl.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "A fájl nem futtatható.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "A fájlt nem sikerült {0}-ként futtatni.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "A fájl nem válaszolt időben.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "Az útvonal nem használható karaktereket tartalmaz.",
+  "AI_CHAT_MODE_SELECT_TITLE": "Váltás a Claude Code csevegés és a beágyazott CLI-terminál között",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "Ez lezárja a futó Codex CLI-munkamenetet, és egy újat indít. Folytatja?",
+  "AI_CHAT_CODEX_UPSELL_MSG": "A Codex futtatása a Phoenix AI panelen belül egy Pro funkció. A Codex CLI-t továbbra is ingyenesen futtathatja a Terminálból.",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "Ez a Codex CLI-munkamenet még mindig fut a(z) {0} projektben – a most megnyitott projekt a(z) {1}.",
+  "AI_CHAT_SETTINGS_TITLE": "AI-beállítások",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Alapértelmezett (helyi {0})",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "Ezek a szolgáltatók a(z) {0} komponenst konfigurálják. Az API-kulcs {1} néven kerül átadásra.",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Hagyja üresen az automatikus észleléshez.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "A(z) {0} futtatható útvonala"
 });
\ No newline at end of file
diff --git a/src/nls/id/lastTranslated.json b/src/nls/id/lastTranslated.json
index 61b0783d87..9fb162a6f3 100644
--- a/src/nls/id/lastTranslated.json
+++ b/src/nls/id/lastTranslated.json
@@ -33,6 +33,11 @@
   "AI_CHAT_CLAUDE_LOGIN_MSG": "Claude Code is installed but needs to be configured.",
   "AI_CHAT_CLAUDE_LOGIN_RESTART_NOTE": "Restart {APP_NAME} after configuration completes.",
   "AI_CHAT_CLAUDE_LOGIN_TITLE": "Setup Claude Code",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "That file did not run as {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "No file exists at that path.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "That file is not executable.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "That path contains characters that cannot be used.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "That file did not respond in time.",
   "AI_CHAT_CLI_INSTALLING": "Installing…",
   "AI_CHAT_CLI_INSTALLING_MSG": "Installing Claude Code, please wait. This may take a while...",
   "AI_CHAT_CLI_INSTALL_BTN": "Install Claude Code",
@@ -40,6 +45,12 @@
   "AI_CHAT_CLI_NEW_CONFIRM_MSG": "This will end the running Claude Code CLI session and start a fresh one. Continue?",
   "AI_CHAT_CLI_NEW_CONFIRM_TITLE": "End this CLI session?",
   "AI_CHAT_CLI_NOT_FOUND": "Claude Code Not Installed",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "The path set for {0} could not be used: {1} Enter a different path, or clear the box to detect it automatically.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Install {0}",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installation instructions",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} could not be found on this system. Install it, or enter the full path to its executable below.",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Save & Retry",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} not found",
   "AI_CHAT_CLI_RESTART_NOTE": "Restart {APP_NAME} after installation completes.",
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "This Claude Code CLI session is still running in {0} — the open project is now {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Stay on “{0}”",
@@ -48,6 +59,9 @@
   "AI_CHAT_CLI_UPSELL_OPEN_TERMINAL_BTN": "Open in Terminal",
   "AI_CHAT_CLI_UPSELL_TITLE": "Available in Phoenix Pro",
   "AI_CHAT_CLI_UPSELL_UPGRADE_BTN": "Upgrade to Pro",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "This will end the running Codex CLI session and start a fresh one. Continue?",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "This Codex CLI session is still running in {0} — the open project is now {1}.",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Running Codex inside the Phoenix AI panel is a Pro feature. You can still run the Codex CLI for free from the Terminal.",
   "AI_CHAT_CODE_COLLAPSE": "Collapse",
   "AI_CHAT_CODE_COLLAPSE_FOOTER": "Click to collapse",
   "AI_CHAT_CODE_DEFAULT_LANG": "text",
@@ -106,6 +120,7 @@
   "AI_CHAT_MODE_AUTO": "Auto",
   "AI_CHAT_MODE_CHAT": "Claude Code",
   "AI_CHAT_MODE_CLI": "Claude Code CLI",
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
   "AI_CHAT_MODE_EDIT": "AI Edit Mode",
   "AI_CHAT_MODE_FULL_AUTO": "Allow Everything",
   "AI_CHAT_MODE_INFO_AUTO": "AI uses judgment to auto-approve safe actions and asks about risky ones (Click to switch)",
@@ -113,7 +128,7 @@
   "AI_CHAT_MODE_INFO_FULL_AUTO": "AI can edit files and run commands without approval (Click to switch)",
   "AI_CHAT_MODE_INFO_PLAN": "AI will propose a plan before making changes (Click to switch)",
   "AI_CHAT_MODE_PLAN": "Plan Mode",
-  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded Claude Code CLI terminal",
+  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded CLI terminal",
   "AI_CHAT_NEW_BTN": "New",
   "AI_CHAT_NEW_SESSION_TITLE": "Start a new conversation",
   "AI_CHAT_NEW_WHILE_STREAMING_MSG": "AI is currently working on a task. Starting a new conversation will stop it. Continue?",
@@ -180,7 +195,7 @@
   "AI_CHAT_SEND_ERROR": "Failed to send message: {0}",
   "AI_CHAT_SEND_TITLE": "Send message",
   "AI_CHAT_SESSION_RESUMED": "Resumed session",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code Settings",
+  "AI_CHAT_SETTINGS_TITLE": "AI Settings",
   "AI_CHAT_SETUP_LEARN_MORE": "Learn More",
   "AI_CHAT_SETUP_NEED_HELP": "Need Help?",
   "AI_CHAT_SHOW_DIFF": "Show diff",
@@ -287,8 +302,11 @@
   "AI_SETTINGS_API_TIMEOUT_PLACEHOLDER": "Leave blank for default",
   "AI_SETTINGS_BASE_URL": "Base URL",
   "AI_SETTINGS_BASE_URL_PLACEHOLDER": "Leave blank for default",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Leave blank to detect automatically.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Path to the {0} executable",
   "AI_SETTINGS_CUSTOM_ENDPOINT_NOTICE": "Using custom API endpoint: {0}",
   "AI_SETTINGS_DEFAULT_PROVIDER": "Default (Local Claude Code)",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Default (Local {0})",
   "AI_SETTINGS_DELETE": "Delete",
   "AI_SETTINGS_DELETE_ACTIVE_CONFIRM": "\"{0}\" is the active provider. Deleting it will revert to the default. Continue?",
   "AI_SETTINGS_DELETE_PROVIDER": "Delete Provider",
@@ -301,6 +319,7 @@
   "AI_SETTINGS_PROVIDERS": "Providers",
   "AI_SETTINGS_PROVIDER_NAME": "Name",
   "AI_SETTINGS_PROVIDER_NAME_PLACEHOLDER": "e.g. My API Provider",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "These providers configure {0}. The API key is passed to it as {1}.",
   "AI_SETTINGS_RESET": "Reset",
   "AI_SETTINGS_SAVE": "Save",
   "AI_SETTINGS_SAVE_PROVIDER": "Save Provider",
diff --git a/src/nls/id/strings.js b/src/nls/id/strings.js
index 36839140ec..d1d192da85 100644
--- a/src/nls/id/strings.js
+++ b/src/nls/id/strings.js
@@ -812,6 +812,8 @@ define({
   "LIVE_PREVIEW_LAYERS_EMPTY_PAGE_STYLES": "Halaman kosong. Tambahkan elemen untuk melihat gayanya.",
   "LIVE_PREVIEW_LAYERS_SHOW_SELECTED": "Tampilkan elemen yang dipilih",
   "LIVE_PREVIEW_LAYERS_SCRUB_HINT": "Seret untuk menyesuaikan, klik dua kali untuk mengedit",
+  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "properti",
+  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "nilai",
   "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS": "Tinjauan Langsung dibatalkan karena Alat Pengembang pada peramban sedang dibuka",
   "LIVE_DEV_DETACHED_TARGET_CLOSED": "Tinjauan Langsung dibatalkan karena halaman telah ditutup pada peramban",
   "LIVE_DEV_NAVIGATED_AWAY": "Tinjauan Langsung dibatalkan karena peramban berpindah ke halaman yang bukan dari proyek",
@@ -2546,7 +2548,6 @@ define({
   "AI_CHAT_MODEL_DESC_SONNET": "Keseimbangan kecepatan dan kemampuan untuk pengodean sehari-hari",
   "AI_CHAT_MODEL_DESC_HAIKU": "Model tercepat untuk tugas-tugas cepat dan sederhana",
   "AI_CHAT_MODEL_SELECT_TITLE": "Pilih model AI untuk obrolan ini",
-  "AI_CHAT_MODE_SELECT_TITLE": "Beralih antara obrolan Claude Code dan terminal Claude Code CLI yang tersemat",
   "AI_CHAT_MODEL_SWITCHED_NOTICE": "Beralih ke {0}. Berlaku untuk pesan Anda berikutnya; respons pertama mungkin memerlukan waktu lebih lama selagi cache dibuat ulang.",
   "AI_CHAT_INPUT_HINT": "Tekan {0} untuk mengirim · {1} untuk baris baru",
   "AI_CHAT_BASH_CONFIRM_TITLE": "Izinkan perintah?",
@@ -2618,7 +2619,6 @@ define({
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "Sesi Claude Code CLI ini masih berjalan di {0} — proyek yang terbuka sekarang adalah {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_SWITCH_BTN": "Beralih ke “{0}”",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Tetap di “{0}”",
-  "AI_CHAT_SETTINGS_TITLE": "Pengaturan Claude Code",
   "AI_SETTINGS_API_KEY": "Kunci API",
   "AI_SETTINGS_BASE_URL": "URL Dasar",
   "AI_SETTINGS_API_TIMEOUT": "Waktu Tunggu API (ms)",
@@ -2762,6 +2762,25 @@ define({
   "MIGRATE_UNREACHABLE_TITLE": "Tidak dapat menjangkau situs lama",
   "MIGRATE_UNREACHABLE_MESSAGE": "{APP_NAME} tidak dapat terhubung ke {0} untuk mencari proyek dan pengaturan Anda, sehingga tidak ada yang diubah. Periksa koneksi internet Anda, lalu coba lagi dengan {1}.",
   "CMD_MIGRATE_DATA": "Migrasikan Data Saya dari {0}…",
-  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "properti",
-  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "nilai"
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} tidak ditemukan",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} tidak dapat ditemukan di sistem ini. Instal, atau masukkan path lengkap ke file eksekusinya di bawah ini.",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "Path yang diatur untuk {0} tidak dapat digunakan: {1} Masukkan path yang berbeda, atau kosongkan kotak untuk mendeteksinya secara otomatis.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Instal {0}",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Simpan & Coba Lagi",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Petunjuk instalasi",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "Tidak ada file di path tersebut.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "File tersebut tidak dapat dieksekusi.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "File tersebut tidak berjalan sebagai {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "File tersebut tidak merespons tepat waktu.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "Jalur tersebut berisi karakter yang tidak dapat digunakan.",
+  "AI_CHAT_MODE_SELECT_TITLE": "Beralih antara obrolan Claude Code dan terminal CLI tersemat",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "Ini akan mengakhiri sesi Codex CLI yang sedang berjalan dan memulai yang baru. Lanjutkan?",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Menjalankan Codex di dalam panel Phoenix AI adalah fitur Pro. Anda masih dapat menjalankan Codex CLI secara gratis dari Terminal.",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "Sesi Codex CLI ini masih berjalan di {0} — proyek yang terbuka sekarang adalah {1}.",
+  "AI_CHAT_SETTINGS_TITLE": "Pengaturan AI",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Default (Lokal {0})",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "Penyedia ini mengonfigurasi {0}. Kunci API diteruskan ke sana sebagai {1}.",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Biarkan kosong untuk mendeteksi secara otomatis.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Jalur ke file eksekusi {0}"
 });
\ No newline at end of file
diff --git a/src/nls/it/lastTranslated.json b/src/nls/it/lastTranslated.json
index 61b0783d87..9fb162a6f3 100644
--- a/src/nls/it/lastTranslated.json
+++ b/src/nls/it/lastTranslated.json
@@ -33,6 +33,11 @@
   "AI_CHAT_CLAUDE_LOGIN_MSG": "Claude Code is installed but needs to be configured.",
   "AI_CHAT_CLAUDE_LOGIN_RESTART_NOTE": "Restart {APP_NAME} after configuration completes.",
   "AI_CHAT_CLAUDE_LOGIN_TITLE": "Setup Claude Code",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "That file did not run as {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "No file exists at that path.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "That file is not executable.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "That path contains characters that cannot be used.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "That file did not respond in time.",
   "AI_CHAT_CLI_INSTALLING": "Installing…",
   "AI_CHAT_CLI_INSTALLING_MSG": "Installing Claude Code, please wait. This may take a while...",
   "AI_CHAT_CLI_INSTALL_BTN": "Install Claude Code",
@@ -40,6 +45,12 @@
   "AI_CHAT_CLI_NEW_CONFIRM_MSG": "This will end the running Claude Code CLI session and start a fresh one. Continue?",
   "AI_CHAT_CLI_NEW_CONFIRM_TITLE": "End this CLI session?",
   "AI_CHAT_CLI_NOT_FOUND": "Claude Code Not Installed",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "The path set for {0} could not be used: {1} Enter a different path, or clear the box to detect it automatically.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Install {0}",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installation instructions",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} could not be found on this system. Install it, or enter the full path to its executable below.",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Save & Retry",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} not found",
   "AI_CHAT_CLI_RESTART_NOTE": "Restart {APP_NAME} after installation completes.",
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "This Claude Code CLI session is still running in {0} — the open project is now {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Stay on “{0}”",
@@ -48,6 +59,9 @@
   "AI_CHAT_CLI_UPSELL_OPEN_TERMINAL_BTN": "Open in Terminal",
   "AI_CHAT_CLI_UPSELL_TITLE": "Available in Phoenix Pro",
   "AI_CHAT_CLI_UPSELL_UPGRADE_BTN": "Upgrade to Pro",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "This will end the running Codex CLI session and start a fresh one. Continue?",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "This Codex CLI session is still running in {0} — the open project is now {1}.",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Running Codex inside the Phoenix AI panel is a Pro feature. You can still run the Codex CLI for free from the Terminal.",
   "AI_CHAT_CODE_COLLAPSE": "Collapse",
   "AI_CHAT_CODE_COLLAPSE_FOOTER": "Click to collapse",
   "AI_CHAT_CODE_DEFAULT_LANG": "text",
@@ -106,6 +120,7 @@
   "AI_CHAT_MODE_AUTO": "Auto",
   "AI_CHAT_MODE_CHAT": "Claude Code",
   "AI_CHAT_MODE_CLI": "Claude Code CLI",
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
   "AI_CHAT_MODE_EDIT": "AI Edit Mode",
   "AI_CHAT_MODE_FULL_AUTO": "Allow Everything",
   "AI_CHAT_MODE_INFO_AUTO": "AI uses judgment to auto-approve safe actions and asks about risky ones (Click to switch)",
@@ -113,7 +128,7 @@
   "AI_CHAT_MODE_INFO_FULL_AUTO": "AI can edit files and run commands without approval (Click to switch)",
   "AI_CHAT_MODE_INFO_PLAN": "AI will propose a plan before making changes (Click to switch)",
   "AI_CHAT_MODE_PLAN": "Plan Mode",
-  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded Claude Code CLI terminal",
+  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded CLI terminal",
   "AI_CHAT_NEW_BTN": "New",
   "AI_CHAT_NEW_SESSION_TITLE": "Start a new conversation",
   "AI_CHAT_NEW_WHILE_STREAMING_MSG": "AI is currently working on a task. Starting a new conversation will stop it. Continue?",
@@ -180,7 +195,7 @@
   "AI_CHAT_SEND_ERROR": "Failed to send message: {0}",
   "AI_CHAT_SEND_TITLE": "Send message",
   "AI_CHAT_SESSION_RESUMED": "Resumed session",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code Settings",
+  "AI_CHAT_SETTINGS_TITLE": "AI Settings",
   "AI_CHAT_SETUP_LEARN_MORE": "Learn More",
   "AI_CHAT_SETUP_NEED_HELP": "Need Help?",
   "AI_CHAT_SHOW_DIFF": "Show diff",
@@ -287,8 +302,11 @@
   "AI_SETTINGS_API_TIMEOUT_PLACEHOLDER": "Leave blank for default",
   "AI_SETTINGS_BASE_URL": "Base URL",
   "AI_SETTINGS_BASE_URL_PLACEHOLDER": "Leave blank for default",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Leave blank to detect automatically.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Path to the {0} executable",
   "AI_SETTINGS_CUSTOM_ENDPOINT_NOTICE": "Using custom API endpoint: {0}",
   "AI_SETTINGS_DEFAULT_PROVIDER": "Default (Local Claude Code)",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Default (Local {0})",
   "AI_SETTINGS_DELETE": "Delete",
   "AI_SETTINGS_DELETE_ACTIVE_CONFIRM": "\"{0}\" is the active provider. Deleting it will revert to the default. Continue?",
   "AI_SETTINGS_DELETE_PROVIDER": "Delete Provider",
@@ -301,6 +319,7 @@
   "AI_SETTINGS_PROVIDERS": "Providers",
   "AI_SETTINGS_PROVIDER_NAME": "Name",
   "AI_SETTINGS_PROVIDER_NAME_PLACEHOLDER": "e.g. My API Provider",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "These providers configure {0}. The API key is passed to it as {1}.",
   "AI_SETTINGS_RESET": "Reset",
   "AI_SETTINGS_SAVE": "Save",
   "AI_SETTINGS_SAVE_PROVIDER": "Save Provider",
diff --git a/src/nls/it/strings.js b/src/nls/it/strings.js
index 9cfe6ff424..93a26e3cf6 100644
--- a/src/nls/it/strings.js
+++ b/src/nls/it/strings.js
@@ -812,6 +812,8 @@ define({
   "LIVE_PREVIEW_LAYERS_EMPTY_PAGE_STYLES": "La pagina è vuota. Aggiungi un elemento per vederne gli stili.",
   "LIVE_PREVIEW_LAYERS_SHOW_SELECTED": "Mostra l'elemento selezionato",
   "LIVE_PREVIEW_LAYERS_SCRUB_HINT": "Trascina per regolare, fai doppio clic per modificare",
+  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "proprietà",
+  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "valore",
   "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS": "L’Anteprima Live è stata cancellata perché uno strumento di sviluppo è stato aperto nel browser",
   "LIVE_DEV_DETACHED_TARGET_CLOSED": "L’Anteprima Live è stata cancellata perché è stato chiuso il browser",
   "LIVE_DEV_NAVIGATED_AWAY": "L’Anteprima Live è stata cancellata perché il browser ha caricato una pagina che non fa parte del progetto corrente",
@@ -2546,7 +2548,6 @@ define({
   "AI_CHAT_MODEL_DESC_SONNET": "Velocità e capacità bilanciate per la programmazione di tutti i giorni",
   "AI_CHAT_MODEL_DESC_HAIKU": "Il modello più veloce per attività semplici e veloci",
   "AI_CHAT_MODEL_SELECT_TITLE": "Scegli il modello di IA per questa chat",
-  "AI_CHAT_MODE_SELECT_TITLE": "Passa dalla chat di Claude Code al terminale CLI di Claude Code integrato",
   "AI_CHAT_MODEL_SWITCHED_NOTICE": "Passato a {0}. Si applica dal tuo prossimo messaggio; la prima risposta potrebbe richiedere un momento in più mentre la cache viene ricostruita.",
   "AI_CHAT_INPUT_HINT": "Premi {0} per inviare · {1} per andare a capo",
   "AI_CHAT_BASH_CONFIRM_TITLE": "Consentire il comando?",
@@ -2618,7 +2619,6 @@ define({
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "Questa sessione CLI di Claude Code è ancora in esecuzione in {0} — il progetto aperto è ora {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_SWITCH_BTN": "Passa a “{0}”",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Resta su “{0}”",
-  "AI_CHAT_SETTINGS_TITLE": "Impostazioni Claude Code",
   "AI_SETTINGS_API_KEY": "Chiave API",
   "AI_SETTINGS_BASE_URL": "URL di base",
   "AI_SETTINGS_API_TIMEOUT": "Timeout API (ms)",
@@ -2762,6 +2762,25 @@ define({
   "MIGRATE_UNREACHABLE_TITLE": "Impossibile raggiungere il vecchio sito",
   "MIGRATE_UNREACHABLE_MESSAGE": "{APP_NAME} non è riuscito a connettersi a {0} per cercare i tuoi progetti e le tue impostazioni, pertanto non è stato modificato nulla. Verifica la tua connessione a Internet, quindi riprova con {1}.",
   "CMD_MIGRATE_DATA": "Migra i miei dati da {0}…",
-  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "proprietà",
-  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "valore"
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} non trovato",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} non è stato trovato in questo sistema. Installalo o inserisci di seguito il percorso completo del suo eseguibile.",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "Il percorso impostato per {0} non può essere utilizzato: {1} Inserisci un percorso diverso o svuota il campo per rilevarlo automaticamente.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Installa {0}",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Salva e riprova",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Istruzioni per l'installazione",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "Non esiste alcun file in quel percorso.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "Il file non è eseguibile.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "Il file non è stato eseguito come {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "Il file non ha risposto in tempo.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "Il percorso contiene caratteri che non possono essere utilizzati.",
+  "AI_CHAT_MODE_SELECT_TITLE": "Passa dalla chat di Claude Code a un terminale CLI incorporato.",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "Questa operazione terminerà la sessione CLI di Codex in esecuzione e ne avvierà una nuova. Continuare?",
+  "AI_CHAT_CODEX_UPSELL_MSG": "L'esecuzione di Codex all'interno del pannello AI di Phoenix è una funzionalità Pro. Puoi comunque eseguire la CLI di Codex gratuitamente dal Terminale.",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "Questa sessione CLI di Codex è ancora in esecuzione in {0} — il progetto aperto ora è {1}.",
+  "AI_CHAT_SETTINGS_TITLE": "Impostazioni AI",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Predefinito (Locale {0})",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "Questi provider configurano {0}. La chiave API viene passata come {1}.",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Lasciare vuoto per il rilevamento automatico.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Percorso dell'eseguibile {0}"
 });
\ No newline at end of file
diff --git a/src/nls/ja/lastTranslated.json b/src/nls/ja/lastTranslated.json
index 61b0783d87..9fb162a6f3 100644
--- a/src/nls/ja/lastTranslated.json
+++ b/src/nls/ja/lastTranslated.json
@@ -33,6 +33,11 @@
   "AI_CHAT_CLAUDE_LOGIN_MSG": "Claude Code is installed but needs to be configured.",
   "AI_CHAT_CLAUDE_LOGIN_RESTART_NOTE": "Restart {APP_NAME} after configuration completes.",
   "AI_CHAT_CLAUDE_LOGIN_TITLE": "Setup Claude Code",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "That file did not run as {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "No file exists at that path.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "That file is not executable.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "That path contains characters that cannot be used.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "That file did not respond in time.",
   "AI_CHAT_CLI_INSTALLING": "Installing…",
   "AI_CHAT_CLI_INSTALLING_MSG": "Installing Claude Code, please wait. This may take a while...",
   "AI_CHAT_CLI_INSTALL_BTN": "Install Claude Code",
@@ -40,6 +45,12 @@
   "AI_CHAT_CLI_NEW_CONFIRM_MSG": "This will end the running Claude Code CLI session and start a fresh one. Continue?",
   "AI_CHAT_CLI_NEW_CONFIRM_TITLE": "End this CLI session?",
   "AI_CHAT_CLI_NOT_FOUND": "Claude Code Not Installed",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "The path set for {0} could not be used: {1} Enter a different path, or clear the box to detect it automatically.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Install {0}",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installation instructions",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} could not be found on this system. Install it, or enter the full path to its executable below.",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Save & Retry",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} not found",
   "AI_CHAT_CLI_RESTART_NOTE": "Restart {APP_NAME} after installation completes.",
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "This Claude Code CLI session is still running in {0} — the open project is now {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Stay on “{0}”",
@@ -48,6 +59,9 @@
   "AI_CHAT_CLI_UPSELL_OPEN_TERMINAL_BTN": "Open in Terminal",
   "AI_CHAT_CLI_UPSELL_TITLE": "Available in Phoenix Pro",
   "AI_CHAT_CLI_UPSELL_UPGRADE_BTN": "Upgrade to Pro",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "This will end the running Codex CLI session and start a fresh one. Continue?",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "This Codex CLI session is still running in {0} — the open project is now {1}.",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Running Codex inside the Phoenix AI panel is a Pro feature. You can still run the Codex CLI for free from the Terminal.",
   "AI_CHAT_CODE_COLLAPSE": "Collapse",
   "AI_CHAT_CODE_COLLAPSE_FOOTER": "Click to collapse",
   "AI_CHAT_CODE_DEFAULT_LANG": "text",
@@ -106,6 +120,7 @@
   "AI_CHAT_MODE_AUTO": "Auto",
   "AI_CHAT_MODE_CHAT": "Claude Code",
   "AI_CHAT_MODE_CLI": "Claude Code CLI",
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
   "AI_CHAT_MODE_EDIT": "AI Edit Mode",
   "AI_CHAT_MODE_FULL_AUTO": "Allow Everything",
   "AI_CHAT_MODE_INFO_AUTO": "AI uses judgment to auto-approve safe actions and asks about risky ones (Click to switch)",
@@ -113,7 +128,7 @@
   "AI_CHAT_MODE_INFO_FULL_AUTO": "AI can edit files and run commands without approval (Click to switch)",
   "AI_CHAT_MODE_INFO_PLAN": "AI will propose a plan before making changes (Click to switch)",
   "AI_CHAT_MODE_PLAN": "Plan Mode",
-  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded Claude Code CLI terminal",
+  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded CLI terminal",
   "AI_CHAT_NEW_BTN": "New",
   "AI_CHAT_NEW_SESSION_TITLE": "Start a new conversation",
   "AI_CHAT_NEW_WHILE_STREAMING_MSG": "AI is currently working on a task. Starting a new conversation will stop it. Continue?",
@@ -180,7 +195,7 @@
   "AI_CHAT_SEND_ERROR": "Failed to send message: {0}",
   "AI_CHAT_SEND_TITLE": "Send message",
   "AI_CHAT_SESSION_RESUMED": "Resumed session",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code Settings",
+  "AI_CHAT_SETTINGS_TITLE": "AI Settings",
   "AI_CHAT_SETUP_LEARN_MORE": "Learn More",
   "AI_CHAT_SETUP_NEED_HELP": "Need Help?",
   "AI_CHAT_SHOW_DIFF": "Show diff",
@@ -287,8 +302,11 @@
   "AI_SETTINGS_API_TIMEOUT_PLACEHOLDER": "Leave blank for default",
   "AI_SETTINGS_BASE_URL": "Base URL",
   "AI_SETTINGS_BASE_URL_PLACEHOLDER": "Leave blank for default",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Leave blank to detect automatically.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Path to the {0} executable",
   "AI_SETTINGS_CUSTOM_ENDPOINT_NOTICE": "Using custom API endpoint: {0}",
   "AI_SETTINGS_DEFAULT_PROVIDER": "Default (Local Claude Code)",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Default (Local {0})",
   "AI_SETTINGS_DELETE": "Delete",
   "AI_SETTINGS_DELETE_ACTIVE_CONFIRM": "\"{0}\" is the active provider. Deleting it will revert to the default. Continue?",
   "AI_SETTINGS_DELETE_PROVIDER": "Delete Provider",
@@ -301,6 +319,7 @@
   "AI_SETTINGS_PROVIDERS": "Providers",
   "AI_SETTINGS_PROVIDER_NAME": "Name",
   "AI_SETTINGS_PROVIDER_NAME_PLACEHOLDER": "e.g. My API Provider",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "These providers configure {0}. The API key is passed to it as {1}.",
   "AI_SETTINGS_RESET": "Reset",
   "AI_SETTINGS_SAVE": "Save",
   "AI_SETTINGS_SAVE_PROVIDER": "Save Provider",
diff --git a/src/nls/ja/strings.js b/src/nls/ja/strings.js
index 5d08c16224..52b2924147 100644
--- a/src/nls/ja/strings.js
+++ b/src/nls/ja/strings.js
@@ -812,6 +812,8 @@ define({
   "LIVE_PREVIEW_LAYERS_EMPTY_PAGE_STYLES": "ページは空です。要素を追加してスタイルを表示してください。",
   "LIVE_PREVIEW_LAYERS_SHOW_SELECTED": "選択した要素を表示する",
   "LIVE_PREVIEW_LAYERS_SCRUB_HINT": "ドラッグして調整、ダブルクリックして編集",
+  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "プロパティ",
+  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "値",
   "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS": "ブラウザーの開発ツールが開いているため、ライブプレビューはキャンセルされました",
   "LIVE_DEV_DETACHED_TARGET_CLOSED": "ブラウザーでページが閉じられたため、ライブプレビューはキャンセルされました",
   "LIVE_DEV_NAVIGATED_AWAY": "ブラウザーで現在のプロジェクトに含まれないページに移動したため、ライブプレビューはキャンセルされました",
@@ -2546,7 +2548,6 @@ define({
   "AI_CHAT_MODEL_DESC_SONNET": "日常的なコーディング向けの、バランスの取れた速度と性能",
   "AI_CHAT_MODEL_DESC_HAIKU": "素早くシンプルなタスク向けの最速モデル",
   "AI_CHAT_MODEL_SELECT_TITLE": "このチャット用のAIモデルを選択",
-  "AI_CHAT_MODE_SELECT_TITLE": "Claude Code チャットと埋め込みClaude Code CLIターミナルを切り替える",
   "AI_CHAT_MODEL_SWITCHED_NOTICE": "{0}に切り替えました。次回のメッセージから適用されます。キャッシュの再構築のため、最初の応答には少し時間がかかる場合があります。",
   "AI_CHAT_INPUT_HINT": "`{0}`を押して送信・`{1}`で改行",
   "AI_CHAT_BASH_CONFIRM_TITLE": "コマンドを許可しますか？",
@@ -2618,7 +2619,6 @@ define({
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "このClaude Code CLIセッションは{0}でまだ実行中ですが、現在開いているプロジェクトは{1}です。",
   "AI_CHAT_CLI_STALE_PROJECT_SWITCH_BTN": "「{0}」に切り替える",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "「{0}」のままにする",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code設定",
   "AI_SETTINGS_API_KEY": "APIキー",
   "AI_SETTINGS_BASE_URL": "ベースURL",
   "AI_SETTINGS_API_TIMEOUT": "APIタイムアウト (ms)",
@@ -2762,6 +2762,25 @@ define({
   "MIGRATE_UNREACHABLE_TITLE": "旧サイトに接続できませんでした",
   "MIGRATE_UNREACHABLE_MESSAGE": "{APP_NAME}はプロジェクトと設定を検索するために{0}に接続できませんでした。そのため、何も変更されていません。インターネット接続を確認してから、{1}で再試行してください。",
   "CMD_MIGRATE_DATA": "{0}からデータを移行…",
-  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "プロパティ",
-  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "値"
+  "AI_CHAT_MODE_CODEX_CLI": "コーデックスCLI",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} が見つかりません",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "このシステムでは {0} が見つかりませんでした。インストールするか、下にある実行可能ファイルへのフルパスを入力してください。",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "{0} に設定されたパスは使用できませんでした: {1} 別のパスを入力するか、ボックスをクリアして自動検出してください。",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "{0} をインストール",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "保存して再試行",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "インストール手順",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "そのパスにファイルが存在しません。",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "そのファイルは実行可能ではありません。",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "そのファイルは {0} として実行されませんでした。",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "ファイルが時間内に応答しませんでした。",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "そのパスには使用できない文字が含まれています。",
+  "AI_CHAT_MODE_SELECT_TITLE": "Claude Codeチャットと埋め込みCLIターミナルを切り替える",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "実行中のCodex CLIセッションを終了して、新しいセッションを開始します。続行しますか？",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Phoenix AIパネル内でのCodexの実行はPro機能です。引き続き、ターミナルから無料でCodex CLIを実行できます。",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "このCodex CLIセッションは{0}で実行中ですが、現在開いているプロジェクトは{1}です。",
+  "AI_CHAT_SETTINGS_TITLE": "AI設定",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "デフォルト（ローカル {0}）",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "これらのプロバイダーは{0}を設定します。APIキーは{1}として渡されます。",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "空欄にすると自動的に検出されます。",
+  "AI_SETTINGS_CLI_PATH_LABEL": "{0}実行ファイルのパス"
 });
\ No newline at end of file
diff --git a/src/nls/ko/lastTranslated.json b/src/nls/ko/lastTranslated.json
index 61b0783d87..9fb162a6f3 100644
--- a/src/nls/ko/lastTranslated.json
+++ b/src/nls/ko/lastTranslated.json
@@ -33,6 +33,11 @@
   "AI_CHAT_CLAUDE_LOGIN_MSG": "Claude Code is installed but needs to be configured.",
   "AI_CHAT_CLAUDE_LOGIN_RESTART_NOTE": "Restart {APP_NAME} after configuration completes.",
   "AI_CHAT_CLAUDE_LOGIN_TITLE": "Setup Claude Code",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "That file did not run as {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "No file exists at that path.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "That file is not executable.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "That path contains characters that cannot be used.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "That file did not respond in time.",
   "AI_CHAT_CLI_INSTALLING": "Installing…",
   "AI_CHAT_CLI_INSTALLING_MSG": "Installing Claude Code, please wait. This may take a while...",
   "AI_CHAT_CLI_INSTALL_BTN": "Install Claude Code",
@@ -40,6 +45,12 @@
   "AI_CHAT_CLI_NEW_CONFIRM_MSG": "This will end the running Claude Code CLI session and start a fresh one. Continue?",
   "AI_CHAT_CLI_NEW_CONFIRM_TITLE": "End this CLI session?",
   "AI_CHAT_CLI_NOT_FOUND": "Claude Code Not Installed",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "The path set for {0} could not be used: {1} Enter a different path, or clear the box to detect it automatically.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Install {0}",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installation instructions",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} could not be found on this system. Install it, or enter the full path to its executable below.",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Save & Retry",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} not found",
   "AI_CHAT_CLI_RESTART_NOTE": "Restart {APP_NAME} after installation completes.",
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "This Claude Code CLI session is still running in {0} — the open project is now {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Stay on “{0}”",
@@ -48,6 +59,9 @@
   "AI_CHAT_CLI_UPSELL_OPEN_TERMINAL_BTN": "Open in Terminal",
   "AI_CHAT_CLI_UPSELL_TITLE": "Available in Phoenix Pro",
   "AI_CHAT_CLI_UPSELL_UPGRADE_BTN": "Upgrade to Pro",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "This will end the running Codex CLI session and start a fresh one. Continue?",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "This Codex CLI session is still running in {0} — the open project is now {1}.",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Running Codex inside the Phoenix AI panel is a Pro feature. You can still run the Codex CLI for free from the Terminal.",
   "AI_CHAT_CODE_COLLAPSE": "Collapse",
   "AI_CHAT_CODE_COLLAPSE_FOOTER": "Click to collapse",
   "AI_CHAT_CODE_DEFAULT_LANG": "text",
@@ -106,6 +120,7 @@
   "AI_CHAT_MODE_AUTO": "Auto",
   "AI_CHAT_MODE_CHAT": "Claude Code",
   "AI_CHAT_MODE_CLI": "Claude Code CLI",
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
   "AI_CHAT_MODE_EDIT": "AI Edit Mode",
   "AI_CHAT_MODE_FULL_AUTO": "Allow Everything",
   "AI_CHAT_MODE_INFO_AUTO": "AI uses judgment to auto-approve safe actions and asks about risky ones (Click to switch)",
@@ -113,7 +128,7 @@
   "AI_CHAT_MODE_INFO_FULL_AUTO": "AI can edit files and run commands without approval (Click to switch)",
   "AI_CHAT_MODE_INFO_PLAN": "AI will propose a plan before making changes (Click to switch)",
   "AI_CHAT_MODE_PLAN": "Plan Mode",
-  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded Claude Code CLI terminal",
+  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded CLI terminal",
   "AI_CHAT_NEW_BTN": "New",
   "AI_CHAT_NEW_SESSION_TITLE": "Start a new conversation",
   "AI_CHAT_NEW_WHILE_STREAMING_MSG": "AI is currently working on a task. Starting a new conversation will stop it. Continue?",
@@ -180,7 +195,7 @@
   "AI_CHAT_SEND_ERROR": "Failed to send message: {0}",
   "AI_CHAT_SEND_TITLE": "Send message",
   "AI_CHAT_SESSION_RESUMED": "Resumed session",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code Settings",
+  "AI_CHAT_SETTINGS_TITLE": "AI Settings",
   "AI_CHAT_SETUP_LEARN_MORE": "Learn More",
   "AI_CHAT_SETUP_NEED_HELP": "Need Help?",
   "AI_CHAT_SHOW_DIFF": "Show diff",
@@ -287,8 +302,11 @@
   "AI_SETTINGS_API_TIMEOUT_PLACEHOLDER": "Leave blank for default",
   "AI_SETTINGS_BASE_URL": "Base URL",
   "AI_SETTINGS_BASE_URL_PLACEHOLDER": "Leave blank for default",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Leave blank to detect automatically.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Path to the {0} executable",
   "AI_SETTINGS_CUSTOM_ENDPOINT_NOTICE": "Using custom API endpoint: {0}",
   "AI_SETTINGS_DEFAULT_PROVIDER": "Default (Local Claude Code)",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Default (Local {0})",
   "AI_SETTINGS_DELETE": "Delete",
   "AI_SETTINGS_DELETE_ACTIVE_CONFIRM": "\"{0}\" is the active provider. Deleting it will revert to the default. Continue?",
   "AI_SETTINGS_DELETE_PROVIDER": "Delete Provider",
@@ -301,6 +319,7 @@
   "AI_SETTINGS_PROVIDERS": "Providers",
   "AI_SETTINGS_PROVIDER_NAME": "Name",
   "AI_SETTINGS_PROVIDER_NAME_PLACEHOLDER": "e.g. My API Provider",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "These providers configure {0}. The API key is passed to it as {1}.",
   "AI_SETTINGS_RESET": "Reset",
   "AI_SETTINGS_SAVE": "Save",
   "AI_SETTINGS_SAVE_PROVIDER": "Save Provider",
diff --git a/src/nls/ko/strings.js b/src/nls/ko/strings.js
index 43149eb66c..c77ab2cbd1 100644
--- a/src/nls/ko/strings.js
+++ b/src/nls/ko/strings.js
@@ -812,6 +812,8 @@ define({
   "LIVE_PREVIEW_LAYERS_EMPTY_PAGE_STYLES": "페이지가 비어 있습니다. 요소를 추가하여 스타일을 확인하세요.",
   "LIVE_PREVIEW_LAYERS_SHOW_SELECTED": "선택한 요소 표시",
   "LIVE_PREVIEW_LAYERS_SCRUB_HINT": "드래그하여 조정, 더블 클릭하여 편집",
+  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "속성",
+  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "값",
   "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS": "브라우저의 개발 도구가 열려 있기 때문에 실시간 미리보기가 취소되었습니다뷰.",
   "LIVE_DEV_DETACHED_TARGET_CLOSED": "브라우저에서 페이지가 닫혀 있으므로 실시간 미리보기가 취소되었습니다.",
   "LIVE_DEV_NAVIGATED_AWAY": "브라우저에서 현재 프로젝트에 포함되지 않은 페이지로 이동했기 때문에 실시간 미리보기가 취소되었습니다.",
@@ -2546,7 +2548,6 @@ define({
   "AI_CHAT_MODEL_DESC_SONNET": "일상적인 코딩을 위한 균형 잡힌 속도와 성능",
   "AI_CHAT_MODEL_DESC_HAIKU": "빠르고 간단한 작업을 위한 가장 빠른 모델",
   "AI_CHAT_MODEL_SELECT_TITLE": "이 채팅에 사용할 AI 모델 선택",
-  "AI_CHAT_MODE_SELECT_TITLE": "Claude Code 채팅과 내장된 Claude Code CLI 터미널 간 전환",
   "AI_CHAT_MODEL_SWITCHED_NOTICE": "{0}으로 전환되었습니다. 다음 메시지부터 적용되며, 캐시가 재구성되는 동안 첫 번째 응답이 조금 더 오래 걸릴 수 있습니다.",
   "AI_CHAT_INPUT_HINT": "{0}를 눌러 전송 · {1}로 줄 바꿈",
   "AI_CHAT_BASH_CONFIRM_TITLE": "명령을 허용하시겠습니까?",
@@ -2618,7 +2619,6 @@ define({
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "이 Claude Code CLI 세션은 {0}에서 계속 실행 중입니다 — 현재 열려 있는 프로젝트는 {1}입니다.",
   "AI_CHAT_CLI_STALE_PROJECT_SWITCH_BTN": "“{0}”(으)로 전환",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "“{0}”에 머무르기",
-  "AI_CHAT_SETTINGS_TITLE": "클로드 코드 설정",
   "AI_SETTINGS_API_KEY": "API 키",
   "AI_SETTINGS_BASE_URL": "기본 URL",
   "AI_SETTINGS_API_TIMEOUT": "API 타임아웃 (밀리초)",
@@ -2762,6 +2762,25 @@ define({
   "MIGRATE_UNREACHABLE_TITLE": "이전 사이트에 접속할 수 없습니다.",
   "MIGRATE_UNREACHABLE_MESSAGE": "{APP_NAME}이(가) {0}에 연결하여 프로젝트 및 설정을 찾을 수 없었으므로 아무것도 변경되지 않았습니다. 인터넷 연결을 확인한 다음 {1}으로 다시 시도하세요.",
   "CMD_MIGRATE_DATA": "{0}에서 내 데이터 이전…",
-  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "속성",
-  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "값"
+  "AI_CHAT_MODE_CODEX_CLI": "코덱스 CLI",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0}을(를) 찾을 수 없음",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "이 시스템에서 {0}을(를) 찾을 수 없습니다. 설치하거나 아래에 실행 파일의 전체 경로를 입력하세요.",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "{0}에 대해 설정된 경로를 사용할 수 없습니다: {1} 다른 경로를 입력하거나, 자동으로 감지하도록 입력란을 비우세요.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "{0} 설치",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "저장 및 다시 시도",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "설치 안내",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "해당 경로에 파일이 존재하지 않습니다.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "해당 파일은 실행 파일이 아닙니다.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "해당 파일이 {0}(으)로 실행되지 않았습니다.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "해당 파일이 시간 내에 응답하지 않았습니다.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "해당 경로에 사용할 수 없는 문자가 포함되어 있습니다.",
+  "AI_CHAT_MODE_SELECT_TITLE": "Claude Code 채팅과 내장 CLI 터미널 간 전환",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "실행 중인 Codex CLI 세션을 종료하고 새 세션을 시작합니다. 계속하시겠습니까?",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Phoenix AI 패널에서 Codex를 실행하는 것은 Pro 기능입니다. 터미널에서는 계속해서 Codex CLI를 무료로 실행할 수 있습니다.",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "이 Codex CLI 세션은 {0}에서 계속 실행 중입니다 — 현재 열려 있는 프로젝트는 {1}입니다.",
+  "AI_CHAT_SETTINGS_TITLE": "AI 설정",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "기본값 (로컬 {0})",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "이 제공자들은 {0}을 구성합니다. API 키는 {1}로 전달됩니다.",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "자동으로 감지하려면 비워 두세요.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "{0} 실행 파일 경로"
 });
\ No newline at end of file
diff --git a/src/nls/lv/lastTranslated.json b/src/nls/lv/lastTranslated.json
index 61b0783d87..9fb162a6f3 100644
--- a/src/nls/lv/lastTranslated.json
+++ b/src/nls/lv/lastTranslated.json
@@ -33,6 +33,11 @@
   "AI_CHAT_CLAUDE_LOGIN_MSG": "Claude Code is installed but needs to be configured.",
   "AI_CHAT_CLAUDE_LOGIN_RESTART_NOTE": "Restart {APP_NAME} after configuration completes.",
   "AI_CHAT_CLAUDE_LOGIN_TITLE": "Setup Claude Code",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "That file did not run as {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "No file exists at that path.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "That file is not executable.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "That path contains characters that cannot be used.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "That file did not respond in time.",
   "AI_CHAT_CLI_INSTALLING": "Installing…",
   "AI_CHAT_CLI_INSTALLING_MSG": "Installing Claude Code, please wait. This may take a while...",
   "AI_CHAT_CLI_INSTALL_BTN": "Install Claude Code",
@@ -40,6 +45,12 @@
   "AI_CHAT_CLI_NEW_CONFIRM_MSG": "This will end the running Claude Code CLI session and start a fresh one. Continue?",
   "AI_CHAT_CLI_NEW_CONFIRM_TITLE": "End this CLI session?",
   "AI_CHAT_CLI_NOT_FOUND": "Claude Code Not Installed",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "The path set for {0} could not be used: {1} Enter a different path, or clear the box to detect it automatically.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Install {0}",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installation instructions",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} could not be found on this system. Install it, or enter the full path to its executable below.",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Save & Retry",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} not found",
   "AI_CHAT_CLI_RESTART_NOTE": "Restart {APP_NAME} after installation completes.",
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "This Claude Code CLI session is still running in {0} — the open project is now {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Stay on “{0}”",
@@ -48,6 +59,9 @@
   "AI_CHAT_CLI_UPSELL_OPEN_TERMINAL_BTN": "Open in Terminal",
   "AI_CHAT_CLI_UPSELL_TITLE": "Available in Phoenix Pro",
   "AI_CHAT_CLI_UPSELL_UPGRADE_BTN": "Upgrade to Pro",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "This will end the running Codex CLI session and start a fresh one. Continue?",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "This Codex CLI session is still running in {0} — the open project is now {1}.",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Running Codex inside the Phoenix AI panel is a Pro feature. You can still run the Codex CLI for free from the Terminal.",
   "AI_CHAT_CODE_COLLAPSE": "Collapse",
   "AI_CHAT_CODE_COLLAPSE_FOOTER": "Click to collapse",
   "AI_CHAT_CODE_DEFAULT_LANG": "text",
@@ -106,6 +120,7 @@
   "AI_CHAT_MODE_AUTO": "Auto",
   "AI_CHAT_MODE_CHAT": "Claude Code",
   "AI_CHAT_MODE_CLI": "Claude Code CLI",
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
   "AI_CHAT_MODE_EDIT": "AI Edit Mode",
   "AI_CHAT_MODE_FULL_AUTO": "Allow Everything",
   "AI_CHAT_MODE_INFO_AUTO": "AI uses judgment to auto-approve safe actions and asks about risky ones (Click to switch)",
@@ -113,7 +128,7 @@
   "AI_CHAT_MODE_INFO_FULL_AUTO": "AI can edit files and run commands without approval (Click to switch)",
   "AI_CHAT_MODE_INFO_PLAN": "AI will propose a plan before making changes (Click to switch)",
   "AI_CHAT_MODE_PLAN": "Plan Mode",
-  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded Claude Code CLI terminal",
+  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded CLI terminal",
   "AI_CHAT_NEW_BTN": "New",
   "AI_CHAT_NEW_SESSION_TITLE": "Start a new conversation",
   "AI_CHAT_NEW_WHILE_STREAMING_MSG": "AI is currently working on a task. Starting a new conversation will stop it. Continue?",
@@ -180,7 +195,7 @@
   "AI_CHAT_SEND_ERROR": "Failed to send message: {0}",
   "AI_CHAT_SEND_TITLE": "Send message",
   "AI_CHAT_SESSION_RESUMED": "Resumed session",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code Settings",
+  "AI_CHAT_SETTINGS_TITLE": "AI Settings",
   "AI_CHAT_SETUP_LEARN_MORE": "Learn More",
   "AI_CHAT_SETUP_NEED_HELP": "Need Help?",
   "AI_CHAT_SHOW_DIFF": "Show diff",
@@ -287,8 +302,11 @@
   "AI_SETTINGS_API_TIMEOUT_PLACEHOLDER": "Leave blank for default",
   "AI_SETTINGS_BASE_URL": "Base URL",
   "AI_SETTINGS_BASE_URL_PLACEHOLDER": "Leave blank for default",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Leave blank to detect automatically.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Path to the {0} executable",
   "AI_SETTINGS_CUSTOM_ENDPOINT_NOTICE": "Using custom API endpoint: {0}",
   "AI_SETTINGS_DEFAULT_PROVIDER": "Default (Local Claude Code)",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Default (Local {0})",
   "AI_SETTINGS_DELETE": "Delete",
   "AI_SETTINGS_DELETE_ACTIVE_CONFIRM": "\"{0}\" is the active provider. Deleting it will revert to the default. Continue?",
   "AI_SETTINGS_DELETE_PROVIDER": "Delete Provider",
@@ -301,6 +319,7 @@
   "AI_SETTINGS_PROVIDERS": "Providers",
   "AI_SETTINGS_PROVIDER_NAME": "Name",
   "AI_SETTINGS_PROVIDER_NAME_PLACEHOLDER": "e.g. My API Provider",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "These providers configure {0}. The API key is passed to it as {1}.",
   "AI_SETTINGS_RESET": "Reset",
   "AI_SETTINGS_SAVE": "Save",
   "AI_SETTINGS_SAVE_PROVIDER": "Save Provider",
diff --git a/src/nls/lv/strings.js b/src/nls/lv/strings.js
index ae97674d9d..d3efaf49f9 100644
--- a/src/nls/lv/strings.js
+++ b/src/nls/lv/strings.js
@@ -812,6 +812,8 @@ define({
   "LIVE_PREVIEW_LAYERS_EMPTY_PAGE_STYLES": "Lapa ir tukša. Pievienojiet elementu, lai redzētu tā stilus.",
   "LIVE_PREVIEW_LAYERS_SHOW_SELECTED": "Parādīt atlasīto elementu",
   "LIVE_PREVIEW_LAYERS_SCRUB_HINT": "Velciet, lai pielāgotu, divreiz noklikšķiniet, lai rediģētu",
+  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "īpašība",
+  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "vērtība",
   "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS": "Tiešais priekšskatījums tika atcelts, jo bija atvērti pārlūka izstrādātāja rīki",
   "LIVE_DEV_DETACHED_TARGET_CLOSED": "Tiešais priekšskatījums tika atcelts, jo lapa tika aizvērta pārlūkā",
   "LIVE_DEV_NAVIGATED_AWAY": "Tiešais priekšskatījums tika atcelts, jo pārlūks pārvietojās uz lapu, kas nav daļa no šī projekta",
@@ -2546,7 +2548,6 @@ define({
   "AI_CHAT_MODEL_DESC_SONNET": "Līdzsvarots ātrums un veiktspēja ikdienas kodēšanai",
   "AI_CHAT_MODEL_DESC_HAIKU": "Visātrākais modelis ātriem, vienkāršiem uzdevumiem",
   "AI_CHAT_MODEL_SELECT_TITLE": "Izvēlieties MI modeli šai sarakstei",
-  "AI_CHAT_MODE_SELECT_TITLE": "Pārslēgties starp Claude Code tērzēšanu un iegultu Claude Code CLI termināli",
   "AI_CHAT_MODEL_SWITCHED_NOTICE": "Pārslēgts uz {0}. Attiecas uz nākamo ziņu; pirmā atbilde var aizņemt nedaudz ilgāku laiku, kamēr tiek atjaunota kešatmiņa.",
   "AI_CHAT_INPUT_HINT": "Nospiediet {0}, lai nosūtītu · {1} jaunai rindai",
   "AI_CHAT_BASH_CONFIRM_TITLE": "Atļaut komandu?",
@@ -2618,7 +2619,6 @@ define({
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "Šī Claude Code CLI sesija joprojām darbojas projektā {0} — atvērtais projekts tagad ir {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_SWITCH_BTN": "Pārslēgties uz “{0}”",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Palikt projektā “{0}”",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code iestatījumi",
   "AI_SETTINGS_API_KEY": "API atslēga",
   "AI_SETTINGS_BASE_URL": "Bāzes URL",
   "AI_SETTINGS_API_TIMEOUT": "API noildze (ms)",
@@ -2762,6 +2762,25 @@ define({
   "MIGRATE_UNREACHABLE_TITLE": "Neizdevās sasniegt veco vietni",
   "MIGRATE_UNREACHABLE_MESSAGE": "{APP_NAME} nevarēja izveidot savienojumu ar {0}, lai meklētu jūsu projektus un iestatījumus, tādēļ nekas nav mainīts. Pārbaudiet interneta savienojumu, pēc tam mēģiniet vēlreiz, izmantojot {1}.",
   "CMD_MIGRATE_DATA": "Migrēt manus datus no {0}…",
-  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "īpašība",
-  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "vērtība"
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} nav atrasts",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "Šajā sistēmā {0} netika atrasts. Instalējiet to vai zemāk ievadiet pilnu ceļu uz tā izpildāmo failu.",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "Priekš {0} iestatīto ceļu nevarēja izmantot: {1} Ievadiet citu ceļu vai notīriet lauku, lai to noteiktu automātiski.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Instalēt {0}",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Saglabāt un mēģināt vēlreiz",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Instalēšanas instrukcijas",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "Norādītajā ceļā neeksistē neviens fails.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "Šis fails nav izpildāms.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "Šo failu neizdevās palaist kā {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "Fails neatbildēja noteiktajā laikā.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "Šis ceļš satur rakstzīmes, kuras nevar izmantot.",
+  "AI_CHAT_MODE_SELECT_TITLE": "Pārslēgties starp Claude Code tērzēšanu un iegulto CLI termināli",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "Šī darbība pārtrauks pašreizējo Codex CLI sesiju un sāks jaunu. Turpināt?",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Codex palaišana Phoenix AI panelī ir Pro funkcija. Jūs joprojām varat bez maksas palaist Codex CLI no termināļa.",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "Šī Codex CLI sesija joprojām darbojas {0} — atvērtais projekts tagad ir {1}.",
+  "AI_CHAT_SETTINGS_TITLE": "MI iestatījumi",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Noklusējuma (lokālais {0})",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "Šie pakalpojumu sniedzēji konfigurē {0}. API atslēga tam tiek nodota kā {1}.",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Atstājiet tukšu, lai noteiktu automātiski.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Ceļš uz {0} izpildāmo failu"
 });
\ No newline at end of file
diff --git a/src/nls/ml/lastTranslated.json b/src/nls/ml/lastTranslated.json
index 61b0783d87..9fb162a6f3 100644
--- a/src/nls/ml/lastTranslated.json
+++ b/src/nls/ml/lastTranslated.json
@@ -33,6 +33,11 @@
   "AI_CHAT_CLAUDE_LOGIN_MSG": "Claude Code is installed but needs to be configured.",
   "AI_CHAT_CLAUDE_LOGIN_RESTART_NOTE": "Restart {APP_NAME} after configuration completes.",
   "AI_CHAT_CLAUDE_LOGIN_TITLE": "Setup Claude Code",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "That file did not run as {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "No file exists at that path.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "That file is not executable.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "That path contains characters that cannot be used.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "That file did not respond in time.",
   "AI_CHAT_CLI_INSTALLING": "Installing…",
   "AI_CHAT_CLI_INSTALLING_MSG": "Installing Claude Code, please wait. This may take a while...",
   "AI_CHAT_CLI_INSTALL_BTN": "Install Claude Code",
@@ -40,6 +45,12 @@
   "AI_CHAT_CLI_NEW_CONFIRM_MSG": "This will end the running Claude Code CLI session and start a fresh one. Continue?",
   "AI_CHAT_CLI_NEW_CONFIRM_TITLE": "End this CLI session?",
   "AI_CHAT_CLI_NOT_FOUND": "Claude Code Not Installed",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "The path set for {0} could not be used: {1} Enter a different path, or clear the box to detect it automatically.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Install {0}",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installation instructions",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} could not be found on this system. Install it, or enter the full path to its executable below.",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Save & Retry",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} not found",
   "AI_CHAT_CLI_RESTART_NOTE": "Restart {APP_NAME} after installation completes.",
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "This Claude Code CLI session is still running in {0} — the open project is now {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Stay on “{0}”",
@@ -48,6 +59,9 @@
   "AI_CHAT_CLI_UPSELL_OPEN_TERMINAL_BTN": "Open in Terminal",
   "AI_CHAT_CLI_UPSELL_TITLE": "Available in Phoenix Pro",
   "AI_CHAT_CLI_UPSELL_UPGRADE_BTN": "Upgrade to Pro",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "This will end the running Codex CLI session and start a fresh one. Continue?",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "This Codex CLI session is still running in {0} — the open project is now {1}.",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Running Codex inside the Phoenix AI panel is a Pro feature. You can still run the Codex CLI for free from the Terminal.",
   "AI_CHAT_CODE_COLLAPSE": "Collapse",
   "AI_CHAT_CODE_COLLAPSE_FOOTER": "Click to collapse",
   "AI_CHAT_CODE_DEFAULT_LANG": "text",
@@ -106,6 +120,7 @@
   "AI_CHAT_MODE_AUTO": "Auto",
   "AI_CHAT_MODE_CHAT": "Claude Code",
   "AI_CHAT_MODE_CLI": "Claude Code CLI",
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
   "AI_CHAT_MODE_EDIT": "AI Edit Mode",
   "AI_CHAT_MODE_FULL_AUTO": "Allow Everything",
   "AI_CHAT_MODE_INFO_AUTO": "AI uses judgment to auto-approve safe actions and asks about risky ones (Click to switch)",
@@ -113,7 +128,7 @@
   "AI_CHAT_MODE_INFO_FULL_AUTO": "AI can edit files and run commands without approval (Click to switch)",
   "AI_CHAT_MODE_INFO_PLAN": "AI will propose a plan before making changes (Click to switch)",
   "AI_CHAT_MODE_PLAN": "Plan Mode",
-  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded Claude Code CLI terminal",
+  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded CLI terminal",
   "AI_CHAT_NEW_BTN": "New",
   "AI_CHAT_NEW_SESSION_TITLE": "Start a new conversation",
   "AI_CHAT_NEW_WHILE_STREAMING_MSG": "AI is currently working on a task. Starting a new conversation will stop it. Continue?",
@@ -180,7 +195,7 @@
   "AI_CHAT_SEND_ERROR": "Failed to send message: {0}",
   "AI_CHAT_SEND_TITLE": "Send message",
   "AI_CHAT_SESSION_RESUMED": "Resumed session",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code Settings",
+  "AI_CHAT_SETTINGS_TITLE": "AI Settings",
   "AI_CHAT_SETUP_LEARN_MORE": "Learn More",
   "AI_CHAT_SETUP_NEED_HELP": "Need Help?",
   "AI_CHAT_SHOW_DIFF": "Show diff",
@@ -287,8 +302,11 @@
   "AI_SETTINGS_API_TIMEOUT_PLACEHOLDER": "Leave blank for default",
   "AI_SETTINGS_BASE_URL": "Base URL",
   "AI_SETTINGS_BASE_URL_PLACEHOLDER": "Leave blank for default",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Leave blank to detect automatically.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Path to the {0} executable",
   "AI_SETTINGS_CUSTOM_ENDPOINT_NOTICE": "Using custom API endpoint: {0}",
   "AI_SETTINGS_DEFAULT_PROVIDER": "Default (Local Claude Code)",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Default (Local {0})",
   "AI_SETTINGS_DELETE": "Delete",
   "AI_SETTINGS_DELETE_ACTIVE_CONFIRM": "\"{0}\" is the active provider. Deleting it will revert to the default. Continue?",
   "AI_SETTINGS_DELETE_PROVIDER": "Delete Provider",
@@ -301,6 +319,7 @@
   "AI_SETTINGS_PROVIDERS": "Providers",
   "AI_SETTINGS_PROVIDER_NAME": "Name",
   "AI_SETTINGS_PROVIDER_NAME_PLACEHOLDER": "e.g. My API Provider",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "These providers configure {0}. The API key is passed to it as {1}.",
   "AI_SETTINGS_RESET": "Reset",
   "AI_SETTINGS_SAVE": "Save",
   "AI_SETTINGS_SAVE_PROVIDER": "Save Provider",
diff --git a/src/nls/ml/strings.js b/src/nls/ml/strings.js
index d93c120bd3..4dbc9b47d5 100644
--- a/src/nls/ml/strings.js
+++ b/src/nls/ml/strings.js
@@ -812,6 +812,8 @@ define({
   "LIVE_PREVIEW_LAYERS_EMPTY_PAGE_STYLES": "പേജ് ശൂന്യമാണ്. ഒരു ഘടകത്തിന്റെ സ്റ്റൈലുകൾ കാണുന്നതിനായി അത് ചേർക്കുക.",
   "LIVE_PREVIEW_LAYERS_SHOW_SELECTED": "തിരഞ്ഞെടുത്ത ഘടകം കാണിക്കുക",
   "LIVE_PREVIEW_LAYERS_SCRUB_HINT": "ക്രമീകരിക്കാൻ വലിക്കുക, എഡിറ്റുചെയ്യാൻ ഡബിൾ ക്ലിക്ക് ചെയ്യുക",
+  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "പ്രോപ്പർട്ടി",
+  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "മൂല്യം",
   "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS": "ബ്രൗസറിന്റെ ഡെവലപ്പർ ടൂളുകൾ തുറന്നതിനാൽ ലൈവ് പ്രിവ്യൂ റദ്ദാക്കി",
   "LIVE_DEV_DETACHED_TARGET_CLOSED": "ബ്രൗസറിൽ പേജ് അടച്ചതിനാൽ ലൈവ് പ്രിവ്യൂ റദ്ദാക്കി",
   "LIVE_DEV_NAVIGATED_AWAY": "ബ്രൗസർ നിലവിലെ പ്രോജക്റ്റിന്റെ ഭാഗമല്ലാത്ത ഒരു പേജിലേക്ക് നാവിഗേറ്റ് ചെയ്തതിനാൽ ലൈവ് പ്രിവ്യൂ റദ്ദാക്കി",
@@ -2546,7 +2548,6 @@ define({
   "AI_CHAT_MODEL_DESC_SONNET": "ദൈനംദിന കോഡിംഗിനുള്ള സന്തുലിതമായ വേഗതയും കഴിവും",
   "AI_CHAT_MODEL_DESC_HAIKU": "വേഗമേറിയതും ലളിതവുമായ ജോലികൾക്കുള്ള ഏറ്റവും വേഗതയേറിയ മോഡൽ",
   "AI_CHAT_MODEL_SELECT_TITLE": "ഈ ചാറ്റിനായി AI മോഡൽ തിരഞ്ഞെടുക്കുക",
-  "AI_CHAT_MODE_SELECT_TITLE": "Claude Code ചാറ്റും ഉൾച്ചേർത്ത Claude Code CLI ടെർമിനലും തമ്മിൽ മാറുക",
   "AI_CHAT_MODEL_SWITCHED_NOTICE": "{0}-ലേക്ക് മാറിയിരിക്കുന്നു. നിങ്ങളുടെ അടുത്ത സന്ദേശം മുതൽ ഇത് ബാധകമാകും. കാഷെ പുനർനിർമ്മിക്കുന്നതിനാൽ ആദ്യ പ്രതികരണത്തിന് അല്പം കൂടുതൽ സമയമെടുത്തേക്കാം.",
   "AI_CHAT_INPUT_HINT": "അയയ്‌ക്കാൻ {0} അമർത്തുക · പുതിയ വരിക്ക് {1}",
   "AI_CHAT_BASH_CONFIRM_TITLE": "കമാൻഡ് അനുവദിക്കണോ?",
@@ -2618,7 +2619,6 @@ define({
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "ഈ Claude Code CLI സെഷൻ {0}-ൽ ഇപ്പോഴും പ്രവർത്തിക്കുന്നു — ഇപ്പോൾ തുറന്നിരിക്കുന്ന പ്രോജക്റ്റ് {1} ആണ്.",
   "AI_CHAT_CLI_STALE_PROJECT_SWITCH_BTN": "“{0}”-ലേക്ക് മാറുക",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "“{0}”-ൽ തുടരുക",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code ക്രമീകരണങ്ങൾ",
   "AI_SETTINGS_API_KEY": "API കീ",
   "AI_SETTINGS_BASE_URL": "ബേസ് URL",
   "AI_SETTINGS_API_TIMEOUT": "API ടൈംഔട്ട് (ms)",
@@ -2762,6 +2762,25 @@ define({
   "MIGRATE_UNREACHABLE_TITLE": "പഴയ സൈറ്റിൽ എത്തിച്ചേരാൻ കഴിഞ്ഞില്ല",
   "MIGRATE_UNREACHABLE_MESSAGE": "നിങ്ങളുടെ പ്രോജക്റ്റുകളും ക്രമീകരണങ്ങളും തിരയുന്നതിന് {APP_NAME}-ന് {0}-ലേക്ക് കണക്റ്റുചെയ്യാൻ കഴിഞ്ഞില്ല, അതിനാൽ മാറ്റങ്ങളൊന്നും വരുത്തിയിട്ടില്ല. നിങ്ങളുടെ ഇന്റർനെറ്റ് കണക്ഷൻ പരിശോധിച്ച്, തുടർന്ന് {1} ഉപയോഗിച്ച് വീണ്ടും ശ്രമിക്കുക.",
   "CMD_MIGRATE_DATA": "{0}-ൽ നിന്ന് എൻ്റെ ഡാറ്റ മൈഗ്രേറ്റ് ചെയ്യുക…",
-  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "പ്രോപ്പർട്ടി",
-  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "മൂല്യം"
+  "AI_CHAT_MODE_CODEX_CLI": "കോഡെക്സ് സിഎൽഐ",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} കണ്ടെത്താനായില്ല",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "ഈ സിസ്റ്റത്തിൽ {0} കണ്ടെത്താനായില്ല. അത് ഇൻസ്റ്റാൾ ചെയ്യുക, അല്ലെങ്കിൽ അതിന്റെ എക്സിക്യൂട്ടബിളിന്റെ പൂർണ്ണ പാത താഴെ നൽകുക.",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "{0}-നായി നൽകിയിട്ടുള്ള പാത ഉപയോഗിക്കാൻ കഴിഞ്ഞില്ല: {1} മറ്റൊരു പാത നൽകുക, അല്ലെങ്കിൽ സ്വയമേവ കണ്ടെത്താനായി ബോക്സ് ക്ലിയർ ചെയ്യുക.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "{0} ഇൻസ്റ്റാൾ ചെയ്യുക",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "സേവ് ചെയ്ത് വീണ്ടും ശ്രമിക്കുക",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "ഇൻസ്റ്റാളേഷൻ നിർദ്ദേശങ്ങൾ",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "ആ പാതയിൽ ഫയൽ നിലവിലില്ല.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "ആ ഫയൽ എക്സിക്യൂട്ടബിൾ അല്ല.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "ആ ഫയൽ {0} ആയി പ്രവർത്തിച്ചില്ല.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "ആ ഫയൽ സമയബന്ധിതമായി പ്രതികരിച്ചില്ല.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "ആ പാതയിൽ ഉപയോഗിക്കാൻ കഴിയാത്ത അക്ഷരങ്ങൾ അടങ്ങിയിരിക്കുന്നു.",
+  "AI_CHAT_MODE_SELECT_TITLE": "ക്ലോഡ് കോഡ് ചാറ്റും ഒരു എംബഡഡ് CLI ടെർമിനലും തമ്മിൽ മാറുക",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "ഇത് പ്രവർത്തിക്കുന്ന കോഡെക്സ് CLI സെഷൻ അവസാനിപ്പിച്ച് പുതിയൊരെണ്ണം ആരംഭിക്കും. തുടരണോ?",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Phoenix AI പാനലിനുള്ളിൽ കോഡെക്സ് പ്രവർത്തിപ്പിക്കുന്നത് ഒരു പ്രോ ഫീച്ചറാണ്. നിങ്ങൾക്ക് ടെർമിനലിൽ നിന്ന് കോഡെക്സ് CLI സൗജന്യമായി പ്രവർത്തിപ്പിക്കാവുന്നതാണ്.",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "ഈ കോഡെക്സ് CLI സെഷൻ ഇപ്പോഴും {0}-ൽ പ്രവർത്തിക്കുന്നു — ഇപ്പോൾ തുറന്നിരിക്കുന്ന പ്രോജക്റ്റ് {1} ആണ്.",
+  "AI_CHAT_SETTINGS_TITLE": "AI ക്രമീകരണങ്ങൾ",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "ഡിഫോൾട്ട് (ലോക്കൽ {0})",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "ഈ പ്രൊവൈഡർമാർ {0}-നെ കോൺഫിഗർ ചെയ്യുന്നു. API കീ {1} ആയി ഇതിലേക്ക് കൈമാറുന്നു.",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "സ്വയമേവ കണ്ടെത്തുന്നതിന് ശൂന്യമായി വിടുക.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "{0} എക്സിക്യൂട്ടബിളിലേക്കുള്ള പാത"
 });
\ No newline at end of file
diff --git a/src/nls/nb/lastTranslated.json b/src/nls/nb/lastTranslated.json
index 61b0783d87..9fb162a6f3 100644
--- a/src/nls/nb/lastTranslated.json
+++ b/src/nls/nb/lastTranslated.json
@@ -33,6 +33,11 @@
   "AI_CHAT_CLAUDE_LOGIN_MSG": "Claude Code is installed but needs to be configured.",
   "AI_CHAT_CLAUDE_LOGIN_RESTART_NOTE": "Restart {APP_NAME} after configuration completes.",
   "AI_CHAT_CLAUDE_LOGIN_TITLE": "Setup Claude Code",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "That file did not run as {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "No file exists at that path.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "That file is not executable.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "That path contains characters that cannot be used.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "That file did not respond in time.",
   "AI_CHAT_CLI_INSTALLING": "Installing…",
   "AI_CHAT_CLI_INSTALLING_MSG": "Installing Claude Code, please wait. This may take a while...",
   "AI_CHAT_CLI_INSTALL_BTN": "Install Claude Code",
@@ -40,6 +45,12 @@
   "AI_CHAT_CLI_NEW_CONFIRM_MSG": "This will end the running Claude Code CLI session and start a fresh one. Continue?",
   "AI_CHAT_CLI_NEW_CONFIRM_TITLE": "End this CLI session?",
   "AI_CHAT_CLI_NOT_FOUND": "Claude Code Not Installed",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "The path set for {0} could not be used: {1} Enter a different path, or clear the box to detect it automatically.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Install {0}",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installation instructions",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} could not be found on this system. Install it, or enter the full path to its executable below.",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Save & Retry",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} not found",
   "AI_CHAT_CLI_RESTART_NOTE": "Restart {APP_NAME} after installation completes.",
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "This Claude Code CLI session is still running in {0} — the open project is now {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Stay on “{0}”",
@@ -48,6 +59,9 @@
   "AI_CHAT_CLI_UPSELL_OPEN_TERMINAL_BTN": "Open in Terminal",
   "AI_CHAT_CLI_UPSELL_TITLE": "Available in Phoenix Pro",
   "AI_CHAT_CLI_UPSELL_UPGRADE_BTN": "Upgrade to Pro",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "This will end the running Codex CLI session and start a fresh one. Continue?",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "This Codex CLI session is still running in {0} — the open project is now {1}.",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Running Codex inside the Phoenix AI panel is a Pro feature. You can still run the Codex CLI for free from the Terminal.",
   "AI_CHAT_CODE_COLLAPSE": "Collapse",
   "AI_CHAT_CODE_COLLAPSE_FOOTER": "Click to collapse",
   "AI_CHAT_CODE_DEFAULT_LANG": "text",
@@ -106,6 +120,7 @@
   "AI_CHAT_MODE_AUTO": "Auto",
   "AI_CHAT_MODE_CHAT": "Claude Code",
   "AI_CHAT_MODE_CLI": "Claude Code CLI",
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
   "AI_CHAT_MODE_EDIT": "AI Edit Mode",
   "AI_CHAT_MODE_FULL_AUTO": "Allow Everything",
   "AI_CHAT_MODE_INFO_AUTO": "AI uses judgment to auto-approve safe actions and asks about risky ones (Click to switch)",
@@ -113,7 +128,7 @@
   "AI_CHAT_MODE_INFO_FULL_AUTO": "AI can edit files and run commands without approval (Click to switch)",
   "AI_CHAT_MODE_INFO_PLAN": "AI will propose a plan before making changes (Click to switch)",
   "AI_CHAT_MODE_PLAN": "Plan Mode",
-  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded Claude Code CLI terminal",
+  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded CLI terminal",
   "AI_CHAT_NEW_BTN": "New",
   "AI_CHAT_NEW_SESSION_TITLE": "Start a new conversation",
   "AI_CHAT_NEW_WHILE_STREAMING_MSG": "AI is currently working on a task. Starting a new conversation will stop it. Continue?",
@@ -180,7 +195,7 @@
   "AI_CHAT_SEND_ERROR": "Failed to send message: {0}",
   "AI_CHAT_SEND_TITLE": "Send message",
   "AI_CHAT_SESSION_RESUMED": "Resumed session",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code Settings",
+  "AI_CHAT_SETTINGS_TITLE": "AI Settings",
   "AI_CHAT_SETUP_LEARN_MORE": "Learn More",
   "AI_CHAT_SETUP_NEED_HELP": "Need Help?",
   "AI_CHAT_SHOW_DIFF": "Show diff",
@@ -287,8 +302,11 @@
   "AI_SETTINGS_API_TIMEOUT_PLACEHOLDER": "Leave blank for default",
   "AI_SETTINGS_BASE_URL": "Base URL",
   "AI_SETTINGS_BASE_URL_PLACEHOLDER": "Leave blank for default",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Leave blank to detect automatically.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Path to the {0} executable",
   "AI_SETTINGS_CUSTOM_ENDPOINT_NOTICE": "Using custom API endpoint: {0}",
   "AI_SETTINGS_DEFAULT_PROVIDER": "Default (Local Claude Code)",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Default (Local {0})",
   "AI_SETTINGS_DELETE": "Delete",
   "AI_SETTINGS_DELETE_ACTIVE_CONFIRM": "\"{0}\" is the active provider. Deleting it will revert to the default. Continue?",
   "AI_SETTINGS_DELETE_PROVIDER": "Delete Provider",
@@ -301,6 +319,7 @@
   "AI_SETTINGS_PROVIDERS": "Providers",
   "AI_SETTINGS_PROVIDER_NAME": "Name",
   "AI_SETTINGS_PROVIDER_NAME_PLACEHOLDER": "e.g. My API Provider",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "These providers configure {0}. The API key is passed to it as {1}.",
   "AI_SETTINGS_RESET": "Reset",
   "AI_SETTINGS_SAVE": "Save",
   "AI_SETTINGS_SAVE_PROVIDER": "Save Provider",
diff --git a/src/nls/nb/strings.js b/src/nls/nb/strings.js
index c78b8508e5..ef390f53b6 100644
--- a/src/nls/nb/strings.js
+++ b/src/nls/nb/strings.js
@@ -812,6 +812,8 @@ define({
   "LIVE_PREVIEW_LAYERS_EMPTY_PAGE_STYLES": "Siden er tom. Legg til et element for å se stilene.",
   "LIVE_PREVIEW_LAYERS_SHOW_SELECTED": "Vis det valgte elementet",
   "LIVE_PREVIEW_LAYERS_SCRUB_HINT": "Dra for å justere, dobbeltklikk for å redigere",
+  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "Egenskap",
+  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "Verdi",
   "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS": "Live Preview ble kansellert fordi nettleserens utviklerverktøy ble åpnet",
   "LIVE_DEV_DETACHED_TARGET_CLOSED": "Live Preview ble kansellert fordi siden ble stengt i nettleseren",
   "LIVE_DEV_NAVIGATED_AWAY": "Live Preview ble kansellert fordi nettleseren navigerte til en side som ikke er en del av prosjektet",
@@ -2546,7 +2548,6 @@ define({
   "AI_CHAT_MODEL_DESC_SONNET": "Balansert hastighet og ytelse for daglig koding",
   "AI_CHAT_MODEL_DESC_HAIKU": "Raskeste modell for raske, enkle oppgaver",
   "AI_CHAT_MODEL_SELECT_TITLE": "Velg AI-modell for denne chatten",
-  "AI_CHAT_MODE_SELECT_TITLE": "Bytt mellom Claude Code-chatten og en innebygd Claude Code CLI-terminal",
   "AI_CHAT_MODEL_SWITCHED_NOTICE": "Byttet til {0}. Gjelder fra din neste melding. Det første svaret kan ta litt lenger tid mens hurtiglageret gjenoppbygges.",
   "AI_CHAT_INPUT_HINT": "Trykk {0} for å sende · {1} for ny linje",
   "AI_CHAT_BASH_CONFIRM_TITLE": "Tillate kommando?",
@@ -2618,7 +2619,6 @@ define({
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "Denne Claude Code CLI-økten kjører fremdeles i {0} – det åpne prosjektet er nå {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_SWITCH_BTN": "Bytt til «{0}»",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Forbli på «{0}»",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code-innstillinger",
   "AI_SETTINGS_API_KEY": "API-nøkkel",
   "AI_SETTINGS_BASE_URL": "Basis-URL",
   "AI_SETTINGS_API_TIMEOUT": "API-tidsavbrudd (ms)",
@@ -2762,6 +2762,25 @@ define({
   "MIGRATE_UNREACHABLE_TITLE": "Fikk ikke kontakt med det gamle nettstedet",
   "MIGRATE_UNREACHABLE_MESSAGE": "{APP_NAME} kunne ikke koble til {0} for å se etter prosjektene og innstillingene dine, så ingenting har blitt endret. Sjekk internettforbindelsen din, og prøv deretter på nytt med {1}.",
   "CMD_MIGRATE_DATA": "Migrer dataene mine fra {0}…",
-  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "Egenskap",
-  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "Verdi"
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} ble ikke funnet",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} ble ikke funnet på dette systemet. Installer det, eller skriv inn hele stien til den kjørbare filen nedenfor.",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "Stien som er angitt for {0} kunne ikke brukes: {1} Skriv inn en annen sti, eller tøm feltet for å finne den automatisk.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Installer {0}",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Lagre og prøv på nytt",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installasjonsinstruksjoner",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "Ingen fil eksisterer på den stien.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "Den filen er ikke kjørbar.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "Den filen kjørte ikke som {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "Filen svarte ikke i tide.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "Filstien inneholder tegn som ikke kan brukes.",
+  "AI_CHAT_MODE_SELECT_TITLE": "Bytt mellom Claude Code-chatten og en innebygd CLI-terminal.",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "Dette vil avslutte den pågående Codex CLI-økten og starte en ny. Fortsette?",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Å kjøre Codex i Phoenix AI-panelet er en Pro-funksjon. Du kan fortsatt kjøre Codex CLI gratis fra terminalen.",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "Denne Codex CLI-økten kjører fortsatt i {0} — det åpne prosjektet er nå {1}.",
+  "AI_CHAT_SETTINGS_TITLE": "AI-innstillinger",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Standard (Lokal {0})",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "Disse leverandørene konfigurerer {0}. API-nøkkelen sendes til den som {1}.",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "La stå tomt for automatisk gjenkjenning.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Sti til den kjørbare {0}-filen"
 });
\ No newline at end of file
diff --git a/src/nls/nl/lastTranslated.json b/src/nls/nl/lastTranslated.json
index 61b0783d87..9fb162a6f3 100644
--- a/src/nls/nl/lastTranslated.json
+++ b/src/nls/nl/lastTranslated.json
@@ -33,6 +33,11 @@
   "AI_CHAT_CLAUDE_LOGIN_MSG": "Claude Code is installed but needs to be configured.",
   "AI_CHAT_CLAUDE_LOGIN_RESTART_NOTE": "Restart {APP_NAME} after configuration completes.",
   "AI_CHAT_CLAUDE_LOGIN_TITLE": "Setup Claude Code",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "That file did not run as {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "No file exists at that path.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "That file is not executable.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "That path contains characters that cannot be used.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "That file did not respond in time.",
   "AI_CHAT_CLI_INSTALLING": "Installing…",
   "AI_CHAT_CLI_INSTALLING_MSG": "Installing Claude Code, please wait. This may take a while...",
   "AI_CHAT_CLI_INSTALL_BTN": "Install Claude Code",
@@ -40,6 +45,12 @@
   "AI_CHAT_CLI_NEW_CONFIRM_MSG": "This will end the running Claude Code CLI session and start a fresh one. Continue?",
   "AI_CHAT_CLI_NEW_CONFIRM_TITLE": "End this CLI session?",
   "AI_CHAT_CLI_NOT_FOUND": "Claude Code Not Installed",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "The path set for {0} could not be used: {1} Enter a different path, or clear the box to detect it automatically.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Install {0}",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installation instructions",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} could not be found on this system. Install it, or enter the full path to its executable below.",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Save & Retry",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} not found",
   "AI_CHAT_CLI_RESTART_NOTE": "Restart {APP_NAME} after installation completes.",
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "This Claude Code CLI session is still running in {0} — the open project is now {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Stay on “{0}”",
@@ -48,6 +59,9 @@
   "AI_CHAT_CLI_UPSELL_OPEN_TERMINAL_BTN": "Open in Terminal",
   "AI_CHAT_CLI_UPSELL_TITLE": "Available in Phoenix Pro",
   "AI_CHAT_CLI_UPSELL_UPGRADE_BTN": "Upgrade to Pro",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "This will end the running Codex CLI session and start a fresh one. Continue?",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "This Codex CLI session is still running in {0} — the open project is now {1}.",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Running Codex inside the Phoenix AI panel is a Pro feature. You can still run the Codex CLI for free from the Terminal.",
   "AI_CHAT_CODE_COLLAPSE": "Collapse",
   "AI_CHAT_CODE_COLLAPSE_FOOTER": "Click to collapse",
   "AI_CHAT_CODE_DEFAULT_LANG": "text",
@@ -106,6 +120,7 @@
   "AI_CHAT_MODE_AUTO": "Auto",
   "AI_CHAT_MODE_CHAT": "Claude Code",
   "AI_CHAT_MODE_CLI": "Claude Code CLI",
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
   "AI_CHAT_MODE_EDIT": "AI Edit Mode",
   "AI_CHAT_MODE_FULL_AUTO": "Allow Everything",
   "AI_CHAT_MODE_INFO_AUTO": "AI uses judgment to auto-approve safe actions and asks about risky ones (Click to switch)",
@@ -113,7 +128,7 @@
   "AI_CHAT_MODE_INFO_FULL_AUTO": "AI can edit files and run commands without approval (Click to switch)",
   "AI_CHAT_MODE_INFO_PLAN": "AI will propose a plan before making changes (Click to switch)",
   "AI_CHAT_MODE_PLAN": "Plan Mode",
-  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded Claude Code CLI terminal",
+  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded CLI terminal",
   "AI_CHAT_NEW_BTN": "New",
   "AI_CHAT_NEW_SESSION_TITLE": "Start a new conversation",
   "AI_CHAT_NEW_WHILE_STREAMING_MSG": "AI is currently working on a task. Starting a new conversation will stop it. Continue?",
@@ -180,7 +195,7 @@
   "AI_CHAT_SEND_ERROR": "Failed to send message: {0}",
   "AI_CHAT_SEND_TITLE": "Send message",
   "AI_CHAT_SESSION_RESUMED": "Resumed session",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code Settings",
+  "AI_CHAT_SETTINGS_TITLE": "AI Settings",
   "AI_CHAT_SETUP_LEARN_MORE": "Learn More",
   "AI_CHAT_SETUP_NEED_HELP": "Need Help?",
   "AI_CHAT_SHOW_DIFF": "Show diff",
@@ -287,8 +302,11 @@
   "AI_SETTINGS_API_TIMEOUT_PLACEHOLDER": "Leave blank for default",
   "AI_SETTINGS_BASE_URL": "Base URL",
   "AI_SETTINGS_BASE_URL_PLACEHOLDER": "Leave blank for default",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Leave blank to detect automatically.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Path to the {0} executable",
   "AI_SETTINGS_CUSTOM_ENDPOINT_NOTICE": "Using custom API endpoint: {0}",
   "AI_SETTINGS_DEFAULT_PROVIDER": "Default (Local Claude Code)",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Default (Local {0})",
   "AI_SETTINGS_DELETE": "Delete",
   "AI_SETTINGS_DELETE_ACTIVE_CONFIRM": "\"{0}\" is the active provider. Deleting it will revert to the default. Continue?",
   "AI_SETTINGS_DELETE_PROVIDER": "Delete Provider",
@@ -301,6 +319,7 @@
   "AI_SETTINGS_PROVIDERS": "Providers",
   "AI_SETTINGS_PROVIDER_NAME": "Name",
   "AI_SETTINGS_PROVIDER_NAME_PLACEHOLDER": "e.g. My API Provider",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "These providers configure {0}. The API key is passed to it as {1}.",
   "AI_SETTINGS_RESET": "Reset",
   "AI_SETTINGS_SAVE": "Save",
   "AI_SETTINGS_SAVE_PROVIDER": "Save Provider",
diff --git a/src/nls/nl/strings.js b/src/nls/nl/strings.js
index 2dba9d519d..c35cc1bd9d 100644
--- a/src/nls/nl/strings.js
+++ b/src/nls/nl/strings.js
@@ -812,6 +812,8 @@ define({
   "LIVE_PREVIEW_LAYERS_EMPTY_PAGE_STYLES": "De pagina is leeg. Voeg een element toe om de stijlen ervan te zien.",
   "LIVE_PREVIEW_LAYERS_SHOW_SELECTED": "Toon het geselecteerde element",
   "LIVE_PREVIEW_LAYERS_SCRUB_HINT": "Sleep om aan te passen, dubbelklik om te bewerken",
+  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "eigenschap",
+  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "waarde",
   "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS": "Live Voorbeeld is geannuleerd omdat de developer tools in de browser zijn geopend",
   "LIVE_DEV_DETACHED_TARGET_CLOSED": "Live Voorbeeld is geannuleerd omdat de pagina gesloten werd in de browser",
   "LIVE_DEV_NAVIGATED_AWAY": "Live Voorbeeld is geannuleerd omdat de browser navigeerde naar een pagina die geen deel uit maakt van het huidige project",
@@ -2546,7 +2548,6 @@ define({
   "AI_CHAT_MODEL_DESC_SONNET": "Gebalanceerde snelheid en capaciteit voor dagelijks coderen",
   "AI_CHAT_MODEL_DESC_HAIKU": "Snelste model voor snelle, eenvoudige taken",
   "AI_CHAT_MODEL_SELECT_TITLE": "Kies het AI-model voor deze chat",
-  "AI_CHAT_MODE_SELECT_TITLE": "Schakel tussen de Claude Code-chat en een ingesloten Claude Code CLI-terminal",
   "AI_CHAT_MODEL_SWITCHED_NOTICE": "Overgeschakeld naar {0}. Geldt vanaf uw volgende bericht; het eerste antwoord kan iets langer duren terwijl de cache opnieuw wordt opgebouwd.",
   "AI_CHAT_INPUT_HINT": "Druk op {0} om te verzenden · {1} voor een nieuwe regel",
   "AI_CHAT_BASH_CONFIRM_TITLE": "Commando toestaan?",
@@ -2618,7 +2619,6 @@ define({
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "Deze Claude Code CLI-sessie draait nog in {0} — het geopende project is nu {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_SWITCH_BTN": "Schakelen naar “{0}”",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Blijven op “{0}”",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code-instellingen",
   "AI_SETTINGS_API_KEY": "API-sleutel",
   "AI_SETTINGS_BASE_URL": "Basis-URL",
   "AI_SETTINGS_API_TIMEOUT": "API-time-out (ms)",
@@ -2762,6 +2762,25 @@ define({
   "MIGRATE_UNREACHABLE_TITLE": "Kon de oude site niet bereiken",
   "MIGRATE_UNREACHABLE_MESSAGE": "{APP_NAME} kon geen verbinding maken met {0} om uw projecten en instellingen te zoeken, dus er is niets gewijzigd. Controleer uw internetverbinding en probeer het opnieuw met {1}.",
   "CMD_MIGRATE_DATA": "Mijn gegevens migreren van {0}…",
-  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "eigenschap",
-  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "waarde"
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} niet gevonden",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} kon niet worden gevonden op dit systeem. Installeer het, of voer hieronder het volledige pad naar het uitvoerbare bestand in.",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "Het ingestelde pad voor {0} kon niet worden gebruikt: {1} Voer een ander pad in, of maak het veld leeg om het automatisch te detecteren.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Installeer {0}",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Opslaan en opnieuw proberen",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installatie-instructies",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "Er bestaat geen bestand op dat pad.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "Dat bestand is niet uitvoerbaar.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "Dat bestand kon niet worden uitgevoerd als {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "Dat bestand reageerde niet op tijd.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "Dat pad bevat tekens die niet gebruikt kunnen worden.",
+  "AI_CHAT_MODE_SELECT_TITLE": "Schakel tussen de Claude Code-chat en een ingebedde CLI-terminal",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "Hiermee wordt de actieve Codex CLI-sessie beëindigd en een nieuwe gestart. Doorgaan?",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Het uitvoeren van Codex in het Phoenix AI-paneel is een Pro-functie. U kunt de Codex CLI nog steeds gratis uitvoeren vanuit de Terminal.",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "Deze Codex CLI-sessie is nog actief in {0} — het geopende project is nu {1}.",
+  "AI_CHAT_SETTINGS_TITLE": "AI-instellingen",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Standaard (Lokaal {0})",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "Deze providers configureren {0}. De API-sleutel wordt hieraan doorgegeven als {1}.",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Laat leeg om automatisch te detecteren.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Pad naar het uitvoerbare {0}-bestand"
 });
\ No newline at end of file
diff --git a/src/nls/pl/lastTranslated.json b/src/nls/pl/lastTranslated.json
index 61b0783d87..9fb162a6f3 100644
--- a/src/nls/pl/lastTranslated.json
+++ b/src/nls/pl/lastTranslated.json
@@ -33,6 +33,11 @@
   "AI_CHAT_CLAUDE_LOGIN_MSG": "Claude Code is installed but needs to be configured.",
   "AI_CHAT_CLAUDE_LOGIN_RESTART_NOTE": "Restart {APP_NAME} after configuration completes.",
   "AI_CHAT_CLAUDE_LOGIN_TITLE": "Setup Claude Code",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "That file did not run as {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "No file exists at that path.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "That file is not executable.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "That path contains characters that cannot be used.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "That file did not respond in time.",
   "AI_CHAT_CLI_INSTALLING": "Installing…",
   "AI_CHAT_CLI_INSTALLING_MSG": "Installing Claude Code, please wait. This may take a while...",
   "AI_CHAT_CLI_INSTALL_BTN": "Install Claude Code",
@@ -40,6 +45,12 @@
   "AI_CHAT_CLI_NEW_CONFIRM_MSG": "This will end the running Claude Code CLI session and start a fresh one. Continue?",
   "AI_CHAT_CLI_NEW_CONFIRM_TITLE": "End this CLI session?",
   "AI_CHAT_CLI_NOT_FOUND": "Claude Code Not Installed",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "The path set for {0} could not be used: {1} Enter a different path, or clear the box to detect it automatically.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Install {0}",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installation instructions",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} could not be found on this system. Install it, or enter the full path to its executable below.",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Save & Retry",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} not found",
   "AI_CHAT_CLI_RESTART_NOTE": "Restart {APP_NAME} after installation completes.",
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "This Claude Code CLI session is still running in {0} — the open project is now {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Stay on “{0}”",
@@ -48,6 +59,9 @@
   "AI_CHAT_CLI_UPSELL_OPEN_TERMINAL_BTN": "Open in Terminal",
   "AI_CHAT_CLI_UPSELL_TITLE": "Available in Phoenix Pro",
   "AI_CHAT_CLI_UPSELL_UPGRADE_BTN": "Upgrade to Pro",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "This will end the running Codex CLI session and start a fresh one. Continue?",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "This Codex CLI session is still running in {0} — the open project is now {1}.",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Running Codex inside the Phoenix AI panel is a Pro feature. You can still run the Codex CLI for free from the Terminal.",
   "AI_CHAT_CODE_COLLAPSE": "Collapse",
   "AI_CHAT_CODE_COLLAPSE_FOOTER": "Click to collapse",
   "AI_CHAT_CODE_DEFAULT_LANG": "text",
@@ -106,6 +120,7 @@
   "AI_CHAT_MODE_AUTO": "Auto",
   "AI_CHAT_MODE_CHAT": "Claude Code",
   "AI_CHAT_MODE_CLI": "Claude Code CLI",
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
   "AI_CHAT_MODE_EDIT": "AI Edit Mode",
   "AI_CHAT_MODE_FULL_AUTO": "Allow Everything",
   "AI_CHAT_MODE_INFO_AUTO": "AI uses judgment to auto-approve safe actions and asks about risky ones (Click to switch)",
@@ -113,7 +128,7 @@
   "AI_CHAT_MODE_INFO_FULL_AUTO": "AI can edit files and run commands without approval (Click to switch)",
   "AI_CHAT_MODE_INFO_PLAN": "AI will propose a plan before making changes (Click to switch)",
   "AI_CHAT_MODE_PLAN": "Plan Mode",
-  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded Claude Code CLI terminal",
+  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded CLI terminal",
   "AI_CHAT_NEW_BTN": "New",
   "AI_CHAT_NEW_SESSION_TITLE": "Start a new conversation",
   "AI_CHAT_NEW_WHILE_STREAMING_MSG": "AI is currently working on a task. Starting a new conversation will stop it. Continue?",
@@ -180,7 +195,7 @@
   "AI_CHAT_SEND_ERROR": "Failed to send message: {0}",
   "AI_CHAT_SEND_TITLE": "Send message",
   "AI_CHAT_SESSION_RESUMED": "Resumed session",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code Settings",
+  "AI_CHAT_SETTINGS_TITLE": "AI Settings",
   "AI_CHAT_SETUP_LEARN_MORE": "Learn More",
   "AI_CHAT_SETUP_NEED_HELP": "Need Help?",
   "AI_CHAT_SHOW_DIFF": "Show diff",
@@ -287,8 +302,11 @@
   "AI_SETTINGS_API_TIMEOUT_PLACEHOLDER": "Leave blank for default",
   "AI_SETTINGS_BASE_URL": "Base URL",
   "AI_SETTINGS_BASE_URL_PLACEHOLDER": "Leave blank for default",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Leave blank to detect automatically.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Path to the {0} executable",
   "AI_SETTINGS_CUSTOM_ENDPOINT_NOTICE": "Using custom API endpoint: {0}",
   "AI_SETTINGS_DEFAULT_PROVIDER": "Default (Local Claude Code)",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Default (Local {0})",
   "AI_SETTINGS_DELETE": "Delete",
   "AI_SETTINGS_DELETE_ACTIVE_CONFIRM": "\"{0}\" is the active provider. Deleting it will revert to the default. Continue?",
   "AI_SETTINGS_DELETE_PROVIDER": "Delete Provider",
@@ -301,6 +319,7 @@
   "AI_SETTINGS_PROVIDERS": "Providers",
   "AI_SETTINGS_PROVIDER_NAME": "Name",
   "AI_SETTINGS_PROVIDER_NAME_PLACEHOLDER": "e.g. My API Provider",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "These providers configure {0}. The API key is passed to it as {1}.",
   "AI_SETTINGS_RESET": "Reset",
   "AI_SETTINGS_SAVE": "Save",
   "AI_SETTINGS_SAVE_PROVIDER": "Save Provider",
diff --git a/src/nls/pl/strings.js b/src/nls/pl/strings.js
index 27e44073ce..4a50bd838f 100644
--- a/src/nls/pl/strings.js
+++ b/src/nls/pl/strings.js
@@ -812,6 +812,8 @@ define({
   "LIVE_PREVIEW_LAYERS_EMPTY_PAGE_STYLES": "Strona jest pusta. Dodaj element, aby zobaczyć jego style.",
   "LIVE_PREVIEW_LAYERS_SHOW_SELECTED": "Pokaż zaznaczony element",
   "LIVE_PREVIEW_LAYERS_SCRUB_HINT": "Przeciągnij, aby dostosować, kliknij dwukrotnie, aby edytować",
+  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "właściwość",
+  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "wartość",
   "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS": "Podgląd na żywo został wyłączony, ponieważ uruchomiono narzędzia dla programistów w przeglądarce",
   "LIVE_DEV_DETACHED_TARGET_CLOSED": "Podgląd na żywo został wyłączony, ponieważ strona została zamknięta w przeglądarce",
   "LIVE_DEV_NAVIGATED_AWAY": "Podgląd na żywo został wyłączony, ponieważ została załadowana strona nie należąca do aktualnego projektu",
@@ -2546,7 +2548,6 @@ define({
   "AI_CHAT_MODEL_DESC_SONNET": "Zrównoważona szybkość i możliwości do codziennego kodowania",
   "AI_CHAT_MODEL_DESC_HAIKU": "Najszybszy model do szybkich, prostych zadań",
   "AI_CHAT_MODEL_SELECT_TITLE": "Wybierz model AI dla tego czatu",
-  "AI_CHAT_MODE_SELECT_TITLE": "Przełączaj między czatem Claude Code a wbudowanym terminalem Claude Code CLI",
   "AI_CHAT_MODEL_SWITCHED_NOTICE": "Przełączono na {0}. Zmiana obowiązuje od następnej wiadomości; pierwsza odpowiedź może potrwać chwilę dłużej podczas przebudowy pamięci podręcznej.",
   "AI_CHAT_INPUT_HINT": "Naciśnij {0}, aby wysłać · {1} dla nowej linii",
   "AI_CHAT_BASH_CONFIRM_TITLE": "Zezwolić na wykonanie polecenia?",
@@ -2618,7 +2619,6 @@ define({
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "Ta sesja Claude Code CLI jest nadal uruchomiona w {0} — otwarty projekt to teraz {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_SWITCH_BTN": "Przełącz na “{0}”",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Pozostań na “{0}”",
-  "AI_CHAT_SETTINGS_TITLE": "Ustawienia Claude Code",
   "AI_SETTINGS_API_KEY": "Klucz API",
   "AI_SETTINGS_BASE_URL": "Bazowy URL",
   "AI_SETTINGS_API_TIMEOUT": "Limit czasu API (ms)",
@@ -2762,6 +2762,25 @@ define({
   "MIGRATE_UNREACHABLE_TITLE": "Nie udało się połączyć ze starą witryną",
   "MIGRATE_UNREACHABLE_MESSAGE": "{APP_NAME} nie mogła połączyć się z {0}, aby wyszukać Twoje projekty i ustawienia, dlatego nic nie zostało zmienione. Sprawdź połączenie z internetem, a następnie spróbuj ponownie, wybierając {1}.",
   "CMD_MIGRATE_DATA": "Migruj moje dane z {0}…",
-  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "właściwość",
-  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "wartość"
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "Nie znaleziono {0}",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "Nie można znaleźć {0} w tym systemie. Zainstaluj go lub wprowadź poniżej pełną ścieżkę do jego pliku wykonywalnego.",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "Nie można użyć ścieżki ustawionej dla {0}: {1}. Wprowadź inną ścieżkę lub wyczyść pole, aby wykryć ją automatycznie.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Zainstaluj {0}",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Zapisz i spróbuj ponownie",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Instrukcje instalacji",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "Brak pliku pod wskazaną ścieżką.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "Ten plik nie jest wykonywalny.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "Ten plik nie uruchomił się jako {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "Ten plik nie odpowiedział na czas.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "Ta ścieżka zawiera niedozwolone znaki.",
+  "AI_CHAT_MODE_SELECT_TITLE": "Przełączanie między czatem Claude Code a osadzonym terminalem CLI",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "Spowoduje to zakończenie bieżącej sesji Codex CLI i rozpoczęcie nowej. Kontynuować?",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Uruchamianie Codex w panelu Phoenix AI jest funkcją Pro. Nadal możesz uruchamiać Codex CLI za darmo z poziomu terminala.",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "Ta sesja Codex CLI jest nadal uruchomiona w {0} — obecnie otwarty projekt to {1}.",
+  "AI_CHAT_SETTINGS_TITLE": "Ustawienia AI",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Domyślny (Lokalny {0})",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "Ci dostawcy konfigurują {0}. Klucz API jest do niego przekazywany jako {1}.",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Pozostaw puste, aby wykryć automatycznie.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Ścieżka do pliku wykonywalnego {0}"
 });
\ No newline at end of file
diff --git a/src/nls/pt-br/lastTranslated.json b/src/nls/pt-br/lastTranslated.json
index 61b0783d87..9fb162a6f3 100644
--- a/src/nls/pt-br/lastTranslated.json
+++ b/src/nls/pt-br/lastTranslated.json
@@ -33,6 +33,11 @@
   "AI_CHAT_CLAUDE_LOGIN_MSG": "Claude Code is installed but needs to be configured.",
   "AI_CHAT_CLAUDE_LOGIN_RESTART_NOTE": "Restart {APP_NAME} after configuration completes.",
   "AI_CHAT_CLAUDE_LOGIN_TITLE": "Setup Claude Code",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "That file did not run as {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "No file exists at that path.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "That file is not executable.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "That path contains characters that cannot be used.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "That file did not respond in time.",
   "AI_CHAT_CLI_INSTALLING": "Installing…",
   "AI_CHAT_CLI_INSTALLING_MSG": "Installing Claude Code, please wait. This may take a while...",
   "AI_CHAT_CLI_INSTALL_BTN": "Install Claude Code",
@@ -40,6 +45,12 @@
   "AI_CHAT_CLI_NEW_CONFIRM_MSG": "This will end the running Claude Code CLI session and start a fresh one. Continue?",
   "AI_CHAT_CLI_NEW_CONFIRM_TITLE": "End this CLI session?",
   "AI_CHAT_CLI_NOT_FOUND": "Claude Code Not Installed",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "The path set for {0} could not be used: {1} Enter a different path, or clear the box to detect it automatically.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Install {0}",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installation instructions",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} could not be found on this system. Install it, or enter the full path to its executable below.",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Save & Retry",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} not found",
   "AI_CHAT_CLI_RESTART_NOTE": "Restart {APP_NAME} after installation completes.",
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "This Claude Code CLI session is still running in {0} — the open project is now {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Stay on “{0}”",
@@ -48,6 +59,9 @@
   "AI_CHAT_CLI_UPSELL_OPEN_TERMINAL_BTN": "Open in Terminal",
   "AI_CHAT_CLI_UPSELL_TITLE": "Available in Phoenix Pro",
   "AI_CHAT_CLI_UPSELL_UPGRADE_BTN": "Upgrade to Pro",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "This will end the running Codex CLI session and start a fresh one. Continue?",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "This Codex CLI session is still running in {0} — the open project is now {1}.",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Running Codex inside the Phoenix AI panel is a Pro feature. You can still run the Codex CLI for free from the Terminal.",
   "AI_CHAT_CODE_COLLAPSE": "Collapse",
   "AI_CHAT_CODE_COLLAPSE_FOOTER": "Click to collapse",
   "AI_CHAT_CODE_DEFAULT_LANG": "text",
@@ -106,6 +120,7 @@
   "AI_CHAT_MODE_AUTO": "Auto",
   "AI_CHAT_MODE_CHAT": "Claude Code",
   "AI_CHAT_MODE_CLI": "Claude Code CLI",
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
   "AI_CHAT_MODE_EDIT": "AI Edit Mode",
   "AI_CHAT_MODE_FULL_AUTO": "Allow Everything",
   "AI_CHAT_MODE_INFO_AUTO": "AI uses judgment to auto-approve safe actions and asks about risky ones (Click to switch)",
@@ -113,7 +128,7 @@
   "AI_CHAT_MODE_INFO_FULL_AUTO": "AI can edit files and run commands without approval (Click to switch)",
   "AI_CHAT_MODE_INFO_PLAN": "AI will propose a plan before making changes (Click to switch)",
   "AI_CHAT_MODE_PLAN": "Plan Mode",
-  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded Claude Code CLI terminal",
+  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded CLI terminal",
   "AI_CHAT_NEW_BTN": "New",
   "AI_CHAT_NEW_SESSION_TITLE": "Start a new conversation",
   "AI_CHAT_NEW_WHILE_STREAMING_MSG": "AI is currently working on a task. Starting a new conversation will stop it. Continue?",
@@ -180,7 +195,7 @@
   "AI_CHAT_SEND_ERROR": "Failed to send message: {0}",
   "AI_CHAT_SEND_TITLE": "Send message",
   "AI_CHAT_SESSION_RESUMED": "Resumed session",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code Settings",
+  "AI_CHAT_SETTINGS_TITLE": "AI Settings",
   "AI_CHAT_SETUP_LEARN_MORE": "Learn More",
   "AI_CHAT_SETUP_NEED_HELP": "Need Help?",
   "AI_CHAT_SHOW_DIFF": "Show diff",
@@ -287,8 +302,11 @@
   "AI_SETTINGS_API_TIMEOUT_PLACEHOLDER": "Leave blank for default",
   "AI_SETTINGS_BASE_URL": "Base URL",
   "AI_SETTINGS_BASE_URL_PLACEHOLDER": "Leave blank for default",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Leave blank to detect automatically.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Path to the {0} executable",
   "AI_SETTINGS_CUSTOM_ENDPOINT_NOTICE": "Using custom API endpoint: {0}",
   "AI_SETTINGS_DEFAULT_PROVIDER": "Default (Local Claude Code)",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Default (Local {0})",
   "AI_SETTINGS_DELETE": "Delete",
   "AI_SETTINGS_DELETE_ACTIVE_CONFIRM": "\"{0}\" is the active provider. Deleting it will revert to the default. Continue?",
   "AI_SETTINGS_DELETE_PROVIDER": "Delete Provider",
@@ -301,6 +319,7 @@
   "AI_SETTINGS_PROVIDERS": "Providers",
   "AI_SETTINGS_PROVIDER_NAME": "Name",
   "AI_SETTINGS_PROVIDER_NAME_PLACEHOLDER": "e.g. My API Provider",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "These providers configure {0}. The API key is passed to it as {1}.",
   "AI_SETTINGS_RESET": "Reset",
   "AI_SETTINGS_SAVE": "Save",
   "AI_SETTINGS_SAVE_PROVIDER": "Save Provider",
diff --git a/src/nls/pt-br/strings.js b/src/nls/pt-br/strings.js
index f9289faa73..a58c04abc4 100644
--- a/src/nls/pt-br/strings.js
+++ b/src/nls/pt-br/strings.js
@@ -812,6 +812,8 @@ define({
   "LIVE_PREVIEW_LAYERS_EMPTY_PAGE_STYLES": "A página está vazia. Adicione um elemento para ver seus estilos.",
   "LIVE_PREVIEW_LAYERS_SHOW_SELECTED": "Mostrar o elemento selecionado",
   "LIVE_PREVIEW_LAYERS_SCRUB_HINT": "Arraste para ajustar, clique duas vezes para editar",
+  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "propriedade",
+  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "valor",
   "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS": "O Live Preview foi cancelado pois as ferramentas de desenvolvedor do navegador foram abertas",
   "LIVE_DEV_DETACHED_TARGET_CLOSED": "O Live Preview foi cancelado pois a página foi fechada no navegador",
   "LIVE_DEV_NAVIGATED_AWAY": "O Live Preview foi cancelado pois o navegador foi para uma página que não pertence a este projeto atual",
@@ -2546,7 +2548,6 @@ define({
   "AI_CHAT_MODEL_DESC_SONNET": "Equilíbrio entre velocidade e capacidade para a programação do dia a dia",
   "AI_CHAT_MODEL_DESC_HAIKU": "Modelo mais rápido para tarefas rápidas e simples",
   "AI_CHAT_MODEL_SELECT_TITLE": "Escolha o modelo de IA para este chat",
-  "AI_CHAT_MODE_SELECT_TITLE": "Alterne entre o chat e o terminal CLI do Claude Code",
   "AI_CHAT_MODEL_SWITCHED_NOTICE": "Alterado para {0}. Válido a partir da sua próxima mensagem; a primeira resposta pode demorar um pouco mais enquanto o cache é reconstruído.",
   "AI_CHAT_INPUT_HINT": "Pressione {0} para enviar · {1} para nova linha",
   "AI_CHAT_BASH_CONFIRM_TITLE": "Permitir comando?",
@@ -2618,7 +2619,6 @@ define({
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "Esta sessão da CLI do Claude Code ainda está em execução em {0} — o projeto aberto agora é {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_SWITCH_BTN": "Alternar para “{0}”",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Permanecer em “{0}”",
-  "AI_CHAT_SETTINGS_TITLE": "Configurações do Claude Code",
   "AI_SETTINGS_API_KEY": "Chave de API",
   "AI_SETTINGS_BASE_URL": "URL Base",
   "AI_SETTINGS_API_TIMEOUT": "Tempo Limite da API (ms)",
@@ -2762,6 +2762,25 @@ define({
   "MIGRATE_UNREACHABLE_TITLE": "Não foi possível acessar o site antigo",
   "MIGRATE_UNREACHABLE_MESSAGE": "O {APP_NAME} não conseguiu se conectar a {0} para procurar seus projetos e configurações, então nada foi alterado. Verifique sua conexão com a internet e tente novamente com {1}.",
   "CMD_MIGRATE_DATA": "Migrar Meus Dados de {0}…",
-  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "propriedade",
-  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "valor"
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} não encontrado",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "Não foi possível encontrar {0} neste sistema. Instale-o ou insira o caminho completo para o seu executável abaixo.",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "O caminho definido para {0} não pôde ser usado: {1} Insira um caminho diferente ou limpe o campo para detectá-lo automaticamente.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Instalar {0}",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Salvar e Tentar Novamente",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Instruções de instalação",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "Nenhum arquivo existe nesse caminho.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "Esse arquivo não é executável.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "Esse arquivo não foi executado como {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "O arquivo não respondeu a tempo.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "O caminho contém caracteres que não podem ser usados.",
+  "AI_CHAT_MODE_SELECT_TITLE": "Alternar entre o chat Claude Code e um terminal CLI incorporado",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "Isso encerrará a sessão do Codex CLI em execução e iniciará uma nova. Deseja continuar?",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Executar o Codex no painel da Phoenix AI é um recurso Pro. Você ainda pode executar o Codex CLI gratuitamente no Terminal.",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "Esta sessão do Codex CLI ainda está em execução em {0} — o projeto aberto agora é o {1}.",
+  "AI_CHAT_SETTINGS_TITLE": "Configurações de IA",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Padrão ({0} local)",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "Estes provedores configuram o {0}. A chave de API é passada para ele como {1}.",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Deixe em branco para detectar automaticamente.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Caminho para o executável {0}"
 });
\ No newline at end of file
diff --git a/src/nls/pt-pt/lastTranslated.json b/src/nls/pt-pt/lastTranslated.json
index 61b0783d87..9fb162a6f3 100644
--- a/src/nls/pt-pt/lastTranslated.json
+++ b/src/nls/pt-pt/lastTranslated.json
@@ -33,6 +33,11 @@
   "AI_CHAT_CLAUDE_LOGIN_MSG": "Claude Code is installed but needs to be configured.",
   "AI_CHAT_CLAUDE_LOGIN_RESTART_NOTE": "Restart {APP_NAME} after configuration completes.",
   "AI_CHAT_CLAUDE_LOGIN_TITLE": "Setup Claude Code",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "That file did not run as {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "No file exists at that path.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "That file is not executable.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "That path contains characters that cannot be used.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "That file did not respond in time.",
   "AI_CHAT_CLI_INSTALLING": "Installing…",
   "AI_CHAT_CLI_INSTALLING_MSG": "Installing Claude Code, please wait. This may take a while...",
   "AI_CHAT_CLI_INSTALL_BTN": "Install Claude Code",
@@ -40,6 +45,12 @@
   "AI_CHAT_CLI_NEW_CONFIRM_MSG": "This will end the running Claude Code CLI session and start a fresh one. Continue?",
   "AI_CHAT_CLI_NEW_CONFIRM_TITLE": "End this CLI session?",
   "AI_CHAT_CLI_NOT_FOUND": "Claude Code Not Installed",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "The path set for {0} could not be used: {1} Enter a different path, or clear the box to detect it automatically.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Install {0}",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installation instructions",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} could not be found on this system. Install it, or enter the full path to its executable below.",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Save & Retry",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} not found",
   "AI_CHAT_CLI_RESTART_NOTE": "Restart {APP_NAME} after installation completes.",
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "This Claude Code CLI session is still running in {0} — the open project is now {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Stay on “{0}”",
@@ -48,6 +59,9 @@
   "AI_CHAT_CLI_UPSELL_OPEN_TERMINAL_BTN": "Open in Terminal",
   "AI_CHAT_CLI_UPSELL_TITLE": "Available in Phoenix Pro",
   "AI_CHAT_CLI_UPSELL_UPGRADE_BTN": "Upgrade to Pro",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "This will end the running Codex CLI session and start a fresh one. Continue?",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "This Codex CLI session is still running in {0} — the open project is now {1}.",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Running Codex inside the Phoenix AI panel is a Pro feature. You can still run the Codex CLI for free from the Terminal.",
   "AI_CHAT_CODE_COLLAPSE": "Collapse",
   "AI_CHAT_CODE_COLLAPSE_FOOTER": "Click to collapse",
   "AI_CHAT_CODE_DEFAULT_LANG": "text",
@@ -106,6 +120,7 @@
   "AI_CHAT_MODE_AUTO": "Auto",
   "AI_CHAT_MODE_CHAT": "Claude Code",
   "AI_CHAT_MODE_CLI": "Claude Code CLI",
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
   "AI_CHAT_MODE_EDIT": "AI Edit Mode",
   "AI_CHAT_MODE_FULL_AUTO": "Allow Everything",
   "AI_CHAT_MODE_INFO_AUTO": "AI uses judgment to auto-approve safe actions and asks about risky ones (Click to switch)",
@@ -113,7 +128,7 @@
   "AI_CHAT_MODE_INFO_FULL_AUTO": "AI can edit files and run commands without approval (Click to switch)",
   "AI_CHAT_MODE_INFO_PLAN": "AI will propose a plan before making changes (Click to switch)",
   "AI_CHAT_MODE_PLAN": "Plan Mode",
-  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded Claude Code CLI terminal",
+  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded CLI terminal",
   "AI_CHAT_NEW_BTN": "New",
   "AI_CHAT_NEW_SESSION_TITLE": "Start a new conversation",
   "AI_CHAT_NEW_WHILE_STREAMING_MSG": "AI is currently working on a task. Starting a new conversation will stop it. Continue?",
@@ -180,7 +195,7 @@
   "AI_CHAT_SEND_ERROR": "Failed to send message: {0}",
   "AI_CHAT_SEND_TITLE": "Send message",
   "AI_CHAT_SESSION_RESUMED": "Resumed session",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code Settings",
+  "AI_CHAT_SETTINGS_TITLE": "AI Settings",
   "AI_CHAT_SETUP_LEARN_MORE": "Learn More",
   "AI_CHAT_SETUP_NEED_HELP": "Need Help?",
   "AI_CHAT_SHOW_DIFF": "Show diff",
@@ -287,8 +302,11 @@
   "AI_SETTINGS_API_TIMEOUT_PLACEHOLDER": "Leave blank for default",
   "AI_SETTINGS_BASE_URL": "Base URL",
   "AI_SETTINGS_BASE_URL_PLACEHOLDER": "Leave blank for default",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Leave blank to detect automatically.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Path to the {0} executable",
   "AI_SETTINGS_CUSTOM_ENDPOINT_NOTICE": "Using custom API endpoint: {0}",
   "AI_SETTINGS_DEFAULT_PROVIDER": "Default (Local Claude Code)",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Default (Local {0})",
   "AI_SETTINGS_DELETE": "Delete",
   "AI_SETTINGS_DELETE_ACTIVE_CONFIRM": "\"{0}\" is the active provider. Deleting it will revert to the default. Continue?",
   "AI_SETTINGS_DELETE_PROVIDER": "Delete Provider",
@@ -301,6 +319,7 @@
   "AI_SETTINGS_PROVIDERS": "Providers",
   "AI_SETTINGS_PROVIDER_NAME": "Name",
   "AI_SETTINGS_PROVIDER_NAME_PLACEHOLDER": "e.g. My API Provider",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "These providers configure {0}. The API key is passed to it as {1}.",
   "AI_SETTINGS_RESET": "Reset",
   "AI_SETTINGS_SAVE": "Save",
   "AI_SETTINGS_SAVE_PROVIDER": "Save Provider",
diff --git a/src/nls/pt-pt/strings.js b/src/nls/pt-pt/strings.js
index 1d065f0758..176ad11b73 100644
--- a/src/nls/pt-pt/strings.js
+++ b/src/nls/pt-pt/strings.js
@@ -812,6 +812,8 @@ define({
   "LIVE_PREVIEW_LAYERS_EMPTY_PAGE_STYLES": "A página está vazia. Adicione um elemento para ver os seus estilos.",
   "LIVE_PREVIEW_LAYERS_SHOW_SELECTED": "Mostrar o elemento selecionado",
   "LIVE_PREVIEW_LAYERS_SCRUB_HINT": "Arraste para ajustar, clique duas vezes para editar",
+  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "propriedade",
+  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "valor",
   "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS": "A Pré-visualização Dinâmica foi cancelada porque as ferramentas de desenvolvimento do navegador foram abertas",
   "LIVE_DEV_DETACHED_TARGET_CLOSED": "A Pré-visualização Dinâmica foi cancelada porque a página foi fechada no navegador",
   "LIVE_DEV_NAVIGATED_AWAY": "A Pré-visualização Dinâmica foi cancelada porque o navegador navegou para uma página que não faz parte do projeto atual",
@@ -2546,7 +2548,6 @@ define({
   "AI_CHAT_MODEL_DESC_SONNET": "Velocidade e capacidade equilibradas para programação do dia a dia",
   "AI_CHAT_MODEL_DESC_HAIKU": "Modelo mais rápido para tarefas rápidas e simples",
   "AI_CHAT_MODEL_SELECT_TITLE": "Escolha o modelo de IA para esta conversa",
-  "AI_CHAT_MODE_SELECT_TITLE": "Alternar entre o chat Claude Code e o terminal CLI Claude Code incorporado",
   "AI_CHAT_MODEL_SWITCHED_NOTICE": "Mudou para {0}. Aplica-se a partir da sua próxima mensagem; a primeira resposta pode demorar um pouco mais enquanto a cache é reconstruída.",
   "AI_CHAT_INPUT_HINT": "Pressione {0} para enviar · {1} para nova linha",
   "AI_CHAT_BASH_CONFIRM_TITLE": "Permitir comando?",
@@ -2618,7 +2619,6 @@ define({
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "Esta sessão Claude Code CLI ainda está em execução em {0} — o projeto aberto é agora {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_SWITCH_BTN": "Mudar para “{0}”",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Permanecer em “{0}”",
-  "AI_CHAT_SETTINGS_TITLE": "Definições do Claude Code",
   "AI_SETTINGS_API_KEY": "Chave da API",
   "AI_SETTINGS_BASE_URL": "URL de Base",
   "AI_SETTINGS_API_TIMEOUT": "Tempo Limite da API (ms)",
@@ -2762,6 +2762,25 @@ define({
   "MIGRATE_UNREACHABLE_TITLE": "Não foi possível aceder ao site antigo",
   "MIGRATE_UNREACHABLE_MESSAGE": "O {APP_NAME} não se conseguiu ligar a {0} para procurar os seus projetos e definições, pelo que nada foi alterado. Verifique a sua ligação à internet e, em seguida, tente novamente com {1}.",
   "CMD_MIGRATE_DATA": "Migrar os Meus Dados de {0}…",
-  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "propriedade",
-  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "valor"
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} não encontrado",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "Não foi possível encontrar o {0} neste sistema. Instale-o ou introduza o caminho completo para o seu executável abaixo.",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "O caminho definido para {0} não pôde ser utilizado: {1} Introduza um caminho diferente ou limpe a caixa para o detetar automaticamente.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Instalar {0}",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Guardar e Tentar Novamente",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Instruções de instalação",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "Não existe nenhum ficheiro nesse caminho.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "Esse ficheiro não é executável.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "Esse ficheiro não foi executado como {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "O ficheiro não respondeu a tempo.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "Esse caminho contém caracteres que não podem ser usados.",
+  "AI_CHAT_MODE_SELECT_TITLE": "Alternar entre o chat Claude Code e um terminal CLI incorporado",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "Isto irá terminar a sessão CLI do Codex em execução e iniciar uma nova. Continuar?",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Executar o Codex dentro do painel Phoenix AI é uma funcionalidade Pro. Pode continuar a executar o CLI do Codex gratuitamente a partir do Terminal.",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "Esta sessão CLI do Codex ainda está em execução em {0} — o projeto aberto é agora {1}.",
+  "AI_CHAT_SETTINGS_TITLE": "Definições de IA",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Padrão (Local {0})",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "Estes fornecedores configuram o {0}. A chave de API é-lhe passada como {1}.",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Deixe em branco para detetar automaticamente.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Caminho para o executável {0}"
 });
\ No newline at end of file
diff --git a/src/nls/ro/lastTranslated.json b/src/nls/ro/lastTranslated.json
index 61b0783d87..9fb162a6f3 100644
--- a/src/nls/ro/lastTranslated.json
+++ b/src/nls/ro/lastTranslated.json
@@ -33,6 +33,11 @@
   "AI_CHAT_CLAUDE_LOGIN_MSG": "Claude Code is installed but needs to be configured.",
   "AI_CHAT_CLAUDE_LOGIN_RESTART_NOTE": "Restart {APP_NAME} after configuration completes.",
   "AI_CHAT_CLAUDE_LOGIN_TITLE": "Setup Claude Code",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "That file did not run as {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "No file exists at that path.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "That file is not executable.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "That path contains characters that cannot be used.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "That file did not respond in time.",
   "AI_CHAT_CLI_INSTALLING": "Installing…",
   "AI_CHAT_CLI_INSTALLING_MSG": "Installing Claude Code, please wait. This may take a while...",
   "AI_CHAT_CLI_INSTALL_BTN": "Install Claude Code",
@@ -40,6 +45,12 @@
   "AI_CHAT_CLI_NEW_CONFIRM_MSG": "This will end the running Claude Code CLI session and start a fresh one. Continue?",
   "AI_CHAT_CLI_NEW_CONFIRM_TITLE": "End this CLI session?",
   "AI_CHAT_CLI_NOT_FOUND": "Claude Code Not Installed",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "The path set for {0} could not be used: {1} Enter a different path, or clear the box to detect it automatically.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Install {0}",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installation instructions",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} could not be found on this system. Install it, or enter the full path to its executable below.",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Save & Retry",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} not found",
   "AI_CHAT_CLI_RESTART_NOTE": "Restart {APP_NAME} after installation completes.",
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "This Claude Code CLI session is still running in {0} — the open project is now {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Stay on “{0}”",
@@ -48,6 +59,9 @@
   "AI_CHAT_CLI_UPSELL_OPEN_TERMINAL_BTN": "Open in Terminal",
   "AI_CHAT_CLI_UPSELL_TITLE": "Available in Phoenix Pro",
   "AI_CHAT_CLI_UPSELL_UPGRADE_BTN": "Upgrade to Pro",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "This will end the running Codex CLI session and start a fresh one. Continue?",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "This Codex CLI session is still running in {0} — the open project is now {1}.",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Running Codex inside the Phoenix AI panel is a Pro feature. You can still run the Codex CLI for free from the Terminal.",
   "AI_CHAT_CODE_COLLAPSE": "Collapse",
   "AI_CHAT_CODE_COLLAPSE_FOOTER": "Click to collapse",
   "AI_CHAT_CODE_DEFAULT_LANG": "text",
@@ -106,6 +120,7 @@
   "AI_CHAT_MODE_AUTO": "Auto",
   "AI_CHAT_MODE_CHAT": "Claude Code",
   "AI_CHAT_MODE_CLI": "Claude Code CLI",
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
   "AI_CHAT_MODE_EDIT": "AI Edit Mode",
   "AI_CHAT_MODE_FULL_AUTO": "Allow Everything",
   "AI_CHAT_MODE_INFO_AUTO": "AI uses judgment to auto-approve safe actions and asks about risky ones (Click to switch)",
@@ -113,7 +128,7 @@
   "AI_CHAT_MODE_INFO_FULL_AUTO": "AI can edit files and run commands without approval (Click to switch)",
   "AI_CHAT_MODE_INFO_PLAN": "AI will propose a plan before making changes (Click to switch)",
   "AI_CHAT_MODE_PLAN": "Plan Mode",
-  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded Claude Code CLI terminal",
+  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded CLI terminal",
   "AI_CHAT_NEW_BTN": "New",
   "AI_CHAT_NEW_SESSION_TITLE": "Start a new conversation",
   "AI_CHAT_NEW_WHILE_STREAMING_MSG": "AI is currently working on a task. Starting a new conversation will stop it. Continue?",
@@ -180,7 +195,7 @@
   "AI_CHAT_SEND_ERROR": "Failed to send message: {0}",
   "AI_CHAT_SEND_TITLE": "Send message",
   "AI_CHAT_SESSION_RESUMED": "Resumed session",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code Settings",
+  "AI_CHAT_SETTINGS_TITLE": "AI Settings",
   "AI_CHAT_SETUP_LEARN_MORE": "Learn More",
   "AI_CHAT_SETUP_NEED_HELP": "Need Help?",
   "AI_CHAT_SHOW_DIFF": "Show diff",
@@ -287,8 +302,11 @@
   "AI_SETTINGS_API_TIMEOUT_PLACEHOLDER": "Leave blank for default",
   "AI_SETTINGS_BASE_URL": "Base URL",
   "AI_SETTINGS_BASE_URL_PLACEHOLDER": "Leave blank for default",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Leave blank to detect automatically.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Path to the {0} executable",
   "AI_SETTINGS_CUSTOM_ENDPOINT_NOTICE": "Using custom API endpoint: {0}",
   "AI_SETTINGS_DEFAULT_PROVIDER": "Default (Local Claude Code)",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Default (Local {0})",
   "AI_SETTINGS_DELETE": "Delete",
   "AI_SETTINGS_DELETE_ACTIVE_CONFIRM": "\"{0}\" is the active provider. Deleting it will revert to the default. Continue?",
   "AI_SETTINGS_DELETE_PROVIDER": "Delete Provider",
@@ -301,6 +319,7 @@
   "AI_SETTINGS_PROVIDERS": "Providers",
   "AI_SETTINGS_PROVIDER_NAME": "Name",
   "AI_SETTINGS_PROVIDER_NAME_PLACEHOLDER": "e.g. My API Provider",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "These providers configure {0}. The API key is passed to it as {1}.",
   "AI_SETTINGS_RESET": "Reset",
   "AI_SETTINGS_SAVE": "Save",
   "AI_SETTINGS_SAVE_PROVIDER": "Save Provider",
diff --git a/src/nls/ro/strings.js b/src/nls/ro/strings.js
index b3c5863ccc..f879e0f6fa 100644
--- a/src/nls/ro/strings.js
+++ b/src/nls/ro/strings.js
@@ -812,6 +812,8 @@ define({
   "LIVE_PREVIEW_LAYERS_EMPTY_PAGE_STYLES": "Pagina este goală. Adaugă un element pentru a-i vedea stilurile.",
   "LIVE_PREVIEW_LAYERS_SHOW_SELECTED": "Afișează elementul selectat",
   "LIVE_PREVIEW_LAYERS_SCRUB_HINT": "Trage pentru a ajusta, dublu-clic pentru a edita",
+  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "proprietate",
+  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "valoare",
   "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS": "Live Preview a fost revocat din cauza că în browser au fost deschise uneltele pentru dezvoltatori",
   "LIVE_DEV_DETACHED_TARGET_CLOSED": "Live Preview a fost revocat din cauza că pagina a fost închisă în browser",
   "LIVE_DEV_NAVIGATED_AWAY": "Live Preview a fost revocat din cauza că browser-ul a navigat spre o pagină care nu face parte din proiectul curent",
@@ -2546,7 +2548,6 @@ define({
   "AI_CHAT_MODEL_DESC_SONNET": "Echilibru între viteză și capacitate pentru programarea de zi cu zi",
   "AI_CHAT_MODEL_DESC_HAIKU": "Cel mai rapid model pentru sarcini rapide și simple",
   "AI_CHAT_MODEL_SELECT_TITLE": "Alegeți modelul AI pentru acest chat",
-  "AI_CHAT_MODE_SELECT_TITLE": "Comutați între chatul Claude Code și un terminal Claude Code CLI încorporat",
   "AI_CHAT_MODEL_SWITCHED_NOTICE": "S-a comutat la {0}. Se aplică de la următorul mesaj; primul răspuns poate dura puțin mai mult în timp ce memoria cache se reconstruiește.",
   "AI_CHAT_INPUT_HINT": "Apăsați {0} pentru a trimite · {1} pentru linie nouă",
   "AI_CHAT_BASH_CONFIRM_TITLE": "Permiteți comanda?",
@@ -2618,7 +2619,6 @@ define({
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "Această sesiune Claude Code CLI încă rulează în {0} — proiectul deschis este acum {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_SWITCH_BTN": "Comutați la “{0}”",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Rămâneți la “{0}”",
-  "AI_CHAT_SETTINGS_TITLE": "Setări Claude Code",
   "AI_SETTINGS_API_KEY": "Cheie API",
   "AI_SETTINGS_BASE_URL": "URL de bază",
   "AI_SETTINGS_API_TIMEOUT": "Timp de expirare API (ms)",
@@ -2762,6 +2762,25 @@ define({
   "MIGRATE_UNREACHABLE_TITLE": "Nu s-a putut accesa site-ul vechi",
   "MIGRATE_UNREACHABLE_MESSAGE": "{APP_NAME} nu s-a putut conecta la {0} pentru a căuta proiectele și setările dvs., prin urmare, nu s-a modificat nimic. Verificați conexiunea la internet, apoi reîncercați cu {1}.",
   "CMD_MIGRATE_DATA": "Migrează datele mele din {0}…",
-  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "proprietate",
-  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "valoare"
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} nu a fost găsit",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} nu a fost găsit pe acest sistem. Instalați-l sau introduceți mai jos calea completă către executabilul său.",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "Calea setată pentru {0} nu a putut fi utilizată: {1} Introduceți o altă cale sau goliți caseta pentru a o detecta automat.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Instalați {0}",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Salvați și reîncercați",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Instrucțiuni de instalare",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "Niciun fișier nu există la calea respectivă.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "Acel fișier nu este executabil.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "Acel fișier nu a rulat ca {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "Fișierul respectiv nu a răspuns la timp.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "Calea respectivă conține caractere care nu pot fi utilizate.",
+  "AI_CHAT_MODE_SELECT_TITLE": "Comutați între chatul Claude Code și un terminal CLI încorporat.",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "Aceasta va încheia sesiunea Codex CLI activă și va porni una nouă. Continuați?",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Rularea Codex în panoul Phoenix AI este o funcționalitate Pro. Puteți rula în continuare Codex CLI gratuit din Terminal.",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "Această sesiune Codex CLI rulează încă în {0} — proiectul deschis acum este {1}.",
+  "AI_CHAT_SETTINGS_TITLE": "Setări AI",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Implicit (Local {0})",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "Acești furnizori configurează {0}. Cheia API îi este transmisă ca {1}.",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Lăsați necompletat pentru a detecta automat.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Calea către executabilul {0}"
 });
\ No newline at end of file
diff --git a/src/nls/ru/lastTranslated.json b/src/nls/ru/lastTranslated.json
index 61b0783d87..9fb162a6f3 100644
--- a/src/nls/ru/lastTranslated.json
+++ b/src/nls/ru/lastTranslated.json
@@ -33,6 +33,11 @@
   "AI_CHAT_CLAUDE_LOGIN_MSG": "Claude Code is installed but needs to be configured.",
   "AI_CHAT_CLAUDE_LOGIN_RESTART_NOTE": "Restart {APP_NAME} after configuration completes.",
   "AI_CHAT_CLAUDE_LOGIN_TITLE": "Setup Claude Code",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "That file did not run as {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "No file exists at that path.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "That file is not executable.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "That path contains characters that cannot be used.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "That file did not respond in time.",
   "AI_CHAT_CLI_INSTALLING": "Installing…",
   "AI_CHAT_CLI_INSTALLING_MSG": "Installing Claude Code, please wait. This may take a while...",
   "AI_CHAT_CLI_INSTALL_BTN": "Install Claude Code",
@@ -40,6 +45,12 @@
   "AI_CHAT_CLI_NEW_CONFIRM_MSG": "This will end the running Claude Code CLI session and start a fresh one. Continue?",
   "AI_CHAT_CLI_NEW_CONFIRM_TITLE": "End this CLI session?",
   "AI_CHAT_CLI_NOT_FOUND": "Claude Code Not Installed",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "The path set for {0} could not be used: {1} Enter a different path, or clear the box to detect it automatically.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Install {0}",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installation instructions",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} could not be found on this system. Install it, or enter the full path to its executable below.",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Save & Retry",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} not found",
   "AI_CHAT_CLI_RESTART_NOTE": "Restart {APP_NAME} after installation completes.",
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "This Claude Code CLI session is still running in {0} — the open project is now {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Stay on “{0}”",
@@ -48,6 +59,9 @@
   "AI_CHAT_CLI_UPSELL_OPEN_TERMINAL_BTN": "Open in Terminal",
   "AI_CHAT_CLI_UPSELL_TITLE": "Available in Phoenix Pro",
   "AI_CHAT_CLI_UPSELL_UPGRADE_BTN": "Upgrade to Pro",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "This will end the running Codex CLI session and start a fresh one. Continue?",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "This Codex CLI session is still running in {0} — the open project is now {1}.",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Running Codex inside the Phoenix AI panel is a Pro feature. You can still run the Codex CLI for free from the Terminal.",
   "AI_CHAT_CODE_COLLAPSE": "Collapse",
   "AI_CHAT_CODE_COLLAPSE_FOOTER": "Click to collapse",
   "AI_CHAT_CODE_DEFAULT_LANG": "text",
@@ -106,6 +120,7 @@
   "AI_CHAT_MODE_AUTO": "Auto",
   "AI_CHAT_MODE_CHAT": "Claude Code",
   "AI_CHAT_MODE_CLI": "Claude Code CLI",
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
   "AI_CHAT_MODE_EDIT": "AI Edit Mode",
   "AI_CHAT_MODE_FULL_AUTO": "Allow Everything",
   "AI_CHAT_MODE_INFO_AUTO": "AI uses judgment to auto-approve safe actions and asks about risky ones (Click to switch)",
@@ -113,7 +128,7 @@
   "AI_CHAT_MODE_INFO_FULL_AUTO": "AI can edit files and run commands without approval (Click to switch)",
   "AI_CHAT_MODE_INFO_PLAN": "AI will propose a plan before making changes (Click to switch)",
   "AI_CHAT_MODE_PLAN": "Plan Mode",
-  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded Claude Code CLI terminal",
+  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded CLI terminal",
   "AI_CHAT_NEW_BTN": "New",
   "AI_CHAT_NEW_SESSION_TITLE": "Start a new conversation",
   "AI_CHAT_NEW_WHILE_STREAMING_MSG": "AI is currently working on a task. Starting a new conversation will stop it. Continue?",
@@ -180,7 +195,7 @@
   "AI_CHAT_SEND_ERROR": "Failed to send message: {0}",
   "AI_CHAT_SEND_TITLE": "Send message",
   "AI_CHAT_SESSION_RESUMED": "Resumed session",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code Settings",
+  "AI_CHAT_SETTINGS_TITLE": "AI Settings",
   "AI_CHAT_SETUP_LEARN_MORE": "Learn More",
   "AI_CHAT_SETUP_NEED_HELP": "Need Help?",
   "AI_CHAT_SHOW_DIFF": "Show diff",
@@ -287,8 +302,11 @@
   "AI_SETTINGS_API_TIMEOUT_PLACEHOLDER": "Leave blank for default",
   "AI_SETTINGS_BASE_URL": "Base URL",
   "AI_SETTINGS_BASE_URL_PLACEHOLDER": "Leave blank for default",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Leave blank to detect automatically.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Path to the {0} executable",
   "AI_SETTINGS_CUSTOM_ENDPOINT_NOTICE": "Using custom API endpoint: {0}",
   "AI_SETTINGS_DEFAULT_PROVIDER": "Default (Local Claude Code)",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Default (Local {0})",
   "AI_SETTINGS_DELETE": "Delete",
   "AI_SETTINGS_DELETE_ACTIVE_CONFIRM": "\"{0}\" is the active provider. Deleting it will revert to the default. Continue?",
   "AI_SETTINGS_DELETE_PROVIDER": "Delete Provider",
@@ -301,6 +319,7 @@
   "AI_SETTINGS_PROVIDERS": "Providers",
   "AI_SETTINGS_PROVIDER_NAME": "Name",
   "AI_SETTINGS_PROVIDER_NAME_PLACEHOLDER": "e.g. My API Provider",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "These providers configure {0}. The API key is passed to it as {1}.",
   "AI_SETTINGS_RESET": "Reset",
   "AI_SETTINGS_SAVE": "Save",
   "AI_SETTINGS_SAVE_PROVIDER": "Save Provider",
diff --git a/src/nls/ru/strings.js b/src/nls/ru/strings.js
index 9e25d5792f..b168bf2eaf 100644
--- a/src/nls/ru/strings.js
+++ b/src/nls/ru/strings.js
@@ -812,6 +812,8 @@ define({
   "LIVE_PREVIEW_LAYERS_EMPTY_PAGE_STYLES": "Страница пуста. Добавьте элемент, чтобы увидеть его стили.",
   "LIVE_PREVIEW_LAYERS_SHOW_SELECTED": "Показать выбранный элемент",
   "LIVE_PREVIEW_LAYERS_SCRUB_HINT": "Перетащите для настройки, дважды щёлкните для редактирования",
+  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "свойство",
+  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "значение",
   "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS": "Функция Live Preview была отключена при открытии инструментов разработки в браузере",
   "LIVE_DEV_DETACHED_TARGET_CLOSED": "Функция Live Preview была отключена при закрытии страницы в браузере",
   "LIVE_DEV_NAVIGATED_AWAY": "Функция Live Preview была отключена при переходе на страницу не принадлежащую проекту",
@@ -2546,7 +2548,6 @@ define({
   "AI_CHAT_MODEL_DESC_SONNET": "Сбалансированное сочетание скорости и возможностей для повседневного написания кода",
   "AI_CHAT_MODEL_DESC_HAIKU": "Самая быстрая модель для быстрых и простых задач",
   "AI_CHAT_MODEL_SELECT_TITLE": "Выберите модель ИИ для этого чата",
-  "AI_CHAT_MODE_SELECT_TITLE": "Переключение между чатом Claude Code и встроенным терминалом Claude Code CLI",
   "AI_CHAT_MODEL_SWITCHED_NOTICE": "Переключено на {0}. Применяется со следующего сообщения; первый ответ может занять больше времени, пока перестраивается кеш.",
   "AI_CHAT_INPUT_HINT": "Нажмите {0}, чтобы отправить · {1} для новой строки",
   "AI_CHAT_BASH_CONFIRM_TITLE": "Разрешить команду?",
@@ -2618,7 +2619,6 @@ define({
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "Эта сессия Claude Code CLI всё ещё запущена в {0} — открытый проект теперь {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_SWITCH_BTN": "Переключиться на «{0}»",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Остаться в «{0}»",
-  "AI_CHAT_SETTINGS_TITLE": "Настройки Claude Code",
   "AI_SETTINGS_API_KEY": "API-ключ",
   "AI_SETTINGS_BASE_URL": "Базовый URL",
   "AI_SETTINGS_API_TIMEOUT": "Тайм-аут API (мс)",
@@ -2762,6 +2762,25 @@ define({
   "MIGRATE_UNREACHABLE_TITLE": "Не удалось подключиться к старому сайту",
   "MIGRATE_UNREACHABLE_MESSAGE": "{APP_NAME} не удалось подключиться к {0} для поиска ваших проектов и настроек, поэтому ничего не было изменено. Проверьте подключение к Интернету, затем повторите попытку с помощью {1}.",
   "CMD_MIGRATE_DATA": "Перенести мои данные из {0}…",
-  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "свойство",
-  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "значение"
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} не найден",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "Не удалось найти {0} в этой системе. Установите его или укажите ниже полный путь к исполняемому файлу.",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "Не удалось использовать путь, указанный для {0}: {1}. Введите другой путь или очистите поле для автоматического определения.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Установить {0}",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Сохранить и повторить",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Инструкции по установке",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "Файл по этому пути не существует.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "Этот файл не является исполняемым.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "Не удалось запустить этот файл как {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "Этот файл не ответил вовремя.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "Этот путь содержит недопустимые символы.",
+  "AI_CHAT_MODE_SELECT_TITLE": "Переключение между чатом Claude Code и встроенным терминалом CLI",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "Это завершит текущую сессию Codex CLI и начнёт новую. Продолжить?",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Запуск Codex в панели Phoenix AI является функцией Pro. Вы по-прежнему можете бесплатно запускать Codex CLI из Терминала.",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "Эта сессия Codex CLI всё ещё запущена в {0} — открытый проект теперь {1}.",
+  "AI_CHAT_SETTINGS_TITLE": "Настройки ИИ",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "По умолчанию (локальный {0})",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "Эти провайдеры настраивают {0}. Ключ API передаётся ему как {1}.",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Оставьте пустым для автоматического определения.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Путь к исполняемому файлу {0}"
 });
\ No newline at end of file
diff --git a/src/nls/sk/lastTranslated.json b/src/nls/sk/lastTranslated.json
index 61b0783d87..9fb162a6f3 100644
--- a/src/nls/sk/lastTranslated.json
+++ b/src/nls/sk/lastTranslated.json
@@ -33,6 +33,11 @@
   "AI_CHAT_CLAUDE_LOGIN_MSG": "Claude Code is installed but needs to be configured.",
   "AI_CHAT_CLAUDE_LOGIN_RESTART_NOTE": "Restart {APP_NAME} after configuration completes.",
   "AI_CHAT_CLAUDE_LOGIN_TITLE": "Setup Claude Code",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "That file did not run as {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "No file exists at that path.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "That file is not executable.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "That path contains characters that cannot be used.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "That file did not respond in time.",
   "AI_CHAT_CLI_INSTALLING": "Installing…",
   "AI_CHAT_CLI_INSTALLING_MSG": "Installing Claude Code, please wait. This may take a while...",
   "AI_CHAT_CLI_INSTALL_BTN": "Install Claude Code",
@@ -40,6 +45,12 @@
   "AI_CHAT_CLI_NEW_CONFIRM_MSG": "This will end the running Claude Code CLI session and start a fresh one. Continue?",
   "AI_CHAT_CLI_NEW_CONFIRM_TITLE": "End this CLI session?",
   "AI_CHAT_CLI_NOT_FOUND": "Claude Code Not Installed",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "The path set for {0} could not be used: {1} Enter a different path, or clear the box to detect it automatically.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Install {0}",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installation instructions",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} could not be found on this system. Install it, or enter the full path to its executable below.",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Save & Retry",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} not found",
   "AI_CHAT_CLI_RESTART_NOTE": "Restart {APP_NAME} after installation completes.",
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "This Claude Code CLI session is still running in {0} — the open project is now {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Stay on “{0}”",
@@ -48,6 +59,9 @@
   "AI_CHAT_CLI_UPSELL_OPEN_TERMINAL_BTN": "Open in Terminal",
   "AI_CHAT_CLI_UPSELL_TITLE": "Available in Phoenix Pro",
   "AI_CHAT_CLI_UPSELL_UPGRADE_BTN": "Upgrade to Pro",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "This will end the running Codex CLI session and start a fresh one. Continue?",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "This Codex CLI session is still running in {0} — the open project is now {1}.",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Running Codex inside the Phoenix AI panel is a Pro feature. You can still run the Codex CLI for free from the Terminal.",
   "AI_CHAT_CODE_COLLAPSE": "Collapse",
   "AI_CHAT_CODE_COLLAPSE_FOOTER": "Click to collapse",
   "AI_CHAT_CODE_DEFAULT_LANG": "text",
@@ -106,6 +120,7 @@
   "AI_CHAT_MODE_AUTO": "Auto",
   "AI_CHAT_MODE_CHAT": "Claude Code",
   "AI_CHAT_MODE_CLI": "Claude Code CLI",
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
   "AI_CHAT_MODE_EDIT": "AI Edit Mode",
   "AI_CHAT_MODE_FULL_AUTO": "Allow Everything",
   "AI_CHAT_MODE_INFO_AUTO": "AI uses judgment to auto-approve safe actions and asks about risky ones (Click to switch)",
@@ -113,7 +128,7 @@
   "AI_CHAT_MODE_INFO_FULL_AUTO": "AI can edit files and run commands without approval (Click to switch)",
   "AI_CHAT_MODE_INFO_PLAN": "AI will propose a plan before making changes (Click to switch)",
   "AI_CHAT_MODE_PLAN": "Plan Mode",
-  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded Claude Code CLI terminal",
+  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded CLI terminal",
   "AI_CHAT_NEW_BTN": "New",
   "AI_CHAT_NEW_SESSION_TITLE": "Start a new conversation",
   "AI_CHAT_NEW_WHILE_STREAMING_MSG": "AI is currently working on a task. Starting a new conversation will stop it. Continue?",
@@ -180,7 +195,7 @@
   "AI_CHAT_SEND_ERROR": "Failed to send message: {0}",
   "AI_CHAT_SEND_TITLE": "Send message",
   "AI_CHAT_SESSION_RESUMED": "Resumed session",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code Settings",
+  "AI_CHAT_SETTINGS_TITLE": "AI Settings",
   "AI_CHAT_SETUP_LEARN_MORE": "Learn More",
   "AI_CHAT_SETUP_NEED_HELP": "Need Help?",
   "AI_CHAT_SHOW_DIFF": "Show diff",
@@ -287,8 +302,11 @@
   "AI_SETTINGS_API_TIMEOUT_PLACEHOLDER": "Leave blank for default",
   "AI_SETTINGS_BASE_URL": "Base URL",
   "AI_SETTINGS_BASE_URL_PLACEHOLDER": "Leave blank for default",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Leave blank to detect automatically.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Path to the {0} executable",
   "AI_SETTINGS_CUSTOM_ENDPOINT_NOTICE": "Using custom API endpoint: {0}",
   "AI_SETTINGS_DEFAULT_PROVIDER": "Default (Local Claude Code)",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Default (Local {0})",
   "AI_SETTINGS_DELETE": "Delete",
   "AI_SETTINGS_DELETE_ACTIVE_CONFIRM": "\"{0}\" is the active provider. Deleting it will revert to the default. Continue?",
   "AI_SETTINGS_DELETE_PROVIDER": "Delete Provider",
@@ -301,6 +319,7 @@
   "AI_SETTINGS_PROVIDERS": "Providers",
   "AI_SETTINGS_PROVIDER_NAME": "Name",
   "AI_SETTINGS_PROVIDER_NAME_PLACEHOLDER": "e.g. My API Provider",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "These providers configure {0}. The API key is passed to it as {1}.",
   "AI_SETTINGS_RESET": "Reset",
   "AI_SETTINGS_SAVE": "Save",
   "AI_SETTINGS_SAVE_PROVIDER": "Save Provider",
diff --git a/src/nls/sk/strings.js b/src/nls/sk/strings.js
index 7c62439e6d..f060536eb9 100644
--- a/src/nls/sk/strings.js
+++ b/src/nls/sk/strings.js
@@ -812,6 +812,8 @@ define({
   "LIVE_PREVIEW_LAYERS_EMPTY_PAGE_STYLES": "Stránka je prázdna. Pridajte prvok, aby sa zobrazili jeho štýly.",
   "LIVE_PREVIEW_LAYERS_SHOW_SELECTED": "Zobraziť vybraný prvok",
   "LIVE_PREVIEW_LAYERS_SCRUB_HINT": "Potiahnutím nastavíte, dvojitým kliknutím upravíte.",
+  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "vlastnosť",
+  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "hodnota",
   "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS": "Živý náhľad bol zrušený kvôli tomu, že boli otvorené vývojárske nástroje v prehliadači",
   "LIVE_DEV_DETACHED_TARGET_CLOSED": "Živý náhľad bol zrušený kvôli tomu, že stránka bola zatvorená v prehliadači",
   "LIVE_DEV_NAVIGATED_AWAY": "Živý náhľad bol zrušený kvôli tomu, že prehliadač odkazoval na stránku, ktorá nie je súčasťou aktuálneho projektu",
@@ -2546,7 +2548,6 @@ define({
   "AI_CHAT_MODEL_DESC_SONNET": "Vyvážená rýchlosť a schopnosti na každodenné kódovanie",
   "AI_CHAT_MODEL_DESC_HAIKU": "Najrýchlejší model na rýchle a jednoduché úlohy",
   "AI_CHAT_MODEL_SELECT_TITLE": "Vyberte AI model pre tento chat",
-  "AI_CHAT_MODE_SELECT_TITLE": "Prepínajte medzi chatom Claude Code a vstavaným terminálom Claude Code CLI",
   "AI_CHAT_MODEL_SWITCHED_NOTICE": "Prepli ste na {0}. Platí od vašej nasledujúcej správy; prvá odpoveď môže trvať o chvíľu dlhšie, kým sa obnoví vyrovnávacia pamäť.",
   "AI_CHAT_INPUT_HINT": "Stlačte {0} na odoslanie · {1} pre nový riadok",
   "AI_CHAT_BASH_CONFIRM_TITLE": "Povoliť príkaz?",
@@ -2618,7 +2619,6 @@ define({
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "Táto relácia Claude Code CLI stále beží v {0} — otvorený projekt je teraz {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_SWITCH_BTN": "Prepnúť na “{0}”",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Zostať na “{0}”",
-  "AI_CHAT_SETTINGS_TITLE": "Nastavenia Claude Code",
   "AI_SETTINGS_API_KEY": "API kľúč",
   "AI_SETTINGS_BASE_URL": "Základná URL",
   "AI_SETTINGS_API_TIMEOUT": "Časový limit API (ms)",
@@ -2762,6 +2762,25 @@ define({
   "MIGRATE_UNREACHABLE_TITLE": "Nepodarilo sa spojiť so starou lokalitou",
   "MIGRATE_UNREACHABLE_MESSAGE": "Aplikácii {APP_NAME} sa nepodarilo pripojiť k {0} na vyhľadanie vašich projektov a nastavení, takže sa nič nezmenilo. Skontrolujte svoje internetové pripojenie a potom to skúste znova výberom {1}.",
   "CMD_MIGRATE_DATA": "Migrovať moje dáta z {0}…",
-  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "vlastnosť",
-  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "hodnota"
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} sa nenašiel",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} sa nepodarilo nájsť v tomto systéme. Nainštalujte ho, alebo nižšie zadajte úplnú cestu k jeho spustiteľnému súboru.",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "Cestu nastavenú pre {0} nebolo možné použiť: {1} Zadajte inú cestu, alebo vymažte pole pre automatickú detekciu.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Nainštalovať {0}",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Uložiť a skúsiť znova",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Inštalačné pokyny",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "Na zadanej ceste neexistuje žiadny súbor.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "Tento súbor nie je spustiteľný.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "Tento súbor sa nespustil ako {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "Súbor neodpovedal včas.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "Táto cesta obsahuje nepovolené znaky.",
+  "AI_CHAT_MODE_SELECT_TITLE": "Prepínanie medzi chatom Claude Code a vstavaným CLI terminálom",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "Týmto sa ukončí spustená relácia Codex CLI a spustí sa nová. Pokračovať?",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Spustenie Codexu v paneli Phoenix AI je funkcia Pro. Stále môžete bezplatne spustiť Codex CLI z Terminálu.",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "Táto relácia Codex CLI je stále spustená v {0} — otvorený projekt je teraz {1}.",
+  "AI_CHAT_SETTINGS_TITLE": "Nastavenia AI",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Predvolené (Lokálne {0})",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "Títo poskytovatelia konfigurujú {0}. API kľúč sa mu odovzdáva ako {1}.",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Ponechajte prázdne pre automatickú detekciu.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Cesta k spustiteľnému súboru {0}"
 });
\ No newline at end of file
diff --git a/src/nls/sr/lastTranslated.json b/src/nls/sr/lastTranslated.json
index 61b0783d87..9fb162a6f3 100644
--- a/src/nls/sr/lastTranslated.json
+++ b/src/nls/sr/lastTranslated.json
@@ -33,6 +33,11 @@
   "AI_CHAT_CLAUDE_LOGIN_MSG": "Claude Code is installed but needs to be configured.",
   "AI_CHAT_CLAUDE_LOGIN_RESTART_NOTE": "Restart {APP_NAME} after configuration completes.",
   "AI_CHAT_CLAUDE_LOGIN_TITLE": "Setup Claude Code",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "That file did not run as {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "No file exists at that path.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "That file is not executable.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "That path contains characters that cannot be used.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "That file did not respond in time.",
   "AI_CHAT_CLI_INSTALLING": "Installing…",
   "AI_CHAT_CLI_INSTALLING_MSG": "Installing Claude Code, please wait. This may take a while...",
   "AI_CHAT_CLI_INSTALL_BTN": "Install Claude Code",
@@ -40,6 +45,12 @@
   "AI_CHAT_CLI_NEW_CONFIRM_MSG": "This will end the running Claude Code CLI session and start a fresh one. Continue?",
   "AI_CHAT_CLI_NEW_CONFIRM_TITLE": "End this CLI session?",
   "AI_CHAT_CLI_NOT_FOUND": "Claude Code Not Installed",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "The path set for {0} could not be used: {1} Enter a different path, or clear the box to detect it automatically.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Install {0}",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installation instructions",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} could not be found on this system. Install it, or enter the full path to its executable below.",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Save & Retry",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} not found",
   "AI_CHAT_CLI_RESTART_NOTE": "Restart {APP_NAME} after installation completes.",
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "This Claude Code CLI session is still running in {0} — the open project is now {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Stay on “{0}”",
@@ -48,6 +59,9 @@
   "AI_CHAT_CLI_UPSELL_OPEN_TERMINAL_BTN": "Open in Terminal",
   "AI_CHAT_CLI_UPSELL_TITLE": "Available in Phoenix Pro",
   "AI_CHAT_CLI_UPSELL_UPGRADE_BTN": "Upgrade to Pro",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "This will end the running Codex CLI session and start a fresh one. Continue?",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "This Codex CLI session is still running in {0} — the open project is now {1}.",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Running Codex inside the Phoenix AI panel is a Pro feature. You can still run the Codex CLI for free from the Terminal.",
   "AI_CHAT_CODE_COLLAPSE": "Collapse",
   "AI_CHAT_CODE_COLLAPSE_FOOTER": "Click to collapse",
   "AI_CHAT_CODE_DEFAULT_LANG": "text",
@@ -106,6 +120,7 @@
   "AI_CHAT_MODE_AUTO": "Auto",
   "AI_CHAT_MODE_CHAT": "Claude Code",
   "AI_CHAT_MODE_CLI": "Claude Code CLI",
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
   "AI_CHAT_MODE_EDIT": "AI Edit Mode",
   "AI_CHAT_MODE_FULL_AUTO": "Allow Everything",
   "AI_CHAT_MODE_INFO_AUTO": "AI uses judgment to auto-approve safe actions and asks about risky ones (Click to switch)",
@@ -113,7 +128,7 @@
   "AI_CHAT_MODE_INFO_FULL_AUTO": "AI can edit files and run commands without approval (Click to switch)",
   "AI_CHAT_MODE_INFO_PLAN": "AI will propose a plan before making changes (Click to switch)",
   "AI_CHAT_MODE_PLAN": "Plan Mode",
-  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded Claude Code CLI terminal",
+  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded CLI terminal",
   "AI_CHAT_NEW_BTN": "New",
   "AI_CHAT_NEW_SESSION_TITLE": "Start a new conversation",
   "AI_CHAT_NEW_WHILE_STREAMING_MSG": "AI is currently working on a task. Starting a new conversation will stop it. Continue?",
@@ -180,7 +195,7 @@
   "AI_CHAT_SEND_ERROR": "Failed to send message: {0}",
   "AI_CHAT_SEND_TITLE": "Send message",
   "AI_CHAT_SESSION_RESUMED": "Resumed session",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code Settings",
+  "AI_CHAT_SETTINGS_TITLE": "AI Settings",
   "AI_CHAT_SETUP_LEARN_MORE": "Learn More",
   "AI_CHAT_SETUP_NEED_HELP": "Need Help?",
   "AI_CHAT_SHOW_DIFF": "Show diff",
@@ -287,8 +302,11 @@
   "AI_SETTINGS_API_TIMEOUT_PLACEHOLDER": "Leave blank for default",
   "AI_SETTINGS_BASE_URL": "Base URL",
   "AI_SETTINGS_BASE_URL_PLACEHOLDER": "Leave blank for default",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Leave blank to detect automatically.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Path to the {0} executable",
   "AI_SETTINGS_CUSTOM_ENDPOINT_NOTICE": "Using custom API endpoint: {0}",
   "AI_SETTINGS_DEFAULT_PROVIDER": "Default (Local Claude Code)",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Default (Local {0})",
   "AI_SETTINGS_DELETE": "Delete",
   "AI_SETTINGS_DELETE_ACTIVE_CONFIRM": "\"{0}\" is the active provider. Deleting it will revert to the default. Continue?",
   "AI_SETTINGS_DELETE_PROVIDER": "Delete Provider",
@@ -301,6 +319,7 @@
   "AI_SETTINGS_PROVIDERS": "Providers",
   "AI_SETTINGS_PROVIDER_NAME": "Name",
   "AI_SETTINGS_PROVIDER_NAME_PLACEHOLDER": "e.g. My API Provider",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "These providers configure {0}. The API key is passed to it as {1}.",
   "AI_SETTINGS_RESET": "Reset",
   "AI_SETTINGS_SAVE": "Save",
   "AI_SETTINGS_SAVE_PROVIDER": "Save Provider",
diff --git a/src/nls/sr/strings.js b/src/nls/sr/strings.js
index 2a54e93739..a0dad7615a 100644
--- a/src/nls/sr/strings.js
+++ b/src/nls/sr/strings.js
@@ -812,6 +812,8 @@ define({
   "LIVE_PREVIEW_LAYERS_EMPTY_PAGE_STYLES": "Страница је празна. Додајте елемент да бисте видели његове стилове.",
   "LIVE_PREVIEW_LAYERS_SHOW_SELECTED": "Прикажи изабрани елемент",
   "LIVE_PREVIEW_LAYERS_SCRUB_HINT": "Превуците за подешавање, дупли клик за уређивање",
+  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "својство",
+  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "вредност",
   "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS": "Живи приказ је отказан јер су развојни алати били отворени у претраживачу",
   "LIVE_DEV_DETACHED_TARGET_CLOSED": "Живи приказ је отказан јер је страница затворена у претраживачу",
   "LIVE_DEV_NAVIGATED_AWAY": "Живи приказ је отказан јер је претраживач отишао на страницу која није део тренутног пројекта",
@@ -2546,7 +2548,6 @@ define({
   "AI_CHAT_MODEL_DESC_SONNET": "Уравнотежена брзина и могућности за свакодневно кодирање",
   "AI_CHAT_MODEL_DESC_HAIKU": "Најбржи модел за брзе, једноставне задатке",
   "AI_CHAT_MODEL_SELECT_TITLE": "Изаберите AI модел за ово ћаскање",
-  "AI_CHAT_MODE_SELECT_TITLE": "Пребацивање између Claude Code ћаскања и уграђеног Claude Code CLI терминала",
   "AI_CHAT_MODEL_SWITCHED_NOTICE": "Пребачено на {0}. Примењује се од ваше следеће поруке; први одговор може потрајати мало дуже док се кеш поново изграђује.",
   "AI_CHAT_INPUT_HINT": "Притисните {0} да пошаљете · {1} за нови ред",
   "AI_CHAT_BASH_CONFIRM_TITLE": "Дозволити команду?",
@@ -2618,7 +2619,6 @@ define({
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "Ова Claude Code CLI сесија је и даље покренута у {0} — отворени пројекат је сада {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_SWITCH_BTN": "Пребаци се на „{0}”",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Остани на „{0}”",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code подешавања",
   "AI_SETTINGS_API_KEY": "API кључ",
   "AI_SETTINGS_BASE_URL": "Основна URL адреса",
   "AI_SETTINGS_API_TIMEOUT": "Време чекања API-ја (мс)",
@@ -2762,6 +2762,25 @@ define({
   "MIGRATE_UNREACHABLE_TITLE": "Није могуће приступити старом сајту",
   "MIGRATE_UNREACHABLE_MESSAGE": "{APP_NAME} није могао да се повеже са {0} да би потражио ваше пројекте и подешавања, тако да ништа није промењено. Проверите интернет везу, а затим покушајте поново помоћу {1}.",
   "CMD_MIGRATE_DATA": "Мигрирајте моје податке са {0}…",
-  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "својство",
-  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "вредност"
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} није пронађен",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} није пронађен на овом систему. Инсталирајте га или унесите пуну путању до његове извршне датотеке испод.",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "Подешена путања за {0} не може да се користи: {1} Унесите другу путању или испразните поље ради аутоматске детекције.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Инсталирајте {0}",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Сачувајте и покушајте поново",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Упутства за инсталацију",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "На наведеној путањи не постоји датотека.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "Та датотека није извршна.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "Та датотека се није покренула као {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "Та датотека није одговорила на време.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "Та путања садржи карактере који се не могу користити.",
+  "AI_CHAT_MODE_SELECT_TITLE": "Пребацивање између Claude Code ћаскања и уграђеног CLI терминала",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "Ово ће прекинути активну Codex CLI сесију и покренути нову. Наставити?",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Покретање Codex-а унутар Phoenix AI панела је Pro функција. И даље можете бесплатно покренути Codex CLI из терминала.",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "Ова Codex CLI сесија је и даље активна у {0} — отворени пројекат је сада {1}.",
+  "AI_CHAT_SETTINGS_TITLE": "AI подешавања",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Подразумевано (Локално {0})",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "Ови провајдери конфигуришу {0}. API кључ му се прослеђује као {1}.",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Оставите празно за аутоматско откривање.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Путања до {0} извршног фајла"
 });
\ No newline at end of file
diff --git a/src/nls/sv/lastTranslated.json b/src/nls/sv/lastTranslated.json
index 61b0783d87..9fb162a6f3 100644
--- a/src/nls/sv/lastTranslated.json
+++ b/src/nls/sv/lastTranslated.json
@@ -33,6 +33,11 @@
   "AI_CHAT_CLAUDE_LOGIN_MSG": "Claude Code is installed but needs to be configured.",
   "AI_CHAT_CLAUDE_LOGIN_RESTART_NOTE": "Restart {APP_NAME} after configuration completes.",
   "AI_CHAT_CLAUDE_LOGIN_TITLE": "Setup Claude Code",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "That file did not run as {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "No file exists at that path.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "That file is not executable.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "That path contains characters that cannot be used.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "That file did not respond in time.",
   "AI_CHAT_CLI_INSTALLING": "Installing…",
   "AI_CHAT_CLI_INSTALLING_MSG": "Installing Claude Code, please wait. This may take a while...",
   "AI_CHAT_CLI_INSTALL_BTN": "Install Claude Code",
@@ -40,6 +45,12 @@
   "AI_CHAT_CLI_NEW_CONFIRM_MSG": "This will end the running Claude Code CLI session and start a fresh one. Continue?",
   "AI_CHAT_CLI_NEW_CONFIRM_TITLE": "End this CLI session?",
   "AI_CHAT_CLI_NOT_FOUND": "Claude Code Not Installed",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "The path set for {0} could not be used: {1} Enter a different path, or clear the box to detect it automatically.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Install {0}",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installation instructions",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} could not be found on this system. Install it, or enter the full path to its executable below.",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Save & Retry",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} not found",
   "AI_CHAT_CLI_RESTART_NOTE": "Restart {APP_NAME} after installation completes.",
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "This Claude Code CLI session is still running in {0} — the open project is now {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Stay on “{0}”",
@@ -48,6 +59,9 @@
   "AI_CHAT_CLI_UPSELL_OPEN_TERMINAL_BTN": "Open in Terminal",
   "AI_CHAT_CLI_UPSELL_TITLE": "Available in Phoenix Pro",
   "AI_CHAT_CLI_UPSELL_UPGRADE_BTN": "Upgrade to Pro",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "This will end the running Codex CLI session and start a fresh one. Continue?",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "This Codex CLI session is still running in {0} — the open project is now {1}.",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Running Codex inside the Phoenix AI panel is a Pro feature. You can still run the Codex CLI for free from the Terminal.",
   "AI_CHAT_CODE_COLLAPSE": "Collapse",
   "AI_CHAT_CODE_COLLAPSE_FOOTER": "Click to collapse",
   "AI_CHAT_CODE_DEFAULT_LANG": "text",
@@ -106,6 +120,7 @@
   "AI_CHAT_MODE_AUTO": "Auto",
   "AI_CHAT_MODE_CHAT": "Claude Code",
   "AI_CHAT_MODE_CLI": "Claude Code CLI",
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
   "AI_CHAT_MODE_EDIT": "AI Edit Mode",
   "AI_CHAT_MODE_FULL_AUTO": "Allow Everything",
   "AI_CHAT_MODE_INFO_AUTO": "AI uses judgment to auto-approve safe actions and asks about risky ones (Click to switch)",
@@ -113,7 +128,7 @@
   "AI_CHAT_MODE_INFO_FULL_AUTO": "AI can edit files and run commands without approval (Click to switch)",
   "AI_CHAT_MODE_INFO_PLAN": "AI will propose a plan before making changes (Click to switch)",
   "AI_CHAT_MODE_PLAN": "Plan Mode",
-  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded Claude Code CLI terminal",
+  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded CLI terminal",
   "AI_CHAT_NEW_BTN": "New",
   "AI_CHAT_NEW_SESSION_TITLE": "Start a new conversation",
   "AI_CHAT_NEW_WHILE_STREAMING_MSG": "AI is currently working on a task. Starting a new conversation will stop it. Continue?",
@@ -180,7 +195,7 @@
   "AI_CHAT_SEND_ERROR": "Failed to send message: {0}",
   "AI_CHAT_SEND_TITLE": "Send message",
   "AI_CHAT_SESSION_RESUMED": "Resumed session",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code Settings",
+  "AI_CHAT_SETTINGS_TITLE": "AI Settings",
   "AI_CHAT_SETUP_LEARN_MORE": "Learn More",
   "AI_CHAT_SETUP_NEED_HELP": "Need Help?",
   "AI_CHAT_SHOW_DIFF": "Show diff",
@@ -287,8 +302,11 @@
   "AI_SETTINGS_API_TIMEOUT_PLACEHOLDER": "Leave blank for default",
   "AI_SETTINGS_BASE_URL": "Base URL",
   "AI_SETTINGS_BASE_URL_PLACEHOLDER": "Leave blank for default",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Leave blank to detect automatically.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Path to the {0} executable",
   "AI_SETTINGS_CUSTOM_ENDPOINT_NOTICE": "Using custom API endpoint: {0}",
   "AI_SETTINGS_DEFAULT_PROVIDER": "Default (Local Claude Code)",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Default (Local {0})",
   "AI_SETTINGS_DELETE": "Delete",
   "AI_SETTINGS_DELETE_ACTIVE_CONFIRM": "\"{0}\" is the active provider. Deleting it will revert to the default. Continue?",
   "AI_SETTINGS_DELETE_PROVIDER": "Delete Provider",
@@ -301,6 +319,7 @@
   "AI_SETTINGS_PROVIDERS": "Providers",
   "AI_SETTINGS_PROVIDER_NAME": "Name",
   "AI_SETTINGS_PROVIDER_NAME_PLACEHOLDER": "e.g. My API Provider",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "These providers configure {0}. The API key is passed to it as {1}.",
   "AI_SETTINGS_RESET": "Reset",
   "AI_SETTINGS_SAVE": "Save",
   "AI_SETTINGS_SAVE_PROVIDER": "Save Provider",
diff --git a/src/nls/sv/strings.js b/src/nls/sv/strings.js
index 5b02221850..9a71725782 100644
--- a/src/nls/sv/strings.js
+++ b/src/nls/sv/strings.js
@@ -812,6 +812,8 @@ define({
   "LIVE_PREVIEW_LAYERS_EMPTY_PAGE_STYLES": "Sidan är tom. Lägg till ett element för att se dess stilar.",
   "LIVE_PREVIEW_LAYERS_SHOW_SELECTED": "Visa det valda elementet",
   "LIVE_PREVIEW_LAYERS_SCRUB_HINT": "Dra för att justera, dubbelklicka för att redigera",
+  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "egenskap",
+  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "värde",
   "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS": "Förhandsvisningen avbröts eftersom webbläsarens utvecklarverktyg öppnades.",
   "LIVE_DEV_DETACHED_TARGET_CLOSED": "Förhandsvisningen avbröts eftersom sidan stängdes i webbläsaren.",
   "LIVE_DEV_NAVIGATED_AWAY": "Förhandsvisningen avbröts eftersom webbläsaren navigerades till en sida som inte är del av det nuvarande projektet.",
@@ -2546,7 +2548,6 @@ define({
   "AI_CHAT_MODEL_DESC_SONNET": "Balanserad hastighet och kapacitet för daglig kodning",
   "AI_CHAT_MODEL_DESC_HAIKU": "Snabbaste modellen för snabba, enkla uppgifter",
   "AI_CHAT_MODEL_SELECT_TITLE": "Välj AI-modell för den här chatten",
-  "AI_CHAT_MODE_SELECT_TITLE": "Växla mellan Claude Code-chatten och en inbäddad Claude Code CLI-terminal",
   "AI_CHAT_MODEL_SWITCHED_NOTICE": "Bytte till {0}. Gäller från och med ditt nästa meddelande; det första svaret kan ta lite längre tid medan cachen byggs om.",
   "AI_CHAT_INPUT_HINT": "Tryck på {0} för att skicka · {1} för ny rad",
   "AI_CHAT_BASH_CONFIRM_TITLE": "Tillåt kommando?",
@@ -2618,7 +2619,6 @@ define({
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "Denna Claude Code CLI-session körs fortfarande i {0} — det öppna projektet är nu {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_SWITCH_BTN": "Växla till ”{0}”",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Stanna kvar i ”{0}”",
-  "AI_CHAT_SETTINGS_TITLE": "Inställningar för Claude Code",
   "AI_SETTINGS_API_KEY": "API-nyckel",
   "AI_SETTINGS_BASE_URL": "Bas-URL",
   "AI_SETTINGS_API_TIMEOUT": "API-timeout (ms)",
@@ -2762,6 +2762,25 @@ define({
   "MIGRATE_UNREACHABLE_TITLE": "Kunde inte nå den gamla webbplatsen",
   "MIGRATE_UNREACHABLE_MESSAGE": "{APP_NAME} kunde inte ansluta till {0} för att leta efter dina projekt och inställningar, så ingenting har ändrats. Kontrollera din internetanslutning och försök sedan igen med {1}.",
   "CMD_MIGRATE_DATA": "Migrera min data från {0}…",
-  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "egenskap",
-  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "värde"
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} hittades inte",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} kunde inte hittas på det här systemet. Installera det, eller ange den fullständiga sökvägen till dess körbara fil nedan.",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "Sökvägen som angetts för {0} kunde inte användas: {1} Ange en annan sökväg, eller rensa rutan för att hitta den automatiskt.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Installera {0}",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Spara och försök igen",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installationsanvisningar",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "Ingen fil finns på den sökvägen.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "Den filen är inte körbar.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "Den filen kördes inte som {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "Filen svarade inte i tid.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "Sökvägen innehåller tecken som inte kan användas.",
+  "AI_CHAT_MODE_SELECT_TITLE": "Växla mellan Claude Code-chatten och en inbäddad CLI-terminal",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "Detta kommer att avsluta den pågående Codex CLI-sessionen och starta en ny. Vill du fortsätta?",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Att köra Codex i Phoenix AI-panelen är en Pro-funktion. Du kan fortfarande köra Codex CLI gratis från terminalen.",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "Denna Codex CLI-session körs fortfarande i {0} — det öppna projektet är nu {1}.",
+  "AI_CHAT_SETTINGS_TITLE": "AI-inställningar",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Standard (Lokal {0})",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "Dessa leverantörer konfigurerar {0}. API-nyckeln skickas till den som {1}.",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Lämna tomt för automatisk identifiering.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Sökväg till den körbara filen för {0}"
 });
\ No newline at end of file
diff --git a/src/nls/tr/lastTranslated.json b/src/nls/tr/lastTranslated.json
index 61b0783d87..9fb162a6f3 100644
--- a/src/nls/tr/lastTranslated.json
+++ b/src/nls/tr/lastTranslated.json
@@ -33,6 +33,11 @@
   "AI_CHAT_CLAUDE_LOGIN_MSG": "Claude Code is installed but needs to be configured.",
   "AI_CHAT_CLAUDE_LOGIN_RESTART_NOTE": "Restart {APP_NAME} after configuration completes.",
   "AI_CHAT_CLAUDE_LOGIN_TITLE": "Setup Claude Code",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "That file did not run as {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "No file exists at that path.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "That file is not executable.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "That path contains characters that cannot be used.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "That file did not respond in time.",
   "AI_CHAT_CLI_INSTALLING": "Installing…",
   "AI_CHAT_CLI_INSTALLING_MSG": "Installing Claude Code, please wait. This may take a while...",
   "AI_CHAT_CLI_INSTALL_BTN": "Install Claude Code",
@@ -40,6 +45,12 @@
   "AI_CHAT_CLI_NEW_CONFIRM_MSG": "This will end the running Claude Code CLI session and start a fresh one. Continue?",
   "AI_CHAT_CLI_NEW_CONFIRM_TITLE": "End this CLI session?",
   "AI_CHAT_CLI_NOT_FOUND": "Claude Code Not Installed",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "The path set for {0} could not be used: {1} Enter a different path, or clear the box to detect it automatically.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Install {0}",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installation instructions",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} could not be found on this system. Install it, or enter the full path to its executable below.",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Save & Retry",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} not found",
   "AI_CHAT_CLI_RESTART_NOTE": "Restart {APP_NAME} after installation completes.",
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "This Claude Code CLI session is still running in {0} — the open project is now {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Stay on “{0}”",
@@ -48,6 +59,9 @@
   "AI_CHAT_CLI_UPSELL_OPEN_TERMINAL_BTN": "Open in Terminal",
   "AI_CHAT_CLI_UPSELL_TITLE": "Available in Phoenix Pro",
   "AI_CHAT_CLI_UPSELL_UPGRADE_BTN": "Upgrade to Pro",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "This will end the running Codex CLI session and start a fresh one. Continue?",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "This Codex CLI session is still running in {0} — the open project is now {1}.",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Running Codex inside the Phoenix AI panel is a Pro feature. You can still run the Codex CLI for free from the Terminal.",
   "AI_CHAT_CODE_COLLAPSE": "Collapse",
   "AI_CHAT_CODE_COLLAPSE_FOOTER": "Click to collapse",
   "AI_CHAT_CODE_DEFAULT_LANG": "text",
@@ -106,6 +120,7 @@
   "AI_CHAT_MODE_AUTO": "Auto",
   "AI_CHAT_MODE_CHAT": "Claude Code",
   "AI_CHAT_MODE_CLI": "Claude Code CLI",
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
   "AI_CHAT_MODE_EDIT": "AI Edit Mode",
   "AI_CHAT_MODE_FULL_AUTO": "Allow Everything",
   "AI_CHAT_MODE_INFO_AUTO": "AI uses judgment to auto-approve safe actions and asks about risky ones (Click to switch)",
@@ -113,7 +128,7 @@
   "AI_CHAT_MODE_INFO_FULL_AUTO": "AI can edit files and run commands without approval (Click to switch)",
   "AI_CHAT_MODE_INFO_PLAN": "AI will propose a plan before making changes (Click to switch)",
   "AI_CHAT_MODE_PLAN": "Plan Mode",
-  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded Claude Code CLI terminal",
+  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded CLI terminal",
   "AI_CHAT_NEW_BTN": "New",
   "AI_CHAT_NEW_SESSION_TITLE": "Start a new conversation",
   "AI_CHAT_NEW_WHILE_STREAMING_MSG": "AI is currently working on a task. Starting a new conversation will stop it. Continue?",
@@ -180,7 +195,7 @@
   "AI_CHAT_SEND_ERROR": "Failed to send message: {0}",
   "AI_CHAT_SEND_TITLE": "Send message",
   "AI_CHAT_SESSION_RESUMED": "Resumed session",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code Settings",
+  "AI_CHAT_SETTINGS_TITLE": "AI Settings",
   "AI_CHAT_SETUP_LEARN_MORE": "Learn More",
   "AI_CHAT_SETUP_NEED_HELP": "Need Help?",
   "AI_CHAT_SHOW_DIFF": "Show diff",
@@ -287,8 +302,11 @@
   "AI_SETTINGS_API_TIMEOUT_PLACEHOLDER": "Leave blank for default",
   "AI_SETTINGS_BASE_URL": "Base URL",
   "AI_SETTINGS_BASE_URL_PLACEHOLDER": "Leave blank for default",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Leave blank to detect automatically.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Path to the {0} executable",
   "AI_SETTINGS_CUSTOM_ENDPOINT_NOTICE": "Using custom API endpoint: {0}",
   "AI_SETTINGS_DEFAULT_PROVIDER": "Default (Local Claude Code)",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Default (Local {0})",
   "AI_SETTINGS_DELETE": "Delete",
   "AI_SETTINGS_DELETE_ACTIVE_CONFIRM": "\"{0}\" is the active provider. Deleting it will revert to the default. Continue?",
   "AI_SETTINGS_DELETE_PROVIDER": "Delete Provider",
@@ -301,6 +319,7 @@
   "AI_SETTINGS_PROVIDERS": "Providers",
   "AI_SETTINGS_PROVIDER_NAME": "Name",
   "AI_SETTINGS_PROVIDER_NAME_PLACEHOLDER": "e.g. My API Provider",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "These providers configure {0}. The API key is passed to it as {1}.",
   "AI_SETTINGS_RESET": "Reset",
   "AI_SETTINGS_SAVE": "Save",
   "AI_SETTINGS_SAVE_PROVIDER": "Save Provider",
diff --git a/src/nls/tr/strings.js b/src/nls/tr/strings.js
index 09a6cf06b0..c900a14fe7 100644
--- a/src/nls/tr/strings.js
+++ b/src/nls/tr/strings.js
@@ -812,6 +812,8 @@ define({
   "LIVE_PREVIEW_LAYERS_EMPTY_PAGE_STYLES": "Sayfa boş. Stillerini görmek için bir öge ekleyin.",
   "LIVE_PREVIEW_LAYERS_SHOW_SELECTED": "Seçili ögeyi göster",
   "LIVE_PREVIEW_LAYERS_SCRUB_HINT": "Ayarlamak için sürükleyin, düzenlemek için çift tıklayın",
+  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "özellik",
+  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "değer",
   "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS": "Tarayıcının geliştirici araçları açıldığı için Canlı Önizleme iptal edildi",
   "LIVE_DEV_DETACHED_TARGET_CLOSED": "Sayfa tarayıcıda kapatıldığı için Canlı Önizleme iptal edildi",
   "LIVE_DEV_NAVIGATED_AWAY": "Tarayıcı mevcut projenin parçası olmayan bir sayfaya gittiği için Canlı Önizleme iptal edildi",
@@ -2546,7 +2548,6 @@ define({
   "AI_CHAT_MODEL_DESC_SONNET": "Günlük kodlama için dengeli hız ve yetenek",
   "AI_CHAT_MODEL_DESC_HAIKU": "Çabuk, basit görevler için en hızlı model",
   "AI_CHAT_MODEL_SELECT_TITLE": "Bu sohbet için yapay zeka modelini seçin",
-  "AI_CHAT_MODE_SELECT_TITLE": "Claude Code sohbeti ile gömülü Claude Code CLI terminali arasında geçiş yapın",
   "AI_CHAT_MODEL_SWITCHED_NOTICE": "{0} modeline geçildi. Sonraki mesajınızdan itibaren uygulanır; önbellek yeniden oluşturulurken ilk yanıt biraz daha uzun sürebilir.",
   "AI_CHAT_INPUT_HINT": "Göndermek için {0} · Yeni satır için {1}",
   "AI_CHAT_BASH_CONFIRM_TITLE": "Komuta izin verilsin mi?",
@@ -2618,7 +2619,6 @@ define({
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "Bu Claude Code CLI oturumu hâlâ {0} üzerinde çalışıyor — açık olan proje ise artık {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_SWITCH_BTN": "“{0}” projesine geçin",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "“{0}” projesinde kalın",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code Ayarları",
   "AI_SETTINGS_API_KEY": "API Anahtarı",
   "AI_SETTINGS_BASE_URL": "Temel URL",
   "AI_SETTINGS_API_TIMEOUT": "API Zaman Aşımı (ms)",
@@ -2762,6 +2762,25 @@ define({
   "MIGRATE_UNREACHABLE_TITLE": "Eski siteye ulaşılamadı",
   "MIGRATE_UNREACHABLE_MESSAGE": "{APP_NAME}, projelerinizi ve ayarlarınızı bulmak için {0} ile bağlantı kuramadı, bu nedenle hiçbir değişiklik yapılmadı. İnternet bağlantınızı kontrol edin, ardından {1} ile yeniden deneyin.",
   "CMD_MIGRATE_DATA": "Verilerimi {0} Konumundan Aktar…",
-  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "özellik",
-  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "değer"
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} bulunamadı",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} bu sistemde bulunamadı. Uygulamayı yükleyin veya aşağıya yürütülebilir dosyasının tam yolunu girin.",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "{0} için ayarlanan yol kullanılamadı: {1} Farklı bir yol girin veya otomatik olarak algılanması için kutuyu temizleyin.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "{0} Yükle",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Kaydet ve Yeniden Dene",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Kurulum talimatları",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "Belirtilen yolda dosya mevcut değil.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "Bu dosya yürütülebilir değil.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "Bu dosya {0} olarak çalışmadı.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "Bu dosya zamanında yanıt vermedi.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "Bu yol, kullanılamayan karakterler içeriyor.",
+  "AI_CHAT_MODE_SELECT_TITLE": "Claude Code sohbeti ile gömülü bir CLI terminali arasında geçiş yapın",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "Bu işlem, mevcut Codex CLI oturumunu sonlandırıp yeni bir oturum başlatacak. Devam edilsin mi?",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Codex'i Phoenix AI paneli içinde çalıştırmak bir Pro özelliğidir. Codex CLI'ı Terminal'den ücretsiz olarak çalıştırmaya devam edebilirsiniz.",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "Bu Codex CLI oturumu hâlâ {0} üzerinde çalışıyor — şu anda açık olan proje ise {1}.",
+  "AI_CHAT_SETTINGS_TITLE": "Yapay Zeka Ayarları",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Varsayılan (Yerel {0})",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "Bu sağlayıcılar {0}'ı yapılandırır. API anahtarı, ona {1} olarak iletilir.",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Otomatik olarak algılanması için boş bırakın.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "{0} çalıştırılabilirinin yolu"
 });
\ No newline at end of file
diff --git a/src/nls/uk/lastTranslated.json b/src/nls/uk/lastTranslated.json
index 61b0783d87..9fb162a6f3 100644
--- a/src/nls/uk/lastTranslated.json
+++ b/src/nls/uk/lastTranslated.json
@@ -33,6 +33,11 @@
   "AI_CHAT_CLAUDE_LOGIN_MSG": "Claude Code is installed but needs to be configured.",
   "AI_CHAT_CLAUDE_LOGIN_RESTART_NOTE": "Restart {APP_NAME} after configuration completes.",
   "AI_CHAT_CLAUDE_LOGIN_TITLE": "Setup Claude Code",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "That file did not run as {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "No file exists at that path.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "That file is not executable.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "That path contains characters that cannot be used.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "That file did not respond in time.",
   "AI_CHAT_CLI_INSTALLING": "Installing…",
   "AI_CHAT_CLI_INSTALLING_MSG": "Installing Claude Code, please wait. This may take a while...",
   "AI_CHAT_CLI_INSTALL_BTN": "Install Claude Code",
@@ -40,6 +45,12 @@
   "AI_CHAT_CLI_NEW_CONFIRM_MSG": "This will end the running Claude Code CLI session and start a fresh one. Continue?",
   "AI_CHAT_CLI_NEW_CONFIRM_TITLE": "End this CLI session?",
   "AI_CHAT_CLI_NOT_FOUND": "Claude Code Not Installed",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "The path set for {0} could not be used: {1} Enter a different path, or clear the box to detect it automatically.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Install {0}",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installation instructions",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} could not be found on this system. Install it, or enter the full path to its executable below.",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Save & Retry",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} not found",
   "AI_CHAT_CLI_RESTART_NOTE": "Restart {APP_NAME} after installation completes.",
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "This Claude Code CLI session is still running in {0} — the open project is now {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Stay on “{0}”",
@@ -48,6 +59,9 @@
   "AI_CHAT_CLI_UPSELL_OPEN_TERMINAL_BTN": "Open in Terminal",
   "AI_CHAT_CLI_UPSELL_TITLE": "Available in Phoenix Pro",
   "AI_CHAT_CLI_UPSELL_UPGRADE_BTN": "Upgrade to Pro",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "This will end the running Codex CLI session and start a fresh one. Continue?",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "This Codex CLI session is still running in {0} — the open project is now {1}.",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Running Codex inside the Phoenix AI panel is a Pro feature. You can still run the Codex CLI for free from the Terminal.",
   "AI_CHAT_CODE_COLLAPSE": "Collapse",
   "AI_CHAT_CODE_COLLAPSE_FOOTER": "Click to collapse",
   "AI_CHAT_CODE_DEFAULT_LANG": "text",
@@ -106,6 +120,7 @@
   "AI_CHAT_MODE_AUTO": "Auto",
   "AI_CHAT_MODE_CHAT": "Claude Code",
   "AI_CHAT_MODE_CLI": "Claude Code CLI",
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
   "AI_CHAT_MODE_EDIT": "AI Edit Mode",
   "AI_CHAT_MODE_FULL_AUTO": "Allow Everything",
   "AI_CHAT_MODE_INFO_AUTO": "AI uses judgment to auto-approve safe actions and asks about risky ones (Click to switch)",
@@ -113,7 +128,7 @@
   "AI_CHAT_MODE_INFO_FULL_AUTO": "AI can edit files and run commands without approval (Click to switch)",
   "AI_CHAT_MODE_INFO_PLAN": "AI will propose a plan before making changes (Click to switch)",
   "AI_CHAT_MODE_PLAN": "Plan Mode",
-  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded Claude Code CLI terminal",
+  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded CLI terminal",
   "AI_CHAT_NEW_BTN": "New",
   "AI_CHAT_NEW_SESSION_TITLE": "Start a new conversation",
   "AI_CHAT_NEW_WHILE_STREAMING_MSG": "AI is currently working on a task. Starting a new conversation will stop it. Continue?",
@@ -180,7 +195,7 @@
   "AI_CHAT_SEND_ERROR": "Failed to send message: {0}",
   "AI_CHAT_SEND_TITLE": "Send message",
   "AI_CHAT_SESSION_RESUMED": "Resumed session",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code Settings",
+  "AI_CHAT_SETTINGS_TITLE": "AI Settings",
   "AI_CHAT_SETUP_LEARN_MORE": "Learn More",
   "AI_CHAT_SETUP_NEED_HELP": "Need Help?",
   "AI_CHAT_SHOW_DIFF": "Show diff",
@@ -287,8 +302,11 @@
   "AI_SETTINGS_API_TIMEOUT_PLACEHOLDER": "Leave blank for default",
   "AI_SETTINGS_BASE_URL": "Base URL",
   "AI_SETTINGS_BASE_URL_PLACEHOLDER": "Leave blank for default",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Leave blank to detect automatically.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Path to the {0} executable",
   "AI_SETTINGS_CUSTOM_ENDPOINT_NOTICE": "Using custom API endpoint: {0}",
   "AI_SETTINGS_DEFAULT_PROVIDER": "Default (Local Claude Code)",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Default (Local {0})",
   "AI_SETTINGS_DELETE": "Delete",
   "AI_SETTINGS_DELETE_ACTIVE_CONFIRM": "\"{0}\" is the active provider. Deleting it will revert to the default. Continue?",
   "AI_SETTINGS_DELETE_PROVIDER": "Delete Provider",
@@ -301,6 +319,7 @@
   "AI_SETTINGS_PROVIDERS": "Providers",
   "AI_SETTINGS_PROVIDER_NAME": "Name",
   "AI_SETTINGS_PROVIDER_NAME_PLACEHOLDER": "e.g. My API Provider",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "These providers configure {0}. The API key is passed to it as {1}.",
   "AI_SETTINGS_RESET": "Reset",
   "AI_SETTINGS_SAVE": "Save",
   "AI_SETTINGS_SAVE_PROVIDER": "Save Provider",
diff --git a/src/nls/uk/strings.js b/src/nls/uk/strings.js
index 425d19a99a..094335db9a 100644
--- a/src/nls/uk/strings.js
+++ b/src/nls/uk/strings.js
@@ -812,6 +812,8 @@ define({
   "LIVE_PREVIEW_LAYERS_EMPTY_PAGE_STYLES": "Сторінка порожня. Додайте елемент, щоб побачити його стилі.",
   "LIVE_PREVIEW_LAYERS_SHOW_SELECTED": "Показати вибраний елемент",
   "LIVE_PREVIEW_LAYERS_SCRUB_HINT": "Перетягніть, щоб налаштувати, двічі клацніть, щоб редагувати",
+  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "властивість",
+  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "значення",
   "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS": "Live Preview зупинено, оскільки в браузері відкрито панель інструментів розробника",
   "LIVE_DEV_DETACHED_TARGET_CLOSED": "Live Preview зупинено, оскільки сторінку закрито в браузері",
   "LIVE_DEV_NAVIGATED_AWAY": "Live Preview зупинено, оскільки браузер перенаправлено на сторінку, що не є частиною поточного проекту",
@@ -2546,7 +2548,6 @@ define({
   "AI_CHAT_MODEL_DESC_SONNET": "Збалансована швидкість і продуктивність для повсякденного кодування",
   "AI_CHAT_MODEL_DESC_HAIKU": "Найшвидша модель для швидких, простих завдань",
   "AI_CHAT_MODEL_SELECT_TITLE": "Виберіть модель ШІ для цього чату",
-  "AI_CHAT_MODE_SELECT_TITLE": "Перемикання між чатом Claude Code та вбудованим терміналом Claude Code CLI",
   "AI_CHAT_MODEL_SWITCHED_NOTICE": "Переключено на {0}. Застосовується з наступного повідомлення; перша відповідь може зайняти трохи більше часу, поки кеш перебудовується.",
   "AI_CHAT_INPUT_HINT": "Натисніть {0}, щоб надіслати · {1} для нового рядка",
   "AI_CHAT_BASH_CONFIRM_TITLE": "Дозволити команду?",
@@ -2618,7 +2619,6 @@ define({
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "Ця CLI-сесія Claude Code досі виконується в {0} — тепер відкрито проєкт {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_SWITCH_BTN": "Перемкнутися на «{0}»",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Залишитися в «{0}»",
-  "AI_CHAT_SETTINGS_TITLE": "Налаштування Claude Code",
   "AI_SETTINGS_API_KEY": "API-ключ",
   "AI_SETTINGS_BASE_URL": "Базова URL-адреса",
   "AI_SETTINGS_API_TIMEOUT": "Час очікування API (мс)",
@@ -2762,6 +2762,25 @@ define({
   "MIGRATE_UNREACHABLE_TITLE": "Не вдалося підключитися до старого сайту",
   "MIGRATE_UNREACHABLE_MESSAGE": "{APP_NAME} не вдалося підключитися до {0}, щоб знайти ваші проєкти та налаштування, тому нічого не було змінено. Перевірте підключення до Інтернету, а потім спробуйте ще раз за допомогою {1}.",
   "CMD_MIGRATE_DATA": "Перенести мої дані з {0}…",
-  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "властивість",
-  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "значення"
+  "AI_CHAT_MODE_CODEX_CLI": "Кодекс КЛІ",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} не знайдено",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "Не вдалося знайти {0} у цій системі. Установіть {0} або введіть нижче повний шлях до виконуваного файлу.",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "Неможливо використати шлях, указаний для {0}: {1}. Введіть інший шлях або очистьте поле для автоматичного виявлення.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Установити {0}",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Зберегти та повторити",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Інструкції з установлення",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "Файл за вказаним шляхом не існує.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "Цей файл не є виконуваним.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "Цей файл не вдалося запустити як {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "Файл не відповів вчасно.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "Шлях містить неприпустимі символи.",
+  "AI_CHAT_MODE_SELECT_TITLE": "Перемикання між чатом Claude Code та вбудованим терміналом CLI",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "Це завершить поточну сесію Codex CLI і запустить нову. Продовжити?",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Запуск Codex у панелі Phoenix AI є функцією Pro. Ви все ще можете безкоштовно запускати Codex CLI з Термінала.",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "Ця сесія Codex CLI все ще запущена в {0} — відкритий проєкт тепер {1}.",
+  "AI_CHAT_SETTINGS_TITLE": "Налаштування ШІ",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "За замовчуванням (локальний {0})",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "Ці провайдери налаштовують {0}. Ключ API передається до нього як {1}.",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Залиште порожнім для автоматичного визначення.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Шлях до виконуваного файлу {0}"
 });
\ No newline at end of file
diff --git a/src/nls/ur/lastTranslated.json b/src/nls/ur/lastTranslated.json
index 61b0783d87..9fb162a6f3 100644
--- a/src/nls/ur/lastTranslated.json
+++ b/src/nls/ur/lastTranslated.json
@@ -33,6 +33,11 @@
   "AI_CHAT_CLAUDE_LOGIN_MSG": "Claude Code is installed but needs to be configured.",
   "AI_CHAT_CLAUDE_LOGIN_RESTART_NOTE": "Restart {APP_NAME} after configuration completes.",
   "AI_CHAT_CLAUDE_LOGIN_TITLE": "Setup Claude Code",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "That file did not run as {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "No file exists at that path.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "That file is not executable.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "That path contains characters that cannot be used.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "That file did not respond in time.",
   "AI_CHAT_CLI_INSTALLING": "Installing…",
   "AI_CHAT_CLI_INSTALLING_MSG": "Installing Claude Code, please wait. This may take a while...",
   "AI_CHAT_CLI_INSTALL_BTN": "Install Claude Code",
@@ -40,6 +45,12 @@
   "AI_CHAT_CLI_NEW_CONFIRM_MSG": "This will end the running Claude Code CLI session and start a fresh one. Continue?",
   "AI_CHAT_CLI_NEW_CONFIRM_TITLE": "End this CLI session?",
   "AI_CHAT_CLI_NOT_FOUND": "Claude Code Not Installed",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "The path set for {0} could not be used: {1} Enter a different path, or clear the box to detect it automatically.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Install {0}",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installation instructions",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} could not be found on this system. Install it, or enter the full path to its executable below.",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Save & Retry",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} not found",
   "AI_CHAT_CLI_RESTART_NOTE": "Restart {APP_NAME} after installation completes.",
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "This Claude Code CLI session is still running in {0} — the open project is now {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Stay on “{0}”",
@@ -48,6 +59,9 @@
   "AI_CHAT_CLI_UPSELL_OPEN_TERMINAL_BTN": "Open in Terminal",
   "AI_CHAT_CLI_UPSELL_TITLE": "Available in Phoenix Pro",
   "AI_CHAT_CLI_UPSELL_UPGRADE_BTN": "Upgrade to Pro",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "This will end the running Codex CLI session and start a fresh one. Continue?",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "This Codex CLI session is still running in {0} — the open project is now {1}.",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Running Codex inside the Phoenix AI panel is a Pro feature. You can still run the Codex CLI for free from the Terminal.",
   "AI_CHAT_CODE_COLLAPSE": "Collapse",
   "AI_CHAT_CODE_COLLAPSE_FOOTER": "Click to collapse",
   "AI_CHAT_CODE_DEFAULT_LANG": "text",
@@ -106,6 +120,7 @@
   "AI_CHAT_MODE_AUTO": "Auto",
   "AI_CHAT_MODE_CHAT": "Claude Code",
   "AI_CHAT_MODE_CLI": "Claude Code CLI",
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
   "AI_CHAT_MODE_EDIT": "AI Edit Mode",
   "AI_CHAT_MODE_FULL_AUTO": "Allow Everything",
   "AI_CHAT_MODE_INFO_AUTO": "AI uses judgment to auto-approve safe actions and asks about risky ones (Click to switch)",
@@ -113,7 +128,7 @@
   "AI_CHAT_MODE_INFO_FULL_AUTO": "AI can edit files and run commands without approval (Click to switch)",
   "AI_CHAT_MODE_INFO_PLAN": "AI will propose a plan before making changes (Click to switch)",
   "AI_CHAT_MODE_PLAN": "Plan Mode",
-  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded Claude Code CLI terminal",
+  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded CLI terminal",
   "AI_CHAT_NEW_BTN": "New",
   "AI_CHAT_NEW_SESSION_TITLE": "Start a new conversation",
   "AI_CHAT_NEW_WHILE_STREAMING_MSG": "AI is currently working on a task. Starting a new conversation will stop it. Continue?",
@@ -180,7 +195,7 @@
   "AI_CHAT_SEND_ERROR": "Failed to send message: {0}",
   "AI_CHAT_SEND_TITLE": "Send message",
   "AI_CHAT_SESSION_RESUMED": "Resumed session",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code Settings",
+  "AI_CHAT_SETTINGS_TITLE": "AI Settings",
   "AI_CHAT_SETUP_LEARN_MORE": "Learn More",
   "AI_CHAT_SETUP_NEED_HELP": "Need Help?",
   "AI_CHAT_SHOW_DIFF": "Show diff",
@@ -287,8 +302,11 @@
   "AI_SETTINGS_API_TIMEOUT_PLACEHOLDER": "Leave blank for default",
   "AI_SETTINGS_BASE_URL": "Base URL",
   "AI_SETTINGS_BASE_URL_PLACEHOLDER": "Leave blank for default",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Leave blank to detect automatically.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Path to the {0} executable",
   "AI_SETTINGS_CUSTOM_ENDPOINT_NOTICE": "Using custom API endpoint: {0}",
   "AI_SETTINGS_DEFAULT_PROVIDER": "Default (Local Claude Code)",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Default (Local {0})",
   "AI_SETTINGS_DELETE": "Delete",
   "AI_SETTINGS_DELETE_ACTIVE_CONFIRM": "\"{0}\" is the active provider. Deleting it will revert to the default. Continue?",
   "AI_SETTINGS_DELETE_PROVIDER": "Delete Provider",
@@ -301,6 +319,7 @@
   "AI_SETTINGS_PROVIDERS": "Providers",
   "AI_SETTINGS_PROVIDER_NAME": "Name",
   "AI_SETTINGS_PROVIDER_NAME_PLACEHOLDER": "e.g. My API Provider",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "These providers configure {0}. The API key is passed to it as {1}.",
   "AI_SETTINGS_RESET": "Reset",
   "AI_SETTINGS_SAVE": "Save",
   "AI_SETTINGS_SAVE_PROVIDER": "Save Provider",
diff --git a/src/nls/ur/strings.js b/src/nls/ur/strings.js
index 0b3d8997f2..a0824878b7 100644
--- a/src/nls/ur/strings.js
+++ b/src/nls/ur/strings.js
@@ -812,6 +812,8 @@ define({
   "LIVE_PREVIEW_LAYERS_EMPTY_PAGE_STYLES": "صفحہ خالی ہے۔ اس کے اسٹائلز دیکھنے کے لیے ایک عنصر شامل کریں۔",
   "LIVE_PREVIEW_LAYERS_SHOW_SELECTED": "منتخب عنصر دکھائیں",
   "LIVE_PREVIEW_LAYERS_SCRUB_HINT": "ایڈجسٹ کرنے کے لیے ڈریگ کریں، ترمیم کرنے کے لیے ڈبل کلک کریں",
+  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "خصوصیت",
+  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "قدر",
   "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS": "براؤزر کے ڈویلپر ٹولز کھولے جانے کی وجہ سے لائیو پیش نظارہ منسوخ کر دیا گیا",
   "LIVE_DEV_DETACHED_TARGET_CLOSED": "براؤزر میں پیج بند ہونے کی وجہ سے لائیو پیش نظارہ منسوخ کر دیا گیا",
   "LIVE_DEV_NAVIGATED_AWAY": "لائیو پیش نظارہ منسوخ کر دیا گیا کیونکہ براؤزر موجودہ پراجیکٹ کے کسی ایسے پیج پر چلا گیا جو اس کا حصہ نہیں ہے",
@@ -2546,7 +2548,6 @@ define({
   "AI_CHAT_MODEL_DESC_SONNET": "روزمرہ کوڈنگ کے لیے متوازن رفتار اور قابلیت",
   "AI_CHAT_MODEL_DESC_HAIKU": "فوری، سادہ کاموں کے لیے تیز ترین ماڈل",
   "AI_CHAT_MODEL_SELECT_TITLE": "اس چیٹ کے لیے AI ماڈل منتخب کریں۔",
-  "AI_CHAT_MODE_SELECT_TITLE": "Claude Code چیٹ اور ایمبیڈڈ Claude Code CLI ٹرمینل کے درمیان سوئچ کریں",
   "AI_CHAT_MODEL_SWITCHED_NOTICE": "{0} پر سوئچ کر دیا گیا ہے۔ یہ آپ کے اگلے پیغام سے لاگو ہوگا؛ کیش کے دوبارہ بننے کے دوران پہلے جواب میں تھوڑا زیادہ وقت لگ سکتا ہے۔",
   "AI_CHAT_INPUT_HINT": "بھیجنے کے لیے {0} دبائیں · نئی لائن کے لیے {1}",
   "AI_CHAT_BASH_CONFIRM_TITLE": "کمانڈ کی اجازت؟",
@@ -2618,7 +2619,6 @@ define({
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "یہ Claude Code CLI سیشن اب بھی {0} میں جاری ہے — کھلا ہوا پروجیکٹ اب {1} ہے۔",
   "AI_CHAT_CLI_STALE_PROJECT_SWITCH_BTN": "”{0}“ پر سوئچ کریں",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "”{0}“ پر رہیں",
-  "AI_CHAT_SETTINGS_TITLE": "کلاڈ کوڈ سیٹنگز",
   "AI_SETTINGS_API_KEY": "API کی",
   "AI_SETTINGS_BASE_URL": "بیس یو آر ایل",
   "AI_SETTINGS_API_TIMEOUT": "API ٹائم آؤٹ (ms)",
@@ -2762,6 +2762,25 @@ define({
   "MIGRATE_UNREACHABLE_TITLE": "پرانی سائٹ تک رسائی ممکن نہ ہو سکی",
   "MIGRATE_UNREACHABLE_MESSAGE": "{APP_NAME} آپ کے پروجیکٹس اور سیٹنگز تلاش کرنے کے لیے {0} سے منسلک نہیں ہو سکا، لہذا کوئی تبدیلی نہیں کی گئی ہے۔ اپنا انٹرنیٹ کنکشن چیک کریں، پھر {1} کے ساتھ دوبارہ کوشش کریں۔",
   "CMD_MIGRATE_DATA": "{0} سے میرا ڈیٹا منتقل کریں…",
-  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "خصوصیت",
-  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "قدر"
+  "AI_CHAT_MODE_CODEX_CLI": "کوڈیکس سی ایل آئی",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} نہیں ملا",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} اس سسٹم پر موجود نہیں ہے۔ اسے انسٹال کریں، یا نیچے اس کی ایگزیکیوٹیبل فائل کا مکمل پاتھ درج کریں۔",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "{0} کے لیے سیٹ کیا گیا پاتھ استعمال نہیں کیا جا سکا: {1} ایک مختلف پاتھ درج کریں، یا اسے خودکار طور پر پتہ لگانے کے لیے باکس کو صاف کریں۔",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "{0} انسٹال کریں",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "محفوظ کریں اور دوبارہ کوشش کریں",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "انسٹالیشن کی ہدایات",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "اس پاتھ پر کوئی فائل موجود نہیں ہے۔",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "وہ فائل ایگزیکیوٹیبل نہیں ہے۔",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "وہ فائل {0} کے طور پر نہیں چلی۔",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "اس فائل نے وقت پر جواب نہیں دیا۔",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "اس پاتھ میں ایسے حروف ہیں جنہیں استعمال نہیں کیا جا سکتا۔",
+  "AI_CHAT_MODE_SELECT_TITLE": "کلاڈ کوڈ چیٹ اور ایک ایمبیڈڈ CLI ٹرمینل کے درمیان سوئچ کریں۔",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "اس سے چلتا ہوا Codex CLI سیشن ختم ہو جائے گا اور ایک نیا شروع ہو جائے گا۔ جاری رکھیں؟",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Phoenix AI پینل کے اندر Codex چلانا ایک پرو فیچر ہے۔ آپ اب بھی ٹرمینل سے Codex CLI مفت میں چلا سکتے ہیں۔",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "یہ Codex CLI سیشن اب بھی {0} میں چل رہا ہے — کھلا ہوا پروجیکٹ اب {1} ہے۔",
+  "AI_CHAT_SETTINGS_TITLE": "AI سیٹنگز",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "ڈیفالٹ (مقامی {0})",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "یہ پرووائیڈرز {0} کو کنفیگر کرتے ہیں۔ API کی اسے {1} کے طور پر بھیجی جاتی ہے۔",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "خودکار طور پر پتہ لگانے کے لیے خالی چھوڑ دیں۔",
+  "AI_SETTINGS_CLI_PATH_LABEL": "{0} ایگزیکیوٹیبل کا پاتھ"
 });
\ No newline at end of file
diff --git a/src/nls/zh-cn/lastTranslated.json b/src/nls/zh-cn/lastTranslated.json
index 61b0783d87..9fb162a6f3 100644
--- a/src/nls/zh-cn/lastTranslated.json
+++ b/src/nls/zh-cn/lastTranslated.json
@@ -33,6 +33,11 @@
   "AI_CHAT_CLAUDE_LOGIN_MSG": "Claude Code is installed but needs to be configured.",
   "AI_CHAT_CLAUDE_LOGIN_RESTART_NOTE": "Restart {APP_NAME} after configuration completes.",
   "AI_CHAT_CLAUDE_LOGIN_TITLE": "Setup Claude Code",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "That file did not run as {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "No file exists at that path.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "That file is not executable.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "That path contains characters that cannot be used.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "That file did not respond in time.",
   "AI_CHAT_CLI_INSTALLING": "Installing…",
   "AI_CHAT_CLI_INSTALLING_MSG": "Installing Claude Code, please wait. This may take a while...",
   "AI_CHAT_CLI_INSTALL_BTN": "Install Claude Code",
@@ -40,6 +45,12 @@
   "AI_CHAT_CLI_NEW_CONFIRM_MSG": "This will end the running Claude Code CLI session and start a fresh one. Continue?",
   "AI_CHAT_CLI_NEW_CONFIRM_TITLE": "End this CLI session?",
   "AI_CHAT_CLI_NOT_FOUND": "Claude Code Not Installed",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "The path set for {0} could not be used: {1} Enter a different path, or clear the box to detect it automatically.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Install {0}",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installation instructions",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} could not be found on this system. Install it, or enter the full path to its executable below.",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Save & Retry",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} not found",
   "AI_CHAT_CLI_RESTART_NOTE": "Restart {APP_NAME} after installation completes.",
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "This Claude Code CLI session is still running in {0} — the open project is now {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Stay on “{0}”",
@@ -48,6 +59,9 @@
   "AI_CHAT_CLI_UPSELL_OPEN_TERMINAL_BTN": "Open in Terminal",
   "AI_CHAT_CLI_UPSELL_TITLE": "Available in Phoenix Pro",
   "AI_CHAT_CLI_UPSELL_UPGRADE_BTN": "Upgrade to Pro",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "This will end the running Codex CLI session and start a fresh one. Continue?",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "This Codex CLI session is still running in {0} — the open project is now {1}.",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Running Codex inside the Phoenix AI panel is a Pro feature. You can still run the Codex CLI for free from the Terminal.",
   "AI_CHAT_CODE_COLLAPSE": "Collapse",
   "AI_CHAT_CODE_COLLAPSE_FOOTER": "Click to collapse",
   "AI_CHAT_CODE_DEFAULT_LANG": "text",
@@ -106,6 +120,7 @@
   "AI_CHAT_MODE_AUTO": "Auto",
   "AI_CHAT_MODE_CHAT": "Claude Code",
   "AI_CHAT_MODE_CLI": "Claude Code CLI",
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
   "AI_CHAT_MODE_EDIT": "AI Edit Mode",
   "AI_CHAT_MODE_FULL_AUTO": "Allow Everything",
   "AI_CHAT_MODE_INFO_AUTO": "AI uses judgment to auto-approve safe actions and asks about risky ones (Click to switch)",
@@ -113,7 +128,7 @@
   "AI_CHAT_MODE_INFO_FULL_AUTO": "AI can edit files and run commands without approval (Click to switch)",
   "AI_CHAT_MODE_INFO_PLAN": "AI will propose a plan before making changes (Click to switch)",
   "AI_CHAT_MODE_PLAN": "Plan Mode",
-  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded Claude Code CLI terminal",
+  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded CLI terminal",
   "AI_CHAT_NEW_BTN": "New",
   "AI_CHAT_NEW_SESSION_TITLE": "Start a new conversation",
   "AI_CHAT_NEW_WHILE_STREAMING_MSG": "AI is currently working on a task. Starting a new conversation will stop it. Continue?",
@@ -180,7 +195,7 @@
   "AI_CHAT_SEND_ERROR": "Failed to send message: {0}",
   "AI_CHAT_SEND_TITLE": "Send message",
   "AI_CHAT_SESSION_RESUMED": "Resumed session",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code Settings",
+  "AI_CHAT_SETTINGS_TITLE": "AI Settings",
   "AI_CHAT_SETUP_LEARN_MORE": "Learn More",
   "AI_CHAT_SETUP_NEED_HELP": "Need Help?",
   "AI_CHAT_SHOW_DIFF": "Show diff",
@@ -287,8 +302,11 @@
   "AI_SETTINGS_API_TIMEOUT_PLACEHOLDER": "Leave blank for default",
   "AI_SETTINGS_BASE_URL": "Base URL",
   "AI_SETTINGS_BASE_URL_PLACEHOLDER": "Leave blank for default",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Leave blank to detect automatically.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Path to the {0} executable",
   "AI_SETTINGS_CUSTOM_ENDPOINT_NOTICE": "Using custom API endpoint: {0}",
   "AI_SETTINGS_DEFAULT_PROVIDER": "Default (Local Claude Code)",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Default (Local {0})",
   "AI_SETTINGS_DELETE": "Delete",
   "AI_SETTINGS_DELETE_ACTIVE_CONFIRM": "\"{0}\" is the active provider. Deleting it will revert to the default. Continue?",
   "AI_SETTINGS_DELETE_PROVIDER": "Delete Provider",
@@ -301,6 +319,7 @@
   "AI_SETTINGS_PROVIDERS": "Providers",
   "AI_SETTINGS_PROVIDER_NAME": "Name",
   "AI_SETTINGS_PROVIDER_NAME_PLACEHOLDER": "e.g. My API Provider",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "These providers configure {0}. The API key is passed to it as {1}.",
   "AI_SETTINGS_RESET": "Reset",
   "AI_SETTINGS_SAVE": "Save",
   "AI_SETTINGS_SAVE_PROVIDER": "Save Provider",
diff --git a/src/nls/zh-cn/strings.js b/src/nls/zh-cn/strings.js
index ca1b3a1e5e..32d0ffd87e 100644
--- a/src/nls/zh-cn/strings.js
+++ b/src/nls/zh-cn/strings.js
@@ -812,6 +812,8 @@ define({
   "LIVE_PREVIEW_LAYERS_EMPTY_PAGE_STYLES": "页面为空。请添加元素以查看其样式。",
   "LIVE_PREVIEW_LAYERS_SHOW_SELECTED": "显示所选元素",
   "LIVE_PREVIEW_LAYERS_SCRUB_HINT": "拖动调整，双击编辑",
+  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "属性",
+  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "值",
   "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS": "由于浏览器开发人员工具已打开, 实时预览已关闭。",
   "LIVE_DEV_DETACHED_TARGET_CLOSED": "由于浏览器中页面已关闭, 实时预览已关闭",
   "LIVE_DEV_NAVIGATED_AWAY": "由于浏览器打开一个不属于本项目的页面, 实时预览已关闭",
@@ -2546,7 +2548,6 @@ define({
   "AI_CHAT_MODEL_DESC_SONNET": "兼顾速度与性能，适用于日常编码",
   "AI_CHAT_MODEL_DESC_HAIKU": "速度最快的模型，适用于快速、简单的任务",
   "AI_CHAT_MODEL_SELECT_TITLE": "为此聊天选择 AI 模型",
-  "AI_CHAT_MODE_SELECT_TITLE": "在 Claude Code 聊天和嵌入式 Claude Code CLI 终端之间切换",
   "AI_CHAT_MODEL_SWITCHED_NOTICE": "已切换到 {0}。此设置将从您的下一条消息开始生效；在缓存重建期间，首次响应可能会稍有延迟。",
   "AI_CHAT_INPUT_HINT": "按下 {0} 发送 · {1} 换行",
   "AI_CHAT_BASH_CONFIRM_TITLE": "允许命令？",
@@ -2618,7 +2619,6 @@ define({
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "Claude Code CLI 会话仍在 {0} 中运行 — 当前打开的项目现为 {1}。",
   "AI_CHAT_CLI_STALE_PROJECT_SWITCH_BTN": "切换到“{0}”",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "停留在“{0}”",
-  "AI_CHAT_SETTINGS_TITLE": "Claude 代码设置",
   "AI_SETTINGS_API_KEY": "API 密钥",
   "AI_SETTINGS_BASE_URL": "基础 URL",
   "AI_SETTINGS_API_TIMEOUT": "API 超时 (毫秒)",
@@ -2762,6 +2762,25 @@ define({
   "MIGRATE_UNREACHABLE_TITLE": "无法访问旧站点",
   "MIGRATE_UNREACHABLE_MESSAGE": "{APP_NAME} 无法连接到 {0} 以查找您的项目和设置，因此未作任何更改。请检查您的网络连接，然后使用 {1} 重试。",
   "CMD_MIGRATE_DATA": "从 {0} 迁移我的数据…",
-  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "属性",
-  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "值"
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} 未找到",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "在此系统中找不到 {0}。请安装它，或在下方输入其可执行文件的完整路径。",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "为 {0} 设置的路径无法使用：{1}。请输入其他路径，或清空输入框以自动检测。",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "安装 {0}",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "保存并重试",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "安装说明",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "该路径下不存在文件。",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "该文件不是可执行文件。",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "该文件未能作为 {0} 运行。",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "该文件未及时响应。",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "该路径包含无法使用的字符。",
+  "AI_CHAT_MODE_SELECT_TITLE": "在 Claude Code 聊天和嵌入式 CLI 终端之间切换",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "此操作将结束正在运行的 Codex CLI 会话并开始一个新会话。是否继续？",
+  "AI_CHAT_CODEX_UPSELL_MSG": "在 Phoenix AI 面板中运行 Codex 是一项 Pro 功能。您仍然可以从终端免费运行 Codex CLI。",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "此 Codex CLI 会话仍在 {0} 中运行 — 当前打开的项目是 {1}。",
+  "AI_CHAT_SETTINGS_TITLE": "AI 设置",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "默认 (本地 {0})",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "这些提供商用于配置 {0}。API 密钥将作为 {1} 传递给它。",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "留空可自动检测。",
+  "AI_SETTINGS_CLI_PATH_LABEL": "{0} 可执行文件路径"
 });
\ No newline at end of file
diff --git a/src/nls/zh-tw/lastTranslated.json b/src/nls/zh-tw/lastTranslated.json
index 61b0783d87..9fb162a6f3 100644
--- a/src/nls/zh-tw/lastTranslated.json
+++ b/src/nls/zh-tw/lastTranslated.json
@@ -33,6 +33,11 @@
   "AI_CHAT_CLAUDE_LOGIN_MSG": "Claude Code is installed but needs to be configured.",
   "AI_CHAT_CLAUDE_LOGIN_RESTART_NOTE": "Restart {APP_NAME} after configuration completes.",
   "AI_CHAT_CLAUDE_LOGIN_TITLE": "Setup Claude Code",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "That file did not run as {0}.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "No file exists at that path.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "That file is not executable.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "That path contains characters that cannot be used.",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "That file did not respond in time.",
   "AI_CHAT_CLI_INSTALLING": "Installing…",
   "AI_CHAT_CLI_INSTALLING_MSG": "Installing Claude Code, please wait. This may take a while...",
   "AI_CHAT_CLI_INSTALL_BTN": "Install Claude Code",
@@ -40,6 +45,12 @@
   "AI_CHAT_CLI_NEW_CONFIRM_MSG": "This will end the running Claude Code CLI session and start a fresh one. Continue?",
   "AI_CHAT_CLI_NEW_CONFIRM_TITLE": "End this CLI session?",
   "AI_CHAT_CLI_NOT_FOUND": "Claude Code Not Installed",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "The path set for {0} could not be used: {1} Enter a different path, or clear the box to detect it automatically.",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "Install {0}",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "Installation instructions",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "{0} could not be found on this system. Install it, or enter the full path to its executable below.",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "Save & Retry",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "{0} not found",
   "AI_CHAT_CLI_RESTART_NOTE": "Restart {APP_NAME} after installation completes.",
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "This Claude Code CLI session is still running in {0} — the open project is now {1}.",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "Stay on “{0}”",
@@ -48,6 +59,9 @@
   "AI_CHAT_CLI_UPSELL_OPEN_TERMINAL_BTN": "Open in Terminal",
   "AI_CHAT_CLI_UPSELL_TITLE": "Available in Phoenix Pro",
   "AI_CHAT_CLI_UPSELL_UPGRADE_BTN": "Upgrade to Pro",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "This will end the running Codex CLI session and start a fresh one. Continue?",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "This Codex CLI session is still running in {0} — the open project is now {1}.",
+  "AI_CHAT_CODEX_UPSELL_MSG": "Running Codex inside the Phoenix AI panel is a Pro feature. You can still run the Codex CLI for free from the Terminal.",
   "AI_CHAT_CODE_COLLAPSE": "Collapse",
   "AI_CHAT_CODE_COLLAPSE_FOOTER": "Click to collapse",
   "AI_CHAT_CODE_DEFAULT_LANG": "text",
@@ -106,6 +120,7 @@
   "AI_CHAT_MODE_AUTO": "Auto",
   "AI_CHAT_MODE_CHAT": "Claude Code",
   "AI_CHAT_MODE_CLI": "Claude Code CLI",
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
   "AI_CHAT_MODE_EDIT": "AI Edit Mode",
   "AI_CHAT_MODE_FULL_AUTO": "Allow Everything",
   "AI_CHAT_MODE_INFO_AUTO": "AI uses judgment to auto-approve safe actions and asks about risky ones (Click to switch)",
@@ -113,7 +128,7 @@
   "AI_CHAT_MODE_INFO_FULL_AUTO": "AI can edit files and run commands without approval (Click to switch)",
   "AI_CHAT_MODE_INFO_PLAN": "AI will propose a plan before making changes (Click to switch)",
   "AI_CHAT_MODE_PLAN": "Plan Mode",
-  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded Claude Code CLI terminal",
+  "AI_CHAT_MODE_SELECT_TITLE": "Switch between the Claude Code chat and an embedded CLI terminal",
   "AI_CHAT_NEW_BTN": "New",
   "AI_CHAT_NEW_SESSION_TITLE": "Start a new conversation",
   "AI_CHAT_NEW_WHILE_STREAMING_MSG": "AI is currently working on a task. Starting a new conversation will stop it. Continue?",
@@ -180,7 +195,7 @@
   "AI_CHAT_SEND_ERROR": "Failed to send message: {0}",
   "AI_CHAT_SEND_TITLE": "Send message",
   "AI_CHAT_SESSION_RESUMED": "Resumed session",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code Settings",
+  "AI_CHAT_SETTINGS_TITLE": "AI Settings",
   "AI_CHAT_SETUP_LEARN_MORE": "Learn More",
   "AI_CHAT_SETUP_NEED_HELP": "Need Help?",
   "AI_CHAT_SHOW_DIFF": "Show diff",
@@ -287,8 +302,11 @@
   "AI_SETTINGS_API_TIMEOUT_PLACEHOLDER": "Leave blank for default",
   "AI_SETTINGS_BASE_URL": "Base URL",
   "AI_SETTINGS_BASE_URL_PLACEHOLDER": "Leave blank for default",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "Leave blank to detect automatically.",
+  "AI_SETTINGS_CLI_PATH_LABEL": "Path to the {0} executable",
   "AI_SETTINGS_CUSTOM_ENDPOINT_NOTICE": "Using custom API endpoint: {0}",
   "AI_SETTINGS_DEFAULT_PROVIDER": "Default (Local Claude Code)",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "Default (Local {0})",
   "AI_SETTINGS_DELETE": "Delete",
   "AI_SETTINGS_DELETE_ACTIVE_CONFIRM": "\"{0}\" is the active provider. Deleting it will revert to the default. Continue?",
   "AI_SETTINGS_DELETE_PROVIDER": "Delete Provider",
@@ -301,6 +319,7 @@
   "AI_SETTINGS_PROVIDERS": "Providers",
   "AI_SETTINGS_PROVIDER_NAME": "Name",
   "AI_SETTINGS_PROVIDER_NAME_PLACEHOLDER": "e.g. My API Provider",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "These providers configure {0}. The API key is passed to it as {1}.",
   "AI_SETTINGS_RESET": "Reset",
   "AI_SETTINGS_SAVE": "Save",
   "AI_SETTINGS_SAVE_PROVIDER": "Save Provider",
diff --git a/src/nls/zh-tw/strings.js b/src/nls/zh-tw/strings.js
index f8ee6e9cc3..62b4e239f3 100644
--- a/src/nls/zh-tw/strings.js
+++ b/src/nls/zh-tw/strings.js
@@ -812,6 +812,8 @@ define({
   "LIVE_PREVIEW_LAYERS_EMPTY_PAGE_STYLES": "頁面是空的。新增元素以查看其樣式。",
   "LIVE_PREVIEW_LAYERS_SHOW_SELECTED": "顯示選取的元素",
   "LIVE_PREVIEW_LAYERS_SCRUB_HINT": "拖曳以調整，按兩下以編輯",
+  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "屬性",
+  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "值",
   "LIVE_DEV_DETACHED_REPLACED_WITH_DEVTOOLS": "已取消即時預覽，因為開發者工具被打開了",
   "LIVE_DEV_DETACHED_TARGET_CLOSED": "已取消即時預覽，因為頁面被關掉了",
   "LIVE_DEV_NAVIGATED_AWAY": "已取消即時預覽，因為您連到專案外的頁面了",
@@ -2546,7 +2548,6 @@ define({
   "AI_CHAT_MODEL_DESC_SONNET": "兼具速度與能力，適用於日常編碼",
   "AI_CHAT_MODEL_DESC_HAIKU": "速度最快的模型，適用於快速、簡單的任務",
   "AI_CHAT_MODEL_SELECT_TITLE": "選擇此聊天室的 AI 模型",
-  "AI_CHAT_MODE_SELECT_TITLE": "在 Claude Code 聊天與內嵌的 Claude Code CLI 終端機之間切換",
   "AI_CHAT_MODEL_SWITCHED_NOTICE": "已切換至 {0}。將從您的下一則訊息開始套用；在快取重建期間，第一次回應可能會需要較長的時間。",
   "AI_CHAT_INPUT_HINT": "按下 {0} 傳送 · {1} 換行",
   "AI_CHAT_BASH_CONFIRM_TITLE": "允許指令？",
@@ -2618,7 +2619,6 @@ define({
   "AI_CHAT_CLI_STALE_PROJECT_MSG": "此 Claude Code CLI 工作階段仍在「{0}」中執行 — 目前開啟的專案是「{1}」。",
   "AI_CHAT_CLI_STALE_PROJECT_SWITCH_BTN": "切換至「{0}」",
   "AI_CHAT_CLI_STALE_PROJECT_STAY_BTN": "停留在「{0}」",
-  "AI_CHAT_SETTINGS_TITLE": "Claude Code 設定",
   "AI_SETTINGS_API_KEY": "API 金鑰",
   "AI_SETTINGS_BASE_URL": "基礎網址",
   "AI_SETTINGS_API_TIMEOUT": "API 逾時（毫秒）",
@@ -2762,6 +2762,25 @@ define({
   "MIGRATE_UNREACHABLE_TITLE": "無法連線至舊網站",
   "MIGRATE_UNREACHABLE_MESSAGE": "{APP_NAME} 無法連線至 {0} 以尋找您的專案與設定，因此沒有任何內容被變更。請檢查您的網路連線，然後透過 {1} 重試。",
   "CMD_MIGRATE_DATA": "從 {0} 轉移我的資料…",
-  "LIVE_PREVIEW_LAYERS_PROPERTY_PLACEHOLDER": "屬性",
-  "LIVE_PREVIEW_LAYERS_VALUE_PLACEHOLDER": "值"
+  "AI_CHAT_MODE_CODEX_CLI": "Codex CLI",
+  "AI_CHAT_CLI_NOT_FOUND_TITLE": "找不到 {0}",
+  "AI_CHAT_CLI_NOT_FOUND_MSG": "系統找不到 {0}。請安裝它，或在下方輸入其可執行檔的完整路徑。",
+  "AI_CHAT_CLI_NOT_FOUND_BAD_PATH_MSG": "無法使用為 {0} 設定的路徑：{1}。請輸入不同的路徑，或清除該欄位以自動偵測。",
+  "AI_CHAT_CLI_NOT_FOUND_INSTALL_BTN": "安裝 {0}",
+  "AI_CHAT_CLI_NOT_FOUND_SAVE_BTN": "儲存並重試",
+  "AI_CHAT_CLI_NOT_FOUND_LEARN_MORE": "安裝說明",
+  "AI_CHAT_CLI_ERR_OVERRIDE_MISSING": "該路徑下不存在任何檔案。",
+  "AI_CHAT_CLI_ERR_OVERRIDE_NOT_EXECUTABLE": "該檔案不可執行。",
+  "AI_CHAT_CLI_ERR_OVERRIDE_INVALID": "該檔案無法作為 {0} 執行。",
+  "AI_CHAT_CLI_ERR_OVERRIDE_TIMEOUT": "該檔案未及時回應。",
+  "AI_CHAT_CLI_ERR_OVERRIDE_REJECTED": "該路徑包含無法使用的字元。",
+  "AI_CHAT_MODE_SELECT_TITLE": "在 Claude Code 聊天和嵌入式 CLI 終端機之間切換",
+  "AI_CHAT_CODEX_NEW_CONFIRM_MSG": "這將會結束正在執行的 Codex CLI 工作階段，並開始一個新的。要繼續嗎？",
+  "AI_CHAT_CODEX_UPSELL_MSG": "在 Phoenix AI 面板中執行 Codex 是 Pro 版功能。您仍然可以從終端機免費執行 Codex CLI。",
+  "AI_CHAT_CODEX_STALE_PROJECT_MSG": "此 Codex CLI 工作階段仍在 {0} 中執行 — 目前開啟的專案是 {1}。",
+  "AI_CHAT_SETTINGS_TITLE": "AI 設定",
+  "AI_SETTINGS_DEFAULT_PROVIDER_FOR": "預設 (本機 {0})",
+  "AI_SETTINGS_PROVIDER_TYPE_NOTE": "這些供應商可設定 {0}。API 金鑰會以 {1} 的形式傳遞給它。",
+  "AI_SETTINGS_CLI_PATHS_NOTE": "留白以自動偵測。",
+  "AI_SETTINGS_CLI_PATH_LABEL": "{0} 可執行檔的路徑"
 });
\ No newline at end of file