diff --git a/assets/locales/ar.json b/assets/locales/ar.json
index 22a35f53d6..b77cbf2d8b 100644
--- a/assets/locales/ar.json
+++ b/assets/locales/ar.json
@@ -4128,6 +4128,7 @@
   "ui.agent_chat_ctx_features": "الميزات",
   "ui.agent_chat_ctx_more": "+{n} أخرى",
   "ui.agent_chat_ctx_other": "أخرى",
+  "ui.agent_chat_custom_heading": "نموذج مخصص",
   "ui.agent_chat_custom_hint": "أي برنامج يتحدث بروتوكول Agent Client Protocol عبر stdin وstdout. لا تشغّله أي صدفة أوامر.",
   "ui.agent_chat_denied": "مرفوض",
   "ui.agent_chat_deny": "رفض",
@@ -4171,8 +4172,16 @@
   "ui.agent_chat_mode_all": "الكل",
   "ui.agent_chat_mode_ask": "السؤال",
   "ui.agent_chat_mode_edits": "التعديلات",
+  "ui.agent_chat_model_custom": "استخدام المخصص: {model}",
   "ui.agent_chat_model_no_tools": "لا يستطيع {model} استخدام أدوات SolidCraft، لذا يمكنه المحادثة فقط. اختر نموذجًا يدعم الأدوات.",
+  "ui.agent_chat_model_rejected": "لم يقبل الوكيل {model}: {error}",
+  "ui.agent_chat_model_search": "البحث عن النماذج…",
   "ui.agent_chat_model_tip": "النموذج الذي يستخدمه الوكيل. يُحفظ اختيارك لهذا الوكيل.",
+  "ui.agent_chat_models_failed": "تعذّر جلب قائمة النماذج: {error}",
+  "ui.agent_chat_models_heading": "النماذج المتاحة",
+  "ui.agent_chat_models_listing": "جارٍ جلب قائمة النماذج…",
+  "ui.agent_chat_models_none": "لا تسرد نقطة النهاية أي نماذج",
+  "ui.agent_chat_models_not_a_list": "لم يكن الرد قائمة نماذج",
   "ui.agent_chat_new": "محادثة جديدة",
   "ui.agent_chat_new_confirm": "بدء محادثة جديدة؟ ستُمسح المحادثة الحالية.",
   "ui.agent_chat_next_picture": "الصورة التالية",
diff --git a/assets/locales/de.json b/assets/locales/de.json
index e50bc40dd2..69a0d4050a 100644
--- a/assets/locales/de.json
+++ b/assets/locales/de.json
@@ -4123,6 +4123,7 @@
   "ui.agent_chat_ctx_features": "Funktionen",
   "ui.agent_chat_ctx_more": "+{n} weitere",
   "ui.agent_chat_ctx_other": "Sonstiges",
+  "ui.agent_chat_custom_heading": "Eigenes Modell",
   "ui.agent_chat_custom_hint": "Jedes Programm, das das Agent Client Protocol über stdin und stdout spricht. Es läuft ohne Shell.",
   "ui.agent_chat_denied": "Abgelehnt",
   "ui.agent_chat_deny": "Ablehnen",
@@ -4166,8 +4167,16 @@
   "ui.agent_chat_mode_all": "Alles",
   "ui.agent_chat_mode_ask": "Fragen",
   "ui.agent_chat_mode_edits": "Ändern",
+  "ui.agent_chat_model_custom": "Eigenes verwenden: {model}",
   "ui.agent_chat_model_no_tools": "{model} kann die Werkzeuge von SolidCraft nicht verwenden und daher nur chatten. Wählen Sie ein Modell mit Werkzeugunterstützung.",
+  "ui.agent_chat_model_rejected": "Der Agent hat {model} nicht akzeptiert: {error}",
+  "ui.agent_chat_model_search": "Modelle suchen…",
   "ui.agent_chat_model_tip": "Das vom Agenten verwendete Modell. Ihre Auswahl wird für diesen Agenten gespeichert.",
+  "ui.agent_chat_models_failed": "Modelle konnten nicht abgerufen werden: {error}",
+  "ui.agent_chat_models_heading": "Verfügbare Modelle",
+  "ui.agent_chat_models_listing": "Modelle werden abgerufen…",
+  "ui.agent_chat_models_none": "Der Endpunkt listet keine Modelle",
+  "ui.agent_chat_models_not_a_list": "Die Antwort war keine Modellliste",
   "ui.agent_chat_new": "Neuer Chat",
   "ui.agent_chat_new_confirm": "Neuen Chat starten? Der aktuelle wird geleert.",
   "ui.agent_chat_next_picture": "Nächstes Bild",
diff --git a/assets/locales/en.json b/assets/locales/en.json
index 9824d4a5c9..3854bd08fc 100644
--- a/assets/locales/en.json
+++ b/assets/locales/en.json
@@ -4128,6 +4128,7 @@
   "ui.agent_chat_ctx_features": "Features",
   "ui.agent_chat_ctx_more": "+{n} more",
   "ui.agent_chat_ctx_other": "Other",
+  "ui.agent_chat_custom_heading": "Custom model",
   "ui.agent_chat_custom_hint": "Any program that speaks the Agent Client Protocol on stdin and stdout. No shell runs it.",
   "ui.agent_chat_denied": "Denied",
   "ui.agent_chat_deny": "Deny",
@@ -4171,8 +4172,16 @@
   "ui.agent_chat_mode_all": "All",
   "ui.agent_chat_mode_ask": "Ask",
   "ui.agent_chat_mode_edits": "Edits",
+  "ui.agent_chat_model_custom": "Use custom: {model}",
   "ui.agent_chat_model_no_tools": "{model} can't use SolidCraft's tools, so it can only chat. Pick a model with tool support.",
+  "ui.agent_chat_model_rejected": "The agent did not accept {model}: {error}",
+  "ui.agent_chat_model_search": "Search models…",
   "ui.agent_chat_model_tip": "The model the agent uses. Your choice is remembered for this agent.",
+  "ui.agent_chat_models_failed": "Couldn't list models: {error}",
+  "ui.agent_chat_models_heading": "Available models",
+  "ui.agent_chat_models_listing": "Listing models…",
+  "ui.agent_chat_models_none": "The endpoint lists no models",
+  "ui.agent_chat_models_not_a_list": "The answer was no model list",
   "ui.agent_chat_new": "New chat",
   "ui.agent_chat_new_confirm": "Start a new chat? The current one is cleared.",
   "ui.agent_chat_next_picture": "Next picture",
diff --git a/assets/locales/he.json b/assets/locales/he.json
index 1a63962bd8..101aa8befe 100644
--- a/assets/locales/he.json
+++ b/assets/locales/he.json
@@ -4128,6 +4128,7 @@
   "ui.agent_chat_ctx_features": "פיצ'רים",
   "ui.agent_chat_ctx_more": "+{n} נוספים",
   "ui.agent_chat_ctx_other": "אחר",
+  "ui.agent_chat_custom_heading": "מודל מותאם אישית",
   "ui.agent_chat_custom_hint": "כל תוכנה שמדברת Agent Client Protocol דרך stdin ו־stdout. היא לא מורצת דרך מעטפת (shell).",
   "ui.agent_chat_denied": "נדחה",
   "ui.agent_chat_deny": "דחייה",
@@ -4171,8 +4172,16 @@
   "ui.agent_chat_mode_all": "הכול",
   "ui.agent_chat_mode_ask": "שאלה",
   "ui.agent_chat_mode_edits": "עריכות",
+  "ui.agent_chat_model_custom": "שימוש במותאם אישית: {model}",
   "ui.agent_chat_model_no_tools": "{model} לא יכול להשתמש בכלים של SolidCraft, ולכן הוא יכול רק לשוחח. יש לבחור מודל שתומך בכלים.",
+  "ui.agent_chat_model_rejected": "הסוכן לא קיבל את {model}: {error}",
+  "ui.agent_chat_model_search": "חיפוש מודלים…",
   "ui.agent_chat_model_tip": "המודל שבו הסוכן משתמש. הבחירה נשמרת עבור הסוכן הזה.",
+  "ui.agent_chat_models_failed": "לא ניתן היה לטעון את רשימת המודלים: {error}",
+  "ui.agent_chat_models_heading": "מודלים זמינים",
+  "ui.agent_chat_models_listing": "טוען רשימת מודלים…",
+  "ui.agent_chat_models_none": "נקודת הקצה אינה מציגה מודלים",
+  "ui.agent_chat_models_not_a_list": "התשובה לא הייתה רשימת מודלים",
   "ui.agent_chat_new": "צ'אט חדש",
   "ui.agent_chat_new_confirm": "להתחיל צ'אט חדש? הצ'אט הנוכחי יימחק.",
   "ui.agent_chat_next_picture": "התמונה הבאה",
diff --git a/assets/locales/ja.json b/assets/locales/ja.json
index 17424db1a8..53303ab8a9 100644
--- a/assets/locales/ja.json
+++ b/assets/locales/ja.json
@@ -4128,6 +4128,7 @@
   "ui.agent_chat_ctx_features": "フィーチャ",
   "ui.agent_chat_ctx_more": "ほか{n}件",
   "ui.agent_chat_ctx_other": "その他",
+  "ui.agent_chat_custom_heading": "カスタムモデル",
   "ui.agent_chat_custom_hint": "標準入出力で Agent Client Protocol を話す任意のプログラム。シェルは使いません。",
   "ui.agent_chat_denied": "拒否しました",
   "ui.agent_chat_deny": "拒否",
@@ -4171,8 +4172,16 @@
   "ui.agent_chat_mode_all": "すべて",
   "ui.agent_chat_mode_ask": "確認",
   "ui.agent_chat_mode_edits": "編集",
+  "ui.agent_chat_model_custom": "カスタムを使用: {model}",
   "ui.agent_chat_model_no_tools": "{model} は SolidCraft のツールを使えず、チャットのみ可能です。ツール対応のモデルを選んでください。",
+  "ui.agent_chat_model_rejected": "エージェントは {model} を受け付けませんでした: {error}",
+  "ui.agent_chat_model_search": "モデルを検索…",
   "ui.agent_chat_model_tip": "エージェントが使うモデル。選択はこのエージェントに対して記憶されます。",
+  "ui.agent_chat_models_failed": "モデルを一覧表示できませんでした: {error}",
+  "ui.agent_chat_models_heading": "利用可能なモデル",
+  "ui.agent_chat_models_listing": "モデルを一覧表示中…",
+  "ui.agent_chat_models_none": "エンドポイントにモデルがありません",
+  "ui.agent_chat_models_not_a_list": "応答はモデル一覧ではありませんでした",
   "ui.agent_chat_new": "新しいチャット",
   "ui.agent_chat_new_confirm": "新しいチャットを始めますか？ 現在のチャットは消去されます。",
   "ui.agent_chat_next_picture": "次の画像",
diff --git a/assets/locales/ko.json b/assets/locales/ko.json
index a8b8a68a84..2304b0375d 100644
--- a/assets/locales/ko.json
+++ b/assets/locales/ko.json
@@ -2957,6 +2957,7 @@
   "ui.agent_chat_command": "에이전트 명령",
   "ui.agent_chat_connect": "연결",
   "ui.agent_chat_copy": "복사",
+  "ui.agent_chat_custom_heading": "사용자 지정 모델",
   "ui.agent_chat_custom_hint": "표준 입출력으로 Agent Client Protocol을 사용하는 모든 프로그램. 셸 없이 실행됩니다.",
   "ui.agent_chat_denied": "거부함",
   "ui.agent_chat_deny": "거부",
@@ -2998,7 +2999,15 @@
   "ui.agent_chat_mode_all": "모두",
   "ui.agent_chat_mode_ask": "확인",
   "ui.agent_chat_mode_edits": "편집",
+  "ui.agent_chat_model_custom": "직접 입력 사용: {model}",
+  "ui.agent_chat_model_rejected": "에이전트가 {model}을(를) 받아들이지 않았습니다: {error}",
+  "ui.agent_chat_model_search": "모델 검색…",
   "ui.agent_chat_model_tip": "에이전트가 사용하는 모델입니다. 선택은 이 에이전트에 기억됩니다.",
+  "ui.agent_chat_models_failed": "모델 목록을 가져올 수 없습니다: {error}",
+  "ui.agent_chat_models_heading": "사용 가능한 모델",
+  "ui.agent_chat_models_listing": "모델 목록을 가져오는 중…",
+  "ui.agent_chat_models_none": "엔드포인트에 나열된 모델이 없습니다",
+  "ui.agent_chat_models_not_a_list": "응답이 모델 목록이 아닙니다",
   "ui.agent_chat_new": "새 채팅",
   "ui.agent_chat_new_confirm": "새 채팅을 시작할까요? 현재 채팅은 지워집니다.",
   "ui.agent_chat_next_picture": "다음 이미지",
diff --git a/assets/locales/pending/agent-chat-model-picker.json b/assets/locales/pending/agent-chat-model-picker.json
deleted file mode 100644
index c97b17710f..0000000000
--- a/assets/locales/pending/agent-chat-model-picker.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  "en": {
-    "ui.agent_chat_custom_heading": "Custom model",
-    "ui.agent_chat_model_custom": "Use custom: {model}",
-    "ui.agent_chat_model_rejected": "The agent did not accept {model}: {error}",
-    "ui.agent_chat_model_search": "Search models…",
-    "ui.agent_chat_models_failed": "Couldn't list models: {error}",
-    "ui.agent_chat_models_heading": "Available models",
-    "ui.agent_chat_models_listing": "Listing models…",
-    "ui.agent_chat_models_none": "The endpoint lists no models",
-    "ui.agent_chat_models_not_a_list": "The answer was no model list"
-  },
-  "de": {
-    "ui.agent_chat_custom_heading": "Eigenes Modell",
-    "ui.agent_chat_model_custom": "Eigenes verwenden: {model}",
-    "ui.agent_chat_model_rejected": "Der Agent hat {model} nicht akzeptiert: {error}",
-    "ui.agent_chat_model_search": "Modelle suchen…",
-    "ui.agent_chat_models_failed": "Modelle konnten nicht abgerufen werden: {error}",
-    "ui.agent_chat_models_heading": "Verfügbare Modelle",
-    "ui.agent_chat_models_listing": "Modelle werden abgerufen…",
-    "ui.agent_chat_models_none": "Der Endpunkt listet keine Modelle",
-    "ui.agent_chat_models_not_a_list": "Die Antwort war keine Modellliste"
-  },
-  "ko": {
-    "ui.agent_chat_custom_heading": "사용자 지정 모델",
-    "ui.agent_chat_model_custom": "직접 입력 사용: {model}",
-    "ui.agent_chat_model_rejected": "에이전트가 {model}을(를) 받아들이지 않았습니다: {error}",
-    "ui.agent_chat_model_search": "모델 검색…",
-    "ui.agent_chat_models_failed": "모델 목록을 가져올 수 없습니다: {error}",
-    "ui.agent_chat_models_heading": "사용 가능한 모델",
-    "ui.agent_chat_models_listing": "모델 목록을 가져오는 중…",
-    "ui.agent_chat_models_none": "엔드포인트에 나열된 모델이 없습니다",
-    "ui.agent_chat_models_not_a_list": "응답이 모델 목록이 아닙니다"
-  },
-  "ar": {
-    "ui.agent_chat_custom_heading": "نموذج مخصص",
-    "ui.agent_chat_model_custom": "استخدام المخصص: {model}",
-    "ui.agent_chat_model_rejected": "لم يقبل الوكيل {model}: {error}",
-    "ui.agent_chat_model_search": "البحث عن النماذج…",
-    "ui.agent_chat_models_failed": "تعذّر جلب قائمة النماذج: {error}",
-    "ui.agent_chat_models_heading": "النماذج المتاحة",
-    "ui.agent_chat_models_listing": "جارٍ جلب قائمة النماذج…",
-    "ui.agent_chat_models_none": "لا تسرد نقطة النهاية أي نماذج",
-    "ui.agent_chat_models_not_a_list": "لم يكن الرد قائمة نماذج"
-  },
-  "he": {
-    "ui.agent_chat_custom_heading": "מודל מותאם אישית",
-    "ui.agent_chat_model_custom": "שימוש במותאם אישית: {model}",
-    "ui.agent_chat_model_rejected": "הסוכן לא קיבל את {model}: {error}",
-    "ui.agent_chat_model_search": "חיפוש מודלים…",
-    "ui.agent_chat_models_failed": "לא ניתן היה לטעון את רשימת המודלים: {error}",
-    "ui.agent_chat_models_heading": "מודלים זמינים",
-    "ui.agent_chat_models_listing": "טוען רשימת מודלים…",
-    "ui.agent_chat_models_none": "נקודת הקצה אינה מציגה מודלים",
-    "ui.agent_chat_models_not_a_list": "התשובה לא הייתה רשימת מודלים"
-  },
-  "ja": {
-    "ui.agent_chat_custom_heading": "カスタムモデル",
-    "ui.agent_chat_model_custom": "カスタムを使用: {model}",
-    "ui.agent_chat_model_rejected": "エージェントは {model} を受け付けませんでした: {error}",
-    "ui.agent_chat_model_search": "モデルを検索…",
-    "ui.agent_chat_models_failed": "モデルを一覧表示できませんでした: {error}",
-    "ui.agent_chat_models_heading": "利用可能なモデル",
-    "ui.agent_chat_models_listing": "モデルを一覧表示中…",
-    "ui.agent_chat_models_none": "エンドポイントにモデルがありません",
-    "ui.agent_chat_models_not_a_list": "応答はモデル一覧ではありませんでした"
-  },
-  "vi": {
-    "ui.agent_chat_custom_heading": "Mô hình tùy chỉnh",
-    "ui.agent_chat_model_custom": "Dùng tùy chỉnh: {model}",
-    "ui.agent_chat_model_rejected": "Tác tử không chấp nhận {model}: {error}",
-    "ui.agent_chat_model_search": "Tìm mô hình…",
-    "ui.agent_chat_models_failed": "Không thể lấy danh sách mô hình: {error}",
-    "ui.agent_chat_models_heading": "Các mô hình có sẵn",
-    "ui.agent_chat_models_listing": "Đang lấy danh sách mô hình…",
-    "ui.agent_chat_models_none": "Điểm cuối không liệt kê mô hình nào",
-    "ui.agent_chat_models_not_a_list": "Phản hồi không phải là danh sách mô hình"
-  },
-  "zh": {
-    "ui.agent_chat_custom_heading": "自定义模型",
-    "ui.agent_chat_model_custom": "使用自定义:{model}",
-    "ui.agent_chat_model_rejected": "智能体未接受 {model}:{error}",
-    "ui.agent_chat_model_search": "搜索模型…",
-    "ui.agent_chat_models_failed": "无法列出模型:{error}",
-    "ui.agent_chat_models_heading": "可用模型",
-    "ui.agent_chat_models_listing": "正在列出模型…",
-    "ui.agent_chat_models_none": "该端点未列出任何模型",
-    "ui.agent_chat_models_not_a_list": "响应不是模型列表"
-  }
-}
diff --git a/assets/locales/vi.json b/assets/locales/vi.json
index a578614252..902780f694 100644
--- a/assets/locales/vi.json
+++ b/assets/locales/vi.json
@@ -4128,6 +4128,7 @@
   "ui.agent_chat_ctx_features": "Tính năng",
   "ui.agent_chat_ctx_more": "+{n} mục khác",
   "ui.agent_chat_ctx_other": "Khác",
+  "ui.agent_chat_custom_heading": "Mô hình tùy chỉnh",
   "ui.agent_chat_custom_hint": "Bất kỳ chương trình nào hỗ trợ giao thức Agent Client Protocol qua stdin và stdout. Không chạy qua shell hệ thống.",
   "ui.agent_chat_denied": "Đã từ chối",
   "ui.agent_chat_deny": "Từ chối",
@@ -4171,8 +4172,16 @@
   "ui.agent_chat_mode_all": "Tất cả",
   "ui.agent_chat_mode_ask": "Hỏi",
   "ui.agent_chat_mode_edits": "Chỉnh sửa",
+  "ui.agent_chat_model_custom": "Dùng tùy chỉnh: {model}",
   "ui.agent_chat_model_no_tools": "{model} không thể sử dụng các công cụ của SolidCraft nên chỉ có thể trò chuyện. Hãy chọn mô hình có hỗ trợ công cụ.",
+  "ui.agent_chat_model_rejected": "Tác tử không chấp nhận {model}: {error}",
+  "ui.agent_chat_model_search": "Tìm mô hình…",
   "ui.agent_chat_model_tip": "Mô hình AI đang sử dụng. Lựa chọn của bạn sẽ được ghi nhớ cho Agent này.",
+  "ui.agent_chat_models_failed": "Không thể lấy danh sách mô hình: {error}",
+  "ui.agent_chat_models_heading": "Các mô hình có sẵn",
+  "ui.agent_chat_models_listing": "Đang lấy danh sách mô hình…",
+  "ui.agent_chat_models_none": "Điểm cuối không liệt kê mô hình nào",
+  "ui.agent_chat_models_not_a_list": "Phản hồi không phải là danh sách mô hình",
   "ui.agent_chat_new": "Cuộc trò chuyện mới",
   "ui.agent_chat_new_confirm": "Bắt đầu cuộc trò chuyện mới? Cuộc trò chuyện hiện tại sẽ bị xóa.",
   "ui.agent_chat_next_picture": "Ảnh kế tiếp",
diff --git a/assets/locales/zh.json b/assets/locales/zh.json
index f4522dc84e..7a046bcc92 100644
--- a/assets/locales/zh.json
+++ b/assets/locales/zh.json
@@ -4128,6 +4128,7 @@
   "ui.agent_chat_ctx_features": "特征",
   "ui.agent_chat_ctx_more": "另有 {n} 项",
   "ui.agent_chat_ctx_other": "其他",
+  "ui.agent_chat_custom_heading": "自定义模型",
   "ui.agent_chat_custom_hint": "任何通过标准输入输出使用 Agent Client Protocol 的程序。不经过 shell 运行。",
   "ui.agent_chat_denied": "已拒绝",
   "ui.agent_chat_deny": "拒绝",
@@ -4171,8 +4172,16 @@
   "ui.agent_chat_mode_all": "全部",
   "ui.agent_chat_mode_ask": "询问",
   "ui.agent_chat_mode_edits": "编辑",
+  "ui.agent_chat_model_custom": "使用自定义:{model}",
   "ui.agent_chat_model_no_tools": "{model} 无法使用 SolidCraft 的工具，只能聊天。请选择支持工具的模型。",
+  "ui.agent_chat_model_rejected": "智能体未接受 {model}:{error}",
+  "ui.agent_chat_model_search": "搜索模型…",
   "ui.agent_chat_model_tip": "智能体使用的模型。你的选择会为此智能体记住。",
+  "ui.agent_chat_models_failed": "无法列出模型:{error}",
+  "ui.agent_chat_models_heading": "可用模型",
+  "ui.agent_chat_models_listing": "正在列出模型…",
+  "ui.agent_chat_models_none": "该端点未列出任何模型",
+  "ui.agent_chat_models_not_a_list": "响应不是模型列表",
   "ui.agent_chat_new": "新对话",
   "ui.agent_chat_new_confirm": "开始新对话？当前对话将被清除。",
   "ui.agent_chat_next_picture": "下一张图片",